diff -u cellwriter-1.3.4/debian/control cellwriter-1.3.4/debian/control --- cellwriter-1.3.4/debian/control +++ cellwriter-1.3.4/debian/control @@ -1,7 +1,7 @@ Source: cellwriter Section: gnome Priority: optional -Maintainer: Ubuntu MOTU Developers +Maintainer: Ubuntu Developers XSBC-Original-Maintainer: Michael Levin Build-Depends: cdbs, debhelper (>= 5), autotools-dev, libgtk2.0-dev (>= 2.8), libgnome2-dev, libxtst-dev Standards-Version: 3.7.3 diff -u cellwriter-1.3.4/debian/changelog cellwriter-1.3.4/debian/changelog --- cellwriter-1.3.4/debian/changelog +++ cellwriter-1.3.4/debian/changelog @@ -1,3 +1,10 @@ +cellwriter (1.3.4-1ubuntu2) natty; urgency=low + + * debian/patches/binutils-gold.patch + - fix FTBFS with ld --no-add-needed (LP: #696848) + + -- Mahyuddin Susanto Mon, 03 Jan 2011 23:08:44 +0700 + cellwriter (1.3.4-1ubuntu1) intrepid; urgency=low * Added depends on librsvg2-common (Fixes LP: #254604). diff -u cellwriter-1.3.4/debian/rules cellwriter-1.3.4/debian/rules --- cellwriter-1.3.4/debian/rules +++ cellwriter-1.3.4/debian/rules @@ -3,6 +3,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/autotools.mk include /usr/share/cdbs/1/class/gnome.mk +include /usr/share/cdbs/1/rules/simple-patchsys.mk # Only install the TODO into the package directory DEB_INSTALL_DOCS_ALL := TODO only in patch2: unchanged: --- cellwriter-1.3.4.orig/debian/patches/binutils-gold.patch +++ cellwriter-1.3.4/debian/patches/binutils-gold.patch @@ -0,0 +1,25 @@ +Description: fix FTBFS with ld --no-add-needed +Author: Mahyuddin Susanto +Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/chemtool/+bug/696859 + +--- cellwriter-1.3.4.orig/Makefile.in ++++ cellwriter-1.3.4/Makefile.in +@@ -73,7 +73,7 @@ + wordfreq.$(OBJEXT) preprocess.$(OBJEXT) keywidget.$(OBJEXT) \ + singleinstance.$(OBJEXT) statusicon.$(OBJEXT) $(am__objects_1) + cellwriter_OBJECTS = $(am_cellwriter_OBJECTS) +-cellwriter_LDADD = $(LDADD) ++cellwriter_LDADD = $(LDADD) -lX11 -lXext + cellwriter_DEPENDENCIES = + DEFAULT_INCLUDES = -I.@am__isrc@ + depcomp = $(SHELL) $(top_srcdir)/depcomp +--- cellwriter-1.3.4.orig/Makefile.am ++++ cellwriter-1.3.4/Makefile.am +@@ -1,6 +1,6 @@ + + INCLUDES = @GTK_CFLAGS@ @GNOME_CFLAGS@ +-LDADD = @GTK_LIBS@ @GNOME_LIBS@ ++LDADD = @GTK_LIBS@ @GNOME_LIBS@ -lX11 -lXext + AM_CFLAGS = -DDATADIR=\"$(datadir)\" -DPKGDATADIR=\"$(pkgdatadir)\" + + bin_PROGRAMS = cellwriter