diff -Nru fotoxx-10.7/debian/changelog fotoxx-10.7/debian/changelog --- fotoxx-10.7/debian/changelog 2010-07-09 05:14:05.000000000 +0700 +++ fotoxx-10.7/debian/changelog 2011-01-28 01:08:28.000000000 +0700 @@ -1,3 +1,12 @@ +fotoxx (10.7-1ubuntu1) natty; urgency=low + + * Fix FTBFS binutils-gold with ld --as-needed. (LP: #707829) + * Renaming old name debian/fotoxxfotoxx.desktop -> debian/fotoxx.desktop + as declared in debian/rules, and refreshed with latest + desktop-file-validate. (LP: #705036) + + -- Mahyuddin Susanto Fri, 28 Jan 2011 01:06:35 +0700 + fotoxx (10.7-1) unstable; urgency=low * New upstream release diff -Nru fotoxx-10.7/debian/control fotoxx-10.7/debian/control --- fotoxx-10.7/debian/control 2010-07-09 05:56:54.000000000 +0700 +++ fotoxx-10.7/debian/control 2011-01-19 23:15:40.000000000 +0700 @@ -1,7 +1,8 @@ Source: fotoxx Section: graphics Priority: extra -Maintainer: Santiago Torres Batan +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Santiago Torres Batan Build-Depends: debhelper (>= 7), libgtk2.0-dev, libfreeimage-dev, xdg-utils, libtiff4-dev Standards-Version: 3.9.0 Homepage: http://kornelix.squarespace.com/downloads/ diff -Nru fotoxx-10.7/debian/fotoxx.desktop fotoxx-10.7/debian/fotoxx.desktop --- fotoxx-10.7/debian/fotoxx.desktop 1970-01-01 07:00:00.000000000 +0700 +++ fotoxx-10.7/debian/fotoxx.desktop 2011-01-20 00:34:24.000000000 +0700 @@ -0,0 +1,11 @@ +[Desktop Entry] +Name=fotoxx +Categories=Graphics;Publishing; +Type=Application +Terminal=false +GenericName=Photo Editor +Comment=Edit photos and manage collections +# Exec=/usr/local/bin/fotoxx +# Icon=/usr/local/share/fotoxx/icons/fotoxx.png +Exec=fotoxx +Icon=fotoxx diff -Nru fotoxx-10.7/debian/fotoxxfotoxx.desktop fotoxx-10.7/debian/fotoxxfotoxx.desktop --- fotoxx-10.7/debian/fotoxxfotoxx.desktop 2010-07-09 05:20:22.000000000 +0700 +++ fotoxx-10.7/debian/fotoxxfotoxx.desktop 1970-01-01 07:00:00.000000000 +0700 @@ -1,11 +0,0 @@ -[Desktop Entry] -Name=fotoxx -Categories=Graphics -Type=Application -Terminal=false -GenericName=Photo Editor -Comment=Edit photos and manage collections -# Exec=/usr/local/bin/fotoxx -# Icon=/usr/local/share/fotoxx/icons/fotoxx.png -Exec=/home/san/sources/Fotoxx/fotoxx-10.7/debian/fotoxx/usr/bin/fotoxx -Icon=/home/san/sources/Fotoxx/fotoxx-10.7/debian/fotoxx/usr/share/fotoxx/icons/fotoxx.png diff -Nru fotoxx-10.7/debian/patches/01_fix_ftbfs_binutils-gold.patch fotoxx-10.7/debian/patches/01_fix_ftbfs_binutils-gold.patch --- fotoxx-10.7/debian/patches/01_fix_ftbfs_binutils-gold.patch 1970-01-01 07:00:00.000000000 +0700 +++ fotoxx-10.7/debian/patches/01_fix_ftbfs_binutils-gold.patch 2011-01-26 16:47:12.000000000 +0700 @@ -0,0 +1,15 @@ +Description: Fix FTBFS binutils-gold with ld --as-needed. +Author: Mahyuddin Susanto +Bug-Ubuntu: https://bugs.launchpad.net/bugs/705036 + +--- fotoxx-10.7.orig/Makefile ++++ fotoxx-10.7/Makefile +@@ -21,7 +21,7 @@ MANDIR = $(PREFIX)/share/man/man1 + + $(PROGRAM): $(PROGRAM).o zfuncs.o + @ ./dependencies.sh +- $(CXX) $(LFLAGS) -ltiff -o $(PROGRAM) $(PROGRAM).o zfuncs.o ++ $(CXX) -o $(PROGRAM) $(PROGRAM).o zfuncs.o $(LFLAGS) -ltiff + + $(PROGRAM).o: $(SOURCE) + $(CXX) $(CFLAGS) -o $(PROGRAM).o $(SOURCE) \ diff -Nru fotoxx-10.7/debian/patches/series fotoxx-10.7/debian/patches/series --- fotoxx-10.7/debian/patches/series 2010-07-09 05:19:57.000000000 +0700 +++ fotoxx-10.7/debian/patches/series 2011-01-26 16:45:50.000000000 +0700 @@ -1,2 +1,3 @@ debian-changes-10.3.1-1 debian-changes-10.7-1 +01_fix_ftbfs_binutils-gold.patch