[Pkg-cli-apps-commits] r3967 - in /packages/gnome-do-plugins/trunk/debian: control patches/ patches/00list patches/01_firefox_iceweasel_rename.dpatch rules

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

Author: ct-guest
Date: Sun May 25 22:22:04 2008
New Revision: 3967

URL: http://svn.debian.org/wsvn/pkg-cli-apps/?sc=1&rev=3967
Log:
* removed requirement to remove build-stamp thanks to dh 7
* recommends on locate | slocate since so much relies on that
* added a patch for iceweasel rename of firefox so opensearch plugins can be found

Added:
    packages/gnome-do-plugins/trunk/debian/patches/
    packages/gnome-do-plugins/trunk/debian/patches/00list
    packages/gnome-do-plugins/trunk/debian/patches/01_firefox_iceweasel_rename.dpatch   (with props)
Modified:
    packages/gnome-do-plugins/trunk/debian/control
    packages/gnome-do-plugins/trunk/debian/rules

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=3967&op=diff
==============================================================================
--- packages/gnome-do-plugins/trunk/debian/control (original)
+++ packages/gnome-do-plugins/trunk/debian/control Sun May 25 22:22:04 2008
@@ -4,7 +4,8 @@
 Maintainer: Debian CLI Applications Team <pkg-cli-apps-team at lists.alioth.debian.org>
 Uploaders: Christopher James Halse Rogers <raof at ubuntu.com>, Colin Turner <ct at piglets.com>
 Build-Depends: debhelper (>= 7), 
-  cli-common-dev (>= 0.5.7)
+  cli-common-dev (>= 0.5.7),
+  dpatch
 Build-Depends-Indep: 
   mono-gmcs (>= 1.1.8) | c-sharp-2.0-compiler,
   autotools-dev,
@@ -25,6 +26,7 @@
 Architecture: all
 Depends: ${cli:Depends}, 
 	 gnome-do (>= 0.4)
+Recommends: locate | slocate
 Description: Extra functionality for GNOME-Do launcher
  This package provides extra plugins for GNOME-Do.  It includes plugins for
  interacting with Evolution & Thunderbird contacts, Pidgin IM buddies, 

Added: 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=3967&op=file
==============================================================================
--- packages/gnome-do-plugins/trunk/debian/patches/00list (added)
+++ packages/gnome-do-plugins/trunk/debian/patches/00list Sun May 25 22:22:04 2008
@@ -1,0 +1,1 @@
+01_firefox_iceweasel_rename

Added: packages/gnome-do-plugins/trunk/debian/patches/01_firefox_iceweasel_rename.dpatch
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/gnome-do-plugins/trunk/debian/patches/01_firefox_iceweasel_rename.dpatch?rev=3967&op=file
==============================================================================
--- packages/gnome-do-plugins/trunk/debian/patches/01_firefox_iceweasel_rename.dpatch (added)
+++ packages/gnome-do-plugins/trunk/debian/patches/01_firefox_iceweasel_rename.dpatch Sun May 25 22:22:04 2008
@@ -1,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## firefox_iceweasel_rename.dpatch by  <colin at imladris.piglets.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad trunk~/OpenSearch/src/FirefoxOpenSearchFileProvider.cs trunk/OpenSearch/src/FirefoxOpenSearchFileProvider.cs
+--- trunk~/OpenSearch/src/FirefoxOpenSearchFileProvider.cs	2008-03-14 09:01:34.000000000 +0000
++++ trunk/OpenSearch/src/FirefoxOpenSearchFileProvider.cs	2008-05-25 23:10:15.000000000 +0100
+@@ -31,7 +31,7 @@
+ 		{		
+ 			System.Diagnostics.Process locate = new System.Diagnostics.Process ();
+ 			locate.StartInfo.FileName = "locate";
+-			locate.StartInfo.Arguments = @"-r ^.*firefox.*/searchplugins/.*\.xml$";
++			locate.StartInfo.Arguments = @"-r ^.*{firefox|iceweasel}.*/searchplugins/.*\.xml$";
+ 			locate.StartInfo.RedirectStandardOutput = true;
+ 			locate.StartInfo.UseShellExecute = false;
+ 			try {

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

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=3967&op=diff
==============================================================================
--- packages/gnome-do-plugins/trunk/debian/rules (original)
+++ packages/gnome-do-plugins/trunk/debian/rules Sun May 25 22:22:04 2008
@@ -6,6 +6,7 @@
 #export DH_VERBOSE=1
 
 include /usr/share/cli-common/cli.make
+include /usr/share/dpatch/dpatch.make
 
 build: build-stamp
 
@@ -16,9 +17,8 @@
 	dh build --after configure
 	touch $@
 
-clean:
+clean: unpatch
 	dh $@
-	rm -f build-stamp
 
 install: build
 	dh $@