tags 339262 patch thanks Hi Laszlo,
I've prepared an NMU to fix this bug in sidplay-libs. The patch for the NMU is attached, and I'll be uploading the package shortly to the NEW queue. If you disagree with any of the changes made, please make a maintainer upload in its place. Cheers, -- Steve Langasek Give me a lever long enough and a Free OS Debian Developer to set it on, and I can move the world. [EMAIL PROTECTED] http://www.debian.org/
reverted:
--- sidplay-libs-2.1.1/debian/libresid-builder0.dirs
+++ sidplay-libs-2.1.1.orig/debian/libresid-builder0.dirs
@@ -1 +0,0 @@
-usr/lib
reverted:
--- sidplay-libs-2.1.1/debian/libresid-builder0.files
+++ sidplay-libs-2.1.1.orig/debian/libresid-builder0.files
@@ -1 +0,0 @@
-usr/lib/libresid-builder.so.*
diff -u sidplay-libs-2.1.1/debian/rules sidplay-libs-2.1.1/debian/rules
--- sidplay-libs-2.1.1/debian/rules
+++ sidplay-libs-2.1.1/debian/rules
@@ -95,11 +95,11 @@
install -d -o root -g root -m 755 debian/libsidplay-dev/usr/share/doc
install -d -o root -g root -m 755
debian/libsidutils0/usr/share/doc/libsidutils0
install -d -o root -g root -m 755 debian/libsidutils-dev/usr/share/doc
- install -d -o root -g root -m 755
debian/libresid-builder0/usr/share/doc/libresid-builder0
+ install -d -o root -g root -m 755
debian/libresid-builder0c2a/usr/share/doc/libresid-builder0c2a
install -d -o root -g root -m 755
debian/libresid-builder-dev/usr/share/doc
ln -s libsidplay2 debian/libsidplay-dev/usr/share/doc/libsidplay-dev
ln -s libsidutils0 debian/libsidutils-dev/usr/share/doc/libsidutils-dev
- ln -s libresid-builder0
debian/libresid-builder-dev/usr/share/doc/libresid-builder-dev
+ ln -s libresid-builder0c2a
debian/libresid-builder-dev/usr/share/doc/libresid-builder-dev
dh_installdocs
dh_installexamples
diff -u sidplay-libs-2.1.1/debian/changelog sidplay-libs-2.1.1/debian/changelog
--- sidplay-libs-2.1.1/debian/changelog
+++ sidplay-libs-2.1.1/debian/changelog
@@ -1,3 +1,13 @@
+sidplay-libs (2.1.1-3.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Medium-urgency upload for RC bugfix.
+ * Rename libresid-builder0 to libresid-builder0c2a for the C++ mt allocator
+ ABI transition, and conflict/replace libresid-builder0 accordingly
+ (closes: #339262).
+
+ -- Steve Langasek <[EMAIL PROTECTED]> Sun, 4 Dec 2005 03:15:07 -0800
+
sidplay-libs (2.1.1-3) unstable; urgency=low
* Drop c102 suffix from the package names due to C++ ABI transition.
diff -u sidplay-libs-2.1.1/debian/control sidplay-libs-2.1.1/debian/control
--- sidplay-libs-2.1.1/debian/control
+++ sidplay-libs-2.1.1/debian/control
@@ -86,19 +86,19 @@
Package: libresid-builder-dev
Section: libdevel
Architecture: any
-Depends: libresid-builder0 (= ${Source-Version})
+Depends: libresid-builder0c2a (= ${Source-Version})
Replaces: libresid-dev (<= 2.1.0)
Conflicts: libresid-dev (<= 2.1.0)
Description: SID chip emulation class based on resid
SID builder packages provide a chip emulator, to be used by libsidplay2.
This package is an emulation based on the resid library.
-Package: libresid-builder0
+Package: libresid-builder0c2a
Section: libs
Architecture: any
Depends: ${shlibs:Depends}
-Replaces: libresid2c102 (<= 2.1.1-2)
-Conflicts: libresid2c102 (<= 2.1.1-2)
+Replaces: libresid2c102 (<= 2.1.1-2), libresid-builder0
+Conflicts: libresid2c102 (<= 2.1.1-2), libresid-builder0
Description: SID chip emulation class based on resid
SID builder packages provide a chip emulator, to be used by libsidplay2.
This package is an emulation based on the resid library.
only in patch2:
unchanged:
--- sidplay-libs-2.1.1.orig/debian/libresid-builder0c2a.dirs
+++ sidplay-libs-2.1.1/debian/libresid-builder0c2a.dirs
@@ -0,0 +1 @@
+usr/lib
only in patch2:
unchanged:
--- sidplay-libs-2.1.1.orig/debian/libresid-builder0c2a.files
+++ sidplay-libs-2.1.1/debian/libresid-builder0c2a.files
@@ -0,0 +1 @@
+usr/lib/libresid-builder.so.*
signature.asc
Description: Digital signature

