[med-svn] r22665 - in trunk/packages/libgenome/trunk/debian: . patches

[Andreas Tille]

Author: tille
Date: 2016-08-12 09:07:24 +0000 (Fri, 12 Aug 2016)
New Revision: 22665

Added:
   trunk/packages/libgenome/trunk/debian/patches/
   trunk/packages/libgenome/trunk/debian/patches/gcc-6.1.patch
   trunk/packages/libgenome/trunk/debian/patches/series
Removed:
   trunk/packages/libgenome/trunk/debian/libgenome-1.3-0v5.lintian-overrides
Modified:
   trunk/packages/libgenome/trunk/debian/changelog
   trunk/packages/libgenome/trunk/debian/control
   trunk/packages/libgenome/trunk/debian/copyright
   trunk/packages/libgenome/trunk/debian/rules
Log:
Fix gcc-6.1 issue and some polishing of package


Modified: trunk/packages/libgenome/trunk/debian/changelog
===================================================================
--- trunk/packages/libgenome/trunk/debian/changelog	2016-08-12 08:13:18 UTC (rev 22664)
+++ trunk/packages/libgenome/trunk/debian/changelog	2016-08-12 09:07:24 UTC (rev 22665)
@@ -1,9 +1,15 @@
-libgenome (1.3.1-9) UNRELEASED; urgency=medium
+libgenome (1.3.1-9) unstable; urgency=medium
 
   * Add Multi-Arch: same and Pre-Depends: ${misc:Pre-Depends}
     according to https://wiki.debian.org/Multiarch/Implementation
+  * Fix gcc-6.1 build issue
+    Closes: #831188
+  * hardening=+bindnow
+  * cme fix dpkg-control
+  * Fixed homepage
+  * Drop unused overrides
 
- -- Andreas Tille <tille at debian.org>  Sun, 09 Aug 2015 07:17:24 +0200
+ -- Andreas Tille <tille at debian.org>  Fri, 12 Aug 2016 10:52:24 +0200
 
 libgenome (1.3.1-8) unstable; urgency=medium
 

Modified: trunk/packages/libgenome/trunk/debian/control
===================================================================
--- trunk/packages/libgenome/trunk/debian/control	2016-08-12 08:13:18 UTC (rev 22664)
+++ trunk/packages/libgenome/trunk/debian/control	2016-08-12 09:07:24 UTC (rev 22665)
@@ -6,10 +6,10 @@
 Build-Depends: debhelper (>= 9),
                dh-autoreconf,
                d-shlibs (>= 0.61)
-Standards-Version: 3.9.6
-Vcs-Browser: http://anonscm.debian.org/viewvc/debian-med/trunk/packages/libgenome/trunk/
+Standards-Version: 3.9.8
+Vcs-Browser: https://anonscm.debian.org/viewvc/debian-med/trunk/packages/libgenome/trunk/
 Vcs-Svn: svn://anonscm.debian.org/debian-med/trunk/packages/libgenome/trunk/
-Homepage: http://asap.ahabs.wisc.edu/software/software-development-libraries/libgenome.html
+Homepage: https://sourceforge.net/projects/libgenome/
 
 Package: libgenome-1.3-dev
 Architecture: any
@@ -37,11 +37,11 @@
 
 Package: libgenome-1.3-0v5
 Architecture: any
+Multi-Arch: same
 Section: libs
-Pre-Depends: ${misc:Pre-Depends}
-Multi-Arch: same
 Depends: ${shlibs:Depends},
          ${misc:Depends}
+Pre-Depends: ${misc:Pre-Depends}
 Conflicts: libgenome-1.3-0
 Replaces: libgenome-1.3-0
 Description: toolkit for developing bioinformatic related software

Modified: trunk/packages/libgenome/trunk/debian/copyright
===================================================================
--- trunk/packages/libgenome/trunk/debian/copyright	2016-08-12 08:13:18 UTC (rev 22664)
+++ trunk/packages/libgenome/trunk/debian/copyright	2016-08-12 09:07:24 UTC (rev 22665)
@@ -1,7 +1,7 @@
-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: libGenome
 Upstream-Contact: Aaron Darling <darling at cs.wisc.edu>
-Source: http://gel.ahabs.wisc.edu/mauve/source/
+Source: http://libgenome.cvs.sourceforge.net/viewvc/libgenome/
 
 Files: *
 Copyright: © 2003-2013 Aaron Darling <darling at cs.wisc.edu>,

Deleted: trunk/packages/libgenome/trunk/debian/libgenome-1.3-0v5.lintian-overrides
===================================================================
--- trunk/packages/libgenome/trunk/debian/libgenome-1.3-0v5.lintian-overrides	2016-08-12 08:13:18 UTC (rev 22664)
+++ trunk/packages/libgenome/trunk/debian/libgenome-1.3-0v5.lintian-overrides	2016-08-12 09:07:24 UTC (rev 22665)
@@ -1,4 +0,0 @@
-# The created symbols control file does more harm than good (see #731485)
-libgenome-1.3-0v5: no-symbols-control-file usr/lib/libGenome-1.3.so.0.1.3
-# G++5 ABI transition
-libgenome-1.3-0v5: package-name-doesnt-match-sonames libgenome-1.3-0

Added: trunk/packages/libgenome/trunk/debian/patches/gcc-6.1.patch
===================================================================
--- trunk/packages/libgenome/trunk/debian/patches/gcc-6.1.patch	                        (rev 0)
+++ trunk/packages/libgenome/trunk/debian/patches/gcc-6.1.patch	2016-08-12 09:07:24 UTC (rev 22665)
@@ -0,0 +1,16 @@
+Author: Andreas Tille <tille at debian.org>
+Last-Update: Fri, 12 Aug 2016 10:35:40 +0200
+Bug-Debian: https://bugs.debian.org/831188
+Description: THis declaration makes gcc-6.1 fail so simply drop it
+
+--- a/libGenome/gnDefs.cpp
++++ b/libGenome/gnDefs.cpp
+@@ -4,8 +4,4 @@
+ 
+ #include "libGenome/gnDefs.h"
+ 
+-// some compilers don't have abs() for 64 bit ints
+-int64 abs( int64 a ){
+-	return a < 0 ? -a : a;
+-}
+ 

Added: trunk/packages/libgenome/trunk/debian/patches/series
===================================================================
--- trunk/packages/libgenome/trunk/debian/patches/series	                        (rev 0)
+++ trunk/packages/libgenome/trunk/debian/patches/series	2016-08-12 09:07:24 UTC (rev 22665)
@@ -0,0 +1 @@
+gcc-6.1.patch

Modified: trunk/packages/libgenome/trunk/debian/rules
===================================================================
--- trunk/packages/libgenome/trunk/debian/rules	2016-08-12 08:13:18 UTC (rev 22664)
+++ trunk/packages/libgenome/trunk/debian/rules	2016-08-12 09:07:24 UTC (rev 22665)
@@ -1,5 +1,7 @@
 #!/usr/bin/make -f
 
+export DEB_BUILD_MAINT_OPTIONS=hardening=+bindnow
+
 %:
 	dh $@ --with autoreconf