[Python-modules-commits] r18921 - in packages/sphinx/branches/1.1/debian (13 files)
jwilk at users.alioth.debian.org
jwilk at users.alioth.debian.org
Sat Oct 15 12:16:13 UTC 2011
Date: Saturday, October 15, 2011 @ 12:16:11
Author: jwilk
Revision: 18921
* Rephrase short package description, so that it's... shorter.
* New binary package: sphinx-common, containing templates, translations and other data files.
* New binary package: sphinx-doc, containing documentation.
* Run dh_install with --fail-missing.
Added:
packages/sphinx/branches/1.1/debian/sphinx-common.install
packages/sphinx/branches/1.1/debian/sphinx-doc.doc-base
(from rev 18918, packages/sphinx/branches/1.1/debian/python-sphinx.doc-base)
packages/sphinx/branches/1.1/debian/sphinx-doc.docs
(from rev 18918, packages/sphinx/branches/1.1/debian/python-sphinx.docs)
packages/sphinx/branches/1.1/debian/sphinx-doc.links
(from rev 18918, packages/sphinx/branches/1.1/debian/python-sphinx.links)
packages/sphinx/branches/1.1/debian/sphinx-doc.lintian-overrides
Modified:
packages/sphinx/branches/1.1/debian/changelog
packages/sphinx/branches/1.1/debian/control
packages/sphinx/branches/1.1/debian/python-sphinx.docs
packages/sphinx/branches/1.1/debian/python-sphinx.install
packages/sphinx/branches/1.1/debian/rules
Deleted:
packages/sphinx/branches/1.1/debian/python-sphinx.dirs
packages/sphinx/branches/1.1/debian/python-sphinx.doc-base
packages/sphinx/branches/1.1/debian/python-sphinx.links
Modified: packages/sphinx/branches/1.1/debian/changelog
===================================================================
--- packages/sphinx/branches/1.1/debian/changelog 2011-10-15 11:07:49 UTC (rev 18920)
+++ packages/sphinx/branches/1.1/debian/changelog 2011-10-15 12:16:11 UTC (rev 18921)
@@ -17,6 +17,15 @@
* Update version numbers in the manual pages. Add a build-time warning to be
emitted if they ever get out of date again.
* Copy sphinx-apidoc script from upstream VCS.
+ * Rephrase short package description, so that it's... shorter.
+ * New binary package: sphinx-common, containing templates, translations and
+ other data files.
+ * New binary package: sphinx-doc, containing documentation.
+ + Conflict with previous versions python-sphinx.
+ + /usr/share/doc/python-sphinx/html used to be a directory, but is now a
+ symlink. Conflict with older versions of python-docutils, so that dpkg
+ can replace one with the other. Add lintian override.
+ * Run dh_install with --fail-missing.
* Refactor the code responsible for moving data into a private directory.
Rename some variables to make them lowercase. Don't use CURDIR where it's
not necessary.
@@ -28,7 +37,7 @@
* Remove unneeded mkdir call.
* Fix a typo in the package description.
- -- Jakub Wilk <jwilk at debian.org> Sat, 15 Oct 2011 11:55:02 +0200
+ -- Jakub Wilk <jwilk at debian.org> Sat, 15 Oct 2011 14:08:17 +0200
sphinx (1.0.8+dfsg-2) unstable; urgency=low
Modified: packages/sphinx/branches/1.1/debian/control
===================================================================
--- packages/sphinx/branches/1.1/debian/control 2011-10-15 11:07:49 UTC (rev 18920)
+++ packages/sphinx/branches/1.1/debian/control 2011-10-15 12:16:11 UTC (rev 18921)
@@ -23,10 +23,11 @@
python-docutils (>= 0.7),
python-pygments (>= 1.2),
python-jinja2 (>= 2.3),
- ${sphinxdoc:Depends}, libjs-sphinxdoc (= ${source:Version})
-Recommends: python (>= 2.6) | python-simplejson, python-imaging
+ sphinx-common (= ${source:Version})
+Recommends: python (>= 2.6) | python-simplejson, python-imaging,
+ sphinx-doc
Suggests: jsmath
-Description: tool for producing documentation for Python projects
+Description: documentation generator for Python projects
Sphinx is a tool for producing documentation for Python projects, using
reStructuredText as markup language.
.
@@ -39,6 +40,31 @@
- automatic testing of code snippets,
- including docstrings from Python modules.
+Package: sphinx-common
+Architecture: all
+Depends: ${misc:Depends},
+ libjs-sphinxdoc (= ${source:Version})
+Recommends: python-sphinx
+Breaks: python-sphinx (<< 1.1)
+Replaces: python-sphinx (<< 1.1)
+Description: documentation generator for Python projects - common data
+ Sphinx is a tool for producing documentation for Python projects, using
+ reStructuredText as markup language.
+ .
+ This package includes templates, translations and other data files.
+
+Package: sphinx-doc
+Section: doc
+Architecture: all
+Conflicts: python-sphinx (<< 1.1)
+Replaces: python-sphinx (<< 1.1)
+Depends: ${misc:Depends}, ${sphinxdoc:Depends}
+Description: documentation generator for Python projects - documentation
+ Sphinx is a tool for producing documentation for Python projects, using
+ reStructuredText as markup language.
+ .
+ This package includes documentation of Sphinx itself.
+
Package: libjs-sphinxdoc
Section: web
Architecture: all
Deleted: packages/sphinx/branches/1.1/debian/python-sphinx.dirs
===================================================================
--- packages/sphinx/branches/1.1/debian/python-sphinx.dirs 2011-10-15 11:07:49 UTC (rev 18920)
+++ packages/sphinx/branches/1.1/debian/python-sphinx.dirs 2011-10-15 12:16:11 UTC (rev 18921)
@@ -1,3 +0,0 @@
-/usr/share/sphinx/locale
-/usr/share/sphinx/pycode
-/usr/share/sphinx/ext/autosummary
Deleted: packages/sphinx/branches/1.1/debian/python-sphinx.doc-base
===================================================================
--- packages/sphinx/branches/1.1/debian/python-sphinx.doc-base 2011-10-15 11:07:49 UTC (rev 18920)
+++ packages/sphinx/branches/1.1/debian/python-sphinx.doc-base 2011-10-15 12:16:11 UTC (rev 18921)
@@ -1,12 +0,0 @@
-Document: sphinx-manual
-Title: Sphinx documentation builder manual
-Author: Georg Brandl
-Abstract: Sphinx is a tool that translates a set of reStructuredText_ source
- files into various output formats, automatically producing cross-references,
- indices etc. It can also generate a LaTeX file that you can compile into a PDF
- version of the documents.
-Section: Text
-
-Format: HTML
-Index: /usr/share/doc/python-sphinx/html/index.html
-Files: /usr/share/doc/python-sphinx/html/*
Modified: packages/sphinx/branches/1.1/debian/python-sphinx.docs
===================================================================
--- packages/sphinx/branches/1.1/debian/python-sphinx.docs 2011-10-15 11:07:49 UTC (rev 18920)
+++ packages/sphinx/branches/1.1/debian/python-sphinx.docs 2011-10-15 12:16:11 UTC (rev 18921)
@@ -1,3 +1,2 @@
README
AUTHORS
-build/html
Modified: packages/sphinx/branches/1.1/debian/python-sphinx.install
===================================================================
--- packages/sphinx/branches/1.1/debian/python-sphinx.install 2011-10-15 11:07:49 UTC (rev 18920)
+++ packages/sphinx/branches/1.1/debian/python-sphinx.install 2011-10-15 12:16:11 UTC (rev 18921)
@@ -1,2 +1,4 @@
debian/dh-sphinxdoc/sphinxdoc.pm /usr/share/perl5/Debian/Debhelper/Sequence/
debian/dh-sphinxdoc/dh_sphinxdoc /usr/bin/
+/usr/lib/python2.*/*-packages/
+/usr/bin/*
Deleted: packages/sphinx/branches/1.1/debian/python-sphinx.links
===================================================================
--- packages/sphinx/branches/1.1/debian/python-sphinx.links 2011-10-15 11:07:49 UTC (rev 18920)
+++ packages/sphinx/branches/1.1/debian/python-sphinx.links 2011-10-15 12:16:11 UTC (rev 18921)
@@ -1 +0,0 @@
-/usr/share/doc/python-sphinx/html/_sources/ /usr/share/doc/python-sphinx/rst
Modified: packages/sphinx/branches/1.1/debian/rules
===================================================================
--- packages/sphinx/branches/1.1/debian/rules 2011-10-15 11:07:49 UTC (rev 18920)
+++ packages/sphinx/branches/1.1/debian/rules 2011-10-15 12:16:11 UTC (rev 18921)
@@ -10,7 +10,7 @@
upstream_dfsg_version = $(firstword $(subst -, ,$(debian_version)))
upstream_version = $(firstword $(subst +, ,$(debian_version)))
-debroot = debian/python-sphinx/
+debroot = debian/tmp/
site_packages = $(call py_libdir,$(shell pyversions -d))
javascript_path = /usr/share/javascript/sphinxdoc/1.0/
@@ -49,11 +49,14 @@
dh_installdirs
python setup.py install --no-compile --install-layout=deb --root $(debroot)
# move static files outside {site,dist}-packages
+ mkdir -p $(debroot)/usr/share/sphinx/
cd $(debroot) && mv -t usr/share/sphinx/ .$(site_packages)/sphinx/texinputs \
.$(site_packages)/sphinx/themes
+ mkdir -p $(debroot)/usr/share/sphinx/pycode/
cd $(debroot) && mv -t usr/share/sphinx/pycode/ \
.$(site_packages)/sphinx/pycode/Grammar.txt
cp -t $(debroot)/usr/share/sphinx/pycode/ sphinx/pycode/Grammar.pickle
+ mkdir -p $(debroot)/usr/share/sphinx/ext/autosummary/
cd $(debroot) && mv -t usr/share/sphinx/ext/autosummary/ \
.$(site_packages)/sphinx/ext/autosummary/templates
set -e; \
@@ -92,8 +95,9 @@
dh_testroot
dh_installchangelogs CHANGES
dh_installdocs
- dh_install
- ./debian/dh-sphinxdoc/dh_sphinxdoc /usr/share/doc/python-sphinx/html/
+ dh_install --fail-missing
+ dh_lintian
+ ./debian/dh-sphinxdoc/dh_sphinxdoc -p sphinx-doc /usr/share/doc/sphinx-doc/html/
dh_installexamples
ifneq ($(shell grep -h '^[.]TH' debian/*.1 | cut -d ' ' -f 6-7 | sort -u), "Sphinx $(upstream_version)")
$(warning W: version numbers in the manual pages are out of date)
Added: packages/sphinx/branches/1.1/debian/sphinx-common.install
===================================================================
--- packages/sphinx/branches/1.1/debian/sphinx-common.install (rev 0)
+++ packages/sphinx/branches/1.1/debian/sphinx-common.install 2011-10-15 12:16:11 UTC (rev 18921)
@@ -0,0 +1,2 @@
+/usr/share/sphinx/
+/usr/share/locale/
Copied: packages/sphinx/branches/1.1/debian/sphinx-doc.doc-base (from rev 18918, packages/sphinx/branches/1.1/debian/python-sphinx.doc-base)
===================================================================
--- packages/sphinx/branches/1.1/debian/sphinx-doc.doc-base (rev 0)
+++ packages/sphinx/branches/1.1/debian/sphinx-doc.doc-base 2011-10-15 12:16:11 UTC (rev 18921)
@@ -0,0 +1,12 @@
+Document: sphinx-manual
+Title: Sphinx documentation builder manual
+Author: Georg Brandl
+Abstract: Sphinx is a tool that translates a set of reStructuredText_ source
+ files into various output formats, automatically producing cross-references,
+ indices etc. It can also generate a LaTeX file that you can compile into a PDF
+ version of the documents.
+Section: Text
+
+Format: HTML
+Index: /usr/share/doc/sphinx-doc/html/index.html
+Files: /usr/share/doc/sphinx-doc/html/*
Copied: packages/sphinx/branches/1.1/debian/sphinx-doc.docs (from rev 18918, packages/sphinx/branches/1.1/debian/python-sphinx.docs)
===================================================================
--- packages/sphinx/branches/1.1/debian/sphinx-doc.docs (rev 0)
+++ packages/sphinx/branches/1.1/debian/sphinx-doc.docs 2011-10-15 12:16:11 UTC (rev 18921)
@@ -0,0 +1,3 @@
+README
+AUTHORS
+build/html
Copied: packages/sphinx/branches/1.1/debian/sphinx-doc.links (from rev 18918, packages/sphinx/branches/1.1/debian/python-sphinx.links)
===================================================================
--- packages/sphinx/branches/1.1/debian/sphinx-doc.links (rev 0)
+++ packages/sphinx/branches/1.1/debian/sphinx-doc.links 2011-10-15 12:16:11 UTC (rev 18921)
@@ -0,0 +1,3 @@
+/usr/share/doc/sphinx-doc/html/_sources/ /usr/share/doc/python-sphinx/rst
+/usr/share/doc/sphinx-doc/rst/ /usr/share/doc/python-sphinx/rst
+/usr/share/doc/sphinx-doc/html/ /usr/share/doc/python-sphinx/html
Added: packages/sphinx/branches/1.1/debian/sphinx-doc.lintian-overrides
===================================================================
--- packages/sphinx/branches/1.1/debian/sphinx-doc.lintian-overrides (rev 0)
+++ packages/sphinx/branches/1.1/debian/sphinx-doc.lintian-overrides 2011-10-15 12:16:11 UTC (rev 18921)
@@ -0,0 +1,4 @@
+# As per policy 6.6, dpkg cannot replace a directory (shipped in
+# python-sphinx << 1.1) with a symlink to directory (shipped in
+# sphinx-doc).
+sphinx-doc: conflicts-with-version python-sphinx (<< 1.1)
More information about the Python-modules-commits
mailing list