>From bf811ab1c218b74f6c80778b82ce1e3f089e0330 Mon Sep 17 00:00:00 2001
From: Jari Aalto <jari.aalto@cante.net>
Date: Sat, 25 Feb 2012 04:09:18 -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.aalto@cante.net>
---
 debian/README.source                               |    7 -----
 debian/changelog                                   |   11 ++++++++
 debian/compat                                      |    2 +-
 debian/control                                     |    4 +-
 debian/patches/00list                              |    7 -----
 ...=> 01_fix_bug_380210_fix_buffer_overflow.patch} |   12 +++------
 ...n.dpatch => 02_fix_locale_initialization.patch} |   12 +++------
 ...es.dpatch => 03_fix_bond_and_arrow_fixes.patch} |   13 +++-------
 ...10_fix_export_and_export_utils_detection.patch} |   26 ++++++++-----------
 ...fix_makefiles.dpatch => 90_fix_makefiles.patch} |   22 +++++++----------
 ...atch => 91_translation_updates_and_fixes.patch} |    0
 ...atch => 92_fix_bug_536388_fix_export_eps.patch} |   13 +++-------
 debian/patches/series                              |    7 +++++
 debian/rules                                       |    7 ++---
 debian/source/format                               |    1 +
 15 files changed, 61 insertions(+), 83 deletions(-)
 delete mode 100644 debian/README.source
 delete mode 100644 debian/patches/00list
 rename debian/patches/{01_fix_bug_380210_fix_buffer_overflow.dpatch => 01_fix_bug_380210_fix_buffer_overflow.patch} (62%)
 rename debian/patches/{02_fix_locale_initialization.dpatch => 02_fix_locale_initialization.patch} (58%)
 rename debian/patches/{03_fix_bond_and_arrow_fixes.dpatch => 03_fix_bond_and_arrow_fixes.patch} (73%)
 rename debian/patches/{04_fix_bug_380210_fix_export_and_export_utils_detection.dpatch => 04_fix_bug_380210_fix_export_and_export_utils_detection.patch} (92%)
 rename debian/patches/{90_fix_makefiles.dpatch => 90_fix_makefiles.patch} (82%)
 rename debian/patches/{91_translation_updates_and_fixes.dpatch => 91_translation_updates_and_fixes.patch} (100%)
 rename debian/patches/{92_fix_bug_536388_fix_export_eps.dpatch => 92_fix_bug_536388_fix_export_eps.patch} (56%)
 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 e714c53..0000000
