[Python-apps-commits] r3444 - in packages/kupfer/trunk/debian/patches (2 files)

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

    Date: Saturday, August 15, 2009 @ 21:34:55
  Author: dktrkranz-guest
Revision: 3444

Refresh patches for new upstream release

Modified:
  packages/kupfer/trunk/debian/patches/debian_wrappers.patch
  packages/kupfer/trunk/debian/patches/no_buildtime_depends.patch

Modified: packages/kupfer/trunk/debian/patches/debian_wrappers.patch
===================================================================
--- packages/kupfer/trunk/debian/patches/debian_wrappers.patch	2009-08-15 21:32:56 UTC (rev 3443)
+++ packages/kupfer/trunk/debian/patches/debian_wrappers.patch	2009-08-15 21:34:55 UTC (rev 3444)
@@ -6,7 +6,7 @@
 ===================================================================
 --- kupfer-0+c1.orig/wscript	2009-07-04 18:28:08.000000000 +0200
 +++ kupfer-0+c1/wscript	2009-07-05 01:00:36.000000000 +0200
-@@ -139,7 +139,7 @@
+@@ -137,7 +137,7 @@
  	binary_subst_file = "kupfer-activate.sh"
  	bin = bld.new_task_gen("subst",
  		source = binary_subst_file,
@@ -15,26 +15,26 @@
  		install_path = "${BINDIR}",
  		chmod = 0755,
  		dict = {"PYTHON": bld.env["PYTHON"]}
-Index: kupfer-0+c1/data/kupfer.desktop.in
+Index: kupfer-0+c8/data/kupfer.desktop.in.in
 ===================================================================
---- kupfer-0+c1.orig/data/kupfer.desktop.in.in	2009-07-05 01:00:42.000000000 +0200
-+++ kupfer-0+c1/data/kupfer.desktop.in.in	2009-07-05 01:01:17.000000000 +0200
-@@ -3,7 +3,7 @@
- _Name=Kupfer
- _Comment=A simple flexible launcher
+--- kupfer-0+c8.orig/data/kupfer.desktop.in.in	2009-08-14 14:35:09.000000000 +0200
++++ kupfer-0+c8/data/kupfer.desktop.in.in	2009-08-15 23:04:57.000000000 +0200
+@@ -4,7 +4,7 @@
+ _GenericName=Application Launcher
+ _Comment=Convenient command and access tool for applications and documents
  Icon=search
 -Exec=@KUPFER@
 +Exec=kupfer
  Type=Application
  Categories=Utility;
  StartupNotify=true
-Index: kupfer-0+c1/kupfer-activate.sh
+Index: kupfer-0+c8/kupfer-activate.sh
 ===================================================================
---- kupfer-0+c1.orig/kupfer-activate.sh	2009-07-05 01:01:42.000000000 +0200
-+++ kupfer-0+c1/kupfer-activate.sh	2009-07-05 01:02:07.000000000 +0200
-@@ -7,4 +7,4 @@
- # but only if there are no arguments
- test -z "$*" && dbus-send --print-reply --dest=se.kaizer.kupfer /interface se.kaizer.kupfer.Listener.ShowHide >/dev/null 2>&1
+--- kupfer-0+c8.orig/kupfer-activate.sh	2009-08-14 14:35:09.000000000 +0200
++++ kupfer-0+c8/kupfer-activate.sh	2009-08-15 23:04:57.000000000 +0200
+@@ -17,4 +17,4 @@
  
--test $? != 0 && exec ${PYTHON} -m kupfer.__init__ $* || ${PYTHON} -c "import gtk.gdk; gtk.gdk.notify_startup_complete()"
-+test $? != 0 && cd /usr/share/kupfer && exec ${PYTHON} -m kupfer.__init__ $* || ${PYTHON} -c "import gtk.gdk; gtk.gdk.notify_startup_complete()"
+ test \( $KUPFER_HAS_CLIARGS = 0 -a $KUPFER_HAS_OPTIONS != 0 \) && dbus-send --print-reply --dest=se.kaizer.kupfer /interface se.kaizer.kupfer.Listener.PutText string:"$PWD" string:"$*" >/dev/null 2>&1
+ 
+-test $KUPFER_RUNNING != 0 && exec ${PYTHON} -m kupfer.__init__ $* || ${PYTHON} -c "import gtk.gdk; gtk.gdk.notify_startup_complete()"
++test $KUPFER_RUNNING != 0 && cd /usr/share/kupfer && exec ${PYTHON} -m kupfer.__init__ $* || ${PYTHON} -c "import gtk.gdk; gtk.gdk.notify_startup_complete()"

Modified: packages/kupfer/trunk/debian/patches/no_buildtime_depends.patch
===================================================================
--- packages/kupfer/trunk/debian/patches/no_buildtime_depends.patch	2009-08-15 21:32:56 UTC (rev 3443)
+++ packages/kupfer/trunk/debian/patches/no_buildtime_depends.patch	2009-08-15 21:34:55 UTC (rev 3444)
@@ -2,11 +2,11 @@
 Origin:		Debian
 Forwarded:	not-needed
 
-Index: kupfer-c4/wscript
+Index: kupfer-0+c8/wscript
 ===================================================================
---- kupfer-c4.orig/wscript	2009-07-15 21:37:35.000000000 +0200
-+++ kupfer-c4/wscript	2009-07-15 21:38:03.000000000 +0200
-@@ -72,36 +72,6 @@
+--- kupfer-0+c8.orig/wscript	2009-08-15 23:07:35.000000000 +0200
++++ kupfer-0+c8/wscript	2009-08-15 23:09:13.000000000 +0200
+@@ -72,34 +72,6 @@
  	# BUG: intltool requires gcc
  	conf.check_tool("gcc intltool")
  
@@ -15,7 +15,6 @@
 -		gtk
 -		xdg
 -		dbus
--		wnck
 -		"""
 -	for module in python_modules.split():
 -		conf.check_python_module(module)
@@ -23,7 +22,7 @@
 -	Utils.pprint("NORMAL", "Checking optional dependencies:")
 -
 -	opt_programs = ["dbus-send"]
--	opt_pymodules = "gnome.ui".split()
+-	opt_pymodules = "wnck gnome.ui".split()
 -	for prog in opt_programs:
 -		prog_path = conf.find_program(prog)
 -
@@ -37,8 +36,7 @@
 -		try:
 -			conf.check_python_module(mod)
 -		except Configure.ConfigurationError, e:
--			pass
--			#Utils.pprint("YELLOW", "python module %s is recommended" % prog)
+-			Utils.pprint("YELLOW", "python module %s is recommended" % mod)
 -
  	conf.env["KUPFER"] = Utils.subst_vars("${BINDIR}/kupfer", conf.env)
  	conf.env["VERSION"] = VERSION