diff -Nru csound-6.05~dfsg1/debian/changelog csound-6.05~dfsg1/debian/changelog --- csound-6.05~dfsg1/debian/changelog 2015-09-04 00:20:21.000000000 +0000 +++ csound-6.05~dfsg1/debian/changelog 2016-02-21 14:13:48.000000000 +0000 @@ -1,3 +1,30 @@ +csound (1:6.05~dfsg1-7build1) xenial; urgency=medium + + * No-change rebuild for stk transition. + + -- Matthias Klose Sun, 21 Feb 2016 15:13:24 +0100 + +csound (1:6.05~dfsg1-7) unstable; urgency=medium + + * Sanitize environment when setting package date + * Disable html timestamps + + -- Felipe Sateler Fri, 04 Dec 2015 16:27:20 -0300 + +csound (1:6.05~dfsg1-6) unstable; urgency=medium + + * debian/copyright: Updates to machine-readable format + * Package cleanup: + - Switch to gbp-pq + - Remove stale scons directives + - Drop conditions for old python versions. + - Drop break/replaces on versions older than stable (jessie) + - Sync debian/rules with debian/control + * Pass last changelog date as date to csound so it can build reproducibly + - Introduce CS_PACKAGE_DATE macro (from upstream) + + -- Felipe Sateler Mon, 30 Nov 2015 10:45:54 -0300 + csound (1:6.05~dfsg1-5) unstable; urgency=medium * Add versioned build-dependency on gcc5-transitioned gmm++ diff -Nru csound-6.05~dfsg1/debian/control csound-6.05~dfsg1/debian/control --- csound-6.05~dfsg1/debian/control 2015-09-04 00:20:21.000000000 +0000 +++ csound-6.05~dfsg1/debian/control 2015-12-04 19:27:28.000000000 +0000 @@ -47,7 +47,6 @@ Package: csound Architecture: any Depends: ${misc:Depends}, ${shlibs:Depends} -Breaks: libcsound64-5.1 (<< 1:5.08.2~dfsg-1) Recommends: csound-utils Description: powerful and versatile sound synthesis software Csound is a sound and music synthesis system. Drawing from over 450 @@ -60,7 +59,6 @@ Package: csound-data Architecture: all Depends: ${misc:Depends} -Breaks: csound (<< 1:5.13.0~dfsg-4) Description: data files used by the csound library This package includes the architecture-independent data files used by the csound library or plugins. @@ -81,8 +79,6 @@ Architecture: any Depends: csound-data, ${misc:Depends}, ${shlibs:Depends} Recommends: csound, stk -Breaks: csound (<< 1:5.07.0.dfsg-1), csound-gui (<< 1:6.00.1~dfsg-3) -Replaces: csound-gui (<< 1:6.00.1~dfsg-3) Description: main library for Csound This package contains the library which provides most of the Csound functionality. This library was built using 64-bit precision for the @@ -122,7 +118,6 @@ libcsnd6-6.0v5 (>= ${source:Version}), libcsound64-dev, ${misc:Depends} -Replaces: libcsnd5.1 Suggests: liblua5.1-luacsnd Provides: liblua5.1-luacsnd-dev Description: development files for Csound -- C++ API @@ -140,7 +135,6 @@ libcsoundac6.0v5 (<< ${source:Version}.1~), libcsoundac6.0v5 (>= ${source:Version}), ${misc:Depends} -Replaces: libcsoundac5.1 Description: development files for CsoundAC This package contains the development files needed to build programs using the CsoundAC algorithmic composition system. @@ -181,8 +175,6 @@ Package: liblua5.1-luacsnd Architecture: any Depends: ${misc:Depends}, ${shlibs:Depends} -Conflicts: liblua5.1-luacsnd5.2 -Replaces: liblua5.1-luacsnd5.2 Description: Lua bindings for the Csound API This is the Lua binding for the Csound API. . diff -Nru csound-6.05~dfsg1/debian/control.in csound-6.05~dfsg1/debian/control.in --- csound-6.05~dfsg1/debian/control.in 2015-09-04 00:20:21.000000000 +0000 +++ csound-6.05~dfsg1/debian/control.in 2015-12-04 19:27:28.000000000 +0000 @@ -16,7 +16,6 @@ Package: csound Architecture: any Depends: ${misc:Depends}, ${shlibs:Depends} -Breaks: libcsound64-5.1 (<< 1:5.08.2~dfsg-1) Recommends: csound-utils Description: powerful and versatile sound synthesis software Csound is a sound and music synthesis system. Drawing from over 450 @@ -29,7 +28,6 @@ Package: csound-data Architecture: all Depends: ${misc:Depends} -Breaks: csound (<< 1:5.13.0~dfsg-4) Description: data files used by the csound library This package includes the architecture-independent data files used by the csound library or plugins. @@ -50,8 +48,6 @@ Architecture: any Depends: csound-data, ${misc:Depends}, ${shlibs:Depends} Recommends: csound, stk -Breaks: csound (<< 1:5.07.0.dfsg-1), csound-gui (<< 1:6.00.1~dfsg-3) -Replaces: csound-gui (<< 1:6.00.1~dfsg-3) Description: main library for Csound This package contains the library which provides most of the Csound functionality. This library was built using 64-bit precision for the @@ -91,7 +87,6 @@ libcsnd6-6.0v5 (>= ${source:Version}), libcsound64-dev, ${misc:Depends} -Replaces: libcsnd5.1 Suggests: liblua5.1-luacsnd Provides: liblua5.1-luacsnd-dev Description: development files for Csound -- C++ API @@ -109,7 +104,6 @@ libcsoundac6.0v5 (<< ${source:Version}.1~), libcsoundac6.0v5 (>= ${source:Version}), ${misc:Depends} -Replaces: libcsoundac5.1 Description: development files for CsoundAC This package contains the development files needed to build programs using the CsoundAC algorithmic composition system. @@ -150,8 +144,6 @@ Package: liblua5.1-luacsnd Architecture: any Depends: ${misc:Depends}, ${shlibs:Depends} -Conflicts: liblua5.1-luacsnd5.2 -Replaces: liblua5.1-luacsnd5.2 Description: Lua bindings for the Csound API This is the Lua binding for the Csound API. . diff -Nru csound-6.05~dfsg1/debian/copyright csound-6.05~dfsg1/debian/copyright --- csound-6.05~dfsg1/debian/copyright 2015-09-04 00:20:21.000000000 +0000 +++ csound-6.05~dfsg1/debian/copyright 2015-12-04 19:27:28.000000000 +0000 @@ -101,13 +101,16 @@ 1991-2011, John ffitch 1991-2011, Csound developers License: LGPL-2.1+ -Files-Stripped: +Files-Excluded: Opcodes/scansyn* csound5_osx_installer_files.tar.gz samples/VintageDreamsWaves-v2.sf2 dependencies/* iOS/* - android + android/* + emscripten/* + installer/* + nacl/* Files: * Copyright: 1986-2015 Csound Developers diff -Nru csound-6.05~dfsg1/debian/Custom.cmake csound-6.05~dfsg1/debian/Custom.cmake --- csound-6.05~dfsg1/debian/Custom.cmake 2015-09-04 00:20:21.000000000 +0000 +++ csound-6.05~dfsg1/debian/Custom.cmake 2015-12-04 19:27:28.000000000 +0000 @@ -20,6 +20,7 @@ add_compiler_flags("-mtune=generic") endif() +add_definitions(-DCS_PACKAGE_DATE=\"@DATE@\") #set(FLTK_INCLUDE_DIR "/usr/include") set(FLTK_SKIP_OPENGL ON) diff -Nru csound-6.05~dfsg1/debian/gbp.conf csound-6.05~dfsg1/debian/gbp.conf --- csound-6.05~dfsg1/debian/gbp.conf 2015-09-04 00:20:21.000000000 +0000 +++ csound-6.05~dfsg1/debian/gbp.conf 2015-12-04 19:27:28.000000000 +0000 @@ -2,3 +2,7 @@ [DEFAULT] pristine-tar = True + +[pq] +patch-numbers = False +renumber = True diff -Nru csound-6.05~dfsg1/debian/patches/0001-Do-not-pass-a-null-pointer-to-strdup.-Fixes-466.patch csound-6.05~dfsg1/debian/patches/0001-Do-not-pass-a-null-pointer-to-strdup.-Fixes-466.patch --- csound-6.05~dfsg1/debian/patches/0001-Do-not-pass-a-null-pointer-to-strdup.-Fixes-466.patch 2015-09-04 00:20:21.000000000 +0000 +++ csound-6.05~dfsg1/debian/patches/0001-Do-not-pass-a-null-pointer-to-strdup.-Fixes-466.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,27 +0,0 @@ -From e7d5030f53e016dd85c2f8fcd3c6607ca06404ed Mon Sep 17 00:00:00 2001 -From: Felipe Sateler -Date: Wed, 13 May 2015 21:43:09 -0300 -Subject: [PATCH] Do not pass a null pointer to strdup. Fixes #466 - ---- - frontends/csladspa/csladspa.cpp | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/frontends/csladspa/csladspa.cpp b/frontends/csladspa/csladspa.cpp -index f6beff6..a37212c 100644 ---- a/frontends/csladspa/csladspa.cpp -+++ b/frontends/csladspa/csladspa.cpp -@@ -427,7 +427,9 @@ unsigned int CountCSD(char **csdnames) - #ifdef MACOSX - src = strdup("/Library/Audio/Plug-Ins/LADSPA"); - #else -- src = strdup(getenv("LADSPA_PATH")); -+ src = getenv("LADSPA_PATH"); -+ if (src) -+ src = strdup(src); - #endif - - if (src) { --- -2.1.4 - diff -Nru csound-6.05~dfsg1/debian/patches/2000-avoid-nonfree-scansyn-plugin.diff csound-6.05~dfsg1/debian/patches/2000-avoid-nonfree-scansyn-plugin.diff --- csound-6.05~dfsg1/debian/patches/2000-avoid-nonfree-scansyn-plugin.diff 2015-09-04 00:20:21.000000000 +0000 +++ csound-6.05~dfsg1/debian/patches/2000-avoid-nonfree-scansyn-plugin.diff 1970-01-01 00:00:00.000000000 +0000 @@ -1,19 +0,0 @@ -Description: Avoid non-free scansyn plugin - The scanned synthesis opcodes are not DFSG-free, so we delete them from - the upstream sources. They need to be removed from SConstruct as well - to prevent build failures. We don't remove them at the same time as the - opcodes themselves to keep repacking of the source minimal. -Author: Felipe Sateler ---- a/Opcodes/CMakeLists.txt -+++ b/Opcodes/CMakeLists.txt -@@ -101,10 +101,6 @@ if(BUILD_PLATEREV_OPCODES) - make_plugin(platerev platerev.c m) - endif() - --set(scansyn_SRCS -- scansyn.c scansynx.c) --make_plugin(scansyn "${scansyn_SRCS}" m) -- - if(UNIX) - make_plugin(control control.c) - endif() diff -Nru csound-6.05~dfsg1/debian/patches/2001-lua-link.diff csound-6.05~dfsg1/debian/patches/2001-lua-link.diff --- csound-6.05~dfsg1/debian/patches/2001-lua-link.diff 2015-09-04 00:20:21.000000000 +0000 +++ csound-6.05~dfsg1/debian/patches/2001-lua-link.diff 1970-01-01 00:00:00.000000000 +0000 @@ -1,34 +0,0 @@ -Description: Only link to lua when necessary, and to the correct lib - Lua policy recommends not linking against the lua library, because it - doesn't help at all. All lua-using programs will load the library, not - the modules. - TODO: The csound-lua bridge is not implemented in cmake yet. - The csound-lua bridge, on the other hand, needs to link to the library or - else it will fail to load. Use the correct library name. -Author: Felipe Sateler ---- a/frontends/CsoundAC/CMakeLists.txt -+++ b/frontends/CsoundAC/CMakeLists.txt -@@ -152,10 +152,10 @@ if(BUILD_CSOUND_AC) - PROPERTIES CPLUSPLUS ON - SWIG_MODULE_NAME luaCsoundAC) - SWIG_ADD_MODULE(luaCsoundAC lua luaCsoundAC.i) -- SWIG_LINK_LIBRARIES(luaCsoundAC libCsoundAC libcsnd6 ${CSOUNDLIB} ${FLTK_LIBRARIES} ${LIBSNDFILE_LIBRARY} ${LUAJIT_LIBRARY}) -+ SWIG_LINK_LIBRARIES(luaCsoundAC libCsoundAC libcsnd6 ${CSOUNDLIB} ${FLTK_LIBRARIES} ${LIBSNDFILE_LIBRARY}) - - if(MUSICXML_LIBRARY) -- SWIG_LINK_LIBRARIES(luaCsoundAC libCsoundAC libcsnd6 ${CSOUNDLIB} ${FLTK_LIBRARIES} ${LIBSNDFILE_LIBRARY} ${MUSICXML_LIBRARY} ${LUAJIT_LIBRARY}) -+ SWIG_LINK_LIBRARIES(luaCsoundAC libCsoundAC libcsnd6 ${CSOUNDLIB} ${FLTK_LIBRARIES} ${LIBSNDFILE_LIBRARY} ${MUSICXML_LIBRARY}) - endif() - - ---- a/interfaces/CMakeLists.txt -+++ b/interfaces/CMakeLists.txt -@@ -162,7 +162,7 @@ if(BUILD_PYTHON_INTERFACE OR BUILD_JAVA_ - endif() - - if(BUILD_LUA_INTERFACE) -- set(swiglua_LIBS ${LUAJIT_LIBRARY} ${CSOUNDLIB} libcsnd6) -+ set(swiglua_LIBS ${CSOUNDLIB} libcsnd6) - - SET_SOURCE_FILES_PROPERTIES(lua_interface.i - PROPERTIES CPLUSPLUS ON diff -Nru csound-6.05~dfsg1/debian/patches/2007-apidoc-dotpath.patch csound-6.05~dfsg1/debian/patches/2007-apidoc-dotpath.patch --- csound-6.05~dfsg1/debian/patches/2007-apidoc-dotpath.patch 2015-09-04 00:20:21.000000000 +0000 +++ csound-6.05~dfsg1/debian/patches/2007-apidoc-dotpath.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,13 +0,0 @@ -Description: Leave dotpath blank in doxygen config -Author: Felipe Sateler ---- a/doc/Doxyfile -+++ b/doc/Doxyfile -@@ -1807,7 +1807,7 @@ INTERACTIVE_SVG = NO - # The tag DOT_PATH can be used to specify the path where the dot tool can be - # found. If left blank, it is assumed the dot tool can be found in the path. - --DOT_PATH = D:\utah\opt\ATT\Graphviz\bin -+DOT_PATH = - - # The DOTFILE_DIRS tag can be used to specify one or more directories that - # contain dot files that are included in the documentation (see the diff -Nru csound-6.05~dfsg1/debian/patches/debian-specific/apidoc-dotpath.patch csound-6.05~dfsg1/debian/patches/debian-specific/apidoc-dotpath.patch --- csound-6.05~dfsg1/debian/patches/debian-specific/apidoc-dotpath.patch 1970-01-01 00:00:00.000000000 +0000 +++ csound-6.05~dfsg1/debian/patches/debian-specific/apidoc-dotpath.patch 2015-12-04 19:27:28.000000000 +0000 @@ -0,0 +1,21 @@ +From: Felipe Sateler +Date: Mon, 30 Nov 2015 10:02:13 -0300 +Subject: Leave dotpath blank in doxygen config + +--- + doc/Doxyfile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/doc/Doxyfile b/doc/Doxyfile +index 83aa6ca..bd56156 100644 +--- a/doc/Doxyfile ++++ b/doc/Doxyfile +@@ -1807,7 +1807,7 @@ INTERACTIVE_SVG = NO + # The tag DOT_PATH can be used to specify the path where the dot tool can be + # found. If left blank, it is assumed the dot tool can be found in the path. + +-DOT_PATH = D:\utah\opt\ATT\Graphviz\bin ++DOT_PATH = + + # The DOTFILE_DIRS tag can be used to specify one or more directories that + # contain dot files that are included in the documentation (see the diff -Nru csound-6.05~dfsg1/debian/patches/debian-specific/avoid-nonfree-scansyn-plugin.diff csound-6.05~dfsg1/debian/patches/debian-specific/avoid-nonfree-scansyn-plugin.diff --- csound-6.05~dfsg1/debian/patches/debian-specific/avoid-nonfree-scansyn-plugin.diff 1970-01-01 00:00:00.000000000 +0000 +++ csound-6.05~dfsg1/debian/patches/debian-specific/avoid-nonfree-scansyn-plugin.diff 2015-12-04 19:27:28.000000000 +0000 @@ -0,0 +1,27 @@ +From: Felipe Sateler +Date: Mon, 30 Nov 2015 10:02:13 -0300 +Subject: Avoid non-free scansyn plugin + +The scanned synthesis opcodes are not DFSG-free, so we delete them from +the upstream sources. They need to be removed from SConstruct as well +to prevent build failures. We don't remove them at the same time as the +opcodes themselves to keep repacking of the source minimal. +--- + Opcodes/CMakeLists.txt | 4 ---- + 1 file changed, 4 deletions(-) + +diff --git a/Opcodes/CMakeLists.txt b/Opcodes/CMakeLists.txt +index 7aea9a1..85e8b57 100644 +--- a/Opcodes/CMakeLists.txt ++++ b/Opcodes/CMakeLists.txt +@@ -101,10 +101,6 @@ if(BUILD_PLATEREV_OPCODES) + make_plugin(platerev platerev.c m) + endif() + +-set(scansyn_SRCS +- scansyn.c scansynx.c) +-make_plugin(scansyn "${scansyn_SRCS}" m) +- + if(UNIX) + make_plugin(control control.c) + endif() diff -Nru csound-6.05~dfsg1/debian/patches/debian-specific/lua-link.diff csound-6.05~dfsg1/debian/patches/debian-specific/lua-link.diff --- csound-6.05~dfsg1/debian/patches/debian-specific/lua-link.diff 1970-01-01 00:00:00.000000000 +0000 +++ csound-6.05~dfsg1/debian/patches/debian-specific/lua-link.diff 2015-12-04 19:27:28.000000000 +0000 @@ -0,0 +1,45 @@ +From: Felipe Sateler +Date: Mon, 30 Nov 2015 10:02:13 -0300 +Subject: Only link to lua when necessary, and to the correct lib + +Lua policy recommends not linking against the lua library, because it +doesn't help at all. All lua-using programs will load the library, not +the modules. +TODO: The csound-lua bridge is not implemented in cmake yet. +The csound-lua bridge, on the other hand, needs to link to the library or +else it will fail to load. Use the correct library name. +--- + frontends/CsoundAC/CMakeLists.txt | 4 ++-- + interfaces/CMakeLists.txt | 2 +- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/frontends/CsoundAC/CMakeLists.txt b/frontends/CsoundAC/CMakeLists.txt +index dbf5bfb..54bd824 100644 +--- a/frontends/CsoundAC/CMakeLists.txt ++++ b/frontends/CsoundAC/CMakeLists.txt +@@ -152,10 +152,10 @@ if(BUILD_CSOUND_AC) + PROPERTIES CPLUSPLUS ON + SWIG_MODULE_NAME luaCsoundAC) + SWIG_ADD_MODULE(luaCsoundAC lua luaCsoundAC.i) +- SWIG_LINK_LIBRARIES(luaCsoundAC libCsoundAC libcsnd6 ${CSOUNDLIB} ${FLTK_LIBRARIES} ${LIBSNDFILE_LIBRARY} ${LUAJIT_LIBRARY}) ++ SWIG_LINK_LIBRARIES(luaCsoundAC libCsoundAC libcsnd6 ${CSOUNDLIB} ${FLTK_LIBRARIES} ${LIBSNDFILE_LIBRARY}) + + if(MUSICXML_LIBRARY) +- SWIG_LINK_LIBRARIES(luaCsoundAC libCsoundAC libcsnd6 ${CSOUNDLIB} ${FLTK_LIBRARIES} ${LIBSNDFILE_LIBRARY} ${MUSICXML_LIBRARY} ${LUAJIT_LIBRARY}) ++ SWIG_LINK_LIBRARIES(luaCsoundAC libCsoundAC libcsnd6 ${CSOUNDLIB} ${FLTK_LIBRARIES} ${LIBSNDFILE_LIBRARY} ${MUSICXML_LIBRARY}) + endif() + + +diff --git a/interfaces/CMakeLists.txt b/interfaces/CMakeLists.txt +index ba813db..30896a3 100644 +--- a/interfaces/CMakeLists.txt ++++ b/interfaces/CMakeLists.txt +@@ -162,7 +162,7 @@ if(BUILD_PYTHON_INTERFACE OR BUILD_JAVA_INTERFACE OR BUILD_LUA_INTERFACE) + endif() + + if(BUILD_LUA_INTERFACE) +- set(swiglua_LIBS ${LUAJIT_LIBRARY} ${CSOUNDLIB} libcsnd6) ++ set(swiglua_LIBS ${CSOUNDLIB} libcsnd6) + + SET_SOURCE_FILES_PROPERTIES(lua_interface.i + PROPERTIES CPLUSPLUS ON diff -Nru csound-6.05~dfsg1/debian/patches/Disable-html-timestamps.patch csound-6.05~dfsg1/debian/patches/Disable-html-timestamps.patch --- csound-6.05~dfsg1/debian/patches/Disable-html-timestamps.patch 1970-01-01 00:00:00.000000000 +0000 +++ csound-6.05~dfsg1/debian/patches/Disable-html-timestamps.patch 2015-12-04 19:27:28.000000000 +0000 @@ -0,0 +1,35 @@ +From: Felipe Sateler +Date: Thu, 3 Dec 2015 20:46:35 -0300 +Subject: Disable html timestamps + +--- + doc/Doxyfile | 2 +- + doc/Doxyfile-CsoundAC | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/doc/Doxyfile b/doc/Doxyfile +index bd56156..0b32a08 100644 +--- a/doc/Doxyfile ++++ b/doc/Doxyfile +@@ -974,7 +974,7 @@ HTML_COLORSTYLE_GAMMA = 80 + # page will contain the date and time when the page was generated. Setting + # this to NO can help when comparing the output of multiple runs. + +-HTML_TIMESTAMP = YES ++HTML_TIMESTAMP = NO + + # If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML + # documentation will contain sections that can be hidden and shown after the +diff --git a/doc/Doxyfile-CsoundAC b/doc/Doxyfile-CsoundAC +index d49576c..3b409b4 100644 +--- a/doc/Doxyfile-CsoundAC ++++ b/doc/Doxyfile-CsoundAC +@@ -836,7 +836,7 @@ HTML_STYLESHEET = + # page will contain the date and time when the page was generated. Setting + # this to NO can help when comparing the output of multiple runs. + +-HTML_TIMESTAMP = YES ++HTML_TIMESTAMP = NO + + # If the HTML_ALIGN_MEMBERS tag is set to YES, the members of classes, + # files or namespaces will be aligned in HTML using tables. If set to diff -Nru csound-6.05~dfsg1/debian/patches/Do-not-pass-a-null-pointer-to-strdup.-Fixes-466.patch csound-6.05~dfsg1/debian/patches/Do-not-pass-a-null-pointer-to-strdup.-Fixes-466.patch --- csound-6.05~dfsg1/debian/patches/Do-not-pass-a-null-pointer-to-strdup.-Fixes-466.patch 1970-01-01 00:00:00.000000000 +0000 +++ csound-6.05~dfsg1/debian/patches/Do-not-pass-a-null-pointer-to-strdup.-Fixes-466.patch 2015-12-04 19:27:28.000000000 +0000 @@ -0,0 +1,23 @@ +From: Felipe Sateler +Date: Wed, 13 May 2015 21:43:09 -0300 +Subject: Do not pass a null pointer to strdup. Fixes #466 + +--- + frontends/csladspa/csladspa.cpp | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/frontends/csladspa/csladspa.cpp b/frontends/csladspa/csladspa.cpp +index f6beff6..a37212c 100644 +--- a/frontends/csladspa/csladspa.cpp ++++ b/frontends/csladspa/csladspa.cpp +@@ -427,7 +427,9 @@ unsigned int CountCSD(char **csdnames) + #ifdef MACOSX + src = strdup("/Library/Audio/Plug-Ins/LADSPA"); + #else +- src = strdup(getenv("LADSPA_PATH")); ++ src = getenv("LADSPA_PATH"); ++ if (src) ++ src = strdup(src); + #endif + + if (src) { diff -Nru csound-6.05~dfsg1/debian/patches/Introduce-CS_PACKAGE_DATE-macro.patch csound-6.05~dfsg1/debian/patches/Introduce-CS_PACKAGE_DATE-macro.patch --- csound-6.05~dfsg1/debian/patches/Introduce-CS_PACKAGE_DATE-macro.patch 1970-01-01 00:00:00.000000000 +0000 +++ csound-6.05~dfsg1/debian/patches/Introduce-CS_PACKAGE_DATE-macro.patch 2015-12-04 19:27:28.000000000 +0000 @@ -0,0 +1,104 @@ +From: Felipe Sateler +Date: Mon, 30 Nov 2015 09:40:27 -0300 +Subject: Introduce CS_PACKAGE_DATE macro + +Defaults to __DATE__ if not set. This can be overriden, in order to set +a deterministic date on it, and thus one step closer to binary +reproducibility. + +Fixes: #561 +--- + Engine/musmon.c | 8 ++++---- + Top/csound.c | 8 ++++---- + frontends/CsoundVST/CsoundVstFltk.cpp | 4 ++-- + include/version.h | 4 ++++ + 4 files changed, 14 insertions(+), 10 deletions(-) + +diff --git a/Engine/musmon.c b/Engine/musmon.c +index 9691de9..2e7b0d4 100644 +--- a/Engine/musmon.c ++++ b/Engine/musmon.c +@@ -173,18 +173,18 @@ int musmon(CSOUND *csound) + #ifdef USE_DOUBLE + #ifdef BETA + csound->Message(csound, Str("--Csound version %s beta (double samples) %s\n"), +- CS_PACKAGE_VERSION, __DATE__); ++ CS_PACKAGE_VERSION, CS_PACKAGE_DATE); + #else + csound->Message(csound, Str("--Csound version %s (double samples) %s\n"), +- CS_PACKAGE_VERSION, __DATE__); ++ CS_PACKAGE_VERSION, CS_PACKAGE_DATE); + #endif + #else + #ifdef BETA + csound->Message(csound, Str("--Csound version %s beta (float samples) %s\n"), +- CS_PACKAGE_VERSION, __DATE__); ++ CS_PACKAGE_VERSION, CS_PACKAGE_DATE); + #else + csound->Message(csound, Str("--Csound version %s (float samples) %s\n"), +- CS_PACKAGE_VERSION, __DATE__); ++ CS_PACKAGE_VERSION, CS_PACKAGE_DATE); + #endif + #endif + /* initialise search path cache */ +diff --git a/Top/csound.c b/Top/csound.c +index 20950e7..4772816 100644 +--- a/Top/csound.c ++++ b/Top/csound.c +@@ -3163,18 +3163,18 @@ PUBLIC void csoundReset(CSOUND *csound) + #ifndef USE_DOUBLE + #ifdef BETA + csound->Message(csound, Str("Csound version %s beta (float samples) %s\n"), +- CS_PACKAGE_VERSION, __DATE__); ++ CS_PACKAGE_VERSION, CS_PACKAGE_DATE); + #else + csound->Message(csound, Str("Csound version %s (float samples) %s\n"), +- CS_PACKAGE_VERSION, __DATE__); ++ CS_PACKAGE_VERSION, CS_PACKAGE_DATE); + #endif + #else + #ifdef BETA + csound->Message(csound, Str("Csound version %s beta (double samples) %s\n"), +- CS_PACKAGE_VERSION, __DATE__); ++ CS_PACKAGE_VERSION, CS_PACKAGE_DATE); + #else + csound->Message(csound, Str("Csound version %s (double samples) %s\n"), +- CS_PACKAGE_VERSION, __DATE__); ++ CS_PACKAGE_VERSION, CS_PACKAGE_DATE); + #endif + #endif + { +diff --git a/frontends/CsoundVST/CsoundVstFltk.cpp b/frontends/CsoundVST/CsoundVstFltk.cpp +index 2712c4a..1459522 100644 +--- a/frontends/CsoundVST/CsoundVstFltk.cpp ++++ b/frontends/CsoundVST/CsoundVstFltk.cpp +@@ -35,13 +35,13 @@ static std::string about = "CSOUND AND CSOUND VST\n" + "Version " + CS_PACKAGE_VERSION + " beta " +- __DATE__ ++ CS_PACKAGE_DATE + "\n" + #else + "Version " + CS_PACKAGE_VERSION + " " +- __DATE__ ++ CS_PACKAGE_DATE + "\n" + #endif + "\n" +diff --git a/include/version.h b/include/version.h +index 00ba087..3ff5d53 100644 +--- a/include/version.h ++++ b/include/version.h +@@ -49,5 +49,9 @@ + #define CS_APISUBVER 0 /* for minor changes that will still allow + compatiblity with older hosts */ + ++#ifndef CS_PACKAGE_DATE ++#define CS_PACKAGE_DATE __DATE__ ++#endif ++ + #endif /* CSOUND_VERSION_H */ + diff -Nru csound-6.05~dfsg1/debian/patches/README csound-6.05~dfsg1/debian/patches/README --- csound-6.05~dfsg1/debian/patches/README 2015-09-04 00:20:21.000000000 +0000 +++ csound-6.05~dfsg1/debian/patches/README 1970-01-01 00:00:00.000000000 +0000 @@ -1,3 +0,0 @@ -0xxx: Grabbed from upstream development. -1xxx: Possibly relevant for upstream adoption. -2xxx: Only relevant for official Debian release. diff -Nru csound-6.05~dfsg1/debian/patches/series csound-6.05~dfsg1/debian/patches/series --- csound-6.05~dfsg1/debian/patches/series 2015-09-04 00:20:21.000000000 +0000 +++ csound-6.05~dfsg1/debian/patches/series 2015-12-04 19:27:28.000000000 +0000 @@ -1,4 +1,6 @@ -0001-Do-not-pass-a-null-pointer-to-strdup.-Fixes-466.patch -2000-avoid-nonfree-scansyn-plugin.diff -2001-lua-link.diff -2007-apidoc-dotpath.patch +Do-not-pass-a-null-pointer-to-strdup.-Fixes-466.patch +Introduce-CS_PACKAGE_DATE-macro.patch +debian-specific/avoid-nonfree-scansyn-plugin.diff +debian-specific/lua-link.diff +debian-specific/apidoc-dotpath.patch +Disable-html-timestamps.patch diff -Nru csound-6.05~dfsg1/debian/rules csound-6.05~dfsg1/debian/rules --- csound-6.05~dfsg1/debian/rules 2015-09-04 00:20:21.000000000 +0000 +++ csound-6.05~dfsg1/debian/rules 2015-12-04 19:27:28.000000000 +0000 @@ -147,13 +147,9 @@ MTUNE = ON endif -# Python >= 2.6 should install to dist-packages instead of site-packages -# Since 2.5 is the only version < 2.6 we support, we test for that. -# TODO: Use simpler second form when 2.6 is default in a stable release -PYLIBPATH = usr/lib/$(cdbs_python_current_binary)/$(if $(call cdbs_streq,$(cdbs_python_current_version),2.5),site-packages,dist-packages) -#PYLIBPATH = usr/lib/$(cdbs_python_current_binary)/dist-packages +PYLIBPATH = usr/lib/$(cdbs_python_current_binary)/dist-packages # Path with PREFIX removed -PYLIBPATH2 = lib/$(cdbs_python_current_binary)/$(if $(call cdbs_streq,$(cdbs_python_current_version),2.5),site-packages,dist-packages) +PYLIBPATH2 = lib/$(cdbs_python_current_binary)/dist-packages CC = $(DEB_HOST_GNU_TYPE)-gcc CXX = $(DEB_HOST_GNU_TYPE)-g++ @@ -163,9 +159,7 @@ DEB_DH_INSTALL_SOURCEDIR = debian/tmp -DEB_SCONS_INSTALL_OPTIONS = instdir=$(CURDIR)/debian/tmp -DEB_SCONS_INSTALL_TARGET = install=1 - +PACKAGE_DATE = $(shell env --ignore-environment TZ=UTC LANG=C date -d"`dpkg-parsechangelog -SDate`" +%F) build/libcsound64-doc:: build-doxygen-stamp build-doxygen-stamp: @@ -177,6 +171,7 @@ pre-build:: Custom.cmake Custom.cmake: debian/Custom.cmake sed -e 's,@PYLIBPATH@,$(PYLIBPATH2),' -e 's,@MTUNE@,$(MTUNE),' \ + -e 's,@DATE@,$(PACKAGE_DATE),' \ debian/Custom.cmake > \ Custom.cmake @@ -298,7 +293,7 @@ libpng-dev, \ dssi-dev, \ libstk0-dev, \ - libgmm++-dev, \ + libgmm++-dev (>= 4.2.1~beta1~svn4635~dfsg-4), \ bison (>= 2.6), \ flex, \ libportsmf-dev, \