Hi, Attached is the diff for my stlport4.6 4.6.2-3.1 NMU.
PS: this patch is enhanced to include my patch for the 434691 FTBFS. Like the previous diff, the NMU won't be uploaded until the suitesparse transition is cleared. Cheers,
diff -u stlport4.6-4.6.2/debian/control stlport4.6-4.6.2/debian/control
--- stlport4.6-4.6.2/debian/control
+++ stlport4.6-4.6.2/debian/control
@@ -3,12 +3,12 @@
Priority: optional
Maintainer: Torsten Werner <[EMAIL PROTECTED]>
Standards-Version: 3.6.1
-Build-Depends: cdbs, debhelper (>= 4.1.0), g++
+Build-Depends: cdbs, debhelper (>= 4.1.0)
Package: libstlport4.6-dev
Section: libdevel
Architecture: any
-Depends: g++ | c++-compiler, libstlport4.6c2 (= ${Source-Version})
+Depends: g++ | c++-compiler, libstlport4.6ldbl (= ${Source-Version})
Provides: libstlport-dev
Conflicts: libstlport-dev, libstlport-common
Replaces: libstlport-dev
@@ -26,7 +26,7 @@
.
This package is the development package.
-Package: libstlport4.6c2
+Package: libstlport4.6ldbl
Section: libs
Architecture: any
Depends: ${shlibs:Depends}
diff -u stlport4.6-4.6.2/debian/changelog stlport4.6-4.6.2/debian/changelog
--- stlport4.6-4.6.2/debian/changelog
+++ stlport4.6-4.6.2/debian/changelog
@@ -1,3 +1,15 @@
+stlport4.6 (4.6.2-3.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Update libstlport4.6 package name to deal with the long double transition
+ (Closes: 430305):
+ + rename libstlport4.6c2 into libstlport4.6ldbl.
+ + update debian/control accordingly.
+ * Remove g++ from the Build-Depends as it's in build-essential.
+ * add crude patch in stlport/cstdlib to prevent g++ FTBFS (Closes: 434691).
+
+ -- Pierre Habouzit <[EMAIL PROTECTED]> Sat, 22 Mar 2008 21:00:58 +0100
+
stlport4.6 (4.6.2-3) unstable; urgency=low
* build with g++-4.0
reverted:
--- stlport4.6-4.6.2/debian/libstlport4.6c2.install
+++ stlport4.6-4.6.2.orig/debian/libstlport4.6c2.install
@@ -1,2 +0,0 @@
-lib/libstlport_gcc.so.* usr/lib
-
only in patch2:
unchanged:
--- stlport4.6-4.6.2.orig/stlport/cstdlib
+++ stlport4.6-4.6.2/stlport/cstdlib
@@ -69,10 +69,12 @@
#endif
using _STLP_VENDOR_CSTD::bsearch;
using _STLP_VENDOR_CSTD::qsort;
+#if 0 /* see Debian bug #434691 */
// boris : if we do not have native float abs, we define ours; then we cannot
do "using" for "other" abs
# ifdef _STLP_HAS_NATIVE_FLOAT_ABS
using _STLP_VENDOR_CSTD::abs;
# endif
+#endif
using _STLP_VENDOR_CSTD::div;
using _STLP_VENDOR_CSTD::labs;
using _STLP_VENDOR_CSTD::ldiv;
only in patch2:
unchanged:
--- stlport4.6-4.6.2.orig/debian/libstlport4.6ldbl.install
+++ stlport4.6-4.6.2/debian/libstlport4.6ldbl.install
@@ -0,0 +1,2 @@
+lib/libstlport_gcc.so.* usr/lib
+
pgpwigQGyCMuj.pgp
Description: PGP signature
