[simbody] 01/01: Import changes from non NMu upload

[Jose Luis Rivero]

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

jrivero-guest pushed a commit to branch master
in repository simbody.

commit e106b52a55f11ee7e74e0f7399a2f52421aa1da5
Author: Jose Luis Rivero <jrivero at osrfoundation.org>
Date:   Tue Nov 17 01:03:57 2015 +0100

    Import changes from non NMu upload
---
 debian/changelog                                          |  9 +++++++++
 debian/control                                            | 12 ++++++++----
 debian/libsimbody3.5.lintian-overrides                    |  7 -------
 debian/libsimbody3.5v5-dbg.lintian-overrides              |  2 ++
 debian/{libsimbody3.5.install => libsimbody3.5v5.install} |  0
 debian/libsimbody3.5v5.lintian-overrides                  |  9 +++++++++
 debian/rules                                              |  2 +-
 7 files changed, 29 insertions(+), 12 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c56ae5f..a8a84b3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,15 @@ simbody (3.5.3+dfsg-1) unstable; urgency=medium
 
  -- Jose Luis Rivero <jrivero at osrfoundation.org>  Sun, 15 Nov 2015 23:36:46 +0100
 
+simbody (3.5.1+dfsg-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload. (See #791280)
+
+  [ Iain Lane ]
+  * Rename library packages for g++5 ABI transition.
+
+ -- Scott Kitterman <scott at kitterman.com>  Sat, 29 Aug 2015 09:44:30 -0400
+
 simbody (3.5.1+dfsg-1) unstable; urgency=medium
 
   [ Frederic Bonnard ]
diff --git a/debian/control b/debian/control
index 8937b30..5ea91cf 100644
--- a/debian/control
+++ b/debian/control
@@ -16,12 +16,14 @@ Vcs-Browser: http://anonscm.debian.org/gitweb/?p=debian-science/packages/simbody
 Vcs-Git: git://anonscm.debian.org/debian-science/packages/simbody.git
 Homepage: https://simtk.org/home/simbody
 
-Package: libsimbody3.5
+Package: libsimbody3.5v5
 Section: libs
 Architecture: any
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Multi-Arch: same
+Conflicts: libsimbody3.5
+Replaces: libsimbody3.5
 Description: SimTK multibody dynamics API - shared library
  Simbody is a SimTK toolset providing general multibody dynamics capability,
  that is, the ability to solve Newton's 2nd law F=ma in any set of generalized
@@ -36,7 +38,7 @@ Depends: freeglut3-dev,
          libxi-dev,
          libxmu-dev,
          liblapack-dev,
-	 libsimbody3.5 (= ${binary:Version}),
+	 libsimbody3.5v5 (= ${binary:Version}),
 	 ${misc:Depends}
 Multi-Arch: same
 Description: SimTK multibody dynamics API - development files
@@ -49,12 +51,14 @@ Description: SimTK multibody dynamics API - development files
  This package contains development files (headers, shared library
  symbolic link and pkg-config file).
 
-Package: libsimbody3.5-dbg
+Package: libsimbody3.5v5-dbg
 Architecture: any
 Section: debug
-Depends: libsimbody3.5 (= ${binary:Version}),
+Depends: libsimbody3.5v5 (= ${binary:Version}),
          ${misc:Depends}
 Multi-Arch: foreign
+Conflicts: libsimbody3.5-dbg
+Replaces: libsimbody3.5-dbg
 Description: SimTK multibody dynamics API - Debugging Symbols
  Simbody is a SimTK toolset providing general multibody dynamics capability,
  that is, the ability to solve Newton's 2nd law F=ma in any set of generalized
diff --git a/debian/libsimbody3.5.lintian-overrides b/debian/libsimbody3.5.lintian-overrides
deleted file mode 100644
index 13a8f69..0000000
--- a/debian/libsimbody3.5.lintian-overrides
+++ /dev/null
@@ -1,7 +0,0 @@
-# Upstream has renamed the namespace. Full upstream answer is at:
-# https://github.com/simbody/simbody/issues/49#issuecomment-39047672 
-libsimbody3.5: embedded-library usr/lib/x86_64-linux-gnu/libSimTKcommon.so.3.5: tinyxml
-
-# Upstream thinks that makes no sense to package libraries independently
-# https://github.com/simbody/simbody/issues/49#issuecomment-27418566
-libsimbody3.5: package-name-doesnt-match-sonames libSimTKcommon3.5 libSimTKmath3.5 libSimTKsimbody3.5
diff --git a/debian/libsimbody3.5v5-dbg.lintian-overrides b/debian/libsimbody3.5v5-dbg.lintian-overrides
new file mode 100644
index 0000000..7f0a6d9
--- /dev/null
+++ b/debian/libsimbody3.5v5-dbg.lintian-overrides
@@ -0,0 +1,2 @@
+# G++5 ABI transition
+libsimbody3.5v5-dbg: package-name-doesnt-match-sonames libsimbody3.5-dbg
diff --git a/debian/libsimbody3.5.install b/debian/libsimbody3.5v5.install
similarity index 100%
rename from debian/libsimbody3.5.install
rename to debian/libsimbody3.5v5.install
diff --git a/debian/libsimbody3.5v5.lintian-overrides b/debian/libsimbody3.5v5.lintian-overrides
new file mode 100644
index 0000000..314edb5
--- /dev/null
+++ b/debian/libsimbody3.5v5.lintian-overrides
@@ -0,0 +1,9 @@
+# Upstream has renamed the namespace. Full upstream answer is at:
+# https://github.com/simbody/simbody/issues/49#issuecomment-39047672 
+libsimbody3.5v5: embedded-library usr/lib/x86_64-linux-gnu/libSimTKcommon.so.3.5: tinyxml
+
+# Upstream thinks that makes no sense to package libraries independently
+# https://github.com/simbody/simbody/issues/49#issuecomment-27418566
+libsimbody3.5v5: package-name-doesnt-match-sonames libSimTKcommon3.5 libSimTKmath3.5 libSimTKsimbody3.5
+# G++5 ABI transition
+libsimbody3.5v5: package-name-doesnt-match-sonames libsimbody3.5
diff --git a/debian/rules b/debian/rules
index 2bcf44d..dc5b256 100755
--- a/debian/rules
+++ b/debian/rules
@@ -24,7 +24,7 @@ override_dh_auto_install:
 	rm debian/tmp/usr/share/doc/simbody/CHANGELOG.md
 
 override_dh_strip:
-	dh_strip -a --dbg-package=libsimbody3.5-dbg
+	dh_strip -a --dbg-package=libsimbody3.5v5-dbg
 
 %:
 	dh $@ --parallel --buildsystem=cmake

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