[tango] 05/05: GCC5 transition

Wed Sep 2 20:48:26 UTC 2015

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

picca pushed a commit to branch master
in repository tango.

commit 0d2937493137933a384f0050a36c14ca41015688
Author: Picca Frédéric-Emmanuel <picca at debian.org>
Date:   Wed Sep 2 21:29:33 2015 +0200

    GCC5 transition
---
 debian/changelog                                   |  9 ++++++++-
 debian/control                                     | 22 +++++++++++++---------
 ...blog4tango5.install => liblog4tango5v5.install} |  0
 debian/{libtango8.install => libtango8v5.install}  |  0
 debian/rules                                       |  6 +++---
 5 files changed, 24 insertions(+), 13 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c58fea8..ebad859 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,17 @@
-tango (8.1.2c+dfsg-6) UNRELEASED; urgency=medium
+tango (8.1.2c+dfsg-6) unstable; urgency=medium
 
   * Bump Standards-Version to 3.9.6 (nothing to do)
   * debian/control
     + Updated Vcs-Git
   * debian/patches
     + 0009-fix-gcc5-compilation.patch (Closes: #797285)
+  * GCC5 transistion
+    - Rename liblog4tango5 to liblog4tango5v5, triggered by the libstdc++6
+    - Rename libtango8 to libtango8v5, triggered by the libstdc++6
+    transition.
+    - Add Conflict/Replaces with the old libraries.
+    - Rename liblog4tango5-dbg to liblog4tango5v5-dbg.
+    - Rename libtango8-dbg to libtango8v5-dbg.
 
  -- Picca Frédéric-Emmanuel <picca at debian.org>  Wed, 02 Sep 2015 18:34:07 +0200
 
diff --git a/debian/control b/debian/control
index 8bd018b..c48d72a 100644
--- a/debian/control
+++ b/debian/control
@@ -15,13 +15,15 @@ Vcs-Browser: https://anonscm.debian.org/cgit/debian-science/packages/tango.git
 Vcs-Git: git://anonscm.debian.org/debian-science/packages/tango.git
 Homepage: http://www.tango-controls.org
 
-Package: liblog4tango5
+Package: liblog4tango5v5
 Architecture: any
 Multi-Arch: same
 Section: libs
 Depends: ${misc:Depends},
          ${shlibs:Depends}
 Pre-Depends: ${misc:Pre-Depends}
+Conflicts: liblog4tango5
+Replaces: liblog4tango5
 Description: logging for TANGO - shared library
  Log for TANGO is a library of C++ classes for flexible logging to files,
  syslog and other destinations. It is modeled after the Log for
@@ -36,7 +38,7 @@ Architecture: any
 Multi-Arch: same
 Section: libdevel
 Depends: ${misc:Depends},
-         liblog4tango5 (= ${binary:Version})
+         liblog4tango5v5 (= ${binary:Version})
 Pre-Depends: ${misc:Pre-Depends}
 Conflicts: liblog4tango4-dev
 Description: logging for TANGO - development library
@@ -47,12 +49,12 @@ Description: logging for TANGO - development library
  .
  This package contains the log4tango5 development files.
 
-Package: liblog4tango5-dbg
+Package: liblog4tango5v5-dbg
 Architecture: any
 Multi-Arch: same
 Section: debug
 Depends: ${misc:Depends},
-         liblog4tango5 (= ${binary:Version})
+         liblog4tango5v5 (= ${binary:Version})
 Pre-Depends: ${misc:Pre-Depends}
 Description: logging for TANGO - debug library
  Log for TANGO is a library of C++ classes for flexible logging to files,
@@ -60,7 +62,7 @@ Description: logging for TANGO - debug library
  C++ library (http://jakarta.apache.org/log4j/), staying as close to
  their API as is reasonable.
  .
- This package contains the debugging symbol for liblog4tango5.
+ This package contains the debugging symbol for liblog4tango5v5.
 
 Package: liblog4tango5-doc
 Architecture: all
@@ -75,7 +77,7 @@ Description: logging for TANGO - documentation
  .
  This package contains the documentation of the log4tango5 library.
 
-Package: libtango8
+Package: libtango8v5
 Architecture: any
 Multi-Arch: same
 Section: libs
@@ -83,6 +85,8 @@ Depends: ${misc:Depends},
          ${shlibs:Depends},
          tango-common
 Pre-Depends: ${misc:Pre-Depends}
+Conflicts: libtango8
+Replaces: libtango8
 Description: TANGO distributed control system - shared library
  TANGO is an object-oriented distributed control system using CORBA. In
  TANGO all objects are representations of devices, which can be on the
@@ -107,7 +111,7 @@ Section: libdevel
 Depends: ${misc:Depends},
          libcos4-dev,
          liblog4tango5-dev,
-         libtango8 (= ${binary:Version}),
+         libtango8v5 (= ${binary:Version}),
          libzmq3-dev
 Pre-Depends: ${misc:Pre-Depends}
 Conflicts: libtango7-dev
@@ -128,12 +132,12 @@ Description: TANGO distributed control system - development library
  .
  This package contains the tango8 development files.
 
-Package: libtango8-dbg
+Package: libtango8v5-dbg
 Architecture: any
 Multi-Arch: same
 Section: debug
 Depends: ${misc:Depends},
-         libtango8 (= ${binary:Version})
+         libtango8v5 (= ${binary:Version})
 Pre-Depends: ${misc:Pre-Depends}
 Description: TANGO distributed control system - debug library
  TANGO is an object-oriented distributed control system using CORBA. In
diff --git a/debian/liblog4tango5.install b/debian/liblog4tango5v5.install
similarity index 100%
rename from debian/liblog4tango5.install
rename to debian/liblog4tango5v5.install
diff --git a/debian/libtango8.install b/debian/libtango8v5.install
similarity index 100%
rename from debian/libtango8.install
rename to debian/libtango8v5.install
diff --git a/debian/rules b/debian/rules
index 4b91ba5..dd172fa 100755
--- a/debian/rules
+++ b/debian/rules
@@ -37,13 +37,13 @@ override_dh_auto_install:
 	install -d debian/tmp/var/lib/tango
 
 override_dh_strip:
-	dh_strip -plibtango8 --dbg-package=libtango8-dbg
-	dh_strip -pliblog4tango5 --dbg-package=liblog4tango5-dbg
+	dh_strip -plibtango8v5 --dbg-package=libtango8v5-dbg
+	dh_strip -pliblog4tango5v5 --dbg-package=liblog4tango5v5-dbg
 	dh_strip -ptango-db --dbg-package=tango-db-dbg
 	dh_strip -ptango-starter --dbg-package=tango-starter-dbg
 	dh_strip -ptango-accesscontrol --dbg-package=tango-accesscontrol-dbg
 	dh_strip -ptango-test --dbg-package=tango-test-dbg
-	dh_strip -a -Nlibtango8 -Nliblog4tango5 -Ntango-db -Ntango-starter -Ntango-accesscontrol -Ntango-test
+	dh_strip -a -Nlibtango8v5 -Nliblog4tango5v5 -Ntango-db -Ntango-starter -Ntango-accesscontrol -Ntango-test
 
 override_dh_installinit:
 	# the tango-accesscontrol device must be started after the tango-db.

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/tango.git

