[PATCH 1/2] rules, patches: Pass --no-runtime-deps to configure



Upstream Kupfer provides the configure flag --no-runtime-deps to pass
checks for run-time dependencies (mostly python modules). The patch to
remove these checks are then no longer needed.
---
 debian/patches/no_buildtime_depends.patch |   54 -----------------------------
 debian/patches/series                     |    1 -
 debian/rules                              |    2 +-
 3 files changed, 1 insertions(+), 56 deletions(-)
 delete mode 100644 debian/patches/no_buildtime_depends.patch

diff --git a/debian/patches/no_buildtime_depends.patch b/debian/patches/no_buildtime_depends.patch
deleted file mode 100644
index 90155f6..0000000
--- a/debian/patches/no_buildtime_depends.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-Description:	Remove check for dependencies at build time, they are required at runtime only.
-Origin:		Debian
-Forwarded:	not-needed
-
-Index: kupfer-c16/wscript
-===================================================================
---- kupfer-c16.orig/wscript	2009-10-08 22:52:13.913761385 +0200
-+++ kupfer-c16/wscript	2009-10-08 22:52:12.421760824 +0200
-@@ -85,45 +85,6 @@
- 	# BUG: intltool requires gcc
- 	conf.check_tool("gcc intltool")
- 
--	python_modules = """
--		gio
--		gtk
--		xdg
--		dbus
--		"""
--	for module in python_modules.split():
--		conf.check_python_module(module)
--
--	Utils.pprint("NORMAL", "Checking optional dependencies:")
--
--	opt_programs = {
--			"dbus-send": "Focus kupfer from the command line",
--			"rst2man": "Generate and install man page",
--		}
--	opt_pymodules = {
--			"wnck": "Identify and focus running applications",
--			"gnome": ("Log out cleanly with session managers *OTHER* than "
--				"gnome-session >= 2.24"),
--		}
--
--	for prog in opt_programs:
--		prog_path = conf.find_program(prog, var=prog.replace("-", "_").upper())
--		if not prog_path:
--			Utils.pprint("YELLOW", "Optional, allows: %s" % opt_programs[prog])
--
--	try:
--		conf.check_python_module("keybinder")
--	except Configure.ConfigurationError, e:
--		Utils.pprint("RED", "Python module keybinder is recommended")
--		Utils.pprint("RED", "Please see README")
--		
--	for mod in opt_pymodules:
--		try:
--			conf.check_python_module(mod)
--		except Configure.ConfigurationError, e:
--			Utils.pprint("YELLOW", "module %s is recommended, allows %s" % (
--				mod, opt_pymodules[mod]))
--
- 	conf.env["KUPFER"] = Utils.subst_vars("${BINDIR}/kupfer", conf.env)
- 	conf.env["VERSION"] = VERSION
- 
diff --git a/debian/patches/series b/debian/patches/series
index 59b49eb..cf57c38 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 debian_wrappers.patch
-no_buildtime_depends.patch
diff --git a/debian/rules b/debian/rules
index 1b30cd5..feb0e3f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,7 +9,7 @@ clean:
 	dh --with quilt $@
 
 override_dh_auto_configure:
-	PYTHONDIR=/usr/share/kupfer waf configure --prefix=/usr --bindir=/usr/share/kupfer
+	PYTHONDIR=/usr/share/kupfer waf configure --prefix=/usr --bindir=/usr/share/kupfer --no-runtime-deps
 
 override_dh_auto_install:
 	waf install --nopyc --nopyo --destdir=$(CURDIR)/debian/kupfer
-- 
1.6.4



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]