[med-svn] r15187 - in trunk/packages/dialign/trunk/debian: . patches

Wed Nov 20 21:49:50 UTC 2013

Author: tille
Date: 2013-11-20 21:49:50 +0000 (Wed, 20 Nov 2013)
New Revision: 15187

Added:
   trunk/packages/dialign/trunk/debian/patches/hardening.patch
Modified:
   trunk/packages/dialign/trunk/debian/changelog
   trunk/packages/dialign/trunk/debian/compat
   trunk/packages/dialign/trunk/debian/control
   trunk/packages/dialign/trunk/debian/copyright
   trunk/packages/dialign/trunk/debian/patches/series
   trunk/packages/dialign/trunk/debian/rules
Log:
Commit mass changes for 2.2.1-6


Modified: trunk/packages/dialign/trunk/debian/changelog
===================================================================

--- trunk/packages/dialign/trunk/debian/changelog	2013-11-20 21:49:17 UTC (rev 15186)
+++ trunk/packages/dialign/trunk/debian/changelog	2013-11-20 21:49:50 UTC (rev 15187)
@@ -1,4 +1,4 @@
-dialign (2.2.1-6) UNRELEASED; urgency=low
+dialign (2.2.1-6) unstable; urgency=low
 
   [ Charles Plessy ]
   * renamed debian/upstream-metadata.yaml to debian/upstream
@@ -6,8 +6,14 @@
   [ Andreas Tille ]
   * debian/upstream: Took over more detailed field from tasks file;
     moved DOI+PMID to References
+  * debian/control:
+     - cme fix dpkg-control
+     - debhelper 9
+     - remove Build-Depends from quilt
+  * debian/copyright: DEP5
+  * debian/patches/hardening.patch: Propagate hardening options
 
- -- Andreas Tille <tille at debian.org>  Mon, 02 Apr 2012 20:54:55 +0200
+ -- Andreas Tille <tille at debian.org>  Thu, 14 Nov 2013 13:23:16 +0100
 
 dialign (2.2.1-5) unstable; urgency=low
 

Modified: trunk/packages/dialign/trunk/debian/compat
===================================================================
--- trunk/packages/dialign/trunk/debian/compat	2013-11-20 21:49:17 UTC (rev 15186)
+++ trunk/packages/dialign/trunk/debian/compat	2013-11-20 21:49:50 UTC (rev 15187)
@@ -1 +1 @@
-8
+9

Modified: trunk/packages/dialign/trunk/debian/control
===================================================================
--- trunk/packages/dialign/trunk/debian/control	2013-11-20 21:49:17 UTC (rev 15186)
+++ trunk/packages/dialign/trunk/debian/control	2013-11-20 21:49:50 UTC (rev 15187)
@@ -1,19 +1,19 @@
 Source: dialign
+Maintainer: Debian Med Packaging Team <debian-med-packaging at lists.alioth.debian.org>
+Uploaders: Charles Plessy <plessy at debian.org>,
+           Andreas Tille <tille at debian.org>
 Section: science
 Priority: optional
-Maintainer: Debian Med Packaging Team <debian-med-packaging at lists.alioth.debian.org>
-DM-Upload-Allowed: yes
-Uploaders: Charles Plessy <plessy at debian.org>,
- Andreas Tille <tille at debian.org>
-Build-Depends: debhelper (>= 8), quilt (>= 0.47)
-Standards-Version: 3.9.1
-Vcs-Browser: http://svn.debian.org/wsvn/debian-med/trunk/packages/dialign/trunk/
-Vcs-Svn: svn://svn.debian.org/debian-med/trunk/packages/dialign/trunk/
+Build-Depends: debhelper (>= 9)
+Standards-Version: 3.9.4
+Vcs-Browser: http://anonscm.debian.org/viewvc/debian-med/trunk/packages/dialign/trunk/
+Vcs-Svn: svn://anonscm.debian.org/debian-med/trunk/packages/dialign/trunk/
 Homepage: http://dialign.gobics.de/
 
 Package: dialign
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends},
+         ${misc:Depends}
 Description: Segment-based multiple sequence alignment
  DIALIGN2 is a command line tool to perform multiple alignment of
  protein or DNA sequences. It constructs alignments from gapfree pairs

Modified: trunk/packages/dialign/trunk/debian/copyright
===================================================================
--- trunk/packages/dialign/trunk/debian/copyright	2013-11-20 21:49:17 UTC (rev 15186)
+++ trunk/packages/dialign/trunk/debian/copyright	2013-11-20 21:49:50 UTC (rev 15187)
@@ -1,12 +1,13 @@
-Format-Specification: http://wiki.debian.org/Proposals/CopyrightFormat?action=recall&rev=103
-Debianized-By: Charles Plessy <plessy at debian.org>
-Debianized-Date: Sun,  9 Apr 2006 23:53:26 +0900
-Original-Source-Location: http://dialign.gobics.de/download/dialign_package.tgz
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: Dialign
 Upstream-Author: Burkhard Morgenstern and Said Abdeddaim
+Source: http://dialign.gobics.de/download/dialign_package.tgz
 
 Files: *
 Copyright: © 1999 Burkhard Morgenstern
 License: LGPL-2.1+
+
+License: LGPL-2.1+
  This package is free software; you can redistribute it and/or
  modify it under the terms of the GNU Lesser General Public
  License as published by the Free Software Foundation; either
@@ -20,17 +21,17 @@
  You should have received a copy of the GNU Lesser General Public
  License along with this package; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
-X-Comment: On Debian systems, the complete text of the GNU Lesser General
+Comment: On Debian systems, the complete text of the GNU Lesser General
  Public License can be found in `/usr/share/common-licenses/LGPL'.
 
 Files: debian/dialign2-2.1*
 Copyright: © 2006-2008 Charles Plessy <plessy at debian.org>
-License: Same as DIALIGN itself.
- (see above)
+License: LGPL-2.1+
 
 Files: debian/*
 Copyright: © 2006-2008 Charles Plessy <plessy at debian.org>
 	   © 2008 Nelson A. de Oliveira <naoliv at debian.org>
 	   © 2008 David Paleino <d.paleino at gmail.com>
+	   © 2011-2013 Andreas Tille <tille at debian.org>
 License: PD
  The packaging work is in the public domain unless stated otherwise.

Added: trunk/packages/dialign/trunk/debian/patches/hardening.patch
===================================================================
--- trunk/packages/dialign/trunk/debian/patches/hardening.patch	                        (rev 0)
+++ trunk/packages/dialign/trunk/debian/patches/hardening.patch	2013-11-20 21:49:50 UTC (rev 15187)
@@ -0,0 +1,24 @@
+Author: Andreas Tille <tille at debian.org>
+LastChanged: Thu, 14 Nov 2013 13:23:16 +0100
+Description: Propagate hardening options
+
+--- a/src/makefile
++++ b/src/makefile
+@@ -11,7 +11,7 @@
+ 
+ 
+ CC = gcc
+-CFLAGS =  -c -O -I$ -DCONS
++CFLAGS +=  -c -O -I$ -DCONS
+ #CFLAGS =  -g -c -I$ -DCONS
+ LIBS = -lm
+ #
+@@ -23,7 +23,7 @@ OBJS = dialign.o functions.o  para.o \
+ 
+ #
+ dialign2-2: $(OBJS)  
+-	$(CC) $(OBJS) $(LIBS) -o dialign2-2
++	$(CC) $(OBJS) $(LIBS) -o dialign2-2 $(LDFLAGS)
+ #	$(CC) -g $(OBJS) $(LIBS) -o dialign2-2_db
+ #
+ #

Modified: trunk/packages/dialign/trunk/debian/patches/series
===================================================================
--- trunk/packages/dialign/trunk/debian/patches/series	2013-11-20 21:49:17 UTC (rev 15186)
+++ trunk/packages/dialign/trunk/debian/patches/series	2013-11-20 21:49:50 UTC (rev 15187)
@@ -1,2 +1,3 @@
 20_no_DIALIGN2_DIR.patch
 30_local_doc.patch
+hardening.patch

Modified: trunk/packages/dialign/trunk/debian/rules
===================================================================
--- trunk/packages/dialign/trunk/debian/rules	2013-11-20 21:49:17 UTC (rev 15186)
+++ trunk/packages/dialign/trunk/debian/rules	2013-11-20 21:49:50 UTC (rev 15187)
@@ -1,7 +1,7 @@
 #!/usr/bin/make -f
 
 %:
-	dh $@ --with quilt
+	dh $@
 
 override_dh_clean:
 	find src/ -name '*.o' -delete


