user release.debian....@packages.debian.org
usertag 790996 + transition
block 790996 by 790756
reassign 790996 release.debian.org
thanks

Attached is the diff for 4.6.1-2. Several build depends have not yet made the
transition:

level 3: gmp (791053)
level 5: qtbase-opensource-src (794518)
level 6: libqglviewer, boost

Joachim

diff -Nru cgal-4.6.1/debian/changelog cgal-4.6.1/debian/changelog
--- cgal-4.6.1/debian/changelog	2015-06-26 18:58:01.000000000 +0200
+++ cgal-4.6.1/debian/changelog	2015-08-15 10:57:45.000000000 +0200
@@ -1,3 +1,9 @@
+cgal (4.6.1-2) unstable; urgency=medium
+
+  * Rename library packages for g++5 ABI transition (Closes: #790996).
+
+ -- Joachim Reichel <reic...@debian.org>  Sat, 15 Aug 2015 10:57:06 +0200
+
 cgal (4.6.1-1) unstable; urgency=medium
 
   * New upstream release.
diff -Nru cgal-4.6.1/debian/control cgal-4.6.1/debian/control
--- cgal-4.6.1/debian/control	2015-04-10 20:19:57.000000000 +0200
+++ cgal-4.6.1/debian/control	2015-08-15 10:58:58.000000000 +0200
@@ -10,7 +10,9 @@
 Homepage: http://www.cgal.org/
 XS-Autobuild: yes
 
-Package: libcgal11
+Package: libcgal11v5
+Conflicts: libcgal11
+Replaces: libcgal11
 Architecture: any
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
@@ -35,13 +37,15 @@
  This package contains the main library libCGAL.so as well as two support
  libraries libCGAL_Core.so (from the CORE project) and libCGAL_ImageIO.so
  (image I/O). The library libCGAL_Qt4.so used for visualization in demos
- can be found in the package libcgal-qt4-11.
+ can be found in the package libcgal-qt4-11v5.
 
-Package: libcgal-qt4-11
+Package: libcgal-qt4-11v5
+Conflicts: libcgal-qt4-11
+Replaces: libcgal-qt4-11
 Architecture: any
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
-Depends: libcgal11 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
+Depends: libcgal11v5 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
 Description: C++ library for computational geometry (support for Qt4)
  CGAL (Computational Geometry Algorithms Library) makes the most important
  of the solutions and methods developed in computational geometry available
@@ -65,7 +69,7 @@
 Section: libdevel
 Architecture: any
 Multi-Arch: same
-Depends: libcgal11 (= ${binary:Version}), libboost-dev, libboost-thread-dev,
+Depends: libcgal11v5 (= ${binary:Version}), libboost-dev, libboost-thread-dev,
  libboost-system-dev, libboost-program-options-dev, libgmp10-dev, libmpfr-dev,
  zlib1g-dev, ${misc:Depends}
 Suggests: libmpfi-dev, libntl-dev, libtbb-dev
@@ -83,7 +87,7 @@
 Section: libdevel
 Architecture: any
 Multi-Arch: same
-Depends: libcgal11 (= ${binary:Version}), libcgal-qt4-11 (= ${binary:Version}),
+Depends: libcgal11v5 (= ${binary:Version}), libcgal-qt4-11v5 (= ${binary:Version}),
  libcgal-dev, libqt4-dev, ${misc:Depends}
 Replaces: libcgal-dev (<< 4.1-1)
 Breaks: libcgal-dev (<< 4.1-1)
@@ -100,9 +104,9 @@
 Section: devel
 Architecture: all
 Multi-Arch: foreign
-Depends: libcgal-dev (>= ${binary:Version}), libcgal11 (>= ${binary:Version}),
+Depends: libcgal-dev (>= ${binary:Version}), libcgal11v5 (>= ${binary:Version}),
  ${misc:Depends}
-Recommends: libcgal-qt4-dev (>= ${binary:Version}), libcgal-qt4-11 (>= ${binary:Version})
+Recommends: libcgal-qt4-dev (>= ${binary:Version}), libcgal-qt4-11v5 (>= ${binary:Version})
 Suggests: liblapack-dev, libatlas-base-dev, gfortran,  geomview,
  libqglviewer-dev, libipe-dev (>= 7), libglew1.5-dev | libglew-dev,
  libmagick++-dev, qt4-dev-tools, libqt4-opengl-dev, libeigen3-dev (>= 3.1.0~beta1-1),
@@ -118,7 +122,7 @@
 Package: libcgal-ipelets
 Section: graphics
 Architecture: any
-Depends: libcgal11 (>= ${binary:Version}), ipe (>= ${Ipe-Version}), ipe (<< ${Ipe-Version}+),
+Depends: libcgal11v5 (>= ${binary:Version}), ipe (>= ${Ipe-Version}), ipe (<< ${Ipe-Version}+),
  ${shlibs:Depends}, ${misc:Depends}
 Conflicts: libcgal5-ipelets
 Replaces: libcgal5-ipelets
diff -Nru cgal-4.6.1/debian/libcgal-qt4-11.install cgal-4.6.1/debian/libcgal-qt4-11.install
--- cgal-4.6.1/debian/libcgal-qt4-11.install	2014-10-24 21:24:42.000000000 +0200
+++ cgal-4.6.1/debian/libcgal-qt4-11.install	1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-usr/lib/*/libCGAL_Qt4.so.*
diff -Nru cgal-4.6.1/debian/libcgal-qt4-11.shlibs cgal-4.6.1/debian/libcgal-qt4-11.shlibs
--- cgal-4.6.1/debian/libcgal-qt4-11.shlibs	2015-04-10 20:43:58.000000000 +0200
+++ cgal-4.6.1/debian/libcgal-qt4-11.shlibs	1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-libCGAL_Qt4 11 libcgal-qt4-11
diff -Nru cgal-4.6.1/debian/libcgal-qt4-11v5.install cgal-4.6.1/debian/libcgal-qt4-11v5.install
--- cgal-4.6.1/debian/libcgal-qt4-11v5.install	1970-01-01 01:00:00.000000000 +0100
+++ cgal-4.6.1/debian/libcgal-qt4-11v5.install	2014-10-24 21:24:42.000000000 +0200
@@ -0,0 +1 @@
+usr/lib/*/libCGAL_Qt4.so.*
diff -Nru cgal-4.6.1/debian/libcgal-qt4-11v5.lintian-overrides cgal-4.6.1/debian/libcgal-qt4-11v5.lintian-overrides
--- cgal-4.6.1/debian/libcgal-qt4-11v5.lintian-overrides	1970-01-01 01:00:00.000000000 +0100
+++ cgal-4.6.1/debian/libcgal-qt4-11v5.lintian-overrides	2015-08-15 11:03:19.000000000 +0200
@@ -0,0 +1 @@
+libcgal-qt4-11v5: package-name-doesnt-match-sonames libcgal-qt4-11
diff -Nru cgal-4.6.1/debian/libcgal-qt4-11v5.shlibs cgal-4.6.1/debian/libcgal-qt4-11v5.shlibs
--- cgal-4.6.1/debian/libcgal-qt4-11v5.shlibs	1970-01-01 01:00:00.000000000 +0100
+++ cgal-4.6.1/debian/libcgal-qt4-11v5.shlibs	2015-08-15 11:01:54.000000000 +0200
@@ -0,0 +1 @@
+libCGAL_Qt4 11 libcgal-qt4-11v5
diff -Nru cgal-4.6.1/debian/libcgal11.install cgal-4.6.1/debian/libcgal11.install
--- cgal-4.6.1/debian/libcgal11.install	2015-04-10 20:19:19.000000000 +0200
+++ cgal-4.6.1/debian/libcgal11.install	1970-01-01 01:00:00.000000000 +0100
@@ -1,4 +0,0 @@
-usr/lib/*/libCGAL.so.*
-usr/lib/*/libCGAL_Core.so.*
-usr/lib/*/libCGAL_ImageIO.so.*
-usr/share/doc/cgal/changelog   usr/share/doc/libcgal11
diff -Nru cgal-4.6.1/debian/libcgal11.lintian-overrides cgal-4.6.1/debian/libcgal11.lintian-overrides
--- cgal-4.6.1/debian/libcgal11.lintian-overrides	2015-04-10 21:51:43.000000000 +0200
+++ cgal-4.6.1/debian/libcgal11.lintian-overrides	1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-libcgal11: hardening-no-fortify-functions usr/lib/*/libCGAL.so.*
diff -Nru cgal-4.6.1/debian/libcgal11.shlibs cgal-4.6.1/debian/libcgal11.shlibs
--- cgal-4.6.1/debian/libcgal11.shlibs	2015-04-10 20:43:58.000000000 +0200
+++ cgal-4.6.1/debian/libcgal11.shlibs	1970-01-01 01:00:00.000000000 +0100
@@ -1,3 +0,0 @@
-libCGAL 11 libcgal11
-libCGAL_Core 11 libcgal11
-libCGAL_ImageIO 11 libcgal11
diff -Nru cgal-4.6.1/debian/libcgal11v5.install cgal-4.6.1/debian/libcgal11v5.install
--- cgal-4.6.1/debian/libcgal11v5.install	1970-01-01 01:00:00.000000000 +0100
+++ cgal-4.6.1/debian/libcgal11v5.install	2015-08-15 11:02:02.000000000 +0200
@@ -0,0 +1,4 @@
+usr/lib/*/libCGAL.so.*
+usr/lib/*/libCGAL_Core.so.*
+usr/lib/*/libCGAL_ImageIO.so.*
+usr/share/doc/cgal/changelog   usr/share/doc/libcgal11v5
diff -Nru cgal-4.6.1/debian/libcgal11v5.lintian-overrides cgal-4.6.1/debian/libcgal11v5.lintian-overrides
--- cgal-4.6.1/debian/libcgal11v5.lintian-overrides	1970-01-01 01:00:00.000000000 +0100
+++ cgal-4.6.1/debian/libcgal11v5.lintian-overrides	2015-08-15 11:02:43.000000000 +0200
@@ -0,0 +1,2 @@
+libcgal11v5: hardening-no-fortify-functions usr/lib/*/libCGAL.so.*
+libcgal11v5: package-name-doesnt-match-sonames libcgal11
diff -Nru cgal-4.6.1/debian/libcgal11v5.shlibs cgal-4.6.1/debian/libcgal11v5.shlibs
--- cgal-4.6.1/debian/libcgal11v5.shlibs	1970-01-01 01:00:00.000000000 +0100
+++ cgal-4.6.1/debian/libcgal11v5.shlibs	2015-08-15 11:02:13.000000000 +0200
@@ -0,0 +1,3 @@
+libCGAL 11 libcgal11v5
+libCGAL_Core 11 libcgal11v5
+libCGAL_ImageIO 11 libcgal11v5
diff -Nru cgal-4.6.1/debian/rules cgal-4.6.1/debian/rules
--- cgal-4.6.1/debian/rules	2015-05-12 22:11:02.000000000 +0200
+++ cgal-4.6.1/debian/rules	2015-08-15 11:01:33.000000000 +0200
@@ -88,22 +88,22 @@
 	mkdir -p  debian/libcgal-qt4-dev/usr/include/CGAL
 	mv debian/libcgal-dev/usr/include/CGAL/Qt debian/libcgal-qt4-dev/usr/include/CGAL
 
-	mkdir -p debian/libcgal-qt4-11/usr/share/doc
-	ln -s libcgal11 debian/libcgal-qt4-11/usr/share/doc/libcgal-qt4-11
+	mkdir -p debian/libcgal-qt4-11v5/usr/share/doc
+	ln -s libcgal11v5 debian/libcgal-qt4-11v5/usr/share/doc/libcgal-qt4-11v5
 	mkdir -p debian/libcgal-dev/usr/share/doc
-	ln -s libcgal11 debian/libcgal-dev/usr/share/doc/libcgal-dev
+	ln -s libcgal11v5 debian/libcgal-dev/usr/share/doc/libcgal-dev
 	mkdir -p debian/libcgal-qt4-dev/usr/share/doc
-	ln -s libcgal11 debian/libcgal-qt4-dev/usr/share/doc/libcgal-qt4-dev
+	ln -s libcgal11v5 debian/libcgal-qt4-dev/usr/share/doc/libcgal-qt4-dev
 	mkdir -p debian/libcgal-demo/usr/share/doc
-	ln -s libcgal11 debian/libcgal-demo/usr/share/doc/libcgal-demo
+	ln -s libcgal11v5 debian/libcgal-demo/usr/share/doc/libcgal-demo
 	mkdir -p debian/libcgal-ipelets/usr/share/doc
-	ln -s libcgal11 debian/libcgal-ipelets/usr/share/doc/libcgal-ipelets
+	ln -s libcgal11v5 debian/libcgal-ipelets/usr/share/doc/libcgal-ipelets
 
 override_dh_installdocs:
-	dh_installdocs -plibcgal11 debian/copyright
+	dh_installdocs -plibcgal11v5 debian/copyright
 
 override_dh_installchangelogs:
-	dh_installchangelogs -plibcgal11
+	dh_installchangelogs -plibcgal11v5
 
 override_dh_gencontrol:
 	dh_gencontrol -- -VIpe-Version=`dpkg-awk 'Package:^ipe$$' -- Version | grep Version | sed 's/Version: //;s/-[^-]*$$//'`

Reply via email to