Package: gimp-resynthesizer
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
Bryan, as we spoke before, here is the proposed NMU patch.
Please let me know if there is anything that needs adjusting or if it
is ok to upload with these changes.
Thanks,
Jari
>From ab7703c318760cbf8bffdd874a7f111e375a536a Mon Sep 17 00:00:00 2001
From: Jari Aalto <jari.aa...@cante.net>
Date: Thu, 8 Mar 2012 16:36:15 -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 | 12 ------------
debian/changelog | 8 ++++++++
debian/compat | 2 +-
debian/control | 4 ++--
debian/patches/00list | 1 -
.../{01_makefile.dpatch => 01_makefile.patch} | 20 ++++++++------------
...iteral.dpatch => 10_nonconst_str_literal.patch} | 10 +++-------
debian/patches/series | 1 +
debian/rules | 7 +++----
debian/source/format | 1 +
10 files changed, 27 insertions(+), 39 deletions(-)
delete mode 100644 debian/README.source
delete mode 100644 debian/patches/00list
rename debian/patches/{01_makefile.dpatch => 01_makefile.patch} (64%)
rename debian/patches/{10_nonconst_str_literal.dpatch => 10_nonconst_str_literal.patch} (64%)
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 336201a..0000000
--- a/debian/README.source
+++ /dev/null
@@ -1,12 +0,0 @@
-This package uses dpatch for modifications to upstream files. While you may
-make changes directly for NMU purposes etc, it would be appreciated if NMUers
-would make any such changes using dpatch as well.
-
-To edit an existing patch, or create a new one, simply do:
- dpatch-edit-patch <patchname>
-The patch will be placed in debian/patches. If you are creating a new one,
-you will also need to add it to debian/patches/00list.
-
-You can obtain the patched source, or remove the applied patches, with the
-debian/rules 'patch' and 'unpatch' targets. debian/rules clean will invoke
-unpatch automatically.
diff --git a/debian/changelog b/debian/changelog
index a608a4e..88095a0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+gimp-resynthesizer (0.16-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.
+
+ -- Jari Aalto <jari.aa...@cante.net> Thu, 08 Mar 2012 16:33:33 -0500
+
gimp-resynthesizer (0.16-1.1) 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 29ce2ed..0c3e673 100644
--- a/debian/control
+++ b/debian/control
@@ -2,8 +2,8 @@ Source: gimp-resynthesizer
Section: graphics
Priority: optional
Maintainer: Bryan Donlan <bdon...@fushizen.net>
-Build-Depends: debhelper (>= 5.0.0), libgimp2.0-dev, libgtk2.0-dev, dpatch
-Standards-Version: 3.7.3.0
+Build-Depends: debhelper (>= 9), libgimp2.0-dev, libgtk2.0-dev
+Standards-Version: 3.9.3.1
Homepage: http://www.logarithmic.net/pfh/resynthesizer
Package: gimp-resynthesizer
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index 36f6025..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1 +0,0 @@
-10_nonconst_str_literal
diff --git a/debian/patches/01_makefile.dpatch b/debian/patches/01_makefile.patch
similarity index 64%
rename from debian/patches/01_makefile.dpatch
rename to debian/patches/01_makefile.patch
index affdee6..a185fac 100644
--- a/debian/patches/01_makefile.dpatch
+++ b/debian/patches/01_makefile.patch
@@ -1,12 +1,8 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 01_makefile.dpatch by Bryan Donlan <bdon...@gmail.com>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Upstream's makefile installs to the user's home directory; change
-## DP: it to the system dir. Also let debian/rules' CFLAGS override upstream's,
-## DP: and use gimptool-2.0 to avoid variations in alternatives.
+From: Bryan Donlan <bdon...@gmail.com>
+Subject: Upstream's makefile installs to the user's home directory; change
+ it to the system dir. Also let debian/rules' CFLAGS override upstream's,
+ and use gimptool-2.0 to avoid variations in alternatives.
-@DPATCH@
diff -urNad gimp-resynthesizer-0.16~/Makefile gimp-resynthesizer-0.16/Makefile
--- gimp-resynthesizer-0.16~/Makefile 2008-03-18 00:51:42.000000000 -0400
+++ gimp-resynthesizer-0.16/Makefile 2008-03-18 01:00:52.000000000 -0400
@@ -24,7 +20,7 @@ diff -urNad gimp-resynthesizer-0.16~/Makefile gimp-resynthesizer-0.16/Makefile
all: resynth
@@ -16,9 +17,9 @@
- @echo
+ @echo
install: resynth smart-enlarge.scm smart-remove.scm
- $(GIMPTOOL) --install-bin resynth
@@ -33,6 +29,6 @@ diff -urNad gimp-resynthesizer-0.16~/Makefile gimp-resynthesizer-0.16/Makefile
+ $(GIMPTOOL) --install-admin-bin resynth
+ $(GIMPTOOL) --install-admin-script smart-enlarge.scm
+ $(GIMPTOOL) --install-admin-script smart-remove.scm
- @echo
- @echo After restarting the Gimp you should find the
- @echo following items in the pop-up image menu:
+ @echo
+ @echo After restarting the Gimp you should find the
+ @echo following items in the pop-up image menu:
diff --git a/debian/patches/10_nonconst_str_literal.dpatch b/debian/patches/10_nonconst_str_literal.patch
similarity index 64%
rename from debian/patches/10_nonconst_str_literal.dpatch
rename to debian/patches/10_nonconst_str_literal.patch
index c4098b1..924eeae 100644
--- a/debian/patches/10_nonconst_str_literal.dpatch
+++ b/debian/patches/10_nonconst_str_literal.patch
@@ -1,11 +1,7 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 10_nonconst_str_literal.dpatch by Bryan Donlan <bdon...@gmail.com>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Silence a warning caused by using a string literal in a non-const
-## DP: context.
+From: Bryan Donlan <bdon...@gmail.com>
+Subject: Silence a warning caused by using a string literal in a non-const
+ context.
-@DPATCH@
diff -urNad gimp-resynthesizer-0.16~/resynth.cc gimp-resynthesizer-0.16/resynth.cc
--- gimp-resynthesizer-0.16~/resynth.cc 2008-03-10 02:52:45.000000000 -0400
+++ gimp-resynthesizer-0.16/resynth.cc 2008-03-18 01:36:30.000000000 -0400
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..bd3d9a7
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+10_nonconst_str_literal.patch
diff --git a/debian/rules b/debian/rules
index 9e9c7be..27e1015 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,7 +9,6 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-include /usr/share/dpatch/dpatch.make
export CFLAGS
CFLAGS += -Wall -g
@@ -25,12 +24,12 @@ endif
build: build-stamp
-build-stamp: patch
+build-stamp:
dh_testdir
$(MAKE)
touch build-stamp
-clean: clean1 unpatch
+clean: clean1
clean1:
dh_testdir
dh_testroot
@@ -66,5 +65,5 @@ binary-arch: build install
dh_builddeb
binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install patch unpatch \
+.PHONY: build clean binary-indep binary-arch binary install \
clean1
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.1