--- a/debian/README.source
+++ /dev/null
@@ -1,7 +0,0 @@
-easychem source for Debian
---------------------------
-
-This package uses the `dpatch' patch management solution. See
-/usr/share/doc/dpatch/README.source.gz.
-
- -- Daniel Leidert (dale) <daniel.leidert@wgdd.de>, Aug 2009
diff --git a/debian/changelog b/debian/changelog
index 36bdeb9..f863c95 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+easychem (0.6-6.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.aalto@cante.net>  Sat, 25 Feb 2012 03:25:56 -0500
+
 easychem (0.6-6) unstable; urgency=low
 
   * debian/control (Build-Depends): Dropped toolchain to produce manual page
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 5ac8132..0cf4e5a 100644
--- a/debian/control
+++ b/debian/control
@@ -4,8 +4,8 @@ Priority: optional
 Maintainer: Debichem Team <debichem-devel@lists.alioth.debian.org>
 Uploaders: Michael Banck <mbanck@debian.org>,
  Daniel Leidert (dale) <daniel.leidert@wgdd.de>
-Build-Depends: debhelper (>= 5), dpatch, gettext, libgtk2.0-dev
-Standards-Version: 3.8.3
+Build-Depends: debhelper (>= 9), gettext, libgtk2.0-dev
+Standards-Version: 3.9.3
 Homepage: http://easychem.sourceforge.net
 Vcs-Browser: http://svn.debian.org/wsvn/debichem/
 Vcs-Svn: svn://svn.debian.org/svn/debichem/unstable/easychem/
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index fa03fde..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1,7 +0,0 @@
-01_fix_bug_380210_fix_buffer_overflow
-02_fix_locale_initialization
-03_fix_bond_and_arrow_fixes
-04_fix_bug_380210_fix_export_and_export_utils_detection
-90_fix_makefiles
-91_translation_updates_and_fixes
-92_fix_bug_536388_fix_export_eps
diff --git a/debian/patches/01_fix_bug_380210_fix_buffer_overflow.dpatch b/debian/patches/01_fix_bug_380210_fix_buffer_overflow.patch
similarity index 62%
rename from debian/patches/01_fix_bug_380210_fix_buffer_overflow.dpatch
rename to debian/patches/01_fix_bug_380210_fix_buffer_overflow.patch
index fdd505f..9c6011c 100644
--- a/debian/patches/01_fix_bug_380210_fix_buffer_overflow.dpatch
+++ b/debian/patches/01_fix_bug_380210_fix_buffer_overflow.patch
@@ -1,12 +1,8 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 01_fix_bug_380210_fix_buffer_overflow.dpatch by Francois-Xavier Coudert.
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: * export.c (eps_write): Fixes a buffer overflow (crashes
-## DP:   easychem) when trying to export a formula to either eps or pdf
-## DP:   format. This bug was found by Fabian Greffrath.
+From: Francois-Xavier Coudert.
+Subject: * export.c (eps_write): Fixes a buffer overflow
+ Crash happens when trying to export a formula to either eps or pdf
+ format. This bug was found by Fabian Greffrath.
 
-@DPATCH@
 diff -urNad easychem-0.6~/export.c easychem-0.6/export.c
 --- easychem-0.6~/export.c	2006-11-14 22:31:38.000000000 +0100
 +++ easychem-0.6/export.c	2006-11-14 23:12:47.000000000 +0100
diff --git a/debian/patches/02_fix_locale_initialization.dpatch b/debian/patches/02_fix_locale_initialization.patch
similarity index 58%
rename from debian/patches/02_fix_locale_initialization.dpatch
rename to debian/patches/02_fix_locale_initialization.patch
index 8f9bc4e..7393c0b 100644
--- a/debian/patches/02_fix_locale_initialization.dpatch
+++ b/debian/patches/02_fix_locale_initialization.patch
@@ -1,12 +1,8 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 02_fix_setlocale_call.dpatch by Daniel Leidert (dale) <daniel.leidert@wgdd.de>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: * easychem.c (main): Fix setlocale call. Fix `Gtk-WARNING **: Invalid
-## DP:   input string' and `Pango-WARNING **: Invalid UTF-8 string passed to
-## DP:   pango_layout_set_text()'.
+From: Daniel Leidert (dale) <daniel.leidert@wgdd.de>
+Subject: easychem.c (main): Fix setlocale call.
+ Fix `Gtk-WARNING **: Invalid input string' and `Pango-WARNING **:
+ Invalid UTF-8 string passed to pango_layout_set_text()'.
 
-@DPATCH@
 diff -urNad easychem-0.6~/easychem.c easychem-0.6/easychem.c
 --- easychem-0.6~/easychem.c	2006-11-15 00:39:57.000000000 +0100
 +++ easychem-0.6/easychem.c	2006-11-15 00:47:36.000000000 +0100
diff --git a/debian/patches/03_fix_bond_and_arrow_fixes.dpatch b/debian/patches/03_fix_bond_and_arrow_fixes.patch
similarity index 73%
rename from debian/patches/03_fix_bond_and_arrow_fixes.dpatch
rename to debian/patches/03_fix_bond_and_arrow_fixes.patch
index d948f76..648a9ae 100644
--- a/debian/patches/03_fix_bond_and_arrow_fixes.dpatch
+++ b/debian/patches/03_fix_bond_and_arrow_fixes.patch
@@ -1,13 +1,8 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 03_fix_bond_and_arrow_fixes.dpatch by Guillaume Burel.
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: * bonds.c (add_bond): Set the ending head by default, when drawing an
-## DP:   arrow.
-## DP: * dialogs.c (edit_bond): Swap the beginning/ending arrow heads, which
-## DP:   now fit, what the user sees.
+From: Guillaume Burel.
+Subject: bonds.c (add_bond): Set the ending head by default, when drawing an
+ arrow. dialogs.c (edit_bond): Swap the beginning/ending arrow heads, which
+ now fit, what the user sees.
 
-@DPATCH@
 diff -urNad easychem-0.6~/bonds.c easychem-0.6/bonds.c
 --- easychem-0.6~/bonds.c	2005-05-04 10:10:07.000000000 +0200
 +++ easychem-0.6/bonds.c	2006-11-14 22:18:34.000000000 +0100
diff --git a/debian/patches/04_fix_bug_380210_fix_export_and_export_utils_detection.dpatch b/debian/patches/04_fix_bug_380210_fix_export_and_export_utils_detection.patch
similarity index 92%
rename from debian/patches/04_fix_bug_380210_fix_export_and_export_utils_detection.dpatch
rename to debian/patches/04_fix_bug_380210_fix_export_and_export_utils_detection.patch
index 10583f1..2e16149 100644
--- a/debian/patches/04_fix_bug_380210_fix_export_and_export_utils_detection.dpatch
+++ b/debian/patches/04_fix_bug_380210_fix_export_and_export_utils_detection.patch
@@ -1,19 +1,15 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 04_fix_bug_380210_fix_export_and_export_utils_detection.dpatch by
-##   Guillaume Burel.
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: * bonds.c (save_list_bonds, load_list_bonds): Temporarily set LC_NUMERIC
-## DP:   to ``C" to fix a freeze when trying to run the export function
-## DP:   (closes: #380210, Malone #71118).
-## DP: * export.c (eps_write, fig_export): Ditto.
-## DP:   (fig_pstoedit_export): Bug-fix.
-## DP: * detect.c (detect_gs, detect_pstoedit): Fix buggy detection routines.
-## DP: * postscript/cm_common.ps: Backported from CVS.
-## DP: * postscript/preamble.ps: Ditto.
-## DP: * postscript/times.ps: Ditto.
+From: Daniel Leidert (dale) <daniel.leidert@wgdd.de>
+Subject:
+ * bonds.c (save_list_bonds, load_list_bonds): Temporarily set LC_NUMERIC
+   to ``C" to fix a freeze when trying to run the export function
+   (closes: #380210, Malone #71118).
+ * export.c (eps_write, fig_export): Ditto.
+   (fig_pstoedit_export): Bug-fix.
+ * detect.c (detect_gs, detect_pstoedit): Fix buggy detection routines.
+ * postscript/cm_common.ps: Backported from CVS.
+ * postscript/preamble.ps: Ditto.
+ * postscript/times.ps: Ditto.
 
-@DPATCH@
 diff -urNad easychem-0.6~/bonds.c easychem-0.6/bonds.c
 --- easychem-0.6~/bonds.c	2006-11-14 22:49:00.000000000 +0100
 +++ easychem-0.6/bonds.c	2006-11-14 22:49:00.000000000 +0100
diff --git a/debian/patches/90_fix_makefiles.dpatch b/debian/patches/90_fix_makefiles.patch
similarity index 82%
rename from debian/patches/90_fix_makefiles.dpatch
rename to debian/patches/90_fix_makefiles.patch
index 9fc2ac5..3c12d71 100644
--- a/debian/patches/90_fix_makefiles.dpatch
+++ b/debian/patches/90_fix_makefiles.patch
@@ -1,15 +1,11 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 90_fix_makefiles_install_location.dpatch by Daniel Leidert (dale) <daniel.leidert@wgdd.de>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: This patch simply fixes some directory values and allows a correct
-## DP: installation of the binary and the translations (all done later using
-## DP: dh_install). Also respect the CFLAGS set in debian/rules.
-## DP:
-## DP: Also fix #436782 and respect/handle nostrip build option (policy 10.1).
-## DP: See <URL:http://bugs.debian.org/436782>.
+From: Daniel Leidert (dale) <daniel.leidert@wgdd.de>
+Subject: Fix some directory values, correct binary and translation install
+ All installs are later done using dh_install. Respect the CFLAGS
+ set in debian/rules.
+ .
+ Also fix #436782 and respect/handle nostrip build option (policy 10.1).
+ See <URL:http://bugs.debian.org/436782>.
 
-@DPATCH@
 diff -urNad easychem~/Makefile.linux easychem/Makefile.linux
 --- easychem~/Makefile.linux	2005-05-04 10:10:07.000000000 +0200
 +++ easychem/Makefile.linux	2007-12-18 01:43:14.000000000 +0100
@@ -46,9 +42,9 @@ diff -urNad easychem~/Makefile.linux easychem/Makefile.linux
 +	# strip easychem # don't strip, see bug #436782
  
  clean: FORCE
- 	-cd graph; make clean
+	-cd graph; make clean
 @@ -38,21 +39,21 @@
- 	-rm $(OBJECTS) easychem
+	-rm $(OBJECTS) easychem
  
  export.o: export.c common.h bonds.h postscript/
 -	$(CC) $(GTK_FLAGS) $(C_FLAGS) -c export.c
diff --git a/debian/patches/91_translation_updates_and_fixes.dpatch b/debian/patches/91_translation_updates_and_fixes.patch
similarity index 100%
rename from debian/patches/91_translation_updates_and_fixes.dpatch
rename to debian/patches/91_translation_updates_and_fixes.patch
diff --git a/debian/patches/92_fix_bug_536388_fix_export_eps.dpatch b/debian/patches/92_fix_bug_536388_fix_export_eps.patch
similarity index 56%
rename from debian/patches/92_fix_bug_536388_fix_export_eps.dpatch
rename to debian/patches/92_fix_bug_536388_fix_export_eps.patch
index d4c3d87..f2571f7 100644
--- a/debian/patches/92_fix_bug_536388_fix_export_eps.dpatch
+++ b/debian/patches/92_fix_bug_536388_fix_export_eps.patch
@@ -1,13 +1,8 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 92_fix_bug_536388_fix_export_eps.dpatch by Mickael Profeta <profeta@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: when exporting to eps the position and size of some bonds
-## DP: where wrongly calculated due to a swap in argument.
-## DP:
-## DP: <URL:http://bugs.debian.org/536388>
+From: Mickael Profeta <profeta@debian.org>
+Subject: when exporting to eps the position and size of some bonds
+ where wrongly calculated due to a swap in argument.
+ <URL:http://bugs.debian.org/536388>
 
-@DPATCH@
 diff -urNad easychem-0.6~/postscript/preamble.ps easychem-0.6/postscript/preamble.ps
 --- easychem-0.6~/postscript/preamble.ps	2005-05-04 10:10:07.000000000 +0200
 +++ easychem-0.6/postscript/preamble.ps	2009-07-09 17:13:05.000000000 +0200
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..3443733
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,7 @@
+01_fix_bug_380210_fix_buffer_overflow.patch
+02_fix_locale_initialization.patch
+03_fix_bond_and_arrow_fixes.patch
+04_fix_bug_380210_fix_export_and_export_utils_detection.patch
+90_fix_makefiles.patch
+91_translation_updates_and_fixes.patch
+92_fix_bug_536388_fix_export_eps.patch
diff --git a/debian/rules b/debian/rules
index 19c6007..e2a8ccb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,7 +4,6 @@
 # Uncomment this to turn on verbose mode.
 # export DH_VERBOSE=1
 
-include /usr/share/dpatch/dpatch.make
 
 PACKAGE = easychem
 
@@ -18,18 +17,18 @@ else
 	LDFLAGS += -Wl,-O1
 endif
 
-build: patch-stamp build-stamp
+build: build-stamp
 build-stamp:
 	dh_testdir
 	$(MAKE) -f Makefile.linux all CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)"
 	touch $@
 
-clean: clean-first unpatch
+clean: clean-first
 clean-first:
 	dh_testdir
 	dh_testroot
 	$(MAKE) -f Makefile.linux clean
-	dh_clean build-stamp patch-stamp
+	dh_clean build-stamp
 
 install: build
 	dh_testdir
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

