Hi,

Attached is the diff for my crystalspace 1.2-20080206-1.1 NMU.
diff -u crystalspace-1.2-20080206/debian/changelog 
crystalspace-1.2-20080206/debian/changelog
--- crystalspace-1.2-20080206/debian/changelog
+++ crystalspace-1.2-20080206/debian/changelog
@@ -1,3 +1,11 @@
+crystalspace (1.2-20080206-1.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Add patch gcc-4.3.patch fixing build with GCC 4.3 (Closes: #471057).
+  * quilt added as dep.
+
+ -- Sylvestre Ledru <[EMAIL PROTECTED]>  Wed, 19 Mar 2008 17:26:03 +0100
+
 crystalspace (1.2-20080206-1) unstable; urgency=low
 
   * Control file make again crystalspace for any architecture though
diff -u crystalspace-1.2-20080206/debian/rules 
crystalspace-1.2-20080206/debian/rules
--- crystalspace-1.2-20080206/debian/rules
+++ crystalspace-1.2-20080206/debian/rules
@@ -44,8 +44,10 @@
 CPUOPTIM = --enable-cpu-specific-optimizations=no
 CONFDIR = --prefix=/usr --sysconfdir=/etc
 
+include /usr/share/quilt/quilt.make
+
 configure: configure-stamp
-configure-stamp:
+configure-stamp: patch
        dh_testdir
        # Autobuild debugging stuff
        dh_buildinfo generate cat
@@ -147,7 +149,7 @@
        # Add here commands to compile the indep part of the package.
        #$(MAKE) doc
 
-clean:
+clean: unpatch
        dh_testdir
        dh_testroot
        rm -f build-arch-stamp build-indep-stamp configure-stamp
@@ -303 +305 @@
-.PHONY: build clean binary-indep binary-arch binary install install-indep 
install-arch configure
+.PHONY: build clean binary-indep binary-arch binary install install-indep 
install-arch configure patch unpatch
diff -u crystalspace-1.2-20080206/debian/control 
crystalspace-1.2-20080206/debian/control
--- crystalspace-1.2-20080206/debian/control
+++ crystalspace-1.2-20080206/debian/control
@@ -2,7 +2,7 @@
 Section: games
 Priority: optional
 Maintainer: Christian Bayle <[EMAIL PROTECTED]>
-Build-Depends: python-support (>= 0.4), debhelper(>= 5), nasm (>= 0.98.08-1), 
lib3ds-dev (>= 1.2.0), libogg-dev (>= 1.0rc2-1), libmikmod2-dev, libvorbis-dev 
(>>1.0.0), docbook-to-man, xlibmesa-gl-dev | libgl-dev, zip, libpng3-dev, 
libjpeg62-dev, libfreetype6-dev, zlib1g-dev, libode0-dev, libopenal-dev, 
libalut-dev, libcal3d-dev, swig, dh-buildinfo, flex, bison, texinfo, tetex-bin, 
doxygen, gs-common, glutg3-dev, libmng-dev, libsdl1.2-dev, autoconf, 
libx11-dev, libxext-dev, libxxf86vm-dev, x-dev
+Build-Depends: python-support (>= 0.4), debhelper(>= 5), nasm (>= 0.98.08-1), 
lib3ds-dev (>= 1.2.0), libogg-dev (>= 1.0rc2-1), libmikmod2-dev, libvorbis-dev 
(>>1.0.0), docbook-to-man, xlibmesa-gl-dev | libgl-dev, zip, libpng3-dev, 
libjpeg62-dev, libfreetype6-dev, zlib1g-dev, libode0-dev, libopenal-dev, 
libalut-dev, libcal3d-dev, swig, dh-buildinfo, flex, bison, texinfo, tetex-bin, 
doxygen, gs-common, glutg3-dev, libmng-dev, libsdl1.2-dev, autoconf, 
libx11-dev, libxext-dev, libxxf86vm-dev, x-dev, quilt
 Standards-Version: 3.7.2.2
 
 Package: crystalspace
only in patch2:
unchanged:
--- crystalspace-1.2-20080206.orig/debian/patches/gcc-4.3-long-double.patch
+++ crystalspace-1.2-20080206/debian/patches/gcc-4.3-long-double.patch
@@ -0,0 +1,15 @@
+--- crystalspace-1.2-20080206.orig/CS/configure.ac     2007-11-26 
23:22:10.000000000 +0100
++++ crystalspace-1.2-20080206/CS/configure.ac  2008-03-19 16:40:05.000000000 
+0100
+@@ -437,9 +437,9 @@
+       [$cs_cv_prog_cxx_ignore_unknown_pragmas], [+])])
+ 
+ # On MacOS/X, use of `long double' in csutil/formatter.h causes complaints.
+-CS_COMPILER_IGNORE_LONG_DOUBLE([C++], [cs_cv_prog_cxx_ignore_long_double],
+-    [CS_EMIT_BUILD_PROPERTY([COMPILER.CFLAGS.MANDATORY],
+-      [$cs_cv_prog_cxx_ignore_long_double], [+])])
++#CS_COMPILER_IGNORE_LONG_DOUBLE([C++], [cs_cv_prog_cxx_ignore_long_double],
++#    [CS_EMIT_BUILD_PROPERTY([COMPILER.CFLAGS.MANDATORY],
++#     [$cs_cv_prog_cxx_ignore_long_double], [+])])
+ 
+ 
+ 
only in patch2:
unchanged:
--- crystalspace-1.2-20080206.orig/debian/patches/series
+++ crystalspace-1.2-20080206/debian/patches/series
@@ -0,0 +1 @@
+gcc-4.3-long-double.patch

Reply via email to