Package: aqualung
Severity: wishlist
Tags: patch
The new 3.0 packaging format contains patch managemet built-in which
makes it possible to drop obsolete dpatch dependency.
See attached patch to migrate to new package format. Note that all
files in debian/patches/* are canocalized to *.patch. The patch also
fixes error reported by Lintian.
-- System Information:
Debian Release: wheezy/sid
APT prefers unstable
APT policy: (990, 'unstable'), (1, 'experimental')
Architecture: i386 (i686)
Kernel: Linux 3.2.0-1-686-pae (SMP w/2 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
>From f9fb0cd31fbea874580cae26c9b50260b7d04bdf Mon Sep 17 00:00:00 2001
From: Jari Aalto <jari.aa...@cante.net>
Date: Sun, 4 Mar 2012 04:17:37 -0500
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 | 8 -----
debian/changelog | 10 +++++++
debian/compat | 2 +-
debian/control | 4 +-
debian/patches/000-Fix_ftbfs_on_gnu-kfreebsd | 20 --------------
debian/patches/000-Fix_ftbfs_on_gnu-kfreebsd.patch | 19 +++++++++++++
...locale.dpatch => 001-Fix-crash-fr-locale.patch} | 8 +----
...{003-autogen.sh.dpatch => 003-autogen.sh.patch} | 8 +----
debian/patches/004_missing-library.dpatch | 27 -------------------
debian/patches/004_missing-library.patch | 28 ++++++++++++++++++++
.../{005_libav-0.7.dpatch => 005_libav-0.7.patch} | 8 +----
debian/patches/00list | 5 ---
debian/patches/series | 5 +++
debian/rules | 13 +++-----
debian/source/format | 1 +
15 files changed, 77 insertions(+), 89 deletions(-)
delete mode 100644 debian/README.source
delete mode 100644 debian/patches/000-Fix_ftbfs_on_gnu-kfreebsd
create mode 100644 debian/patches/000-Fix_ftbfs_on_gnu-kfreebsd.patch
rename debian/patches/{001-Fix-crash-fr-locale.dpatch => 001-Fix-crash-fr-locale.patch} (58%)
rename debian/patches/{003-autogen.sh.dpatch => 003-autogen.sh.patch} (99%)
delete mode 100644 debian/patches/004_missing-library.dpatch
create mode 100644 debian/patches/004_missing-library.patch
rename debian/patches/{005_libav-0.7.dpatch => 005_libav-0.7.patch} (85%)
delete mode 100644 debian/patches/00list
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 eec4b1a..0000000
--- a/debian/README.source
+++ /dev/null
@@ -1,8 +0,0 @@
-This package uses dpatch to manage all modifications to the upstream
-source. Changes are stored in the source package as diffs in
-debian/patches and applied during the build. Please see:
-
-/usr/share/doc/dpatch/README.source.gz
-
-for more information on how to apply the patches, modify patches, or
-remove a patch.
diff --git a/debian/changelog b/debian/changelog
index 5af5e9a..bda85f3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+aqualung (0.9~beta11-1.3) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Remove deprecated dpatch and upgrade to packaging format "3.0 quilt".
+ Note: some patches were updated with "quilt refresh" to make
+ them apply cleanly.
+ * Update to Standards-Version to 3.9.3 and debhelper to 9.
+
+ -- Jari Aalto <jari.aa...@cante.net> Sun, 04 Mar 2012 04:13:56 -0500
+
aqualung (0.9~beta11-1.2) unstable; urgency=low
* Non-maintainer upload.
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 a8fa41e..7da863e 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: aqualung
Section: sound
Priority: extra
Maintainer: Adam Cécile (Le_Vert) <gand...@le-vert.net>
-Build-Depends: debhelper (>= 5), dpatch, autotools-dev,
+Build-Depends: debhelper (>= 9), autotools-dev,
libgtk2.0-dev (>= 2.6),
libxml2-dev,
libasound2-dev [linux-any] | libasound-dev [linux-any],
@@ -27,7 +27,7 @@ Build-Depends: debhelper (>= 5), dpatch, autotools-dev,
libpulse-dev,
liblua5.1-0-dev | liblua5.1-dev,
libmp3lame-dev
-Standards-Version: 3.8.4
+Standards-Version: 3.9.3
Homepage: http://aqualung.sourceforge.net/
Package: aqualung
diff --git a/debian/patches/000-Fix_ftbfs_on_gnu-kfreebsd b/debian/patches/000-Fix_ftbfs_on_gnu-kfreebsd
deleted file mode 100644
index 3bd81f9..0000000
--- a/debian/patches/000-Fix_ftbfs_on_gnu-kfreebsd
+++ /dev/null
@@ -1,20 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 000-Fix_ftbfs_on_gnu-kfreebsd
-## by Cyril Brulebois <cyril.bruleb...@enst-bretagne.fr>
-##
-## DP: Fix FTBFS on GNU/kFreeBSD systems.
-
-@DPATCH@
-
-diff -u aqualung-0.9~beta7.1/src/core.c aqualung-0.9~beta7.1/src/core.c.new
---- aqualung-0.9~beta7.1/src/core.c 2007-02-18 10:31:25.000000000 +0100
-+++ aqualung-0.9~beta7.1/src/core.c.new 2007-03-10 16:14:14.000000000 +0100
-@@ -48,7 +48,7 @@
- #ifdef HAVE_OSS
- #include <sys/ioctl.h>
- #include <sys/types.h>
--#ifdef __FreeBSD__
-+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
- #include <sys/soundcard.h>
- #else
- #include <linux/soundcard.h>
diff --git a/debian/patches/000-Fix_ftbfs_on_gnu-kfreebsd.patch b/debian/patches/000-Fix_ftbfs_on_gnu-kfreebsd.patch
new file mode 100644
index 0000000..f10dda3
--- /dev/null
+++ b/debian/patches/000-Fix_ftbfs_on_gnu-kfreebsd.patch
@@ -0,0 +1,19 @@
+From: Cyril Brulebois <cyril.bruleb...@enst-bretagne.fr>
+Subject: Fix FTBFS on GNU/kFreeBSD systems.
+
+
+---
+ src/core.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/src/core.c
++++ b/src/core.c
+@@ -52,7 +52,7 @@
+ #ifdef HAVE_OSS
+ #include <sys/ioctl.h>
+ #include <sys/types.h>
+-#ifdef __FreeBSD__
++#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
+ #include <sys/soundcard.h>
+ #else
+ #ifdef __OpenBSD__
diff --git a/debian/patches/001-Fix-crash-fr-locale.dpatch b/debian/patches/001-Fix-crash-fr-locale.patch
similarity index 58%
rename from debian/patches/001-Fix-crash-fr-locale.dpatch
rename to debian/patches/001-Fix-crash-fr-locale.patch
index 4aefbf8..05448a1 100644
--- a/debian/patches/001-Fix-crash-fr-locale.dpatch
+++ b/debian/patches/001-Fix-crash-fr-locale.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 001-Fix-crash-fr-locale.dpatch by Julien Lavergne <gi...@ubuntu.com>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fix crash with french locale (From upstream, revision 1136)
+From: Julien Lavergne <gi...@ubuntu.com>
+Subject: Fix crash with french locale (From upstream, revision 1136)
-@DPATCH@
diff -urNad aqualung-0.9~beta11~/src/po/fr.po aqualung-0.9~beta11/src/po/fr.po
--- aqualung-0.9~beta11~/src/po/fr.po 2010-01-31 18:06:16.000000000 +0100
+++ aqualung-0.9~beta11/src/po/fr.po 2010-05-24 21:20:28.364729368 +0200
diff --git a/debian/patches/003-autogen.sh.dpatch b/debian/patches/003-autogen.sh.patch
similarity index 99%
rename from debian/patches/003-autogen.sh.dpatch
rename to debian/patches/003-autogen.sh.patch
index 413a38d..62684c8 100644
--- a/debian/patches/003-autogen.sh.dpatch
+++ b/debian/patches/003-autogen.sh.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 003-autogen.sh.dpatch
-## by Adam Cécile (Le_Vert) <gand...@le-vert.net>
-##
-## DP: Run autogen.sh again because of incompatibility with aclocal 1.11.
+From: Adam Cécile (Le_Vert) <gand...@le-vert.net>
+Subject: Run autogen.sh again because of incompatibility with aclocal 1.11.
-@DPATCH@
diff -Nur aqualung-0.9~beta11/aclocal.m4 aqualung-0.9~beta11.new/aclocal.m4
--- aqualung-0.9~beta11/aclocal.m4 2010-01-31 17:30:15.000000000 +0100
+++ aqualung-0.9~beta11.new/aclocal.m4 2010-03-15 19:31:43.164322429 +0100
diff --git a/debian/patches/004_missing-library.dpatch b/debian/patches/004_missing-library.dpatch
deleted file mode 100644
index 4bf39c5..0000000
--- a/debian/patches/004_missing-library.dpatch
+++ /dev/null
@@ -1,27 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 004_missing-library.dpatch by Ilya Barygin <bary...@gmail.com>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: New patch generated from aqualung 0.9~beta11-1ubuntu7 diff.gz
-
-@DPATCH@
-
---- aqualung-0.9~beta11.orig/src/Makefile.am
-+++ aqualung-0.9~beta11/src/Makefile.am
-@@ -46,3 +46,5 @@
- utils_gui.c utils_gui.h \
- version.h \
- volume.c volume.h
-+
-+aqualung_LDADD = -ldl
---- aqualung-0.9~beta11.orig/src/Makefile.in
-+++ aqualung-0.9~beta11/src/Makefile.in
-@@ -60,7 +60,7 @@
- trashlist.$(OBJEXT) utils.$(OBJEXT) utils_gui.$(OBJEXT) \
- volume.$(OBJEXT)
- aqualung_OBJECTS = $(am_aqualung_OBJECTS)
--aqualung_LDADD = $(LDADD)
-+aqualung_LDADD = $(LDADD) -ldl
- DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
- depcomp = $(SHELL) $(top_srcdir)/depcomp
- am__depfiles_maybe = depfiles
diff --git a/debian/patches/004_missing-library.patch b/debian/patches/004_missing-library.patch
new file mode 100644
index 0000000..494c52e
--- /dev/null
+++ b/debian/patches/004_missing-library.patch
@@ -0,0 +1,28 @@
+From: Ilya Barygin <bary...@gmail.com>
+Subject: New patch generated from aqualung 0.9~beta11-1ubuntu7 diff.gz
+
+
+---
+ src/Makefile.am | 2 ++
+ src/Makefile.in | 2 +-
+ 2 files changed, 3 insertions(+), 1 deletion(-)
+
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -46,3 +46,5 @@
+ utils_gui.c utils_gui.h \
+ version.h \
+ volume.c volume.h
++
++aqualung_LDADD = -ldl
+--- a/src/Makefile.in
++++ b/src/Makefile.in
+@@ -62,7 +62,7 @@
+ trashlist.$(OBJEXT) utils.$(OBJEXT) utils_gui.$(OBJEXT) \
+ volume.$(OBJEXT)
+ aqualung_OBJECTS = $(am_aqualung_OBJECTS)
+-aqualung_LDADD = $(LDADD)
++aqualung_LDADD = $(LDADD) -ldl
+ DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
+ depcomp = $(SHELL) $(top_srcdir)/depcomp
+ am__depfiles_maybe = depfiles
diff --git a/debian/patches/005_libav-0.7.dpatch b/debian/patches/005_libav-0.7.patch
similarity index 85%
rename from debian/patches/005_libav-0.7.dpatch
rename to debian/patches/005_libav-0.7.patch
index ff711a1..6d690ec 100644
--- a/debian/patches/005_libav-0.7.dpatch
+++ b/debian/patches/005_libav-0.7.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 005_libav-api.dpatch by Colin Watson <cjwat...@ubuntu.com>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Port to the current libav API.
+From: Colin Watson <cjwat...@ubuntu.com>
+Subject: Port to the current libav API.
-@DPATCH@
diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' aqualung-0.9~beta11~/src/decoder/dec_lavc.c aqualung-0.9~beta11/src/decoder/dec_lavc.c
--- aqualung-0.9~beta11~/src/decoder/dec_lavc.c 2009-08-20 19:11:11.000000000 +0100
+++ aqualung-0.9~beta11/src/decoder/dec_lavc.c 2011-08-18 18:24:13.000000000 +0100
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index 5d2c79d..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1,5 +0,0 @@
-000-Fix_ftbfs_on_gnu-kfreebsd
-001-Fix-crash-fr-locale.dpatch
-003-autogen.sh
-004_missing-library
-005_libav-0.7
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..f7cdf5b
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,5 @@
+000-Fix_ftbfs_on_gnu-kfreebsd.patch
+001-Fix-crash-fr-locale.patch
+003-autogen.sh.patch
+004_missing-library.patch
+005_libav-0.7.patch
diff --git a/debian/rules b/debian/rules
index a8ea9e9..7040199 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,9 +3,6 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-# Dpatch targets...
-include /usr/share/dpatch/dpatch.make
-
DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
@@ -18,7 +15,7 @@ endif
DESTDIR = $(CURDIR)/debian/aqualung
-config.status: configure patch-stamp
+config.status: configure
dh_testdir
ifneq "$(wildcard /usr/share/misc/config.sub)" ""
cp -f /usr/share/misc/config.sub config.sub
@@ -27,7 +24,7 @@ ifneq "$(wildcard /usr/share/misc/config.guess)" ""
cp -f /usr/share/misc/config.guess config.guess
endif
./configure --host=$(DEB_HOST_GNU_TYPE) \
- --build=$(DEB_BUILD_GNU_TYPE) \
+ --build=$(DEB_BUILD_GNU_TYPE) \
--prefix=/usr \
--mandir=/usr/share/man \
CFLAGS="$(CFLAGS)" \
@@ -39,7 +36,7 @@ build-stamp: config.status
$(MAKE)
touch $@
-clean: unpatch
+clean:
dh_testdir
dh_testroot
rm -f build-stamp config.log config.guess config.sub
@@ -56,7 +53,7 @@ install: build
rm -rf $(DESTDIR)/usr/share/aqualung/doc
# Install 'desktop' menu entry
install -D -m 644 debian/aqualung.desktop \
- $(DESTDIR)/usr/share/applications/aqualung.desktop
+ $(DESTDIR)/usr/share/applications/aqualung.desktop
binary-indep: build install
@@ -69,7 +66,7 @@ binary-arch: build install
dh_link
# Generate XPM icon
convert $(DESTDIR)/usr/share/pixmaps/aqualung.png \
- $(DESTDIR)/usr/share/pixmaps/aqualung.xpm
+ $(DESTDIR)/usr/share/pixmaps/aqualung.xpm
dh_strip
dh_compress
dh_fixperms
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
