Commit 62bb1cce authored by Graham Inggs's avatar Graham Inggs

Update to packaging format 3.0 - Jari Aalto

parent 3eadae11
qutemol (0.4.1~cvs20081111-4) UNRELEASED; urgency=low
[ Jari Aalto ]
* Remove deprecated dpatch and upgrade to packaging format "3.0 quilt".
(Closes: #667759)
* 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).
[ Graham Inggs ]
* Acknowledge NMU from Olly Betts. (Closes: #760619)
......
......@@ -3,9 +3,9 @@ Section: science
Priority: optional
Maintainer: Debichem Team <debichem-devel@lists.alioth.debian.org>
Uploaders: Morten Kjeldgaard <mok0@ubuntu.com>, Michael Banck <mbanck@debian.org>
Build-Depends: debhelper (>= 5), cdbs, dpatch, libwxgtk3.0-dev, libglew1.5-dev,
Build-Depends: debhelper (>= 9), cdbs, libwxgtk3.0-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
......
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
34_geometry_tab_sliders.dpatch
35_gifsave_honor_umask.dpatch
36_wx3.0_compat.dpatch
#! /bin/sh /usr/share/dpatch/dpatch-run
## makefile.dpatch by Morten Kjeldgaard <mok@bioxray.au.dk>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: modification to source code
From: Morten Kjeldgaard <mok@bioxray.au.dk>
Subject: modification to source code
@DPATCH@
--- a/Makefile
+++ b/Makefile
......
#! /bin/sh /usr/share/dpatch/dpatch-run
## qutemol.cfg.dpatch by Morten Kjeldgaard <mok@bioxray.au.dk>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: modification to source code
From: Morten Kjeldgaard <mok@bioxray.au.dk>
Subject: modification to source code
@DPATCH@
--- /dev/null
+++ b/qutemol.cfg
......
#! /bin/sh /usr/share/dpatch/dpatch-run
## ao.cpp.dpatch by Morten Kjeldgaard <mok@bioxray.au.dk>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: modification to source code
From: Morten Kjeldgaard <mok@bioxray.au.dk>
Subject: modification to source code
@DPATCH@
--- a/src/AO.cpp
+++ b/src/AO.cpp
......
#! /bin/sh /usr/share/dpatch/dpatch-run
## ao.h.dpatch by Morten Kjeldgaard <mok@bioxray.au.dk>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: modification to source code
From: Morten Kjeldgaard <mok@bioxray.au.dk>
Subject: modification to source code
@DPATCH@
--- a/src/AO.h
+++ b/src/AO.h
......
#! /bin/sh /usr/share/dpatch/dpatch-run
## aogpu.cpp.dpatch by Morten Kjeldgaard <mok@bioxray.au.dk>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: modification to source code
From: Morten Kjeldgaard <mok@bioxray.au.dk>
Subject: modification to source code
@DPATCH@
--- a/src/AOgpu.cpp
+++ b/src/AOgpu.cpp
......
#! /bin/sh /usr/share/dpatch/dpatch-run
## atomcolor.cpp.dpatch by Morten Kjeldgaard <mok@bioxray.au.dk>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: modification to source code
From: Morten Kjeldgaard <mok@bioxray.au.dk>
Subject: modification to source code
@DPATCH@
--- a/src/AtomColor.cpp
+++ b/src/AtomColor.cpp
......
#! /bin/sh /usr/share/dpatch/dpatch-run
## cgutil.cpp.dpatch by Morten Kjeldgaard <mok@bioxray.au.dk>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: modification to source code
From: Morten Kjeldgaard <mok@bioxray.au.dk>
Subject: modification to source code
@DPATCH@
--- a/src/CgUtil.cpp
+++ b/src/CgUtil.cpp
......
#! /bin/sh /usr/share/dpatch/dpatch-run
## common.cpp.dpatch by Morten Kjeldgaard <mok@bioxray.au.dk>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: modification to source code
From: Morten Kjeldgaard <mok@bioxray.au.dk>
Subject: modification to source code
@DPATCH@
--- a/src/Common.cpp
+++ b/src/Common.cpp
......
#! /bin/sh /usr/share/dpatch/dpatch-run
## cubemapsamp.h.dpatch by Morten Kjeldgaard <mok@bioxray.au.dk>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: modification to source code
From: Morten Kjeldgaard <mok@bioxray.au.dk>
Subject: modification to source code
@DPATCH@
--- a/src/CubeMapSamp.h
+++ b/src/CubeMapSamp.h
......
#! /bin/sh /usr/share/dpatch/dpatch-run
## hardsettings.cpp.dpatch by Morten Kjeldgaard <mok@bioxray.au.dk>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: modification to source code
From: Morten Kjeldgaard <mok@bioxray.au.dk>
Subject: modification to source code
@DPATCH@
--- a/src/HardSettings.cpp
+++ b/src/HardSettings.cpp
......
#! /bin/sh /usr/share/dpatch/dpatch-run
## hardsettings.h.dpatch by Morten Kjeldgaard <mok@bioxray.au.dk>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: modification to source code
From: Morten Kjeldgaard <mok@bioxray.au.dk>
Subject: modification to source code
@DPATCH@
--- a/src/HardSettings.h
+++ b/src/HardSettings.h
......
#! /bin/sh /usr/share/dpatch/dpatch-run
## mol.cpp.dpatch by Morten Kjeldgaard <mok@bioxray.au.dk>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: modification to source code
From: Morten Kjeldgaard <mok@bioxray.au.dk>
Subject: modification to source code
@DPATCH@
--- a/src/Mol.cpp
+++ b/src/Mol.cpp
......
#! /bin/sh /usr/share/dpatch/dpatch-run
## mol.h.dpatch by Morten Kjeldgaard <mok@bioxray.au.dk>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: modification to source code
From: Morten Kjeldgaard <mok@bioxray.au.dk>
Subject: modification to source code
@DPATCH@
--- a/src/Mol.h
+++ b/src/Mol.h
......
#! /bin/sh /usr/share/dpatch/dpatch-run
## mycanvas.cpp.dpatch by Morten Kjeldgaard <mok@bioxray.au.dk>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: modification to source code
From: Morten Kjeldgaard <mok@bioxray.au.dk>
Subject: modification to source code
@DPATCH@
--- a/src/MyCanvas.cpp
+++ b/src/MyCanvas.cpp
......
#! /bin/sh /usr/share/dpatch/dpatch-run
## mycanvas.h.dpatch by Morten Kjeldgaard <mok@bioxray.au.dk>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: modification to source code
From: Morten Kjeldgaard <mok@bioxray.au.dk>
Subject: modification to source code
@DPATCH@
--- a/src/MyCanvas.h
+++ b/src/MyCanvas.h
......
#! /bin/sh /usr/share/dpatch/dpatch-run
## mytab.cpp.dpatch by Morten Kjeldgaard <mok@bioxray.au.dk>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: modification to source code
From: Morten Kjeldgaard <mok@bioxray.au.dk>
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
......
#! /bin/sh /usr/share/dpatch/dpatch-run
## shadowmap.cpp.dpatch by Morten Kjeldgaard <mok@bioxray.au.dk>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: modification to source code
From: Morten Kjeldgaard <mok@bioxray.au.dk>
Subject: modification to source code
@DPATCH@
--- a/src/ShadowMap.cpp
+++ b/src/ShadowMap.cpp
......
#! /bin/sh /usr/share/dpatch/dpatch-run
## shadowmap.h.dpatch by Morten Kjeldgaard <mok@bioxray.au.dk>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: modification to source code
From: Morten Kjeldgaard <mok@bioxray.au.dk>
Subject: modification to source code
@DPATCH@
--- a/src/ShadowMap.h
+++ b/src/ShadowMap.h
......
#! /bin/sh /usr/share/dpatch/dpatch-run
## gifsave.cpp.dpatch by Morten Kjeldgaard <mok@bioxray.au.dk>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: modification to source code
From: Morten Kjeldgaard <mok@bioxray.au.dk>
Subject: modification to source code
@DPATCH@
--- a/src/gifSave.cpp
+++ b/src/gifSave.cpp
......
#! /bin/sh /usr/share/dpatch/dpatch-run
## main.cpp.dpatch by Morten Kjeldgaard <mok@bioxray.au.dk>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: modification to source code
From: Morten Kjeldgaard <mok@bioxray.au.dk>
Subject: modification to source code
@DPATCH@
--- a/src/main.cpp
+++ b/src/main.cpp
......
#! /bin/sh /usr/share/dpatch/dpatch-run
## pngsave.cpp.dpatch by Morten Kjeldgaard <mok@bioxray.au.dk>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: modification to source code
From: Morten Kjeldgaard <mok@bioxray.au.dk>
Subject: modification to source code
@DPATCH@
--- a/src/pngSave.cpp
+++ b/src/pngSave.cpp
......
#! /bin/sh /usr/share/dpatch/dpatch-run
## progress.cpp.dpatch by Morten Kjeldgaard <mok@bioxray.au.dk>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: modification to source code
From: Morten Kjeldgaard <mok@bioxray.au.dk>
Subject: modification to source code
@DPATCH@
--- a/src/progress.cpp
+++ b/src/progress.cpp
......
#! /bin/sh /usr/share/dpatch/dpatch-run
## progress.h.dpatch by Morten Kjeldgaard <mok@bioxray.au.dk>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: modification to source code
From: Morten Kjeldgaard <mok@bioxray.au.dk>
Subject: modification to source code
@DPATCH@
--- a/src/progress.h
+++ b/src/progress.h
......
#! /bin/sh /usr/share/dpatch/dpatch-run
## savesnapdialog.cpp.dpatch by Morten Kjeldgaard <mok@bioxray.au.dk>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: modification to source code
From: Morten Kjeldgaard <mok@bioxray.au.dk>
Subject: modification to source code
@DPATCH@
--- a/src/saveSnapDialog.cpp
+++ b/src/saveSnapDialog.cpp
......
#! /bin/sh /usr/share/dpatch/dpatch-run
## matrix44.h.dpatch by Morten Kjeldgaard <mok@bioxray.au.dk>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: modification to source code
From: Morten Kjeldgaard <mok@bioxray.au.dk>
Subject: modification to source code
@DPATCH@
--- a/vcg/vcg/math/matrix44.h
+++ b/vcg/vcg/math/matrix44.h
......
#! /bin/sh /usr/share/dpatch/dpatch-run
## trackmode.cpp.dpatch by Morten Kjeldgaard <mok@bioxray.au.dk>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: modification to source code
From: Morten Kjeldgaard <mok@bioxray.au.dk>
Subject: modification to source code
@DPATCH@
--- a/vcg/wrap/gui/trackmode.cpp
+++ b/vcg/wrap/gui/trackmode.cpp
......
#! /bin/sh /usr/share/dpatch/dpatch-run
## trackutils.h.dpatch by Morten Kjeldgaard <mok@bioxray.au.dk>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: modification to source code
From: Morten Kjeldgaard <mok@bioxray.au.dk>
Subject: modification to source code
@DPATCH@
--- a/vcg/wrap/gui/trackutils.h
+++ b/vcg/wrap/gui/trackutils.h
......
#! /bin/sh /usr/share/dpatch/dpatch-run
## 28_mol.cpp.dpatch by Morten Kjeldgaard <mok0@ubuntu.com>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Include string.h
From: Morten Kjeldgaard <mok0@ubuntu.com>
Subject: Include string.h
@DPATCH@
--- a/src/Mol.cpp
+++ b/src/Mol.cpp
......
#! /bin/sh /usr/share/dpatch/dpatch-run
## 29_mol.h.dpatch by Morten Kjeldgaard <mok0@ubuntu.com>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Include string
From: Morten Kjeldgaard <mok0@ubuntu.com>
Subject: Include string
@DPATCH@
--- a/src/Mol.h
+++ b/src/Mol.h
......
#! /bin/sh /usr/share/dpatch/dpatch-run
## 30_matrix33.h.dpatch by Morten Kjeldgaard <mok0@ubuntu.com>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Include stdlib.h
From: Morten Kjeldgaard <mok0@ubuntu.com>
Subject: Include stdlib.h
@DPATCH@
--- a/vcg/vcg/math/matrix33.h
+++ b/vcg/vcg/math/matrix33.h
......
#! /bin/sh /usr/share/dpatch/dpatch-run
## 31_reset_local_for_shaders.dpatch by Michael Banck <mbanck@debian.org>
##
## 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 <mbanck@debian.org>
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
......
#! /bin/sh /usr/share/dpatch/dpatch-run
## 32_stdio_includes.dpatch by Michael Banck <mbanck@debian.org>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Add missing includes for <stdio.h>
From: Michael Banck <mbanck@debian.org>
Subject: Add missing includes for <stdio.h>
@DPATCH@
diff --exclude debian -Naur qutemol/src/AO.cpp qutemol-0.4.1~cvs20081111//src/AO.cpp
......
#! /bin/sh /usr/share/dpatch/dpatch-run
## 33_format-security.dpatch by Ilya Barygin <randomaction@ubuntu.com>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Fix warnings produced by -Werror=format-security
From: Ilya Barygin <randomaction@ubuntu.com>
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
......
#! /bin/sh /usr/share/dpatch/dpatch-run
## 34_geometry_tab_sliders.dpatch by Michael Banck <mbanck@debian.org>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Fix broken sliders in geometry tab
From: Michael Banck <mbanck@debian.org>
Subject: Fix broken sliders in geometry tab
@DPATCH@
--- ./src/MyTab.cpp.orig 2013-10-06 16:57:34.878875265 +0200
+++ ./src/MyTab.cpp 2013-10-06 16:56:23.506510069 +0200
@@ -722,6 +722,9 @@
......
#! /bin/sh /usr/share/dpatch/dpatch-run
## 35_gifsave_honor_umask.dpatch by Michael Banck <mbanck@debian.org>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Honor umask when saving a gif animation by changing the permissions
## DP: accordingly afterwards.
From: Michael Banck <mbanck@debian.org>
Subject: Honor umask when saving a gif animation by changing the permissions accordingly afterwards.
@DPATCH@
--- ./src/gifSave.cpp.orig 2013-10-06 18:15:49.335167635 +0200
+++ ./src/gifSave.cpp 2013-10-06 18:19:18.124244413 +0200
@@ -9,6 +9,8 @@
......
#! /bin/sh /usr/share/dpatch/dpatch-run
## wx3.0_compact.dpatch by Olly Betts <olly@survex.com>
## These changes should maintain compatibility with wxwidgets2.8.
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: modification to source code
@DPATCH@
From: Olly Betts <olly@survex.com>
Subject: modification to source code
--- a/src/main.cpp
+++ b/src/main.cpp
......@@ -28,7 +22,7 @@
wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL
},
{ wxCMD_LINE_NONE }
@@ -836,7 +836,7 @@
@@ -845,7 +845,7 @@
wxString(), // def path
wxString(),
FILETYPES,
......@@ -37,7 +31,7 @@
);
static int lastFilterIndex=-1;
@@ -1004,7 +1004,7 @@
@@ -1013,7 +1013,7 @@
wxString(), // def path
wxString(),
FILETYPES,
......
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
34_geometry_tab_sliders.patch
35_gifsave_honor_umask.patch
36_wx3.0_compat.patch
......@@ -8,7 +8,6 @@ INCDIRS = -Ivcg -Isrc -I.
# default under wx2.8).
CXXFLAGS = -DPKGDATADIR='\"/usr/share/qutemol\"' $(INCDIRS) $(OPTFLAGS) `wx-config --cppflags` -DNDEBUG
include /usr/share/cdbs/1/rules/dpatch.mk
include /usr/share/cdbs/1/class/makefile.mk
include /usr/share/cdbs/1/rules/debhelper.mk
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment