[ogre-1.9] 04/10: Transition for GCC-5 with ABI change (rename library package to *v5)

Manuel A. Fernandez Montecelo mafm at moszumanska.debian.org
Wed Aug 12 15:10:50 UTC 2015


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

mafm pushed a commit to branch master
in repository ogre-1.9.

commit 70757274f95ca46933c52487124402877b216775
Author: Manuel A. Fernandez Montecelo <mafm at debian.org>
Date:   Fri Jul 31 02:22:25 2015 +0100

    Transition for GCC-5 with ABI change (rename library package to *v5)
---
 debian/changelog |  1 +
 debian/control   |  6 +++---
 debian/rules     | 13 +++++++------
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b6ae3da..9f6ab1c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ ogre-1.9 (1.9.0+dfsg1-5) UNRELEASED; urgency=medium
   * Bump Standards-Version to 3.9.6 (no changes needed)
   * Update Vcs-Browser link
   * In -dev package, add -dbg to Suggests
+  * Transition for GCC-5 with ABI change (rename library package to *v5)
 
  -- Manuel A. Fernandez Montecelo <mafm at debian.org>  Mon, 20 Apr 2015 15:50:17 +0100
 
diff --git a/debian/control b/debian/control
index a97306f..e2c5c2a 100644
--- a/debian/control
+++ b/debian/control
@@ -38,7 +38,7 @@ Package: libogre-1.9-dev
 Section: libdevel
 Architecture: any
 Depends: ${misc:Depends},
-         libogre-1.9.0 (= ${binary:Version}),
+         libogre-1.9.0v5 (= ${binary:Version}),
          libboost-dev,
          libboost-thread-dev
 Conflicts: libogre-dev (<< 1.9.0), libogre-1.8-dev (<< 1.9.0)
@@ -53,7 +53,7 @@ Description: 3D Object-Oriented Graphics Rendering Engine (development files)
  .
  This package contains the headers needed to develop with OGRE.
 
-Package: libogre-1.9.0
+Package: libogre-1.9.0v5
 Architecture: any
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
@@ -75,7 +75,7 @@ Architecture: any
 Multi-Arch: same
 Priority: extra
 Depends: ${misc:Depends},
-         libogre-1.9.0 (= ${binary:Version})
+         libogre-1.9.0v5 (= ${binary:Version})
 Description: 3D Object-Oriented Graphics Rendering Engine (debugging libs)
  OGRE (Object-Oriented Graphics Rendering Engine) is a scene-oriented, flexible
  3D engine written in C++ designed to make it easier and more intuitive for
diff --git a/debian/rules b/debian/rules
index c6300bb..1361333 100755
--- a/debian/rules
+++ b/debian/rules
@@ -26,6 +26,7 @@ DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 
 # Use this variable to define the particular version of OGRE that we're building
 OGRE_VERSION=1.9.0
+OGRE_VERSION_ABI_CHANGE=$(OGRE_VERSION)v5
 
 OGRE_CHANGELOG = Docs/ChangeLog.html
 
@@ -71,11 +72,11 @@ override_dh_auto_build-indep:
 
 override_dh_install-arch:
         # Copy files from template for this particular version
-	cp -f debian/libogre-VERSION.install debian/libogre-$(OGRE_VERSION).install
-	cp -f debian/libogre-VERSION.lintian-overrides debian/libogre-$(OGRE_VERSION).lintian-overrides
-	cp -f debian/libogre-VERSION.preinst debian/libogre-$(OGRE_VERSION).preinst
-	cp -f debian/libogre-VERSION.postinst debian/libogre-$(OGRE_VERSION).postinst
-	cp -f debian/libogre-VERSION.postrm debian/libogre-$(OGRE_VERSION).postrm
+	cp -f debian/libogre-VERSION.install debian/libogre-$(OGRE_VERSION_ABI_CHANGE).install
+	cp -f debian/libogre-VERSION.lintian-overrides debian/libogre-$(OGRE_VERSION_ABI_CHANGE).lintian-overrides
+	cp -f debian/libogre-VERSION.preinst debian/libogre-$(OGRE_VERSION_ABI_CHANGE).preinst
+	cp -f debian/libogre-VERSION.postinst debian/libogre-$(OGRE_VERSION_ABI_CHANGE).postinst
+	cp -f debian/libogre-VERSION.postrm debian/libogre-$(OGRE_VERSION_ABI_CHANGE).postrm
 
         # Workaround for CMake and debhelper with mutiarch (Debian bug:
         # http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=641051 )
@@ -121,7 +122,7 @@ override_dh_installchangelogs:
 	dh_installchangelogs -- $(OGRE_CHANGELOG)
 
 override_dh_strip:
-	dh_strip -plibogre-$(OGRE_VERSION) --dbg-package=libogre-$(OGRE_VERSION)-dbg
+	dh_strip -plibogre-$(OGRE_VERSION_ABI_CHANGE) --dbg-package=libogre-$(OGRE_VERSION)-dbg
 	dh_strip -pogre-1.9-tools
         #dh_strip -pogre-1.9-samples --dbg-package=ogre-1.9-samples-dbg
 

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



More information about the Pkg-games-commits mailing list