[Pkg-cli-apps-commits] r3908 - in /packages/f-spot/trunk/debian: changelog patches/98_autoreconf.dpatch patches/debian_link-system-flickrnet.dpatch
diocles-guest at users.alioth.debian.org
diocles-guest at users.alioth.debian.org
Wed Apr 16 21:20:27 UTC 2008
Author: diocles-guest
Date: Wed Apr 16 21:20:26 2008
New Revision: 3908
URL: http://svn.debian.org/wsvn/pkg-cli-apps/?sc=1&rev=3908
Log:
debian_link-system-flickrnet.dpatch: Remove configure.in entries.
Modified:
packages/f-spot/trunk/debian/changelog
packages/f-spot/trunk/debian/patches/98_autoreconf.dpatch
packages/f-spot/trunk/debian/patches/debian_link-system-flickrnet.dpatch
Modified: packages/f-spot/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/f-spot/trunk/debian/changelog?rev=3908&op=diff
==============================================================================
--- packages/f-spot/trunk/debian/changelog (original)
+++ packages/f-spot/trunk/debian/changelog Wed Apr 16 21:20:26 2008
@@ -5,7 +5,8 @@
upstream stable SVN branch, and debian_* patches are not upstream.
* debian/patches/debian_x-content-mimetype.dpatch:
+ Patch from upstream bugzilla for x-content mimetype .desktop file.
- * debian/patches/debian_link-system-mono-addins.dpatch:
+ * debian/patches/debian_link-system-mono-addins.dpatch,
+ debian/patches/debian_link-system-flickrnet.dpatch:
+ Remove configure.in entries so that Makefiles aren't generated.
* debian/patches/svn-042-3817_importdialog-missing-icon.dpatch:
+ Show a 'missing icon' image in the import dialog rather than
@@ -27,7 +28,7 @@
+ Add line breaks to Build-Depends.
* debian/update_src_to_use_system_libs.sh: Remove unused script.
- -- Tim Retout <tim at retout.co.uk> Wed, 16 Apr 2008 22:11:46 +0100
+ -- Tim Retout <tim at retout.co.uk> Wed, 16 Apr 2008 22:18:36 +0100
f-spot (0.4.2-1) unstable; urgency=low
Modified: packages/f-spot/trunk/debian/patches/98_autoreconf.dpatch
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/f-spot/trunk/debian/patches/98_autoreconf.dpatch?rev=3908&op=diff
==============================================================================
--- packages/f-spot/trunk/debian/patches/98_autoreconf.dpatch (original)
+++ packages/f-spot/trunk/debian/patches/98_autoreconf.dpatch Wed Apr 16 21:20:26 2008
@@ -7,7 +7,7 @@
@DPATCH@
diff -urNad f-spot~/Makefile.in f-spot/Makefile.in
--- f-spot~/Makefile.in 2008-04-16 22:07:51.000000000 +0100
-+++ f-spot/Makefile.in 2008-04-16 22:10:46.000000000 +0100
++++ f-spot/Makefile.in 2008-04-16 22:18:21.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -202,7 +202,7 @@
install-ApplicationsDATA install-am install-data \
diff -urNad f-spot~/Tao/Makefile.in f-spot/Tao/Makefile.in
--- f-spot~/Tao/Makefile.in 2008-04-16 22:07:51.000000000 +0100
-+++ f-spot/Tao/Makefile.in 2008-04-16 22:10:40.000000000 +0100
++++ f-spot/Tao/Makefile.in 2008-04-16 22:18:17.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -305,7 +305,7 @@
$$tags $$unique
diff -urNad f-spot~/Tao/Tao.GlPostProcess/Makefile.in f-spot/Tao/Tao.GlPostProcess/Makefile.in
--- f-spot~/Tao/Tao.GlPostProcess/Makefile.in 2008-04-16 22:07:51.000000000 +0100
-+++ f-spot/Tao/Tao.GlPostProcess/Makefile.in 2008-04-16 22:10:40.000000000 +0100
++++ f-spot/Tao/Tao.GlPostProcess/Makefile.in 2008-04-16 22:18:17.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -383,7 +383,7 @@
LINK_TAO = \
diff -urNad f-spot~/Tao/Tao.OpenGl/Makefile.in f-spot/Tao/Tao.OpenGl/Makefile.in
--- f-spot~/Tao/Tao.OpenGl/Makefile.in 2008-04-16 22:07:51.000000000 +0100
-+++ f-spot/Tao/Tao.OpenGl/Makefile.in 2008-04-16 22:10:40.000000000 +0100
++++ f-spot/Tao/Tao.OpenGl/Makefile.in 2008-04-16 22:18:17.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -461,7 +461,7 @@
LINK_TAO = \
diff -urNad f-spot~/Tao/Tao.OpenGl.ExtensionLoader/Makefile.in f-spot/Tao/Tao.OpenGl.ExtensionLoader/Makefile.in
--- f-spot~/Tao/Tao.OpenGl.ExtensionLoader/Makefile.in 2008-04-16 22:07:51.000000000 +0100
-+++ f-spot/Tao/Tao.OpenGl.ExtensionLoader/Makefile.in 2008-04-16 22:10:40.000000000 +0100
++++ f-spot/Tao/Tao.OpenGl.ExtensionLoader/Makefile.in 2008-04-16 22:18:17.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -539,7 +539,7 @@
LINK_TAO = \
diff -urNad f-spot~/Tao/Tao.OpenGl.Glu/Makefile.in f-spot/Tao/Tao.OpenGl.Glu/Makefile.in
--- f-spot~/Tao/Tao.OpenGl.Glu/Makefile.in 2008-04-16 22:07:51.000000000 +0100
-+++ f-spot/Tao/Tao.OpenGl.Glu/Makefile.in 2008-04-16 22:10:40.000000000 +0100
++++ f-spot/Tao/Tao.OpenGl.Glu/Makefile.in 2008-04-16 22:18:17.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -617,7 +617,7 @@
LINK_TAO = \
diff -urNad f-spot~/aclocal.m4 f-spot/aclocal.m4
--- f-spot~/aclocal.m4 2008-04-16 22:07:51.000000000 +0100
-+++ f-spot/aclocal.m4 2008-04-16 22:10:32.000000000 +0100
++++ f-spot/aclocal.m4 2008-04-16 22:18:02.000000000 +0100
@@ -1,7 +1,7 @@
-# generated automatically by aclocal 1.10 -*- Autoconf -*-
+# generated automatically by aclocal 1.10.1 -*- Autoconf -*-
@@ -1446,7 +1446,7 @@
diff -urNad f-spot~/configure f-spot/configure
--- f-spot~/configure 2008-04-16 22:07:51.000000000 +0100
-+++ f-spot/configure 2008-04-16 22:10:38.000000000 +0100
++++ f-spot/configure 2008-04-16 22:18:16.000000000 +0100
@@ -847,14 +847,14 @@
INTLTOOL_SCHEMAS_RULE
INTLTOOL_THEME_RULE
@@ -3684,7 +3684,7 @@
-ac_config_files="$ac_config_files Makefile dbus-sharp/Makefile dbus-sharp-glib/Makefile docs/Makefile gnome-keyring-sharp/Makefile icons/Makefile libeog/Makefile libeog/cursors/Makefile libjpegtran/Makefile libfspot/Makefile libgphoto2-sharp/Makefile mono-addins/Makefile mono-addins/Mono.Addins/Makefile mono-addins/Mono.Addins.Gui/Makefile mono-addins/Mono.Addins.Setup/Makefile semweb/Makefile tools/Makefile po/Makefile.in src/Core/Defines.cs src/AssemblyInfo.cs src/f-spot.exe.config src/Makefile glitz-sharp/Makefile glitz-sharp/src/Makefile Tao/Makefile Tao/Tao.OpenGl/Makefile Tao/Tao.OpenGl.Glu/Makefile Tao/Tao.GlPostProcess/Makefile Tao/Tao.OpenGl.ExtensionLoader/Makefile extensions/Makefile extensions/CDExport/Makefile extensions/DefaultExporters/Makefile extensions/FlickrExport/Makefile extensions/FlickrExport/FlickrNet/Makefile extensions/GalleryExport/Makefile extensions/FolderExport/Makefile extensions/SmugMugExport/SmugMugNet/Makefile extensions/SmugMugExport/Makefile extensions/PicasaWebExport/Makefile extensions/PicasaWebExport/google-sharp/Makefile f-spot.pc f-spot.spec f-spot.desktop.in f-spot-view.desktop.in"
-+ac_config_files="$ac_config_files Makefile dbus-sharp/Makefile dbus-sharp-glib/Makefile docs/Makefile gnome-keyring-sharp/Makefile icons/Makefile libeog/Makefile libeog/cursors/Makefile libjpegtran/Makefile libfspot/Makefile libgphoto2-sharp/Makefile semweb/Makefile tools/Makefile po/Makefile.in src/Core/Defines.cs src/AssemblyInfo.cs src/f-spot.exe.config src/Cms.dll.config src/Makefile glitz-sharp/Makefile glitz-sharp/src/Makefile Tao/Makefile Tao/Tao.OpenGl/Makefile Tao/Tao.OpenGl.Glu/Makefile Tao/Tao.GlPostProcess/Makefile Tao/Tao.OpenGl.ExtensionLoader/Makefile extensions/Makefile extensions/CDExport/Makefile extensions/DefaultExporters/Makefile extensions/FlickrExport/Makefile extensions/FlickrExport/FlickrNet/Makefile extensions/GalleryExport/Makefile extensions/FolderExport/Makefile extensions/SmugMugExport/SmugMugNet/Makefile extensions/SmugMugExport/Makefile extensions/PicasaWebExport/Makefile extensions/PicasaWebExport/google-sharp/Makefile f-spot.pc f-spot.spec f-spot.desktop.in f-spot-view.desktop.in f-spot-import.desktop.in"
++ac_config_files="$ac_config_files Makefile dbus-sharp/Makefile dbus-sharp-glib/Makefile docs/Makefile gnome-keyring-sharp/Makefile icons/Makefile libeog/Makefile libeog/cursors/Makefile libjpegtran/Makefile libfspot/Makefile libgphoto2-sharp/Makefile semweb/Makefile tools/Makefile po/Makefile.in src/Core/Defines.cs src/AssemblyInfo.cs src/f-spot.exe.config src/Cms.dll.config src/Makefile glitz-sharp/Makefile glitz-sharp/src/Makefile Tao/Makefile Tao/Tao.OpenGl/Makefile Tao/Tao.OpenGl.Glu/Makefile Tao/Tao.GlPostProcess/Makefile Tao/Tao.OpenGl.ExtensionLoader/Makefile extensions/Makefile extensions/CDExport/Makefile extensions/DefaultExporters/Makefile extensions/FlickrExport/Makefile extensions/GalleryExport/Makefile extensions/FolderExport/Makefile extensions/SmugMugExport/SmugMugNet/Makefile extensions/SmugMugExport/Makefile extensions/PicasaWebExport/Makefile extensions/PicasaWebExport/google-sharp/Makefile f-spot.pc f-spot.spec f-spot.desktop.in f-spot-view.desktop.in f-spot-import.desktop.in"
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
@@ -3717,7 +3717,15 @@
"src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
"glitz-sharp/Makefile") CONFIG_FILES="$CONFIG_FILES glitz-sharp/Makefile" ;;
"glitz-sharp/src/Makefile") CONFIG_FILES="$CONFIG_FILES glitz-sharp/src/Makefile" ;;
-@@ -26417,6 +26830,7 @@
+@@ -26406,7 +26819,6 @@
+ "extensions/CDExport/Makefile") CONFIG_FILES="$CONFIG_FILES extensions/CDExport/Makefile" ;;
+ "extensions/DefaultExporters/Makefile") CONFIG_FILES="$CONFIG_FILES extensions/DefaultExporters/Makefile" ;;
+ "extensions/FlickrExport/Makefile") CONFIG_FILES="$CONFIG_FILES extensions/FlickrExport/Makefile" ;;
+- "extensions/FlickrExport/FlickrNet/Makefile") CONFIG_FILES="$CONFIG_FILES extensions/FlickrExport/FlickrNet/Makefile" ;;
+ "extensions/GalleryExport/Makefile") CONFIG_FILES="$CONFIG_FILES extensions/GalleryExport/Makefile" ;;
+ "extensions/FolderExport/Makefile") CONFIG_FILES="$CONFIG_FILES extensions/FolderExport/Makefile" ;;
+ "extensions/SmugMugExport/SmugMugNet/Makefile") CONFIG_FILES="$CONFIG_FILES extensions/SmugMugExport/SmugMugNet/Makefile" ;;
+@@ -26417,6 +26829,7 @@
"f-spot.spec") CONFIG_FILES="$CONFIG_FILES f-spot.spec" ;;
"f-spot.desktop.in") CONFIG_FILES="$CONFIG_FILES f-spot.desktop.in" ;;
"f-spot-view.desktop.in") CONFIG_FILES="$CONFIG_FILES f-spot-view.desktop.in" ;;
@@ -3725,7 +3733,7 @@
"po/stamp-it") CONFIG_COMMANDS="$CONFIG_COMMANDS po/stamp-it" ;;
*) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
-@@ -26560,14 +26974,14 @@
+@@ -26560,14 +26973,14 @@
INTLTOOL_SCHEMAS_RULE!$INTLTOOL_SCHEMAS_RULE$ac_delim
INTLTOOL_THEME_RULE!$INTLTOOL_THEME_RULE$ac_delim
INTLTOOL_SERVICE_RULE!$INTLTOOL_SERVICE_RULE$ac_delim
@@ -3744,7 +3752,7 @@
ALL_LINGUAS!$ALL_LINGUAS$ac_delim
CC!$CC$ac_delim
CFLAGS!$CFLAGS$ac_delim
-@@ -26643,6 +27057,8 @@
+@@ -26643,6 +27056,8 @@
ECHO!$ECHO$ac_delim
AR!$AR$ac_delim
RANLIB!$RANLIB$ac_delim
@@ -3753,7 +3761,7 @@
CXX!$CXX$ac_delim
CXXFLAGS!$CXXFLAGS$ac_delim
ac_ct_CXX!$ac_ct_CXX$ac_delim
-@@ -26668,6 +27084,7 @@
+@@ -26668,6 +27083,7 @@
DOC_USER_FORMATS!$DOC_USER_FORMATS$ac_delim
ENABLE_SK_TRUE!$ENABLE_SK_TRUE$ac_delim
ENABLE_SK_FALSE!$ENABLE_SK_FALSE$ac_delim
@@ -3761,7 +3769,7 @@
HAVE_GNOME_DOC_UTILS_TRUE!$HAVE_GNOME_DOC_UTILS_TRUE$ac_delim
HAVE_GNOME_DOC_UTILS_FALSE!$HAVE_GNOME_DOC_UTILS_FALSE$ac_delim
F_CFLAGS!$F_CFLAGS$ac_delim
-@@ -26712,9 +27129,6 @@
+@@ -26712,9 +27128,6 @@
LIBGPHOTO2_LIBS!$LIBGPHOTO2_LIBS$ac_delim
EXIF_CFLAGS!$EXIF_CFLAGS$ac_delim
EXIF_LIBS!$EXIF_LIBS$ac_delim
@@ -3771,7 +3779,7 @@
_ACEOF
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
-@@ -26756,6 +27170,9 @@
+@@ -26756,6 +27169,9 @@
ac_delim='%!_!# '
for ac_last_try in false false false false false :; do
cat >conf$$subs.sed <<_ACEOF
@@ -3781,7 +3789,7 @@
WITH_TURTLE_TRUE!$WITH_TURTLE_TRUE$ac_delim
WITH_TURTLE_FALSE!$WITH_TURTLE_FALSE$ac_delim
TURTLEDIR!$TURTLEDIR$ac_delim
-@@ -26764,10 +27181,8 @@
+@@ -26764,10 +27180,8 @@
ICONS_DIRECTORY!$ICONS_DIRECTORY$ac_delim
GETTEXT_PACKAGE!$GETTEXT_PACKAGE$ac_delim
USE_NLS!$USE_NLS$ac_delim
@@ -3792,7 +3800,7 @@
CATALOGS!$CATALOGS$ac_delim
CATOBJEXT!$CATOBJEXT$ac_delim
GMOFILES!$GMOFILES$ac_delim
-@@ -26777,6 +27192,7 @@
+@@ -26777,6 +27191,7 @@
PO_IN_DATADIR_FALSE!$PO_IN_DATADIR_FALSE$ac_delim
POFILES!$POFILES$ac_delim
POSUB!$POSUB$ac_delim
@@ -3800,7 +3808,7 @@
LIBJPEG!$LIBJPEG$ac_delim
CSC!$CSC$ac_delim
expanded_libdir!$expanded_libdir$ac_delim
-@@ -26785,7 +27201,7 @@
+@@ -26785,7 +27200,7 @@
LTLIBOBJS!$LTLIBOBJS$ac_delim
_ACEOF
@@ -3809,7 +3817,7 @@
break
elif $ac_last_try; then
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-@@ -27186,21 +27602,22 @@
+@@ -27186,21 +27601,22 @@
fi
rm -f "$tmp/out12"
# Compute $ac_file's index in $config_headers.
@@ -3839,7 +3847,7 @@
sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
s//\1/
q
-@@ -27237,7 +27654,7 @@
+@@ -27237,7 +27653,7 @@
# each Makefile.in and add a new line on top of each file to say so.
# Grep'ing the whole file is not good either: AIX grep has a line
# limit of 2048, but all sed's we know have understand at least 4000.
@@ -3848,7 +3856,7 @@
dirpart=`$as_dirname -- "$mf" ||
$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
X"$mf" : 'X\(//\)[^/]' \| \
-@@ -27356,10 +27773,6 @@
+@@ -27356,10 +27772,6 @@
for file in intltool-extract intltool-merge intltool-update; do
sed -e "s|@INTLTOOL_EXTRACT@|`pwd`/intltool-extract|g" \
-e "s|@INTLTOOL_LIBDIR@|${INTLTOOL_LIBDIR}|g" \
@@ -3861,7 +3869,7 @@
if cmp -s ${file} ${file}.out 2>/dev/null; then
diff -urNad f-spot~/dbus-sharp/Makefile.in f-spot/dbus-sharp/Makefile.in
--- f-spot~/dbus-sharp/Makefile.in 2008-04-16 22:07:51.000000000 +0100
-+++ f-spot/dbus-sharp/Makefile.in 2008-04-16 22:10:41.000000000 +0100
++++ f-spot/dbus-sharp/Makefile.in 2008-04-16 22:18:18.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -3939,7 +3947,7 @@
LINK_TAO = \
diff -urNad f-spot~/dbus-sharp-glib/Makefile.in f-spot/dbus-sharp-glib/Makefile.in
--- f-spot~/dbus-sharp-glib/Makefile.in 2008-04-16 22:07:51.000000000 +0100
-+++ f-spot/dbus-sharp-glib/Makefile.in 2008-04-16 22:10:41.000000000 +0100
++++ f-spot/dbus-sharp-glib/Makefile.in 2008-04-16 22:18:17.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -4017,7 +4025,7 @@
LINK_TAO = \
diff -urNad f-spot~/docs/Makefile.in f-spot/docs/Makefile.in
--- f-spot~/docs/Makefile.in 2008-04-16 22:07:51.000000000 +0100
-+++ f-spot/docs/Makefile.in 2008-04-16 22:10:41.000000000 +0100
++++ f-spot/docs/Makefile.in 2008-04-16 22:18:18.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -4082,7 +4090,7 @@
NUNIT_CFLAGS = @NUNIT_CFLAGS@
diff -urNad f-spot~/extensions/CDExport/Makefile.in f-spot/extensions/CDExport/Makefile.in
--- f-spot~/extensions/CDExport/Makefile.in 2008-04-16 22:07:51.000000000 +0100
-+++ f-spot/extensions/CDExport/Makefile.in 2008-04-16 22:10:41.000000000 +0100
++++ f-spot/extensions/CDExport/Makefile.in 2008-04-16 22:18:18.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -4160,7 +4168,7 @@
LINK_TAO = \
diff -urNad f-spot~/extensions/DefaultExporters/Makefile.in f-spot/extensions/DefaultExporters/Makefile.in
--- f-spot~/extensions/DefaultExporters/Makefile.in 2008-04-16 22:07:51.000000000 +0100
-+++ f-spot/extensions/DefaultExporters/Makefile.in 2008-04-16 22:10:41.000000000 +0100
++++ f-spot/extensions/DefaultExporters/Makefile.in 2008-04-16 22:18:18.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -4238,7 +4246,7 @@
LINK_TAO = \
diff -urNad f-spot~/extensions/FlickrExport/FlickrNet/Makefile.in f-spot/extensions/FlickrExport/FlickrNet/Makefile.in
--- f-spot~/extensions/FlickrExport/FlickrNet/Makefile.in 2008-04-16 22:07:51.000000000 +0100
-+++ f-spot/extensions/FlickrExport/FlickrNet/Makefile.in 2008-04-16 22:10:42.000000000 +0100
++++ f-spot/extensions/FlickrExport/FlickrNet/Makefile.in 2008-04-16 22:18:02.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -4316,7 +4324,7 @@
LINK_TAO = \
diff -urNad f-spot~/extensions/FlickrExport/Makefile.in f-spot/extensions/FlickrExport/Makefile.in
--- f-spot~/extensions/FlickrExport/Makefile.in 2008-04-16 22:07:51.000000000 +0100
-+++ f-spot/extensions/FlickrExport/Makefile.in 2008-04-16 22:10:42.000000000 +0100
++++ f-spot/extensions/FlickrExport/Makefile.in 2008-04-16 22:18:18.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -4741,7 +4749,7 @@
all: $(PLUGIN_ASSEMBLY)
diff -urNad f-spot~/extensions/FolderExport/Makefile.in f-spot/extensions/FolderExport/Makefile.in
--- f-spot~/extensions/FolderExport/Makefile.in 2008-04-16 22:07:51.000000000 +0100
-+++ f-spot/extensions/FolderExport/Makefile.in 2008-04-16 22:10:42.000000000 +0100
++++ f-spot/extensions/FolderExport/Makefile.in 2008-04-16 22:18:18.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -4819,7 +4827,7 @@
LINK_TAO = \
diff -urNad f-spot~/extensions/GalleryExport/Makefile.in f-spot/extensions/GalleryExport/Makefile.in
--- f-spot~/extensions/GalleryExport/Makefile.in 2008-04-16 22:07:51.000000000 +0100
-+++ f-spot/extensions/GalleryExport/Makefile.in 2008-04-16 22:10:42.000000000 +0100
++++ f-spot/extensions/GalleryExport/Makefile.in 2008-04-16 22:18:18.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -4906,7 +4914,7 @@
.NOEXPORT:
diff -urNad f-spot~/extensions/Makefile.in f-spot/extensions/Makefile.in
--- f-spot~/extensions/Makefile.in 2008-04-16 22:07:51.000000000 +0100
-+++ f-spot/extensions/Makefile.in 2008-04-16 22:10:42.000000000 +0100
++++ f-spot/extensions/Makefile.in 2008-04-16 22:18:18.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -5009,7 +5017,7 @@
$$tags $$unique
diff -urNad f-spot~/extensions/PicasaWebExport/Makefile.in f-spot/extensions/PicasaWebExport/Makefile.in
--- f-spot~/extensions/PicasaWebExport/Makefile.in 2008-04-16 22:07:51.000000000 +0100
-+++ f-spot/extensions/PicasaWebExport/Makefile.in 2008-04-16 22:10:43.000000000 +0100
++++ f-spot/extensions/PicasaWebExport/Makefile.in 2008-04-16 22:18:19.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -5125,7 +5133,7 @@
$$tags $$unique
diff -urNad f-spot~/extensions/PicasaWebExport/google-sharp/Makefile.in f-spot/extensions/PicasaWebExport/google-sharp/Makefile.in
--- f-spot~/extensions/PicasaWebExport/google-sharp/Makefile.in 2008-04-16 22:07:51.000000000 +0100
-+++ f-spot/extensions/PicasaWebExport/google-sharp/Makefile.in 2008-04-16 22:10:43.000000000 +0100
++++ f-spot/extensions/PicasaWebExport/google-sharp/Makefile.in 2008-04-16 22:18:19.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -5203,7 +5211,7 @@
LINK_TAO = \
diff -urNad f-spot~/extensions/SmugMugExport/Makefile.in f-spot/extensions/SmugMugExport/Makefile.in
--- f-spot~/extensions/SmugMugExport/Makefile.in 2008-04-16 22:07:51.000000000 +0100
-+++ f-spot/extensions/SmugMugExport/Makefile.in 2008-04-16 22:10:43.000000000 +0100
++++ f-spot/extensions/SmugMugExport/Makefile.in 2008-04-16 22:18:19.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -5319,7 +5327,7 @@
$$tags $$unique
diff -urNad f-spot~/extensions/SmugMugExport/SmugMugNet/Makefile.in f-spot/extensions/SmugMugExport/SmugMugNet/Makefile.in
--- f-spot~/extensions/SmugMugExport/SmugMugNet/Makefile.in 2008-04-16 22:07:51.000000000 +0100
-+++ f-spot/extensions/SmugMugExport/SmugMugNet/Makefile.in 2008-04-16 22:10:43.000000000 +0100
++++ f-spot/extensions/SmugMugExport/SmugMugNet/Makefile.in 2008-04-16 22:18:19.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -5397,7 +5405,7 @@
LINK_TAO = \
diff -urNad f-spot~/glitz-sharp/Makefile.in f-spot/glitz-sharp/Makefile.in
--- f-spot~/glitz-sharp/Makefile.in 2008-04-16 22:07:51.000000000 +0100
-+++ f-spot/glitz-sharp/Makefile.in 2008-04-16 22:10:43.000000000 +0100
++++ f-spot/glitz-sharp/Makefile.in 2008-04-16 22:18:19.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -5500,7 +5508,7 @@
$$tags $$unique
diff -urNad f-spot~/glitz-sharp/src/Makefile.in f-spot/glitz-sharp/src/Makefile.in
--- f-spot~/glitz-sharp/src/Makefile.in 2008-04-16 22:07:51.000000000 +0100
-+++ f-spot/glitz-sharp/src/Makefile.in 2008-04-16 22:10:44.000000000 +0100
++++ f-spot/glitz-sharp/src/Makefile.in 2008-04-16 22:18:19.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -5578,7 +5586,7 @@
LINK_TAO = \
diff -urNad f-spot~/gnome-keyring-sharp/Makefile.in f-spot/gnome-keyring-sharp/Makefile.in
--- f-spot~/gnome-keyring-sharp/Makefile.in 2008-04-16 22:07:51.000000000 +0100
-+++ f-spot/gnome-keyring-sharp/Makefile.in 2008-04-16 22:10:44.000000000 +0100
++++ f-spot/gnome-keyring-sharp/Makefile.in 2008-04-16 22:18:19.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -5656,7 +5664,7 @@
LINK_TAO = \
diff -urNad f-spot~/icons/Makefile.in f-spot/icons/Makefile.in
--- f-spot~/icons/Makefile.in 2008-04-16 22:07:51.000000000 +0100
-+++ f-spot/icons/Makefile.in 2008-04-16 22:10:44.000000000 +0100
++++ f-spot/icons/Makefile.in 2008-04-16 22:18:19.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -5733,7 +5741,7 @@
devices,camera-photo-24.png \
diff -urNad f-spot~/intltool-extract.in f-spot/intltool-extract.in
--- f-spot~/intltool-extract.in 2008-04-16 22:07:51.000000000 +0100
-+++ f-spot/intltool-extract.in 2008-04-16 22:10:17.000000000 +0100
++++ f-spot/intltool-extract.in 2008-04-16 22:18:02.000000000 +0100
@@ -32,7 +32,7 @@
## Release information
my $PROGRAM = "intltool-extract";
@@ -5793,7 +5801,7 @@
diff -urNad f-spot~/intltool-merge.in f-spot/intltool-merge.in
--- f-spot~/intltool-merge.in 2008-04-16 22:07:51.000000000 +0100
-+++ f-spot/intltool-merge.in 2008-04-16 22:10:17.000000000 +0100
++++ f-spot/intltool-merge.in 2008-04-16 22:18:02.000000000 +0100
@@ -35,7 +35,7 @@
## Release information
my $PROGRAM = "intltool-merge";
@@ -6106,7 +6114,7 @@
close OUTPUT;
diff -urNad f-spot~/intltool-update.in f-spot/intltool-update.in
--- f-spot~/intltool-update.in 2008-04-16 22:07:51.000000000 +0100
-+++ f-spot/intltool-update.in 2008-04-16 22:10:17.000000000 +0100
++++ f-spot/intltool-update.in 2008-04-16 22:18:02.000000000 +0100
@@ -30,7 +30,7 @@
## Release information
@@ -6366,7 +6374,7 @@
return $keywords;
diff -urNad f-spot~/libeog/Makefile.in f-spot/libeog/Makefile.in
--- f-spot~/libeog/Makefile.in 2008-04-16 22:07:51.000000000 +0100
-+++ f-spot/libeog/Makefile.in 2008-04-16 22:10:44.000000000 +0100
++++ f-spot/libeog/Makefile.in 2008-04-16 22:18:20.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -6518,7 +6526,7 @@
$$tags $$unique
diff -urNad f-spot~/libeog/cursors/Makefile.in f-spot/libeog/cursors/Makefile.in
--- f-spot~/libeog/cursors/Makefile.in 2008-04-16 22:07:51.000000000 +0100
-+++ f-spot/libeog/cursors/Makefile.in 2008-04-16 22:10:44.000000000 +0100
++++ f-spot/libeog/cursors/Makefile.in 2008-04-16 22:18:20.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -6583,7 +6591,7 @@
NUNIT_CFLAGS = @NUNIT_CFLAGS@
diff -urNad f-spot~/libfspot/Makefile.in f-spot/libfspot/Makefile.in
--- f-spot~/libfspot/Makefile.in 2008-04-16 22:07:51.000000000 +0100
-+++ f-spot/libfspot/Makefile.in 2008-04-16 22:10:45.000000000 +0100
++++ f-spot/libfspot/Makefile.in 2008-04-16 22:18:20.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -6733,7 +6741,7 @@
$$tags $$unique
diff -urNad f-spot~/libgphoto2-sharp/Makefile.in f-spot/libgphoto2-sharp/Makefile.in
--- f-spot~/libgphoto2-sharp/Makefile.in 2008-04-16 22:07:51.000000000 +0100
-+++ f-spot/libgphoto2-sharp/Makefile.in 2008-04-16 22:10:45.000000000 +0100
++++ f-spot/libgphoto2-sharp/Makefile.in 2008-04-16 22:18:20.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -6811,7 +6819,7 @@
LINK_TAO = \
diff -urNad f-spot~/libjpegtran/Makefile.in f-spot/libjpegtran/Makefile.in
--- f-spot~/libjpegtran/Makefile.in 2008-04-16 22:07:51.000000000 +0100
-+++ f-spot/libjpegtran/Makefile.in 2008-04-16 22:10:45.000000000 +0100
++++ f-spot/libjpegtran/Makefile.in 2008-04-16 22:18:20.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -6959,7 +6967,7 @@
$$tags $$unique
diff -urNad f-spot~/mono-addins/Makefile.in f-spot/mono-addins/Makefile.in
--- f-spot~/mono-addins/Makefile.in 2008-04-16 22:07:51.000000000 +0100
-+++ f-spot/mono-addins/Makefile.in 2008-04-16 22:10:17.000000000 +0100
++++ f-spot/mono-addins/Makefile.in 2008-04-16 22:18:02.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -7062,7 +7070,7 @@
$$tags $$unique
diff -urNad f-spot~/mono-addins/Mono.Addins/Makefile.in f-spot/mono-addins/Mono.Addins/Makefile.in
--- f-spot~/mono-addins/Mono.Addins/Makefile.in 2008-04-16 22:07:51.000000000 +0100
-+++ f-spot/mono-addins/Mono.Addins/Makefile.in 2008-04-16 22:10:17.000000000 +0100
++++ f-spot/mono-addins/Mono.Addins/Makefile.in 2008-04-16 22:18:02.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -7140,7 +7148,7 @@
LINK_TAO = \
diff -urNad f-spot~/mono-addins/Mono.Addins.Gui/Makefile.in f-spot/mono-addins/Mono.Addins.Gui/Makefile.in
--- f-spot~/mono-addins/Mono.Addins.Gui/Makefile.in 2008-04-16 22:07:51.000000000 +0100
-+++ f-spot/mono-addins/Mono.Addins.Gui/Makefile.in 2008-04-16 22:10:17.000000000 +0100
++++ f-spot/mono-addins/Mono.Addins.Gui/Makefile.in 2008-04-16 22:18:02.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -7218,7 +7226,7 @@
LINK_TAO = \
diff -urNad f-spot~/mono-addins/Mono.Addins.Setup/Makefile.in f-spot/mono-addins/Mono.Addins.Setup/Makefile.in
--- f-spot~/mono-addins/Mono.Addins.Setup/Makefile.in 2008-04-16 22:07:51.000000000 +0100
-+++ f-spot/mono-addins/Mono.Addins.Setup/Makefile.in 2008-04-16 22:10:17.000000000 +0100
++++ f-spot/mono-addins/Mono.Addins.Setup/Makefile.in 2008-04-16 22:18:02.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -7296,7 +7304,7 @@
LINK_TAO = \
diff -urNad f-spot~/po/Makefile.in.in f-spot/po/Makefile.in.in
--- f-spot~/po/Makefile.in.in 2008-04-16 22:07:51.000000000 +0100
-+++ f-spot/po/Makefile.in.in 2008-04-16 22:10:17.000000000 +0100
++++ f-spot/po/Makefile.in.in 2008-04-16 22:18:02.000000000 +0100
@@ -1,10 +1,10 @@
# Makefile for program source directory in GNU NLS utilities package.
# Copyright (C) 1995, 1996, 1997 by Ulrich Drepper <drepper at gnu.ai.mit.edu>
@@ -7331,7 +7339,7 @@
linguas="$(USE_LINGUAS)"; \
diff -urNad f-spot~/semweb/Makefile.in f-spot/semweb/Makefile.in
--- f-spot~/semweb/Makefile.in 2008-04-16 22:07:51.000000000 +0100
-+++ f-spot/semweb/Makefile.in 2008-04-16 22:10:45.000000000 +0100
++++ f-spot/semweb/Makefile.in 2008-04-16 22:18:20.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -7409,7 +7417,7 @@
LINK_TAO = \
diff -urNad f-spot~/src/Makefile.in f-spot/src/Makefile.in
--- f-spot~/src/Makefile.in 2008-04-16 22:07:51.000000000 +0100
-+++ f-spot/src/Makefile.in 2008-04-16 22:10:45.000000000 +0100
++++ f-spot/src/Makefile.in 2008-04-16 22:18:20.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -7564,7 +7572,7 @@
test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
diff -urNad f-spot~/tools/Makefile.in f-spot/tools/Makefile.in
--- f-spot~/tools/Makefile.in 2008-04-16 22:07:51.000000000 +0100
-+++ f-spot/tools/Makefile.in 2008-04-16 22:10:46.000000000 +0100
++++ f-spot/tools/Makefile.in 2008-04-16 22:18:20.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
Modified: packages/f-spot/trunk/debian/patches/debian_link-system-flickrnet.dpatch
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/f-spot/trunk/debian/patches/debian_link-system-flickrnet.dpatch?rev=3908&op=diff
==============================================================================
--- packages/f-spot/trunk/debian/patches/debian_link-system-flickrnet.dpatch (original)
+++ packages/f-spot/trunk/debian/patches/debian_link-system-flickrnet.dpatch Wed Apr 16 21:20:26 2008
@@ -5,9 +5,20 @@
## DP: Link against system flickrnet-2.1.5 rather than bundled f-spot version.
@DPATCH@
+diff -urNad f-spot~/configure.in f-spot/configure.in
+--- f-spot~/configure.in 2008-04-16 22:16:06.000000000 +0100
++++ f-spot/configure.in 2008-04-16 22:16:55.000000000 +0100
+@@ -302,7 +302,6 @@
+ extensions/CDExport/Makefile
+ extensions/DefaultExporters/Makefile
+ extensions/FlickrExport/Makefile
+-extensions/FlickrExport/FlickrNet/Makefile
+ extensions/GalleryExport/Makefile
+ extensions/FolderExport/Makefile
+ extensions/SmugMugExport/SmugMugNet/Makefile
diff -urNad f-spot~/extensions/FlickrExport/Makefile.am f-spot/extensions/FlickrExport/Makefile.am
---- f-spot~/extensions/FlickrExport/Makefile.am 2008-03-09 01:13:46.000000000 +0000
-+++ f-spot/extensions/FlickrExport/Makefile.am 2008-03-09 01:25:30.000000000 +0000
+--- f-spot~/extensions/FlickrExport/Makefile.am 2008-04-16 22:07:51.000000000 +0100
++++ f-spot/extensions/FlickrExport/Makefile.am 2008-04-16 22:16:07.000000000 +0100
@@ -15,16 +15,13 @@
-r:../../src/FSpot.Core.dll \
-r:../../src/FSpot.Utils.dll \
More information about the Pkg-cli-apps-commits
mailing list