[med-svn] [Git][med-team/progressivemauve][master] 7 commits: Enable building against unversioned libs

[Andreas Tille]

Andreas Tille pushed to branch master at Debian Med / progressivemauve


Commits:
f61e0e73 by Andreas Tille at 2018-07-27T08:43:28+02:00
Enable building against unversioned libs

- - - - -
15f42a18 by Andreas Tille at 2018-07-27T08:43:41+02:00
Another spelling fix

- - - - -
b3ee831e by Andreas Tille at 2018-07-27T08:47:06+02:00
Point Vcs fields to salsa.debian.org

- - - - -
c27cc565 by Andreas Tille at 2018-07-27T08:47:06+02:00
Standards-Version: 4.1.5

- - - - -
94a67257 by Andreas Tille at 2018-07-27T08:54:44+02:00
Spelling

- - - - -
60171737 by Andreas Tille at 2018-07-27T08:57:39+02:00
Silence lintian about version mangling

- - - - -
264cad14 by Andreas Tille at 2018-07-27T09:01:58+02:00
Upload to unstable

- - - - -


7 changed files:

- debian/changelog
- debian/control
- + debian/patches/adapt-to-unversioned-libs.patch
- debian/patches/do_not_build_static_binaries.patch
- debian/patches/series
- debian/patches/spelling.patch
- debian/watch


Changes:

=====================================
debian/changelog
=====================================
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,17 @@
-progressivemauve (1.2.0+4713+dfsg-2) UNRELEASED; urgency=medium
+progressivemauve (1.2.0+4713+dfsg-3) unstable; urgency=medium
+
+  * Point Vcs fields to salsa.debian.org
+  * Standards-Version: 4.1.5
+
+ -- Andreas Tille <tille at debian.org>  Fri, 27 Jul 2018 08:58:00 +0200
+
+progressivemauve (1.2.0+4713+dfsg-2) unstable; urgency=medium
 
   * Adjust Build-Depends to renamed libraries
     Closes: #904690
+  * Enable building against unversioned libs
 
- -- Andreas Tille <tille at debian.org>  Fri, 27 Jul 2018 00:51:34 +0200
+ -- Andreas Tille <tille at debian.org>  Fri, 27 Jul 2018 06:32:17 +0200
 
 progressivemauve (1.2.0+4713+dfsg-1) unstable; urgency=medium
 


=====================================
debian/control
=====================================
--- a/debian/control
+++ b/debian/control
@@ -12,10 +12,10 @@ Build-Depends: debhelper (>= 11~),
                libboost-iostreams-dev,
                libgenome-dev,
                libmuscle-dev,
-               libmems-dev
-Standards-Version: 4.1.3
-Vcs-Browser: https://anonscm.debian.org/cgit/debian-med/progressivemauve.git
-Vcs-Git: https://anonscm.debian.org/git/debian-med/progressivemauve.git
+               libmems-dev (>= 1.6.0+4725-7~)
+Standards-Version: 4.1.5
+Vcs-Browser: https://salsa.debian.org/med-team/progressivemauve
+Vcs-Git: https://salsa.debian.org/med-team/progressivemauve.git
 Homepage: http://darlinglab.org/mauve/user-guide/mauvealigner.html
 
 Package: progressivemauve


=====================================
debian/patches/adapt-to-unversioned-libs.patch
=====================================
--- /dev/null
+++ b/debian/patches/adapt-to-unversioned-libs.patch
@@ -0,0 +1,15 @@
+Description: Enable building against unversioned libs
+Author: Andreas Tille <tille at debian.org>
+Last-Updates: Fri, 27 Jul 2018 06:32:17 +0200
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -43,7 +43,7 @@ AC_DEFINE(GETOPT_UNDEFINED,[],"Define th
+ ()")
+ )
+ 
+-PKG_CHECK_MODULES(DEPS, libMems-1.6 >= 1.0.0)
++PKG_CHECK_MODULES(DEPS, libMems >= 1.0.0)
+ AC_SUBST(DEPS_CFLAGS)
+ AC_SUBST(DEPS_LIBS)
+ 


=====================================
debian/patches/do_not_build_static_binaries.patch
=====================================
--- a/debian/patches/do_not_build_static_binaries.patch
+++ b/debian/patches/do_not_build_static_binaries.patch
@@ -4,7 +4,7 @@ Description: Avoid static linking
  * mauveAlignerStatic fails to build due to a problem linking -lgomp symbols
    May be these need to be linked right into libGenome to make thos working
  * Moreover the -static flag is suppressed in general
- * Once -static is droped progressiveMauveStatic becomes identical to
+ * Once -static is dropped progressiveMauveStatic becomes identical to
    progressiveMauve and is thus skipped as well
 
 --- a/src/Makefile.am


=====================================
debian/patches/series
=====================================
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@ fix_build.patch
 do_not_build_static_binaries.patch
 spelling.patch
 use-native-getopt.patch
+adapt-to-unversioned-libs.patch


=====================================
debian/patches/spelling.patch
=====================================
--- a/debian/patches/spelling.patch
+++ b/debian/patches/spelling.patch
@@ -13,3 +13,14 @@ Description: Fix spelling
  			return -1;
  		}
  	}
+--- a/src/repeatoire.cpp
++++ b/src/repeatoire.cpp
+@@ -1776,7 +1776,7 @@ int main( int argc, char* argv[] )
+         }
+ 
+         if (vm.count("rmax")) {
+-            cout << "setting maximimum multiplicity to " 
++            cout << "setting maximum multiplicity to " 
+                  << rmax << ".\n";
+         } else {
+             cout << "Using default maximum multiplicity (500).\n";


=====================================
debian/watch
=====================================
--- a/debian/watch
+++ b/debian/watch
@@ -1,4 +1,4 @@
 version=4
 
-opts=dversionmangle=s/.*/0.No-Release/ \
+opts="dversionmangle=s/.*/0.No-Release/;s/\+dfsg//g" \
   https://people.debian.org/~eriberto/ FakeWatchNoUpstreamReleaseForThisPackage-(\d\S+)\.gz



View it on GitLab: https://salsa.debian.org/med-team/progressivemauve/compare/06ddc050db8f6e00ce72add59ff2408a35430f3f...264cad146c48537b35fa8365e9137905785f8a21

-- 
View it on GitLab: https://salsa.debian.org/med-team/progressivemauve/compare/06ddc050db8f6e00ce72add59ff2408a35430f3f...264cad146c48537b35fa8365e9137905785f8a21
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20180727/dca053f8/attachment-0001.html>