[Pkg-cli-apps-commits] r5150 - in /packages/gnome-do-plugins/trunk/debian: ./ patches/
laney-guest at users.alioth.debian.org
laney-guest at users.alioth.debian.org
Wed Nov 18 17:10:42 UTC 2009
Author: laney-guest
Date: Wed Nov 18 17:10:42 2009
New Revision: 5150
URL: http://svn.debian.org/wsvn/pkg-cli-apps/?sc=1&rev=5150
Log:
* debian/rules, debian/*.install: Update dh7isation to be more standard.
install files no longer required as dh_auto_* takes care of this perfectly
* debian/rules, debian/control: Use quilt as patchsys - refresh patches to
take this into account
* debian/control: Drop gnome-do-plugin-evolution as this cannot be built due
to our evolution-sharp being uninstallable and unfixable. Sorry. It will
be back as soon as possible.
* debian/control: Depend on libflickrnet -dev package as part of the new
world order
Added:
packages/gnome-do-plugins/trunk/debian/patches/00_debian_default_plugins.patch
- copied, changed from r5149, packages/gnome-do-plugins/trunk/debian/patches/00_debian_default_plugins.dpatch
packages/gnome-do-plugins/trunk/debian/patches/01_firefox_iceweasel_rename.patch
- copied, changed from r5149, packages/gnome-do-plugins/trunk/debian/patches/01_firefox_iceweasel_rename.dpatch
packages/gnome-do-plugins/trunk/debian/patches/series
- copied, changed from r5149, packages/gnome-do-plugins/trunk/debian/patches/00list
Removed:
packages/gnome-do-plugins/trunk/debian/gnome-do-plugin-evolution.install
packages/gnome-do-plugins/trunk/debian/gnome-do-plugins.install
packages/gnome-do-plugins/trunk/debian/patches/00_debian_default_plugins.dpatch
packages/gnome-do-plugins/trunk/debian/patches/00list
packages/gnome-do-plugins/trunk/debian/patches/01_firefox_iceweasel_rename.dpatch
Modified:
packages/gnome-do-plugins/trunk/debian/changelog
packages/gnome-do-plugins/trunk/debian/control
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=5150&op=diff
==============================================================================
--- packages/gnome-do-plugins/trunk/debian/changelog (original)
+++ packages/gnome-do-plugins/trunk/debian/changelog Wed Nov 18 17:10:42 2009
@@ -9,12 +9,21 @@
* 02_fix_banshee_plugin.dpatch: Drop, no longer required. Errors will be
shown on console if Banshee is not installed but these are non-fatal.
* rules, control: Use mono-csc
+ * debian/rules, debian/*.install: Update dh7isation to be more standard.
+ install files no longer required as dh_auto_* takes care of this perfectly
+ * debian/rules, debian/control: Use quilt as patchsys - refresh patches to
+ take this into account
+ * debian/control: Drop gnome-do-plugin-evolution as this cannot be built due
+ to our evolution-sharp being uninstallable and unfixable. Sorry. It will
+ be back as soon as possible.
+ * debian/control: Depend on libflickrnet -dev package as part of the new
+ world order
[ Jo Shields ]
* debian/rules:
- Make get-orig-source rule deterministic
- -- Iain Lane <laney at ubuntu.com> Tue, 13 Oct 2009 19:10:38 +0100
+ -- Iain Lane <laney at ubuntu.com> Wed, 18 Nov 2009 17:01:01 +0000
gnome-do-plugins (0.8.2+dfsg-2) unstable; urgency=low
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=5150&op=diff
==============================================================================
--- packages/gnome-do-plugins/trunk/debian/control (original)
+++ packages/gnome-do-plugins/trunk/debian/control Wed Nov 18 17:10:42 2009
@@ -5,7 +5,7 @@
Uploaders: Christopher James Halse Rogers <raof at ubuntu.com>, Colin Turner <ct at piglets.com>, Iain Lane <laney at ubuntu.com>
Build-Depends: debhelper (>= 7.0.50~),
cli-common-dev (>= 0.5.7),
- dpatch
+ quilt (>= 0.46-7~)
Build-Depends-Indep:
mono-devel (>= 2.4.2.3),
autotools-dev,
@@ -16,8 +16,8 @@
intltool,
libtool,
libglib2.0-dev,
- libevolution5.0-cil,
- libflickrnet2.2-cil,
+# libevolution5.0-cil,
+ libflickrnet-cil-dev,
libglib2.0-cil,
libgtk2.0-cil,
libglade2.0-cil,
@@ -59,12 +59,12 @@
interacting with Evolution & Thunderbird contacts, Pidgin IM buddies,
searching the Web using Firefox search plugins, and more.
-Package: gnome-do-plugin-evolution
-Architecture: all
-Depends: ${cli:Depends},
- ${misc:Depends},
- gnome-do (>= 0.8.2),
- gnome-do-plugins
-Description: Extra functionality for GNOME Do (Evolution plugin)
- This package provides extra plugins for GNOME Do. It includes the Evolution
- plugin, providing access to your Evolution contacts in Do.
+#Package: gnome-do-plugin-evolution
+#Architecture: all
+#Depends: ${cli:Depends},
+# ${misc:Depends},
+# gnome-do (>= 0.8.2),
+# gnome-do-plugins
+#Description: Extra functionality for GNOME Do (Evolution plugin)
+# This package provides extra plugins for GNOME Do. It includes the Evolution
+# plugin, providing access to your Evolution contacts in Do.
Copied: packages/gnome-do-plugins/trunk/debian/patches/00_debian_default_plugins.patch (from r5149, packages/gnome-do-plugins/trunk/debian/patches/00_debian_default_plugins.dpatch)
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/gnome-do-plugins/trunk/debian/patches/00_debian_default_plugins.patch?rev=5150&op=diff
==============================================================================
--- packages/gnome-do-plugins/trunk/debian/patches/00_debian_default_plugins.dpatch (original)
+++ packages/gnome-do-plugins/trunk/debian/patches/00_debian_default_plugins.patch Wed Nov 18 17:10:42 2009
@@ -6,9 +6,8 @@
## DP: configuration by default, so gnome-do is more useful out of the box.
@DPATCH@
-diff -urNad gnome-do-plugins-0.8.2+dfsg~/Firefox/Resources/Firefox.addin.xml.in gnome-do-plugins-0.8.2+dfsg/Firefox/Resources/Firefox.addin.xml.in
---- gnome-do-plugins-0.8.2+dfsg~/Firefox/Resources/Firefox.addin.xml.in 2009-06-23 11:00:43.000000000 +1000
-+++ gnome-do-plugins-0.8.2+dfsg/Firefox/Resources/Firefox.addin.xml.in 2009-07-02 14:56:30.583554974 +1000
+--- gnome-do-plugins-0.8.2.1.orig/Firefox/Resources/Firefox.addin.xml.in
++++ gnome-do-plugins-0.8.2.1/Firefox/Resources/Firefox.addin.xml.in
@@ -6,7 +6,7 @@
description="Search Firefox 3 bookmarks, bookmark directories, and history."
author="David Siegel, Neal Stewart, Alex Launi"
@@ -18,9 +17,8 @@
>
<Runtime>
-diff -urNad gnome-do-plugins-0.8.2+dfsg~/GNOME-Dictionary/Resources/GNOME-Dictionary.addin.xml.in gnome-do-plugins-0.8.2+dfsg/GNOME-Dictionary/Resources/GNOME-Dictionary.addin.xml.in
---- gnome-do-plugins-0.8.2+dfsg~/GNOME-Dictionary/Resources/GNOME-Dictionary.addin.xml.in 2009-06-23 11:00:43.000000000 +1000
-+++ gnome-do-plugins-0.8.2+dfsg/GNOME-Dictionary/Resources/GNOME-Dictionary.addin.xml.in 2009-07-02 14:57:30.139560345 +1000
+--- gnome-do-plugins-0.8.2.1.orig/GNOME-Dictionary/Resources/GNOME-Dictionary.addin.xml.in
++++ gnome-do-plugins-0.8.2.1/GNOME-Dictionary/Resources/GNOME-Dictionary.addin.xml.in
@@ -6,7 +6,7 @@
description="Look up word definitions in GNOME Dictionary."
author="David Siegel"
@@ -30,9 +28,8 @@
>
<Runtime>
-diff -urNad gnome-do-plugins-0.8.2+dfsg~/GNOME-Screenshot/Resources/GNOME-Screenshot.addin.xml.in gnome-do-plugins-0.8.2+dfsg/GNOME-Screenshot/Resources/GNOME-Screenshot.addin.xml.in
---- gnome-do-plugins-0.8.2+dfsg~/GNOME-Screenshot/Resources/GNOME-Screenshot.addin.xml.in 2009-06-23 11:00:43.000000000 +1000
-+++ gnome-do-plugins-0.8.2+dfsg/GNOME-Screenshot/Resources/GNOME-Screenshot.addin.xml.in 2009-07-02 14:57:30.143523418 +1000
+--- gnome-do-plugins-0.8.2.1.orig/GNOME-Screenshot/Resources/GNOME-Screenshot.addin.xml.in
++++ gnome-do-plugins-0.8.2.1/GNOME-Screenshot/Resources/GNOME-Screenshot.addin.xml.in
@@ -6,7 +6,7 @@
description="Take screenshots with optional delay."
author="David Siegel"
@@ -42,9 +39,8 @@
>
<Runtime>
-diff -urNad gnome-do-plugins-0.8.2+dfsg~/GNOME-Session/Resources/GNOME-Session.addin.xml.in gnome-do-plugins-0.8.2+dfsg/GNOME-Session/Resources/GNOME-Session.addin.xml.in
---- gnome-do-plugins-0.8.2+dfsg~/GNOME-Session/Resources/GNOME-Session.addin.xml.in 2009-06-23 11:00:43.000000000 +1000
-+++ gnome-do-plugins-0.8.2+dfsg/GNOME-Session/Resources/GNOME-Session.addin.xml.in 2009-07-02 14:57:30.147522600 +1000
+--- gnome-do-plugins-0.8.2.1.orig/GNOME-Session/Resources/GNOME-Session.addin.xml.in
++++ gnome-do-plugins-0.8.2.1/GNOME-Session/Resources/GNOME-Session.addin.xml.in
@@ -6,7 +6,7 @@
description="Log out, lock your screen, shutdown, suspend, etc."
author="David Siegel"
@@ -54,9 +50,8 @@
>
<Runtime>
-diff -urNad gnome-do-plugins-0.8.2+dfsg~/GNOME-Terminal/Resources/GNOME-Terminal.addin.xml.in gnome-do-plugins-0.8.2+dfsg/GNOME-Terminal/Resources/GNOME-Terminal.addin.xml.in
---- gnome-do-plugins-0.8.2+dfsg~/GNOME-Terminal/Resources/GNOME-Terminal.addin.xml.in 2009-06-23 11:00:43.000000000 +1000
-+++ gnome-do-plugins-0.8.2+dfsg/GNOME-Terminal/Resources/GNOME-Terminal.addin.xml.in 2009-07-02 14:57:30.155523058 +1000
+--- gnome-do-plugins-0.8.2.1.orig/GNOME-Terminal/Resources/GNOME-Terminal.addin.xml.in
++++ gnome-do-plugins-0.8.2.1/GNOME-Terminal/Resources/GNOME-Terminal.addin.xml.in
@@ -6,7 +6,7 @@
description="Run commands and open new terminals."
author="David Siegel, Tim McLaughlin"
@@ -66,9 +61,8 @@
>
<Runtime>
-diff -urNad gnome-do-plugins-0.8.2+dfsg~/GoogleCalculator/Resources/GoogleCalculator.addin.xml.in gnome-do-plugins-0.8.2+dfsg/GoogleCalculator/Resources/GoogleCalculator.addin.xml.in
---- gnome-do-plugins-0.8.2+dfsg~/GoogleCalculator/Resources/GoogleCalculator.addin.xml.in 2009-06-23 11:00:43.000000000 +1000
-+++ gnome-do-plugins-0.8.2+dfsg/GoogleCalculator/Resources/GoogleCalculator.addin.xml.in 2009-07-02 14:58:21.220021972 +1000
+--- gnome-do-plugins-0.8.2.1.orig/GoogleCalculator/Resources/GoogleCalculator.addin.xml.in
++++ gnome-do-plugins-0.8.2.1/GoogleCalculator/Resources/GoogleCalculator.addin.xml.in
@@ -6,7 +6,7 @@
description="Perform calculations, and currency/quantity conversions."
author="David Siegel"
@@ -78,9 +72,8 @@
>
<Runtime>
-diff -urNad gnome-do-plugins-0.8.2+dfsg~/OpenSearch/Resources/OpenSearch.addin.xml.in gnome-do-plugins-0.8.2+dfsg/OpenSearch/Resources/OpenSearch.addin.xml.in
---- gnome-do-plugins-0.8.2+dfsg~/OpenSearch/Resources/OpenSearch.addin.xml.in 2009-06-23 11:00:43.000000000 +1000
-+++ gnome-do-plugins-0.8.2+dfsg/OpenSearch/Resources/OpenSearch.addin.xml.in 2009-07-02 14:58:36.596022624 +1000
+--- gnome-do-plugins-0.8.2.1.orig/OpenSearch/Resources/OpenSearch.addin.xml.in
++++ gnome-do-plugins-0.8.2.1/OpenSearch/Resources/OpenSearch.addin.xml.in
@@ -6,7 +6,7 @@
description="Search the web using your installed OpenSearch plugins."
author="Jason Jones"
@@ -90,9 +83,8 @@
>
<Runtime>
-diff -urNad gnome-do-plugins-0.8.2+dfsg~/Pastebin/Resources/Pastebin.addin.xml.in gnome-do-plugins-0.8.2+dfsg/Pastebin/Resources/Pastebin.addin.xml.in
---- gnome-do-plugins-0.8.2+dfsg~/Pastebin/Resources/Pastebin.addin.xml.in 2009-06-23 11:00:43.000000000 +1000
-+++ gnome-do-plugins-0.8.2+dfsg/Pastebin/Resources/Pastebin.addin.xml.in 2009-07-02 14:58:58.479520120 +1000
+--- gnome-do-plugins-0.8.2.1.orig/Pastebin/Resources/Pastebin.addin.xml.in
++++ gnome-do-plugins-0.8.2.1/Pastebin/Resources/Pastebin.addin.xml.in
@@ -6,7 +6,7 @@
description="Paste text to an online pastebin."
author="Jason Jones"
@@ -102,9 +94,8 @@
>
<Runtime>
-diff -urNad gnome-do-plugins-0.8.2+dfsg~/TinyUrl/Resources/TinyUrl.addin.xml.in gnome-do-plugins-0.8.2+dfsg/TinyUrl/Resources/TinyUrl.addin.xml.in
---- gnome-do-plugins-0.8.2+dfsg~/TinyUrl/Resources/TinyUrl.addin.xml.in 2009-06-23 11:00:43.000000000 +1000
-+++ gnome-do-plugins-0.8.2+dfsg/TinyUrl/Resources/TinyUrl.addin.xml.in 2009-07-02 14:59:10.908023178 +1000
+--- gnome-do-plugins-0.8.2.1.orig/TinyUrl/Resources/TinyUrl.addin.xml.in
++++ gnome-do-plugins-0.8.2.1/TinyUrl/Resources/TinyUrl.addin.xml.in
@@ -6,7 +6,7 @@
description="Make unwieldy urls tiny."
author="David Siegel"
@@ -114,9 +105,8 @@
>
<Runtime>
-diff -urNad gnome-do-plugins-0.8.2+dfsg~/Tomboy/Resources/Tomboy.addin.xml.in gnome-do-plugins-0.8.2+dfsg/Tomboy/Resources/Tomboy.addin.xml.in
---- gnome-do-plugins-0.8.2+dfsg~/Tomboy/Resources/Tomboy.addin.xml.in 2009-06-23 11:00:43.000000000 +1000
-+++ gnome-do-plugins-0.8.2+dfsg/Tomboy/Resources/Tomboy.addin.xml.in 2009-07-02 14:59:20.344023350 +1000
+--- gnome-do-plugins-0.8.2.1.orig/Tomboy/Resources/Tomboy.addin.xml.in
++++ gnome-do-plugins-0.8.2.1/Tomboy/Resources/Tomboy.addin.xml.in
@@ -6,7 +6,7 @@
description="Search and create new Tomboy notes."
author="Rick Harding, Chris Szikszoy"
@@ -126,9 +116,8 @@
>
<Runtime>
-diff -urNad gnome-do-plugins-0.8.2+dfsg~/WindowManager/Resources/WindowManager.addin.xml.in gnome-do-plugins-0.8.2+dfsg/WindowManager/Resources/WindowManager.addin.xml.in
---- gnome-do-plugins-0.8.2+dfsg~/WindowManager/Resources/WindowManager.addin.xml.in 2009-06-23 11:00:43.000000000 +1000
-+++ gnome-do-plugins-0.8.2+dfsg/WindowManager/Resources/WindowManager.addin.xml.in 2009-07-02 14:59:32.211523201 +1000
+--- gnome-do-plugins-0.8.2.1.orig/WindowManager/Resources/WindowManager.addin.xml.in
++++ gnome-do-plugins-0.8.2.1/WindowManager/Resources/WindowManager.addin.xml.in
@@ -6,7 +6,7 @@
description="Control your windows or groups of windows with Do."
author="Jason Smith"
Copied: packages/gnome-do-plugins/trunk/debian/patches/01_firefox_iceweasel_rename.patch (from r5149, 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.patch?rev=5150&op=diff
==============================================================================
--- packages/gnome-do-plugins/trunk/debian/patches/01_firefox_iceweasel_rename.dpatch (original)
+++ packages/gnome-do-plugins/trunk/debian/patches/01_firefox_iceweasel_rename.patch Wed Nov 18 17:10:42 2009
@@ -9,10 +9,9 @@
## DP: Iceweasel bookmarks.
@DPATCH@
-diff -urNad gnome-do-plugins-0.8.2+dfsg~/Firefox/src/PlacesItemSource.cs gnome-do-plugins-0.8.2+dfsg/Firefox/src/PlacesItemSource.cs
---- gnome-do-plugins-0.8.2+dfsg~/Firefox/src/PlacesItemSource.cs 2009-06-23 11:00:43.000000000 +1000
-+++ gnome-do-plugins-0.8.2+dfsg/Firefox/src/PlacesItemSource.cs 2009-06-28 20:52:39.596179763 +1000
-@@ -160,8 +160,13 @@
+--- gnome-do-plugins-0.8.2.1.orig/Firefox/src/PlacesItemSource.cs
++++ gnome-do-plugins-0.8.2.1/Firefox/src/PlacesItemSource.cs
+@@ -161,8 +161,13 @@
profile = null;
home = Environment.GetFolderPath (Environment.SpecialFolder.Personal);
@@ -28,7 +27,7 @@
while ((line = r.ReadLine ()) != null) {
if (line.StartsWith (BeginDefaultProfile)) {
break;
-@@ -172,7 +177,7 @@
+@@ -173,7 +178,7 @@
}
}
}
@@ -37,9 +36,8 @@
}
-diff -urNad gnome-do-plugins-0.8.2+dfsg~/OpenSearch/src/FirefoxOpenSearchDirectoryProvider.cs gnome-do-plugins-0.8.2+dfsg/OpenSearch/src/FirefoxOpenSearchDirectoryProvider.cs
---- gnome-do-plugins-0.8.2+dfsg~/OpenSearch/src/FirefoxOpenSearchDirectoryProvider.cs 2009-06-23 11:00:43.000000000 +1000
-+++ gnome-do-plugins-0.8.2+dfsg/OpenSearch/src/FirefoxOpenSearchDirectoryProvider.cs 2009-06-28 20:38:51.032212068 +1000
+--- gnome-do-plugins-0.8.2.1.orig/OpenSearch/src/FirefoxOpenSearchDirectoryProvider.cs
++++ gnome-do-plugins-0.8.2.1/OpenSearch/src/FirefoxOpenSearchDirectoryProvider.cs
@@ -37,6 +37,9 @@
/// </summary>
public class FirefoxOpenSearchDirectoryProvider
Copied: packages/gnome-do-plugins/trunk/debian/patches/series (from r5149, packages/gnome-do-plugins/trunk/debian/patches/00list)
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/gnome-do-plugins/trunk/debian/patches/series?rev=5150&op=diff
==============================================================================
--- packages/gnome-do-plugins/trunk/debian/patches/00list (original)
+++ packages/gnome-do-plugins/trunk/debian/patches/series Wed Nov 18 17:10:42 2009
@@ -1,2 +1,2 @@
-00_debian_default_plugins
-01_firefox_iceweasel_rename
+00_debian_default_plugins.patch
+01_firefox_iceweasel_rename.patch
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=5150&op=diff
==============================================================================
--- packages/gnome-do-plugins/trunk/debian/rules (original)
+++ packages/gnome-do-plugins/trunk/debian/rules Wed Nov 18 17:10:42 2009
@@ -6,37 +6,23 @@
#export DH_VERBOSE=1
include /usr/share/cli-common/cli.make
-include /usr/share/dpatch/dpatch.make
+include /usr/share/quilt/quilt.make
-configure: configure-stamp
+override_dh_auto_configure:
+ autoreconf -I m4/shamrock
+ dh_auto_configure -- --enable-flickr=yes MCS=/usr/bin/mono-csc
-configure-stamp: patch-stamp
- autoreconf -I m4/shamrock
- touch $@
-
-build: configure
- MCS=/usr/bin/mono-csc dh $@
-
-clean: unpatch
- dh clean
-# Clean buildsystem changes
+override_dh_auto_clean:
+ dh_auto_clean
+ # Clean buildsystem changes
find . -iname Makefile.in -delete
rm -f configure
-
-install: build
- dh $@
-
-binary: binary-indep
- dh $@
-
-binary-indep: install
- dh $@
override_dh_install:
dh_install --fail-missing
-# provide a target, it does nothing but depend upon build as per policy
-binary-arch: build
+%:
+ dh $@
# Makefile arcanery warning:
# $(dir $(_)) gives us the path containing this rules file.
@@ -69,8 +55,7 @@
gzip -9fn $(TARBALL)
get-orig-source: repack-source
- [ -d ../tarballs ] || mkdir ../tarballs
- mv $(TEMP_DIR)/*.orig.tar.gz ../tarballs
+ mv $(TEMP_DIR)/*.orig.tar.gz .
rm -r $(TEMP_DIR)
-.PHONY: configure build clean install binary binary-indep binary-arch download-tarball strip-shipped-binaries repack-source get-orig-source patch
+.PHONY: download-tarball strip-shipped-binaries repack-source get-orig-source
More information about the Pkg-cli-apps-commits
mailing list