[Python-modules-commits] r4864 - in packages/python-docutils/trunk/debian (9 files)
smcv-guest at users.alioth.debian.org
smcv-guest at users.alioth.debian.org
Thu Mar 20 20:53:12 UTC 2008
Date: Thursday, March 20, 2008 @ 20:53:10
Author: smcv-guest
Revision: 4864
* Apply patch from Ubuntu to fix build with current python-central
(closes: #470697)
* Simplify and re-indent debian/rules for better clarity
* Remove man page during clean
* Keep lintian happy: relax setuptools dependency from 0.6b3-1 to 0.6b3,
remove override for build-depends-without-arch-dep python-setuptools (bug
fixed in lintian), Standards-Version: 3.7.3 (no changes)
* Set XS-Dm-Upload-Allowed: yes so I can upload in future
Added:
packages/python-docutils/trunk/debian/50python-docutils.el
(from rev 3674, packages/python-docutils/trunk/debian/emacs-start.el)
packages/python-docutils/trunk/debian/python-docutils.install
packages/python-docutils/trunk/debian/python-roman.install
Modified:
packages/python-docutils/trunk/debian/changelog
packages/python-docutils/trunk/debian/control
packages/python-docutils/trunk/debian/patches/10_doc_debian_paths.dpatch
packages/python-docutils/trunk/debian/rules
Deleted:
packages/python-docutils/trunk/debian/emacs-start.el
packages/python-docutils/trunk/debian/source.lintian-overrides
Copied: packages/python-docutils/trunk/debian/50python-docutils.el (from rev 3674, packages/python-docutils/trunk/debian/emacs-start.el)
===================================================================
--- packages/python-docutils/trunk/debian/50python-docutils.el (rev 0)
+++ packages/python-docutils/trunk/debian/50python-docutils.el 2008-03-20 20:53:10 UTC (rev 4864)
@@ -0,0 +1,10 @@
+;; autoload support for reStructuredText, from python-docutils
+(autoload 'rst-mode "rst" "mode for editing reStructuredText documents" t)
+
+;; The following lines are not enabled by default because the 'correct'
+;; extension for reStructuredText files, according to the ReST
+;; documentation, is '.txt'. (Or nothing, for that matter.)
+;;
+;;(setq auto-mode-alist
+;; (append '(("\\.rst$" . rst-mode)
+;; ("\\.rest$" . rst-mode)) auto-mode-alist))
Modified: packages/python-docutils/trunk/debian/changelog
===================================================================
--- packages/python-docutils/trunk/debian/changelog 2008-03-20 15:17:31 UTC (rev 4863)
+++ packages/python-docutils/trunk/debian/changelog 2008-03-20 20:53:10 UTC (rev 4864)
@@ -4,8 +4,18 @@
* debian/control
- added Vcs-Browser
- -- Sandro Tosi <matrixhasu at gmail.com> Wed, 02 Jan 2008 12:33:45 +0100
+ [ Simon McVittie ]
+ * Apply patch from Ubuntu to fix build with current python-central
+ (closes: #470697)
+ * Simplify and re-indent debian/rules for better clarity
+ * Remove man page during clean
+ * Keep lintian happy: relax setuptools dependency from 0.6b3-1 to 0.6b3,
+ remove override for build-depends-without-arch-dep python-setuptools (bug
+ fixed in lintian), Standards-Version: 3.7.3 (no changes)
+ * Set XS-Dm-Upload-Allowed: yes so I can upload in future
+ -- Simon McVittie <smcv at ianadd.pseudorandom.co.uk> Thu, 20 Mar 2008 20:36:10 +0000
+
python-docutils (0.4-5) unstable; urgency=low
[ Bernd Zeimetz ]
Modified: packages/python-docutils/trunk/debian/control
===================================================================
--- packages/python-docutils/trunk/debian/control 2008-03-20 15:17:31 UTC (rev 4863)
+++ packages/python-docutils/trunk/debian/control 2008-03-20 20:53:10 UTC (rev 4864)
@@ -3,13 +3,14 @@
Priority: optional
Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
Uploaders: martin f. krafft <madduck at debian.org>, Simon McVittie <smcv at ianadd.pseudorandom.co.uk>
-Build-Depends: debhelper (>= 5.0.37.1), dpatch, python-setuptools (>= 0.6b3-1)
-Build-Depends-Indep: python-dev, python (>= 2.3), xsltproc (>= 1.1.20), python-central (>= 0.5.6)
-Standards-Version: 3.7.2.0
+Build-Depends: debhelper (>= 5.0.37.1), dpatch, python-setuptools (>= 0.6b3), python (>= 2.3)
+Build-Depends-Indep: python-dev, xsltproc (>= 1.1.20), python-central (>= 0.6.0)
+Standards-Version: 3.7.3.0
XS-Python-Version: >= 2.3
Vcs-Svn: svn://svn.debian.org/python-modules/packages/python-docutils/trunk/
Vcs-Browser: http://svn.debian.org/wsvn/python-modules/packages/python-docutils/trunk/?op=log
Homepage: http://docutils.sourceforge.net/
+XS-Dm-Upload-Allowed: yes
Package: python-docutils
Architecture: all
Deleted: packages/python-docutils/trunk/debian/emacs-start.el
===================================================================
--- packages/python-docutils/trunk/debian/emacs-start.el 2008-03-20 15:17:31 UTC (rev 4863)
+++ packages/python-docutils/trunk/debian/emacs-start.el 2008-03-20 20:53:10 UTC (rev 4864)
@@ -1,10 +0,0 @@
-;; autoload support for reStructuredText, from python-docutils
-(autoload 'rst-mode "rst" "mode for editing reStructuredText documents" t)
-
-;; The following lines are not enabled by default because the 'correct'
-;; extension for reStructuredText files, according to the ReST
-;; documentation, is '.txt'. (Or nothing, for that matter.)
-;;
-;;(setq auto-mode-alist
-;; (append '(("\\.rst$" . rst-mode)
-;; ("\\.rest$" . rst-mode)) auto-mode-alist))
Modified: packages/python-docutils/trunk/debian/patches/10_doc_debian_paths.dpatch
===================================================================
--- packages/python-docutils/trunk/debian/patches/10_doc_debian_paths.dpatch 2008-03-20 15:17:31 UTC (rev 4863)
+++ packages/python-docutils/trunk/debian/patches/10_doc_debian_paths.dpatch 2008-03-20 20:53:10 UTC (rev 4864)
@@ -2,7 +2,7 @@
## 10_doc_debian_paths.dpatch by Simon McVittie <smcv at ianadd.pseudorandom.co.uk>
##
## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
+## DP: Adjust documentation to explain where Debian installs things
@DPATCH@
Added: packages/python-docutils/trunk/debian/python-docutils.install
===================================================================
--- packages/python-docutils/trunk/debian/python-docutils.install (rev 0)
+++ packages/python-docutils/trunk/debian/python-docutils.install 2008-03-20 20:53:10 UTC (rev 4864)
@@ -0,0 +1,5 @@
+debian/tmp/usr/lib/python*.*/site-packages/docutils*.egg-info
+debian/tmp/usr/lib/python*.*/site-packages/docutils
+tools/editors/emacs/rst.el usr/share/emacs/site-lisp
+debian/50python-docutils.el etc/emacs/site-start.d
+debian/tmp/usr/bin/*
Added: packages/python-docutils/trunk/debian/python-roman.install
===================================================================
--- packages/python-docutils/trunk/debian/python-roman.install (rev 0)
+++ packages/python-docutils/trunk/debian/python-roman.install 2008-03-20 20:53:10 UTC (rev 4864)
@@ -0,0 +1,2 @@
+debian/tmp/usr/lib/python*.*/site-packages/roman.py
+debian/tmp/usr/lib/python*.*/site-packages/roman*.egg-info
Modified: packages/python-docutils/trunk/debian/rules
===================================================================
--- packages/python-docutils/trunk/debian/rules 2008-03-20 15:17:31 UTC (rev 4863)
+++ packages/python-docutils/trunk/debian/rules 2008-03-20 20:53:10 UTC (rev 4864)
@@ -7,25 +7,29 @@
include /usr/share/dpatch/dpatch.make
-export DH_PYCENTRAL=nomove
-
p = python-docutils
d = debian/$(p)
PYTHON = /usr/bin/python
PYVER := $(shell $(PYTHON) -c 'import sys; print sys.version[:3]')
-DEB_UPSTREAM_VERSION=$(shell dpkg-parsechangelog \
- | sed -rne 's,^Version: ([^-]+).*,\1,p')
+DEB_UPSTREAM_VERSION := $(shell dpkg-parsechangelog | sed -rne 's,^Version: ([^-]+).*,\1,p')
BUILDHTML_DIRS := .
BUILDHTML_RECURSE_DIRS := docs
build: build-stamp
-build-stamp: patch
+build-stamp: patch-stamp
dh_testdir
$(PYTHON) setup.py build
$(PYTHON) setup_roman.py build
- set -e && for dir in $(BUILDHTML_DIRS); do PYTHONPATH=.:extras $(PYTHON) tools/buildhtml.py --local --config=tools/docutils.conf $$dir --traceback; done
- set -e && for dir in $(BUILDHTML_RECURSE_DIRS); do PYTHONPATH=.:extras $(PYTHON) tools/buildhtml.py --config=tools/docutils.conf $$dir --traceback; done
+ set -e && for dir in $(BUILDHTML_DIRS); do \
+ PYTHONPATH=.:extras $(PYTHON) tools/buildhtml.py \
+ --local --config=tools/docutils.conf $$dir \
+ --traceback; \
+ done
+ set -e && for dir in $(BUILDHTML_RECURSE_DIRS); do \
+ PYTHONPATH=.:extras $(PYTHON) tools/buildhtml.py \
+ --config=tools/docutils.conf $$dir --traceback; \
+ done
touch build-stamp
clean: clean-patched unpatch
@@ -37,7 +41,9 @@
$(PYTHON) setup.py clean --all
-find -name '*.py[co]' | xargs rm -f
rm -f *.html
- find docs -name '*.html' -not -name 'quickref.html' -print0 | xargs -0 --no-run-if-empty rm
+ rm -f debian/*.1
+ find docs -name '*.html' -not -name 'quickref.html' -print0 | \
+ xargs -0 --no-run-if-empty rm
-rm -rf docutils.egg-info
dh_clean
@@ -45,46 +51,14 @@
dh_testdir
dh_testroot
dh_installdirs
- -mkdir -p $(d)/usr/bin
-
- : # Install Python files - all to python-docutils first, then sort
- : # out roman.py afterwards (it looks simpler to do it separately,
- : # but currently distutils ends up copying both roman and docutils
- : # to both directories if you do)
- @mkdir -p debian/tmp
+ mkdir -p debian/tmp
$(PYTHON) setup.py install \
- --root debian/tmp --no-compile \
- --install-lib /usr/share/pycentral/$(p)/site-packages \
- --install-data /usr/share/pycentral/$(p)/site-packages \
-
+ --root debian/tmp --no-compile
$(PYTHON) setup_roman.py install \
- --root debian/tmp --no-compile \
- --install-lib /usr/share/pycentral/$(p)/site-packages \
- --install-data /usr/share/pycentral/$(p)/site-packages \
-
- install -d debian/tmp/usr/share/pycentral/python-roman/site-packages
- mv debian/tmp/usr/share/pycentral/python-docutils/site-packages/roman.py \
- debian/tmp/usr/share/pycentral/python-roman/site-packages/roman.py
-
- # get rid of PEP-0263 to be nice to python2.5-minimal (#379709)
- for f in docutils/languages/*.py; do \
- python debian/unpep263.py < $$f \
- > debian/tmp/usr/share/pycentral/python-docutils/site-packages/$$f;\
- done
-
- # share Egg dir
- mv debian/tmp/usr/share/pycentral/$(p)/site-packages/docutils-$(DEB_UPSTREAM_VERSION)-py$(PYVER).egg-info \
- debian/tmp/usr/share/pycentral/$(p)/site-packages/docutils-$(DEB_UPSTREAM_VERSION).egg-info
-
- # Emacs: move files to site-start directory
- install -d $(d)/usr/share/emacs/site-lisp
- install -m644 tools/editors/emacs/rst.el $(d)/usr/share/emacs/site-lisp/rst.el
-
- # ... and have it autoload rst-mode
- install -d $(d)/etc/emacs/site-start.d/
- install -m 644 debian/emacs-start.el \
- $(d)/etc/emacs/site-start.d/50python-docutils.el
-
+ --root debian/tmp --no-compile
+ : # share Egg dir between all versions
+ mv debian/tmp/usr/lib/python$(PYVER)/site-packages/docutils-$(DEB_UPSTREAM_VERSION)-py$(PYVER).egg-info \
+ debian/tmp/usr/lib/python$(PYVER)/site-packages/docutils-$(DEB_UPSTREAM_VERSION).egg-info
: # give scripts canonical names in /usr/bin
cd debian/tmp/usr/bin && \
mv rst2newlatex.py rst2newlatex && \
@@ -94,11 +68,9 @@
mv rst2pseudoxml.py rst2pseudoxml && \
mv rstpep2html.py rstpep2html && \
mv rst2latex.py rst2latex
-
install tools/buildhtml.py debian/tmp/usr/bin/rst-buildhtml
-
- # Make the man pages (we want to do this *after* renaming all the tools,
- # because their executable name goes into the --help output)
+ : # Make the man pages (we want to do this *after* renaming all the
+ : # tools, because their executable name goes into the --help output)
PYTHONPATH=.:extras $(PYTHON) debian/tmp/usr/bin/rst2html --help | \
PYTHONPATH=.:extras $(PYTHON) tools/rst2xml.py | \
xsltproc \
@@ -166,31 +138,15 @@
binary-indep: build install
dh_testdir
dh_testroot
-# dh_installdebconf
-
dh_installdocs *.txt *.html -XCOPYING
- set -e && ( cd docs; find . -name SCCS -prune -o -type d -print ) | \
- while read f ; do install -d $(d)/usr/share/doc/$(p)/docs/$$f ; done
- set -e && ( cd docs; find . -name SCCS -prune -o -type f -print ) | \
- while read f ; do install -o root -m 755 docs/$$f $(d)/usr/share/doc/$(p)/docs/$$f ; done
-
- dh_movefiles -ppython-roman \
- usr/share/pycentral/python-roman
- dh_movefiles -ppython-docutils \
- usr/share/pycentral/python-docutils usr/bin
-
+ dh_install -i
: # The license file for python-roman mentions the GPL
install -d debian/python-roman/usr/share/lintian/overrides
install -m644 debian/python-roman.override \
debian/python-roman/usr/share/lintian/overrides/python-roman
-
dh_pycentral
dh_installexamples
dh_installman
- set -e && for x in rst2latex rst2newlatex rst2html rst2pseudoxml \
- rst2s5 rstpep2html rst2xml rst-buildhtml; do \
- ln -sf rst2html.1.gz $(d)/usr/share/man/man1/$$x.1.gz; \
- done
dh_installchangelogs
dh_compress -X.py -X.dtd -X.html
dh_fixperms
Deleted: packages/python-docutils/trunk/debian/source.lintian-overrides
===================================================================
--- packages/python-docutils/trunk/debian/source.lintian-overrides 2008-03-20 15:17:31 UTC (rev 4863)
+++ packages/python-docutils/trunk/debian/source.lintian-overrides 2008-03-20 20:53:10 UTC (rev 4864)
@@ -1,2 +0,0 @@
-# We need setuptools to run python setup.py clean
-python-docutils source: build-depends-without-arch-dep python-setuptools
More information about the Python-modules-commits
mailing list