Your message dated Tue, 10 Jan 2017 04:25:15 +0000 with message-id <[email protected]> and subject line Bug#850715: Removed package(s) from unstable has caused the Debian Bug report #664329, regarding [PATCH] distmp3: Helping to update to packaging format 3.0 to be marked as done.
This means that you claim that the problem has been dealt with. If this is not the case it is now your responsibility to reopen the Bug report if necessary, and/or fix the problem forthwith. (NB: If you are a system administrator and have no idea what this message is talking about, this may indicate a serious mail system misconfiguration somewhere. Please contact [email protected] immediately.) -- 664329: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=664329 Debian Bug Tracking System Contact [email protected] with problems
--- Begin Message ---Package: distmp3 Severity: wishlist Tags: patch Hi, The dpatch patch management system has been deprecated for some time. The Lintian currently flags use of dpatch packages as an error. The new 3.0 packaging format is an improved version which, among other things, contains patch management built-in. For more information, see: http://wiki.debian.org/Projects/DebSrc3.0 I had some free time; see attached patch to migrate to new package format. Note that all files in debian/patches/* are canocalized to *.patch. Let me know if there is anything that needs adjusting or if it is ok to upload this version in a NMU in case you are working on other issues needing attention. Thanks, Jari>From 3fdf7ec57cdeb30baa2a7fece35af7743149a769 Mon Sep 17 00:00:00 2001 From: Jari Aalto <[email protected]> Date: Mon, 27 Feb 2012 14:33:29 -0500 Subject: [PATCH] format-3.0 Organization: Private Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit Signed-off-by: Jari Aalto <[email protected]> --- debian/changelog | 8 ++++ debian/compat | 2 +- debian/control | 4 +- debian/patches/00list | 6 --- debian/patches/01_config_file.dpatch | 42 ------------------- debian/patches/01_config_file.patch | 25 +++++++++++ ..._handling.dpatch => 02_tempfile_handling.patch} | 21 +-------- ...3_fork+pidfile.dpatch => 03_fork+pidfile.patch} | 21 +-------- debian/patches/04_encoder_flac.dpatch | 31 -------------- debian/patches/04_encoder_flac.patch | 14 ++++++ ...coder_oggenc.dpatch => 04_encoder_oggenc.patch} | 21 +-------- debian/patches/05_funky_redirection.dpatch | 44 -------------------- debian/patches/05_funky_redirection.patch | 14 ++++++ ...system_call.dpatch => 06_fix_system_call.patch} | 22 +--------- debian/patches/series | 6 +++ debian/rules | 5 +- debian/source/format | 1 + 17 files changed, 81 insertions(+), 206 deletions(-) delete mode 100644 debian/patches/00list delete mode 100644 debian/patches/01_config_file.dpatch create mode 100644 debian/patches/01_config_file.patch rename debian/patches/{02_tempfile_handling.dpatch => 02_tempfile_handling.patch} (72%) rename debian/patches/{03_fork+pidfile.dpatch => 03_fork+pidfile.patch} (68%) delete mode 100644 debian/patches/04_encoder_flac.dpatch create mode 100644 debian/patches/04_encoder_flac.patch rename debian/patches/{04_encoder_oggenc.dpatch => 04_encoder_oggenc.patch} (51%) delete mode 100644 debian/patches/05_funky_redirection.dpatch create mode 100644 debian/patches/05_funky_redirection.patch rename debian/patches/{06_fix_system_call.dpatch => 06_fix_system_call.patch} (51%) create mode 100644 debian/patches/series create mode 100644 debian/source/format diff --git a/debian/changelog b/debian/changelog index 41f84a8..498585f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +distmp3 (0.1.9.ds1-4.4) unstable; urgency=low + + * Non-maintainer upload. + * Remove deprecated dpatch and upgrade to packaging format "3.0 quilt". + * Update to Standards-Version to 3.9.3 and debhelper to 9. + + -- Jari Aalto <[email protected]> Mon, 27 Feb 2012 14:32:17 -0500 + distmp3 (0.1.9.ds1-4.3) unstable; urgency=low * Non-maintainer upload to solve release goal. diff --git a/debian/compat b/debian/compat index b8626c4..ec63514 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -4 +9 diff --git a/debian/control b/debian/control index 7aa5979..40df516 100644 --- a/debian/control +++ b/debian/control @@ -3,8 +3,8 @@ Section: sound Priority: optional Maintainer: Jesus Climent <[email protected]> Build-Depends-Indep: po-debconf -Build-Depends: debhelper (>> 4.0.0), dpatch -Standards-Version: 3.6.1.0 +Build-Depends: debhelper (>= 9) +Standards-Version: 3.9.3 Package: distmp3 Architecture: all diff --git a/debian/patches/00list b/debian/patches/00list deleted file mode 100644 index c90a689..0000000 --- a/debian/patches/00list +++ /dev/null @@ -1,6 +0,0 @@ -01_config_file -02_tempfile_handling -03_fork+pidfile -04_encoder_oggenc -05_funky_redirection -06_fix_system_call diff --git a/debian/patches/01_config_file.dpatch b/debian/patches/01_config_file.dpatch deleted file mode 100644 index e856113..0000000 --- a/debian/patches/01_config_file.dpatch +++ /dev/null @@ -1,42 +0,0 @@ -#! /bin/sh -e -## 01_config_file.dpatch by Joshua Kwan <[email protected]> -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: Use /etc/distmp3.conf. - -if [ $# -ne 1 ]; then - echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" - exit 1 -fi -case "$1" in - -patch) patch -f --no-backup-if-mismatch -p1 < $0;; - -unpatch) patch -f --no-backup-if-mismatch -R -p1 < $0;; - *) - echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" - exit 1;; -esac - -exit 0 - ---- distmp3-0.1.9.orig/distmp3 -+++ distmp3-0.1.9/distmp3 -@@ -30,7 +30,7 @@ - #---------------------------- - $version = "0.1.9"; - --$config_file = "/etc/distmp3/distmp3.conf"; -+$config_file = "/etc/distmp3.conf"; - - $RTR = "hejhopp_rtr"; - $RTS = "hejhopp_rts"; ---- distmp3-0.1.9.orig/distmp3host -+++ distmp3-0.1.9/distmp3host -@@ -30,7 +30,7 @@ - #---------------------------- - $version = "0.1.9"; - --$config_file = "/etc/distmp3/distmp3.conf"; -+$config_file = "/etc/distmp3.conf"; - - $RTR = "hejhopp_rtr"; - $RTS = "hejhopp_rts"; diff --git a/debian/patches/01_config_file.patch b/debian/patches/01_config_file.patch new file mode 100644 index 0000000..51d4679 --- /dev/null +++ b/debian/patches/01_config_file.patch @@ -0,0 +1,25 @@ +From: Joshua Kwan <[email protected]> +Subject: Use /etc/distmp3.conf. + +--- distmp3-0.1.9.orig/distmp3 ++++ distmp3-0.1.9/distmp3 +@@ -30,7 +30,7 @@ + #---------------------------- + $version = "0.1.9"; + +-$config_file = "/etc/distmp3/distmp3.conf"; ++$config_file = "/etc/distmp3.conf"; + + $RTR = "hejhopp_rtr"; + $RTS = "hejhopp_rts"; +--- distmp3-0.1.9.orig/distmp3host ++++ distmp3-0.1.9/distmp3host +@@ -30,7 +30,7 @@ + #---------------------------- + $version = "0.1.9"; + +-$config_file = "/etc/distmp3/distmp3.conf"; ++$config_file = "/etc/distmp3.conf"; + + $RTR = "hejhopp_rtr"; + $RTS = "hejhopp_rts"; diff --git a/debian/patches/02_tempfile_handling.dpatch b/debian/patches/02_tempfile_handling.patch similarity index 72% rename from debian/patches/02_tempfile_handling.dpatch rename to debian/patches/02_tempfile_handling.patch index 6ac4c83..b26eb1a 100644 --- a/debian/patches/02_tempfile_handling.dpatch +++ b/debian/patches/02_tempfile_handling.patch @@ -1,22 +1,5 @@ -#! /bin/sh -e -## 02_tempfile_handling.dpatch by Joshua Kwan <[email protected]> -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: More secure method of dealing with temporary files. - -if [ $# -ne 1 ]; then - echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" - exit 1 -fi -case "$1" in - -patch) patch -f --no-backup-if-mismatch -p1 < $0;; - -unpatch) patch -f --no-backup-if-mismatch -R -p1 < $0;; - *) - echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" - exit 1;; -esac - -exit 0 +From: Joshua Kwan <[email protected]> +Subject: More secure method of dealing with temporary files. --- distmp3-0.1.9.orig/distmp3.conf +++ distmp3-0.1.9/distmp3.conf diff --git a/debian/patches/03_fork+pidfile.dpatch b/debian/patches/03_fork+pidfile.patch similarity index 68% rename from debian/patches/03_fork+pidfile.dpatch rename to debian/patches/03_fork+pidfile.patch index 19d1901..5bc08af 100644 --- a/debian/patches/03_fork+pidfile.dpatch +++ b/debian/patches/03_fork+pidfile.patch @@ -1,22 +1,5 @@ -#! /bin/sh -e -## 03_fork+pidfile.dpatch by Joshua Kwan <[email protected]> -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: Fork and leave a pidfile. - -if [ $# -ne 1 ]; then - echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" - exit 1 -fi -case "$1" in - -patch) patch -f --no-backup-if-mismatch -p1 < $0;; - -unpatch) patch -f --no-backup-if-mismatch -R -p1 < $0;; - *) - echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" - exit 1;; -esac - -exit 0 +From: Joshua Kwan <[email protected]> +Subject: Fork and leave a pidfile. --- a/distmp3host~ 2003-09-29 20:16:16.000000000 -0700 +++ b/distmp3host 2003-09-29 20:29:27.000000000 -0700 diff --git a/debian/patches/04_encoder_flac.dpatch b/debian/patches/04_encoder_flac.dpatch deleted file mode 100644 index aa21e09..0000000 --- a/debian/patches/04_encoder_flac.dpatch +++ /dev/null @@ -1,31 +0,0 @@ -#! /bin/sh -e -## 04_encoder_flac.dpatch by Joshua Kwan <[email protected]> -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: Use FLAC's flac as the default encoder. (NOT DEFAULT) - -if [ $# -ne 1 ]; then - echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" - exit 1 -fi -case "$1" in - -patch) patch -f --no-backup-if-mismatch -p1 < $0;; - -unpatch) patch -f --no-backup-if-mismatch -R -p1 < $0;; - *) - echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" - exit 1;; -esac - -exit 0 - ---- a/distmp3.conf~ 2003-09-30 19:56:12.000000000 -0700 -+++ b/distmp3.conf 2003-09-30 19:56:27.000000000 -0700 -@@ -36,7 +36,7 @@ - # the program that should be executed then a connection is made. - # $wavfifo will be replaced with the path and name of the WAVFIFO - # $mp3fifo will be replaced with the path and name of the MP3FIFO --SERVER_PROGRAM=/usr/local/bin/bladeenc -br 192 $wavfifo $mp3fifo -+SERVER_PROGRAM=/usr/bin/flac $wavfifo -o $mp3fifo - - # the "chunk"-size that the data will be sent in. - SERVER_DATASIZE=16384 diff --git a/debian/patches/04_encoder_flac.patch b/debian/patches/04_encoder_flac.patch new file mode 100644 index 0000000..2cd0fb0 --- /dev/null +++ b/debian/patches/04_encoder_flac.patch @@ -0,0 +1,14 @@ +From: Joshua Kwan <[email protected]> +Subject: Use FLAC's flac as the default encoder. (NOT DEFAULT) + +--- a/distmp3.conf~ 2003-09-30 19:56:12.000000000 -0700 ++++ b/distmp3.conf 2003-09-30 19:56:27.000000000 -0700 +@@ -36,7 +36,7 @@ + # the program that should be executed then a connection is made. + # $wavfifo will be replaced with the path and name of the WAVFIFO + # $mp3fifo will be replaced with the path and name of the MP3FIFO +-SERVER_PROGRAM=/usr/local/bin/bladeenc -br 192 $wavfifo $mp3fifo ++SERVER_PROGRAM=/usr/bin/flac $wavfifo -o $mp3fifo + + # the "chunk"-size that the data will be sent in. + SERVER_DATASIZE=16384 diff --git a/debian/patches/04_encoder_oggenc.dpatch b/debian/patches/04_encoder_oggenc.patch similarity index 51% rename from debian/patches/04_encoder_oggenc.dpatch rename to debian/patches/04_encoder_oggenc.patch index 62f84bd..72b0aa5 100644 --- a/debian/patches/04_encoder_oggenc.dpatch +++ b/debian/patches/04_encoder_oggenc.patch @@ -1,22 +1,5 @@ -#! /bin/sh -e -## 04_encoder_oggenc.dpatch by Joshua Kwan <[email protected]> -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: Use vorbis-tools oggenc as the default encoder. - -if [ $# -ne 1 ]; then - echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" - exit 1 -fi -case "$1" in - -patch) patch -f --no-backup-if-mismatch -p1 < $0;; - -unpatch) patch -f --no-backup-if-mismatch -R -p1 < $0;; - *) - echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" - exit 1;; -esac - -exit 0 +From: Joshua Kwan <[email protected]> +Subject: Use vorbis-tools oggenc as the default encoder. --- a/distmp3.conf~ 2003-09-30 19:56:12.000000000 -0700 +++ b/distmp3.conf 2003-09-30 19:56:27.000000000 -0700 diff --git a/debian/patches/05_funky_redirection.dpatch b/debian/patches/05_funky_redirection.dpatch deleted file mode 100644 index 9661523..0000000 --- a/debian/patches/05_funky_redirection.dpatch +++ /dev/null @@ -1,44 +0,0 @@ -#! /bin/sh -e -## 05_funky_redirection.dpatch by Joshua Kwan <[email protected]> -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: Fix busted shell redirection in distmp3host - -if [ $# -ne 1 ]; then - echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" - exit 1 -fi -case "$1" in - -patch) - if patch -f --dry-run -p1 < $0; then - patch -f --no-backup-if-mismatch -p1 < $0 - else - exit 1 - fi - ;; - -unpatch) - if patch -f --dry-run -R -p1 < $0; then - patch -f --no-backup-if-mismatch -R -p1 < $0 - else - exit 1 - fi - ;; - *) - echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" - exit 1;; -esac - -exit 0 - - ---- a/distmp3host~ 2004-03-04 18:01:30.000000000 -0800 -+++ b/distmp3host 2004-03-04 18:02:01.000000000 -0800 -@@ -190,7 +190,7 @@ - } - else - { -- $extra_param = "&>/dev/null &"; -+ $extra_param = ">/dev/null 2>&1 &"; - } - system "@config{PROGRAM} $extra_param"; - if ( $? ne 0 ) { diff --git a/debian/patches/05_funky_redirection.patch b/debian/patches/05_funky_redirection.patch new file mode 100644 index 0000000..04253c9 --- /dev/null +++ b/debian/patches/05_funky_redirection.patch @@ -0,0 +1,14 @@ +From: Joshua Kwan <[email protected]> +Subject: Fix busted shell redirection in distmp3host + +--- a/distmp3host~ 2004-03-04 18:01:30.000000000 -0800 ++++ b/distmp3host 2004-03-04 18:02:01.000000000 -0800 +@@ -190,7 +190,7 @@ + } + else + { +- $extra_param = "&>/dev/null &"; ++ $extra_param = ">/dev/null 2>&1 &"; + } + system "@config{PROGRAM} $extra_param"; + if ( $? ne 0 ) { diff --git a/debian/patches/06_fix_system_call.dpatch b/debian/patches/06_fix_system_call.patch similarity index 51% rename from debian/patches/06_fix_system_call.dpatch rename to debian/patches/06_fix_system_call.patch index f16062c..36b2128 100644 --- a/debian/patches/06_fix_system_call.dpatch +++ b/debian/patches/06_fix_system_call.patch @@ -1,23 +1,5 @@ -#! /bin/sh -e -## 06_fix_system_call.dpatch by Michael Eyrich <[email protected]> -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: Make system() call use ('-m', '0600') instead of ('-m 0600') -## DP: as parameters - -if [ $# -ne 1 ]; then - echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" - exit 1 -fi -case "$1" in - -patch) patch -f --no-backup-if-mismatch -p1 < $0;; - -unpatch) patch -f --no-backup-if-mismatch -R -p1 < $0;; - *) - echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" - exit 1;; -esac - -exit 0 +From: Michael Eyrich <[email protected]> +Subject: Make system() call use ('-m', '0600') instead of ('-m 0600') --- distmp3-0.1.9.orig/distmp3host +++ distmp3-0.1.9/distmp3host diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..9080141 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1,6 @@ +01_config_file.patch +02_tempfile_handling.patch +03_fork+pidfile.patch +04_encoder_oggenc.patch +05_funky_redirection.patch +06_fix_system_call.patch diff --git a/debian/rules b/debian/rules index 5a3a66c..7b620e0 100755 --- a/debian/rules +++ b/debian/rules @@ -3,11 +3,10 @@ export PACKAGE=distmp3 -include /usr/share/dpatch/dpatch.make -build: patch +build: -clean: unpatch +clean: dh_testdir dh_testroot dh_clean diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 0000000..163aaf8 --- /dev/null +++ b/debian/source/format @@ -0,0 +1 @@ +3.0 (quilt) -- 1.7.9
--- End Message ---
--- Begin Message ---Version: 0.1.9.ds1-4.6+rm Dear submitter, as the package distmp3 has just been removed from the Debian archive unstable we hereby close the associated bug reports. We are sorry that we couldn't deal with your issue properly. For details on the removal, please see https://bugs.debian.org/850715 The version of this package that was in Debian prior to this removal can still be found using http://snapshot.debian.org/. This message was generated automatically; if you believe that there is a problem with it please contact the archive administrators by mailing [email protected]. Debian distribution maintenance software pp. Scott Kitterman (the ftpmaster behind the curtain)
--- End Message ---
