Control: tags 989344 + patch
Control: tags 989344 + pending


Dear maintainer,

I've prepared an NMU for ogre-1.12 (versioned as 1.12.10+dfsg2-1.1) and
uploaded it to DELAYED/3. Please feel free to tell me if I
should delay it longer.

I've chosen a short delay as this needs to pass the NEW queue, hope that is fine. The release team said would still consider this for bullseye.

Regards.

diff -Nru ogre-1.12-1.12.10+dfsg2/debian/changelog ogre-1.12-1.12.10+dfsg2/debian/changelog
--- ogre-1.12-1.12.10+dfsg2/debian/changelog	2021-01-01 09:04:19.000000000 +0100
+++ ogre-1.12-1.12.10+dfsg2/debian/changelog	2021-06-12 16:37:07.000000000 +0200
@@ -1,3 +1,10 @@
+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 <jspri...@debian.org>  Sat, 12 Jun 2021 16:37:07 +0200
+
 ogre-1.12 (1.12.10+dfsg2-1) unstable; urgency=medium
 
   [ Simon Schmeisser ]
diff -Nru ogre-1.12-1.12.10+dfsg2/debian/control ogre-1.12-1.12.10+dfsg2/debian/control
--- ogre-1.12-1.12.10+dfsg2/debian/control	2021-01-01 09:04:19.000000000 +0100
+++ ogre-1.12-1.12.10+dfsg2/debian/control	2021-06-12 16:37:00.000000000 +0200
@@ -39,7 +39,7 @@
 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 @@
  .
  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 -Nru ogre-1.12-1.12.10+dfsg2/debian/libogre-VERSION.install ogre-1.12-1.12.10+dfsg2/debian/libogre-VERSION.install
--- ogre-1.12-1.12.10+dfsg2/debian/libogre-VERSION.install	2021-01-01 09:04:19.000000000 +0100
+++ ogre-1.12-1.12.10+dfsg2/debian/libogre-VERSION.install	1970-01-01 01:00:00.000000000 +0100
@@ -1,5 +0,0 @@
-usr/lib/*/libOgre*.so.*
-usr/lib/*/OGRE/*.so.*
-usr/share/OGRE/*.cfg
-usr/share/OGRE/GLX_backdrop.png
-usr/share/OGRE/Media/*
diff -Nru ogre-1.12-1.12.10+dfsg2/debian/libogreVERSION.install ogre-1.12-1.12.10+dfsg2/debian/libogreVERSION.install
--- ogre-1.12-1.12.10+dfsg2/debian/libogreVERSION.install	1970-01-01 01:00:00.000000000 +0100
+++ ogre-1.12-1.12.10+dfsg2/debian/libogreVERSION.install	2021-06-12 16:08:14.000000000 +0200
@@ -0,0 +1,5 @@
+usr/lib/*/libOgre*.so.*
+usr/lib/*/OGRE/*.so.*
+usr/share/OGRE/*.cfg
+usr/share/OGRE/GLX_backdrop.png
+usr/share/OGRE/Media/*
diff -Nru ogre-1.12-1.12.10+dfsg2/debian/libogre-VERSION.lintian-overrides ogre-1.12-1.12.10+dfsg2/debian/libogre-VERSION.lintian-overrides
--- ogre-1.12-1.12.10+dfsg2/debian/libogre-VERSION.lintian-overrides	2021-01-01 09:04:19.000000000 +0100
+++ ogre-1.12-1.12.10+dfsg2/debian/libogre-VERSION.lintian-overrides	1970-01-01 01:00:00.000000000 +0100
@@ -1,3 +0,0 @@
-package-name-doesnt-match-sonames *
-# Bug reported #690084, no simple way to untangle
-embedded-library usr/lib/*/OGRE*/RenderSystem_GL.so.*: glew
diff -Nru ogre-1.12-1.12.10+dfsg2/debian/libogreVERSION.lintian-overrides ogre-1.12-1.12.10+dfsg2/debian/libogreVERSION.lintian-overrides
--- ogre-1.12-1.12.10+dfsg2/debian/libogreVERSION.lintian-overrides	1970-01-01 01:00:00.000000000 +0100
+++ ogre-1.12-1.12.10+dfsg2/debian/libogreVERSION.lintian-overrides	2021-06-12 16:08:14.000000000 +0200
@@ -0,0 +1,3 @@
+package-name-doesnt-match-sonames *
+# Bug reported #690084, no simple way to untangle
+embedded-library usr/lib/*/OGRE*/RenderSystem_GL.so.*: glew
diff -Nru ogre-1.12-1.12.10+dfsg2/debian/rules ogre-1.12-1.12.10+dfsg2/debian/rules
--- ogre-1.12-1.12.10+dfsg2/debian/rules	2021-01-01 09:04:19.000000000 +0100
+++ ogre-1.12-1.12.10+dfsg2/debian/rules	2021-06-12 16:37:07.000000000 +0200
@@ -25,8 +25,7 @@
 
 
 # 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_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 @@
 	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:

Attachment: signature.asc
Description: PGP signature

Reply via email to