Package: enscribe
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 156254478462e012ff4c36696fe7cab5e17f6710 Mon Sep 17 00:00:00 2001
From: Jari Aalto <[email protected]>
Date: Fri, 20 Apr 2012 16:48:53 +0300
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 | 12 +++++++++
debian/compat | 2 +-
debian/control | 5 ++--
debian/copyright | 2 +-
debian/dirs | 2 +-
debian/patches/00list | 2 --
.../{01-makefile.dpatch => 01-makefile.patch} | 26 ++------------------
...cksizenorm.dpatch => 02-FFTblocksizenorm.patch} | 26 ++------------------
debian/patches/series | 2 ++
debian/rules | 26 ++++++++------------
debian/source/format | 1 +
11 files changed, 35 insertions(+), 71 deletions(-)
delete mode 100644 debian/patches/00list
rename debian/patches/{01-makefile.dpatch => 01-makefile.patch} (53%)
rename debian/patches/{02-FFTblocksizenorm.dpatch => 02-FFTblocksizenorm.patch} (59%)
create mode 100644 debian/patches/series
create mode 100644 debian/source/format
diff --git a/debian/changelog b/debian/changelog
index 629ed5c..49f4679 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+enscribe (0.1.0-1.2) 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.
+ * Add build-arch and build-indep targets; use dh_prep in rules file.
+ * Fix copyright-refers-to-symlink-license (Lintian).
+ * Fix package-contains-empty-directory usr/sbin/ (Lintian).
+ * Fix no-homepage-field (Lintian).
+
+ -- Jari Aalto <[email protected]> Fri, 20 Apr 2012 16:48:40 +0300
+
enscribe (0.1.0-1.1) unstable; urgency=low
* Non-maintainer upload.
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 476bd8f..014b58e 100644
--- a/debian/control
+++ b/debian/control
@@ -2,8 +2,9 @@ Source: enscribe
Section: sound
Priority: extra
Maintainer: Nick Rusnov <[email protected]>
-Build-Depends: debhelper (>= 4.0.0), libgd2-xpm-dev | libgd-dev, libsndfile1-dev, pkg-config, docbook-to-man, dpatch
-Standards-Version: 3.7.2.0
+Build-Depends: debhelper (>= 9), libgd2-xpm-dev | libgd-dev, libsndfile1-dev, pkg-config, docbook-to-man
+Standards-Version: 3.9.3
+Homepage: http://freecode.com/projects/enscribe
Package: enscribe
Architecture: any
diff --git a/debian/copyright b/debian/copyright
index ffe13f0..25cc0d2 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -10,4 +10,4 @@ Copyright:
http://jbd.zayda.net/enscribe/
This package may be redistributed under the terms of the GNU GPL, version 2 or
-later, found on Debian systems in the file /usr/share/common-licenses/GPL
+later, found on Debian systems in the file /usr/share/common-licenses/GPL-2
diff --git a/debian/dirs b/debian/dirs
index ca882bb..74c5069 100644
--- a/debian/dirs
+++ b/debian/dirs
@@ -1,2 +1,2 @@
usr/bin
-usr/sbin
+
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index 1fedc0c..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1,2 +0,0 @@
-01-makefile.dpatch
-02-FFTblocksizenorm.dpatch
diff --git a/debian/patches/01-makefile.dpatch b/debian/patches/01-makefile.patch
similarity index 53%
rename from debian/patches/01-makefile.dpatch
rename to debian/patches/01-makefile.patch
index 60db378..a2ddcbb 100644
--- a/debian/patches/01-makefile.dpatch
+++ b/debian/patches/01-makefile.patch
@@ -1,28 +1,6 @@
-#! /bin/sh -e
-## 01-makefile.dpatch by Nick Rusnov <[email protected]>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Add the required functions to makefile, etc.
+From: Nick Rusnov <[email protected]>
+Subject: Add the required functions to makefile, etc.
-if [ $# -lt 1 ]; then
- echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
- exit 1
-fi
-
-[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
-patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}"
-
-case "$1" in
- -patch) patch -p1 ${patch_opts} < $0;;
- -unpatch) patch -R -p1 ${patch_opts} < $0;;
- *)
- echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
- exit 1;;
-esac
-
-exit 0
-
-@DPATCH@
diff -udr enscribe-0.0.4/makefile enscribe-0.0.4-makefilepatch/makefile
--- enscribe-0.0.4/makefile 2004-07-04 12:49:06.000000000 -0700
+++ enscribe-0.0.4-makefilepatch/makefile 2004-11-01 15:44:55.000000000 -0800
diff --git a/debian/patches/02-FFTblocksizenorm.dpatch b/debian/patches/02-FFTblocksizenorm.patch
similarity index 59%
rename from debian/patches/02-FFTblocksizenorm.dpatch
rename to debian/patches/02-FFTblocksizenorm.patch
index 879eeaa..d5a2b94 100644
--- a/debian/patches/02-FFTblocksizenorm.dpatch
+++ b/debian/patches/02-FFTblocksizenorm.patch
@@ -1,28 +1,6 @@
-#! /bin/sh -e
-## 02-FFTblocksizenorm.dpatch by Nick Rusnov <[email protected]>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Normalize the two FFT blocksize arguments
+From: Nick Rusnov <[email protected]>
+Subject: Normalize the two FFT blocksize arguments
-if [ $# -lt 1 ]; then
- echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
- exit 1
-fi
-
-[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
-patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}"
-
-case "$1" in
- -patch) patch -p1 ${patch_opts} < $0;;
- -unpatch) patch -R -p1 ${patch_opts} < $0;;
- *)
- echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
- exit 1;;
-esac
-
-exit 0
-
-@DPATCH@
diff -udr enscribe-0.1.0-orig/enscribe.c enscribe-0.1.0/enscribe.c
--- enscribe-0.1.0-orig/enscribe.c 2009-08-10 20:52:16.000000000 -0700
+++ enscribe-0.1.0/enscribe.c 2009-08-10 20:58:28.000000000 -0700
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..42712d8
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+01-makefile.patch
+02-FFTblocksizenorm.patch
diff --git a/debian/rules b/debian/rules
index c3d7e11..11cb0c0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -13,29 +13,26 @@
CFLAGS='-Wall -g'
-build: patch
+
+build-arch: build
+build-indep: build
+
+build:
dh_testdir
$(MAKE) CFLAGS=$(CFLAGS)
docbook-to-man debian/enscribe.sgml > enscribe.1
-clean: clean-patched unpatch
-clean-patched:
+clean:
dh_testdir
dh_testroot
-
- -$(MAKE) clean
- -rm -f enscribe.1
-
- dh_clean
-
-unpatch:
- dpatch deapply-all
- rm -rf patch-stamp debian/patched
+ $(MAKE) clean
+ rm -f enscribe.1
+ dh_clean
install: build
dh_testdir
dh_testroot
- dh_clean -k
+ dh_prep
dh_installdirs
$(MAKE) install DESTDIR=$(CURDIR)/debian/enscribe
@@ -62,6 +59,3 @@ binary-arch: build install
binary: binary-indep binary-arch
.PHONY: build clean binary-indep binary-arch binary install configure
-
-patch:
- dpatch apply-all
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
