[med-svn] r2746 - in trunk/packages/mustang/trunk/debian: . patches
mok0-guest at alioth.debian.org
mok0-guest at alioth.debian.org
Mon Dec 1 12:15:21 UTC 2008
Author: mok0-guest
Date: 2008-12-01 12:15:21 +0000 (Mon, 01 Dec 2008)
New Revision: 2746
Added:
trunk/packages/mustang/trunk/debian/patches/02-main.cpp.patch
trunk/packages/mustang/trunk/debian/patches/03-test_zf-cchh.patch
trunk/packages/mustang/trunk/debian/patches/04-gcc-4.3-exit.patch
trunk/packages/mustang/trunk/debian/patches/series
Removed:
trunk/packages/mustang/trunk/debian/patches/00list
trunk/packages/mustang/trunk/debian/patches/02-main.cpp.dpatch
trunk/packages/mustang/trunk/debian/patches/03-test_zf-cchh.dpatch
trunk/packages/mustang/trunk/debian/patches/04-gcc-4.3-exit
Modified:
trunk/packages/mustang/trunk/debian/changelog
trunk/packages/mustang/trunk/debian/control
trunk/packages/mustang/trunk/debian/rules
Log:
Converted package from dpatch -> quilt
Modified: trunk/packages/mustang/trunk/debian/changelog
===================================================================
--- trunk/packages/mustang/trunk/debian/changelog 2008-11-29 23:29:35 UTC (rev 2745)
+++ trunk/packages/mustang/trunk/debian/changelog 2008-12-01 12:15:21 UTC (rev 2746)
@@ -1,3 +1,9 @@
+mustang (3.0-2) unstable; urgency=low
+
+ * Converted to quilt patch system.
+
+ -- Morten Kjeldgaard <mok at bioxray.au.dk> Sun, 30 Nov 2008 14:59:43 +0100
+
mustang (3.0-1) unstable; urgency=low
[ Nelson A. de Oliveira ]
Modified: trunk/packages/mustang/trunk/debian/control
===================================================================
--- trunk/packages/mustang/trunk/debian/control 2008-11-29 23:29:35 UTC (rev 2745)
+++ trunk/packages/mustang/trunk/debian/control 2008-12-01 12:15:21 UTC (rev 2746)
@@ -5,7 +5,7 @@
Uploaders: Morten Kjeldgaard <mok at bioxray.au.dk>
DM-Upload-Allowed: yes
Homepage: http://www.cs.mu.oz.au/~arun/mustang/
-Build-Depends: debhelper (>= 5), dpatch
+Build-Depends: debhelper (>= 5), quilt
Standards-Version: 3.8.0
Vcs-Browser: http://svn.debian.org/wsvn/debian-med/trunk/packages/mustang/trunk/?rev=0&sc=0
Vcs-Svn: svn://svn.debian.org/svn/debian-med/trunk/packages/mustang/trunk/
Deleted: trunk/packages/mustang/trunk/debian/patches/00list
===================================================================
--- trunk/packages/mustang/trunk/debian/patches/00list 2008-11-29 23:29:35 UTC (rev 2745)
+++ trunk/packages/mustang/trunk/debian/patches/00list 2008-12-01 12:15:21 UTC (rev 2746)
@@ -1,3 +0,0 @@
-02-main.cpp
-03-test_zf-cchh
-04-gcc-4.3-exit
Deleted: trunk/packages/mustang/trunk/debian/patches/02-main.cpp.dpatch
===================================================================
--- trunk/packages/mustang/trunk/debian/patches/02-main.cpp.dpatch 2008-11-29 23:29:35 UTC (rev 2745)
+++ trunk/packages/mustang/trunk/debian/patches/02-main.cpp.dpatch 2008-12-01 12:15:21 UTC (rev 2746)
@@ -1,33 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## main.cpp.dpatch by Morten Kjeldgaard <mok at bioxray.dk>
-##
-## DP: beautify output of initial advertisement
-
- at DPATCH@
-
---- mustang-3.0/src/main.cpp 2006-10-19 18:39:45.000000000 +0200
-+++ mustang-3.0.orig/src/main.cpp 2007-08-22 17:13:17.000000000 +0200
-@@ -64,17 +64,17 @@
- if(!meditate)
- {
- cout << "\n" ;
-- cout << "\t\t\t\t\033[0;37;1;41m";
-- cout << " MUSTANG (v.3): A MUltiple STuructural AligNment alGorithm. \033[0;0m\n" ;
-+ cout << "\033[0;37;1;41m";
-+ cout << " MUSTANG (v.3): A MUltiple STructural AligNment alGorithm. \033[0;0m\n" ;
- //cout << "\033[0;49m" ;
-- cout << "\t\t\t\t\033[1;33;4;1;46m";
-+ cout << "\033[1;33;4;1;46m";
- cout << "Authors: " ;
- cout << "\033[0;1;37;4;1;46m" ;
-- cout << " A S Konagurthu, J Whisstock, and P J Stuckey, A M Lesk.\033[0m\n";
-+ cout << " A S Konagurthu, J Whisstock, and P J Stuckey, A M Lesk. \033[0m\n";
- //cout << "\033[0m" ;
-- cout << "\t\t\t\t\033[0;33;4;1;46m";
-+ cout << "\033[0;33;4;1;46m";
- cout << "(Mis)Coding: " ; cout << "\033[0;37;4;1;46m" ;
-- cout << " A S Konagurthu. \033[0m\n";
-+ cout << " A S Konagurthu. \033[0m\n";
- cout << "\033[0m" ;
- cout << "\n\n" ;
- }
Added: trunk/packages/mustang/trunk/debian/patches/02-main.cpp.patch
===================================================================
--- trunk/packages/mustang/trunk/debian/patches/02-main.cpp.patch (rev 0)
+++ trunk/packages/mustang/trunk/debian/patches/02-main.cpp.patch 2008-12-01 12:15:21 UTC (rev 2746)
@@ -0,0 +1,27 @@
+
+--- trunk.orig/src/main.cpp
++++ trunk/src/main.cpp
+@@ -64,17 +64,17 @@
+ if(!meditate)
+ {
+ cout << "\n" ;
+- cout << "\t\t\t\t\033[0;37;1;41m";
+- cout << " MUSTANG (v.3): A MUltiple STuructural AligNment alGorithm. \033[0;0m\n" ;
++ cout << "\033[0;37;1;41m";
++ cout << " MUSTANG (v.3): A MUltiple STructural AligNment alGorithm. \033[0;0m\n" ;
+ //cout << "\033[0;49m" ;
+- cout << "\t\t\t\t\033[1;33;4;1;46m";
++ cout << "\033[1;33;4;1;46m";
+ cout << "Authors: " ;
+ cout << "\033[0;1;37;4;1;46m" ;
+- cout << " A S Konagurthu, J Whisstock, and P J Stuckey, A M Lesk.\033[0m\n";
++ cout << " A S Konagurthu, J Whisstock, and P J Stuckey, A M Lesk. \033[0m\n";
+ //cout << "\033[0m" ;
+- cout << "\t\t\t\t\033[0;33;4;1;46m";
++ cout << "\033[0;33;4;1;46m";
+ cout << "(Mis)Coding: " ; cout << "\033[0;37;4;1;46m" ;
+- cout << " A S Konagurthu. \033[0m\n";
++ cout << " A S Konagurthu. \033[0m\n";
+ cout << "\033[0m" ;
+ cout << "\n\n" ;
+ }
Deleted: trunk/packages/mustang/trunk/debian/patches/03-test_zf-cchh.dpatch
===================================================================
--- trunk/packages/mustang/trunk/debian/patches/03-test_zf-cchh.dpatch 2008-11-29 23:29:35 UTC (rev 2745)
+++ trunk/packages/mustang/trunk/debian/patches/03-test_zf-cchh.dpatch 2008-12-01 12:15:21 UTC (rev 2746)
@@ -1,30 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## test_zf_cchh by Morten Kjeldgaard <mok at bioxray.dk>
-##
-## DP: Fix the test command file so it makes use of the pdb entries
-## DP: that have been downloaded.
-
- at DPATCH@
-diff -urNad mustang~/data/test/test_zf-CCHH mustang/data/test/test_zf-CCHH
---- mustang~/data/test/test_zf-CCHH 2008-01-31 17:10:54.000000000 +0100
-+++ mustang/data/test/test_zf-CCHH 2008-02-01 15:01:14.000000000 +0100
-@@ -16,8 +16,7 @@
- ## symbols to show that the whitespaces are ignored ##
- ###############################################################################################
-
--
-- > ./data/test/pdbs
-+> /usr/share/doc/mustang-testdata/examples/pdbs
-
- +1ard.pdb
- +1bboN.pdb
-@@ -37,6 +36,7 @@
- +2drp2.pdb
- +3znf.pdb
-
-+
- +5znf.pdb
--#+test1.pdb
--#+test2.pdb
-++test1.pdb
-++test2.pdb
Added: trunk/packages/mustang/trunk/debian/patches/03-test_zf-cchh.patch
===================================================================
--- trunk/packages/mustang/trunk/debian/patches/03-test_zf-cchh.patch (rev 0)
+++ trunk/packages/mustang/trunk/debian/patches/03-test_zf-cchh.patch 2008-12-01 12:15:21 UTC (rev 2746)
@@ -0,0 +1,22 @@
+--- trunk.orig/data/test/test_zf-CCHH
++++ trunk/data/test/test_zf-CCHH
+@@ -16,8 +16,7 @@
+ ## symbols to show that the whitespaces are ignored ##
+ ###############################################################################################
+
+-
+- > ./data/test/pdbs
++> /usr/share/doc/mustang-testdata/examples/pdbs
+
+ +1ard.pdb
+ +1bboN.pdb
+@@ -37,6 +36,7 @@
+ +2drp2.pdb
+ +3znf.pdb
+
++
+ +5znf.pdb
+-#+test1.pdb
+-#+test2.pdb
+++test1.pdb
+++test2.pdb
Deleted: trunk/packages/mustang/trunk/debian/patches/04-gcc-4.3-exit
===================================================================
--- trunk/packages/mustang/trunk/debian/patches/04-gcc-4.3-exit 2008-11-29 23:29:35 UTC (rev 2745)
+++ trunk/packages/mustang/trunk/debian/patches/04-gcc-4.3-exit 2008-12-01 12:15:21 UTC (rev 2746)
@@ -1,67 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 04-gcc-4.3-exit.dpatch by <steffen_moeller at gmx.de>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: exit not found
-
- at DPATCH@
-
---- mustang.old/src/ew_2.cpp.orig 2008-08-04 01:01:45.509512156 +0200
-+++ mustang/src/ew_2.cpp 2008-08-04 01:02:08.001463089 +0200
-@@ -35,6 +35,8 @@
- #include <fstream>
- using std::ifstream;
-
-+#include <stdlib.h>
-+
- #include<math.h>
- #include "macros.h"
- #include "globals.h"
---- mustang.old/src/multiple_superposition.cpp.orig 2008-08-04 01:03:34.018459733 +0200
-+++ mustang/src/multiple_superposition.cpp 2008-08-04 01:03:59.790460503 +0200
-@@ -43,10 +43,11 @@
- using std::flush; using std::endl; using std::ios;
- using std::fixed;
-
--
- #include<iomanip>
- using std::setprecision ; using std::setw ;
-
-+#include<stdlib.h>
-+
- #include "jacobi.h"
- #include "alloc_routines.h"
- #include "de_alloc_routines.h"
---- mustang.old/src/pdb_ripper_2.cpp.orig 2008-08-04 01:01:06.014501128 +0200
-+++ mustang/src/pdb_ripper_2.cpp 2008-08-04 01:01:25.510476525 +0200
-@@ -35,6 +35,8 @@
- #include <cstring>
- using std::ifstream ;
-
-+#include <stdlib.h>
-+
- #include "macros.h"
- #include "globals.h"
- #include "pdb_ripper.h"
---- mustang.old/src/progress_align_3.cpp.orig 2008-08-04 01:02:32.922510805 +0200
-+++ mustang/src/progress_align_3.cpp 2008-08-04 01:02:48.657512880 +0200
-@@ -34,6 +34,8 @@
- #include<cmath>
- #include<cstring>
-
-+#include<stdlib.h>
-+
-
- #include "macros.h"
- #include "globals.h"
---- mustang.old/src/read_structures.cpp.orig 2008-08-04 00:57:19.561501585 +0200
-+++ mustang/src/read_structures.cpp 2008-08-04 01:00:10.961466245 +0200
-@@ -35,6 +35,8 @@
- using std::ifstream ;
- using std::ofstream ;
-
-+#include <stdlib.h>
-+
- #include "macros.h"
- #include "globals.h"
- #include "read_structures.h"
Added: trunk/packages/mustang/trunk/debian/patches/04-gcc-4.3-exit.patch
===================================================================
--- trunk/packages/mustang/trunk/debian/patches/04-gcc-4.3-exit.patch (rev 0)
+++ trunk/packages/mustang/trunk/debian/patches/04-gcc-4.3-exit.patch 2008-12-01 12:15:21 UTC (rev 2746)
@@ -0,0 +1,60 @@
+
+--- trunk.orig/src/ew_2.cpp
++++ trunk/src/ew_2.cpp
+@@ -35,6 +35,8 @@
+ #include <fstream>
+ using std::ifstream;
+
++#include <stdlib.h>
++
+ #include<math.h>
+ #include "macros.h"
+ #include "globals.h"
+--- trunk.orig/src/multiple_superposition.cpp
++++ trunk/src/multiple_superposition.cpp
+@@ -43,10 +43,11 @@
+ using std::flush; using std::endl; using std::ios;
+ using std::fixed;
+
+-
+ #include<iomanip>
+ using std::setprecision ; using std::setw ;
+
++#include<stdlib.h>
++
+ #include "jacobi.h"
+ #include "alloc_routines.h"
+ #include "de_alloc_routines.h"
+--- trunk.orig/src/pdb_ripper_2.cpp
++++ trunk/src/pdb_ripper_2.cpp
+@@ -35,6 +35,8 @@
+ #include <cstring>
+ using std::ifstream ;
+
++#include <stdlib.h>
++
+ #include "macros.h"
+ #include "globals.h"
+ #include "pdb_ripper.h"
+--- trunk.orig/src/progress_align_3.cpp
++++ trunk/src/progress_align_3.cpp
+@@ -34,6 +34,8 @@
+ #include<cmath>
+ #include<cstring>
+
++#include<stdlib.h>
++
+
+ #include "macros.h"
+ #include "globals.h"
+--- trunk.orig/src/read_structures.cpp
++++ trunk/src/read_structures.cpp
+@@ -35,6 +35,8 @@
+ using std::ifstream ;
+ using std::ofstream ;
+
++#include <stdlib.h>
++
+ #include "macros.h"
+ #include "globals.h"
+ #include "read_structures.h"
Added: trunk/packages/mustang/trunk/debian/patches/series
===================================================================
--- trunk/packages/mustang/trunk/debian/patches/series (rev 0)
+++ trunk/packages/mustang/trunk/debian/patches/series 2008-12-01 12:15:21 UTC (rev 2746)
@@ -0,0 +1,3 @@
+02-main.cpp.patch
+03-test_zf-cchh.patch
+04-gcc-4.3-exit.patch
Modified: trunk/packages/mustang/trunk/debian/rules
===================================================================
--- trunk/packages/mustang/trunk/debian/rules 2008-11-29 23:29:35 UTC (rev 2745)
+++ trunk/packages/mustang/trunk/debian/rules 2008-12-01 12:15:21 UTC (rev 2746)
@@ -7,7 +7,7 @@
# This has to be exported to make some magic below work.
export DH_OPTIONS
-include /usr/share/dpatch/dpatch.make
+include /usr/share/quilt/quilt.make
CPPFLAGS = -Wall -g
@@ -21,7 +21,7 @@
get-orig-source:
wget http://www.cs.mu.oz.au/~arun/mustang/mustang_v.3.tgz -O ../mustang_3.0.orig.tar.gz
-build: patch-stamp build-arch build-indep
+build: patch build-arch build-indep
build-arch: build-arch-stamp
build-arch-stamp:
More information about the debian-med-commit
mailing list