Package: grpn
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 f0cff7fc25d9e23c6e57b1c24e9b20b0d377fa65 Mon Sep 17 00:00:00 2001
From: Jari Aalto <jari.aa...@cante.net>
Date: Wed, 11 Apr 2012 13:03:33 +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/changelog | 10 +++++++
debian/compat | 2 +-
debian/control | 4 +--
debian/patches/00list | 3 --
.../{01_fix_locale.dpatch => 01_fix_locale.patch} | 25 ++---------------
...2_add_includes.dpatch => 02_add_includes.patch} | 8 ++----
debian/patches/{03_gtk2.dpatch => 03_gtk2.patch} | 8 ++----
debian/patches/series | 3 ++
debian/rules | 29 +++++++-------------
debian/source/format | 1 +
10 files changed, 33 insertions(+), 60 deletions(-)
delete mode 100644 debian/patches/00list
rename debian/patches/{01_fix_locale.dpatch => 01_fix_locale.patch} (69%)
rename debian/patches/{02_add_includes.dpatch => 02_add_includes.patch} (92%)
rename debian/patches/{03_gtk2.dpatch => 03_gtk2.patch} (90%)
create mode 100644 debian/patches/series
create mode 100644 debian/source/format
diff --git a/debian/changelog b/debian/changelog
index cacd301..b81b912 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+grpn (1.1.2-3.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.1 and debhelper to 9.
+ * Add build-arch and build-indep targets; use dh_prep in rules file.
+ * Fix dh_desktop-is-deprecated (Lintian).
+
+ -- Jari Aalto <jari.aa...@cante.net> Wed, 11 Apr 2012 12:44:41 +0300
+
grpn (1.1.2-3) unstable; urgency=low
* "Thank you, Barry" release
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 c7af0b3..c2e5c93 100644
--- a/debian/control
+++ b/debian/control
@@ -2,8 +2,8 @@ Source: grpn
Section: math
Priority: extra
Maintainer: Wartan Hachaturow <w...@debian.org>
-Build-Depends: debhelper (>= 5), dpatch, libgtk2.0-dev
-Standards-Version: 3.8.0
+Build-Depends: debhelper (>= 9), libgtk2.0-dev
+Standards-Version: 3.9.3.1
Package: grpn
Architecture: any
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index ceeadf9..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1,3 +0,0 @@
-01_fix_locale.dpatch
-02_add_includes.dpatch
-03_gtk2.dpatch
diff --git a/debian/patches/01_fix_locale.dpatch b/debian/patches/01_fix_locale.patch
similarity index 69%
rename from debian/patches/01_fix_locale.dpatch
rename to debian/patches/01_fix_locale.patch
index bb902ce..08f1b1a 100644
--- a/debian/patches/01_fix_locale.dpatch
+++ b/debian/patches/01_fix_locale.patch
@@ -1,26 +1,5 @@
-#! /bin/sh -e
-## 01_fix_locale.dpatch by Wartan Hachaturow <w...@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fix problems with locale.
-
-[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
-patch_opts="${patch_opts:--f --no-backup-if-mismatch ${2:+-d $2}}"
-
-if [ $# -lt 1 ]; then
- echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
- exit 1
-fi
-case "$1" in
- -patch) patch $patch_opts -p1 < $0;;
- -unpatch) patch $patch_opts -p1 -R < $0;;
- *)
- echo >&2 "`basename $0`: script expects -patch|-unpatch as argum
-ent"
- exit 1;;
-esac
-
-exit 0
+From: Wartan Hachaturow <w...@debian.org>
+Subject: Fix problems with locale.
diff -urNad grpn-1.1.2/funcs.c /tmp/dpep.7TXnG1/grpn-1.1.2/funcs.c
--- grpn-1.1.2/funcs.c 2004-10-17 15:55:23.000000000 +0400
diff --git a/debian/patches/02_add_includes.dpatch b/debian/patches/02_add_includes.patch
similarity index 92%
rename from debian/patches/02_add_includes.dpatch
rename to debian/patches/02_add_includes.patch
index d3f9005..81322a8 100644
--- a/debian/patches/02_add_includes.dpatch
+++ b/debian/patches/02_add_includes.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 02_add_includes.dpatch by Michael Bienia <ge...@ubuntu.com>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Add missing includes
+From: Michael Bienia <ge...@ubuntu.com>
+Subject: Add missing includes
-@DPATCH@
diff -Nur grpn-1.1.2/callback_menu.c grpn-1.1.2.patched/callback_menu.c
--- grpn-1.1.2/callback_menu.c 2002-04-04 05:46:10.000000000 +0200
diff --git a/debian/patches/03_gtk2.dpatch b/debian/patches/03_gtk2.patch
similarity index 90%
rename from debian/patches/03_gtk2.dpatch
rename to debian/patches/03_gtk2.patch
index 6544df7..14e3a04 100644
--- a/debian/patches/03_gtk2.dpatch
+++ b/debian/patches/03_gtk2.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 03_gtk2.dpatch by Barry deFreese <bdefre...@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Gtk2 port
+From: Barry deFreese <bdefre...@debian.org>
+Subject: Gtk2 port
-@DPATCH@
diff --git a/Makefile b/Makefile
index 10e8718..f51dde5 100644
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..c8114cf
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,3 @@
+01_fix_locale.patch
+02_add_includes.patch
+03_gtk2.patch
diff --git a/debian/rules b/debian/rules
index d4d4a6a..74bc264 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,15 +7,18 @@
PACKAGE=grpn
-include /usr/share/dpatch/dpatch.make
+
+
+build-arch: build
+build-indep: build
build: build-stamp
-build-stamp: patch
+build-stamp:
dh_testdir
$(MAKE)
touch build-stamp
-clean: clean1 unpatch
+clean: clean1
clean1:
dh_testdir
@@ -28,9 +31,9 @@ install: install-stamp
install-stamp: build-stamp
dh_testdir
dh_testroot
- dh_clean -k
+ dh_prep
dh_installdirs
- dh_desktop -pgrpn
+# dh_desktop -pgrpn
install -D -m644 debian/grpn.desktop $(CURDIR)/debian/$(PACKAGE)/usr/share/applications/grpn.desktop
install -o root -m 0755 $(CURDIR)/$(PACKAGE) $(CURDIR)/debian/$(PACKAGE)/usr/bin/
@@ -56,21 +59,9 @@ binary-arch: build install
dh_md5sums
dh_builddeb
-source diff:
+source diff:
@echo >&2 'source and diff are obsolete - use dpkg-source -b'; false
binary: binary-indep binary-arch
-# And now the simple things for dpatch. Here we only apply/unapply the patches.
-
-patch: patch-stamp
-
-patch-stamp:
- dpatch apply-all
- touch patch-stamp
-
-unpatch:
- dpatch deapply-all
- rm -rf patch-stamp debian/patched
-
-.PHONY: build clean binary-indep binary-arch binary patch unpatch clean1
+.PHONY: build clean binary-indep binary-arch binary 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.5
