Author: diocles-guest
Date: Sun Mar 9 02:29:40 2008
New Revision: 3783
URL: http://svn.debian.org/wsvn/pkg-cli-apps/?sc=1&rev=3783
Log:
Update link_system_libs.dpatch and unlink_nunit.dpatch for bitrot.
Modified:
packages/f-spot/trunk/debian/changelog
packages/f-spot/trunk/debian/patches/link_system_libs.dpatch
packages/f-spot/trunk/debian/patches/unlink_nunit.dpatch
Modified: packages/f-spot/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/f-spot/trunk/debian/changelog?rev=3783&op=diff
==============================================================================
--- packages/f-spot/trunk/debian/changelog (original)
+++ packages/f-spot/trunk/debian/changelog Sun Mar 9 02:29:40 2008
@@ -8,12 +8,15 @@
- Update debian/patches/forward_port_to_flickrnet_2.1.5.dpatch
- New patch debian/patches/link_system_flickrnet.dpatch for changes
to FlickrExport makefiles.
+ + Update patches for bitrot:
+ - debian/patches/unlink_nunit.dpatch
+ - debian/patches/link_system_libs.dpatch
* debian/patches/01_build-system.dpatch,
debian/patches/10_cs-changes.dpatch: Delete unused patches.
* debian/patches/98_autoreconf.dpatch: Move all automake changes from
other patches into single patch, for easier maintenance.
- -- Tim Retout <tim at retout.co.uk> Sun, 09 Mar 2008 01:48:15 +0000
+ -- Tim Retout <tim at retout.co.uk> Sun, 09 Mar 2008 01:56:33 +0000
f-spot (0.4.1-4) unstable; urgency=low
Modified: packages/f-spot/trunk/debian/patches/link_system_libs.dpatch
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/f-spot/trunk/debian/patches/link_system_libs.dpatch?rev=3783&op=diff
==============================================================================
--- packages/f-spot/trunk/debian/patches/link_system_libs.dpatch (original)
+++ packages/f-spot/trunk/debian/patches/link_system_libs.dpatch Sun Mar 9 02:29:40 2008
@@ -2,21 +2,14 @@
## link_system_libs.dpatch by Mirco Bauer <meebey at debian.org>
##
## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
+## DP: Link against system libraries in preference to versions bundled in the
+## DP: f-spot tarball.
@DPATCH@
-diff -urNad f-spot-0.4.1~/Makefile.am f-spot-0.4.1/Makefile.am
---- f-spot-0.4.1~/Makefile.am 2007-12-04 13:19:26.000000000 +0100
-+++ f-spot-0.4.1/Makefile.am 2007-12-11 21:26:25.000000000 +0100
-@@ -2,7 +2,6 @@
- $(DIR_DBUS) \
- $(DIR_DBUS_GLIB)\
- docs \
-- FlickrNet \
- SmugMugNet \
- glitz-sharp \
- google-sharp \
-@@ -14,7 +13,6 @@
+diff -urNad f-spot~/Makefile.am f-spot/Makefile.am
+--- f-spot~/Makefile.am 2008-03-08 21:55:32.000000000 +0000
++++ f-spot/Makefile.am 2008-03-08 22:11:23.000000000 +0000
+@@ -11,7 +11,6 @@
libgphoto2-sharp \
semweb \
Tao \
@@ -24,15 +17,7 @@
tools \
po \
src \
-@@ -24,7 +22,6 @@
- dbus-sharp \
- dbus-sharp-glib \
- docs \
-- FlickrNet \
- SmugMugNet \
- glitz-sharp \
- google-sharp \
-@@ -36,7 +33,6 @@
+@@ -30,7 +29,6 @@
libgphoto2-sharp \
semweb \
Tao \
@@ -40,52 +25,21 @@
tools \
po \
src \
-diff -urNad f-spot-0.4.1~/Makefile.include f-spot-0.4.1/Makefile.include
---- f-spot-0.4.1~/Makefile.include 2007-12-04 13:19:26.000000000 +0100
-+++ f-spot-0.4.1/Makefile.include 2007-12-11 21:25:38.000000000 +0100
-@@ -27,15 +27,15 @@
-
- ## Links
-
--LINK_FLICKR = -r:$(DIR_FLICKR)/FlickrNet.dll
-+LINK_FLICKR = -r:/usr/lib/cli/flickrnet-2.1.5/FlickrNet.dll
+diff -urNad f-spot~/Makefile.include f-spot/Makefile.include
+--- f-spot~/Makefile.include 2008-03-08 21:50:45.000000000 +0000
++++ f-spot/Makefile.include 2008-03-08 22:11:23.000000000 +0000
+@@ -27,10 +27,10 @@
LINK_KEYRING = -r:$(DIR_KEYRING)/gnome-keyring-sharp.dll
LINK_GLITZ = -r:$(DIR_GLITZ)/NDesk.Glitz.dll
- LINK_GOOGLE = -r:$(DIR_GOOGLE)/Mono.Google.dll
LINK_GPHOTO2 = -r:$(DIR_GPHOTO2)/libgphoto2-sharp.dll
- LINK_MONO_ADDINS = \
+-LINK_MONO_ADDINS = \
- -r:$(DIR_ADDINS_ADDINS)/Mono.Addins.dll \
- -r:$(DIR_ADDINS_SETUP)/Mono.Addins.Setup.dll \
- -r:$(DIR_ADDINS_GUI)/Mono.Addins.Gui.dll
-+ $(shell pkg-config --libs mono-addins) \
-+ $(shell pkg-config --libs mono-addins-setup) \
-+ $(shell pkg-config --libs mono-addins-gui)
++LINK_MONO_ADDINS = \
++ -pkg:mono-addins \
++ -pkg:mono-addins-setup \
++ -pkg:mono-addins-gui
LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
- LINK_SMUGMUG = -r:$(DIR_SMUGMUG)/SmugMugNet.dll
LINK_TAO = \
-diff -urNad f-spot-0.4.1~/mono-addins/Mono.Addins.Gui/Makefile.am f-spot-0.4.1/mono-addins/Mono.Addins.Gui/Makefile.am
---- f-spot-0.4.1~/mono-addins/Mono.Addins.Gui/Makefile.am 2007-12-04 13:19:24.000000000 +0100
-+++ f-spot-0.4.1/mono-addins/Mono.Addins.Gui/Makefile.am 2007-12-11 21:25:38.000000000 +0100
-@@ -27,8 +27,8 @@
- REFS = \
- -r:Mono.Posix \
- -r:System \
-- -r:$(DIR_ADDINS_ADDINS)/Mono.Addins.dll \
-- -r:$(DIR_ADDINS_SETUP)/Mono.Addins.Setup.dll
-+ $(shell pkg-config --libs mono-addins) \
-+ $(shell pkg-config --libs mono-addins-setup)
-
- PKGS = \
- -pkg:gnome-sharp-2.0 \
-diff -urNad f-spot-0.4.1~/mono-addins/Mono.Addins.Setup/Makefile.am f-spot-0.4.1/mono-addins/Mono.Addins.Setup/Makefile.am
---- f-spot-0.4.1~/mono-addins/Mono.Addins.Setup/Makefile.am 2007-12-04 13:19:23.000000000 +0100
-+++ f-spot-0.4.1/mono-addins/Mono.Addins.Setup/Makefile.am 2007-12-11 21:25:38.000000000 +0100
-@@ -38,7 +38,7 @@
- -r:Mono.Posix \
- -r:System \
- -r:System.Xml \
-- -r:$(DIR_ADDINS_ADDINS)/Mono.Addins.dll
-+ $(shell pkg-config --libs mono-addins)
-
- PKGS =
-
+ -r:$(DIR_TAO_OPENGL)/Tao.OpenGl.dll \
Modified: packages/f-spot/trunk/debian/patches/unlink_nunit.dpatch
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/f-spot/trunk/debian/patches/unlink_nunit.dpatch?rev=3783&op=diff
==============================================================================
--- packages/f-spot/trunk/debian/patches/unlink_nunit.dpatch (original)
+++ packages/f-spot/trunk/debian/patches/unlink_nunit.dpatch Sun Mar 9 02:29:40 2008
@@ -5,21 +5,29 @@
## DP: No description.
@DPATCH@
-diff -urNad f-spot-0.4.1~/src/Makefile.am f-spot-0.4.1/src/Makefile.am
---- f-spot-0.4.1~/src/Makefile.am 2007-12-04 13:19:18.000000000 +0100
-+++ f-spot-0.4.1/src/Makefile.am 2008-01-01 17:38:29.000000000 +0100
+diff -urNad f-spot~/src/Makefile.am f-spot/src/Makefile.am
+--- f-spot~/src/Makefile.am 2008-03-08 17:24:56.000000000 +0000
++++ f-spot/src/Makefile.am 2008-03-08 22:24:44.000000000 +0000
@@ -1,5 +1,5 @@
include $(top_srcdir)/Makefile.include
-EXTRAFLAGS = -unsafe -nowarn:0169 -nowarn:0612 -nowarn:0414 -d:TEST_METADATA -d:BROKEN_RSVG $(NUNIT_DEFINES) $(BEAGLE_DEFINES) $(CSC_DEFINES)
+EXTRAFLAGS = -unsafe -nowarn:0169 -nowarn:0612 -nowarn:0414 -d:TEST_METADATA -d:BROKEN_RSVG $(BEAGLE_DEFINES) $(CSC_DEFINES)
- F_SPOT_CSDISTFILES = \
- $(srcdir)/Cairo/Antialias.cs \
-@@ -254,7 +254,6 @@
- -r:Mono.Posix \
- -r:Mono.Security \
- -r:ICSharpCode.SharpZipLib \
+ CMS_CSDISTFILES = \
+ $(srcdir)/Cms/Cms.cs \
+@@ -270,7 +270,6 @@
+ endif
+
+ CMS_ASSEMBLIES = \
- $(NUNIT_PKG) \
- -pkg:gtkhtml-sharp-2.0 \
+ -pkg:gtk-sharp-2.0
+
+ CORE_ASSEMBLIES = \
+@@ -312,7 +311,6 @@
+ -r:FSpot.Query.dll \
+ -r:FSpot.Utils.dll \
+ -r:Cms.dll \
+- $(NUNIT_PKG) \
+ $(GCONF_PKG) \
+ $(GTKHTML_SHARP_PKG) \
-pkg:glade-sharp-2.0 \
- -pkg:gnome-vfs-sharp-2.0 \