[Pkg-cli-apps-commits] r4533 - in /packages/gnome-do-plugins/trunk/debian: changelog patches/00_dfsg_autofoo.dpatch rules

[raof-guest at users.alioth.debian.org]

Author: raof-guest
Date: Tue Feb 17 00:17:15 2009
New Revision: 4533

URL: http://svn.debian.org/wsvn/pkg-cli-apps/?sc=1&rev=4533
Log:
DFSG strip more precisely.  Fixes(?) the Banshee build

Modified:
    packages/gnome-do-plugins/trunk/debian/changelog
    packages/gnome-do-plugins/trunk/debian/patches/00_dfsg_autofoo.dpatch
    packages/gnome-do-plugins/trunk/debian/rules

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=4533&op=diff
==============================================================================
--- packages/gnome-do-plugins/trunk/debian/changelog (original)
+++ packages/gnome-do-plugins/trunk/debian/changelog Tue Feb 17 00:17:15 2009
@@ -14,6 +14,11 @@
     + Rework clean target to simply delete files generated by autoreconf,
       rather than trying to preserve them.
     + Remove XDG_CONFIG_DIR hack needed for mdtool
+    + Make dfsg-stripping more precise.  We now need the BundledLibraries dir
+      to build properly
+  * debian/patches/00_dfsg_autofoo
+    + Update.  Don't remove BundledLibraries entirely, just all the binaries.
+      It still needs to copy the system's BansheeCollectionIndexer.dll.
   * debian/patches/01_firefox_iceweasel_rename:
     + Refresh for new upsteam changes.
     + Extend to also make the Firefox bookmark plugin index iceweasel bookmarks

Modified: packages/gnome-do-plugins/trunk/debian/patches/00_dfsg_autofoo.dpatch
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/gnome-do-plugins/trunk/debian/patches/00_dfsg_autofoo.dpatch?rev=4533&op=diff
==============================================================================
--- packages/gnome-do-plugins/trunk/debian/patches/00_dfsg_autofoo.dpatch (original)
+++ packages/gnome-do-plugins/trunk/debian/patches/00_dfsg_autofoo.dpatch Tue Feb 17 00:17:15 2009
@@ -6,18 +6,34 @@
 ## DP: the tarball.
 
 @DPATCH@
+diff -urNad gnome-do-plugins-0.8.0.2+dfsg~/BundledLibraries/Makefile.am gnome-do-plugins-0.8.0.2+dfsg/BundledLibraries/Makefile.am
+--- gnome-do-plugins-0.8.0.2+dfsg~/BundledLibraries/Makefile.am	2009-02-05 11:11:42.000000000 +1100
++++ gnome-do-plugins-0.8.0.2+dfsg/BundledLibraries/Makefile.am	2009-02-17 11:09:34.002731510 +1100
+@@ -1,18 +1,12 @@
+ bundledir = ${datadir}/gnome-do/plugins
+ 
+-GOOGLE_LIBS = \
+-	Google.GData.AccessControl.dll \
+-	Google.GData.Calendar.dll \
+-	Google.GData.Client.dll \
+-	Google.GData.Contacts.dll \
+-	Google.GData.Documents.dll \
+-	Google.GData.Extensions.dll 
++GOOGLE_LIBS =
+ 
+ bundle_DATA = \
+ 	$(addprefix $(srcdir)/,$(GOOGLE_LIBS)) \
+ 	$(BANSHEE_INDEXER_DLL)
+ 
+-EXTRA_DIST=$(GOOGLE_LIBS) gmcs.exe
++EXTRA_DIST=$(GOOGLE_LIBS)
+ 
+ # Copy these to the build dir; some things require the dlls to be present
+ # during build - particularly mautil.
 diff -urNad gnome-do-plugins-0.8.0.2+dfsg~/Makefile.am gnome-do-plugins-0.8.0.2+dfsg/Makefile.am
 --- gnome-do-plugins-0.8.0.2+dfsg~/Makefile.am	2009-02-05 11:10:20.000000000 +1100
-+++ gnome-do-plugins-0.8.0.2+dfsg/Makefile.am	2009-02-06 21:07:58.182572599 +1100
-@@ -3,7 +3,6 @@
- 
- SUBDIRS = \
- 	po \
--	BundledLibraries \
- 	Alias \
- 	AptURL \
- 	Archive \
-@@ -25,9 +24,6 @@
++++ gnome-do-plugins-0.8.0.2+dfsg/Makefile.am	2009-02-17 11:08:37.061584246 +1100
+@@ -25,9 +25,6 @@
  	GNOME-Session \
  	GNOME-Terminal \
  	GoogleCalculator \
@@ -27,7 +43,7 @@
  	GoogleMaps \
  	GoogleSearch \
  	ImageShack \
-@@ -47,7 +43,6 @@
+@@ -47,7 +44,6 @@
  	Quote \
  	RememberTheMilk \
  	Rhythmbox \
@@ -37,7 +53,7 @@
  	Skype \
 diff -urNad gnome-do-plugins-0.8.0.2+dfsg~/configure.ac gnome-do-plugins-0.8.0.2+dfsg/configure.ac
 --- gnome-do-plugins-0.8.0.2+dfsg~/configure.ac	2009-02-05 11:35:53.000000000 +1100
-+++ gnome-do-plugins-0.8.0.2+dfsg/configure.ac	2009-02-06 21:08:28.786595170 +1100
++++ gnome-do-plugins-0.8.0.2+dfsg/configure.ac	2009-02-17 11:08:37.061584246 +1100
 @@ -140,9 +140,6 @@
  GNOME-Session/Makefile
  GNOME-Terminal/Makefile
@@ -56,11 +72,3 @@
  RSS/Makefile
  Shelf/Makefile
  Skype/Makefile
-@@ -188,7 +184,6 @@
- Zim/Makefile
- Makefile
- po/Makefile.in
--BundledLibraries/Makefile
- ])
- 
- AC_OUTPUT

Modified: packages/gnome-do-plugins/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/gnome-do-plugins/trunk/debian/rules?rev=4533&op=diff
==============================================================================
--- packages/gnome-do-plugins/trunk/debian/rules (original)
+++ packages/gnome-do-plugins/trunk/debian/rules Tue Feb 17 00:17:15 2009
@@ -54,7 +54,7 @@
 	cd $(TEMP_DIR) && tar xzvf *.tar.gz
 
 strip-shipped-binaries: download-tarball
-	rm -r $(SOURCE_DIR)/BundledLibraries
+	rm $(SOURCE_DIR)/BundledLibraries/*.{dll,exe}
 
 repack-source: strip-shipped-binaries
 	cd $(TEMP_DIR) && \