[med-svn] [Git][med-team/libmuscle][master] 2 commits: Correct the libMUSCLE.la dependency

[Andreas Tille]

Andreas Tille pushed to branch master at Debian Med / libmuscle


Commits:
be98aeaa by Andreas Tille at 2018-08-11T18:39:07Z
Correct the libMUSCLE.la dependency

- - - - -
02a1db7f by Andreas Tille at 2018-08-11T18:41:25Z
Upload to unstable

- - - - -


4 changed files:

- debian/changelog
- + debian/patches/makefile_deps.patch
- debian/patches/series
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+libmuscle (3.7+4565-6) unstable; urgency=medium
+
+  [ Adrian Bunk ]
+  * Correct the libMUSCLE.la dependency
+
+ -- Andreas Tille <tille at debian.org>  Sat, 11 Aug 2018 20:39:56 +0200
+
 libmuscle (3.7+4565-5) unstable; urgency=medium
 
   * Provide link to old versioned lib


=====================================
debian/patches/makefile_deps.patch
=====================================
--- /dev/null
+++ b/debian/patches/makefile_deps.patch
@@ -0,0 +1,14 @@
+Description: Correct the libMUSCLE.la dependency
+ This allows automake to generate proper dependencies.
+Author: Adrian Bunk <bunk at debian.org>
+
+--- libmuscle-3.7+4565.orig/libMUSCLE/Makefile.am
++++ libmuscle-3.7+4565/libMUSCLE/Makefile.am
+@@ -36,6 +36,6 @@ bin_PROGRAMS = muscle
+ 
+ 
+ muscle_SOURCES = main.cpp
+-muscle_LDADD = $(top_builddir)/libMUSCLE/libMUSCLE.la
++muscle_LDADD = libMUSCLE.la
+ 
+ 


=====================================
debian/patches/series
=====================================
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 parsnp_changes.patch
 drop_version_from_library_name.patch
+makefile_deps.patch


=====================================
debian/rules
=====================================
--- a/debian/rules
+++ b/debian/rules
@@ -5,9 +5,6 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 %:
 	dh $@
 
-override_dh_auto_build:
-	dh_auto_build --no-parallel
-
 override_dh_install:
 	dh_install
 	d-shlibmove --commit \



View it on GitLab: https://salsa.debian.org/med-team/libmuscle/compare/3b5bf91a2666a521ba91378a1e02e47b7e7007e1...02a1db7f73b1d8c8a2e6c5d5aa2e05815457e27c

-- 
View it on GitLab: https://salsa.debian.org/med-team/libmuscle/compare/3b5bf91a2666a521ba91378a1e02e47b7e7007e1...02a1db7f73b1d8c8a2e6c5d5aa2e05815457e27c
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/20180811/41ef111d/attachment-0001.html>