[med-svn] [freecontact] 03/03: Upload gcc-5 transition

[Andreas Tille]

This is an automated email from the git hooks/post-receive script.

tille pushed a commit to branch master
in repository freecontact.

commit 33fb8f89d131ea841285e7e14a3d83f77865ff29
Author: Andreas Tille <tille at debian.org>
Date:   Wed Aug 19 22:40:48 2015 +0200

    Upload gcc-5 transition
---
 debian/changelog |  7 +++++--
 debian/control   | 11 ++++++++---
 debian/rules     |  8 +++-----
 3 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 0b936e9..ff008d1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,14 @@
-freecontact (1.0.21-4) UNRELEASED; urgency=medium
+freecontact (1.0.21-4) unstable; urgency=medium
 
   * cme fix dpkg-control
   * simplify debian/rules
   * DEP5
   * fix location of bash-completion script
+  * unversioned *-dev library
+  * remove jquery.js copy
+  * gcc-5 transition
 
- -- Andreas Tille <tille at debian.org>  Sun, 16 Aug 2015 13:22:32 +0200
+ -- Andreas Tille <tille at debian.org>  Wed, 19 Aug 2015 22:28:09 +0200
 
 freecontact (1.0.21-3) unstable; urgency=medium
 
diff --git a/debian/control b/debian/control
index f0a0f96..5f781af 100644
--- a/debian/control
+++ b/debian/control
@@ -39,12 +39,15 @@ Description: fast protein contact predictor
  .
  This package contains the command line tool freecontact(1).
 
-Package: libfreecontact0
+Package: libfreecontact0v5
 Architecture: any
+Multi-Arch: same
 Section: libs
 Depends: ${shlibs:Depends},
          ${misc:Depends}
 Pre-Depends: ${misc:Pre-Depends}
+Conflicts: libfreecontact0
+Replaces: libfreecontact0
 Description: fast protein contact predictor library
  ${Description}
  .
@@ -53,7 +56,7 @@ Description: fast protein contact predictor library
 Package: libfreecontact-dev
 Architecture: any
 Section: libdevel
-Depends: libfreecontact0 (= ${binary:Version}),
+Depends: libfreecontact0v5 (= ${binary:Version}),
          ${misc:Depends}
 Suggests: libfreecontact-doc
 Conflicts: libfreecontact-dev
@@ -66,9 +69,11 @@ Description: fast protein contact predictor library - development files
 
 Package: libfreecontact0-dbg
 Architecture: any
+Multi-Arch: same
 Section: debug
 Priority: extra
-Depends: libfreecontact0 (= ${binary:Version}),
+Pre-Depends: ${misc:Pre-Depends}
+Depends: libfreecontact0v5 (= ${binary:Version}),
          ${misc:Depends}
 Description: debugging symbols for libfreecontact
  ${Description}
diff --git a/debian/rules b/debian/rules
index 39fb7cb..f0e35d3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -32,15 +32,13 @@ override_dh_install:
 	            --exclude-la \
 	            --devunversioned \
 	            --override s/libblas3-dev/libblas-dev/ \
-	            --override s/libgfortran3-dev/libgfortran-4.9-dev/ \
+	            --v5 \
+	            --override s/libgfortran3-dev/libgfortran-5-dev/ \
+	            --override s/libquadmath0-dev/libgcc-5-dev/ \
 	            --override s/liblapack3-dev/liblapack-dev/ \
-	            --override s/libquadmath0-dev/libgcc-4.9-dev/ \
 	            --movedev debian/tmp/usr/include/* usr/include \
 	            debian/tmp/usr/lib/*/*.so
 
-##	            --v5 \
-##	            --override s/libgfortran3-dev/libgfortran-5-dev/ \
-##	            --override s/libquadmath0-dev/libgcc-5-dev/ \
 
 override_dh_bash-completion:
 	echo "Until bug #668254 is fixed we need to override this"

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/freecontact.git