[Pkg-cli-apps-commits] r4906 - in /packages/gnome-do-plugins/trunk/debian: changelog control patches/00_dfsg_autofoo.dpatch patches/00_use_system_gdata.dpatch patches/00list

laney-guest at users.alioth.debian.org laney-guest at users.alioth.debian.org
Thu May 7 19:44:50 UTC 2009 

Author: laney-guest
Date: Thu May  7 19:44:50 2009
New Revision: 4906

URL: http://svn.debian.org/wsvn/pkg-cli-apps/?sc=1&rev=4906
Log:
* debian/patches/00_use_system_gdata.dpatch: Patch build system to use
  system copy of gdata libs, allowing Google plugins to be enabled.
* debian/patches/00_dfsg_autofoo.dpatch: Drop, now obsolete.
* debian/control: Add libgdata1.4-cil build-dep for above.

Added:
    packages/gnome-do-plugins/trunk/debian/patches/00_use_system_gdata.dpatch   (with props)
Removed:
    packages/gnome-do-plugins/trunk/debian/patches/00_dfsg_autofoo.dpatch
Modified:
    packages/gnome-do-plugins/trunk/debian/changelog
    packages/gnome-do-plugins/trunk/debian/control
    packages/gnome-do-plugins/trunk/debian/patches/00list

Modified: packages/gnome-do-plugins/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/gnome-do-plugins/trunk/debian/changelog?rev=4906&op=diff
==============================================================================
--- packages/gnome-do-plugins/trunk/debian/changelog (original)
+++ packages/gnome-do-plugins/trunk/debian/changelog Thu May  7 19:44:50 2009
@@ -1,3 +1,12 @@
+gnome-do-plugins (0.8.1.3+dfsg-2) UNRELEASED; urgency=low
+
+  * debian/patches/00_use_system_gdata.dpatch: Patch build system to use
+    system copy of gdata libs, allowing Google plugins to be enabled.
+  * debian/patches/00_dfsg_autofoo.dpatch: Drop, now obsolete.
+  * debian/control: Add libgdata1.4-cil build-dep for above.
+
+ -- Iain Lane <laney at ubuntu.com>  Thu, 07 May 2009 19:27:22 +0100
+
 gnome-do-plugins (0.8.1.3+dfsg-1) unstable; urgency=low
 
   [ Daniel T Chen ]

Modified: packages/gnome-do-plugins/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/gnome-do-plugins/trunk/debian/control?rev=4906&op=diff
==============================================================================
--- packages/gnome-do-plugins/trunk/debian/control (original)
+++ packages/gnome-do-plugins/trunk/debian/control Thu May  7 19:44:50 2009
@@ -34,7 +34,8 @@
   libwnck2.20-cil,
   libmono-sqlite2.0-cil,
   libmono-system-data2.0-cil,
-  libmono-system-web2.0-cil
+  libmono-system-web2.0-cil,
+  libgdata1.4-cil
 Standards-Version: 3.8.0
 Homepage: http://do.davebsd.com
 Vcs-Svn: svn://svn.debian.org/svn/pkg-cli-apps/packages/gnome-do-plugins/trunk

Added: packages/gnome-do-plugins/trunk/debian/patches/00_use_system_gdata.dpatch
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/gnome-do-plugins/trunk/debian/patches/00_use_system_gdata.dpatch?rev=4906&op=file
==============================================================================
--- packages/gnome-do-plugins/trunk/debian/patches/00_use_system_gdata.dpatch (added)
+++ packages/gnome-do-plugins/trunk/debian/patches/00_use_system_gdata.dpatch Thu May  7 19:44:50 2009
@@ -1,0 +1,144 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 00_use_system_gdata.dpatch by Iain Lane <laney at ubuntu.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Patch build system to not use bundled copy of gdata library, but to use
+## DP: from the system instead. Allows Google plugins to be built on Debian.
+
+ at DPATCH@
+diff -urNad gnome-do-plugins-0.8.1.3+dfsg~/BundledLibraries/Makefile.am gnome-do-plugins-0.8.1.3+dfsg/BundledLibraries/Makefile.am
+--- gnome-do-plugins-0.8.1.3+dfsg~/BundledLibraries/Makefile.am	2009-03-17 18:53:30.000000000 +0000
++++ gnome-do-plugins-0.8.1.3+dfsg/BundledLibraries/Makefile.am	2009-05-07 20:32:38.000000000 +0100
+@@ -1,38 +1,4 @@
+ bundledir = ${datadir}/gnome-do/plugins
+ 
+-gdata_subdir = libgoogle-data-mono-1.4.0.2
+-gdata_subdir_full = $(addprefix $(srcdir)/,$(gdata_subdir))
+-
+-GOOGLE_LIBS = \
+-	Google.GData.AccessControl.dll \
+-	Google.GData.Calendar.dll \
+-	Google.GData.Client.dll \
+-	Google.GData.Contacts.dll \
+-	Google.GData.Documents.dll \
+-	Google.GData.YouTube.dll \
+-	Google.GData.Extensions.dll
+-
+ bundle_DATA = \
+-	$(addprefix $(srcdir)/,$(GOOGLE_LIBS)) \
+ 	$(BANSHEE_INDEXER_DLL)
+-
+-EXTRA_DIST= gmcs.exe $(gdata_subdir_full)
+-
+-# Copy these to the build dir; some things require the dlls to be present
+-# during build - particularly mautil.
+-all-local: $(GOOGLE_LIBS)
+-	mkdir -p $(top_builddir)/build
+-	install -m 644 -t $(top_builddir)/build $(bundle_DATA)
+-
+-dist-hook:
+-	chmod -R u+w $(distdir)
+-	rm -f $(distdir)/*.dll
+-
+-clean-local:
+-	rm -f $(srcdir)/*.dll
+-	rm -f $(top_builddir)/build/*.dll
+-     
+-%.dll:
+-	chmod -R u+w $(srcdir)
+-	$(MAKE) -C $(gdata_subdir_full) $(AM_MAKEFLAGS) $(addsuffix .dll, $(notdir $(basename $@)))
+-	mv $(gdata_subdir_full)/*.dll $(srcdir)
+diff -urNad gnome-do-plugins-0.8.1.3+dfsg~/GoogleCalendar/Resources/GoogleCalendar.addin.xml gnome-do-plugins-0.8.1.3+dfsg/GoogleCalendar/Resources/GoogleCalendar.addin.xml
+--- gnome-do-plugins-0.8.1.3+dfsg~/GoogleCalendar/Resources/GoogleCalendar.addin.xml	2009-03-17 17:56:56.000000000 +0000
++++ gnome-do-plugins-0.8.1.3+dfsg/GoogleCalendar/Resources/GoogleCalendar.addin.xml	2009-05-07 20:33:43.000000000 +0100
+@@ -10,10 +10,6 @@
+ 
+ 	<Runtime>
+ 		<Import assembly="GoogleCalendar.dll"/>
+-		<Import assembly="Google.GData.AccessControl.dll"/>
+-		<Import assembly="Google.GData.Calendar.dll"/>
+-		<Import assembly="Google.GData.Client.dll"/>
+-		<Import assembly="Google.GData.Extensions.dll"/>
+ 	</Runtime>
+ 
+ 	<Dependencies>
+diff -urNad gnome-do-plugins-0.8.1.3+dfsg~/GoogleContacts/Resources/GoogleContacts.addin.xml gnome-do-plugins-0.8.1.3+dfsg/GoogleContacts/Resources/GoogleContacts.addin.xml
+--- gnome-do-plugins-0.8.1.3+dfsg~/GoogleContacts/Resources/GoogleContacts.addin.xml	2009-03-17 17:56:56.000000000 +0000
++++ gnome-do-plugins-0.8.1.3+dfsg/GoogleContacts/Resources/GoogleContacts.addin.xml	2009-05-07 20:33:52.000000000 +0100
+@@ -10,9 +10,6 @@
+ 
+ 	<Runtime>
+ 		<Import assembly="GoogleContacts.dll"/>
+-		<Import assembly="Google.GData.Contacts.dll"/>
+-		<Import assembly="Google.GData.Client.dll"/>
+-		<Import assembly="Google.GData.Extensions.dll"/>
+ 	</Runtime>
+ 
+ 	<Dependencies>
+diff -urNad gnome-do-plugins-0.8.1.3+dfsg~/GoogleDocs/Resources/GoogleDocs.addin.xml gnome-do-plugins-0.8.1.3+dfsg/GoogleDocs/Resources/GoogleDocs.addin.xml
+--- gnome-do-plugins-0.8.1.3+dfsg~/GoogleDocs/Resources/GoogleDocs.addin.xml	2009-03-17 17:56:56.000000000 +0000
++++ gnome-do-plugins-0.8.1.3+dfsg/GoogleDocs/Resources/GoogleDocs.addin.xml	2009-05-07 20:34:07.000000000 +0100
+@@ -10,10 +10,6 @@
+ 
+ 	<Runtime>
+ 		<Import assembly="GoogleDocs.dll"/>
+-		<Import assembly="Google.GData.AccessControl.dll"/>
+-		<Import assembly="Google.GData.Documents.dll"/>
+-		<Import assembly="Google.GData.Client.dll"/>
+-		<Import assembly="Google.GData.Extensions.dll"/>
+ 	</Runtime>
+ 
+ 	<Dependencies>
+diff -urNad gnome-do-plugins-0.8.1.3+dfsg~/YouTube/Makefile.am gnome-do-plugins-0.8.1.3+dfsg/YouTube/Makefile.am
+--- gnome-do-plugins-0.8.1.3+dfsg~/YouTube/Makefile.am	2009-03-17 17:56:56.000000000 +0000
++++ gnome-do-plugins-0.8.1.3+dfsg/YouTube/Makefile.am	2009-05-07 20:32:38.000000000 +0100
+@@ -23,7 +23,7 @@
+ 	System.Core \
+ 	Mono.Posix \
+ 	$(GDATA_SHARP_CONTACTS_LIBS) \
+-	$(top_srcdir)/BundledLibraries/Google.GData.YouTube.dll \
++	$(GDATA_SHARP_YOUTUBE_LIBS) \
+ 	$(DO_PLATFORM_LIBS) \
+ 	$(GTK_SHARP_20_LIBS) \
+ 	$(DO_PLATFORM_LINUX_LIBS) \
+diff -urNad gnome-do-plugins-0.8.1.3+dfsg~/YouTube/Resources/Youtube.addin.xml gnome-do-plugins-0.8.1.3+dfsg/YouTube/Resources/Youtube.addin.xml
+--- gnome-do-plugins-0.8.1.3+dfsg~/YouTube/Resources/Youtube.addin.xml	2009-03-17 17:56:56.000000000 +0000
++++ gnome-do-plugins-0.8.1.3+dfsg/YouTube/Resources/Youtube.addin.xml	2009-05-07 20:34:26.000000000 +0100
+@@ -10,9 +10,6 @@
+ 
+ 	<Runtime>
+ 		<Import assembly="YouTube.dll"/>
+-		<Import assembly="Google.GData.YouTube.dll"/>
+-		<Import assembly="Google.GData.Client.dll"/>
+-		<Import assembly="Google.GData.Extensions.dll"/>
+ 	</Runtime>
+ 
+ 	<Dependencies>
+diff -urNad gnome-do-plugins-0.8.1.3+dfsg~/configure.ac gnome-do-plugins-0.8.1.3+dfsg/configure.ac
+--- gnome-do-plugins-0.8.1.3+dfsg~/configure.ac	2009-03-17 18:54:14.000000000 +0000
++++ gnome-do-plugins-0.8.1.3+dfsg/configure.ac	2009-05-07 20:32:38.000000000 +0100
+@@ -56,11 +56,11 @@
+ PKG_CHECK_MODULES([NOTIFY_SHARP], [notify-sharp])
+ PKG_CHECK_MODULES([WNCK_SHARP_10], [wnck-sharp-1.0])
+ 
+-dnl Handle bundled Google libs until they're packaged
+-GDATA_SHARP_ACL_LIBS=-r:$top_srcdir/BundledLibraries/Google.GData.AccessControl.dll
+-GDATA_SHARP_CALENDAR_LIBS="-r:$top_srcdir/BundledLibraries/Google.GData.Client.dll -r:$top_srcdir/BundledLibraries/Google.GData.Extensions.dll -r:$top_srcdir/BundledLibraries/Google.GData.Calendar.dll"
+-GDATA_SHARP_DOCUMENTS_LIBS="-r:$top_srcdir/BundledLibraries/Google.GData.Client.dll -r:$top_srcdir/BundledLibraries/Google.GData.Extensions.dll -r:$top_srcdir/BundledLibraries/Google.GData.Documents.dll"
+-GDATA_SHARP_CONTACTS_LIBS="-r:$top_srcdir/BundledLibraries/Google.GData.Client.dll -r:$top_srcdir/BundledLibraries/Google.GData.Extensions.dll -r:$top_srcdir/BundledLibraries/Google.GData.Contacts.dll"
++PKG_CHECK_MODULES([GDATA_SHARP_ACL], [gdata-sharp-acl])
++PKG_CHECK_MODULES([GDATA_SHARP_CALENDAR], [gdata-sharp-calendar])
++PKG_CHECK_MODULES([GDATA_SHARP_DOCUMENTS], [gdata-sharp-documents])
++PKG_CHECK_MODULES([GDATA_SHARP_CONTACTS], [gdata-sharp-contacts])
++PKG_CHECK_MODULES([GDATA_SHARP_YOUTUBE], [gdata-sharp-youtube])
+ 
+ dnl We need to copy Banshee.CollectionIndexer.dll; it's not in the GAC
+ BANSHEE_INDEXER_DLL=$($PKG_CONFIG --variable=Libraries banshee-1-collection-indexer)
+@@ -73,6 +73,7 @@
+ AC_SUBST([GDATA_SHARP_CALENDAR_LIBS])
+ AC_SUBST([GDATA_SHARP_CONTACTS_LIBS])
+ AC_SUBST([GDATA_SHARP_DOCUMENTS_LIBS])
++AC_SUBST([GDATA_SHARP_YOUTUBE_LIBS])
+ AC_SUBST([GLADE_SHARP_20_LIBS])
+ AC_SUBST([GLIB_SHARP_20_LIBS])
+ AC_SUBST([GNOME_DESKTOP_SHARP_20_LIBS])

Propchange: packages/gnome-do-plugins/trunk/debian/patches/00_use_system_gdata.dpatch
------------------------------------------------------------------------------
    svn:executable = *

Modified: packages/gnome-do-plugins/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/gnome-do-plugins/trunk/debian/patches/00list?rev=4906&op=diff
==============================================================================
--- packages/gnome-do-plugins/trunk/debian/patches/00list (original)
+++ packages/gnome-do-plugins/trunk/debian/patches/00list Thu May  7 19:44:50 2009
@@ -1,4 +1,4 @@
-00_dfsg_autofoo
+00_use_system_gdata
 04_fix_pidgin_dbus_ints
 01_firefox_iceweasel_rename
 15_twitter_api

More information about the Pkg-cli-apps-commits mailing list