--- Begin Message ---
Package: qutemol
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 cf297c83db16bf5ec484d5fc8e362decdc8ee3d2 Mon Sep 17 00:00:00 2001
From: Jari Aalto <[email protected]>
Date: Fri, 6 Apr 2012 17:44:48 +0300
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 | 10 ++++++
debian/compat | 2 +-
debian/control | 7 ++--
debian/patches/00list | 33 --------------------
.../{01_makefile.dpatch => 01_makefile.patch} | 8 +---
...{02_qutemol.cfg.dpatch => 02_qutemol.cfg.patch} | 8 +---
.../patches/{03_ao.cpp.dpatch => 03_ao.cpp.patch} | 8 +---
debian/patches/{04_ao.h.dpatch => 04_ao.h.patch} | 8 +---
.../{05_aogpu.cpp.dpatch => 05_aogpu.cpp.patch} | 8 +---
...atomcolor.cpp.dpatch => 06_atomcolor.cpp.patch} | 8 +---
.../{07_cgutil.cpp.dpatch => 07_cgutil.cpp.patch} | 8 +---
.../{08_common.cpp.dpatch => 08_common.cpp.patch} | 8 +---
...cubemapsamp.h.dpatch => 09_cubemapsamp.h.patch} | 8 +---
...ttings.cpp.dpatch => 10_hardsettings.cpp.patch} | 8 +---
...rdsettings.h.dpatch => 11_hardsettings.h.patch} | 8 +---
.../{12_mol.cpp.dpatch => 12_mol.cpp.patch} | 8 +---
debian/patches/{13_mol.h.dpatch => 13_mol.h.patch} | 8 +---
...4_mycanvas.cpp.dpatch => 14_mycanvas.cpp.patch} | 8 +---
.../{15_mycanvas.h.dpatch => 15_mycanvas.h.patch} | 8 +---
.../{16_mytab.cpp.dpatch => 16_mytab.cpp.patch} | 8 +---
...shadowmap.cpp.dpatch => 17_shadowmap.cpp.patch} | 8 +---
...{18_shadowmap.h.dpatch => 18_shadowmap.h.patch} | 8 +---
...{19_gifsave.cpp.dpatch => 19_gifsave.cpp.patch} | 8 +---
.../{20_main.cpp.dpatch => 20_main.cpp.patch} | 8 +---
...{21_pngsave.cpp.dpatch => 21_pngsave.cpp.patch} | 8 +---
...2_progress.cpp.dpatch => 22_progress.cpp.patch} | 8 +---
.../{23_progress.h.dpatch => 23_progress.h.patch} | 8 +---
...alog.cpp.dpatch => 24_savesnapdialog.cpp.patch} | 8 +---
.../{25_matrix44.h.dpatch => 25_matrix44.h.patch} | 8 +---
...trackmode.cpp.dpatch => 26_trackmode.cpp.patch} | 8 +---
...7_trackutils.h.dpatch => 27_trackutils.h.patch} | 8 +---
.../{28_mol.cpp.dpatch => 28_mol.cpp.patch} | 8 +---
debian/patches/29_mol.h.dpatch | 17 ----------
debian/patches/29_mol.h.patch | 13 ++++++++
.../{30_matrix33.h.dpatch => 30_matrix33.h.patch} | 8 +---
...ers.dpatch => 31_reset_local_for_shaders.patch} | 8 +---
...dio_includes.dpatch => 32_stdio_includes.patch} | 8 +---
...at-security.dpatch => 33_format-security.patch} | 8 +---
debian/patches/series | 33 ++++++++++++++++++++
debian/rules | 1 -
debian/source/format | 1 +
41 files changed, 125 insertions(+), 248 deletions(-)
delete mode 100644 debian/patches/00list
rename debian/patches/{01_makefile.dpatch => 01_makefile.patch} (88%)
rename debian/patches/{02_qutemol.cfg.dpatch => 02_qutemol.cfg.patch} (92%)
rename debian/patches/{03_ao.cpp.dpatch => 03_ao.cpp.patch} (64%)
rename debian/patches/{04_ao.h.dpatch => 04_ao.h.patch} (62%)
rename debian/patches/{05_aogpu.cpp.dpatch => 05_aogpu.cpp.patch} (87%)
rename debian/patches/{06_atomcolor.cpp.dpatch => 06_atomcolor.cpp.patch} (70%)
rename debian/patches/{07_cgutil.cpp.dpatch => 07_cgutil.cpp.patch} (92%)
rename debian/patches/{08_common.cpp.dpatch => 08_common.cpp.patch} (95%)
rename debian/patches/{09_cubemapsamp.h.dpatch => 09_cubemapsamp.h.patch} (76%)
rename debian/patches/{10_hardsettings.cpp.dpatch => 10_hardsettings.cpp.patch} (88%)
rename debian/patches/{11_hardsettings.h.dpatch => 11_hardsettings.h.patch} (69%)
rename debian/patches/{12_mol.cpp.dpatch => 12_mol.cpp.patch} (96%)
rename debian/patches/{13_mol.h.dpatch => 13_mol.h.patch} (84%)
rename debian/patches/{14_mycanvas.cpp.dpatch => 14_mycanvas.cpp.patch} (59%)
rename debian/patches/{15_mycanvas.h.dpatch => 15_mycanvas.h.patch} (56%)
rename debian/patches/{16_mytab.cpp.dpatch => 16_mytab.cpp.patch} (96%)
rename debian/patches/{17_shadowmap.cpp.dpatch => 17_shadowmap.cpp.patch} (82%)
rename debian/patches/{18_shadowmap.h.dpatch => 18_shadowmap.h.patch} (60%)
rename debian/patches/{19_gifsave.cpp.dpatch => 19_gifsave.cpp.patch} (82%)
rename debian/patches/{20_main.cpp.dpatch => 20_main.cpp.patch} (96%)
rename debian/patches/{21_pngsave.cpp.dpatch => 21_pngsave.cpp.patch} (73%)
rename debian/patches/{22_progress.cpp.dpatch => 22_progress.cpp.patch} (68%)
rename debian/patches/{23_progress.h.dpatch => 23_progress.h.patch} (57%)
rename debian/patches/{24_savesnapdialog.cpp.dpatch => 24_savesnapdialog.cpp.patch} (93%)
rename debian/patches/{25_matrix44.h.dpatch => 25_matrix44.h.patch} (65%)
rename debian/patches/{26_trackmode.cpp.dpatch => 26_trackmode.cpp.patch} (79%)
rename debian/patches/{27_trackutils.h.dpatch => 27_trackutils.h.patch} (75%)
rename debian/patches/{28_mol.cpp.dpatch => 28_mol.cpp.patch} (53%)
delete mode 100644 debian/patches/29_mol.h.dpatch
create mode 100644 debian/patches/29_mol.h.patch
rename debian/patches/{30_matrix33.h.dpatch => 30_matrix33.h.patch} (63%)
rename debian/patches/{31_reset_local_for_shaders.dpatch => 31_reset_local_for_shaders.patch} (67%)
rename debian/patches/{32_stdio_includes.dpatch => 32_stdio_includes.patch} (86%)
rename debian/patches/{33_format-security.dpatch => 33_format-security.patch} (71%)
create mode 100644 debian/patches/series
create mode 100644 debian/source/format
diff --git a/debian/changelog b/debian/changelog
index 6561910..6828593 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+qutemol (0.4.1~cvs20081111-2.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Remove deprecated dpatch and upgrade to packaging format "3.0 quilt"
+ * New Patch 10: convert in-line changes into a separate patch.
+ * Update to Standards-Version to 3.9.3.1 and debhelper to 9.
+ * Fix binary-control-field-duplicates-source section (Lintian).
+
+ -- Jari Aalto <[email protected]> Fri, 06 Apr 2012 17:41:16 +0300
+
qutemol (0.4.1~cvs20081111-2) unstable; urgency=low
* debian/patches/33_format-security.dpatch: New patch, fixes build error
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 4902814..8d9adfd 100644
--- a/debian/control
+++ b/debian/control
@@ -3,9 +3,9 @@ Section: science
Priority: optional
Maintainer: Debichem Team <[email protected]>
Uploaders: Morten Kjeldgaard <[email protected]>, Michael Banck <[email protected]>
-Build-Depends: debhelper (>= 5), cdbs, dpatch, libwxgtk2.8-dev, libglew1.5-dev,
+Build-Depends: debhelper (>= 9), cdbs, libwxgtk2.8-dev, libglew1.5-dev,
libgif-dev, libpng12-dev
-Standards-Version: 3.9.2
+Standards-Version: 3.9.3.1
Homepage: http://qutemol.sourceforge.net/
Vcs-Browser: http://svn.debian.org/wsvn/debichem/
Vcs-Svn: svn://svn.debian.org/svn/debichem/unstable/qutemol/
@@ -13,9 +13,8 @@ DM-Upload-Allowed: yes
Package: qutemol
-Section: science
Architecture: any
-Depends: ${shlibs:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
Description: interactive visualization of macromolecules
QuteMol is an interactive, high quality molecular visualization
system. It exploits the current GPU capabilities through OpenGL shaders
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index 2f824ad..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1,33 +0,0 @@
-01_makefile.dpatch
-02_qutemol.cfg.dpatch
-03_ao.cpp.dpatch
-04_ao.h.dpatch
-05_aogpu.cpp.dpatch
-06_atomcolor.cpp.dpatch
-07_cgutil.cpp.dpatch
-08_common.cpp.dpatch
-09_cubemapsamp.h.dpatch
-10_hardsettings.cpp.dpatch
-11_hardsettings.h.dpatch
-12_mol.cpp.dpatch
-13_mol.h.dpatch
-14_mycanvas.cpp.dpatch
-15_mycanvas.h.dpatch
-16_mytab.cpp.dpatch
-17_shadowmap.cpp.dpatch
-18_shadowmap.h.dpatch
-19_gifsave.cpp.dpatch
-20_main.cpp.dpatch
-21_pngsave.cpp.dpatch
-22_progress.cpp.dpatch
-23_progress.h.dpatch
-24_savesnapdialog.cpp.dpatch
-25_matrix44.h.dpatch
-#26_trackmode.cpp.dpatch
-#27_trackutils.h.dpatch
-28_mol.cpp.dpatch
-29_mol.h.dpatch
-30_matrix33.h.dpatch
-31_reset_local_for_shaders.dpatch
-32_stdio_includes.dpatch
-33_format-security.dpatch
diff --git a/debian/patches/01_makefile.dpatch b/debian/patches/01_makefile.patch
similarity index 88%
rename from debian/patches/01_makefile.dpatch
rename to debian/patches/01_makefile.patch
index 771ce0a..b47042f 100644
--- a/debian/patches/01_makefile.dpatch
+++ b/debian/patches/01_makefile.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## makefile.dpatch by Morten Kjeldgaard <[email protected]>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: modification to source code
+From: Morten Kjeldgaard <[email protected]>
+Subject: modification to source code
-@DPATCH@
--- a/Makefile
+++ b/Makefile
diff --git a/debian/patches/02_qutemol.cfg.dpatch b/debian/patches/02_qutemol.cfg.patch
similarity index 92%
rename from debian/patches/02_qutemol.cfg.dpatch
rename to debian/patches/02_qutemol.cfg.patch
index 7bb56cf..64e222b 100644
--- a/debian/patches/02_qutemol.cfg.dpatch
+++ b/debian/patches/02_qutemol.cfg.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## qutemol.cfg.dpatch by Morten Kjeldgaard <[email protected]>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: modification to source code
+From: Morten Kjeldgaard <[email protected]>
+Subject: modification to source code
-@DPATCH@
--- /dev/null
+++ b/qutemol.cfg
diff --git a/debian/patches/03_ao.cpp.dpatch b/debian/patches/03_ao.cpp.patch
similarity index 64%
rename from debian/patches/03_ao.cpp.dpatch
rename to debian/patches/03_ao.cpp.patch
index c37bd1d..07abcb9 100644
--- a/debian/patches/03_ao.cpp.dpatch
+++ b/debian/patches/03_ao.cpp.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## ao.cpp.dpatch by Morten Kjeldgaard <[email protected]>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: modification to source code
+From: Morten Kjeldgaard <[email protected]>
+Subject: modification to source code
-@DPATCH@
--- a/src/AO.cpp
+++ b/src/AO.cpp
diff --git a/debian/patches/04_ao.h.dpatch b/debian/patches/04_ao.h.patch
similarity index 62%
rename from debian/patches/04_ao.h.dpatch
rename to debian/patches/04_ao.h.patch
index 9ad15f4..dfa4035 100644
--- a/debian/patches/04_ao.h.dpatch
+++ b/debian/patches/04_ao.h.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## ao.h.dpatch by Morten Kjeldgaard <[email protected]>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: modification to source code
+From: Morten Kjeldgaard <[email protected]>
+Subject: modification to source code
-@DPATCH@
--- a/src/AO.h
+++ b/src/AO.h
diff --git a/debian/patches/05_aogpu.cpp.dpatch b/debian/patches/05_aogpu.cpp.patch
similarity index 87%
rename from debian/patches/05_aogpu.cpp.dpatch
rename to debian/patches/05_aogpu.cpp.patch
index 753b0ef..4b8e283 100644
--- a/debian/patches/05_aogpu.cpp.dpatch
+++ b/debian/patches/05_aogpu.cpp.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## aogpu.cpp.dpatch by Morten Kjeldgaard <[email protected]>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: modification to source code
+From: Morten Kjeldgaard <[email protected]>
+Subject: modification to source code
-@DPATCH@
--- a/src/AOgpu.cpp
+++ b/src/AOgpu.cpp
diff --git a/debian/patches/06_atomcolor.cpp.dpatch b/debian/patches/06_atomcolor.cpp.patch
similarity index 70%
rename from debian/patches/06_atomcolor.cpp.dpatch
rename to debian/patches/06_atomcolor.cpp.patch
index a6383d7..60c4869 100644
--- a/debian/patches/06_atomcolor.cpp.dpatch
+++ b/debian/patches/06_atomcolor.cpp.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## atomcolor.cpp.dpatch by Morten Kjeldgaard <[email protected]>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: modification to source code
+From: Morten Kjeldgaard <[email protected]>
+Subject: modification to source code
-@DPATCH@
--- a/src/AtomColor.cpp
+++ b/src/AtomColor.cpp
diff --git a/debian/patches/07_cgutil.cpp.dpatch b/debian/patches/07_cgutil.cpp.patch
similarity index 92%
rename from debian/patches/07_cgutil.cpp.dpatch
rename to debian/patches/07_cgutil.cpp.patch
index a4aa332..a9b4ff8 100644
--- a/debian/patches/07_cgutil.cpp.dpatch
+++ b/debian/patches/07_cgutil.cpp.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## cgutil.cpp.dpatch by Morten Kjeldgaard <[email protected]>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: modification to source code
+From: Morten Kjeldgaard <[email protected]>
+Subject: modification to source code
-@DPATCH@
--- a/src/CgUtil.cpp
+++ b/src/CgUtil.cpp
diff --git a/debian/patches/08_common.cpp.dpatch b/debian/patches/08_common.cpp.patch
similarity index 95%
rename from debian/patches/08_common.cpp.dpatch
rename to debian/patches/08_common.cpp.patch
index 3fea9df..c0fe249 100644
--- a/debian/patches/08_common.cpp.dpatch
+++ b/debian/patches/08_common.cpp.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## common.cpp.dpatch by Morten Kjeldgaard <[email protected]>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: modification to source code
+From: Morten Kjeldgaard <[email protected]>
+Subject: modification to source code
-@DPATCH@
--- a/src/Common.cpp
+++ b/src/Common.cpp
diff --git a/debian/patches/09_cubemapsamp.h.dpatch b/debian/patches/09_cubemapsamp.h.patch
similarity index 76%
rename from debian/patches/09_cubemapsamp.h.dpatch
rename to debian/patches/09_cubemapsamp.h.patch
index 07cd84a..6cdfe5b 100644
--- a/debian/patches/09_cubemapsamp.h.dpatch
+++ b/debian/patches/09_cubemapsamp.h.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## cubemapsamp.h.dpatch by Morten Kjeldgaard <[email protected]>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: modification to source code
+From: Morten Kjeldgaard <[email protected]>
+Subject: modification to source code
-@DPATCH@
--- a/src/CubeMapSamp.h
+++ b/src/CubeMapSamp.h
diff --git a/debian/patches/10_hardsettings.cpp.dpatch b/debian/patches/10_hardsettings.cpp.patch
similarity index 88%
rename from debian/patches/10_hardsettings.cpp.dpatch
rename to debian/patches/10_hardsettings.cpp.patch
index fd90de0..b389dd5 100644
--- a/debian/patches/10_hardsettings.cpp.dpatch
+++ b/debian/patches/10_hardsettings.cpp.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## hardsettings.cpp.dpatch by Morten Kjeldgaard <[email protected]>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: modification to source code
+From: Morten Kjeldgaard <[email protected]>
+Subject: modification to source code
-@DPATCH@
--- a/src/HardSettings.cpp
+++ b/src/HardSettings.cpp
diff --git a/debian/patches/11_hardsettings.h.dpatch b/debian/patches/11_hardsettings.h.patch
similarity index 69%
rename from debian/patches/11_hardsettings.h.dpatch
rename to debian/patches/11_hardsettings.h.patch
index 48b70ff..30c0e7b 100644
--- a/debian/patches/11_hardsettings.h.dpatch
+++ b/debian/patches/11_hardsettings.h.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## hardsettings.h.dpatch by Morten Kjeldgaard <[email protected]>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: modification to source code
+From: Morten Kjeldgaard <[email protected]>
+Subject: modification to source code
-@DPATCH@
--- a/src/HardSettings.h
+++ b/src/HardSettings.h
diff --git a/debian/patches/12_mol.cpp.dpatch b/debian/patches/12_mol.cpp.patch
similarity index 96%
rename from debian/patches/12_mol.cpp.dpatch
rename to debian/patches/12_mol.cpp.patch
index fc37073..21c98aa 100644
--- a/debian/patches/12_mol.cpp.dpatch
+++ b/debian/patches/12_mol.cpp.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## mol.cpp.dpatch by Morten Kjeldgaard <[email protected]>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: modification to source code
+From: Morten Kjeldgaard <[email protected]>
+Subject: modification to source code
-@DPATCH@
--- a/src/Mol.cpp
+++ b/src/Mol.cpp
diff --git a/debian/patches/13_mol.h.dpatch b/debian/patches/13_mol.h.patch
similarity index 84%
rename from debian/patches/13_mol.h.dpatch
rename to debian/patches/13_mol.h.patch
index 829aef5..c01657d 100644
--- a/debian/patches/13_mol.h.dpatch
+++ b/debian/patches/13_mol.h.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## mol.h.dpatch by Morten Kjeldgaard <[email protected]>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: modification to source code
+From: Morten Kjeldgaard <[email protected]>
+Subject: modification to source code
-@DPATCH@
--- a/src/Mol.h
+++ b/src/Mol.h
diff --git a/debian/patches/14_mycanvas.cpp.dpatch b/debian/patches/14_mycanvas.cpp.patch
similarity index 59%
rename from debian/patches/14_mycanvas.cpp.dpatch
rename to debian/patches/14_mycanvas.cpp.patch
index c9f4f73..a8ef747 100644
--- a/debian/patches/14_mycanvas.cpp.dpatch
+++ b/debian/patches/14_mycanvas.cpp.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## mycanvas.cpp.dpatch by Morten Kjeldgaard <[email protected]>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: modification to source code
+From: Morten Kjeldgaard <[email protected]>
+Subject: modification to source code
-@DPATCH@
--- a/src/MyCanvas.cpp
+++ b/src/MyCanvas.cpp
diff --git a/debian/patches/15_mycanvas.h.dpatch b/debian/patches/15_mycanvas.h.patch
similarity index 56%
rename from debian/patches/15_mycanvas.h.dpatch
rename to debian/patches/15_mycanvas.h.patch
index e24d337..d2c46e7 100644
--- a/debian/patches/15_mycanvas.h.dpatch
+++ b/debian/patches/15_mycanvas.h.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## mycanvas.h.dpatch by Morten Kjeldgaard <[email protected]>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: modification to source code
+From: Morten Kjeldgaard <[email protected]>
+Subject: modification to source code
-@DPATCH@
--- a/src/MyCanvas.h
+++ b/src/MyCanvas.h
diff --git a/debian/patches/16_mytab.cpp.dpatch b/debian/patches/16_mytab.cpp.patch
similarity index 96%
rename from debian/patches/16_mytab.cpp.dpatch
rename to debian/patches/16_mytab.cpp.patch
index a1885a0..f5ce5c7 100644
--- a/debian/patches/16_mytab.cpp.dpatch
+++ b/debian/patches/16_mytab.cpp.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## mytab.cpp.dpatch by Morten Kjeldgaard <[email protected]>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: modification to source code
+From: Morten Kjeldgaard <[email protected]>
+Subject: modification to source code
-@DPATCH@
diff -urNad qutemol~/src/MyTab.cpp qutemol/src/MyTab.cpp
--- qutemol~/src/MyTab.cpp 2008-01-30 19:53:18.000000000 +0100
+++ qutemol/src/MyTab.cpp 2008-01-30 19:55:10.000000000 +0100
diff --git a/debian/patches/17_shadowmap.cpp.dpatch b/debian/patches/17_shadowmap.cpp.patch
similarity index 82%
rename from debian/patches/17_shadowmap.cpp.dpatch
rename to debian/patches/17_shadowmap.cpp.patch
index 11cfa82..40c7f42 100644
--- a/debian/patches/17_shadowmap.cpp.dpatch
+++ b/debian/patches/17_shadowmap.cpp.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## shadowmap.cpp.dpatch by Morten Kjeldgaard <[email protected]>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: modification to source code
+From: Morten Kjeldgaard <[email protected]>
+Subject: modification to source code
-@DPATCH@
--- a/src/ShadowMap.cpp
+++ b/src/ShadowMap.cpp
diff --git a/debian/patches/18_shadowmap.h.dpatch b/debian/patches/18_shadowmap.h.patch
similarity index 60%
rename from debian/patches/18_shadowmap.h.dpatch
rename to debian/patches/18_shadowmap.h.patch
index 3617bb5..15b55ce 100644
--- a/debian/patches/18_shadowmap.h.dpatch
+++ b/debian/patches/18_shadowmap.h.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## shadowmap.h.dpatch by Morten Kjeldgaard <[email protected]>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: modification to source code
+From: Morten Kjeldgaard <[email protected]>
+Subject: modification to source code
-@DPATCH@
--- a/src/ShadowMap.h
+++ b/src/ShadowMap.h
diff --git a/debian/patches/19_gifsave.cpp.dpatch b/debian/patches/19_gifsave.cpp.patch
similarity index 82%
rename from debian/patches/19_gifsave.cpp.dpatch
rename to debian/patches/19_gifsave.cpp.patch
index 19ce285..63a4ebb 100644
--- a/debian/patches/19_gifsave.cpp.dpatch
+++ b/debian/patches/19_gifsave.cpp.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## gifsave.cpp.dpatch by Morten Kjeldgaard <[email protected]>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: modification to source code
+From: Morten Kjeldgaard <[email protected]>
+Subject: modification to source code
-@DPATCH@
--- a/src/gifSave.cpp
+++ b/src/gifSave.cpp
diff --git a/debian/patches/20_main.cpp.dpatch b/debian/patches/20_main.cpp.patch
similarity index 96%
rename from debian/patches/20_main.cpp.dpatch
rename to debian/patches/20_main.cpp.patch
index 6c7b298..68e5e5a 100644
--- a/debian/patches/20_main.cpp.dpatch
+++ b/debian/patches/20_main.cpp.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## main.cpp.dpatch by Morten Kjeldgaard <[email protected]>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: modification to source code
+From: Morten Kjeldgaard <[email protected]>
+Subject: modification to source code
-@DPATCH@
--- a/src/main.cpp
+++ b/src/main.cpp
diff --git a/debian/patches/21_pngsave.cpp.dpatch b/debian/patches/21_pngsave.cpp.patch
similarity index 73%
rename from debian/patches/21_pngsave.cpp.dpatch
rename to debian/patches/21_pngsave.cpp.patch
index cbb83f1..a6f979d 100644
--- a/debian/patches/21_pngsave.cpp.dpatch
+++ b/debian/patches/21_pngsave.cpp.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## pngsave.cpp.dpatch by Morten Kjeldgaard <[email protected]>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: modification to source code
+From: Morten Kjeldgaard <[email protected]>
+Subject: modification to source code
-@DPATCH@
--- a/src/pngSave.cpp
+++ b/src/pngSave.cpp
diff --git a/debian/patches/22_progress.cpp.dpatch b/debian/patches/22_progress.cpp.patch
similarity index 68%
rename from debian/patches/22_progress.cpp.dpatch
rename to debian/patches/22_progress.cpp.patch
index 2257006..61c70da 100644
--- a/debian/patches/22_progress.cpp.dpatch
+++ b/debian/patches/22_progress.cpp.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## progress.cpp.dpatch by Morten Kjeldgaard <[email protected]>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: modification to source code
+From: Morten Kjeldgaard <[email protected]>
+Subject: modification to source code
-@DPATCH@
--- a/src/progress.cpp
+++ b/src/progress.cpp
diff --git a/debian/patches/23_progress.h.dpatch b/debian/patches/23_progress.h.patch
similarity index 57%
rename from debian/patches/23_progress.h.dpatch
rename to debian/patches/23_progress.h.patch
index c18067d..fd085a3 100644
--- a/debian/patches/23_progress.h.dpatch
+++ b/debian/patches/23_progress.h.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## progress.h.dpatch by Morten Kjeldgaard <[email protected]>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: modification to source code
+From: Morten Kjeldgaard <[email protected]>
+Subject: modification to source code
-@DPATCH@
--- a/src/progress.h
+++ b/src/progress.h
diff --git a/debian/patches/24_savesnapdialog.cpp.dpatch b/debian/patches/24_savesnapdialog.cpp.patch
similarity index 93%
rename from debian/patches/24_savesnapdialog.cpp.dpatch
rename to debian/patches/24_savesnapdialog.cpp.patch
index 215c1eb..1156a49 100644
--- a/debian/patches/24_savesnapdialog.cpp.dpatch
+++ b/debian/patches/24_savesnapdialog.cpp.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## savesnapdialog.cpp.dpatch by Morten Kjeldgaard <[email protected]>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: modification to source code
+From: Morten Kjeldgaard <[email protected]>
+Subject: modification to source code
-@DPATCH@
--- a/src/saveSnapDialog.cpp
+++ b/src/saveSnapDialog.cpp
diff --git a/debian/patches/25_matrix44.h.dpatch b/debian/patches/25_matrix44.h.patch
similarity index 65%
rename from debian/patches/25_matrix44.h.dpatch
rename to debian/patches/25_matrix44.h.patch
index 5683388..3d8db64 100644
--- a/debian/patches/25_matrix44.h.dpatch
+++ b/debian/patches/25_matrix44.h.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## matrix44.h.dpatch by Morten Kjeldgaard <[email protected]>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: modification to source code
+From: Morten Kjeldgaard <[email protected]>
+Subject: modification to source code
-@DPATCH@
--- a/vcg/vcg/math/matrix44.h
+++ b/vcg/vcg/math/matrix44.h
diff --git a/debian/patches/26_trackmode.cpp.dpatch b/debian/patches/26_trackmode.cpp.patch
similarity index 79%
rename from debian/patches/26_trackmode.cpp.dpatch
rename to debian/patches/26_trackmode.cpp.patch
index 6fde098..a9b4385 100644
--- a/debian/patches/26_trackmode.cpp.dpatch
+++ b/debian/patches/26_trackmode.cpp.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## trackmode.cpp.dpatch by Morten Kjeldgaard <[email protected]>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: modification to source code
+From: Morten Kjeldgaard <[email protected]>
+Subject: modification to source code
-@DPATCH@
--- a/vcg/wrap/gui/trackmode.cpp
+++ b/vcg/wrap/gui/trackmode.cpp
diff --git a/debian/patches/27_trackutils.h.dpatch b/debian/patches/27_trackutils.h.patch
similarity index 75%
rename from debian/patches/27_trackutils.h.dpatch
rename to debian/patches/27_trackutils.h.patch
index a68cfb7..0cbd886 100644
--- a/debian/patches/27_trackutils.h.dpatch
+++ b/debian/patches/27_trackutils.h.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## trackutils.h.dpatch by Morten Kjeldgaard <[email protected]>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: modification to source code
+From: Morten Kjeldgaard <[email protected]>
+Subject: modification to source code
-@DPATCH@
--- a/vcg/wrap/gui/trackutils.h
+++ b/vcg/wrap/gui/trackutils.h
diff --git a/debian/patches/28_mol.cpp.dpatch b/debian/patches/28_mol.cpp.patch
similarity index 53%
rename from debian/patches/28_mol.cpp.dpatch
rename to debian/patches/28_mol.cpp.patch
index 91b93cf..2c2be4a 100644
--- a/debian/patches/28_mol.cpp.dpatch
+++ b/debian/patches/28_mol.cpp.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 28_mol.cpp.dpatch by Morten Kjeldgaard <[email protected]>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Include string.h
+From: Morten Kjeldgaard <[email protected]>
+Subject: Include string.h
-@DPATCH@
--- a/src/Mol.cpp
+++ b/src/Mol.cpp
diff --git a/debian/patches/29_mol.h.dpatch b/debian/patches/29_mol.h.dpatch
deleted file mode 100644
index ac47acb..0000000
--- a/debian/patches/29_mol.h.dpatch
+++ /dev/null
@@ -1,17 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 29_mol.h.dpatch by Morten Kjeldgaard <[email protected]>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Include string
-
-@DPATCH@
-
---- a/src/Mol.h
-+++ b/src/Mol.h
-@@ -1,3 +1,4 @@
-+#include <string>
-
- class MyString{
- public:
-diff --git a/vcg/vcg/math/matrix33.h b/vcg/vcg/math/matrix33.h
-index f1b0d7b..0fbc087 100644
diff --git a/debian/patches/29_mol.h.patch b/debian/patches/29_mol.h.patch
new file mode 100644
index 0000000..255d4bf
--- /dev/null
+++ b/debian/patches/29_mol.h.patch
@@ -0,0 +1,13 @@
+From: Morten Kjeldgaard <[email protected]>
+Subject: Include string
+
+
+--- a/src/Mol.h
++++ b/src/Mol.h
+@@ -1,3 +1,4 @@
++#include <string>
+
+ class MyString{
+ public:
+diff --git a/vcg/vcg/math/matrix33.h b/vcg/vcg/math/matrix33.h
+index f1b0d7b..0fbc087 100644
diff --git a/debian/patches/30_matrix33.h.dpatch b/debian/patches/30_matrix33.h.patch
similarity index 63%
rename from debian/patches/30_matrix33.h.dpatch
rename to debian/patches/30_matrix33.h.patch
index e4adfb5..df3db50 100644
--- a/debian/patches/30_matrix33.h.dpatch
+++ b/debian/patches/30_matrix33.h.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 30_matrix33.h.dpatch by Morten Kjeldgaard <[email protected]>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Include stdlib.h
+From: Morten Kjeldgaard <[email protected]>
+Subject: Include stdlib.h
-@DPATCH@
--- a/vcg/vcg/math/matrix33.h
+++ b/vcg/vcg/math/matrix33.h
diff --git a/debian/patches/31_reset_local_for_shaders.dpatch b/debian/patches/31_reset_local_for_shaders.patch
similarity index 67%
rename from debian/patches/31_reset_local_for_shaders.dpatch
rename to debian/patches/31_reset_local_for_shaders.patch
index 6a71d30..0918cec 100644
--- a/debian/patches/31_reset_local_for_shaders.dpatch
+++ b/debian/patches/31_reset_local_for_shaders.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 31_reset_local_for_shaders.dpatch by Michael Banck <[email protected]>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Set locale to "C" before making shaders and reset it afterwards.
+From: Michael Banck <[email protected]>
+Subject: Set locale to "C" before making shaders and reset it afterwards.
-@DPATCH@
--- ./src/Common.cpp.orig 2011-09-12 17:07:36.000000000 +0200
+++ ./src/Common.cpp 2011-09-12 17:08:49.000000000 +0200
diff --git a/debian/patches/32_stdio_includes.dpatch b/debian/patches/32_stdio_includes.patch
similarity index 86%
rename from debian/patches/32_stdio_includes.dpatch
rename to debian/patches/32_stdio_includes.patch
index 6ee058c..cec8e20 100644
--- a/debian/patches/32_stdio_includes.dpatch
+++ b/debian/patches/32_stdio_includes.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 32_stdio_includes.dpatch by Michael Banck <[email protected]>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Add missing includes for <stdio.h>
+From: Michael Banck <[email protected]>
+Subject: Add missing includes for <stdio.h>
-@DPATCH@
diff --exclude debian -Naur qutemol/src/AO.cpp qutemol-0.4.1~cvs20081111//src/AO.cpp
diff --git a/debian/patches/33_format-security.dpatch b/debian/patches/33_format-security.patch
similarity index 71%
rename from debian/patches/33_format-security.dpatch
rename to debian/patches/33_format-security.patch
index 03cca11..2b3ff69 100644
--- a/debian/patches/33_format-security.dpatch
+++ b/debian/patches/33_format-security.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 33_format-security.dpatch by Ilya Barygin <[email protected]>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fix warnings produced by -Werror=format-security
+From: Ilya Barygin <[email protected]>
+Subject: Fix warnings produced by -Werror=format-security
-@DPATCH@
diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' qutemol-0.4.1~cvs20081111~/src/pngSave.cpp qutemol-0.4.1~cvs20081111/src/pngSave.cpp
--- qutemol-0.4.1~cvs20081111~/src/pngSave.cpp 2011-11-01 20:27:07.000000000 +0400
+++ qutemol-0.4.1~cvs20081111/src/pngSave.cpp 2011-11-01 20:28:16.000000000 +0400
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..010e5b1
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,33 @@
+01_makefile.patch
+02_qutemol.cfg.patch
+03_ao.cpp.patch
+04_ao.h.patch
+05_aogpu.cpp.patch
+06_atomcolor.cpp.patch
+07_cgutil.cpp.patch
+08_common.cpp.patch
+09_cubemapsamp.h.patch
+10_hardsettings.cpp.patch
+11_hardsettings.h.patch
+12_mol.cpp.patch
+13_mol.h.patch
+14_mycanvas.cpp.patch
+15_mycanvas.h.patch
+16_mytab.cpp.patch
+17_shadowmap.cpp.patch
+18_shadowmap.h.patch
+19_gifsave.cpp.patch
+20_main.cpp.patch
+21_pngsave.cpp.patch
+22_progress.cpp.patch
+23_progress.h.patch
+24_savesnapdialog.cpp.patch
+25_matrix44.h.patch
+#26_trackmode.cpp.patch
+#27_trackutils.h.patch
+28_mol.cpp.patch
+29_mol.h.patch
+30_matrix33.h.patch
+31_reset_local_for_shaders.patch
+32_stdio_includes.patch
+33_format-security.patch
diff --git a/debian/rules b/debian/rules
index 89d6cb2..139232f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,7 +6,6 @@ INCDIRS = -Ivcg -Isrc -I.
CXXFLAGS = -DPKGDATADIR='\"/usr/share/qutemol\"' $(INCDIRS) $(OPTFLAGS) `wx-config --cppflags`
-include /usr/share/cdbs/1/rules/dpatch.mk
include /usr/share/cdbs/1/class/makefile.mk
include /usr/share/cdbs/1/rules/debhelper.mk
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.1
--- End Message ---
