Package: rephrase
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 c05dcd668850d9dff8481d2ef55894a90aa4f116 Mon Sep 17 00:00:00 2001
From: Jari Aalto <jari.aa...@cante.net>
Date: Thu, 12 Apr 2012 12:29:32 +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 | 5 -----
debian/changelog | 9 ++++++++
debian/compat | 2 +-
debian/control | 4 ++--
debian/patches/00list | 2 --
...1_fix_bin_path.dpatch => 01_fix_bin_path.patch} | 8 ++-----
...{02_add_destdir.dpatch => 02_add_destdir.patch} | 8 ++-----
debian/patches/series | 2 ++
debian/rules | 22 +++++++-------------
debian/source/format | 1 +
10 files changed, 26 insertions(+), 37 deletions(-)
delete mode 100644 debian/README.source
delete mode 100644 debian/patches/00list
rename debian/patches/{01_fix_bin_path.dpatch => 01_fix_bin_path.patch} (62%)
rename debian/patches/{02_add_destdir.dpatch => 02_add_destdir.patch} (72%)
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 f05f712..0000000
--- a/debian/README.source
+++ /dev/null
@@ -1,5 +0,0 @@
-This source package uses dpatch for the modifications of the upstream source.
-If you want to change something it is best to use the dpatch approach as
-documented in /usr/share/doc/dpatch/README.source.gz
-
- -- Tiago Bortoletto Vaz <ti...@debian.org> Sat, 26 Sep 2009 23:15:23 -0300
diff --git a/debian/changelog b/debian/changelog
index 9282c8c..1a16eb4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+rephrase (0.1-2.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 and debhelper to 9.
+ * Add build-arch and build-indep targets to rules file.
+
+ -- Jari Aalto <jari.aa...@cante.net> Thu, 12 Apr 2012 10:57:17 +0300
+
rephrase (0.1-2) unstable; urgency=low
* Added gnupg as dependency.
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 f0107f2..9573c7b 100644
--- a/debian/control
+++ b/debian/control
@@ -2,8 +2,8 @@ Source: rephrase
Section: utils
Priority: extra
Maintainer: Tiago Bortoletto Vaz <ti...@debian.org>
-Build-Depends: debhelper (>= 7), dpatch
-Standards-Version: 3.8.3
+Build-Depends: debhelper (>= 9)
+Standards-Version: 3.9.3
Homepage: http://www.roguedaemon.net/rephrase/
Vcs-Git: git://git.debian.org/users/zadig-guest/rephrase.git
Vcs-Browser: http://git.debian.org/git/users/zadig-guest/rephrase.git
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index 118df5b..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1,2 +0,0 @@
-01_fix_bin_path
-02_add_destdir
diff --git a/debian/patches/01_fix_bin_path.dpatch b/debian/patches/01_fix_bin_path.patch
similarity index 62%
rename from debian/patches/01_fix_bin_path.dpatch
rename to debian/patches/01_fix_bin_path.patch
index 80a7b36..eb8f3a9 100644
--- a/debian/patches/01_fix_bin_path.dpatch
+++ b/debian/patches/01_fix_bin_path.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 01_fix_bin_path.dpatch by Tiago Bortoletto Vaz <ti...@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fix binary path in Makefile
+From: Tiago Bortoletto Vaz <ti...@debian.org>
+Subject: Fix binary path in Makefile
-@DPATCH@
diff -urNad rephrase-0.1~/Makefile rephrase-0.1/Makefile
--- rephrase-0.1~/Makefile 2009-09-27 00:51:00.000000000 -0300
+++ rephrase-0.1/Makefile 2009-09-27 00:51:11.000000000 -0300
diff --git a/debian/patches/02_add_destdir.dpatch b/debian/patches/02_add_destdir.patch
similarity index 72%
rename from debian/patches/02_add_destdir.dpatch
rename to debian/patches/02_add_destdir.patch
index 2eb5504..8346dc7 100644
--- a/debian/patches/02_add_destdir.dpatch
+++ b/debian/patches/02_add_destdir.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 02_add_destdir.dpatch by Tiago Bortoletto Vaz <ti...@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Add DESTDIR to Makefile
+From: Tiago Bortoletto Vaz <ti...@debian.org>
+Subject: Add DESTDIR to Makefile
-@DPATCH@
diff -urNad rephrase-0.1~/Makefile rephrase-0.1/Makefile
--- rephrase-0.1~/Makefile 2009-09-27 00:54:25.000000000 -0300
+++ rephrase-0.1/Makefile 2009-09-27 00:55:44.000000000 -0300
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..90c4c62
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+01_fix_bin_path.patch
+02_add_destdir.patch
diff --git a/debian/rules b/debian/rules
index db789de..35861ac 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,9 +2,7 @@
#export DH_VERBOSE=1
-clean: clean-patched unpatch
-
-clean-patched:
+clean:
dh_testdir
dh_testroot
rm -f build-stamp
@@ -13,23 +11,17 @@ clean-patched:
dh_clean
-patch: patch-stamp
-
-patch-stamp:
- dpatch apply-all
- dpatch cat-all >patch-stamp
-
-unpatch:
- dpatch deapply-all
- rm -rf patch-stamp debian/patched
-
-build-stamp: patch
+build-stamp:
dh_testdir
$(MAKE) GPG=/usr/bin/gpg
touch build-stamp
+
+build-arch: build
+build-indep: build
+
build: build-stamp
install: build
@@ -45,7 +37,7 @@ binary-arch: install
dh_testdir
dh_testroot
dh_installchangelogs
- dh_installdocs debian/README.source
+ dh_installdocs
dh_installman debian/rephrase.1
dh_lintian
dh_strip
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
