[Python-modules-commits] r16812 - in packages/pebl/trunk/debian (changelog rules)

[yoh at users.alioth.debian.org]

    Date: Friday, April 29, 2011 @ 01:11:25
  Author: yoh
Revision: 16812

debian/rules: install-layout=deb, PYTHONPATH for sphinx (Closes: #623123)

* debian/rules (Closes: #623123):
  - Unconditionally provide --install-layout=deb
  - Point PYTHONPATH to the built version while invoking sphinx-build
  - Use inplace sid operation for tuning up shebang in /usr/bin/pebl

Modified:
  packages/pebl/trunk/debian/changelog
  packages/pebl/trunk/debian/rules

Modified: packages/pebl/trunk/debian/changelog
===================================================================
--- packages/pebl/trunk/debian/changelog	2011-04-29 01:11:06 UTC (rev 16811)
+++ packages/pebl/trunk/debian/changelog	2011-04-29 01:11:25 UTC (rev 16812)
@@ -4,7 +4,11 @@
     - Vcs headers
     - Slight tune ups in the descriptions
     - Myself to uploaders
-
+  * debian/rules (Closes: #623123):
+    - Unconditionally provide --install-layout=deb
+    - Point PYTHONPATH to the built version while invoking sphinx-build
+    - Use inplace sid operation for tuning up shebang in /usr/bin/pebl
+    
  -- Yaroslav Halchenko <debian at onerussian.com>  Thu, 28 Apr 2011 16:55:59 -0400
 
 pebl (1.0.2-1) unstable; urgency=low

Modified: packages/pebl/trunk/debian/rules
===================================================================
--- packages/pebl/trunk/debian/rules	2011-04-29 01:11:06 UTC (rev 16811)
+++ packages/pebl/trunk/debian/rules	2011-04-29 01:11:25 UTC (rev 16812)
@@ -3,16 +3,18 @@
 include /usr/share/quilt/quilt.make
 
 PYVERS=$(shell pyversions -vs)
+PYVER=$(shell pyversions -vd)
 
 config: config-stamp
-config-stamp: 
+config-stamp:
 	dh_testdir
 	[ ! -d debian/patches ] || $(MAKE) -f /usr/share/quilt/quilt.make patch
 	touch $@
 
 build: $(PYVERS:%=build-python%)
 	mkdir -p build/html/
-	sphinx-build docs/src/ build/html/
+	PYTHONPATH=$$(/bin/ls -d $(CURDIR)/build/lib.*-$(PYVER)) \
+		sphinx-build docs/src/ build/html/
 
 build-python%: config-stamp
 	dh_testdir
@@ -36,7 +38,8 @@
 	dh_testroot
 	python$* setup.py install \
 		--no-compile \
-		--root=$(CURDIR)/debian/python-pebl
+		--root=$(CURDIR)/debian/python-pebl \
+		--install-layout=deb
 	touch $@
 
 binary-indep: install
@@ -69,15 +72,9 @@
 	dh_link -a
 	dh_pysupport -a
 	dh_strip -a --dbg-package=python-pebl-dbg
-	rm -f debian/python-pebl/usr/local/bin/pebl
-	-rmdir debian/python-pebl/usr/local/bin/
-	-rmdir debian/python-pebl/usr/local/
 	mkdir -p debian/python-pebl/usr/bin/
-	cp debian/python-pebl/usr/bin/pebl debian/python-pebl/usr/bin/pebl.orig
-	cat debian/python-pebl/usr/bin/pebl.orig \
-		| sed -e 's|^#!/usr/bin/python.*$$|#!/usr/bin/python|g' \
-		> debian/python-pebl/usr/bin/pebl
-	rm debian/python-pebl/usr/bin/pebl.orig
+	sed -i -e 's|^#!/usr/bin/python.*$$|#!/usr/bin/python|g' \
+		debian/python-pebl/usr/bin/pebl
 	dh_compress -a --exclude=.js --exclude=.pdf --exclude=.py --exclude=.txt
 	dh_fixperms -a
 	[ ! -e /usr/bin/dh_buildinfo ] || dh_buildinfo -a