Control: tag -1 pending

Hello again,

Martin Pitt [2015-08-05 10:44 +0200]:
> Debdiff attached.

As per current g++5 transition exception I uploaded this as a 2-day
NMU with attached debdiff. (I can't commit to git)

Martin
-- 
Martin Pitt                        | http://www.piware.de
Ubuntu Developer (www.ubuntu.com)  | Debian Developer  (www.debian.org)
diff -Nru libhmsbeagle-2.1.2+20150609/debian/changelog 
libhmsbeagle-2.1.2+20150609/debian/changelog
--- libhmsbeagle-2.1.2+20150609/debian/changelog        2015-07-18 
20:35:19.000000000 +0200
+++ libhmsbeagle-2.1.2+20150609/debian/changelog        2015-08-05 
11:44:41.000000000 +0200
@@ -1,3 +1,10 @@
+libhmsbeagle (2.1.2+20150609-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Rename library packages for g++5 ABI transition. (Closes: #791128)
+
+ -- Martin Pitt <[email protected]>  Wed, 05 Aug 2015 11:44:16 +0200
+
 libhmsbeagle (2.1.2+20150609-1) unstable; urgency=medium
 
   * New Git checkout featuring functionality used in beast-mcmc release
diff -Nru libhmsbeagle-2.1.2+20150609/debian/control 
libhmsbeagle-2.1.2+20150609/debian/control
--- libhmsbeagle-2.1.2+20150609/debian/control  2015-07-18 20:35:19.000000000 
+0200
+++ libhmsbeagle-2.1.2+20150609/debian/control  2015-08-05 11:44:10.000000000 
+0200
@@ -22,7 +22,7 @@
 Package: libhmsbeagle-dev
 Architecture: linux-any
 Section: libdevel
-Depends: libhmsbeagle1 (= ${binary:Version}),
+Depends: libhmsbeagle1v5 (= ${binary:Version}),
          ${shlibs:Depends},
          ${misc:Depends}
 Description: High-performance lib for Bayesian and Maximum Likelihood 
phylogenetics (devel)
@@ -42,11 +42,13 @@
  .
  This package contains development files needed to build against Beagle 
library.
 
-Package: libhmsbeagle1
+Package: libhmsbeagle1v5
 Architecture: linux-any
 Depends: ${shlibs:Depends},
          ${misc:Depends}
 Pre-Depends: ${misc:Pre-Depends}
+Conflicts: libhmsbeagle1
+Replaces: libhmsbeagle1
 Description: High-performance lib for Bayesian and Maximum Likelihood 
phylogenetics
  BEAGLE is a high-performance library that can perform the core calculations at
  the heart of most Bayesian and Maximum Likelihood phylogenetics packages. It
diff -Nru libhmsbeagle-2.1.2+20150609/debian/libhmsbeagle1.dirs 
libhmsbeagle-2.1.2+20150609/debian/libhmsbeagle1.dirs
--- libhmsbeagle-2.1.2+20150609/debian/libhmsbeagle1.dirs       2015-07-18 
20:35:19.000000000 +0200
+++ libhmsbeagle-2.1.2+20150609/debian/libhmsbeagle1.dirs       1970-01-01 
01:00:00.000000000 +0100
@@ -1 +0,0 @@
-usr/lib
diff -Nru libhmsbeagle-2.1.2+20150609/debian/libhmsbeagle1.install 
libhmsbeagle-2.1.2+20150609/debian/libhmsbeagle1.install
--- libhmsbeagle-2.1.2+20150609/debian/libhmsbeagle1.install    2015-07-18 
20:35:19.000000000 +0200
+++ libhmsbeagle-2.1.2+20150609/debian/libhmsbeagle1.install    1970-01-01 
01:00:00.000000000 +0100
@@ -1,2 +0,0 @@
-usr/lib/*/lib*.so.*
-usr/lib/*/lib*jni.so
diff -Nru libhmsbeagle-2.1.2+20150609/debian/libhmsbeagle1v5.dirs 
libhmsbeagle-2.1.2+20150609/debian/libhmsbeagle1v5.dirs
--- libhmsbeagle-2.1.2+20150609/debian/libhmsbeagle1v5.dirs     1970-01-01 
01:00:00.000000000 +0100
+++ libhmsbeagle-2.1.2+20150609/debian/libhmsbeagle1v5.dirs     2015-08-05 
11:44:10.000000000 +0200
@@ -0,0 +1 @@
+usr/lib
diff -Nru libhmsbeagle-2.1.2+20150609/debian/libhmsbeagle1v5.install 
libhmsbeagle-2.1.2+20150609/debian/libhmsbeagle1v5.install
--- libhmsbeagle-2.1.2+20150609/debian/libhmsbeagle1v5.install  1970-01-01 
01:00:00.000000000 +0100
+++ libhmsbeagle-2.1.2+20150609/debian/libhmsbeagle1v5.install  2015-08-05 
11:44:10.000000000 +0200
@@ -0,0 +1,2 @@
+usr/lib/*/lib*.so.*
+usr/lib/*/lib*jni.so
diff -Nru libhmsbeagle-2.1.2+20150609/debian/libhmsbeagle1v5.lintian-overrides 
libhmsbeagle-2.1.2+20150609/debian/libhmsbeagle1v5.lintian-overrides
--- libhmsbeagle-2.1.2+20150609/debian/libhmsbeagle1v5.lintian-overrides        
1970-01-01 01:00:00.000000000 +0100
+++ libhmsbeagle-2.1.2+20150609/debian/libhmsbeagle1v5.lintian-overrides        
2015-08-05 11:44:10.000000000 +0200
@@ -0,0 +1,2 @@
+# G++5 ABI transition
+libhmsbeagle1v5: package-name-doesnt-match-sonames libhmsbeagle1
diff -Nru libhmsbeagle-2.1.2+20150609/debian/rules 
libhmsbeagle-2.1.2+20150609/debian/rules
--- libhmsbeagle-2.1.2+20150609/debian/rules    2015-07-18 20:35:19.000000000 
+0200
+++ libhmsbeagle-2.1.2+20150609/debian/rules    2015-08-05 11:44:10.000000000 
+0200
@@ -6,7 +6,7 @@
 #export DH_VERBOSE=1
 
 pkg := $(shell dpkg-parsechangelog | sed -n 's/^Source: //p')
-lib := $(pkg)1
+lib := $(pkg)1v5
 use_sse := $(shell if [ `dpkg-architecture -qDEB_BUILD_ARCH` = amd64 ] ; then 
echo yes ; else echo no ; fi)
 
 %:

Attachment: signature.asc
Description: Digital signature

Reply via email to