Package: tilda
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 baff34fd10251c87cbb0ada3d9906a43e8350602 Mon Sep 17 00:00:00 2001
From: Jari Aalto <[email protected]>
Date: Wed, 29 Feb 2012 11:01: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 <[email protected]>
---
debian/changelog | 8 ++++++++
debian/compat | 2 +-
debian/control | 4 ++--
debian/patches/00list | 3 ---
...general-fixes.dpatch => 01_general-fixes.patch} | 7 ++-----
....dpatch => 02_update-italian-translation.patch} | 7 ++-----
..._realize.dpatch => 03_gtk_window_realize.patch} | 10 +++-------
debian/patches/series | 3 +++
debian/rules | 16 ++--------------
debian/source/format | 1 +
10 files changed, 24 insertions(+), 37 deletions(-)
delete mode 100644 debian/patches/00list
rename debian/patches/{01_general-fixes.dpatch => 01_general-fixes.patch} (91%)
rename debian/patches/{02_update-italian-translation.dpatch => 02_update-italian-translation.patch} (98%)
rename debian/patches/{03_gtk_window_realize.dpatch => 03_gtk_window_realize.patch} (68%)
create mode 100644 debian/patches/series
create mode 100644 debian/source/format
diff --git a/debian/changelog b/debian/changelog
index 3d4d86f..526fe7b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+tilda (0.09.6-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.
+
+ -- Jari Aalto <[email protected]> Wed, 29 Feb 2012 10:58:51 -0500
+
tilda (0.09.6-2) unstable; urgency=low
* Fix "segfaults on startup" with 03_gtk_window_realize.dpatch
diff --git a/debian/compat b/debian/compat
index 1e8b314..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-6
+9
diff --git a/debian/control b/debian/control
index 1b8efbf..576e095 100644
--- a/debian/control
+++ b/debian/control
@@ -3,8 +3,8 @@ Section: x11
Priority: optional
Maintainer: Davide Truffa <[email protected]>
Uploaders: Filippo Giunchedi <[email protected]>
-Build-Depends: debhelper (>= 6), autotools-dev, pkg-config, libgtk2.0-dev, libglade2-dev, libvte-dev, libconfuse-dev, dpatch, flex
-Standards-Version: 3.8.0
+Build-Depends: debhelper (>= 9), autotools-dev, pkg-config, libgtk2.0-dev, libglade2-dev, libvte-dev, libconfuse-dev, flex
+Standards-Version: 3.9.3
Homepage: http://tilda.sourceforge.net
Package: tilda
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index 605bd84..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1,3 +0,0 @@
-01_general-fixes.dpatch
-02_update-italian-translation.dpatch
-03_gtk_window_realize.dpatch
diff --git a/debian/patches/01_general-fixes.dpatch b/debian/patches/01_general-fixes.patch
similarity index 91%
rename from debian/patches/01_general-fixes.dpatch
rename to debian/patches/01_general-fixes.patch
index b234ecf..c325810 100644
--- a/debian/patches/01_general-fixes.dpatch
+++ b/debian/patches/01_general-fixes.patch
@@ -1,9 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 01_general-fixes.dpatch
-##
-## DP: Misc fixes
+From: Unknown
+Subject: Misc fixes
-@DPATCH@
diff -Nur tilda-0.09.6-orig/src/wizard.c tilda-0.09.6/src/wizard.c
--- tilda-0.09.6-orig/src/wizard.c 2008-01-24 08:20:26.000000000 +0100
diff --git a/debian/patches/02_update-italian-translation.dpatch b/debian/patches/02_update-italian-translation.patch
similarity index 98%
rename from debian/patches/02_update-italian-translation.dpatch
rename to debian/patches/02_update-italian-translation.patch
index 09649a2..75e4d9e 100644
--- a/debian/patches/02_update-italian-translation.dpatch
+++ b/debian/patches/02_update-italian-translation.patch
@@ -1,9 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 02_update-italian-translation.dpatch
-##
-## DP: Update italian translation
+From: Unknown
+Subject: Update italian translation
-@DPATCH@
diff -Nur tilda-0.09.6-orig/po/it.po tilda-0.09.6/po/it.po
--- tilda-0.09.6-orig/po/it.po 2008-04-28 12:41:42.000000000 +0200
diff --git a/debian/patches/03_gtk_window_realize.dpatch b/debian/patches/03_gtk_window_realize.patch
similarity index 68%
rename from debian/patches/03_gtk_window_realize.dpatch
rename to debian/patches/03_gtk_window_realize.patch
index c7d1e89..2717e5d 100644
--- a/debian/patches/03_gtk_window_realize.dpatch
+++ b/debian/patches/03_gtk_window_realize.patch
@@ -1,11 +1,7 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 03_gtk_window_realize.dpatch by Chris Coulson <[email protected]>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Make sure that GDK resources are created for the main GtkWindow before
-## DP: trying to access them, otherwise it will just crash
+From: Chris Coulson <[email protected]>
+Subject: Make sure that GDK resources are created for the main GtkWindow before
+trying to access them, otherwise it will just crash
-@DPATCH@
diff -urNad tilda-0.09.6~/src/tilda_window.c tilda-0.09.6/src/tilda_window.c
--- tilda-0.09.6~/src/tilda_window.c 2008-01-17 22:07:39.000000000 +0000
+++ tilda-0.09.6/src/tilda_window.c 2009-10-09 18:05:57.081042433 +0100
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..b0683ac
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,3 @@
+01_general-fixes.patch
+02_update-italian-translation.patch
+03_gtk_window_realize.patch
diff --git a/debian/rules b/debian/rules
index 2a3b934..360468e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -17,7 +17,7 @@ endif
-config.status: patch configure
+config.status: configure
dh_testdir
ifneq "$(wildcard /usr/share/misc/config.sub)" ""
cp -f /usr/share/misc/config.sub config.sub
@@ -35,9 +35,7 @@ build-stamp: config.status
$(MAKE)
touch $@
-clean: clean-patched unpatch
-
-clean-patched:
+clean:
dh_testdir
dh_testroot
rm -f build-stamp
@@ -56,16 +54,6 @@ install: build
mv $(CURDIR)/debian/tilda/usr/share/tilda.glade \
$(CURDIR)/debian/tilda/usr/share/tilda/
-patch: patch-stamp
-
-patch-stamp:
- dpatch apply-all
- dpatch cat-all >patch-stamp
-
-unpatch:
- dpatch deapply-all
- rm -rf patch-stamp debian/patched
-
binary-indep: build install
binary-arch: build install
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
