tags 458880 + patch
thanks
Hi,
Attached is the diff for my bmpx 0.40.11+debian-1.1 NMU.
diff -Nru /tmp/z0drdfhsdN/bmpx-0.40.11+debian/debian/changelog /tmp/TF48TSCIOj/bmpx-0.40.11+debian/debian/changelog
--- bmpx-0.40.11+debian/debian/changelog 2008-01-12 20:53:56.000000000 +0100
+++ bmpx-0.40.11+debian/debian/changelog 2008-01-12 20:53:56.000000000 +0100
@@ -1,3 +1,11 @@
+bmpx (0.40.11+debian-1.1) unstable; urgency=low
+
+ * Non-maintainer upload to upload FTBFS bug.
+ * Fix invalid conversion. Patch by Tobias Klauser. (Closes: #458880)
+ * Add quilt build depend for patch handling.
+
+ -- Ana Beatriz Guerrero Lopez <[EMAIL PROTECTED]> Sat, 12 Jan 2008 20:26:30 +0100
+
bmpx (0.40.11+debian-1) unstable; urgency=low
* New upstream release.
diff -Nru /tmp/z0drdfhsdN/bmpx-0.40.11+debian/debian/control /tmp/TF48TSCIOj/bmpx-0.40.11+debian/debian/control
--- bmpx-0.40.11+debian/debian/control 2008-01-12 20:53:56.000000000 +0100
+++ bmpx-0.40.11+debian/debian/control 2008-01-12 20:53:56.000000000 +0100
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Thierry Randrianiriana <[EMAIL PROTECTED]>
Uploaders: Frédéric Brin <[EMAIL PROTECTED]>
-Build-Depends: debhelper (>= 5), autotools-dev, intltool (>= 0.35.0), libboost-dev (>= 1.33), libboost-filesystem-dev, libboost-regex-dev, libboost-iostreams-dev, libglib2.0-dev (>= 2.10), libglibmm-2.4-dev (>= 2.8.5), libglib2.0-data, libgtkmm-2.4-dev (>= 2.8.3), libglademm-2.4-dev (>= 2.6.2), libgstreamer0.10-dev (>= 0.10.11), libgstreamer-plugins-base0.10-dev (>= 0.10.11), libdbus-1-dev (>= 0.62), libdbus-glib-1-dev (>= 0.62), libmusicbrainz4-dev (>= 2.1.2), libtagc0-dev (>= 1.4), libglade2-dev (>= 2.5.1), libstartup-notification0-dev (>= 0.8), libhal-storage-dev (>= 0.5.6) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libcairomm-1.0-dev (>= 0.6.0), libcairo2-dev (>=1.0.0), libsidplay1-dev, libxt-dev, libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libfam-dev, librsvg2-dev (>= 2.14.0), libcdparanoia0-dev, libofa0-dev (>= 0.9.3), libsqlite3-dev (>= 3.3.11), libdiscid0-dev (>= 0.1.0), libsexymm-dev (>= 0.1.9), libmodplug-dev, libsoup2.2-dev (>= 2.2.100), xsltproc, docbook-xsl
+Build-Depends: debhelper (>= 5), autotools-dev, intltool (>= 0.35.0), libboost-dev (>= 1.33), libboost-filesystem-dev, libboost-regex-dev, libboost-iostreams-dev, libglib2.0-dev (>= 2.10), libglibmm-2.4-dev (>= 2.8.5), libglib2.0-data, libgtkmm-2.4-dev (>= 2.8.3), libglademm-2.4-dev (>= 2.6.2), libgstreamer0.10-dev (>= 0.10.11), libgstreamer-plugins-base0.10-dev (>= 0.10.11), libdbus-1-dev (>= 0.62), libdbus-glib-1-dev (>= 0.62), libmusicbrainz4-dev (>= 2.1.2), libtagc0-dev (>= 1.4), libglade2-dev (>= 2.5.1), libstartup-notification0-dev (>= 0.8), libhal-storage-dev (>= 0.5.6) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libcairomm-1.0-dev (>= 0.6.0), libcairo2-dev (>=1.0.0), libsidplay1-dev, libxt-dev, libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libfam-dev, librsvg2-dev (>= 2.14.0), libcdparanoia0-dev, libofa0-dev (>= 0.9.3), libsqlite3-dev (>= 3.3.11), libdiscid0-dev (>= 0.1.0), libsexymm-dev (>= 0.1.9), libmodplug-dev, libsoup2.2-dev (>= 2.2.100), xsltproc, docbook-xsl, quilt
Standards-Version: 3.7.2
Package: bmpx
diff -Nru /tmp/z0drdfhsdN/bmpx-0.40.11+debian/debian/patches/bmpx-sanity-const-char.diff /tmp/TF48TSCIOj/bmpx-0.40.11+debian/debian/patches/bmpx-sanity-const-char.diff
--- bmpx-0.40.11+debian/debian/patches/bmpx-sanity-const-char.diff 1970-01-01 01:00:00.000000000 +0100
+++ bmpx-0.40.11+debian/debian/patches/bmpx-sanity-const-char.diff 2008-01-12 20:53:56.000000000 +0100
@@ -0,0 +1,11 @@
+--- bmpx-0.40.11+debian/src/sanity.cc.orig 2008-01-10 20:04:09.000000000 +0100
++++ bmpx-0.40.11+debian/src/sanity.cc 2008-01-10 19:31:13.000000000 +0100
+@@ -69,7 +69,7 @@ sanity_check_glib_msg (void)
+ }
+
+ C_FUNCTION
+-gchar *
++const gchar *
+ sanity_check_gtk (void)
+ {
+ return gtk_check_version (GTK_REQUIRED_MAJOR_VER,
diff -Nru /tmp/z0drdfhsdN/bmpx-0.40.11+debian/debian/patches/series /tmp/TF48TSCIOj/bmpx-0.40.11+debian/debian/patches/series
--- bmpx-0.40.11+debian/debian/patches/series 1970-01-01 01:00:00.000000000 +0100
+++ bmpx-0.40.11+debian/debian/patches/series 2008-01-12 20:53:56.000000000 +0100
@@ -0,0 +1 @@
+bmpx-sanity-const-char.diff
diff -Nru /tmp/z0drdfhsdN/bmpx-0.40.11+debian/debian/rules /tmp/TF48TSCIOj/bmpx-0.40.11+debian/debian/rules
--- bmpx-0.40.11+debian/debian/rules 2008-01-12 20:53:56.000000000 +0100
+++ bmpx-0.40.11+debian/debian/rules 2008-01-12 20:53:56.000000000 +0100
@@ -14,7 +14,10 @@
CFLAGS += -O2
endif
-config.status: configure
+
+include /usr/share/quilt/quilt.make
+
+config.status: configure $(QUILT_STAMPFN)
dh_testdir
./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) CFLAGS="$(CFLAGS)" \
@@ -41,7 +44,7 @@
touch $@
-clean:
+clean: unpatch
dh_testdir
dh_testroot
rm -f build-stamp
