[med-svn] [Git][med-team/freecontact][master] 12 commits: Fix d-shlibmove override to fit gcc-8

Thu Jul 26 14:37:44 BST 2018

Andreas Tille pushed to branch master at Debian Med / freecontact


Commits:
683b58b3 by Andreas Tille at 2018-07-26T15:00:26+02:00
Fix d-shlibmove override to fit gcc-8

- - - - -
e9de9ac7 by Andreas Tille at 2018-07-26T15:01:34+02:00
Update copyright

- - - - -
a179532a by Andreas Tille at 2018-07-26T15:02:01+02:00
debhelper 11

- - - - -
f6b5aeff by Andreas Tille at 2018-07-26T15:05:41+02:00
Point Vcs fields to salsa.debian.org

- - - - -
62180dd1 by Andreas Tille at 2018-07-26T15:05:41+02:00
Standards-Version: 4.1.5

- - - - -
d9c87f95 by Andreas Tille at 2018-07-26T15:14:37+02:00
Fix override

- - - - -
5d62096c by Andreas Tille at 2018-07-26T15:15:14+02:00
Do not Build-Depends: automake

- - - - -
22d6d7ca by Andreas Tille at 2018-07-26T15:23:57+02:00
Adapt docbase file to debhelper 11 decision

- - - - -
e24edad7 by Andreas Tille at 2018-07-26T15:24:50+02:00
Remove useless get-orig-source target

- - - - -
ff946b6a by Andreas Tille at 2018-07-26T15:25:53+02:00
Drop unused lintian override

- - - - -
0db5a3a5 by Andreas Tille at 2018-07-26T15:32:23+02:00
Do not fiddle arround with upstream files

- - - - -
4d1bff66 by Andreas Tille at 2018-07-26T15:36:40+02:00
Upload to unstable

- - - - -


9 changed files:

- INSTALL
- debian/changelog
- debian/compat
- debian/control
- debian/copyright
- debian/libfreecontact-doc.doc-base
- − debian/libfreecontact-doc.lintian-overrides
- debian/rules
- − debian/source/options


Changes:

=====================================
INSTALL
=====================================

--- a/INSTALL
+++ b/INSTALL
@@ -1,8 +1,8 @@
 Installation Instructions
 *************************
 
-Copyright (C) 1994-1996, 1999-2002, 2004-2013 Free Software Foundation,
-Inc.
+Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
+2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 
    Copying and distribution of this file, with or without modification,
 are permitted in any medium without royalty provided the copyright
@@ -12,8 +12,8 @@ without warranty of any kind.
 Basic Installation
 ==================
 
-   Briefly, the shell command `./configure && make && make install'
-should configure, build, and install this package.  The following
+   Briefly, the shell commands `./configure; make; make install' should
+configure, build, and install this package.  The following
 more-detailed instructions are generic; see the `README' file for
 instructions specific to this package.  Some packages provide this
 `INSTALL' file but do not implement all of the features documented
@@ -226,11 +226,6 @@ order to use an ANSI C compiler:
 
 and if that doesn't work, install pre-built binaries of GCC for HP-UX.
 
-   HP-UX `make' updates targets which have the same time stamps as
-their prerequisites, which makes it generally unusable when shipped
-generated files such as `configure' are involved.  Use GNU `make'
-instead.
-
    On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot
 parse its `<wchar.h>' header file.  The option `-nodtk' can be used as
 a workaround.  If GNU CC is not installed, it is therefore recommended
@@ -309,10 +304,9 @@ causes the specified `gcc' to be used as the C compiler (unless it is
 overridden in the site shell script).
 
 Unfortunately, this technique does not work for `CONFIG_SHELL' due to
-an Autoconf limitation.  Until the limitation is lifted, you can use
-this workaround:
+an Autoconf bug.  Until the bug is fixed you can use this workaround:
 
