tags 339269 patch thanks Hi Daniel,
I've prepared an NMU to fix this bug in sword. 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/
diff -u sword-1.5.8/debian/control sword-1.5.8/debian/control
--- sword-1.5.8/debian/control
+++ sword-1.5.8/debian/control
@@ -5,12 +5,13 @@
Maintainer: Daniel Glassey <[EMAIL PROTECTED]>
Standards-Version: 3.6.2.0
-Package: libsword5
+Package: libsword5c2a
Architecture: any
Section: libs
Depends: ${shlibs:Depends}
Recommends: sword-frontend
-Replaces: libsword1, libsword4, libsword4c2, libsword-runtime, libsword-config
+Conflicts: libsword5
+Replaces: libsword1, libsword4, libsword4c2, libsword-runtime,
libsword-config, libsword5
Description: API/library for bible software
The SWORD Project is an open source, cross-platform (Linux, Windows, Solaris,
MacOSX etc.) API/library for Bible software with a constantly growing list
@@ -26,7 +27,7 @@
Package: libsword-dev
Architecture: any
Section: libdevel
-Depends: libsword5 (= ${Source-Version}), libc6-dev, libz-dev,
libcurl3-openssl-dev
+Depends: libsword5c2a (= ${Source-Version}), libc6-dev, libz-dev,
libcurl3-openssl-dev
Provides: sword-dev
Description: Development files for libsword
This package contains the static libraries and headers for developing
diff -u sword-1.5.8/debian/changelog sword-1.5.8/debian/changelog
--- sword-1.5.8/debian/changelog
+++ sword-1.5.8/debian/changelog
@@ -1,3 +1,12 @@
+sword (1.5.8-6.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Medium-urgency upload for RC bugfix.
+ * Rename libsword5 to libsword5c2a for the C++ mt allocator ABI transition,
+ and conflict/replace libsword5 accordingly (closes: #339269).
+
+ -- Steve Langasek <[EMAIL PROTECTED]> Mon, 5 Dec 2005 00:10:19 -0800
+
sword (1.5.8-6) unstable; urgency=low
* build dep on a version of libcurl3-openssl-dev that has the
reverted:
--- sword-1.5.8/debian/libsword5.install
+++ sword-1.5.8.orig/debian/libsword5.install
@@ -1,18 +0,0 @@
-etc/sword.conf
-usr/lib/libsword.so.5.0.0
-usr/lib/libsword.so.5
-usr/bin/addld
-usr/bin/imp2ld
-usr/bin/imp2gbs
-usr/bin/imp2vs
-usr/bin/installmgr
-usr/bin/mkfastmod
-usr/bin/mod2imp
-usr/bin/mod2osis
-usr/bin/mod2vpl
-usr/bin/mod2zmod
-usr/bin/osis2mod
-usr/bin/vpl2mod
-usr/bin/vs2osisref
-usr/bin/xml2gbs
-usr/share/sword
diff -u sword-1.5.8/debian/control.in sword-1.5.8/debian/control.in
--- sword-1.5.8/debian/control.in
+++ sword-1.5.8/debian/control.in
@@ -5,12 +5,13 @@
Maintainer: Daniel Glassey <[EMAIL PROTECTED]>
Standards-Version: 3.6.2.0
-Package: libsword5
+Package: libsword5c2a
Architecture: any
Section: libs
Depends: ${shlibs:Depends}
Recommends: sword-frontend
-Replaces: libsword1, libsword4, libsword4c2, libsword-runtime, libsword-config
+Conflicts: libsword5
+Replaces: libsword1, libsword4, libsword4c2, libsword-runtime,
libsword-config, libsword5
Description: API/library for bible software
The SWORD Project is an open source, cross-platform (Linux, Windows, Solaris,
MacOSX etc.) API/library for Bible software with a constantly growing list
@@ -26,7 +27,7 @@
Package: libsword-dev
Architecture: any
Section: libdevel
-Depends: libsword5 (= ${Source-Version}), libc6-dev, libz-dev,
libcurl3-openssl-dev
+Depends: libsword5c2a (= ${Source-Version}), libc6-dev, libz-dev,
libcurl3-openssl-dev
Provides: sword-dev
Description: Development files for libsword
This package contains the static libraries and headers for developing
reverted:
--- sword-1.5.8/debian/libsword5.shlibs
+++ sword-1.5.8.orig/debian/libsword5.shlibs
@@ -1 +0,0 @@
-libsword 5 libsword5 (>= 1.5.8-3)
reverted:
--- sword-1.5.8/debian/libsword5.dirs
+++ sword-1.5.8.orig/debian/libsword5.dirs
@@ -1,7 +0,0 @@
-usr/lib
-usr/bin
-etc/
-usr/share/sword
-usr/share/sword/mods.d
-usr/share/sword/modules
-usr/share/sword/locales.d
reverted:
--- sword-1.5.8/debian/libsword5.docs
+++ sword-1.5.8.orig/debian/libsword5.docs
@@ -1,2 +0,0 @@
-build-tree/sword-1.5.8/doc/greektrans.txt
-build-tree/sword-1.5.8/doc/translation-template.conf
only in patch2:
unchanged:
--- sword-1.5.8.orig/debian/libsword5c2a.dirs
+++ sword-1.5.8/debian/libsword5c2a.dirs
@@ -0,0 +1,7 @@
+usr/lib
+usr/bin
+etc/
+usr/share/sword
+usr/share/sword/mods.d
+usr/share/sword/modules
+usr/share/sword/locales.d
only in patch2:
unchanged:
--- sword-1.5.8.orig/debian/libsword5c2a.docs
+++ sword-1.5.8/debian/libsword5c2a.docs
@@ -0,0 +1,2 @@
+build-tree/sword-1.5.8/doc/greektrans.txt
+build-tree/sword-1.5.8/doc/translation-template.conf
only in patch2:
unchanged:
--- sword-1.5.8.orig/debian/libsword5c2a.install
+++ sword-1.5.8/debian/libsword5c2a.install
@@ -0,0 +1,18 @@
+etc/sword.conf
+usr/lib/libsword.so.5.0.0
+usr/lib/libsword.so.5
+usr/bin/addld
+usr/bin/imp2ld
+usr/bin/imp2gbs
+usr/bin/imp2vs
+usr/bin/installmgr
+usr/bin/mkfastmod
+usr/bin/mod2imp
+usr/bin/mod2osis
+usr/bin/mod2vpl
+usr/bin/mod2zmod
+usr/bin/osis2mod
+usr/bin/vpl2mod
+usr/bin/vs2osisref
+usr/bin/xml2gbs
+usr/share/sword
only in patch2:
unchanged:
--- sword-1.5.8.orig/debian/libsword5c2a.shlibs
+++ sword-1.5.8/debian/libsword5c2a.shlibs
@@ -0,0 +1 @@
+libsword 5 libsword5c2a (>= 1.5.8-3)
signature.asc
Description: Digital signature
