Package: igal2
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 9ac75b17fe9cdbb0bede709e754e03efb5dabf71 Mon Sep 17 00:00:00 2001
From: Jari Aalto <jari.aa...@cante.net>
Date: Sat, 5 May 2012 17:40:47 +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 | 38 --------------------
debian/changelog | 10 ++++++
debian/compat | 2 +-
debian/control | 6 ++--
debian/copyright | 2 +-
debian/igal2.docs | 1 -
debian/patches/00list | 3 --
debian/patches/{01paths.dpatch => 10-paths.patch} | 8 ++---
.../patches/{01animgif.dpatch => 20-animgif.patch} | 8 ++---
debian/patches/{02imlib.dpatch => 30-imlib.patch} | 8 ++---
debian/patches/series | 3 ++
debian/rules | 12 ++++---
debian/source/format | 1 +
13 files changed, 32 insertions(+), 70 deletions(-)
delete mode 100644 debian/README.source
delete mode 100644 debian/igal2.docs
delete mode 100644 debian/patches/00list
rename debian/patches/{01paths.dpatch => 10-paths.patch} (94%)
rename debian/patches/{01animgif.dpatch => 20-animgif.patch} (73%)
rename debian/patches/{02imlib.dpatch => 30-imlib.patch} (98%)
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 fc98b3d..0000000
--- a/debian/README.source
+++ /dev/null
@@ -1,38 +0,0 @@
-This package uses dpatch to manage all modifications to the upstream
-source. Changes are stored in the source package as diffs in
-debian/patches and applied during the build.
-
-To get the fully patched source after unpacking the source package, cd
-to the root level of the source package and run:
-
- debian/rules patch
-
-Removing a patch is as simple as removing its entry from the
-debian/patches/00list file, and please also remove the patch file
-itself.
-
-Creating a new patch is done with "dpatch-edit-patch patch XX_patchname"
-where you should replace XX with a new number and patchname with a
-descriptive shortname of the patch. You can then simply edit all the
-files your patch wants to edit, and then simply "exit 0" from the shell
-to actually create the patch file.
-
-To tweak an already existing patch, call "dpatch-edit-patch XX_patchname"
-and replace XX_patchname with the actual filename from debian/patches
-you want to use.
-
-To clean up afterwards again, "debian/rules unpatch" will do the
-work for you - or you can of course choose to call
-"fakeroot debian/rules clean" all together.
-
-
----
-
-this documentation is part of dpatch package, and may be used by
-packages using dpatch to comply with policy on README.source. This
-documentation is meant to be useful to users who are not proficient in
-dpatch in doing work with dpatch-based packages. Please send any
-improvements to the BTS of dpatch package.
-
-original text by Gerfried Fuchs, edited by Junichi Uekawa <dan...@debian.org>
-10 Aug 2008.
diff --git a/debian/changelog b/debian/changelog
index e3d4ec2..9f787ae 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+igal2 (2.0-5.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; use dh_prep in rules file.
+ * Fix copyright-refers-to-symlink-license (Lintian).
+
+ -- Jari Aalto <jari.aa...@cante.net> Sat, 05 May 2012 17:37:30 +0300
+
igal2 (2.0-5) unstable; urgency=low
* lifted standards version
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 416b988..22b65d1 100644
--- a/debian/control
+++ b/debian/control
@@ -2,13 +2,13 @@ Source: igal2
Section: web
Priority: optional
Maintainer: Alexander Zangerl <a...@debian.org>
-Build-Depends: debhelper (>= 4.0.2), dpatch
-Standards-Version: 3.9.1
+Build-Depends: debhelper (>= 9)
+Standards-Version: 3.9.3
Homepage: http://igal.trexler.at/
Package: igal2
Architecture: all
-Depends: libimage-size-perl, libimage-imlib2-perl, ${perl:Depends}
+Depends: ${misc:Depends}, libimage-size-perl, libimage-imlib2-perl, ${perl:Depends}
Replaces: igal
Provides: igal
Conflicts: igal
diff --git a/debian/copyright b/debian/copyright
index 40f52e1..1789958 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -17,4 +17,4 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
On Debian systems, the complete text of the GNU General Public
-License can be found in /usr/share/common-licenses/GPL file.
+License can be found in /usr/share/common-licenses/GPL-2 file.
diff --git a/debian/igal2.docs b/debian/igal2.docs
deleted file mode 100644
index 5323396..0000000
--- a/debian/igal2.docs
+++ /dev/null
@@ -1 +0,0 @@
-debian/README.source
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index 553ee78..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1,3 +0,0 @@
-01paths
-# 01animgif
-02imlib
diff --git a/debian/patches/01paths.dpatch b/debian/patches/10-paths.patch
similarity index 94%
rename from debian/patches/01paths.dpatch
rename to debian/patches/10-paths.patch
index da117bd..56e27d9 100644
--- a/debian/patches/01paths.dpatch
+++ b/debian/patches/10-paths.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 01paths.dpatch by <a...@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: adjust paths for debian
+From: <a...@debian.org>
+Subject: adjust paths for debian
-@DPATCH@
diff -urNad igal2-2.0~/Makefile igal2-2.0/Makefile
--- igal2-2.0~/Makefile 2008-11-28 11:36:31.000000000 +1000
+++ igal2-2.0/Makefile 2008-11-28 11:36:31.351523445 +1000
diff --git a/debian/patches/01animgif.dpatch b/debian/patches/20-animgif.patch
similarity index 73%
rename from debian/patches/01animgif.dpatch
rename to debian/patches/20-animgif.patch
index 0f3f4fb..274668d 100644
--- a/debian/patches/01animgif.dpatch
+++ b/debian/patches/20-animgif.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 01animgif.dpatch by <a...@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: use the first frame of animated gifs for thumbs
+From: <a...@debian.org>
+Subject: use the first frame of animated gifs for thumbs
-@DPATCH@
diff -urNad igal2-2.0~/igal2 igal2-2.0/igal2
--- igal2-2.0~/igal2 2009-08-16 14:18:35.968632269 +1000
+++ igal2-2.0/igal2 2009-08-16 14:18:57.371540748 +1000
diff --git a/debian/patches/02imlib.dpatch b/debian/patches/30-imlib.patch
similarity index 98%
rename from debian/patches/02imlib.dpatch
rename to debian/patches/30-imlib.patch
index 25531b9..5844871 100644
--- a/debian/patches/02imlib.dpatch
+++ b/debian/patches/30-imlib.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 02imlib.dpatch by <a...@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
+From: <a...@debian.org>
+Subject: No description.
-@DPATCH@
diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' igal2-2.0~/igal2 igal2-2.0/igal2
--- igal2-2.0~/igal2 2011-04-10 00:19:15.375646479 +1000
+++ igal2-2.0/igal2 2011-04-10 00:21:17.590777205 +1000
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..8973fda
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,3 @@
+10-paths.patch
+# 20-animgif.patch
+30-imlib.patch
diff --git a/debian/rules b/debian/rules
index ee03ea0..4c0d2bc 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,15 +4,17 @@
PACKAGE=$(shell dh_listpackages)
TMP=$(CURDIR)/debian/$(PACKAGE)
-# to get the patch application targets
-include /usr/share/dpatch/dpatch.make
+# to get the application targets
+
+build-arch: build
+build-indep: build
build: build-stamp
-build-stamp: patch
+build-stamp:
dh_testdir
touch build-stamp
-clean: unpatch
+clean:
dh_testdir
dh_testroot
rm -f build-stamp
@@ -21,7 +23,7 @@ clean: unpatch
install: build
dh_testdir
dh_testroot
- dh_clean -k
+ dh_prep
$(MAKE) install DESTDIR=$(TMP)/usr
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
