Source: ogre-1.9 Dear maintainer, Please find attached a final version of this patch for the time_t transition. This patch is being uploaded to unstable.
Note that this adds a versioned build-dependency on dpkg-dev, to guard against accidental backports with a wrong ABI. Thanks! -- System Information: Debian Release: trixie/sid APT prefers unstable APT policy: (500, 'unstable'), (1, 'experimental') Architecture: amd64 (x86_64) Kernel: Linux 6.5.0-21-generic (SMP w/16 CPU threads; PREEMPT) Kernel taint flags: TAINT_PROPRIETARY_MODULE, TAINT_OOT_MODULE, TAINT_UNSIGNED_MODULE Locale: LANG=C, LC_CTYPE=C.UTF-8 (charmap=UTF-8), LANGUAGE not set Shell: /bin/sh linked to /usr/bin/dash Init: unable to detect
diff -Nru ogre-1.9-1.9.0+dfsg1/debian/changelog ogre-1.9-1.9.0+dfsg1/debian/changelog --- ogre-1.9-1.9.0+dfsg1/debian/changelog 2022-11-15 22:07:30.000000000 +0000 +++ ogre-1.9-1.9.0+dfsg1/debian/changelog 2024-02-29 02:10:52.000000000 +0000 @@ -1,3 +1,10 @@ +ogre-1.9 (1.9.0+dfsg1-14.1) unstable; urgency=medium + + * Non-maintainer upload. + * Rename libraries for 64-bit time_t transition. Closes: #1062818 + + -- Benjamin Drung <bdr...@debian.org> Thu, 29 Feb 2024 02:10:52 +0000 + ogre-1.9 (1.9.0+dfsg1-14) unstable; urgency=medium * Bump Standards-Version to 4.6.1 (no changes needed) diff -Nru ogre-1.9-1.9.0+dfsg1/debian/control ogre-1.9-1.9.0+dfsg1/debian/control --- ogre-1.9-1.9.0+dfsg1/debian/control 2022-11-15 22:01:36.000000000 +0000 +++ ogre-1.9-1.9.0+dfsg1/debian/control 2024-02-29 02:10:52.000000000 +0000 @@ -8,7 +8,7 @@ Vcs-Browser: https://salsa.debian.org/games-team/ogre-1.9 Vcs-Git: https://salsa.debian.org/games-team/ogre-1.9.git Rules-Requires-Root: no -Build-Depends: debhelper-compat (= 12), +Build-Depends: dpkg-dev (>= 1.22.5), debhelper-compat (= 12), dpkg-dev (>= 1.16.1~), cmake (>= 2.8.0), pkg-config, @@ -39,7 +39,7 @@ Section: libdevel Architecture: any Depends: ${misc:Depends}, - libogre-1.9.0v5 (= ${binary:Version}), + libogre-1.9.0t64 (= ${binary:Version}), libboost-dev, libboost-thread-dev Conflicts: libogre-dev (<< 1.9.0), libogre-1.8-dev (<< 1.9.0) @@ -54,14 +54,17 @@ . This package contains the headers needed to develop with OGRE. -Package: libogre-1.9.0v5 +Package: libogre-1.9.0t64 +Provides: ${t64:Provides} +X-Time64-Compat: libogre-1.9.0v5 +Breaks: libogre-1.9.0v5 (<< ${source:Version}) Architecture: any Multi-Arch: same Pre-Depends: ${misc:Pre-Depends} Depends: ${misc:Depends}, ${shlibs:Depends} -Conflicts: libogre-1.9.0 -Replaces: libogre-1.9.0 +Conflicts: libogre-1.9.0v5 +Replaces: libogre-1.9.0v5, libogre-1.9.0 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.9-1.9.0+dfsg1/debian/libogre-1.9.0t64.lintian-overrides ogre-1.9-1.9.0+dfsg1/debian/libogre-1.9.0t64.lintian-overrides --- ogre-1.9-1.9.0+dfsg1/debian/libogre-1.9.0t64.lintian-overrides 1970-01-01 00:00:00.000000000 +0000 +++ ogre-1.9-1.9.0+dfsg1/debian/libogre-1.9.0t64.lintian-overrides 2024-02-29 02:09:28.000000000 +0000 @@ -0,0 +1 @@ +libogre-1.9.0t64: package-name-doesnt-match-sonames libogre-1.9.0v5 diff -Nru ogre-1.9-1.9.0+dfsg1/debian/libogre-1.9.0v5.install ogre-1.9-1.9.0+dfsg1/debian/libogre-1.9.0v5.install --- ogre-1.9-1.9.0+dfsg1/debian/libogre-1.9.0v5.install 1970-01-01 00:00:00.000000000 +0000 +++ ogre-1.9-1.9.0+dfsg1/debian/libogre-1.9.0v5.install 2024-02-29 02:10:49.000000000 +0000 @@ -0,0 +1,2 @@ +usr/lib/*/libOgre*.so.* +usr/lib/*/OGRE-*/*.so* diff -Nru ogre-1.9-1.9.0+dfsg1/debian/libogre-1.9.0v5.lintian-overrides ogre-1.9-1.9.0+dfsg1/debian/libogre-1.9.0v5.lintian-overrides --- ogre-1.9-1.9.0+dfsg1/debian/libogre-1.9.0v5.lintian-overrides 1970-01-01 00:00:00.000000000 +0000 +++ ogre-1.9-1.9.0+dfsg1/debian/libogre-1.9.0v5.lintian-overrides 2024-02-29 02:10:49.000000000 +0000 @@ -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.9-1.9.0+dfsg1/debian/libogre-1.9.0v5.postinst ogre-1.9-1.9.0+dfsg1/debian/libogre-1.9.0v5.postinst --- ogre-1.9-1.9.0+dfsg1/debian/libogre-1.9.0v5.postinst 1970-01-01 00:00:00.000000000 +0000 +++ ogre-1.9-1.9.0+dfsg1/debian/libogre-1.9.0v5.postinst 2024-02-29 02:10:49.000000000 +0000 @@ -0,0 +1,23 @@ +#!/bin/sh + +set -e + + +#DEBHELPER# + + +if dpkg-maintscript-helper supports rm_conffile 2>/dev/null; then + dpkg-maintscript-helper rm_conffile /etc/OGRE/plugins.cfg 1.7.3-5~ libogre-1.7.3 -- "$@" + dpkg-maintscript-helper rm_conffile /etc/OGRE-1.7.3/plugins.cfg 1.7.3-6~ libogre-1.7.3 -- "$@" +fi + +# Remove obsolete config files/directories from previous packages. It doesn't +# work completely with "dpkg-maintscript-helper rm_conffile" because the binary +# .deb package name changes, due to SONAME bumps +rm -f /etc/OGRE/plugins.cfg.dpkg-remove +if [ -d /etc/OGRE-1.7.3 ]; then + rmdir --ignore-fail-on-non-empty /etc/OGRE-1.7.3 +fi +if [ -d /etc/OGRE ]; then + rmdir --ignore-fail-on-non-empty /etc/OGRE +fi diff -Nru ogre-1.9-1.9.0+dfsg1/debian/libogre-1.9.0v5.postrm ogre-1.9-1.9.0+dfsg1/debian/libogre-1.9.0v5.postrm --- ogre-1.9-1.9.0+dfsg1/debian/libogre-1.9.0v5.postrm 1970-01-01 00:00:00.000000000 +0000 +++ ogre-1.9-1.9.0+dfsg1/debian/libogre-1.9.0v5.postrm 2024-02-29 02:10:49.000000000 +0000 @@ -0,0 +1,23 @@ +#!/bin/sh + +set -e + + +#DEBHELPER# + + +if dpkg-maintscript-helper supports rm_conffile 2>/dev/null; then + dpkg-maintscript-helper rm_conffile /etc/OGRE/plugins.cfg 1.7.3-5~ libogre-1.7.3 -- "$@" + dpkg-maintscript-helper rm_conffile /etc/OGRE-1.7.3/plugins.cfg 1.7.3-6~ libogre-1.7.3 -- "$@" +fi + +# Remove obsolete config files/directories from previous packages. It doesn't +# work completely with "dpkg-maintscript-helper rm_conffile" because the binary +# .deb package name changes, due to SONAME bumps +rm -f /etc/OGRE/plugins.cfg.dpkg-remove +if [ -d /etc/OGRE-1.7.3 ]; then + rmdir --ignore-fail-on-non-empty /etc/OGRE-1.7.3 +fi +if [ -d /etc/OGRE ]; then + rmdir --ignore-fail-on-non-empty /etc/OGRE +fi diff -Nru ogre-1.9-1.9.0+dfsg1/debian/libogre-1.9.0v5.preinst ogre-1.9-1.9.0+dfsg1/debian/libogre-1.9.0v5.preinst --- ogre-1.9-1.9.0+dfsg1/debian/libogre-1.9.0v5.preinst 1970-01-01 00:00:00.000000000 +0000 +++ ogre-1.9-1.9.0+dfsg1/debian/libogre-1.9.0v5.preinst 2024-02-29 02:10:49.000000000 +0000 @@ -0,0 +1,23 @@ +#!/bin/sh + +set -e + + +#DEBHELPER# + + +if dpkg-maintscript-helper supports rm_conffile 2>/dev/null; then + dpkg-maintscript-helper rm_conffile /etc/OGRE/plugins.cfg 1.7.3-5~ libogre-1.7.3 -- "$@" + dpkg-maintscript-helper rm_conffile /etc/OGRE-1.7.3/plugins.cfg 1.7.3-6~ libogre-1.7.3 -- "$@" +fi + +# Remove obsolete config files/directories from previous packages. It doesn't +# work completely with "dpkg-maintscript-helper rm_conffile" because the binary +# .deb package name changes, due to SONAME bumps +rm -f /etc/OGRE/plugins.cfg.dpkg-remove +if [ -d /etc/OGRE-1.7.3 ]; then + rmdir --ignore-fail-on-non-empty /etc/OGRE-1.7.3 +fi +if [ -d /etc/OGRE ]; then + rmdir --ignore-fail-on-non-empty /etc/OGRE +fi diff -Nru ogre-1.9-1.9.0+dfsg1/debian/rules ogre-1.9-1.9.0+dfsg1/debian/rules --- ogre-1.9-1.9.0+dfsg1/debian/rules 2022-11-15 21:16:42.000000000 +0000 +++ ogre-1.9-1.9.0+dfsg1/debian/rules 2024-02-29 02:10:49.000000000 +0000 @@ -26,7 +26,7 @@ # 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_VERSION_ABI_CHANGE=$(OGRE_VERSION)t64 OGRE_CHANGELOG = Docs/ChangeLog.html