-     CONFIG_SHELL=/bin/bash ./configure CONFIG_SHELL=/bin/bash
+     CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash
 
 `configure' Invocation
 ======================
@@ -368,3 +362,4 @@ operates.
 
 `configure' also accepts some other, not widely useful, options.  Run
 `configure --help' for more details.
+


=====================================
debian/changelog
=====================================
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+freecontact (1.0.21-7) unstable; urgency=medium
+
+  * Fix d-shlibmove override to fit gcc-8
+    Closes: #897750
+  * debhelper 11
+  * Point Vcs fields to salsa.debian.org
+  * Standards-Version: 4.1.5
+  * Do not Build-Depends: automake
+  * Remove useless get-orig-source target
+  * Drop unused lintian override
+
+ -- Andreas Tille <tille at debian.org>  Thu, 26 Jul 2018 15:32:51 +0200
+
 freecontact (1.0.21-6) unstable; urgency=medium
 
   [ Steffen Moeller ]


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


=====================================
debian/control
=====================================
--- a/debian/control
+++ b/debian/control
@@ -4,11 +4,8 @@ Uploaders: Laszlo Kajan <lkajan at debian.org>,
            Andreas Tille <tille at debian.org>
 Section: science
 Priority: optional
-Build-Depends: debhelper (>= 10),
-               automake,
-               autotools-dev,
+Build-Depends: debhelper (>= 11~),
                bash-completion,
-               dh-autoreconf,
                d-shlibs,
                gfortran,
                libblas-dev | libblas-3.so,
@@ -20,9 +17,9 @@ Build-Depends: debhelper (>= 10),
                perl,
                xsdcxx
 Build-Depends-Indep: doxygen
-Standards-Version: 4.0.0
-Vcs-Browser: https://anonscm.debian.org/cgit/debian-med/freecontact.git
-Vcs-Git: https://anonscm.debian.org/git/debian-med/freecontact.git
+Standards-Version: 4.1.5
+Vcs-Browser: https://salsa.debian.org/med-team/freecontact
+Vcs-Git: https://salsa.debian.org/med-team/freecontact.git
 Homepage: http://rostlab.org/
 
 Package: freecontact


=====================================
debian/copyright
=====================================
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,4 +1,4 @@
-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: freecontact
 Upstream-Contact: Laszlo Kajan <lkajan at rostlab.org>
 Source: ftp://rostlab.org/free/
@@ -14,7 +14,8 @@ Copyright: 2012 M. A. Sustik <msustik at gmail.com>
 License: GPL-3+
 
 Files: debian/*
-Copyright: 2013 Laszlo Kajan <lkajan at rostlab.org>
+Copyright: 2013-2015 Laszlo Kajan <lkajan at rostlab.org>
+           2014-2018 Andreas Tille <tille at debian.org>
 License: GPL-3+
 
 License: GPL-3+


=====================================
debian/libfreecontact-doc.doc-base
=====================================
--- a/debian/libfreecontact-doc.doc-base
+++ b/debian/libfreecontact-doc.doc-base
@@ -10,5 +10,5 @@ Abstract: library for fast protein contact prediction
 Section: Science/Biology
 
 Format: HTML
-Index: /usr/share/doc/libfreecontact-doc/html/index.html
-Files: /usr/share/doc/libfreecontact-doc/html/*.html
+Index: /usr/share/doc/libfreecontact-dev/html/index.html
+Files: /usr/share/doc/libfreecontact-dev/html/*.html


=====================================
debian/libfreecontact-doc.lintian-overrides deleted
=====================================
--- a/debian/libfreecontact-doc.lintian-overrides
+++ /dev/null
@@ -1,2 +0,0 @@
-# Doxygen generated. See more in d/README.source.
-libfreecontact-doc: embedded-javascript-library usr/share/doc/libfreecontact-doc/html/jquery.js


=====================================
debian/rules
=====================================
--- a/debian/rules
+++ b/debian/rules
@@ -10,7 +10,7 @@ export DEB_BUILD_MAINT_OPTIONS=hardening=+all
 Description := $(shell sed -e ':a; N; s/\n/$${Newline}/; ta' < debian/Description)
 
 %:
-	dh $@ --with bash-completion --with autoreconf
+	dh $@ --with bash-completion
 
 override_dh_auto_configure-indep:
 	dh_auto_configure -- --with-blas=blas --with-boost-libdir=/usr/lib/$(DEB_HOST_MULTIARCH) && $(MAKE) -C lib doxygen-doc && touch $@
@@ -32,8 +32,8 @@ override_dh_install:
 	            --devunversioned \
 	            --override s/libblas3-dev/libblas-dev/ \
 	            --v5 \
-                    --override s/libgfortran[34]-dev/libgfortran-7-dev/ \
-                    --override s/libquadmath0-dev/libgcc-7-dev/ \
+                    --override s/libgfortran[345]-dev/libgfortran-8-dev/ \
+                    --override s/libquadmath0-dev/libgcc-8-dev/ \
 	            --override s/liblapack3-dev/liblapack-dev/ \
 	            --movedev debian/tmp/usr/include/* usr/include \
 	            debian/tmp/usr/lib/*/*.so
@@ -51,8 +51,3 @@ override_dh_installdocs:
 override_dh_auto_clean:
 	rm -f build-indep-stamp
 	dh_auto_clean
-
-get-orig-source:
-	mkdir -p ../tarballs
-	uscan --verbose --force-download
-


=====================================
debian/source/options deleted
=====================================
--- a/debian/source/options
+++ /dev/null
@@ -1,2 +0,0 @@
-single-debian-patch
-extend-diff-ignore="(^|/)(config.guess|config.sub|INSTALL)$"



View it on GitLab: https://salsa.debian.org/med-team/freecontact/compare/3728af54a3b4083e14c8909461d10f8b55a6c2e6...4d1bff6691729524849d64e30774fc1168ee9b96

-- 
View it on GitLab: https://salsa.debian.org/med-team/freecontact/compare/3728af54a3b4083e14c8909461d10f8b55a6c2e6...4d1bff6691729524849d64e30774fc1168ee9b96
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/20180726/e286cfb4/attachment-0001.html>
