Bug#989883: unblock: ogre-1.12/1.12.10+dfsg2-1.2 ros-rviz/1.14.4+dfsg-3+b1

[Jochen Sprickerhof <jspricke@debian.org>]

Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock

Please unblock package ogre-1.12 and ros-rviz

[ Reason ]
libogre-1.12 bumped it's soname and library names without changing the
package name, breaking rviz (#989344).

[ Impact ]
ogre-1.12 and ros-rviz would be removed from testing.

[ Tests ]
I tested rviz manually and it is working again.

[ Risks ]
For ogre-1.12 this only changes the package name and for ros-rviz this
is a binary rebuild only. I don't see a risk by this change.

[ Checklist ]
  [X] all changes are documented in the d/changelog
  [X] I reviewed all changes and I approve them
  [X] attach debdiff against the package in testing

[ Other info ]
I'm not sure if ros-rviz would transition automatically, so I add it
here just for completeness.

unblock ogre-1.12/1.12.10+dfsg2-1.2
unblock ros-rviz/1.14.4+dfsg-3+b1

diff --git a/debian/changelog b/debian/changelog
index 07b1065a..a3d59c83 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,17 @@
+ogre-1.12 (1.12.10+dfsg2-1.2) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Source only upload
+
+ -- Jochen Sprickerhof <jspricke@debian.org>  Mon, 14 Jun 2021 21:39:29 +0200
+
+ogre-1.12 (1.12.10+dfsg2-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Rename library package to match Soname (Closes: #989344)
+
+ -- Jochen Sprickerhof <jspricke@debian.org>  Sat, 12 Jun 2021 16:37:07 +0200
+
 ogre-1.12 (1.12.10+dfsg2-1) unstable; urgency=medium
 
   [ Simon Schmeisser ]
diff --git a/debian/control b/debian/control
index faf0e3ab..b094898a 100644
--- a/debian/control
+++ b/debian/control
@@ -39,7 +39,7 @@ Package: libogre-1.12-dev
 Section: libdevel
 Architecture: any
 Depends: ${misc:Depends},
-         libogre-1.12 (= ${binary:Version})
+         libogre1.12.10 (= ${binary:Version})
 Conflicts: libogre-dev, libogre-1.8-dev, libogre-1.9-dev
 Suggests: ogre-1.12-doc
 Description: 3D Object-Oriented Graphics Rendering Engine (development files)
@@ -52,12 +52,14 @@ Description: 3D Object-Oriented Graphics Rendering Engine (development files)
  .
  This package contains the headers needed to develop with OGRE.
 
-Package: libogre-1.12
+Package: libogre1.12.10
 Architecture: any
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends},
          ${shlibs:Depends}
+Breaks: libogre-1.12 (<<1.12.10+dfsg2-1.1)
+Replaces: libogre-1.12 (<<1.12.10+dfsg2-1.1)
 Description: 3D Object-Oriented Graphics Rendering Engine (libraries)
  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/libogre-VERSION.install b/debian/libogreVERSION.install
similarity index 100%
rename from debian/libogre-VERSION.install
rename to debian/libogreVERSION.install
diff --git a/debian/libogre-VERSION.lintian-overrides b/debian/libogreVERSION.lintian-overrides
similarity index 100%
rename from debian/libogre-VERSION.lintian-overrides
rename to debian/libogreVERSION.lintian-overrides
diff --git a/debian/rules b/debian/rules
index 040b664c..a8dce01a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -25,8 +25,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.12
-OGRE_VERSION_ABI_CHANGE=$(OGRE_VERSION)
+OGRE_SOVERSION=1.12.10
 
 OGRE_CHANGELOG = Docs/ChangeLog.md
 
@@ -67,8 +66,8 @@ 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_ABI_CHANGE).install
-	cp -f debian/libogre-VERSION.lintian-overrides debian/libogre-$(OGRE_VERSION_ABI_CHANGE).lintian-overrides
+	cp -f debian/libogreVERSION.install debian/libogre$(OGRE_SOVERSION).install
+	cp -f debian/libogreVERSION.lintian-overrides debian/libogre$(OGRE_SOVERSION).lintian-overrides
 
         # docs installed in other way
         #rm -rfv debian/tmp/usr/share/OGRE/docs
@@ -101,11 +100,11 @@ override_dh_clean:
 	dh_clean
 
         # Remove files from template
-	rm -rf debian/libogre-$(OGRE_VERSION).*
+	rm -rf debian/libogre$(OGRE_SOVERSION).*
 
 # For new symbols when compiled with GCC 7
 override_dh_makeshlibs:
-	dh_makeshlibs -V"libogre-1.12 (>= 1.12.10+dfsg1-1~)"
+	dh_makeshlibs -V"libogre1.12.10 (>= 1.12.10+dfsg1-1~)"
 
 
 override_dh_shlibdeps: