[med-svn] r5664 - in trunk/packages/dialign/trunk/debian: . patches source
Andreas Tille
tille at alioth.debian.org
Fri Jan 14 12:52:05 UTC 2011
Author: tille
Date: 2011-01-14 12:52:03 +0000 (Fri, 14 Jan 2011)
New Revision: 5664
Added:
trunk/packages/dialign/trunk/debian/patches/20_no_DIALIGN2_DIR.patch
trunk/packages/dialign/trunk/debian/patches/30_local_doc.patch
trunk/packages/dialign/trunk/debian/patches/series
trunk/packages/dialign/trunk/debian/source/
trunk/packages/dialign/trunk/debian/source/format
Removed:
trunk/packages/dialign/trunk/debian/patches/00list
trunk/packages/dialign/trunk/debian/patches/20_no_DIALIGN2_DIR.dpatch
trunk/packages/dialign/trunk/debian/patches/30_local_doc.dpatch
Modified:
trunk/packages/dialign/trunk/debian/changelog
trunk/packages/dialign/trunk/debian/compat
trunk/packages/dialign/trunk/debian/control
trunk/packages/dialign/trunk/debian/rules
Log:
Commit pending changes, general packaging polishing
Modified: trunk/packages/dialign/trunk/debian/changelog
===================================================================
--- trunk/packages/dialign/trunk/debian/changelog 2011-01-14 12:35:07 UTC (rev 5663)
+++ trunk/packages/dialign/trunk/debian/changelog 2011-01-14 12:52:03 UTC (rev 5664)
@@ -1,14 +1,24 @@
-dialign (2.2.1-4) UNRELEASED; urgency=low
+dialign (2.2.1-4) unstable; urgency=low
[ David Paleino ]
* Removed myself from Uploaders
[ Charles Plessy ]
- * Documented informations in ‘debian/upstream-metadata.yaml’.
+ * Documented information in ‘debian/upstream-metadata.yaml’.
* Removed mention of the bibliographic reference in ‘debian/control’.
- -- David Paleino <d.paleino at gmail.com> Sat, 23 May 2009 14:42:57 +0200
+ [ Andreas Tille ]
+ * debian/control:
+ - Standards-Version: 3.9.1 (no changes needed)
+ - Debhelper 7
+ - s/dpatch/quilt/
+ - spelling of Debian Med
+ * debian/patches: converted to quilt
+ * debian/source/format: 3.0 (quilt)
+ * debian/rules: s/dpatch/patchsys-quilt/
+ -- Andreas Tille <tille at debian.org> Fri, 14 Jan 2011 13:28:33 +0100
+
dialign (2.2.1-3) unstable; urgency=low
* Changed the doc-base section according to the new policy.
Modified: trunk/packages/dialign/trunk/debian/compat
===================================================================
--- trunk/packages/dialign/trunk/debian/compat 2011-01-14 12:35:07 UTC (rev 5663)
+++ trunk/packages/dialign/trunk/debian/compat 2011-01-14 12:52:03 UTC (rev 5664)
@@ -1 +1 @@
-5
+7
Modified: trunk/packages/dialign/trunk/debian/control
===================================================================
--- trunk/packages/dialign/trunk/debian/control 2011-01-14 12:35:07 UTC (rev 5663)
+++ trunk/packages/dialign/trunk/debian/control 2011-01-14 12:52:03 UTC (rev 5664)
@@ -5,8 +5,8 @@
DM-Upload-Allowed: yes
Uploaders: Charles Plessy <plessy at debian.org>,
Andreas Tille <tille at debian.org>
-Build-Depends: debhelper (>= 5), cdbs, dpatch
-Standards-Version: 3.7.3
+Build-Depends: debhelper (>= 7), cdbs, quilt
+Standards-Version: 3.9.1
Vcs-Browser: http://svn.debian.org/wsvn/debian-med/trunk/packages/dialign/trunk/?rev=0&sc=0
Vcs-Svn: svn://svn.debian.org/svn/debian-med/trunk/packages/dialign/trunk/
Homepage: http://dialign.gobics.de/
Deleted: trunk/packages/dialign/trunk/debian/patches/00list
===================================================================
--- trunk/packages/dialign/trunk/debian/patches/00list 2011-01-14 12:35:07 UTC (rev 5663)
+++ trunk/packages/dialign/trunk/debian/patches/00list 2011-01-14 12:52:03 UTC (rev 5664)
@@ -1,2 +0,0 @@
-20_no_DIALIGN2_DIR.dpatch
-30_local_doc.dpatch
Deleted: trunk/packages/dialign/trunk/debian/patches/20_no_DIALIGN2_DIR.dpatch
===================================================================
--- trunk/packages/dialign/trunk/debian/patches/20_no_DIALIGN2_DIR.dpatch 2011-01-14 12:35:07 UTC (rev 5663)
+++ trunk/packages/dialign/trunk/debian/patches/20_no_DIALIGN2_DIR.dpatch 2011-01-14 12:52:03 UTC (rev 5664)
@@ -1,38 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 20_no_DIALIGN2_DIR.dpatch by Charles Plessy <charles-debian-nospam at plessy.org>
-## This patch is hereby released in public domain.
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Gives a default value to par_file so that the environment variable
-## DP: DIALIGN2_DIR is optional
-
- at DPATCH@
-
---- dialign_package_old/src/dialign.c 2005-02-22 01:32:55.000000000 +0900
-+++ dialign_package/src/dialign.c 2006-04-09 23:14:18.000000000 +0900
-@@ -296,10 +296,13 @@
-
- if ((par_file = getenv(dialign_dir)) == NULL)
- {
-- printf("\n \n \n Please set the environmentvariable DIALIGN2_DIR \n");
-- printf(" as described in the README file \n");
-- exit(1);
-- }
-+ par_file = "/usr/share/dialign/" ; /* Default value for Debian, makes the environment variable optional */
-+
-+/* printf("\n \n \n Please set the environmentvariable DIALIGN2_DIR \n");
-+ * printf(" as described in the README file \n");
-+ * exit(1);
-+ */
-+ }
-
- argnum = argc;
-
-@@ -523,6 +526,7 @@
- printf(" to a directory containing the files \n\n");
- printf(" BLOSUM \n tp400_dna\n tp400_prot \n tp400_trans \n\n" );
- printf(" These files should be contained in the DIALIGN package \n\n\n" ) ;
-+ printf(" See /usr/share/doc/dialign/README.Debian for more details \n" ) ;
- exit(1) ;
-
-
Added: trunk/packages/dialign/trunk/debian/patches/20_no_DIALIGN2_DIR.patch
===================================================================
--- trunk/packages/dialign/trunk/debian/patches/20_no_DIALIGN2_DIR.patch (rev 0)
+++ trunk/packages/dialign/trunk/debian/patches/20_no_DIALIGN2_DIR.patch 2011-01-14 12:52:03 UTC (rev 5664)
@@ -0,0 +1,33 @@
+Author: Charles Plessy <charles-debian-nospam at plessy.org>
+License: public domain.
+Description: Gives a default value to par_file so that the environment variable
+ DIALIGN2_DIR is optional
+
+--- dialign-2.2.1.orig/src/dialign.c
++++ dialign-2.2.1/src/dialign.c
+@@ -296,10 +296,13 @@
+
+ if ((par_file = getenv(dialign_dir)) == NULL)
+ {
+- printf("\n \n \n Please set the environmentvariable DIALIGN2_DIR \n");
+- printf(" as described in the README file \n");
+- exit(1);
+- }
++ par_file = "/usr/share/dialign/" ; /* Default value for Debian, makes the environment variable optional */
++
++/* printf("\n \n \n Please set the environmentvariable DIALIGN2_DIR \n");
++ * printf(" as described in the README file \n");
++ * exit(1);
++ */
++ }
+
+ argnum = argc;
+
+@@ -523,6 +526,7 @@
+ printf(" to a directory containing the files \n\n");
+ printf(" BLOSUM \n tp400_dna\n tp400_prot \n tp400_trans \n\n" );
+ printf(" These files should be contained in the DIALIGN package \n\n\n" ) ;
++ printf(" See /usr/share/doc/dialign/README.Debian for more details \n" ) ;
+ exit(1) ;
+
+
Deleted: trunk/packages/dialign/trunk/debian/patches/30_local_doc.dpatch
===================================================================
--- trunk/packages/dialign/trunk/debian/patches/30_local_doc.dpatch 2011-01-14 12:35:07 UTC (rev 5663)
+++ trunk/packages/dialign/trunk/debian/patches/30_local_doc.dpatch 2011-01-14 12:52:03 UTC (rev 5664)
@@ -1,21 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 30_local_doc.dpatch by Charles Plessy <charles-debian-nospam at plessy.org>
-## This patch is hereby released in the public domain.
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Mentions the man page and /usr/share/doc/dialign when it is invoked
-## DP: without arguments
-
- at DPATCH@
-
---- dialign_package_old/src/dialign.c 2006-04-16 21:34:22.000000000 +0900
-+++ dialign_package/src/dialign.c 2006-04-16 21:41:00.000000000 +0900
-@@ -320,7 +320,7 @@
- printf(" -lgs long genomic sequences: Both nucleotide and peptide\n");
- printf(" similarities calculated \n\n");
- printf(" Many more options are available, please consult the \n");
-- printf(" DIALIGN USER_GUIDE that should come with the DIALIGN package.\n");
-+ printf(" DIALIGN USER_GUIDE in /usr/share/doc/dialign/, or the manpage.\n");
- printf(" For more information on DIALIGN, please visit the DIALIGN\n");
- printf(" home page at BiBiServ (Bielefeld Bioinformatic Server): \n\n") ;
- printf(" http://bibiserv.techfak.uni-bielefeld.de/dialign/ \n\n");
Added: trunk/packages/dialign/trunk/debian/patches/30_local_doc.patch
===================================================================
--- trunk/packages/dialign/trunk/debian/patches/30_local_doc.patch (rev 0)
+++ trunk/packages/dialign/trunk/debian/patches/30_local_doc.patch 2011-01-14 12:52:03 UTC (rev 5664)
@@ -0,0 +1,16 @@
+Author: Charles Plessy <charles-debian-nospam at plessy.org>
+License: public domain.
+Description: Mentions the man page and /usr/share/doc/dialign when it is invoked
+ without arguments
+
+--- dialign-2.2.1.orig/src/dialign.c
++++ dialign-2.2.1/src/dialign.c
+@@ -320,7 +320,7 @@
+ printf(" -lgs long genomic sequences: Both nucleotide and peptide\n");
+ printf(" similarities calculated \n\n");
+ printf(" Many more options are available, please consult the \n");
+- printf(" DIALIGN USER_GUIDE that should come with the DIALIGN package.\n");
++ printf(" DIALIGN USER_GUIDE in /usr/share/doc/dialign/, or the manpage.\n");
+ printf(" For more information on DIALIGN, please visit the DIALIGN\n");
+ printf(" home page at BiBiServ (Bielefeld Bioinformatic Server): \n\n") ;
+ printf(" http://bibiserv.techfak.uni-bielefeld.de/dialign/ \n\n");
Added: trunk/packages/dialign/trunk/debian/patches/series
===================================================================
--- trunk/packages/dialign/trunk/debian/patches/series (rev 0)
+++ trunk/packages/dialign/trunk/debian/patches/series 2011-01-14 12:52:03 UTC (rev 5664)
@@ -0,0 +1,2 @@
+20_no_DIALIGN2_DIR.patch
+30_local_doc.patch
Modified: trunk/packages/dialign/trunk/debian/rules
===================================================================
--- trunk/packages/dialign/trunk/debian/rules 2011-01-14 12:35:07 UTC (rev 5663)
+++ trunk/packages/dialign/trunk/debian/rules 2011-01-14 12:52:03 UTC (rev 5664)
@@ -1,7 +1,7 @@
#!/usr/bin/make -f
include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/dpatch.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
include /usr/share/cdbs/1/class/makefile.mk
DEB_MAKE_BUILD_TARGET = -C src
Added: trunk/packages/dialign/trunk/debian/source/format
===================================================================
--- trunk/packages/dialign/trunk/debian/source/format (rev 0)
+++ trunk/packages/dialign/trunk/debian/source/format 2011-01-14 12:52:03 UTC (rev 5664)
@@ -0,0 +1 @@
+3.0 (quilt)
More information about the debian-med-commit
mailing list