diffstat of debian/ for xcftools_1.0.7-3 xcftools_1.0.7-3ubuntu1 changelog | 15 +++++++++++++++ control | 3 ++- patches/fix-as-needed-linking | 30 ++++++++++++++++++++++++++++++ patches/series | 1 + 4 files changed, 48 insertions(+), 1 deletion(-) diff -Nru xcftools-1.0.7/debian/changelog xcftools-1.0.7/debian/changelog --- xcftools-1.0.7/debian/changelog 2011-09-20 16:25:45.000000000 +0000 +++ xcftools-1.0.7/debian/changelog 2011-11-03 11:01:12.000000000 +0000 @@ -1,3 +1,11 @@ +xcftools (1.0.7-3ubuntu1) precise; urgency=low + + * Merge from Debian unstable, remaining changes: + - debian/patches/fix-as-needed-linking: + Move $(LIBS) to the end of the linker call. + + -- Felix Geyer Thu, 03 Nov 2011 12:00:25 +0100 + xcftools (1.0.7-3) unstable; urgency=low * [3b10c637] Use dh-autoreconf and leave all the rest to debhelper @@ -9,6 +17,13 @@ -- Jan Hauke Rahm Tue, 20 Sep 2011 18:25:36 +0200 +xcftools (1.0.7-2ubuntu1) natty; urgency=low + + * debian/patches/fix-as-needed-linking: + Move $(LIBS) to the end of the linker call. + + -- Michael Bienia Sun, 05 Dec 2010 12:13:43 +0100 + xcftools (1.0.7-2) unstable; urgency=low * Fix uninitialized variables error which made xcfview unusable. Thanks and diff -Nru xcftools-1.0.7/debian/control xcftools-1.0.7/debian/control --- xcftools-1.0.7/debian/control 2011-09-20 16:25:17.000000000 +0000 +++ xcftools-1.0.7/debian/control 2011-11-03 11:01:17.000000000 +0000 @@ -1,7 +1,8 @@ Source: xcftools Section: graphics Priority: optional -Maintainer: Jan Hauke Rahm +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Jan Hauke Rahm Build-Depends: debhelper (>= 7.0.50), autotools-dev, libpng12-dev, netpbm, dh-autoreconf Standards-Version: 3.9.2 diff -Nru xcftools-1.0.7/debian/patches/fix-as-needed-linking xcftools-1.0.7/debian/patches/fix-as-needed-linking --- xcftools-1.0.7/debian/patches/fix-as-needed-linking 1970-01-01 00:00:00.000000000 +0000 +++ xcftools-1.0.7/debian/patches/fix-as-needed-linking 2011-11-03 10:59:45.000000000 +0000 @@ -0,0 +1,30 @@ +Index: xcftools-1.0.7/Makefile.in +=================================================================== +--- xcftools-1.0.7.orig/Makefile.in 2010-12-05 12:12:02.000000000 +0100 ++++ xcftools-1.0.7/Makefile.in 2010-12-05 12:12:56.000000000 +0100 +@@ -71,21 +71,21 @@ + all: $(BINARIES) $(SCRIPTS) $(MANPAGES) po/stamp manpo/all + + xcfinfo$e: xcfinfo.$o $(FILEIO).$o enums.$o xcf-general.$o utils.$o nlsini.$o +- $(CC) $(LDFLAGS) $(LIBS) $^ -o $@ ++ $(CC) $(LDFLAGS) $^ -o $@ $(LIBS) + + xcf2pnm$e: xcf2pnm.$o $(FILEIO).$o enums.$o xcf-general.$o utils.$o nlsini.$o \ + pixels.$o flatten.$o flatspec.$o scaletab.$o table.$o +- $(CC) $(LDFLAGS) $(LIBS) $^ -o $@ ++ $(CC) $(LDFLAGS) $^ -o $@ $(LIBS) + + xcf2png$e: xcf2png.$o $(FILEIO).$o enums.$o xcf-general.$o utils.$o nlsini.$o \ + pixels.$o flatten.$o flatspec.$o scaletab.$o table.$o palette.$o +- $(CC) $(LDFLAGS) $(LIBS) -lpng $^ -o $@ ++ $(CC) $(LDFLAGS) $^ -o $@ $(LIBS) -lpng + + xcfview: xcfview.in Makefile + sed '1s,/usr/bin/perl,@PERL@,' < $< > $@ + + testscale$e: testscale.$o +- $(CC) $(LDFLAGS) $(LIBS) $^ -o $@ ++ $(CC) $(LDFLAGS) $^ -o $@ $(LIBS) + + install: all + for p in $(BINARIES) ; do \ diff -Nru xcftools-1.0.7/debian/patches/series xcftools-1.0.7/debian/patches/series --- xcftools-1.0.7/debian/patches/series 2011-09-20 16:25:17.000000000 +0000 +++ xcftools-1.0.7/debian/patches/series 2011-11-03 11:00:12.000000000 +0000 @@ -1,3 +1,4 @@ use_xdg_for_mime_type_handling remove_strip_from_Makefile libpng-1.5 +fix-as-needed-linking