[Pkg-cli-apps-commits] r3961 - in /packages/gnome-do-plugins/trunk/debian: ./ compat control copyright rules

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

Author: raof-guest
Date: Fri May 23 08:13:35 2008
New Revision: 3961

URL: http://svn.debian.org/wsvn/pkg-cli-apps/?sc=1&rev=3961
Log:
 * add mergeWithUpstream
 * debian/control:
  + Arch any -> all
  + Move depends to B-D-I
  + Depend: on gnome-do
 * Update copyright
 * Clean rules

Modified:
    packages/gnome-do-plugins/trunk/debian/   (props changed)
    packages/gnome-do-plugins/trunk/debian/compat
    packages/gnome-do-plugins/trunk/debian/control
    packages/gnome-do-plugins/trunk/debian/copyright
    packages/gnome-do-plugins/trunk/debian/rules

Propchange: packages/gnome-do-plugins/trunk/debian/
------------------------------------------------------------------------------
    mergeWithUpstream = 1

Modified: packages/gnome-do-plugins/trunk/debian/compat
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/gnome-do-plugins/trunk/debian/compat?rev=3961&op=diff
==============================================================================
--- packages/gnome-do-plugins/trunk/debian/compat (original)
+++ packages/gnome-do-plugins/trunk/debian/compat Fri May 23 08:13:35 2008
@@ -1,1 +1,1 @@
-5
+7

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=3961&op=diff
==============================================================================
--- packages/gnome-do-plugins/trunk/debian/control (original)
+++ packages/gnome-do-plugins/trunk/debian/control Fri May 23 08:13:35 2008
@@ -4,27 +4,27 @@
 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), 
-			 mono-gmcs (>= 1.1.8) | c-sharp-2.0-compiler,
-		     autotools-dev,
-		     gnome-do (>= 0.4.0),
-		     libndesk-dbus1.0-cil,
-		     cli-common-dev (>= 0.5.7),
-         pkg-config,
-		     libmono-sqlite2.0-cil,
-		     libmono-system-data2.0-cil,
-		     libevolution3.0-cil,
-		     libmono-system-web2.0-cil,
-		     libgtk2.0-cil
+	       cli-common-dev (>= 0.5.7)
 Build-Depends-Indep: 
+               mono-gmcs (>= 1.1.8) | c-sharp-2.0-compiler,
+	       autotools-dev,
+	       gnome-do (>= 0.4.0),
+	       libndesk-dbus1.0-cil,
+	       pkg-config,
+	       libmono-sqlite2.0-cil,
+	       libmono-system-data2.0-cil,
+	       libevolution3.0-cil,
+	       libmono-system-web2.0-cil,
+	       libgtk2.0-cil
 Standards-Version: 3.7.3
 Homepage: http://do.davebsd.com
 Vcs-Svn: svn://svn.debian.org/svn/pkg-cli-apps/packages/gnome-do-plugins/trunk
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-cli-apps/packages/gnome-do-plugins/trunk
 
 Package: gnome-do-plugins
-Architecture: any
+Architecture: all
 Depends: ${cli:Depends}, 
-	 ${shlibs:Depends},
+	 gnome-do (>= 0.4)
 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, 

Modified: packages/gnome-do-plugins/trunk/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/gnome-do-plugins/trunk/debian/copyright?rev=3961&op=diff
==============================================================================
--- packages/gnome-do-plugins/trunk/debian/copyright (original)
+++ packages/gnome-do-plugins/trunk/debian/copyright Fri May 23 08:13:35 2008
@@ -12,7 +12,8 @@
 Files: *
 Copyright: © 2007 David Siegel,
 	   © 2007 Elliot Murphy,
-	   © 2007 Jason Jones
+	   © 2007 Jason Jones,
+	   © 2007 Peter Stuifzand
 License: GPL-3+
 
     This program is free software: you can redistribute it and/or modify

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=3961&op=diff
==============================================================================
--- packages/gnome-do-plugins/trunk/debian/rules (original)
+++ packages/gnome-do-plugins/trunk/debian/rules Fri May 23 08:13:35 2008
@@ -6,19 +6,19 @@
 #export DH_VERBOSE=1
 
 include /usr/share/cli-common/cli.make
-include /usr/share/dpatch/dpatch.make
 
-build: patch-stamp
-	dh $@
+build:
+	dh build --before configure
+	dh_auto_configure -- --disable-banshee-plugin --disable-amarok-plugin
+	dh build --after configure
 
 clean:
 	dh $@
 
-install: build
+install:
 	dh $@
 
-binary: binary-arch
-binary-arch: install
+binary:
 	dh $@
 
 get-orig-source: