debian/changelog

-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@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@debian.org>  Fri, 27 Jul 2018 00:51:34 +0200
+ -- Andreas Tille <tille@debian.org>  Fri, 27 Jul 2018 06:32:17 +0200
 
 progressivemauve (1.2.0+4713+dfsg-1) unstable; urgency=medium
 

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

+Description: Enable building against unversioned libs
+Author: Andreas Tille <tille@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

@@ -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

@@ -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

@@ -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

 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