[med-svn] [Git][med-team/biosquid][master] 9 commits: debhelper 11

[Andreas Tille]

Andreas Tille pushed to branch master at Debian Med / biosquid


Commits:
8ba3be0a by Andreas Tille at 2018-08-18T05:40:40Z
debhelper 11

- - - - -
983f984c by Andreas Tille at 2018-08-18T05:40:49Z
Point Vcs fields to salsa.debian.org

- - - - -
f2def650 by Andreas Tille at 2018-08-18T05:40:49Z
Standards-Version: 4.2.0

- - - - -
2277727a by Andreas Tille at 2018-08-18T05:49:09Z
Fix LDADD in Makefile.am

- - - - -
432d12ec by Andreas Tille at 2018-08-18T05:49:53Z
Drop --no-parallel

- - - - -
e16fd0c5 by Andreas Tille at 2018-08-18T05:51:09Z
Merge unintended changelog entry

- - - - -
75267145 by Andreas Tille at 2018-08-18T06:01:23Z
Refresh patch

- - - - -
b8378b55 by Andreas Tille at 2018-08-18T06:06:48Z
Do not parse d/changelog

- - - - -
4289c793 by Andreas Tille at 2018-08-18T06:08:36Z
Upload to unstable

- - - - -


5 changed files:

- debian/changelog
- debian/compat
- debian/control
- debian/patches/pkg-config.patch
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+biosquid (1.9g+cvs20050121-11) unstable; urgency=medium
+
+  * debhelper 11
+  * Point Vcs fields to salsa.debian.org
+  * Standards-Version: 4.2.0
+  * Fix LDADD in Makefile.am
+    Closes: #906454
+  * d/rules:
+     - Drop --no-parallel
+     - Do not parse d/changelog
+
+ -- Andreas Tille <tille at debian.org>  Sat, 18 Aug 2018 08:06:54 +0200
+
 biosquid (1.9g+cvs20050121-10) unstable; urgency=medium
 
   * Upload to unstable


=====================================
debian/compat
=====================================
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-10
+11


=====================================
debian/control
=====================================
--- a/debian/control
+++ b/debian/control
@@ -3,13 +3,12 @@ Maintainer: Debian-Med Packaging Team <debian-med-packaging at lists.alioth.debian.
 Uploaders: Andreas Tille <tille at debian.org>
 Section: science
 Priority: optional
-Build-Depends: debhelper (>= 10),
+Build-Depends: debhelper (>= 11~),
                d-shlibs,
-               autotools-dev,
-	       pvm-dev
-Standards-Version: 3.9.8
-Vcs-Browser: https://anonscm.debian.org/cgit/debian-med/biosquid.git
-Vcs-Git: https://anonscm.debian.org/git/debian-med/biosquid.git
+               pvm-dev
+Standards-Version: 4.2.0
+Vcs-Browser: https://salsa.debian.org/med-team/biosquid
+Vcs-Git: https://salsa.debian.org/med-team/biosquid.git
 Homepage: http://eddylab.org/software.html
 
 Package: biosquid
@@ -52,8 +51,8 @@ Depends: ${shlibs:Depends},
          libsquid1 (= ${binary:Version}),
          ${misc:Depends}
 Breaks: biosquid-dev
-Replaces: biosquid-dev
 Provides: biosquid-dev
+Replaces: biosquid-dev
 Description: biosquid headers and static library for biological sequence analysis
  SQUID is a library of C code functions for sequence analysis. It also
  includes a number of small utility programs to convert, show statistics,


=====================================
debian/patches/pkg-config.patch
=====================================
--- a/debian/patches/pkg-config.patch
+++ b/debian/patches/pkg-config.patch
@@ -35,13 +35,15 @@ Last-Update: Thu, 23 Mar 2017 21:55:15 +0100
  
 --- a/Makefile.am
 +++ b/Makefile.am
-@@ -74,6 +74,9 @@ bin_PROGRAMS =	afetch\
- 
- LDADD = -lsquid -lm
+@@ -72,7 +72,10 @@ bin_PROGRAMS =	afetch\
+ 	translate\
+ 	weight
  
+-LDADD = -lsquid -lm
++LDADD = libsquid.la -lm
++
 +pkgconfigdir=$(libdir)/pkgconfig
 +pkgconfig_DATA = libsquid.pc
-+
+ 
  bin_MANS =  afetch\
  	alistat\
- 	compstruct\


=====================================
debian/rules
=====================================
--- a/debian/rules
+++ b/debian/rules
@@ -1,16 +1,15 @@
 #!/usr/bin/make -f
 
-
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 
 # Uncomment this to turn on verbose mode.
 export DH_VERBOSE=1
 
-DEBPKGNAME     := $(shell dpkg-parsechangelog | awk '/^Source:/ {print $$2}')
+include /usr/share/dpkg/default.mk
 LIBNAME	       := libsquid
 
 %:
-	dh $@ --no-parallel
+	dh $@
 
 override_dh_auto_clean:
 	dh_auto_clean
@@ -42,12 +41,12 @@ override_dh_install:
 		    --exclude-la \
 		    --override s/libpvm3-3-dev/pvm-dev/ \
 		    --movedev debian/tmp/usr/include/* usr/include \
-		    --movedev squid.h usr/include/$(DEBPKGNAME) \
-		    --movedev squidconf.h usr/include/$(DEBPKGNAME) \
+		    --movedev squid.h usr/include/$(DEB_SOURCE) \
+		    --movedev squidconf.h usr/include/$(DEB_SOURCE) \
 		    --movedev "debian/tmp/usr/lib/*/pkgconfig/*.pc" usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig \
 		    debian/tmp/usr/lib/*/$(LIBNAME).so
 	# resolve @LICENSE@ by text in header files
-	for HEADER in $(CURDIR)/debian/$(LIBNAME)-dev/usr/include/$(DEBPKGNAME)/*.h ; do \
+	for HEADER in $(CURDIR)/debian/$(LIBNAME)-dev/usr/include/$(DEB_SOURCE)/*.h ; do \
 	  if grep -q '@LICENSE@' $${HEADER} ; then \
 	    sed '/@LICENSE@/,$$d' $${HEADER} > $${HEADER}_tmp ; \
 	    sed 's/^/ * /' Licenses/gnu     >> $${HEADER}_tmp ; \



View it on GitLab: https://salsa.debian.org/med-team/biosquid/compare/6af23b6ce51d112237e48bf5eea8ded45ef9239d...4289c793dedf8eaabdb9caa275ad11a6c7359b6c

-- 
View it on GitLab: https://salsa.debian.org/med-team/biosquid/compare/6af23b6ce51d112237e48bf5eea8ded45ef9239d...4289c793dedf8eaabdb9caa275ad11a6c7359b6c
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/20180818/eda3fe9d/attachment-0001.html>