[pkg-fgfs-crew] [simgear] 01/01: * Revert removal of patch version from package names - they better match the library's SONAMES. * Revert version change of the Breaks+Replaces against simgear-dev, these shouldn't be updated.

[Markus Wanner]

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

markus_wanner-guest pushed a commit to branch master
in repository simgear.

commit 6009d743092ebe3b73961ec227ad0a39b3af90fa
Author: Markus Wanner <markus at bluegap.ch>
Date:   Sun Sep 22 20:43:22 2013 +0200

    * Revert removal of patch version from package names - they better
      match the library's SONAMES.
    * Revert version change of the Breaks+Replaces against simgear-dev,
      these shouldn't be updated.
---
 debian/changelog                                   |    1 -
 debian/control                                     |   22 ++++++++++----------
 ...re2.12.install => libsimgearcore2.12.0.install} |    0
 debian/libsimgearcore2.12.0.shlibs                 |    1 +
 debian/libsimgearcore2.12.shlibs                   |    1 -
 ...e2.12.install => libsimgearscene2.12.0.install} |    0
 debian/libsimgearscene2.12.0.shlibs                |    1 +
 debian/libsimgearscene2.12.shlibs                  |    1 -
 debian/rules                                       |    4 ++--
 9 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 78d001f..d49911e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,6 @@
 simgear (2.12.0-1) UNRELEASED; urgency=low
 
   * New upstream release.
-  * Strip package names by patch version.
   * Adjust .install and .shlibs files accordingly.
   * Drop patches gcc-macro-correction.diff, osg-compat.diff,
     CVE-2012-2090.diff CVE-2012-2091.diff. These got applied upstream.
diff --git a/debian/control b/debian/control
index 2dfc0dd..aa8d2ad 100644
--- a/debian/control
+++ b/debian/control
@@ -17,7 +17,7 @@ Homepage: http://www.simgear.org/
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=collab-maint/simgear.git
 Vcs-Git: git://anonscm.debian.org/collab-maint/simgear.git
 
-Package: libsimgearcore2.12
+Package: libsimgearcore2.12.0
 Architecture: any
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
@@ -30,12 +30,12 @@ Description: Simulator Construction Gear -- core library
  .
  This package contains the core library.
 
-Package: libsimgearcore2.12-dbg
+Package: libsimgearcore2.12.0-dbg
 Architecture: any
 Section: debug
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
-Depends: libsimgearcore2.12 (= ${binary:Version}),
+Depends: libsimgearcore2.12.0 (= ${binary:Version}),
  ${misc:Depends}
 Description: debugging symbols for libsimgearcore
  SimGear is a collection of libraries useful for constructing
@@ -44,11 +44,11 @@ Description: debugging symbols for libsimgearcore
  .
  This package contains the debug symbols for the core library.
 
-Package: libsimgearscene2.12
+Package: libsimgearscene2.12.0
 Architecture: any
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
-Depends: libsimgearcore2.12 (= ${binary:Version}),
+Depends: libsimgearcore2.12.0 (= ${binary:Version}),
  ${shlibs:Depends}, ${misc:Depends}
 Conflicts: simgear0
 Description: Simulator Construction Gear -- scene library
@@ -58,12 +58,12 @@ Description: Simulator Construction Gear -- scene library
  .
  This package contains the scene library.
 
-Package: libsimgearscene2.12-dbg
+Package: libsimgearscene2.12.0-dbg
 Architecture: any
 Section: debug
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
-Depends: libsimgearcore2.12 (= ${binary:Version}),
+Depends: libsimgearcore2.12.0 (= ${binary:Version}),
  ${misc:Depends}
 Conflicts: simgear0
 Description: debugging symbols for libsimgearscene
@@ -76,11 +76,11 @@ Description: debugging symbols for libsimgearscene
 Package: libsimgear-dev
 Architecture: any
 Section: libdevel
-Depends: libsimgearcore2.12 (= ${binary:Version}),
- libsimgearscene2.12 (= ${binary:Version}),
+Depends: libsimgearcore2.12.0 (= ${binary:Version}),
+ libsimgearscene2.12.0 (= ${binary:Version}),
  libopenscenegraph-dev, libc6-dev, ${misc:Depends}
-Replaces: simgear-dev (<< 2.12.0~)
-Breaks: simgear-dev (<< 2.12.0~)
+Replaces: simgear-dev (<< 2.10.0~)
+Breaks: simgear-dev (<< 2.10.0~)
 Description: Simulator Construction Gear -- development files
  SimGear is a collection of libraries useful for constructing
  simulation and visualization applications such as FlightGear
diff --git a/debian/libsimgearcore2.12.install b/debian/libsimgearcore2.12.0.install
similarity index 100%
rename from debian/libsimgearcore2.12.install
rename to debian/libsimgearcore2.12.0.install
diff --git a/debian/libsimgearcore2.12.0.shlibs b/debian/libsimgearcore2.12.0.shlibs
new file mode 100644
index 0000000..f301085
--- /dev/null
+++ b/debian/libsimgearcore2.12.0.shlibs
@@ -0,0 +1 @@
+libSimGearCore 2.12.0 libsimgearcore2.12.0 (>= 2.12.0~)
diff --git a/debian/libsimgearcore2.12.shlibs b/debian/libsimgearcore2.12.shlibs
deleted file mode 100644
index 59a7924..0000000
--- a/debian/libsimgearcore2.12.shlibs
+++ /dev/null
@@ -1 +0,0 @@
-libSimGearCore 2.12.0 libsimgearcore2.12 (>= 2.12.0~)
diff --git a/debian/libsimgearscene2.12.install b/debian/libsimgearscene2.12.0.install
similarity index 100%
rename from debian/libsimgearscene2.12.install
rename to debian/libsimgearscene2.12.0.install
diff --git a/debian/libsimgearscene2.12.0.shlibs b/debian/libsimgearscene2.12.0.shlibs
new file mode 100644
index 0000000..12d8123
--- /dev/null
+++ b/debian/libsimgearscene2.12.0.shlibs
@@ -0,0 +1 @@
+libSimGearScene 2.12.0 libsimgearscene2.12.0 (>= 2.12.0~)
diff --git a/debian/libsimgearscene2.12.shlibs b/debian/libsimgearscene2.12.shlibs
deleted file mode 100644
index 1180a31..0000000
--- a/debian/libsimgearscene2.12.shlibs
+++ /dev/null
@@ -1 +0,0 @@
-libSimGearScene 2.12.0 libsimgearscene2.12 (>= 2.12.0~)
diff --git a/debian/rules b/debian/rules
index 4d5c2c4..f2f6605 100755
--- a/debian/rules
+++ b/debian/rules
@@ -38,8 +38,8 @@ override_dh_auto_configure:
 	cd build && cmake .. $(CMAKE_FLAGS)
 
 override_dh_strip:
-	dh_strip -plibsimgearcore2.12 --dbg-package=libsimgearcore2.12-dbg
-	dh_strip -plibsimgearscene2.12 --dbg-package=libsimgearscene2.12-dbg
+	dh_strip -plibsimgearcore2.12.0 --dbg-package=libsimgearcore2.12.0-dbg
+	dh_strip -plibsimgearscene2.12.0 --dbg-package=libsimgearscene2.12.0-dbg
 
 get-orig-source:
 	uscan --download-current-version --verbose --rename

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/simgear.git