[Python-modules-commits] r5077 - in packages/sphinx/trunk/debian (4 files)

[piotr at users.alioth.debian.org]

    Date: Sunday, April 20, 2008 @ 21:38:25
  Author: piotr
Revision: 5077

* install scripts not touched by evil easy install
  + new add_shebangs patch
* really remove bundled jinja
* add python-pygments to build depends

Modified:
  packages/sphinx/trunk/debian/changelog
  packages/sphinx/trunk/debian/control
  packages/sphinx/trunk/debian/patches/series
  packages/sphinx/trunk/debian/rules

Modified: packages/sphinx/trunk/debian/changelog
===================================================================
--- packages/sphinx/trunk/debian/changelog	2008-04-20 21:34:57 UTC (rev 5076)
+++ packages/sphinx/trunk/debian/changelog	2008-04-20 21:38:25 UTC (rev 5077)
@@ -1,10 +1,11 @@
 sphinx (0.1.61950-1) unstable; urgency=low
 
   * Initial release (Closes: #474782)
-  
   * Added patch disable-sphinx-web.patch, disabling installation of
     sphinx-web, which is not yet ready.
+  * Added patch add_shebangs.patch, adding shebangs in sphinx-build and
+    sphinx-quickstart
   * Added manpages for sphinx-build(1) and sphinx-quickstart(1).
   * Removed bundled jinja instance.
 
- -- Mikhail Gusarov <dottedmag at dottedmag.net>  Mon,  1 Jan 2007 16:03:10 +0600
+ -- Mikhail Gusarov <dottedmag at dottedmag.net>  Sun, 20 Apr 2008 23:01:50 +0200

Modified: packages/sphinx/trunk/debian/control
===================================================================
--- packages/sphinx/trunk/debian/control	2008-04-20 21:34:57 UTC (rev 5076)
+++ packages/sphinx/trunk/debian/control	2008-04-20 21:38:25 UTC (rev 5077)
@@ -4,8 +4,8 @@
 Maintainer: Mikhail Gusarov <dottedmag at dottedmag.net>
 Uploaders: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
 Homepage: http://sphinx.pocoo.org/
-Build-Depends: debhelper (>= 5.0.38), python-all-dev (>= 2.3.5-11), python-setuptools (>= 0.6c5), quilt
-Build-Depends-Indep: python-central (>= 0.5.6), python-docutils
+Build-Depends: debhelper (>= 5), python-all-dev (>= 2.3.5-11), python-setuptools (>= 0.6c5), quilt
+Build-Depends-Indep: python-central (>= 0.5.6), python-docutils, python-pygments (>= 0.8)
 Standards-Version: 3.7.3
 XS-Python-Version: all
 

Modified: packages/sphinx/trunk/debian/patches/series
===================================================================
--- packages/sphinx/trunk/debian/patches/series	2008-04-20 21:34:57 UTC (rev 5076)
+++ packages/sphinx/trunk/debian/patches/series	2008-04-20 21:38:25 UTC (rev 5077)
@@ -1 +1,2 @@
+add_shebangs.patch
 disable-sphinx-web.patch

Modified: packages/sphinx/trunk/debian/rules
===================================================================
--- packages/sphinx/trunk/debian/rules	2008-04-20 21:34:57 UTC (rev 5076)
+++ packages/sphinx/trunk/debian/rules	2008-04-20 21:38:25 UTC (rev 5077)
@@ -17,23 +17,26 @@
 clean: unpatch
 	dh_testdir
 	dh_testroot
-	-rm -f build-stamp
 
 	python setup.py clean
 	rm -rf build
-	rm -f build-stamp
 	find . -name '*.py[co]' -delete
 	rm -rf _build
 
-	dh_clean
+	dh_clean build-stamp
 
-install: build
+install: patch build
 	dh_testdir
 	dh_testroot
+	dh_installdirs
 	dh_clean -k
 
 	python setup.py install --no-compile --root $(CURDIR)/debian/$(PACKAGE_NAME)
-	rm -rf $(CURDIR)/debian/$(PACKAGE_NAME)/usr/lib/*/sphinx/jinja
+	# remove bundled jinja
+	rm -rf $(CURDIR)/debian/$(PACKAGE_NAME)/usr/lib/`pyversions -d`/site-packages/sphinx/jinja
+	# install scripts not touched by easy install
+	install -m 755 $(CURDIR)/sphinx-build.py $(CURDIR)/debian/$(PACKAGE_NAME)/usr/bin/sphinx-build
+	install -m 755 $(CURDIR)/sphinx-quickstart.py $(CURDIR)/debian/$(PACKAGE_NAME)/usr/bin/sphinx-quickstart
 
 binary-indep: build install
 	dh_testdir