diff -Nru pd-nusmuk-20151113+repack/debian/changelog pd-nusmuk-20151113+repack/debian/changelog --- pd-nusmuk-20151113+repack/debian/changelog 2017-01-06 21:50:51.000000000 +0000 +++ pd-nusmuk-20151113+repack/debian/changelog 2018-02-01 22:25:25.000000000 +0000 @@ -1,3 +1,20 @@ +pd-nusmuk (20151113+repack-4) unstable; urgency=medium + + * Switched buildsystem from dh to cdbs + * Bumped dh compat to 11 + * Enabled hardening + * Dropped unneeded B-Ds + * Updated Vcs-* stanzas to salsa.d.o + * Updated maintainer address + * Removed trailing whitespace in debian/* + * Removed obsolete git-tuneclone.sh script + * Updated d/README.source + * Switched URLs to https:/ + * Updated d/copyright_hints + * Bumped standards version to 4.1.3 + + -- IOhannes m zmölnig (Debian/GNU) Thu, 01 Feb 2018 23:25:25 +0100 + pd-nusmuk (20151113+repack-3) unstable; urgency=medium * Enabled hardening diff -Nru pd-nusmuk-20151113+repack/debian/compat pd-nusmuk-20151113+repack/debian/compat --- pd-nusmuk-20151113+repack/debian/compat 2017-01-06 21:50:51.000000000 +0000 +++ pd-nusmuk-20151113+repack/debian/compat 2018-02-01 22:25:25.000000000 +0000 @@ -1 +1 @@ -9 +11 diff -Nru pd-nusmuk-20151113+repack/debian/control pd-nusmuk-20151113+repack/debian/control --- pd-nusmuk-20151113+repack/debian/control 2017-01-06 21:50:51.000000000 +0000 +++ pd-nusmuk-20151113+repack/debian/control 2018-02-01 22:25:25.000000000 +0000 @@ -1,19 +1,17 @@ Source: pd-nusmuk Section: sound Priority: optional -Maintainer: Debian Multimedia Maintainers +Maintainer: Debian Multimedia Maintainers Uploaders: IOhannes m zmölnig (Debian/GNU) , Build-Depends: puredata-dev | puredata, - cdbs (>= 0.4.91~), - debhelper, + debhelper (>=11~), dh-buildinfo, - licensecheck, -Standards-Version: 3.9.8 -Homepage: http://www.chnry.net/ch/?011-Software -Vcs-Git: https://anonscm.debian.org/git/pkg-multimedia/pd-nusmuk.git -Vcs-Browser: https://anonscm.debian.org/git/pkg-multimedia/pd-nusmuk.git +Standards-Version: 4.1.3 +Homepage: https://www.chnry.net/ch/?011-Software +Vcs-Git: https://salsa.debian.org/multimedia-team/pd/pd-nusmuk.git +Vcs-Browser: https://salsa.debian.org/multimedia-team/pd/pd-nusmuk Package: pd-nusmuk Architecture: any diff -Nru pd-nusmuk-20151113+repack/debian/control.in pd-nusmuk-20151113+repack/debian/control.in --- pd-nusmuk-20151113+repack/debian/control.in 2017-01-06 21:50:51.000000000 +0000 +++ pd-nusmuk-20151113+repack/debian/control.in 1970-01-01 00:00:00.000000000 +0000 @@ -1,27 +0,0 @@ -Source: pd-nusmuk -Section: sound -Priority: optional -Maintainer: Debian Multimedia Maintainers -Uploaders: - IOhannes m zmölnig (Debian/GNU) , -Build-Depends: - puredata-dev | puredata, - @cdbs@, -Standards-Version: 3.9.8 -Homepage: http://www.chnry.net/ch/?011-Software -Vcs-Git: https://anonscm.debian.org/git/pkg-multimedia/pd-nusmuk.git -Vcs-Browser: https://anonscm.debian.org/git/pkg-multimedia/pd-nusmuk.git - -Package: pd-nusmuk -Architecture: any -Depends: - puredata | pd, - ${shlibs:Depends}, - ${misc:Depends}, -Provides: pd-nusmuk-audio, pd-nusmuk-utils -Description: random collection of useful Pd objects - The nusmuk library contains object targeted at high-quality audio synthesis - like band-limited synthesizers, audio filters and effects and interpolating - table lookups. - It also includes a number of general purpose utilities, ranging from simple - shorthand abstractions to higher mathematics (random generators). diff -Nru pd-nusmuk-20151113+repack/debian/copyright pd-nusmuk-20151113+repack/debian/copyright --- pd-nusmuk-20151113+repack/debian/copyright 2017-01-06 21:50:51.000000000 +0000 +++ pd-nusmuk-20151113+repack/debian/copyright 2018-02-01 22:25:25.000000000 +0000 @@ -1,6 +1,6 @@ Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: pd-nusmuk -Source: http://www.chnry.net/ch/?011-Software +Source: https://www.chnry.net/ch/?011-Software Files: * Copyright: 2008-2015, Cyrille Henry @@ -57,7 +57,7 @@ GNU General Public License for more details. Comment: You should have received a copy of the GNU General Public License - along with this program. If not, see . + along with this program. If not, see . . On Debian systems, the complete text of the GNU General Public License (GPL) version 3 can be found in "/usr/share/common-licenses/GPL-3". @@ -73,12 +73,12 @@ . 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. - 2. Redistributions in binary form must reproduce the above - copyright notice, this list of conditions and the following + 2. Redistributions in binary form must reproduce the above + copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. 3. The name of the author may not be used to endorse or promote - products derived from this software without specific prior + products derived from this software without specific prior written permission. . THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY @@ -87,7 +87,7 @@ PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED - TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING diff -Nru pd-nusmuk-20151113+repack/debian/copyright_hints pd-nusmuk-20151113+repack/debian/copyright_hints --- pd-nusmuk-20151113+repack/debian/copyright_hints 2017-01-06 21:50:51.000000000 +0000 +++ pd-nusmuk-20151113+repack/debian/copyright_hints 2018-02-01 22:25:25.000000000 +0000 @@ -1,181 +1,160 @@ -Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: FIXME Upstream-Contact: FIXME Source: FIXME -Disclaimer: Autogenerated by CDBS +Disclaimer: Autogenerated by licensecheck -Files: audio/ADSR-help.pd - audio/ADSR.pd - audio/Makefile - audio/README.txt - audio/_sinh.pd - audio/bq_coef_bp-help.pd - audio/bq_coef_bp.pd - audio/bq_coef_highshelf-help.pd - audio/bq_coef_highshelf.pd - audio/bq_coef_hip-help.pd - audio/bq_coef_hip.pd - audio/bq_coef_lop-help.pd - audio/bq_coef_lop.pd - audio/bq_coef_lowshelf-help.pd - audio/bq_coef_lowshelf.pd - audio/bq_coef_notch-help.pd - audio/bq_coef_notch.pd - audio/bq_coef_peak-help.pd - audio/bq_coef_peak.pd - audio/bq_list~-help.pd - audio/bq_list~.pd - audio/bq~-help.pd - audio/compress_limit_sidechain~-help.pd - audio/compress_limit_sidechain~.pd - audio/compress_limit~-help.pd - audio/compress_limit~.pd - audio/distortion2~-help.pd - audio/distortion2~.pd - audio/distortion~-help.pd - audio/distortion~.pd - audio/echo~-help.pd - audio/echo~.pd - audio/examples/analog_synth_emulation.pd - audio/granulator~-help.pd - audio/granulator~.pd - audio/nusmuk-audio-meta.pd - audio/oscillo~-help.pd - audio/oscillo~.pd - audio/pwm~-help.pd - audio/pwm~.pd - audio/saw2_table_generation.pd - audio/saw2~-help.pd - audio/saw2~.pd - audio/saw~-help.pd - audio/saw~.pd - audio/spatialisation~-help.pd - audio/spatialisation~.pd - audio/tabosc4c~-help.pd - audio/tabosci~-help.pd - audio/tabread4c~-help.pd - audio/triangle_table_generation.pd - audio/triangle~-help.pd - audio/triangle~.pd - debian/README.source - debian/compat - debian/control - debian/control.in - debian/gbp.conf - debian/git-tuneclone.sh - debian/links - debian/patches/fix-typos.patch - debian/patches/series - debian/source/format - debian/source/local-options - debian/watch - utils/Makefile - utils/README.txt - utils/_mtx_preset-help.pd - utils/_mtx_preset.pd - utils/between-help.pd - utils/between.pd - utils/common.h - utils/examples/bushmeat.pbank - utils/filtered_random-help.pd - utils/filtered_random.pd - utils/fmod-help.pd - utils/fmod.pd - utils/img2cnv.pd - utils/lb-help.pd - utils/lb.pd - utils/lfo-help.pd - utils/lfo.pd - utils/line3-help.pd - utils/many_bang-help.pd - utils/many_bang.pd - utils/mtx_preset-help.pd - utils/nusmuk-utils-meta.pd - utils/once-help.pd - utils/once.pd - utils/p-help.pd - utils/p.pd - utils/pbank-help.pd - utils/pbank.h - utils/pps-help.pd - utils/pps.pd - utils/preset_param.pd - utils/rand_diff-help.pd - utils/rand_diff.pd - utils/randn-help.pd - utils/randn.pd - utils/rnd_flow-help.pd - utils/rnd_flow.pd - utils/rnd_metro-help.pd - utils/rnd_metro.pd - utils/tab_derivate.c - utils/tab_downsample-help.pd - utils/tab_downsample.c - utils/tab_downsample_average-help.pd - utils/tab_downsample_average.c - utils/tab_downsample_max-help.pd - utils/tab_downsample_max.c - utils/tab_downsample_min-help.pd - utils/tab_downsample_min.c - utils/tab_integrate.c - utils/tab_max.c - utils/tab_min.c - utils/tab_upsample-help.pd - utils/tab_upsample.c - utils/tab_upsample_copy-help.pd - utils/tab_upsample_copy.c - utils/test.txt +Files: ./audio/ADSR-help.pd + ./audio/ADSR.pd + ./audio/Makefile + ./audio/README.txt + ./audio/_sinh.pd + ./audio/bq_coef_bp-help.pd + ./audio/bq_coef_bp.pd + ./audio/bq_coef_highshelf-help.pd + ./audio/bq_coef_highshelf.pd + ./audio/bq_coef_hip-help.pd + ./audio/bq_coef_hip.pd + ./audio/bq_coef_lop-help.pd + ./audio/bq_coef_lop.pd + ./audio/bq_coef_lowshelf-help.pd + ./audio/bq_coef_lowshelf.pd + ./audio/bq_coef_notch-help.pd + ./audio/bq_coef_notch.pd + ./audio/bq_coef_peak-help.pd + ./audio/bq_coef_peak.pd + ./audio/bq_list~-help.pd + ./audio/bq_list~.pd + ./audio/bq~-help.pd + ./audio/compress_limit_sidechain~-help.pd + ./audio/compress_limit_sidechain~.pd + ./audio/compress_limit~-help.pd + ./audio/compress_limit~.pd + ./audio/distortion2~-help.pd + ./audio/distortion2~.pd + ./audio/distortion~-help.pd + ./audio/distortion~.pd + ./audio/echo~-help.pd + ./audio/echo~.pd + ./audio/examples/analog_synth_emulation.pd + ./audio/granulator~-help.pd + ./audio/granulator~.pd + ./audio/nusmuk-audio-meta.pd + ./audio/oscillo~-help.pd + ./audio/oscillo~.pd + ./audio/pwm~-help.pd + ./audio/pwm~.pd + ./audio/saw2_table_generation.pd + ./audio/saw2~-help.pd + ./audio/saw2~.pd + ./audio/saw~-help.pd + ./audio/saw~.pd + ./audio/spatialisation~-help.pd + ./audio/spatialisation~.pd + ./audio/tabosc4c~-help.pd + ./audio/tabosci~-help.pd + ./audio/tabread4c~-help.pd + ./audio/triangle_table_generation.pd + ./audio/triangle~-help.pd + ./audio/triangle~.pd + ./utils/Makefile + ./utils/README.txt + ./utils/_mtx_preset-help.pd + ./utils/_mtx_preset.pd + ./utils/between-help.pd + ./utils/between.pd + ./utils/common.h + ./utils/examples/bushmeat.pbank + ./utils/filtered_random-help.pd + ./utils/filtered_random.pd + ./utils/fmod-help.pd + ./utils/fmod.pd + ./utils/img2cnv.pd + ./utils/lb-help.pd + ./utils/lb.pd + ./utils/lfo-help.pd + ./utils/lfo.pd + ./utils/line3-help.pd + ./utils/many_bang-help.pd + ./utils/many_bang.pd + ./utils/mtx_preset-help.pd + ./utils/nusmuk-utils-meta.pd + ./utils/once-help.pd + ./utils/once.pd + ./utils/p-help.pd + ./utils/p.pd + ./utils/pbank-help.pd + ./utils/pbank.h + ./utils/pps-help.pd + ./utils/pps.pd + ./utils/preset_param.pd + ./utils/rand_diff-help.pd + ./utils/rand_diff.pd + ./utils/randn-help.pd + ./utils/randn.pd + ./utils/rnd_flow-help.pd + ./utils/rnd_flow.pd + ./utils/rnd_metro-help.pd + ./utils/rnd_metro.pd + ./utils/tab_derivate.c + ./utils/tab_downsample-help.pd + ./utils/tab_downsample.c + ./utils/tab_downsample_average-help.pd + ./utils/tab_downsample_average.c + ./utils/tab_downsample_max-help.pd + ./utils/tab_downsample_max.c + ./utils/tab_downsample_min-help.pd + ./utils/tab_downsample_min.c + ./utils/tab_integrate.c + ./utils/tab_max-help.pd + ./utils/tab_max.c + ./utils/tab_min-help.pd + ./utils/tab_min.c + ./utils/tab_upsample-help.pd + ./utils/tab_upsample.c + ./utils/tab_upsample_copy-help.pd + ./utils/tab_upsample_copy.c + ./utils/test.txt Copyright: NONE License: UNKNOWN FIXME -Files: utils/tab_derivate-help.pd - utils/tab_integrate-help.pd - utils/tab_max-help.pd - utils/tab_min-help.pd -Copyright: Thomas Musil 2000 - 2009; -License: UNKNOWN - FIXME - -Files: audio/tabosc4c~.c - audio/tabosci~.c - audio/tabread4c~.c +Files: ./audio/tabosc4c~.c + ./audio/tabosci~.c + ./audio/tabread4c~.c Copyright: ed by Miller Puckette and others. The following License: BSD-3-clause FIXME -Files: audio/LICENSE.txt - utils/LICENSE.txt +Files: ./audio/LICENSE.txt + ./utils/LICENSE.txt Copyright: 1989, 1991, Free Software Foundation, Inc. - ed by the Free - ed interfaces, the original - the software, and License: UNKNOWN FIXME -Files: utils/line3.c +Files: ./utils/tab_derivate-help.pd + ./utils/tab_integrate-help.pd +Copyright: Thomas Musil 2000 - 2009; +License: UNKNOWN + FIXME + +Files: ./utils/line3.c Copyright: comes from pure data) ed by Miller Puckette and others. The following License: BSD-3-clause FIXME -Files: utils/mtx_preset.c +Files: ./utils/mtx_preset.c Copyright: 2014, Cyrile Henry License: GPL-3+ FIXME -Files: utils/pbank.c -Copyright: (t_atom *)1:NIL; +Files: ./utils/pbank.c +Copyright: NONE License: LGPL-2+ FIXME -Files: debian/rules -Copyright: -check = - 2015, IOhannes m zmölnig -License: UNKNOWN - FIXME - -Files: audio/bq~.c +Files: ./audio/bq~.c Copyright: 1997-1999, Miller Puckette. License: UNKNOWN FIXME diff -Nru pd-nusmuk-20151113+repack/debian/git-tuneclone.sh pd-nusmuk-20151113+repack/debian/git-tuneclone.sh --- pd-nusmuk-20151113+repack/debian/git-tuneclone.sh 2017-01-06 21:50:51.000000000 +0000 +++ pd-nusmuk-20151113+repack/debian/git-tuneclone.sh 1970-01-01 00:00:00.000000000 +0000 @@ -1,35 +0,0 @@ -#!/bin/sh - -## script to initialize a cloned repository -## with per (local) repository settings. - -# - ignore quilt's .pc/ directory -# - enable the "--follow-tags" mode for pushing - -error() { - echo "$@" 1>&2 -} - -NAME=$(dpkg-parsechangelog -S Source) - -if [ "x${NAME}" = "x" ]; then - error "unable to determine package name" - error "make sure you run this script within a source package dir" - exit 1 -fi - -if [ ! -d ".git" ]; then - error "it seems like this source package is not under git control" - exit 1 -fi - -echo "tuning git-repository for ${NAME}" -git config push.followTags true && echo "enabled push.followTags" - -GITEXCLUDE=".git/info/exclude" -egrep "^/?\.pc/?$" "${GITEXCLUDE}" >/dev/null 2>&1 \ - || (echo "/.pc/" >> "${GITEXCLUDE}" && echo "ignoring /.pc/") - -for branch in pristine-tar upstream master; do - git checkout "${branch}" -done diff -Nru pd-nusmuk-20151113+repack/debian/README.source pd-nusmuk-20151113+repack/debian/README.source --- pd-nusmuk-20151113+repack/debian/README.source 2017-01-06 21:50:51.000000000 +0000 +++ pd-nusmuk-20151113+repack/debian/README.source 2018-02-01 22:25:25.000000000 +0000 @@ -7,25 +7,7 @@ For the Debian, they have been merged into a single source package. Since as of now pristine-tar and git-buildpackage cannot handle some "3.0 -(quilt) Source" packages (cf. #561071), the upstream zipfiles are currently -being repacked into a single tarball. +(quilt) Source" packages with multiple upstream tarballs (cf. #561071), +the upstream zipfiles are currently being repacked into a single tarball. -- IOhannes m zmölnig (Debian/GNU) Tue, 17 Nov 2015 22:49:48 +0100 - - -git-tuneclone.sh ----------------- - -This package comes with a script 'debian/git-tuneclone.sh'. -Running it after a fresh clone of the packaging repository -will fine-tune your local copy, namely: -- make git ignore any .pc/ directory (created by quilt) -- enable the "-follow-tags" when running 'git-push', so it's harder - to forget to push packaging tags along with the branches. -- do an initial checkout of the 3 packaging branches (master, pristine-tar, - upstream) -The script only needs to run once (though running it multiple times shouldn't -matter). -You are of course free to *not* run the script, if you prefer. - - -- IOhannes m zmölnig (Debian/GNU) Tue, 11 Nov 2015 11:11:03 +0100 diff -Nru pd-nusmuk-20151113+repack/debian/rules pd-nusmuk-20151113+repack/debian/rules --- pd-nusmuk-20151113+repack/debian/rules 2017-01-06 21:50:51.000000000 +0000 +++ pd-nusmuk-20151113+repack/debian/rules 2018-02-01 22:25:25.000000000 +0000 @@ -1,29 +1,50 @@ #!/usr/bin/make -f -# -*- mode: makefile; coding: utf-8 -*- -# Copyright © 2015 IOhannes m zmölnig -# Description: Main Debian packaging script for mrpeach - -include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/makefile-vars.mk -include /usr/share/cdbs/1/class/pd.mk -include /usr/share/cdbs/1/rules/utils.mk +# Copyright © 2010 Hans-Christoph Steiner +# Copyright © 2018 IOhannes m zmölnig -CDBS_BUILD_DEPENDS_rules_utils_buildinfo = - -#CDBS_BUILD_DEPENDS_rules_utils_copyright-check = +#enable hardening +export DEB_BUILD_MAINT_OPTIONS=hardening=+all DEB_COPYRIGHT_CHECK_IGNORE_REGEX = \ - ^(audio/i?sinc.wav|audio/examples/hanning.wav|debian/(changelog|copyright(|_hints|_newhints)))$ + ^\./\.git/.*|\./debian/|\./audio/.*\.wav$ + +pkglibdir = /usr/lib/pd/extra + +CFLAGS += -fPIC +LDFLAGS += -Wl,-as-needed -fPIC -CPPCFLAGS=$(CFLAGS) -fPIC $(CPPFLAGS) -pkglibdir=/usr/lib/pd/extra +%: + dh $@ -Smakefile -build/pd-nusmuk:: - make -Caudio CFLAGS="$(CPPCFLAGS)" LDFLAGS="$(LDFLAGS)" - make -Cutils CFLAGS="$(CPPCFLAGS)" LDFLAGS="$(LDFLAGS) -Wl,--export-dynamic -shared -fPIC" -clean:: +override_dh_auto_build: + make -Caudio \ + CFLAGS="$(CPPCFLAGS) $(CFLAGS)" \ + LDFLAGS="$(LDFLAGS)" + make -Cutils \ + CFLAGS="$(CPPCFLAGS) $(CFLAGS)" \ + LDFLAGS="$(LDFLAGS) -Wl,--export-dynamic -shared" + +override_dh_auto_install: + dh_auto_install -Daudio -- \ + prefix=/usr pkglibdir=$(pkglibdir) \ + STRIP="true" \ + $(empty) + dh_auto_install -Dutils -- \ + prefix=/usr pkglibdir=$(pkglibdir) \ + STRIP="true" \ + $(empty) +# fix permissions + find $(CURDIR)/debian/*/$(pkglibdir) -name "*.pd_linux" -exec \ + chmod 0664 {} + +# remove license file so we can replace it with link to the Debian license file + rm -f -- $(CURDIR)/debian/*/$(pkglibdir)/*/LICENSE.txt + +override_dh_clean: + dh_clean make clean -Caudio make clean -Cutils -binary-install/pd-nusmuk:: - make -Caudio install DESTDIR=$(DEB_DESTDIR) pkglibdir=$(pkglibdir) - make -Cutils install DESTDIR=$(DEB_DESTDIR) pkglibdir=$(pkglibdir) - find "$(CURDIR)/debian/pd-nusmuk" -name LICENSE.txt -delete + +licensecheck: + licensecheck -i "$(DEB_COPYRIGHT_CHECK_IGNORE_REGEX)" --deb-machine -r . \ + > debian/copyright_newhints + cmp debian/copyright_hints debian/copyright_newhints \ + && rm debian/copyright_newhints