Package: mp3val
Severity: wishlist
Tags: patch
Hi Sandro,
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
[*] 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>
>From 8064251c8e1d9cbf4bc13c24e05cdc3ed50232a3 Mon Sep 17 00:00:00 2001
From: Jari Aalto <jari.aa...@cante.net>
Date: Fri, 20 Apr 2012 15:28:57 +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 | 4 ----
debian/changelog | 13 +++++++++++++
debian/compat | 2 +-
debian/control | 6 +++---
debian/patches/00list | 3 ---
...39_CFLAGS.dpatch => 10-bts-409739-CFLAGS.patch} | 8 ++------
...patch => 20-bts-442679-FTBFS-build-twice.patch} | 8 ++------
...cc43.dpatch => 30-bts-532803-FTBFS-gcc43.patch} | 8 ++------
debian/patches/series | 3 +++
debian/rules | 17 +++++++++--------
debian/source/format | 1 +
11 files changed, 36 insertions(+), 37 deletions(-)
delete mode 100644 debian/README.source
delete mode 100644 debian/patches/00list
rename debian/patches/{10_bts-409739_CFLAGS.dpatch => 10-bts-409739-CFLAGS.patch} (80%)
rename debian/patches/{20_bts-442679_FTBFS_build_twice.dpatch => 20-bts-442679-FTBFS-build-twice.patch} (65%)
rename debian/patches/{30_bts-532803_FTBFS_gcc43.dpatch => 30-bts-532803-FTBFS-gcc43.patch} (62%)
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 0d0aa40..0000000
--- a/debian/README.source
+++ /dev/null
@@ -1,4 +0,0 @@
-This package uses dpatch to handle patches against upstream source code; you
-can find additional information about dpatch at
-
- /usr/share/doc/dpatch/
diff --git a/debian/changelog b/debian/changelog
index fdcaf3b..e09e5e9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+mp3val (0.1.8-2) unstable; urgency=low
+
+ [ Jari Aalto ]
+ * Remove deprecated dpatch and upgrade to packaging format "3.0 quilt".
+ * debian/control
+ - Bump Standards-Version to 3.9.3.
+ - Update to debhelper 9.
+ * debian/rules
+ - Add required build-arch and build-indep targets
+ - Update to use dh_prep.
+
+ -- Jari Aalto <jari.aa...@cante.net> Fri, 20 Apr 2012 15:27:05 +0300
+
mp3val (0.1.8-1) unstable; urgency=low
* New upstream release
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 4f10d70..010ddce 100644
--- a/debian/control
+++ b/debian/control
@@ -3,13 +3,13 @@ Section: sound
Priority: optional
Maintainer: Sandro Tosi <mo...@debian.org>
Uploaders: tony mancill <tmanc...@debian.org>
-Build-Depends: debhelper (>= 5), dpatch
-Standards-Version: 3.8.3
+Build-Depends: debhelper (>= 9)
+Standards-Version: 3.9.3
Homepage: http://mp3val.sourceforge.net/
Package: mp3val
Architecture: any
-Depends: ${shlibs:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
Description: program for MPEG audio stream validation
MP3val is a small, high-speed tool for MPEG audio files validation
and (optionally) fixing problems.
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index b150fb0..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1,3 +0,0 @@
-10_bts-409739_CFLAGS
-20_bts-442679_FTBFS_build_twice
-30_bts-532803_FTBFS_gcc43
diff --git a/debian/patches/10_bts-409739_CFLAGS.dpatch b/debian/patches/10-bts-409739-CFLAGS.patch
similarity index 80%
rename from debian/patches/10_bts-409739_CFLAGS.dpatch
rename to debian/patches/10-bts-409739-CFLAGS.patch
index 962d15a..4c387f3 100644
--- a/debian/patches/10_bts-409739_CFLAGS.dpatch
+++ b/debian/patches/10-bts-409739-CFLAGS.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 10_bts-409739_CFLAGS.dpatch by Sandro Tosi <mo...@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Support CFLAGS
+From: Sandro Tosi <mo...@debian.org>
+Subject: Support CFLAGS
-@DPATCH@
diff -urNad mp3val~/Makefile.gcc mp3val/Makefile.gcc
--- mp3val~/Makefile.gcc 2007-05-31 23:37:34.000000000 +0200
+++ mp3val/Makefile.gcc 2007-09-19 21:34:02.000000000 +0200
diff --git a/debian/patches/20_bts-442679_FTBFS_build_twice.dpatch b/debian/patches/20-bts-442679-FTBFS-build-twice.patch
similarity index 65%
rename from debian/patches/20_bts-442679_FTBFS_build_twice.dpatch
rename to debian/patches/20-bts-442679-FTBFS-build-twice.patch
index 84784c9..bd05374 100644
--- a/debian/patches/20_bts-442679_FTBFS_build_twice.dpatch
+++ b/debian/patches/20-bts-442679-FTBFS-build-twice.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 20_bts-442679_FTBFS_build_twice.dpatch by Sandro Tosi <mo...@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fix a FTBFS if built twice, removing strip and the executables
+From: Sandro Tosi <mo...@debian.org>
+Subject: Fix a FTBFS if built twice, removing strip and the executables
-@DPATCH@
diff -urNad mp3val~/Makefile.gcc mp3val/Makefile.gcc
--- mp3val~/Makefile.gcc 2007-09-20 20:43:07.000000000 +0200
+++ mp3val/Makefile.gcc 2007-09-20 20:43:54.000000000 +0200
diff --git a/debian/patches/30_bts-532803_FTBFS_gcc43.dpatch b/debian/patches/30-bts-532803-FTBFS-gcc43.patch
similarity index 62%
rename from debian/patches/30_bts-532803_FTBFS_gcc43.dpatch
rename to debian/patches/30-bts-532803-FTBFS-gcc43.patch
index 3e6be3a..712a1f4 100644
--- a/debian/patches/30_bts-532803_FTBFS_gcc43.dpatch
+++ b/debian/patches/30-bts-532803-FTBFS-gcc43.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 30_bts-532803_FTBFS_gcc43.dpatch by Fabrice Coutadeur <fabric...@ubuntu.com>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: fix a FTBFS with gcc 4.4 because of missing third argument to open call
+From: Fabrice Coutadeur <fabric...@ubuntu.com>
+Subject: fix a FTBFS with gcc 4.4 because of missing third argument to open call
-@DPATCH@
diff -urNad mp3val~/crossapi.cpp mp3val/crossapi.cpp
--- mp3val~/crossapi.cpp 2009-06-11 23:35:04.000000000 +0200
+++ mp3val/crossapi.cpp 2009-06-11 23:37:04.044668511 +0200
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..4dbe998
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,3 @@
+10-bts-409739-CFLAGS.patch
+20-bts-442679-FTBFS-build-twice.patch
+30-bts-532803-FTBFS-gcc43.patch
diff --git a/debian/rules b/debian/rules
index ffa1748..bdc78df 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,9 +1,6 @@
#!/usr/bin/make -f
# -*- makefile -*-
-# using dpatch
-include /usr/share/dpatch/dpatch.make
-
CFLAGS = -Wall -g
ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
@@ -12,8 +9,12 @@ else
CFLAGS += -O2
endif
+
+build-arch: build
+build-indep: build
+
build: build-stamp
-build-stamp: patch-stamp
+build-stamp:
dh_testdir
# Add here commands to compile the package.
@@ -21,8 +22,8 @@ build-stamp: patch-stamp
touch build-stamp
-clean: clean-patched unpatch
-clean-patched: patch-stamp
+clean: clean-patched
+clean-patched:
dh_testdir
dh_testroot
@@ -34,7 +35,7 @@ clean-patched: patch-stamp
install: build
dh_testdir
dh_testroot
- dh_clean -k
+ dh_prep
dh_installdirs
# Add here commands to install the package into debian/mp3val.
@@ -51,7 +52,7 @@ binary-arch: build install
dh_testroot
dh_installchangelogs changelog.txt
dh_installdocs manual.html
- dh_installman debian/mp3val.1
+ dh_installman debian/mp3val.1
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.5
