Package: gperiodic
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 ef3c5c46184fbbf841bc8d9893489c8037e1e01c Mon Sep 17 00:00:00 2001
From: Jari Aalto <jari.aa...@cante.net>
Date: Sat, 25 Feb 2012 08:17:35 -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/changelog | 11 +++++++++
debian/compat | 2 +-
debian/control | 4 +-
debian/patches/00list | 9 -------
...> 11_remove_DEPRECATED_flags_for_GTK_2_4.patch} | 20 +++++++----------
...sktop_file.dpatch => 12_fix_desktop_file.patch} | 9 +------
...iption.dpatch => 13_fix_zink_description.patch} | 13 +++-------
...t.dpatch => 14_fix_lithium_melting_point.patch} | 13 +++-------
...ta_set.dpatch => 15_fix_bohrium_data_set.patch} | 13 +++-------
...ch => 16_466231_remove_markup_on_console.patch} | 23 ++++++++-----------
....dpatch => 17_483586_fix_encoding_errors.patch} | 13 +++-------
...u.dpatch => 18_488461_update_Uun_and_Uuu.patch} | 14 +++--------
... => 19_488469_use_appropriate_menu_icons.patch} | 19 +++++++---------
debian/patches/series | 9 +++++++
debian/rules | 10 +++-----
debian/source/format | 1 +
16 files changed, 76 insertions(+), 107 deletions(-)
delete mode 100644 debian/patches/00list
rename debian/patches/{11_remove_DEPRECATED_flags_for_GTK_2_4.dpatch => 11_remove_DEPRECATED_flags_for_GTK_2_4.patch} (77%)
rename debian/patches/{12_fix_desktop_file.dpatch => 12_fix_desktop_file.patch} (60%)
rename debian/patches/{13_fix_zink_description.dpatch => 13_fix_zink_description.patch} (90%)
rename debian/patches/{14_fix_lithium_melting_point.dpatch => 14_fix_lithium_melting_point.patch} (87%)
rename debian/patches/{15_fix_bohrium_data_set.dpatch => 15_fix_bohrium_data_set.patch} (90%)
rename debian/patches/{16_466231_remove_markup_on_console.dpatch => 16_466231_remove_markup_on_console.patch} (57%)
rename debian/patches/{17_483586_fix_encoding_errors.dpatch => 17_483586_fix_encoding_errors.patch} (97%)
rename debian/patches/{18_488461_update_Uun_and_Uuu.dpatch => 18_488461_update_Uun_and_Uuu.patch} (91%)
rename debian/patches/{19_488469_use_appropriate_menu_icons.dpatch => 19_488469_use_appropriate_menu_icons.patch} (63%)
create mode 100644 debian/patches/series
create mode 100644 debian/source/format
diff --git a/debian/changelog b/debian/changelog
index 05cf4ff..5d0bafd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+gperiodic (2.0.10-5.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ Upgrade to packaging format "3.0 quilt".
+ * debian/rules: Remove dpatch.
+ * debian/control: (Standards-Version) Bumped to 3.9.3.
+ (Build-Depends): Update debhelper to 9.
+ * debian/patches: Convert to quilt format.
+
+ -- Jari Aalto <jari.aa...@cante.net> Sat, 25 Feb 2012 08:15:53 -0500
+
gperiodic (2.0.10-5) unstable; urgency=low
* debian/patches/11_remove_DEPRECATED_flags_for_GTK_2_4.dpatch: Adjusted.
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 deef9bf..22916cf 100644
--- a/debian/control
+++ b/debian/control
@@ -3,8 +3,8 @@ Section: science
Priority: optional
Maintainer: Debichem Team <debichem-de...@lists.alioth.debian.org>
Uploaders: Daniel Leidert (dale) <daniel.leid...@wgdd.de>
-Build-Depends: debhelper (>= 5), dpatch, libgtk2.0-dev (>= 2.6)
-Standards-Version: 3.7.3
+Build-Depends: debhelper (>= 9), libgtk2.0-dev (>= 2.6)
+Standards-Version: 3.9.3
Homepage: http://www.frantz.fi/software/gperiodic.php
Vcs-Browser: http://svn.debian.org/wsvn/debichem/
Vcs-Svn: svn+ssh://svn.debian.org/svn/debichem/unstable/gperiodic/
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index 020e8e7..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1,9 +0,0 @@
-11_remove_DEPRECATED_flags_for_GTK_2_4
-12_fix_desktop_file
-13_fix_zink_description
-14_fix_lithium_melting_point
-15_fix_bohrium_data_set
-16_466231_remove_markup_on_console
-17_483586_fix_encoding_errors
-18_488461_update_Uun_and_Uuu
-19_488469_use_appropriate_menu_icons
diff --git a/debian/patches/11_remove_DEPRECATED_flags_for_GTK_2_4.dpatch b/debian/patches/11_remove_DEPRECATED_flags_for_GTK_2_4.patch
similarity index 77%
rename from debian/patches/11_remove_DEPRECATED_flags_for_GTK_2_4.dpatch
rename to debian/patches/11_remove_DEPRECATED_flags_for_GTK_2_4.patch
index d3444ec..a11373b 100644
--- a/debian/patches/11_remove_DEPRECATED_flags_for_GTK_2_4.dpatch
+++ b/debian/patches/11_remove_DEPRECATED_flags_for_GTK_2_4.patch
@@ -1,16 +1,12 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 11_remove_DEPRECATED_flags_for_GTK_2_4.dpatch by Sebastien Bacher <seb...@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: * Makefile (CFLAGS): Remove the DEPRECATED flags to build fine with
-## DP: GTK+2.4. Add the LDFLAGS variable to give some linker flags.
-## DP:
-## DP: Added possibility to set some CFLAGS and LDFLAGS. Proposal has been
-## DP: sent to Jonas Frantz.
-## DP:
-## DP: <URL:http://packages.debian.org/changelogs/pool/main/g/gperiodic/current/changelog#versionversion2.0.7-4>
+From: Sebastien Bacher <seb...@debian.org>
+Subject: Makefile (CFLAGS): Remove the DEPRECATED flags for GTK+ 2.4.
+ Add the LDFLAGS variable to give some linker flags.
+ .
+ Added possibility to set some CFLAGS and LDFLAGS. Proposal has been
+ sent to Jonas Frantz.
+ .
+ <URL:http://packages.debian.org/changelogs/pool/main/g/gperiodic/current/changelog#versionversion2.0.7-4>
-@DPATCH@
diff -urNad gperiodic~/Makefile gperiodic/Makefile
--- gperiodic~/Makefile 2007-07-11 14:58:05.000000000 +0200
+++ gperiodic/Makefile 2008-06-30 14:45:51.000000000 +0200
diff --git a/debian/patches/12_fix_desktop_file.dpatch b/debian/patches/12_fix_desktop_file.patch
similarity index 60%
rename from debian/patches/12_fix_desktop_file.dpatch
rename to debian/patches/12_fix_desktop_file.patch
index 31114f1..5d5aab3 100644
--- a/debian/patches/12_fix_desktop_file.dpatch
+++ b/debian/patches/12_fix_desktop_file.patch
@@ -1,11 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 12_fix_desktop_file.dpatch by Daniel Leidert (dale) <daniel.leid...@wgdd.de>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Make the .desktop file compliant to the latest fd.o spec. Thus removing
-## DP: the Encoding key.
+From: Daniel Leidert (dale) <daniel.leid...@wgdd.de>
+Subject: Remove encoding to make the .desktop file compliant
-@DPATCH@
diff -urNad gperiodic~/gperiodic.desktop gperiodic/gperiodic.desktop
--- gperiodic~/gperiodic.desktop 2007-07-11 14:58:05.000000000 +0200
+++ gperiodic/gperiodic.desktop 2007-08-27 01:39:41.000000000 +0200
diff --git a/debian/patches/13_fix_zink_description.dpatch b/debian/patches/13_fix_zink_description.patch
similarity index 90%
rename from debian/patches/13_fix_zink_description.dpatch
rename to debian/patches/13_fix_zink_description.patch
index c3497f4..0ffeeb0 100644
--- a/debian/patches/13_fix_zink_description.dpatch
+++ b/debian/patches/13_fix_zink_description.patch
@@ -1,13 +1,8 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 13_fix_zink_description.dpatch by Daniel Leidert (dale) <daniel.leid...@wgdd.de>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Lothar Schmidt reported a bug in the description of zinc (Zn, 30):
-## DP: tin = Zinn (Sn, 50), zinc = Zink (Zn, 30).
-## DP:
-## DP: Upstream has been informed.
+From: Daniel Leidert (dale) <daniel.leid...@wgdd.de>
+Subject: Lothar Schmidt reported a bug in the description of zinc (Zn, 30):
+ tin = Zinn (Sn, 50), zinc = Zink (Zn, 30).
+ Upstream has been informed.
-@DPATCH@
diff -urNad gperiodic~/table_data.h gperiodic/table_data.h
--- gperiodic~/table_data.h 2007-07-11 14:58:05.000000000 +0200
+++ gperiodic/table_data.h 2007-10-24 20:17:11.000000000 +0200
diff --git a/debian/patches/14_fix_lithium_melting_point.dpatch b/debian/patches/14_fix_lithium_melting_point.patch
similarity index 87%
rename from debian/patches/14_fix_lithium_melting_point.dpatch
rename to debian/patches/14_fix_lithium_melting_point.patch
index 2819a6b..9cb3a70 100644
--- a/debian/patches/14_fix_lithium_melting_point.dpatch
+++ b/debian/patches/14_fix_lithium_melting_point.patch
@@ -1,13 +1,8 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 14_fix_lithium_melting_point.dpatch by Daniel Leidert (dale) <daniel.leid...@wgdd.de>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Miguel Martinez reported, that the shown Melting Point for Lithium is
-## DP: wrong. The correct MP is at 453.7 Kelvin.
-## DP:
-## DP: <URL:https://bugs.launchpad.net/ubuntu/+source/gperiodic/+bug/160424>
+From: Daniel Leidert (dale) <daniel.leid...@wgdd.de>
+Subject: Miguel Martinez reported, that the shown Melting Point for Lithium
+ is wrong. The correct MP is at 453.7 Kelvin.
+ <URL:https://bugs.launchpad.net/ubuntu/+source/gperiodic/+bug/160424>
-@DPATCH@
diff -urNad gperiodic~/table_data.h gperiodic/table_data.h
--- gperiodic~/table_data.h 2007-07-11 14:58:05.000000000 +0200
+++ gperiodic/table_data.h 2007-11-06 13:26:18.000000000 +0100
diff --git a/debian/patches/15_fix_bohrium_data_set.dpatch b/debian/patches/15_fix_bohrium_data_set.patch
similarity index 90%
rename from debian/patches/15_fix_bohrium_data_set.dpatch
rename to debian/patches/15_fix_bohrium_data_set.patch
index 5ce75d7..1868866 100644
--- a/debian/patches/15_fix_bohrium_data_set.dpatch
+++ b/debian/patches/15_fix_bohrium_data_set.patch
@@ -1,13 +1,8 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 15_fix_bohrium_data_set.dpatch by Daniel Leidert (dale) <daniel.leid...@wgdd.de>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: The Electronic Configuration for Bohrium is shown in the Oxidation
-## DP: States field. This patch fixes this.
-## DP:
-## DP: <URL:http://cvs.fedoraproject.org/viewcvs/*checkout*/rpms/gperiodic/devel/gperiodic-bh.patch>
+From: Daniel Leidert (dale) <daniel.leid...@wgdd.de>
+Subject: The Electronic Configuration for Bohrium is shown in the Oxidation
+ States field. This patch fixes this.
+ <URL:http://cvs.fedoraproject.org/viewcvs/*checkout*/rpms/gperiodic/devel/gperiodic-bh.patch>
-@DPATCH@
diff -urNad gperiodic~/table_data.h gperiodic/table_data.h
--- gperiodic~/table_data.h 2008-01-15 03:18:41.000000000 +0100
+++ gperiodic/table_data.h 2008-01-15 03:20:02.000000000 +0100
diff --git a/debian/patches/16_466231_remove_markup_on_console.dpatch b/debian/patches/16_466231_remove_markup_on_console.patch
similarity index 57%
rename from debian/patches/16_466231_remove_markup_on_console.dpatch
rename to debian/patches/16_466231_remove_markup_on_console.patch
index d7ea47a..29de64f 100644
--- a/debian/patches/16_466231_remove_markup_on_console.dpatch
+++ b/debian/patches/16_466231_remove_markup_on_console.patch
@@ -1,17 +1,14 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 16_466231_remove_markup_on_console.dpatch by Daniel Leidert (dale) <daniel.leid...@wgdd.de>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: gperiodic.c (gpparse_print_element_data_for_num): Using gperiodic to
-## DP: output information on the console leads to having Pango markup in the
-## DP: output. This patch uses pango_parse_markup to get the plain text and
-## DP: then g_utf8_strlen to get the string length. So we get a nice UTF-8
-## DP: output on the console. The disadvantage is, that only systems with an
-## DP: UTf-8 locale wil get this tiny output.
-## DP:
-## DP: <URL:http://bugs.debian.org/466231>
+From: Daniel Leidert (dale) <daniel.leid...@wgdd.de>
+Subject: Fix pango markup on UTF-8 output
+ gperiodic.c (gpparse_print_element_data_for_num): Using gperiodic to
+ output information on the console leads to having Pango markup in the
+ output. This patch uses pango_parse_markup to get the plain text and
+ then g_utf8_strlen to get the string length. So we get a nice UTF-8
+ output on the console. The disadvantage is, that only systems with an
+ UTf-8 locale wil get this tiny output.
+ .
+ <URL:http://bugs.debian.org/466231>
-@DPATCH@
diff -urNad gperiodic~/gperiodic.c gperiodic/gperiodic.c
--- gperiodic~/gperiodic.c 2007-07-11 15:01:34.000000000 +0200
+++ gperiodic/gperiodic.c 2008-03-06 06:41:51.000000000 +0100
diff --git a/debian/patches/17_483586_fix_encoding_errors.dpatch b/debian/patches/17_483586_fix_encoding_errors.patch
similarity index 97%
rename from debian/patches/17_483586_fix_encoding_errors.dpatch
rename to debian/patches/17_483586_fix_encoding_errors.patch
index d79e02e..5ce6ad1 100644
--- a/debian/patches/17_483586_fix_encoding_errors.dpatch
+++ b/debian/patches/17_483586_fix_encoding_errors.patch
@@ -1,13 +1,8 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 17_483586_fix_encoding_errors.dpatch by Daniel Leidert (dale) <daniel.leid...@wgdd.de>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fix badly encoded data, which will print garbage to the console. Thanks
-## DP: to Petter Reinholdtsen for the report.
-## DP:
-## DP: <URL:http://bugs.debian.org/483586>
+From: Daniel Leidert (dale) <daniel.leid...@wgdd.de>
+Subject: Fix badly encoded data, which will print garbage to the console.
+ Thanks to Petter Reinholdtsen for the report.
+ <URL:http://bugs.debian.org/483586>
-@DPATCH@
diff -urNad gperiodic~/table_data.h gperiodic/table_data.h
--- gperiodic~/table_data.h 2008-05-30 01:21:41.000000000 +0200
+++ gperiodic/table_data.h 2008-05-30 01:24:32.000000000 +0200
diff --git a/debian/patches/18_488461_update_Uun_and_Uuu.dpatch b/debian/patches/18_488461_update_Uun_and_Uuu.patch
similarity index 91%
rename from debian/patches/18_488461_update_Uun_and_Uuu.dpatch
rename to debian/patches/18_488461_update_Uun_and_Uuu.patch
index bd26fd6..98d661d 100644
--- a/debian/patches/18_488461_update_Uun_and_Uuu.dpatch
+++ b/debian/patches/18_488461_update_Uun_and_Uuu.patch
@@ -1,14 +1,8 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 18_488461_update_Uun_and_Uuu.dpatch by Daniel Leidert <daniel.leid...@wgdd.de>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Theppitak Karoonboonyanan reported that Ununnilium (Uun) and Unununium
-## DP: (Uuu) already got names accordingly to Wikipedia and sent us this
-## DP: patch (closes: #488461).
-## DP:
-## DP: <URL:http://bugs.debian.org/488461>
+From: Daniel Leidert <daniel.leid...@wgdd.de>
+Subject: Ununnilium (Uun) and Unununium (Uuu) already got names
+ Patch thanks to Theppitak Karoonboonyanan to notify about this in Wikipedia
+ (closes: #488461). <URL:http://bugs.debian.org/488461>
-@DPATCH@
diff -urNad gperiodic~/table_data.h gperiodic/table_data.h
--- gperiodic~/table_data.h 2008-06-30 14:52:31.000000000 +0200
+++ gperiodic/table_data.h 2008-06-30 14:52:54.000000000 +0200
diff --git a/debian/patches/19_488469_use_appropriate_menu_icons.dpatch b/debian/patches/19_488469_use_appropriate_menu_icons.patch
similarity index 63%
rename from debian/patches/19_488469_use_appropriate_menu_icons.dpatch
rename to debian/patches/19_488469_use_appropriate_menu_icons.patch
index a43daf2..b199ab8 100644
--- a/debian/patches/19_488469_use_appropriate_menu_icons.dpatch
+++ b/debian/patches/19_488469_use_appropriate_menu_icons.patch
@@ -1,15 +1,12 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 19_488469_use_appropriate_menu_icons.dpatch by Daniel Leidert <daniel.leid...@wgdd.de>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: gperiodic uses the OPEN icon for the Exit action, which should be the
-## DP: QUIT icon. Further the About dialog uses the HELP icon instead of the
-## DP: ABOUT icon introduced in GTK 2.6. This patch fixes the icons (closes:
-## DP: #488469). Thanks to Theppitak Karoonboonyanan.
-## DP:
-## DP: <URL:http://bugs.debian.org/488469>
+From: Daniel Leidert <daniel.leid...@wgdd.de>
+Subject: Fix icons
+ gperiodic uses the OPEN icon for the Exit action, which should be the
+ QUIT icon. Further the About dialog uses the HELP icon instead of the
+ ABOUT icon introduced in GTK 2.6. This patch fixes the icons (closes:
+ #488469). Thanks to Theppitak Karoonboonyanan.
+
+<URL:http://bugs.debian.org/488469>
-@DPATCH@
diff -urNad gperiodic~/gperiodic.c gperiodic/gperiodic.c
--- gperiodic~/gperiodic.c 2008-06-30 14:55:11.000000000 +0200
+++ gperiodic/gperiodic.c 2008-06-30 14:57:46.000000000 +0200
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..a7abb78
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,9 @@
+11_remove_DEPRECATED_flags_for_GTK_2_4.patch
+12_fix_desktop_file.patch
+13_fix_zink_description.patch
+14_fix_lithium_melting_point.patch
+15_fix_bohrium_data_set.patch
+16_466231_remove_markup_on_console.patch
+17_483586_fix_encoding_errors.patch
+18_488461_update_Uun_and_Uuu.patch
+19_488469_use_appropriate_menu_icons.patch
diff --git a/debian/rules b/debian/rules
index c6cec16..ebcc1be 100755
--- a/debian/rules
+++ b/debian/rules
@@ -13,18 +13,16 @@ else
endif
-include /usr/share/dpatch/dpatch.make
-build: patch-stamp build-stamp
-build-stamp:
+build:
dh_testdir
$(MAKE) LDFLAGS="$(LDFLAGS)" CFLAGS="$(CFLAGS)"
touch $@
-clean: unpatch
+clean:
dh_testdir
dh_testroot
- rm -f build-stamp patch-stamp
+ rm -f build-stamp
$(MAKE) clean
dh_clean
@@ -34,7 +32,7 @@ install: build
dh_clean -k
dh_installdirs
$(MAKE) install bindir=/usr/bin datadir=/usr/share \
- enable_nls=1 DESTDIR=$(CURDIR)/debian/$(PACKAGE)
+ enable_nls=1 DESTDIR=$(CURDIR)/debian/$(PACKAGE)
# Build architecture-independent files here.
binary-indep: 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
