Package: gif2png
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 7455071ce70d39a9b2f0ac667a29951c61cb90b4 Mon Sep 17 00:00:00 2001
From: Jari Aalto <[email protected]>
Date: Sat, 28 Apr 2012 22:46: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 <[email protected]>
---
debian/README.source | 4 ----
debian/changelog | 9 +++++++++
debian/compat | 2 +-
debian/control | 6 +++---
debian/patches/00list | 3 ---
.../{10_fix_gif2png_c.dpatch => 10-fix-gif2png-c.patch} | 10 +++-------
...ve_unneeded_libs.dpatch => 20-remove-unneeded-libs.patch} | 8 ++------
.../{30_remove_option_t.dpatch => 30-remove-option-t.patch} | 8 ++------
debian/patches/series | 3 +++
debian/rules | 9 ++++++---
debian/source/format | 1 +
11 files changed, 30 insertions(+), 33 deletions(-)
delete mode 100644 debian/README.source
delete mode 100644 debian/patches/00list
rename debian/patches/{10_fix_gif2png_c.dpatch => 10-fix-gif2png-c.patch} (87%)
rename debian/patches/{20_remove_unneeded_libs.dpatch => 20-remove-unneeded-libs.patch} (92%)
rename debian/patches/{30_remove_option_t.dpatch => 30-remove-option-t.patch} (74%)
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 9767404..0000000
--- a/debian/README.source
+++ /dev/null
@@ -1,4 +0,0 @@
-This package uses the `dpatch' patch management solution. See
-/usr/share/doc/dpatch/README.source.gz.
-
- -- Erik Schanze <[email protected]> Sat, 5 Dec 2009 13:47:21 +0100
diff --git a/debian/changelog b/debian/changelog
index 51b1467..0ff2e7c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+gif2png (2.5.4-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 required build-arch and build-indep targets to rules file.
+
+ -- Jari Aalto <[email protected]> Sat, 28 Apr 2012 22:34:12 +0300
+
gif2png (2.5.4-2) unstable; urgency=low
* Extend 10_fix_gif2png_c.dpatch:
diff --git a/debian/compat b/debian/compat
index 45a4fb7..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-8
+9
diff --git a/debian/control b/debian/control
index 79594e2..9c1cc64 100644
--- a/debian/control
+++ b/debian/control
@@ -2,13 +2,13 @@ Source: gif2png
Section: graphics
Priority: optional
Maintainer: Erik Schanze <[email protected]>
-Standards-Version: 3.9.1
-Build-Depends: libpng-dev, debhelper (>=8), xmlto, dpatch
+Standards-Version: 3.9.3
+Build-Depends: libpng-dev, debhelper (>= 9), xmlto
Homepage: http://www.catb.org/~esr/gif2png/
Package: gif2png
Architecture: any
-Depends: ${shlibs:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
Recommends: python (>= 1.5.2)
Description: GIF -> PNG conversions
This program can convert GIF images to PNG images. It also contains
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index db92c8c..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1,3 +0,0 @@
-10_fix_gif2png_c
-20_remove_unneeded_libs
-30_remove_option_t
diff --git a/debian/patches/10_fix_gif2png_c.dpatch b/debian/patches/10-fix-gif2png-c.patch
similarity index 87%
rename from debian/patches/10_fix_gif2png_c.dpatch
rename to debian/patches/10-fix-gif2png-c.patch
index ae27e3a..cc6163d 100644
--- a/debian/patches/10_fix_gif2png_c.dpatch
+++ b/debian/patches/10-fix-gif2png-c.patch
@@ -1,11 +1,7 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 10_fix_gif2png_c.dpatch by Erik Schanze <[email protected]>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: - clarify if/else construct, because of compiler warning
-## DP: - prevent buffer overflow with strcpy, closes: #550978
+From: Erik Schanze <[email protected]>
+Subject: - clarify if/else construct, because of compiler warning.
+ Prevent buffer overflow with strcpy, closes: #550978
-@DPATCH@
diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' gif2png-2.5.4~/gif2png.c gif2png-2.5.4/gif2png.c
--- gif2png-2.5.4~/gif2png.c 2010-10-20 16:20:07.000000000 +0200
+++ gif2png-2.5.4/gif2png.c 2011-02-12 01:14:29.530909414 +0100
diff --git a/debian/patches/20_remove_unneeded_libs.dpatch b/debian/patches/20-remove-unneeded-libs.patch
similarity index 92%
rename from debian/patches/20_remove_unneeded_libs.dpatch
rename to debian/patches/20-remove-unneeded-libs.patch
index b7daa24..0f5460d 100644
--- a/debian/patches/20_remove_unneeded_libs.dpatch
+++ b/debian/patches/20-remove-unneeded-libs.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 20_remove_unneeded_libs.dpatch by Erik Schanze <[email protected]>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
+From: Erik Schanze <[email protected]>
+Subject: No description.
-@DPATCH@
diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' gif2png-2.5.4~/configure gif2png-2.5.4/configure
--- gif2png-2.5.4~/configure 2010-11-24 15:56:01.000000000 +0100
+++ gif2png-2.5.4/configure 2011-02-11 23:58:50.874800976 +0100
diff --git a/debian/patches/30_remove_option_t.dpatch b/debian/patches/30-remove-option-t.patch
similarity index 74%
rename from debian/patches/30_remove_option_t.dpatch
rename to debian/patches/30-remove-option-t.patch
index bb4c305..98dc2a4 100644
--- a/debian/patches/30_remove_option_t.dpatch
+++ b/debian/patches/30-remove-option-t.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 30_remove_option_t.dpatch by Erik Schanze <[email protected]>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Remove "-t" option from "--help" output, because it is obsolete
+From: Erik Schanze <[email protected]>
+Subject: Remove "-t" option from "--help" output, because it is obsolete
-@DPATCH@
diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' gif2png-2.5.4~/gif2png.c gif2png-2.5.4/gif2png.c
--- gif2png-2.5.4~/gif2png.c 2011-02-12 00:32:19.030806373 +0100
+++ gif2png-2.5.4/gif2png.c 2011-02-12 00:32:44.278800770 +0100
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..15134be
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,3 @@
+10-fix-gif2png-c.patch
+20-remove-unneeded-libs.patch
+30-remove-option-t.patch
diff --git a/debian/rules b/debian/rules
index b84b7ad..1f6f0c0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,7 +7,6 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-include /usr/share/dpatch/dpatch.make
CFLAGS= -Wall
@@ -28,8 +27,12 @@ ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
MAKEFLAGS += -j$(NUMJOBS)
endif
+
+build-arch: build
+build-indep: build
+
build: build-stamp
-build-stamp: patch-stamp
+build-stamp:
dh_testdir
chmod 755 configure
@@ -44,7 +47,7 @@ build-stamp: patch-stamp
touch build-stamp
-clean: unpatch
+clean:
dh_testdir
dh_testroot
# Makefile needs .deps dir to work, but it will be not there
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.10
