[Pkg-cli-apps-commits] r3827 - in /packages/f-spot/trunk/debian: changelog patches/00list patches/98_autoreconf.dpatch patches/fix_gnome-sharp_typo.dpatch
diocles-guest at users.alioth.debian.org
diocles-guest at users.alioth.debian.org
Thu Mar 20 18:15:04 UTC 2008
Author: diocles-guest
Date: Thu Mar 20 18:15:04 2008
New Revision: 3827
URL: http://svn.debian.org/wsvn/pkg-cli-apps/?sc=1&rev=3827
Log:
debian/patches/fix_gnome-sharp_typo.dpatch: Fix for typo in configure.in.
Added:
packages/f-spot/trunk/debian/patches/fix_gnome-sharp_typo.dpatch (with props)
Modified:
packages/f-spot/trunk/debian/changelog
packages/f-spot/trunk/debian/patches/00list
packages/f-spot/trunk/debian/patches/98_autoreconf.dpatch
Modified: packages/f-spot/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/f-spot/trunk/debian/changelog?rev=3827&op=diff
==============================================================================
--- packages/f-spot/trunk/debian/changelog (original)
+++ packages/f-spot/trunk/debian/changelog Thu Mar 20 18:15:04 2008
@@ -27,12 +27,14 @@
+ debian/patches/fix_v8_db_update.dpatch:
- Fix from upstream stable SVN branch for updating from v7 to v8 of the
f-spot photo database.
+ + debian/patches/fix_gnome-sharp_typo.dpatch:
+ - Fix from upstream SVN for typo in configure.in.
+ debian/patches/98_autoreconf.dpatch:
- Move all generated changes from other patches into single patch,
for easier maintenance.
* debian/control: Recommend dbus-x11. (Closes: #459272)
- -- Tim Retout <tim at retout.co.uk> Sat, 15 Mar 2008 15:15:05 +0000
+ -- Tim Retout <tim at retout.co.uk> Thu, 20 Mar 2008 18:00:49 +0000
f-spot (0.4.1-4) unstable; urgency=low
Modified: packages/f-spot/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/f-spot/trunk/debian/patches/00list?rev=3827&op=diff
==============================================================================
--- packages/f-spot/trunk/debian/patches/00list (original)
+++ packages/f-spot/trunk/debian/patches/00list Thu Mar 20 18:15:04 2008
@@ -14,6 +14,9 @@
# Bugfix for deleting >1000 photos (#462798)
fix_deleting_1000_photos
+# Bugfix for gnome-sharp typo in configure.in
+fix_gnome-sharp_typo
+
# Bugfix for build breakage.
fix_gallery_extension_install_hook
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=3827&op=diff
==============================================================================
--- packages/f-spot/trunk/debian/patches/98_autoreconf.dpatch (original)
+++ packages/f-spot/trunk/debian/patches/98_autoreconf.dpatch Thu Mar 20 18:15:04 2008
@@ -6,8 +6,8 @@
@DPATCH@
diff -urNad f-spot~/Makefile.in f-spot/Makefile.in
---- f-spot~/Makefile.in 2008-03-09 11:12:45.000000000 +0000
-+++ f-spot/Makefile.in 2008-03-09 11:25:05.000000000 +0000
+--- f-spot~/Makefile.in 2008-03-15 15:00:06.000000000 +0000
++++ f-spot/Makefile.in 2008-03-20 17:58:50.000000000 +0000
@@ -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.
@@ -164,8 +164,8 @@
dvi-am html html-am info info-am install \
install-ApplicationsDATA install-am install-data \
diff -urNad f-spot~/Tao/Makefile.in f-spot/Tao/Makefile.in
---- f-spot~/Tao/Makefile.in 2008-03-09 11:12:45.000000000 +0000
-+++ f-spot/Tao/Makefile.in 2008-03-09 11:25:00.000000000 +0000
+--- f-spot~/Tao/Makefile.in 2008-03-15 15:00:06.000000000 +0000
++++ f-spot/Tao/Makefile.in 2008-03-20 17:58:50.000000000 +0000
@@ -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.
@@ -267,8 +267,8 @@
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$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-03-09 11:12:45.000000000 +0000
-+++ f-spot/Tao/Tao.GlPostProcess/Makefile.in 2008-03-09 11:25:00.000000000 +0000
+--- f-spot~/Tao/Tao.GlPostProcess/Makefile.in 2008-03-15 15:00:06.000000000 +0000
++++ f-spot/Tao/Tao.GlPostProcess/Makefile.in 2008-03-20 17:58:50.000000000 +0000
@@ -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.
@@ -345,8 +345,8 @@
LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
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-03-09 11:12:45.000000000 +0000
-+++ f-spot/Tao/Tao.OpenGl/Makefile.in 2008-03-09 11:25:00.000000000 +0000
+--- f-spot~/Tao/Tao.OpenGl/Makefile.in 2008-03-15 15:00:06.000000000 +0000
++++ f-spot/Tao/Tao.OpenGl/Makefile.in 2008-03-20 17:58:50.000000000 +0000
@@ -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.
@@ -423,8 +423,8 @@
LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
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-03-09 11:12:45.000000000 +0000
-+++ f-spot/Tao/Tao.OpenGl.ExtensionLoader/Makefile.in 2008-03-09 11:25:00.000000000 +0000
+--- f-spot~/Tao/Tao.OpenGl.ExtensionLoader/Makefile.in 2008-03-15 15:00:06.000000000 +0000
++++ f-spot/Tao/Tao.OpenGl.ExtensionLoader/Makefile.in 2008-03-20 17:58:50.000000000 +0000
@@ -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.
@@ -501,8 +501,8 @@
LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
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-03-09 11:12:45.000000000 +0000
-+++ f-spot/Tao/Tao.OpenGl.Glu/Makefile.in 2008-03-09 11:25:00.000000000 +0000
+--- f-spot~/Tao/Tao.OpenGl.Glu/Makefile.in 2008-03-15 15:00:06.000000000 +0000
++++ f-spot/Tao/Tao.OpenGl.Glu/Makefile.in 2008-03-20 17:58:50.000000000 +0000
@@ -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.
@@ -579,8 +579,8 @@
LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
LINK_TAO = \
diff -urNad f-spot~/aclocal.m4 f-spot/aclocal.m4
---- f-spot~/aclocal.m4 2008-03-09 11:12:45.000000000 +0000
-+++ f-spot/aclocal.m4 2008-03-09 11:24:55.000000000 +0000
+--- f-spot~/aclocal.m4 2008-03-15 15:00:06.000000000 +0000
++++ f-spot/aclocal.m4 2008-03-20 17:58:50.000000000 +0000
@@ -1,7 +1,7 @@
-# generated automatically by aclocal 1.10 -*- Autoconf -*-
+# generated automatically by aclocal 1.10.1 -*- Autoconf -*-
@@ -1439,8 +1439,8 @@
AC_DEFUN([_AM_SUBST_NOTMAKE])
diff -urNad f-spot~/configure f-spot/configure
---- f-spot~/configure 2008-03-09 11:12:45.000000000 +0000
-+++ f-spot/configure 2008-03-09 11:24:59.000000000 +0000
+--- f-spot~/configure 2008-03-15 15:00:06.000000000 +0000
++++ f-spot/configure 2008-03-20 17:59:01.000000000 +0000
@@ -847,14 +847,14 @@
INTLTOOL_SCHEMAS_RULE
INTLTOOL_THEME_RULE
@@ -3535,6 +3535,15 @@
See \`config.log' for more details." >&2;}
{ (exit 1); exit 1; }; }
else
+@@ -21928,7 +22333,7 @@
+ echo "${ECHO_T}yes" >&6; }
+ :
+ fi
+-if pkg-config --atleast-version=2.19.90 gnome-sharp; then
++if pkg-config --atleast-version=2.19.90 gnome-sharp-2.0; then
+
+ pkg_failed=no
+ { echo "$as_me:$LINENO: checking for GTKHTML_SHARP" >&5
@@ -22020,7 +22425,7 @@
and GTKHTML_SHARP_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -3813,8 +3822,8 @@
< ${ac_aux_dir}/${file}.in > ${file}.out
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-03-09 11:12:45.000000000 +0000
-+++ f-spot/dbus-sharp/Makefile.in 2008-03-09 11:25:01.000000000 +0000
+--- f-spot~/dbus-sharp/Makefile.in 2008-03-15 15:00:06.000000000 +0000
++++ f-spot/dbus-sharp/Makefile.in 2008-03-20 17:58:50.000000000 +0000
@@ -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.
@@ -3891,8 +3900,8 @@
LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
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-03-09 11:12:45.000000000 +0000
-+++ f-spot/dbus-sharp-glib/Makefile.in 2008-03-09 11:25:00.000000000 +0000
+--- f-spot~/dbus-sharp-glib/Makefile.in 2008-03-15 15:00:06.000000000 +0000
++++ f-spot/dbus-sharp-glib/Makefile.in 2008-03-20 17:58:50.000000000 +0000
@@ -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.
@@ -3969,8 +3978,8 @@
LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
LINK_TAO = \
diff -urNad f-spot~/docs/Makefile.in f-spot/docs/Makefile.in
---- f-spot~/docs/Makefile.in 2008-03-09 11:12:45.000000000 +0000
-+++ f-spot/docs/Makefile.in 2008-03-09 11:25:01.000000000 +0000
+--- f-spot~/docs/Makefile.in 2008-03-15 15:00:06.000000000 +0000
++++ f-spot/docs/Makefile.in 2008-03-20 17:58:50.000000000 +0000
@@ -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.
@@ -4034,8 +4043,8 @@
NUNIT22_LIBS = @NUNIT22_LIBS@
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-03-09 11:12:45.000000000 +0000
-+++ f-spot/extensions/CDExport/Makefile.in 2008-03-09 11:25:01.000000000 +0000
+--- f-spot~/extensions/CDExport/Makefile.in 2008-03-15 15:00:06.000000000 +0000
++++ f-spot/extensions/CDExport/Makefile.in 2008-03-20 17:58:50.000000000 +0000
@@ -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.
@@ -4112,8 +4121,8 @@
LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
LINK_TAO = \
diff -urNad f-spot~/extensions/DefaultExporters/Makefile.in f-spot/extensions/DefaultExporters/Makefile.in
---- f-spot~/extensions/DefaultExporters/Makefile.in 2008-03-09 11:12:45.000000000 +0000
-+++ f-spot/extensions/DefaultExporters/Makefile.in 2008-03-09 11:25:01.000000000 +0000
+--- f-spot~/extensions/DefaultExporters/Makefile.in 2008-03-15 15:00:06.000000000 +0000
++++ f-spot/extensions/DefaultExporters/Makefile.in 2008-03-20 17:58:50.000000000 +0000
@@ -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.
@@ -4190,8 +4199,8 @@
LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
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-03-09 11:12:45.000000000 +0000
-+++ f-spot/extensions/FlickrExport/FlickrNet/Makefile.in 2008-03-09 11:25:01.000000000 +0000
+--- f-spot~/extensions/FlickrExport/FlickrNet/Makefile.in 2008-03-15 15:00:06.000000000 +0000
++++ f-spot/extensions/FlickrExport/FlickrNet/Makefile.in 2008-03-20 17:58:50.000000000 +0000
@@ -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.
@@ -4268,8 +4277,8 @@
LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
LINK_TAO = \
diff -urNad f-spot~/extensions/FlickrExport/Makefile.in f-spot/extensions/FlickrExport/Makefile.in
---- f-spot~/extensions/FlickrExport/Makefile.in 2008-03-09 11:12:45.000000000 +0000
-+++ f-spot/extensions/FlickrExport/Makefile.in 2008-03-09 11:25:01.000000000 +0000
+--- f-spot~/extensions/FlickrExport/Makefile.in 2008-03-15 15:00:06.000000000 +0000
++++ f-spot/extensions/FlickrExport/Makefile.in 2008-03-20 17:58:50.000000000 +0000
@@ -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.
@@ -4693,8 +4702,8 @@
all: $(PLUGIN_ASSEMBLY)
diff -urNad f-spot~/extensions/FolderExport/Makefile.in f-spot/extensions/FolderExport/Makefile.in
---- f-spot~/extensions/FolderExport/Makefile.in 2008-03-09 11:12:45.000000000 +0000
-+++ f-spot/extensions/FolderExport/Makefile.in 2008-03-09 11:25:02.000000000 +0000
+--- f-spot~/extensions/FolderExport/Makefile.in 2008-03-15 15:00:06.000000000 +0000
++++ f-spot/extensions/FolderExport/Makefile.in 2008-03-20 17:58:50.000000000 +0000
@@ -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.
@@ -4771,8 +4780,8 @@
LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
LINK_TAO = \
diff -urNad f-spot~/extensions/GalleryExport/Makefile.in f-spot/extensions/GalleryExport/Makefile.in
---- f-spot~/extensions/GalleryExport/Makefile.in 2008-03-09 11:12:45.000000000 +0000
-+++ f-spot/extensions/GalleryExport/Makefile.in 2008-03-09 11:25:02.000000000 +0000
+--- f-spot~/extensions/GalleryExport/Makefile.in 2008-03-15 15:00:06.000000000 +0000
++++ f-spot/extensions/GalleryExport/Makefile.in 2008-03-20 17:58:50.000000000 +0000
@@ -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.
@@ -4858,8 +4867,8 @@
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
diff -urNad f-spot~/extensions/Makefile.in f-spot/extensions/Makefile.in
---- f-spot~/extensions/Makefile.in 2008-03-09 11:12:45.000000000 +0000
-+++ f-spot/extensions/Makefile.in 2008-03-09 11:25:02.000000000 +0000
+--- f-spot~/extensions/Makefile.in 2008-03-15 15:00:06.000000000 +0000
++++ f-spot/extensions/Makefile.in 2008-03-20 17:58:50.000000000 +0000
@@ -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.
@@ -4961,8 +4970,8 @@
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
diff -urNad f-spot~/extensions/PicasaWebExport/Makefile.in f-spot/extensions/PicasaWebExport/Makefile.in
---- f-spot~/extensions/PicasaWebExport/Makefile.in 2008-03-09 11:12:45.000000000 +0000
-+++ f-spot/extensions/PicasaWebExport/Makefile.in 2008-03-09 11:25:02.000000000 +0000
+--- f-spot~/extensions/PicasaWebExport/Makefile.in 2008-03-15 15:00:06.000000000 +0000
++++ f-spot/extensions/PicasaWebExport/Makefile.in 2008-03-20 17:58:50.000000000 +0000
@@ -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.
@@ -5077,8 +5086,8 @@
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$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-03-09 11:12:45.000000000 +0000
-+++ f-spot/extensions/PicasaWebExport/google-sharp/Makefile.in 2008-03-09 11:25:02.000000000 +0000
+--- f-spot~/extensions/PicasaWebExport/google-sharp/Makefile.in 2008-03-15 15:00:06.000000000 +0000
++++ f-spot/extensions/PicasaWebExport/google-sharp/Makefile.in 2008-03-20 17:58:50.000000000 +0000
@@ -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.
@@ -5155,8 +5164,8 @@
LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
LINK_TAO = \
diff -urNad f-spot~/extensions/SmugMugExport/Makefile.in f-spot/extensions/SmugMugExport/Makefile.in
---- f-spot~/extensions/SmugMugExport/Makefile.in 2008-03-09 11:12:45.000000000 +0000
-+++ f-spot/extensions/SmugMugExport/Makefile.in 2008-03-09 11:25:02.000000000 +0000
+--- f-spot~/extensions/SmugMugExport/Makefile.in 2008-03-15 15:00:06.000000000 +0000
++++ f-spot/extensions/SmugMugExport/Makefile.in 2008-03-20 17:58:50.000000000 +0000
@@ -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.
@@ -5271,8 +5280,8 @@
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$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-03-09 11:12:45.000000000 +0000
-+++ f-spot/extensions/SmugMugExport/SmugMugNet/Makefile.in 2008-03-09 11:25:02.000000000 +0000
+--- f-spot~/extensions/SmugMugExport/SmugMugNet/Makefile.in 2008-03-15 15:00:06.000000000 +0000
++++ f-spot/extensions/SmugMugExport/SmugMugNet/Makefile.in 2008-03-20 17:58:50.000000000 +0000
@@ -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.
@@ -5349,8 +5358,8 @@
LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
LINK_TAO = \
diff -urNad f-spot~/glitz-sharp/Makefile.in f-spot/glitz-sharp/Makefile.in
---- f-spot~/glitz-sharp/Makefile.in 2008-03-09 11:12:45.000000000 +0000
-+++ f-spot/glitz-sharp/Makefile.in 2008-03-09 11:25:03.000000000 +0000
+--- f-spot~/glitz-sharp/Makefile.in 2008-03-15 15:00:06.000000000 +0000
++++ f-spot/glitz-sharp/Makefile.in 2008-03-20 17:58:50.000000000 +0000
@@ -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.
@@ -5452,8 +5461,8 @@
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$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-03-09 11:12:45.000000000 +0000
-+++ f-spot/glitz-sharp/src/Makefile.in 2008-03-09 11:25:03.000000000 +0000
+--- f-spot~/glitz-sharp/src/Makefile.in 2008-03-15 15:00:06.000000000 +0000
++++ f-spot/glitz-sharp/src/Makefile.in 2008-03-20 17:58:50.000000000 +0000
@@ -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.
@@ -5530,8 +5539,8 @@
LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
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-03-09 11:12:45.000000000 +0000
-+++ f-spot/gnome-keyring-sharp/Makefile.in 2008-03-09 11:25:03.000000000 +0000
+--- f-spot~/gnome-keyring-sharp/Makefile.in 2008-03-15 15:00:06.000000000 +0000
++++ f-spot/gnome-keyring-sharp/Makefile.in 2008-03-20 17:58:50.000000000 +0000
@@ -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.
@@ -5608,8 +5617,8 @@
LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
LINK_TAO = \
diff -urNad f-spot~/icons/Makefile.in f-spot/icons/Makefile.in
---- f-spot~/icons/Makefile.in 2008-03-09 11:12:45.000000000 +0000
-+++ f-spot/icons/Makefile.in 2008-03-09 11:25:03.000000000 +0000
+--- f-spot~/icons/Makefile.in 2008-03-15 15:00:06.000000000 +0000
++++ f-spot/icons/Makefile.in 2008-03-20 17:58:50.000000000 +0000
@@ -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.
@@ -5685,8 +5694,8 @@
devices,camera-photo-22.png \
devices,camera-photo-24.png \
diff -urNad f-spot~/intltool-extract.in f-spot/intltool-extract.in
---- f-spot~/intltool-extract.in 2008-03-09 11:12:45.000000000 +0000
-+++ f-spot/intltool-extract.in 2008-03-09 11:24:39.000000000 +0000
+--- f-spot~/intltool-extract.in 2008-03-15 15:00:06.000000000 +0000
++++ f-spot/intltool-extract.in 2008-03-20 17:58:50.000000000 +0000
@@ -32,7 +32,7 @@
## Release information
my $PROGRAM = "intltool-extract";
@@ -5745,8 +5754,8 @@
### For translatable Glade XML files ###
diff -urNad f-spot~/intltool-merge.in f-spot/intltool-merge.in
---- f-spot~/intltool-merge.in 2008-03-09 11:12:45.000000000 +0000
-+++ f-spot/intltool-merge.in 2008-03-09 11:24:39.000000000 +0000
+--- f-spot~/intltool-merge.in 2008-03-15 15:00:06.000000000 +0000
++++ f-spot/intltool-merge.in 2008-03-20 17:58:50.000000000 +0000
@@ -35,7 +35,7 @@
## Release information
my $PROGRAM = "intltool-merge";
@@ -6058,8 +6067,8 @@
}
close OUTPUT;
diff -urNad f-spot~/intltool-update.in f-spot/intltool-update.in
---- f-spot~/intltool-update.in 2008-03-09 11:12:45.000000000 +0000
-+++ f-spot/intltool-update.in 2008-03-09 11:24:39.000000000 +0000
+--- f-spot~/intltool-update.in 2008-03-15 15:00:06.000000000 +0000
++++ f-spot/intltool-update.in 2008-03-20 17:58:50.000000000 +0000
@@ -30,7 +30,7 @@
## Release information
@@ -6318,8 +6327,8 @@
return $keywords;
diff -urNad f-spot~/libeog/Makefile.in f-spot/libeog/Makefile.in
---- f-spot~/libeog/Makefile.in 2008-03-09 11:12:45.000000000 +0000
-+++ f-spot/libeog/Makefile.in 2008-03-09 11:25:03.000000000 +0000
+--- f-spot~/libeog/Makefile.in 2008-03-15 15:00:06.000000000 +0000
++++ f-spot/libeog/Makefile.in 2008-03-20 17:58:50.000000000 +0000
@@ -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.
@@ -6470,8 +6479,8 @@
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
diff -urNad f-spot~/libeog/cursors/Makefile.in f-spot/libeog/cursors/Makefile.in
---- f-spot~/libeog/cursors/Makefile.in 2008-03-09 11:12:45.000000000 +0000
-+++ f-spot/libeog/cursors/Makefile.in 2008-03-09 11:25:03.000000000 +0000
+--- f-spot~/libeog/cursors/Makefile.in 2008-03-15 15:00:06.000000000 +0000
++++ f-spot/libeog/cursors/Makefile.in 2008-03-20 17:58:50.000000000 +0000
@@ -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.
@@ -6535,8 +6544,8 @@
NUNIT22_LIBS = @NUNIT22_LIBS@
NUNIT_CFLAGS = @NUNIT_CFLAGS@
diff -urNad f-spot~/libfspot/Makefile.in f-spot/libfspot/Makefile.in
---- f-spot~/libfspot/Makefile.in 2008-03-09 11:12:45.000000000 +0000
-+++ f-spot/libfspot/Makefile.in 2008-03-09 11:25:03.000000000 +0000
+--- f-spot~/libfspot/Makefile.in 2008-03-15 15:00:06.000000000 +0000
++++ f-spot/libfspot/Makefile.in 2008-03-20 17:58:50.000000000 +0000
@@ -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.
@@ -6685,8 +6694,8 @@
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
diff -urNad f-spot~/libgphoto2-sharp/Makefile.in f-spot/libgphoto2-sharp/Makefile.in
---- f-spot~/libgphoto2-sharp/Makefile.in 2008-03-09 11:12:45.000000000 +0000
-+++ f-spot/libgphoto2-sharp/Makefile.in 2008-03-09 11:25:04.000000000 +0000
+--- f-spot~/libgphoto2-sharp/Makefile.in 2008-03-15 15:00:06.000000000 +0000
++++ f-spot/libgphoto2-sharp/Makefile.in 2008-03-20 17:58:50.000000000 +0000
@@ -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.
@@ -6763,8 +6772,8 @@
LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
LINK_TAO = \
diff -urNad f-spot~/libjpegtran/Makefile.in f-spot/libjpegtran/Makefile.in
---- f-spot~/libjpegtran/Makefile.in 2008-03-09 11:12:45.000000000 +0000
-+++ f-spot/libjpegtran/Makefile.in 2008-03-09 11:25:04.000000000 +0000
+--- f-spot~/libjpegtran/Makefile.in 2008-03-15 15:00:06.000000000 +0000
++++ f-spot/libjpegtran/Makefile.in 2008-03-20 17:58:50.000000000 +0000
@@ -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.
@@ -6911,8 +6920,8 @@
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
diff -urNad f-spot~/mono-addins/Makefile.in f-spot/mono-addins/Makefile.in
---- f-spot~/mono-addins/Makefile.in 2008-03-09 11:12:45.000000000 +0000
-+++ f-spot/mono-addins/Makefile.in 2008-03-09 11:25:04.000000000 +0000
+--- f-spot~/mono-addins/Makefile.in 2008-03-15 15:00:06.000000000 +0000
++++ f-spot/mono-addins/Makefile.in 2008-03-20 17:58:50.000000000 +0000
@@ -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.
@@ -7014,8 +7023,8 @@
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$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-03-09 11:12:45.000000000 +0000
-+++ f-spot/mono-addins/Mono.Addins/Makefile.in 2008-03-09 11:25:04.000000000 +0000
+--- f-spot~/mono-addins/Mono.Addins/Makefile.in 2008-03-15 15:00:06.000000000 +0000
++++ f-spot/mono-addins/Mono.Addins/Makefile.in 2008-03-20 17:58:50.000000000 +0000
@@ -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.
@@ -7092,8 +7101,8 @@
LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
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-03-09 11:12:45.000000000 +0000
-+++ f-spot/mono-addins/Mono.Addins.Gui/Makefile.in 2008-03-09 11:25:04.000000000 +0000
+--- f-spot~/mono-addins/Mono.Addins.Gui/Makefile.in 2008-03-15 15:00:06.000000000 +0000
++++ f-spot/mono-addins/Mono.Addins.Gui/Makefile.in 2008-03-20 17:58:50.000000000 +0000
@@ -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.
@@ -7170,8 +7179,8 @@
LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
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-03-09 11:12:45.000000000 +0000
-+++ f-spot/mono-addins/Mono.Addins.Setup/Makefile.in 2008-03-09 11:25:04.000000000 +0000
+--- f-spot~/mono-addins/Mono.Addins.Setup/Makefile.in 2008-03-15 15:00:06.000000000 +0000
++++ f-spot/mono-addins/Mono.Addins.Setup/Makefile.in 2008-03-20 17:58:50.000000000 +0000
@@ -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.
@@ -7248,8 +7257,8 @@
LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
LINK_TAO = \
diff -urNad f-spot~/po/Makefile.in.in f-spot/po/Makefile.in.in
---- f-spot~/po/Makefile.in.in 2008-03-09 11:12:45.000000000 +0000
-+++ f-spot/po/Makefile.in.in 2008-03-09 11:24:39.000000000 +0000
+--- f-spot~/po/Makefile.in.in 2008-03-15 15:00:06.000000000 +0000
++++ f-spot/po/Makefile.in.in 2008-03-20 17:58:50.000000000 +0000
@@ -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>
@@ -7283,8 +7292,8 @@
uninstall:
linguas="$(USE_LINGUAS)"; \
diff -urNad f-spot~/semweb/Makefile.in f-spot/semweb/Makefile.in
---- f-spot~/semweb/Makefile.in 2008-03-09 11:12:45.000000000 +0000
-+++ f-spot/semweb/Makefile.in 2008-03-09 11:25:05.000000000 +0000
+--- f-spot~/semweb/Makefile.in 2008-03-15 15:00:06.000000000 +0000
++++ f-spot/semweb/Makefile.in 2008-03-20 17:58:50.000000000 +0000
@@ -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.
@@ -7361,8 +7370,8 @@
LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
LINK_TAO = \
diff -urNad f-spot~/src/Makefile.in f-spot/src/Makefile.in
---- f-spot~/src/Makefile.in 2008-03-09 11:12:45.000000000 +0000
-+++ f-spot/src/Makefile.in 2008-03-09 11:25:05.000000000 +0000
+--- f-spot~/src/Makefile.in 2008-03-15 15:00:06.000000000 +0000
++++ f-spot/src/Makefile.in 2008-03-20 17:58:50.000000000 +0000
@@ -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.
@@ -7516,8 +7525,8 @@
@$(NORMAL_INSTALL)
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-03-09 11:12:45.000000000 +0000
-+++ f-spot/tools/Makefile.in 2008-03-09 11:25:05.000000000 +0000
+--- f-spot~/tools/Makefile.in 2008-03-15 15:00:06.000000000 +0000
++++ f-spot/tools/Makefile.in 2008-03-20 17:58:50.000000000 +0000
@@ -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.
Added: packages/f-spot/trunk/debian/patches/fix_gnome-sharp_typo.dpatch
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/f-spot/trunk/debian/patches/fix_gnome-sharp_typo.dpatch?rev=3827&op=file
==============================================================================
--- packages/f-spot/trunk/debian/patches/fix_gnome-sharp_typo.dpatch (added)
+++ packages/f-spot/trunk/debian/patches/fix_gnome-sharp_typo.dpatch Thu Mar 20 18:15:04 2008
@@ -1,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## fix_gnome-sharp_typo.dpatch by Tim Retout <tim at retout.co.uk>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fix from upsteam SVN r3766 for typo in configure.in.
+
+ at DPATCH@
+diff -urNad f-spot~/configure.in f-spot/configure.in
+--- f-spot~/configure.in 2008-03-15 15:00:06.000000000 +0000
++++ f-spot/configure.in 2008-03-20 17:52:45.000000000 +0000
+@@ -74,7 +74,7 @@
+ AC_SUBST(F_LIBS)
+
+ PKG_CHECK_MODULES(GNOME_SHARP, gnome-sharp-2.0 >= 2.8)
+-if pkg-config --atleast-version=2.19.90 gnome-sharp; then
++if pkg-config --atleast-version=2.19.90 gnome-sharp-2.0; then
+ PKG_CHECK_MODULES(GTKHTML_SHARP, gtkhtml-sharp-3.14 >= 2.19.90)
+ GTKHTML_SHARP_PKG="-pkg:gtkhtml-sharp-3.14"
+ else
Propchange: packages/f-spot/trunk/debian/patches/fix_gnome-sharp_typo.dpatch
------------------------------------------------------------------------------
svn:executable = *
More information about the Pkg-cli-apps-commits
mailing list