[clanlib] 31/40: Rename library packages for g++5 ABI transition. (Closes: #790999)

[Stephen Kitt]

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

skitt pushed a commit to branch master
in repository clanlib.

commit b894c4b0d913d1c77700c38ea05c9bc2897fe893
Author: Simon McVittie <smcv at debian.org>
Date:   Wed Aug 19 08:25:28 2015 +0000

    Rename library packages for g++5 ABI transition. (Closes: #790999)
    
    Based on Ubuntu patches by Steve Langasek. Revert addition of lintian
    overrides for the v5 package names, which are not necessary with an
    up-to-date lintian.
---
 debian/changelog                                            | 10 ++++++++++
 debian/control                                              | 12 ++++++++----
 debian/{libclanapp-1.0.install => libclanapp-1.0v5.install} |  0
 debian/libclansdl-1.0.links                                 |  1 -
 debian/{libclansdl-1.0.dirs => libclansdl-1.0v5.dirs}       |  0
 debian/{libclansdl-1.0.install => libclansdl-1.0v5.install} |  0
 debian/libclansdl-1.0v5.links                               |  1 +
 debian/rules                                                | 10 +++++-----
 8 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d2b85d0..a04aa95 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,17 @@
 clanlib (1.0~svn3827-4) UNRELEASED; urgency=low
 
+  * Team upload.
+
+  [ Evgeni Golov ]
   * Correct Vcs-* URLs to point to anonscm.debian.org
 
+  [ Steve Langasek ]
+  * Rename library packages for g++5 ABI transition. (Closes: #790999)
+
+  [ Simon McVittie ]
+  * Revert addition of lintian overrides for the v5 package names,
+    which are not necessary with an up-to-date lintian.
+
  -- Evgeni Golov <evgeni at debian.org>  Mon, 15 Jul 2013 22:21:15 +0200
 
 clanlib (1.0~svn3827-3) unstable; urgency=low
diff --git a/debian/control b/debian/control
index d9f78c5..44d7f64 100644
--- a/debian/control
+++ b/debian/control
@@ -10,9 +10,11 @@ Homepage: http://www.clanlib.org/
 Vcs-Svn: svn://anonscm.debian.org/pkg-games/packages/trunk/clanlib
 Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-games/packages/trunk/clanlib/
 
-Package: libclanapp-1.0
+Package: libclanapp-1.0v5
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
+Conflicts: libclanapp-1.0
+Replaces: libclanapp-1.0
 Description: ClanLib game SDK runtime
  ClanLib is a multi-platform software development kit, with an emphasis on
  game development.
@@ -31,9 +33,11 @@ Description: ClanLib game SDK runtime
  This is the runtime part of the ClanLib SDK, needed to run applications
  built with it.
 
-Package: libclansdl-1.0
+Package: libclansdl-1.0v5
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
+Conflicts: libclansdl-1.0
+Replaces: libclansdl-1.0
 Description: SDL module for ClanLib game SDK
  ClanLib delivers a platform independent interface to write games with.
  If a game is written with ClanLib, it should be possible to compile the
@@ -52,8 +56,8 @@ Description: SDL module for ClanLib game SDK
 Package: libclanlib-dev
 Section: libdevel
 Architecture: any
-Depends: libclanapp-1.0 (= ${binary:Version}), libclansdl-1.0 (= ${binary:Version}), ${misc:Depends}
-Recommends: libfreetype6-dev, libglu1-mesa-dev | xlibmesa-dev | libgl-dev, libjpeg-dev, libmikmod2-dev, libpng12-0-dev, libvorbis-dev
+Depends: libclanapp-1.0v5 (= ${binary:Version}), libclansdl-1.0v5 (= ${binary:Version}), ${misc:Depends}
+Recommends: libfreetype6-dev, libglu1-mesa-dev | xlibmesa-dev | libgl-dev, libjpeg-dev, libmikmod-dev, libpng12-0-dev, libvorbis-dev
 Conflicts: clanlib0-common, libutahglx-dev, clanlib2 (<< 0.6.1-1-3), clanlib-dev
 Provides: clanlib-dev
 Replaces: clanlib-dev
diff --git a/debian/libclanapp-1.0.install b/debian/libclanapp-1.0v5.install
similarity index 100%
rename from debian/libclanapp-1.0.install
rename to debian/libclanapp-1.0v5.install
diff --git a/debian/libclansdl-1.0.links b/debian/libclansdl-1.0.links
deleted file mode 100644
index c04c907..0000000
--- a/debian/libclansdl-1.0.links
+++ /dev/null
@@ -1 +0,0 @@
-/usr/share/doc/libclanapp-1.0 /usr/share/doc/libclansdl-1.0
diff --git a/debian/libclansdl-1.0.dirs b/debian/libclansdl-1.0v5.dirs
similarity index 100%
rename from debian/libclansdl-1.0.dirs
rename to debian/libclansdl-1.0v5.dirs
diff --git a/debian/libclansdl-1.0.install b/debian/libclansdl-1.0v5.install
similarity index 100%
rename from debian/libclansdl-1.0.install
rename to debian/libclansdl-1.0v5.install
diff --git a/debian/libclansdl-1.0v5.links b/debian/libclansdl-1.0v5.links
new file mode 100644
index 0000000..c6675ec
--- /dev/null
+++ b/debian/libclansdl-1.0v5.links
@@ -0,0 +1 @@
+/usr/share/doc/libclanapp-1.0 /usr/share/doc/libclansdl-1.0v5
diff --git a/debian/rules b/debian/rules
index 952185b..3d8d900 100755
--- a/debian/rules
+++ b/debian/rules
@@ -85,16 +85,16 @@ binary-arch: build install
 	dh_testdir
 	dh_testroot
 	dh_installdebconf -a
-	dh_installdocs -plibclanapp-1.0
-	dh_installchangelogs -plibclanapp-1.0 
+	dh_installdocs -plibclanapp-1.0v5
+	dh_installchangelogs -plibclanapp-1.0v5
 	dh_strip -a
 	dh_link -a
 	dh_compress -a
 	dh_fixperms -a
-	dh_makeshlibs -plibclanapp-1.0 -V "libclanapp-1.0"
-	dh_makeshlibs -plibclansdl-1.0 -V "libclansdl-1.0"
+	dh_makeshlibs -plibclanapp-1.0v5 -V "libclanapp-1.0v5"
+	dh_makeshlibs -plibclansdl-1.0v5 -V "libclansdl-1.0v5"
 	dh_installdeb -a
-	dh_shlibdeps -a -L libclanapp-1.0 -L libclansdl-1.0 -ldebian/libclanapp-1.0/usr/lib:debian/libclansdl-1.0/usr/lib
+	dh_shlibdeps -a -L libclanapp-1.0v5 -L libclansdl-1.0v5 -ldebian/libclanapp-1.0v5/usr/lib:debian/libclansdl-1.0/usr/lib
 	dh_gencontrol -a
 	dh_md5sums -a
 	dh_builddeb -a

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/clanlib.git