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

Tue Mar 17 22:41:06 UTC 2009

Date: Tuesday, March 17, 2009 @ 22:41:05
  Author: piotr
Revision: 7886

* New upstream release (Closes: #517735)
  + depend on python-jinja2 instead of python-jinja
* Switch to python-support
* Add move_static_files_outside_site-packages patch
* Build depend on python-all (>= 2.5.4-1) (py_libdir is now used in
  debian/rules)
* remove .pickle file in clean rule
* Standards-Version bumped to 3.8.1, no changes needed.
TODO:
* move locale outside site-packages (warning: .js and .py files inside!)
* check python-central leftovers 
* create manpage for sphinx-autogen

Added:
  packages/sphinx/trunk/debian/dirs
  packages/sphinx/trunk/debian/patches/move_static_files_outside_site-packages.patch
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	2009-03-17 20:34:08 UTC (rev 7885)
+++ packages/sphinx/trunk/debian/changelog	2009-03-17 22:41:05 UTC (rev 7886)
@@ -1,3 +1,21 @@
+sphinx (0.6~b1-1) UNRELEASED; urgency=low
+
+  [ Piotr OÅ¼arowski ]
+  * New upstream release (Closes: #517735)
+    + depend on python-jinja2 instead of python-jinja
+  * Switch to python-support
+  * Add move_static_files_outside_site-packages patch
+  * Build depend on python-all (>= 2.5.4-1) (py_libdir is now used in
+    debian/rules)
+  * remove .pickle file in clean rule
+  * Standards-Version bumped to 3.8.1, no changes needed.
+  TODO:
+  * move locale outside site-packages (warning: .js and .py files inside!)
+  * check python-central leftovers 
+  * create manpage for sphinx-autogen
+
+ -- Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>  Tue, 17 Mar 2009 20:25:11 +0100
+
 sphinx (0.5.1-2) unstable; urgency=low
 
   [ Piotr OÅ¼arowski ]

Modified: packages/sphinx/trunk/debian/control
===================================================================
--- packages/sphinx/trunk/debian/control	2009-03-17 20:34:08 UTC (rev 7885)
+++ packages/sphinx/trunk/debian/control	2009-03-17 22:41:05 UTC (rev 7886)
@@ -4,16 +4,16 @@
 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), 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
+Build-Depends: debhelper (>= 7), python-all (>= 2.5.4-1), python-setuptools (>= 0.6c5), quilt (>= 0.40)
+Build-Depends-Indep: python-support (>= 0.6), python-docutils, python-pygments (>= 0.8), python-jinja2 (>= 2.1)
+Standards-Version: 3.8.1
 XS-Python-Version: >=2.4
 Vcs-Svn: svn://svn.debian.org/python-modules/packages/sphinx/trunk/
 Vcs-Browser: http://svn.debian.org/viewsvn/python-modules/packages/sphinx/trunk/
 
 Package: python-sphinx
 Architecture: all
-Depends: ${python:Depends}, python-docutils, python-pygments (>= 0.8), python-jinja (>= 1.1), libjs-jquery
+Depends: ${python:Depends}, python-docutils, python-pygments (>= 0.8), python-jinja2 (>= 2.1), libjs-jquery
 Recommends: python (>= 2.6) | python-simplejson, python-imaging
 Suggests: jsmath
 XB-Python-Version: ${python:Versions}

Added: packages/sphinx/trunk/debian/dirs
===================================================================
--- packages/sphinx/trunk/debian/dirs	                        (rev 0)
+++ packages/sphinx/trunk/debian/dirs	2009-03-17 22:41:05 UTC (rev 7886)
@@ -0,0 +1 @@
+/usr/share/sphinx/

Added: packages/sphinx/trunk/debian/patches/move_static_files_outside_site-packages.patch
===================================================================
--- packages/sphinx/trunk/debian/patches/move_static_files_outside_site-packages.patch	                        (rev 0)
+++ packages/sphinx/trunk/debian/patches/move_static_files_outside_site-packages.patch	2009-03-17 22:41:05 UTC (rev 7886)
@@ -0,0 +1,47 @@
+# move static files outside site-packages so that they can be shared between
+# different Python versions
+Index: sphinx-0.6~b1/sphinx/builders/changes.py
+===================================================================
+--- sphinx-0.6~b1.orig/sphinx/builders/changes.py
++++ sphinx-0.6~b1/sphinx/builders/changes.py
+@@ -137,12 +137,10 @@ class ChangesBuilder(Builder):
+                 f.close()
+         themectx = dict(('theme_' + key, val) for (key, val) in
+                         self.theme.get_options({}).iteritems())
+-        copy_static_entry(path.join(package_dir, 'themes', 'default',
+-                                    'static', 'default.css_t'),
++        copy_static_entry('/usr/share/sphinx/themes/default/static/default.css_t',
+                           path.join(self.outdir, 'default.css_t'),
+                           self, themectx)
+-        copy_static_entry(path.join(package_dir, 'themes', 'basic',
+-                                    'static', 'basic.css'),
++        copy_static_entry('/usr/share/sphinx/themes/basic/static/basic.css',
+                           path.join(self.outdir, 'basic.css'), self)
+ 
+     def hl(self, text, version):
+Index: sphinx-0.6~b1/sphinx/builders/latex.py
+===================================================================
+--- sphinx-0.6~b1.orig/sphinx/builders/latex.py
++++ sphinx-0.6~b1/sphinx/builders/latex.py
+@@ -195,7 +195,7 @@ class LaTeXBuilder(Builder):
+                             path.join(self.outdir, logobase))
+ 
+         self.info(bold('copying TeX support files... '), nonl=True)
+-        staticdirname = path.join(package_dir, 'texinputs')
++        staticdirname = '/usr/share/sphinx/texinputs'
+         for filename in os.listdir(staticdirname):
+             if not filename.startswith('.'):
+                 shutil.copyfile(path.join(staticdirname, filename),
+Index: sphinx-0.6~b1/sphinx/builders/pdf.py
+===================================================================
+--- sphinx-0.6~b1.orig/sphinx/builders/pdf.py
++++ sphinx-0.6~b1/sphinx/builders/pdf.py
+@@ -185,7 +185,7 @@ class PdfBuilder(Builder):
+                             path.join(self.outdir, logobase))
+ 
+         self.info(bold('copying TeX support files... '), nonl=True)
+-        staticdirname = path.join(package_dir, 'texinputs')
++        staticdirname = '/usr/share/sphinx/texinputs'
+         for filename in os.listdir(staticdirname):
+             if not filename.startswith('.'):
+                 shutil.copyfile(path.join(staticdirname, filename),

Modified: packages/sphinx/trunk/debian/patches/series
===================================================================
--- packages/sphinx/trunk/debian/patches/series	2009-03-17 20:34:08 UTC (rev 7885)
+++ packages/sphinx/trunk/debian/patches/series	2009-03-17 22:41:05 UTC (rev 7886)
@@ -1 +1,2 @@
+move_static_files_outside_site-packages.patch
 disable_ez_setup.patch

Modified: packages/sphinx/trunk/debian/rules
===================================================================
--- packages/sphinx/trunk/debian/rules	2009-03-17 20:34:08 UTC (rev 7885)
+++ packages/sphinx/trunk/debian/rules	2009-03-17 22:41:05 UTC (rev 7886)
@@ -2,8 +2,10 @@
 # -*- makefile -*-
 
 include /usr/share/quilt/quilt.make
+include /usr/share/python/python.mk
 
 PACKAGE_NAME=python-sphinx
+PACKAGE_DIR=$(CURDIR)/debian/$(PACKAGE_NAME)
 
 build: build-stamp
 
@@ -19,7 +21,7 @@
 	dh_testroot
 	find . -name '*.py[co]' -delete
 	rm -rf _build build
-	dh_clean
+	dh_clean sphinx/pycode/*.pickle
 
 clean-patched: patch
 	dh_testdir
@@ -30,26 +32,31 @@
 	dh_testroot
 	dh_installdirs
 
-	python setup.py install --no-compile --root $(CURDIR)/debian/$(PACKAGE_NAME)
+	python setup.py install --no-compile --root $(PACKAGE_DIR)
+	# move static files outside {site,dist}-packages
+	mv $(PACKAGE_DIR)$(call py_libdir,$(shell pyversions -d))/sphinx/texinputs \
+	   $(PACKAGE_DIR)/usr/share/sphinx/
+	mv $(PACKAGE_DIR)$(call py_libdir,$(shell pyversions -d))/sphinx/themes \
+	   $(PACKAGE_DIR)/usr/share/sphinx/
+	# use packaged jQuery
+	dh_link /usr/share/javascript/jquery/jquery.js \
+		/usr/share/sphinx/themes/basic/static/jquery.js
 	# 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
+	install -m 755 $(CURDIR)/sphinx-build.py $(PACKAGE_DIR)/usr/bin/sphinx-build
+	install -m 755 $(CURDIR)/sphinx-quickstart.py $(PACKAGE_DIR)/usr/bin/sphinx-quickstart
 
 binary-indep: build install
 	dh_testdir
 	dh_testroot
 	dh_installchangelogs CHANGES
 	dh_installdocs
-	rm -rf $(CURDIR)/debian/$(PACKAGE_NAME)/usr/share/doc/python-sphinx/html/.doctrees
+	rm -rf $(PACKAGE_DIR)/usr/share/doc/python-sphinx/html/.doctrees
 	dh_installexamples
 	dh_installman
-	dh_pycentral
+	dh_pysupport
 	dh_compress -X.py -X.js -X.rst -X.json -X.doctree -X.txt
-	ln -sf /usr/share/javascript/jquery/jquery.js \
-		$(CURDIR)/debian/$(PACKAGE_NAME)/usr/share/doc/python-sphinx/html/_static/jquery.js
-	ln -sf /usr/share/javascript/jquery/jquery.js \
-		$(CURDIR)/debian/$(PACKAGE_NAME)/usr/share/pyshared/sphinx/static/jquery.js
-	dh_link
+	dh_link /usr/share/javascript/jquery/jquery.js \
+		/usr/share/doc/python-sphinx/html/_static/jquery.js
 	dh_fixperms
 	dh_installdeb
 	dh_gencontrol


