tags 556509 + patch pending
thanks
Dear maintainer,
I've prepared an NMU for tuxpaint (versioned as 1:0.9.21-1.1) and
uploaded it. Please find attached the diff.
Regards,
Ana
diff -u tuxpaint-0.9.21/debian/control tuxpaint-0.9.21/debian/control
--- tuxpaint-0.9.21/debian/control
+++ tuxpaint-0.9.21/debian/control
@@ -2,7 +2,7 @@
Section: graphics
Priority: optional
Maintainer: Ben Armstrong sy...@sanctuary.nslug.ns.ca
-Build-Depends: debhelper (= 5.0.51~), gettext, libfribidi-dev, libsdl1.2-dev, libsdl-image1.2-dev, libsdl-mixer1.2-dev (= 1.2.4-1.1), libsdl-ttf2.0-dev, libsdl-pango-dev, libpng3-dev, libvorbis-dev (= 1.0.0-2), librsvg2-dev, libcairo2-dev, libpaper-dev
+Build-Depends: debhelper (= 5.0.51~), gettext, libfribidi-dev, libsdl1.2-dev, libsdl-image1.2-dev, libsdl-mixer1.2-dev (= 1.2.4-1.1), libsdl-ttf2.0-dev, libsdl-pango-dev, libpng3-dev, libvorbis-dev (= 1.0.0-2), librsvg2-dev, libcairo2-dev, libpaper-dev, quilt
Standards-Version: 3.8.2
Package: tuxpaint
diff -u tuxpaint-0.9.21/debian/rules tuxpaint-0.9.21/debian/rules
--- tuxpaint-0.9.21/debian/rules
+++ tuxpaint-0.9.21/debian/rules
@@ -5,6 +5,9 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
+include /usr/share/quilt/quilt.make
+
+
export DH_ALWAYS_EXCLUDE=CVS
ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
@@ -23,7 +26,7 @@
build-arch: configure-stamp build-arch-stamp
-build-arch-stamp:
+build-arch-stamp: $(QUILT_STAMPFN)
dh_testdir
# Add here commands to compile the package.
@@ -44,7 +47,7 @@
build: build-arch build-indep
-clean:
+clean: unpatch
dh_testdir
dh_testroot
rm -f build-arch-stamp build-indep-stamp configure-stamp
diff -u tuxpaint-0.9.21/debian/changelog tuxpaint-0.9.21/debian/changelog
--- tuxpaint-0.9.21/debian/changelog
+++ tuxpaint-0.9.21/debian/changelog
@@ -1,3 +1,11 @@
+tuxpaint (1:0.9.21-1.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Fix FTBFS with binutils-gold. Thanks to Georgios M. Zarkadas for the
+patch. (Closes: #556509)
+
+ -- Ana Beatriz Guerrero Lopez a...@debian.org Sun, 04 Dec 2011 14:04:49 +0100
+
tuxpaint (1:0.9.21-1) unstable; urgency=low
* New upstream release.
only in patch2:
unchanged:
--- tuxpaint-0.9.21.orig/debian/patches/fix-ftbfs.patch
+++ tuxpaint-0.9.21/debian/patches/fix-ftbfs.patch
@@ -0,0 +1,13 @@
+diff --git a/Makefile b/Makefile
+index e7c4fff..e9e6b93 100644
+--- a/Makefile
b/Makefile
+@@ -80,7 +80,7 @@ FRIBIDI_CFLAGS:=$(shell pkg-config --cflags fribidi)
+ windows_ARCH_LINKS:=-lintl $(PNG) -lwinspool -lshlwapi $(FRIBIDI_LIB)
+ osx_ARCH_LINKS:=$(PAPER_LIB) $(FRIBIDI_LIB)
+ beos_ARCH_LINKS:=-lintl $(PNG) -lz -lbe -liconv $(FRIBIDI_LIB)
+-linux_ARCH_LINKS:=$(PAPER_LIB) $(FRIBIDI_LIB)
++linux_ARCH_LINKS:=$(PAPER_LIB) $(PNG) $(FRIBIDI_LIB)
+ ARCH_LINKS:=$($(OS)_ARCH_LINKS)
+
+ windows_ARCH_HEADERS:=src/win32_print.h
only in patch2:
unchanged:
--- tuxpaint-0.9.21.orig/debian/patches/series
+++ tuxpaint-0.9.21/debian/patches/series
@@ -0,0 +1 @@
+fix-ftbfs.patch
