On Saturday 05 March 2011 21:32:43 Lisandro Damián Nicanor Pérez Meyer wrote: > Hello! I am attaching a patch for fixing 604319 and 556299. > I will uploaded to delayed/10. > > Please feel free to contact me in case you would like to discuss this > patch.
I'm attaching a fixed patch, I forgot to add quilt as B-D and calling the
proper dh-quilt_* commands.
Kinds regards, Lisandro.
--
16: De quien es Internet
* De DIOS dado que todas las cosas del mundo le pertenecen
Damian Nadales
http://mx.grulic.org.ar/lurker/message/20080307.141449.a70fb2fc.es.html
Lisandro Damián Nicanor Pérez Meyer
http://perezmeyer.com.ar/
http://perezmeyer.blogspot.com/
diff --git a/debian/changelog b/debian/changelog index 0313b35..91f54be 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,15 @@ +papaya (0.97.20031122-5.6) unstable; urgency=low + + * Non-maintainer upload. + * Remove kdelibs4-dev from BD. This will remove MIDI support, + but this support is going to dissapear soon though (Closes: #604319). + * Add part of a patch provided by Matthias Klose to fix FTBFS with + binutils-gold (Closes: #556299). + * Add quilt as BD and the proper dh_quilt_* commands to patch the + source code. + + -- Lisandro Damián Nicanor Pérez Meyer <perezme...@gmail.com> Sat, 05 Mar 2011 21:21:56 -0300 + papaya (0.97.20031122-5.5) unstable; urgency=low * Non-maintainer upload. diff --git a/debian/control b/debian/control index 86d28e4..bad0ae7 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: papaya Section: games Priority: optional Maintainer: Sam Hocevar (Debian packages) <sam+...@zoy.org> -Build-Depends: debhelper (>> 4.0.0), libgtk2.0-dev, libglade2-dev, kdelibs4-dev, pkg-config, python-dev, python-gtk2-dev, libfreetype6-dev, texlive-latex-recommended, texlive-latex-extra, texlive-extra-utils, texlive-font-utils, netpbm, ghostscript +Build-Depends: debhelper (>> 4.0.0), libgtk2.0-dev, libglade2-dev, pkg-config, python-dev, python-gtk2-dev, libfreetype6-dev, texlive-latex-recommended, texlive-latex-extra, texlive-extra-utils, texlive-font-utils, netpbm, ghostscript, quilt Standards-Version: 3.6.2.1 Package: papaya diff --git a/debian/patches/01_fix_linking.patch b/debian/patches/01_fix_linking.patch new file mode 100644 index 0000000..4ad1f35 --- /dev/null +++ b/debian/patches/01_fix_linking.patch @@ -0,0 +1,22 @@ +--- a/src/papaya/Makefile.am ++++ b/src/papaya/Makefile.am +@@ -76,7 +76,7 @@ + + papaya_CXXFLAGS = -I../include @PAPAYA_CFLAGS@ @ALL_CFLAGS@ @GTK_CFLAGS@ @INTERFACE@ @DEBUG@ @PROFILE@ @ZLIB@ @IPV4@ + papaya_CFLAGS = -I../include @PAPAYA_CFLAGS@ @ALL_CFLAGS@ @GTK_CFLAGS@ @INTERFACE@ @DEBUG@ @PROFILE@ @ZLIB@ @IPV4@ +-papaya_LDFLAGS = @PAPAYA_LIBS@ @ALL_LIBS@ @GTK_LIBS@ @DMALLOC_LIB@ ++papaya_LDADD = @PAPAYA_LIBS@ @ALL_LIBS@ @GTK_LIBS@ @DMALLOC_LIB@ -lX11 + + #BUILT_SOURCES = version.h + +--- a/src/papaya/Makefile.in ++++ b/src/papaya/Makefile.in +@@ -366,7 +366,7 @@ + # count.cpp + papaya_CXXFLAGS = -I../include @PAPAYA_CFLAGS@ @ALL_CFLAGS@ @GTK_CFLAGS@ @INTERFACE@ @DEBUG@ @PROFILE@ @ZLIB@ @IPV4@ + papaya_CFLAGS = -I../include @PAPAYA_CFLAGS@ @ALL_CFLAGS@ @GTK_CFLAGS@ @INTERFACE@ @DEBUG@ @PROFILE@ @ZLIB@ @IPV4@ +-papaya_LDFLAGS = @PAPAYA_LIBS@ @ALL_LIBS@ @GTK_LIBS@ @DMALLOC_LIB@ ++papaya_LDADD = @PAPAYA_LIBS@ @ALL_LIBS@ @GTK_LIBS@ @DMALLOC_LIB@ $(LDADD) -lX11 + all: all-am + + .SUFFIXES: diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..c3bf4b0 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1 @@ +01_fix_linking.patch diff --git a/debian/rules b/debian/rules index 0d16ae1..630b87a 100755 --- a/debian/rules +++ b/debian/rules @@ -31,6 +31,7 @@ endif config.status: configure dh_testdir # Add here commands to configure the package. + dh_quilt_patch touch configure.in touch aclocal.m4 touch configure @@ -55,6 +56,7 @@ build-indep-stamp: config.status clean: dh_testdir dh_testroot + dh_quilt_unpatch rm -f m4/Makefile rm -f build-arch-stamp build-indep-stamp config-stamp rm -f po/*.gmo
signature.asc
Description: This is a digitally signed message part.
