[Python-modules-commits] r7110 - in packages/sphinx/trunk/debian (6 files)

[piotr at users.alioth.debian.org]

    Date: Wednesday, December 17, 2008 @ 19:16:50
  Author: piotr
Revision: 7110

* New upstream release (upload to experimental due to Lenny freeze, to ease testing rev. dependencies)
* Add disable_ez_setup patch (and quilt to build dependencies) so that it will not try to download stuff that is already installed on the system
* Add jsmath to suggested packages (Closes: #507691)

Added:
  packages/sphinx/trunk/debian/patches/
  packages/sphinx/trunk/debian/patches/disable_ez_setup.patch
  packages/sphinx/trunk/debian/patches/series
Modified:
  packages/sphinx/trunk/debian/changelog
  packages/sphinx/trunk/debian/control
  packages/sphinx/trunk/debian/rules

Modified: packages/sphinx/trunk/debian/changelog
===================================================================
--- packages/sphinx/trunk/debian/changelog	2008-12-17 08:52:12 UTC (rev 7109)
+++ packages/sphinx/trunk/debian/changelog	2008-12-17 19:16:50 UTC (rev 7110)
@@ -1,3 +1,14 @@
+sphinx (0.5.1-1) UNRELEASED; urgency=low
+
+  [ Piotr Ożarowski ]
+  * New upstream release (upload to experimental due to Lenny freeze, to ease
+    testing rev. dependencies)
+  * Add disable_ez_setup patch (and quilt to build dependencies) so that it
+    will not try to download stuff that is already installed on the system
+  * Add jsmath to suggested packages (Closes: #507691)
+
+ -- Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>  Wed, 17 Dec 2008 18:42:59 +0100
+
 sphinx (0.5-1) experimental; urgency=low
 
   [ Sandro Tosi ]

Modified: packages/sphinx/trunk/debian/control
===================================================================
--- packages/sphinx/trunk/debian/control	2008-12-17 08:52:12 UTC (rev 7109)
+++ packages/sphinx/trunk/debian/control	2008-12-17 19:16:50 UTC (rev 7110)
@@ -4,7 +4,7 @@
 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 (>= 7), python-all-dev (>= 2.3.5-11), python-setuptools (>= 0.6c5)
+Build-Depends: debhelper (>= 7), python-all-dev (>= 2.3.5-11), python-setuptools (>= 0.6c5), quilt (>= 0.40)
 Build-Depends-Indep: python-central (>= 0.5.6), python-docutils, python-pygments (>= 0.8), python-jinja (>= 1.1)
 Standards-Version: 3.8.0
 XS-Python-Version: >=2.4
@@ -15,6 +15,7 @@
 Architecture: all
 Depends: ${python:Depends}, python-docutils, python-pygments (>= 0.8), python-jinja (>= 1.1), libjs-jquery
 Recommends: python (>= 2.6) | python-simplejson, python-imaging
+Suggests: jsmath
 XB-Python-Version: ${python:Versions}
 Description: tool for producing documentation for Python projects
  Sphinx is a tool for producing documentation for Python projects, using

Added: packages/sphinx/trunk/debian/patches/disable_ez_setup.patch
===================================================================
--- packages/sphinx/trunk/debian/patches/disable_ez_setup.patch	                        (rev 0)
+++ packages/sphinx/trunk/debian/patches/disable_ez_setup.patch	2008-12-17 19:16:50 UTC (rev 7110)
@@ -0,0 +1,15 @@
+all dependencies should be are already installed (see Build-Depends*),
+ignore ez_setup's attempt to download different version of setuptools
+Index: sphinx-0.5.1/setup.py
+===================================================================
+--- sphinx-0.5.1.orig/setup.py
++++ sphinx-0.5.1/setup.py
+@@ -1,6 +1,6 @@
+ # -*- coding: utf-8 -*-
+-import ez_setup
+-ez_setup.use_setuptools()
++#import ez_setup
++#ez_setup.use_setuptools()
+ 
+ import os
+ import sys

Added: packages/sphinx/trunk/debian/patches/series
===================================================================
--- packages/sphinx/trunk/debian/patches/series	                        (rev 0)
+++ packages/sphinx/trunk/debian/patches/series	2008-12-17 19:16:50 UTC (rev 7110)
@@ -0,0 +1 @@
+disable_ez_setup.patch

Modified: packages/sphinx/trunk/debian/rules
===================================================================
--- packages/sphinx/trunk/debian/rules	2008-12-17 08:52:12 UTC (rev 7109)
+++ packages/sphinx/trunk/debian/rules	2008-12-17 19:16:50 UTC (rev 7110)
@@ -1,6 +1,8 @@
 #!/usr/bin/make -f
 # -*- makefile -*-
 
+include /usr/share/quilt/quilt.make
+
 PACKAGE_NAME=python-sphinx
 
 build: build-stamp
@@ -12,22 +14,21 @@
 	python sphinx-build.py doc _build/html
 	touch build-stamp
 
-clean:
+clean: clean-patched unpatch
 	dh_testdir
 	dh_testroot
-
-	python setup.py clean
-	rm -rf build
 	find . -name '*.py[co]' -delete
-	rm -rf _build
-
+	rm -rf _build build
 	dh_clean
 
-install: build
+clean-patched: patch
 	dh_testdir
+	python setup.py clean
+
+install: build patch
+	dh_testdir
 	dh_testroot
 	dh_installdirs
-	dh_clean -k
 
 	python setup.py install --no-compile --root $(CURDIR)/debian/$(PACKAGE_NAME)
 	# install scripts not touched by easy install