Package: normalize-audio
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.
Thanks,
Jari
>From a86c14e39a45d5c00c29801ae38ccfde7ab754bb Mon Sep 17 00:00:00 2001
From: Jari Aalto <jari.aa...@cante.net>
Date: Sat, 14 Apr 2012 14:13:43 +0300
Subject: [PATCH] format-3.0
Organization: Private
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 8bit
Signed-off-by: Jari Aalto <jari.aa...@cante.net>
---
debian/README.source | 7 ----
debian/changelog | 9 +++++
debian/compat | 2 +-
debian/control | 4 +--
debian/patches/00list | 7 ----
...wav-files.dpatch => compressed-wav-files.patch} | 11 +++---
...-configure-ac.dpatch => fix-configure-ac.patch} | 14 +++-----
....dpatch => fix-encoder-decoder-detection.patch} | 12 +++----
...ix-exdev-error.dpatch => fix-exdev-error.patch} | 7 ++--
debian/patches/{fix-flac.dpatch => fix-flac.patch} | 7 ++--
.../{fix-manpage.dpatch => fix-manpage.patch} | 9 ++---
.../{rename-binary.dpatch => rename-binary.patch} | 7 ++--
debian/patches/series | 7 ++++
debian/rules | 38 ++++++--------------
debian/source/format | 1 +
15 files changed, 53 insertions(+), 89 deletions(-)
delete mode 100644 debian/README.source
delete mode 100644 debian/patches/00list
rename debian/patches/{compressed-wav-files.dpatch => compressed-wav-files.patch} (71%)
rename debian/patches/{fix-configure-ac.dpatch => fix-configure-ac.patch} (72%)
rename debian/patches/{fix-encoder-decoder-detection.dpatch => fix-encoder-decoder-detection.patch} (74%)
rename debian/patches/{fix-exdev-error.dpatch => fix-exdev-error.patch} (76%)
rename debian/patches/{fix-flac.dpatch => fix-flac.patch} (78%)
rename debian/patches/{fix-manpage.dpatch => fix-manpage.patch} (97%)
rename debian/patches/{rename-binary.dpatch => rename-binary.patch} (94%)
create mode 100644 debian/patches/series
create mode 100644 debian/source/format
diff --git a/debian/README.source b/debian/README.source
deleted file mode 100644
index f31dc77..0000000
--- a/debian/README.source
+++ /dev/null
@@ -1,7 +0,0 @@
-README.source
--------------
-
-The package uses dpatch to manage patches to the original source.
-See /usr/share/doc/dpatch/README.source.gz for details.
-
- -- Joachim Reichel <reic...@debian.org> Sun, 22 Nov 2009 22:15:22 +0100
diff --git a/debian/changelog b/debian/changelog
index dc4ea48..bdc610c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+normalize-audio (0.7.7-8.1) 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.1 and debhelper to 9.
+ * Add build-arch and build-indep targets; use dh_prep in rules file.
+
+ -- Jari Aalto <jari.aa...@cante.net> Sat, 14 Apr 2012 13:33:38 +0300
+
normalize-audio (0.7.7-8) unstable; urgency=low
* Add patch fix-configure-ac.dpatch to fix audiofile detection for
diff --git a/debian/compat b/debian/compat
index 7ed6ff8..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-5
+9
diff --git a/debian/control b/debian/control
index 0b376fd..7f3ac8b 100644
--- a/debian/control
+++ b/debian/control
@@ -2,8 +2,8 @@ Source: normalize-audio
Section: sound
Priority: extra
Maintainer: Joachim Reichel <reic...@debian.org>
-Build-Depends: debhelper (>= 5), dpatch, autotools-dev, dh-autoreconf, pkg-config, libaudiofile-dev, libmad0-dev, mpg321, vorbis-tools, flac
-Standards-Version: 3.9.2
+Build-Depends: debhelper (>= 9), autotools-dev, dh-autoreconf, pkg-config, libaudiofile-dev, libmad0-dev, mpg321, vorbis-tools, flac
+Standards-Version: 3.9.3
Package: normalize-audio
Architecture: any
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index d15bc8a..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1,7 +0,0 @@
-compressed-wav-files.dpatch
-rename-binary.dpatch
-fix-exdev-error.dpatch
-fix-flac.dpatch
-fix-manpage.dpatch
-fix-encoder-decoder-detection.dpatch
-fix-configure-ac.dpatch
diff --git a/debian/patches/compressed-wav-files.dpatch b/debian/patches/compressed-wav-files.patch
similarity index 71%
rename from debian/patches/compressed-wav-files.dpatch
rename to debian/patches/compressed-wav-files.patch
index 05a614f..04a7539 100644
--- a/debian/patches/compressed-wav-files.dpatch
+++ b/debian/patches/compressed-wav-files.patch
@@ -1,11 +1,8 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## compressed-wav-files.dpatch by Stefan Fritsch <s...@sfritsch.de>
-##
-## DP: afGetVirtualFrameSize() needs to be used instead of afGetFrameSize(),
-## DP: otherwise the allocated buffer size is too small for compressed
-## DP: WAV files (see #558399).
+From: Stefan Fritsch <s...@sfritsch.de>
+Subject: afGetVirtualFrameSize() needs to be used instead of afGetFrameSize(),
+ otherwise the allocated buffer size is too small for compressed
+ WAV files (see #558399).
-@DPATCH@
diff -urNad normalize-audio-0.7.7~/src/adjust.c normalize-audio-0.7.7/src/adjust.c
--- normalize-audio-0.7.7~/src/adjust.c 2009-01-29 21:25:27.000000000 +0100
+++ normalize-audio-0.7.7/src/adjust.c 2009-11-28 17:23:40.000000000 +0100
diff --git a/debian/patches/fix-configure-ac.dpatch b/debian/patches/fix-configure-ac.patch
similarity index 72%
rename from debian/patches/fix-configure-ac.dpatch
rename to debian/patches/fix-configure-ac.patch
index c559f28..5ecdafa 100644
--- a/debian/patches/fix-configure-ac.dpatch
+++ b/debian/patches/fix-configure-ac.patch
@@ -1,13 +1,9 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## fix-audiofile-detection.dpatch by Ilya Barygin <randomact...@ubuntu.com>
-##
-## DP: - Add AM_PROG_CC_C_O required by newer automake versions.
-## DP: - Avoid autoconf errors related to AM_PATH_GLIB, AM_PATH_GTK, and AM_PATH_XMMS
-## by using pkg-config instead.
-## DP: - audiofile >= 0.3.2-1 does no longer provide audiofile-config and the
-## DP: AM_PATH_AUDIOFILE macro based on it. Use pkg-config instead (see #655181).
+From: Ilya Barygin <randomact...@ubuntu.com>
+Subject: Add AM_PROG_CC_C_O required by newer automake versions.
+ - Avoid autoconf errors related to AM_PATH_GLIB, AM_PATH_GTK, and AM_PATH_XMMS
+ - audiofile >= 0.3.2-1 does no longer provide audiofile-config and the
+ AM_PATH_AUDIOFILE macro based on it. Use pkg-config instead (see #655181).
-@DPATCH@
diff -urNad normalize-audio-0.7.7~/configure.ac normalize-audio-0.7.7/configure.ac
--- normalize-audio-0.7.7~/configure.ac 2011-12-22 23:17:58.000000000 +0400
+++ normalize-audio-0.7.7/configure.ac 2011-12-22 23:18:32.000000000 +0400
diff --git a/debian/patches/fix-encoder-decoder-detection.dpatch b/debian/patches/fix-encoder-decoder-detection.patch
similarity index 74%
rename from debian/patches/fix-encoder-decoder-detection.dpatch
rename to debian/patches/fix-encoder-decoder-detection.patch
index 66d0690..08443d8 100644
--- a/debian/patches/fix-encoder-decoder-detection.dpatch
+++ b/debian/patches/fix-encoder-decoder-detection.patch
@@ -1,12 +1,8 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## fix-encoder-decoder-detection.dpatch by Joachim Reichel <reic...@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Detect encoder and decoder dynamically at runtime. This results in
-## DP: better defaults depending on the user's environment and avoids data loss
-## DP: if no suitable encoder/decoder is found.
+From: Joachim Reichel <reic...@debian.org>
+Subject: Detect encoder and decoder dynamically at runtime. This results in
+ better defaults depending on the user's environment and avoids data loss
+ if no suitable encoder/decoder is found.
-@DPATCH@
diff -urNad normalize-audio-0.7.7~/src/normalize-mp3.in normalize-audio-0.7.7/src/normalize-mp3.in
--- normalize-audio-0.7.7~/src/normalize-mp3.in 2010-06-16 20:05:57.000000000 +0200
+++ normalize-audio-0.7.7/src/normalize-mp3.in 2010-06-16 20:06:19.000000000 +0200
diff --git a/debian/patches/fix-exdev-error.dpatch b/debian/patches/fix-exdev-error.patch
similarity index 76%
rename from debian/patches/fix-exdev-error.dpatch
rename to debian/patches/fix-exdev-error.patch
index fd4a2c5..3d0cb16 100644
--- a/debian/patches/fix-exdev-error.dpatch
+++ b/debian/patches/fix-exdev-error.patch
@@ -1,9 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## fix-exdev-error.dpatch by Joachim Reichel <joachim.reic...@gmx.de>
-##
-## DP: use move instead of rename to avoid EXDEV, see #336808 and #337396
+From: Joachim Reichel <joachim.reic...@gmx.de>
+Subject: use move instead of rename to avoid EXDEV, see #336808 and #337396
-@DPATCH@
diff -urNad normalize-audio-0.7.7~/src/normalize-mp3.in normalize-audio-0.7.7/src/normalize-mp3.in
--- normalize-audio-0.7.7~/src/normalize-mp3.in 2007-09-02 22:14:00.000000000 +0200
+++ normalize-audio-0.7.7/src/normalize-mp3.in 2007-09-02 22:14:38.000000000 +0200
diff --git a/debian/patches/fix-flac.dpatch b/debian/patches/fix-flac.patch
similarity index 78%
rename from debian/patches/fix-flac.dpatch
rename to debian/patches/fix-flac.patch
index 9c18b99..3a37c25 100644
--- a/debian/patches/fix-flac.dpatch
+++ b/debian/patches/fix-flac.patch
@@ -1,9 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## fix-flac.dpatch by Joachim Reichel <joachim.reic...@gmx.de>
-##
-## DP: fix typo w.r.t. flac support
+From: Joachim Reichel <joachim.reic...@gmx.de>
+Subject: fix typo w.r.t. flac support
-@DPATCH@
diff -urNad normalize-audio-0.7.7~/src/normalize-mp3.in normalize-audio-0.7.7/src/normalize-mp3.in
--- normalize-audio-0.7.7~/src/normalize-mp3.in 2005-09-12 07:31:15.000000000 +0200
+++ normalize-audio-0.7.7/src/normalize-mp3.in 2007-01-19 21:37:37.000000000 +0100
diff --git a/debian/patches/fix-manpage.dpatch b/debian/patches/fix-manpage.patch
similarity index 97%
rename from debian/patches/fix-manpage.dpatch
rename to debian/patches/fix-manpage.patch
index b4559a8..f50e5e8 100644
--- a/debian/patches/fix-manpage.dpatch
+++ b/debian/patches/fix-manpage.patch
@@ -1,10 +1,7 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## fix-manpage.dpatch by Joachim Reichel <joachim.reic...@gmx.de>
-##
-## DP: Replace invalid groff input character by corresponding escape sequence.
-## DP: Use \- instead of - to represent minus signs.
+From: Joachim Reichel <joachim.reic...@gmx.de>
+Subject: Replace invalid groff input character by corresponding escape sequence.
+ Fix hypens (minus signs).
-@DPATCH@
diff -urNad normalize-audio-0.7.7~/doc/normalize-mp3.1 normalize-audio-0.7.7/doc/normalize-mp3.1
--- normalize-audio-0.7.7~/doc/normalize-mp3.1 2010-06-16 20:57:10.000000000 +0200
+++ normalize-audio-0.7.7/doc/normalize-mp3.1 2010-06-16 21:03:47.000000000 +0200
diff --git a/debian/patches/rename-binary.dpatch b/debian/patches/rename-binary.patch
similarity index 94%
rename from debian/patches/rename-binary.dpatch
rename to debian/patches/rename-binary.patch
index d3031c6..4436b70 100644
--- a/debian/patches/rename-binary.dpatch
+++ b/debian/patches/rename-binary.patch
@@ -1,9 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## rename.dpatch by Joachim Reichel <joachim.reic...@gmx.de>
-##
-## DP: replace all user-visible occurrences of "normalize" by "normalize-audio"
+From: Joachim Reichel <joachim.reic...@gmx.de>
+Subject: replace all user-visible occurrences of "normalize" by "normalize-audio"
-@DPATCH@
diff -urNad normalize-audio-0.7.7~/doc/normalize-mp3.1 normalize-audio-0.7.7/doc/normalize-mp3.1
--- normalize-audio-0.7.7~/doc/normalize-mp3.1 2005-09-09 22:14:15.000000000 +0200
+++ normalize-audio-0.7.7/doc/normalize-mp3.1 2007-01-19 21:37:37.000000000 +0100
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..608ea71
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,7 @@
+compressed-wav-files.patch
+rename-binary.patch
+fix-exdev-error.patch
+fix-flac.patch
+fix-manpage.patch
+fix-encoder-decoder-detection.patch
+fix-configure-ac.patch
diff --git a/debian/rules b/debian/rules
index 2ff9624..b76176d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -23,9 +23,11 @@ endif
# nothing to do for nocheck option
configure: configure-stamp
-configure-stamp: patch-stamp
+configure-stamp:
dh_testdir
touch AUTHORS ChangeLog
+ cp -vf /usr/share/misc/config.sub .
+ cp -vf /usr/share/misc/config.guess .
dh_autoreconf
./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \
--prefix=/usr --mandir=\$${prefix}/share/man \
@@ -33,27 +35,30 @@ configure-stamp: patch-stamp
CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs"
touch $@
+
+build-arch: build
+build-indep: build
+
build: build-stamp
build-stamp: configure-stamp
dh_testdir
$(MAKE)
touch $@
-clean: clean-patched unpatch
-clean-patched: patch
+clean:
dh_testdir
dh_testroot
rm -f build-stamp configure-stamp
[ ! -f Makefile ] || $(MAKE) distclean
rm -fr xmms-rva/Makefile xmms-rva/.deps
dh_autoreconf_clean
- rm -rf AUTHORS ChangeLog
+ rm -f AUTHORS ChangeLog config.guess config.sub
dh_clean
install: build
dh_testdir
dh_testroot
- dh_clean -k
+ dh_prep
dh_installdirs
$(MAKE) install DESTDIR=$(CURDIR)/debian/normalize-audio
mv $(CURDIR)/debian/normalize-audio/usr/share/locale/en_GB/LC_MESSAGES/normalize.mo \
@@ -84,25 +89,4 @@ binary-arch: build install
binary: binary-indep binary-arch
-patch: patch-stamp
-patch-stamp:
- dpatch apply-all
- for FILE in config.sub config.guess; do \
- if [ -f /usr/share/misc/$$FILE ]; then \
- mv config/$$FILE config/$$FILE.sik; \
- ln -s /usr/share/misc/$$FILE config/$$FILE; \
- fi; \
- done
- touch $@
-
-unpatch:
- dpatch deapply-all
- for FILE in config.sub config.guess; do \
- if [ -f config/$$FILE.sik ]; then \
- rm config/$$FILE; \
- mv config/$$FILE.sik config/$$FILE; \
- fi; \
- done
- rm -fr patch-stamp debian/patched
-
-.PHONY: build clean binary-indep binary-arch binary install patch unpatch configure
+.PHONY: build clean binary-indep binary-arch binary install configure
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.5
