[Python-apps-commits] r3341 - in packages/waf/trunk/debian (8 files)

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

    Date: Saturday, July 25, 2009 @ 18:51:41
  Author: dktrkranz-guest
Revision: 3341

Use waf-light instead of generating a waf "tarball"

Added:
  packages/waf/trunk/debian/install
  packages/waf/trunk/debian/patches/WAFDIR.patch
Modified:
  packages/waf/trunk/debian/links
  packages/waf/trunk/debian/patches/series
  packages/waf/trunk/debian/patches/unpack_in_cwd.patch
  packages/waf/trunk/debian/rules
  packages/waf/trunk/debian/waf-doc.doc-base
Deleted:
  packages/waf/trunk/debian/patches/waf_noninteractive.patch

Added: packages/waf/trunk/debian/install
===================================================================
--- packages/waf/trunk/debian/install	                        (rev 0)
+++ packages/waf/trunk/debian/install	2009-07-25 18:51:41 UTC (rev 3341)
@@ -0,0 +1,2 @@
+waf-light	usr/share/waf
+wafadmin	usr/share/waf

Modified: packages/waf/trunk/debian/links
===================================================================
--- packages/waf/trunk/debian/links	2009-07-25 17:14:36 UTC (rev 3340)
+++ packages/waf/trunk/debian/links	2009-07-25 18:51:41 UTC (rev 3341)
@@ -1 +1 @@
-usr/share/waf/bin/waf	usr/bin/waf
+usr/share/waf/waf-light	usr/bin/waf

Added: packages/waf/trunk/debian/patches/WAFDIR.patch
===================================================================
--- packages/waf/trunk/debian/patches/WAFDIR.patch	                        (rev 0)
+++ packages/waf/trunk/debian/patches/WAFDIR.patch	2009-07-25 18:51:41 UTC (rev 3341)
@@ -0,0 +1,17 @@
+Description:	Look for wafadmin into /usr/share/waf
+Origin:		Debian
+Forwarded:	not-needed
+
+Index: waf-1.5.8+dfsg/waf-light
+===================================================================
+--- waf-1.5.8+dfsg.orig/waf-light	2009-07-25 19:17:44.000000000 +0200
++++ waf-1.5.8+dfsg/waf-light	2009-07-25 19:18:13.000000000 +0200
+@@ -114,7 +114,7 @@
+ 	base = os.path.dirname(os.path.abspath(name))
+ 
+ 	#devs use $WAFDIR
+-	w=test(os.environ.get('WAFDIR', ''))
++	w=test('/usr/share/waf')
+ 	if w: return w
+ 
+ 	#waf-light

Modified: packages/waf/trunk/debian/patches/series
===================================================================
--- packages/waf/trunk/debian/patches/series	2009-07-25 17:14:36 UTC (rev 3340)
+++ packages/waf/trunk/debian/patches/series	2009-07-25 18:51:41 UTC (rev 3341)
@@ -1,3 +1,3 @@
-waf_noninteractive.patch
+WAFDIR.patch
 waf_stylesheet.patch
 unpack_in_cwd.patch

Modified: packages/waf/trunk/debian/patches/unpack_in_cwd.patch
===================================================================
--- packages/waf/trunk/debian/patches/unpack_in_cwd.patch	2009-07-25 17:14:36 UTC (rev 3340)
+++ packages/waf/trunk/debian/patches/unpack_in_cwd.patch	2009-07-25 18:51:41 UTC (rev 3341)
@@ -14,4 +14,4 @@
 +	base = os.path.dirname(os.getcwd())
  
  	#devs use $WAFDIR
- 	w=test(os.environ.get('WAFDIR', ''))
+ 	w=test('/usr/share/waf')

Deleted: packages/waf/trunk/debian/patches/waf_noninteractive.patch
===================================================================
--- packages/waf/trunk/debian/patches/waf_noninteractive.patch	2009-07-25 17:14:36 UTC (rev 3340)
+++ packages/waf/trunk/debian/patches/waf_noninteractive.patch	2009-07-25 18:51:41 UTC (rev 3341)
@@ -1,17 +0,0 @@
-Description:	Do not ask to install files system-wide, simply do it
-Origin:		Debian
-Forwarded:	not-needed
-
-Index: waf-1.5.8/wscript
-===================================================================
---- waf-1.5.8.orig/wscript	2009-07-19 15:25:38.000000000 +0200
-+++ waf-1.5.8/wscript	2009-07-19 15:25:51.000000000 +0200
-@@ -310,8 +310,6 @@
- 		compute_revision()
- 
- 	if Options.commands['install']:
--		val = Options.options.yes or (not sys.stdin.isatty() or raw_input("Installing Waf is discouraged. Proceed? [y/n]"))
--		if val != True and val != "y": sys.exit(1)
- 		create_waf()
- 
- 	dir = os.path.join('lib', 'waf-%s-%s' % (VERSION, REVISION), 'wafadmin')

Modified: packages/waf/trunk/debian/rules
===================================================================
--- packages/waf/trunk/debian/rules	2009-07-25 17:14:36 UTC (rev 3340)
+++ packages/waf/trunk/debian/rules	2009-07-25 18:51:41 UTC (rev 3341)
@@ -10,18 +10,15 @@
 override_dh_auto_clean:
 	find -name "*.lock-wscript" -delete
 	find -name "*.pyc" -delete
-	rm -fr waf .waf-* doc/.waf-* build doc/book/build
+	rm -fr doc/book/build doc/book/wafadmin doc/book/waf-light
 
 override_dh_auto_configure:
-	python waf-light configure --prefix=$(CURDIR)/debian/waf/usr/share/waf
 
 override_dh_auto_build:
-	python waf-light --make-waf --prefix=/usr --zip-type=bz2 --strip --nopyc --nopyo
-	cd doc/book && python ../../waf configure && python ../../waf build
+	cd doc/book && cp -r $(CURDIR)/waf* . && \
+	sed -i 's|test(base)|test(os.getcwd())|' waf-light && \
+	python waf-light configure && python waf-light build
 
-override_dh_auto_install:
-	python waf-light install --strip --nopyc --nopyo
-
 get-orig-source:
 	cd $(CURDIR); \
 	wget http://waf.googlecode.com/files/waf-$(VERSION).tar.bz2; \

Modified: packages/waf/trunk/debian/waf-doc.doc-base
===================================================================
--- packages/waf/trunk/debian/waf-doc.doc-base	2009-07-25 17:14:36 UTC (rev 3340)
+++ packages/waf/trunk/debian/waf-doc.doc-base	2009-07-25 18:51:41 UTC (rev 3341)
@@ -6,5 +6,5 @@
 Section: Help/Books
 
 Format: HTML
-Index: /usr/share/doc/waf-doc/html/index.html
-Files: /usr/share/doc/waf-doc/html/*.html
+Index: /usr/share/doc/waf-doc/index.html
+Files: /usr/share/doc/waf-doc/*.html