[med-svn] r15198 - in trunk/packages/prank/trunk/debian: . patches

Wed Nov 20 21:56:11 UTC 2013

Author: tille
Date: 2013-11-20 21:56:10 +0000 (Wed, 20 Nov 2013)
New Revision: 15198

Added:
   trunk/packages/prank/trunk/debian/patches/hardening.patch
   trunk/packages/prank/trunk/debian/patches/series
Modified:
   trunk/packages/prank/trunk/debian/changelog
   trunk/packages/prank/trunk/debian/compat
   trunk/packages/prank/trunk/debian/control
   trunk/packages/prank/trunk/debian/copyright
   trunk/packages/prank/trunk/debian/rules
   trunk/packages/prank/trunk/debian/watch
Log:
Mass changes for initial upload


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

--- trunk/packages/prank/trunk/debian/changelog	2013-11-20 21:55:39 UTC (rev 15197)
+++ trunk/packages/prank/trunk/debian/changelog	2013-11-20 21:56:10 UTC (rev 15198)
@@ -1,17 +1,5 @@
-prank (0.0.120716-1) precise; urgency=low
+prank (0.0.130820-1) unstable; urgency=low
 
-  * Files now on Google Code - edited watchfile
-  * New upstream release
-  * Code is now in src/ subdirectory
-  * manpage patch has been incorporated in upstream, and I've added 
-    the cleanup fixes into /debian/rules, so there are now no patches
-  * Prevent DH from doing QMake rebuild - see README.source for a
-    justification
+  * Initial upload to Debian (Closes: #627391)
 
- -- Tim Booth <tbooth at ceh.ac.uk>  Mon, 20 Aug 2012 15:29:45 +0100
-
-prank (0.0.111130-1) UNRELEASED; urgency=low
-
-  * Initial release. (Closes: #627391)
-
- -- Manuel Prinz <manuel at debian.org>  Fri, 20 May 2011 11:58:29 +0200
+ -- Andreas Tille <tille at debian.org>  Wed, 13 Nov 2013 14:29:31 +0100

Modified: trunk/packages/prank/trunk/debian/compat
===================================================================
--- trunk/packages/prank/trunk/debian/compat	2013-11-20 21:55:39 UTC (rev 15197)
+++ trunk/packages/prank/trunk/debian/compat	2013-11-20 21:56:10 UTC (rev 15198)
@@ -1 +1 @@
-8
+9

Modified: trunk/packages/prank/trunk/debian/control
===================================================================
--- trunk/packages/prank/trunk/debian/control	2013-11-20 21:55:39 UTC (rev 15197)
+++ trunk/packages/prank/trunk/debian/control	2013-11-20 21:56:10 UTC (rev 15198)
@@ -1,17 +1,19 @@
 Source: prank
-Section: non-free/science
+Maintainer: Debian Med Packaging Team <debian-med-packaging at lists.alioth.debian.org>
+Uploaders: Manuel Prinz <manuel 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>
-Uploaders: Manuel Prinz <manuel at debian.org>
-Build-Depends: debhelper (>= 8)
-Standards-Version: 3.9.3
-Homepage: http://www.ebi.ac.uk/goldman-srv/prank/
-Vcs-Svn: svn://svn.debian.org/debian-med/trunk/packages/prank/trunk/
-Vcs-Browser: http://svn.debian.org/wsvn/debian-med/trunk/packages/prank/trunk/
+Build-Depends: debhelper (>= 9)
+Standards-Version: 3.9.4
+Vcs-Browser: http://anonscm.debian.org/viewvc/debian-med/trunk/packages/prank/trunk/
+Vcs-Svn: svn://anonscm.debian.org/debian-med/trunk/packages/prank/trunk/
+Homepage: http://code.google.com/p/prank-msa/
 
 Package: prank
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends},
+         ${misc:Depends}
 Enhances: t-coffee
 Description: Probabilistic Alignment Kit for DNA, codon and amino-acid sequences
  PRANK is a probabilistic multiple alignment program for DNA, codon

Modified: trunk/packages/prank/trunk/debian/copyright
===================================================================
--- trunk/packages/prank/trunk/debian/copyright	2013-11-20 21:55:39 UTC (rev 15197)
+++ trunk/packages/prank/trunk/debian/copyright	2013-11-20 21:56:10 UTC (rev 15198)
@@ -3,20 +3,28 @@
 Source: http://code.google.com/p/prank-msa/downloads/list
 
 Files: *
-Copyright: © 2005-2011 Ari Loytynoja
-License: GPL-v3
-    See: /usr/share/common-licenses/GPL-3
+Copyright: © 2005-2011 Ari Loytynoja <ari.loytynoja at gmail.com>
+License: GPLv2+
 
 Files: debian/*
 Copyright: © 2011 Manuel Prinz <manuel at debian.org>
-License: GPL-v3
+           © 2013 Andreas Tille <tille at debian.org>
+License: GPLv2+
 
-Files: eigen.*
-Copyright: © 2001 Ziheng Yang
-License:
-    These files are copies from the PAML software package. The homepage
-    (http://abacus.gene.ucl.ac.uk/software/paml.html) states:
-    .
-    PAML is a package of programs for phylogenetic analyses of DNA or
-    protein sequences using maximum likelihood.  It is maintained and
-    distributed for academic use free of charge by Ziheng Yang.
+License: GPLv2+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+ .
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License along
+ with this program; if not, write to the Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ .
+ On Debian systems you can find a copy of the GPL-v2 license
+ at /usr/share/common-licenses/GPL-2.

Added: trunk/packages/prank/trunk/debian/patches/hardening.patch
===================================================================
--- trunk/packages/prank/trunk/debian/patches/hardening.patch	                        (rev 0)
+++ trunk/packages/prank/trunk/debian/patches/hardening.patch	2013-11-20 21:56:10 UTC (rev 15198)
@@ -0,0 +1,30 @@
+Author: Andreas Tille <tille at debian.org>
+LastChanges: Wed, 13 Nov 2013 14:29:31 +0100
+Description: Propagate hardening options
+
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -7,11 +7,11 @@
+ CC            = gcc
+ CXX           = g++
+ DEFINES       = 
+-CFLAGS        = -m64 -pipe -O3 $(DEFINES)
+-CXXFLAGS      = -m64 -pipe -O3 $(DEFINES)
++CFLAGS       += -pipe -O3 $(DEFINES)
++CXXFLAGS     += -pipe -O3 $(DEFINES)
+ INCPATH       = -I. -I/usr/include
+ LINK          = g++
+-LFLAGS        = -m64
++#LFLAGS        = -m64
+ LIBS          = $(SUBLIBS)    
+ AR            = ar cqs
+ RANLIB        = 
+@@ -136,7 +136,7 @@ first: all
+ all: Makefile $(TARGET) $(MANPAGES)
+ 
+ $(TARGET):  $(OBJECTS)  
+-	$(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJCOMP) $(LIBS)
++	$(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJCOMP) $(LIBS) $(LDFLAGS)
+ 
+ 
+ clean:compiler_clean 

Added: trunk/packages/prank/trunk/debian/patches/series
===================================================================
--- trunk/packages/prank/trunk/debian/patches/series	                        (rev 0)
+++ trunk/packages/prank/trunk/debian/patches/series	2013-11-20 21:56:10 UTC (rev 15198)
@@ -0,0 +1 @@
+hardening.patch

Modified: trunk/packages/prank/trunk/debian/rules
===================================================================
--- trunk/packages/prank/trunk/debian/rules	2013-11-20 21:55:39 UTC (rev 15197)
+++ trunk/packages/prank/trunk/debian/rules	2013-11-20 21:56:10 UTC (rev 15198)
@@ -16,3 +16,6 @@
 override_dh_install:
 	dh_install $(SRCDIR)/prank /usr/bin
 	dh_installman $(SRCDIR)/prank.1
+
+override_dh_installchangelogs:
+	dh_installchangelogs VERSION_HISTORY

Modified: trunk/packages/prank/trunk/debian/watch
===================================================================
--- trunk/packages/prank/trunk/debian/watch	2013-11-20 21:55:39 UTC (rev 15197)
+++ trunk/packages/prank/trunk/debian/watch	2013-11-20 21:56:10 UTC (rev 15198)
@@ -1,3 +1,3 @@
 version=3
 opts="uversionmangle=s/^/0.0./" \
-http://code.google.com/p/prank-msa/downloads/list .*/files/prank\.src\.(\d{6})\.tgz
+http://code.google.com/p/prank-msa/downloads/list .*/files/prank\.source\.(\d{6})\.tgz


