[Python-modules-commits] [paste] 05/06: Documentation moved to solo package python-paste-doc
Ondřej Nový
onovy-guest at moszumanska.debian.org
Sat Mar 5 19:06:43 UTC 2016
This is an automated email from the git hooks/post-receive script.
onovy-guest pushed a commit to branch master
in repository paste.
commit cf815bf68b690c6796e68ec6715cb8fae55e8f3f
Author: Ondřej Nový <novy at ondrej.org>
Date: Sat Mar 5 20:04:51 2016 +0100
Documentation moved to solo package python-paste-doc
* d/rules rewritten
---
debian/changelog | 2 +
debian/control | 30 +++++++-
...on-paste.doc-base => python-paste-doc.doc-base} | 8 +-
debian/python-paste.dirs | 2 -
debian/python-paste.links | 1 +
debian/python3-paste.dirs | 2 -
debian/python3-paste.doc-base | 10 ---
debian/python3-paste.links | 1 +
debian/rules | 85 +++-------------------
9 files changed, 45 insertions(+), 96 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 93ea9c3..cc0c421 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,8 @@ paste (2.0.2-1) UNRELEASED; urgency=medium
* Fixed d/watch file
* Added Build-Depends: dh-python
* Removed all patches (not needed anymore)
+ * Documentation moved to solo package python-paste-doc
+ * d/rules rewritten
-- Ondřej Nový <novy at ondrej.org> Fri, 04 Mar 2016 23:24:56 +0100
diff --git a/debian/control b/debian/control
index 14ac3c3..ed5b9e3 100644
--- a/debian/control
+++ b/debian/control
@@ -39,7 +39,7 @@ Suggests: libapache2-mod-python (>= 3.2.8-3),
python-pastewebkit,
python-pgsql (>= 2.5.1-1),
${sphinxdoc:Depends},
-Description: tools for using a Web Server Gateway Interface stack
+Description: tools for using a Web Server Gateway Interface stack - Python 2.x
Python Paste brings consistency to Python web development and web application
installation, providing tools for both developers and system administrators.
.
@@ -70,7 +70,7 @@ Suggests: libapache2-mod-python (>= 3.2.8-3),
libapache2-mod-scgi,
libapache2-mod-wsgi,
${sphinxdoc:Depends},
-Description: tools for using a Web Server Gateway Interface stack with Python 3
+Description: tools for using a Web Server Gateway Interface stack - Python 3.x
Python Paste brings consistency to Python web development and web application
installation, providing tools for both developers and system administrators.
.
@@ -90,3 +90,29 @@ Description: tools for using a Web Server Gateway Interface stack with Python 3
complementary packages and tools
.
This is the Python3 version of the package.
+
+Package: python-paste-doc
+Architecture: all
+Section: doc
+Depends: ${misc:Depends},
+ ${sphinxdoc:Depends},
+Description: tools for using a Web Server Gateway Interface stack - documentation
+ Python Paste brings consistency to Python web development and web application
+ installation, providing tools for both developers and system administrators.
+ .
+ Paste for Administrators:
+ * Easily install, run, and configure multiple Paste-enabled web
+ applications at once, and integrate them into your website how
+ you want (SCGI, FCGI, AJP, WSGI)
+ * Manage and install web applications system-wide for easy maintenance
+ .
+ Paste for Web Developers:
+ * Increase your web application's audience
+ * Provide starter templates and custom commands for using your web framework
+ * Keep your development and deployment straightened out, and your automated
+ testing streamlined
+ * Attention payed to the full development cycle -- starting projects,
+ converting old projects, updating and deploying projects -- using a set of
+ complementary packages and tools
+ .
+ This package provides the Sphinx generated documentation for Paste.
diff --git a/debian/python-paste.doc-base b/debian/python-paste-doc.doc-base
similarity index 62%
rename from debian/python-paste.doc-base
rename to debian/python-paste-doc.doc-base
index 65acc65..3b17bbc 100644
--- a/debian/python-paste.doc-base
+++ b/debian/python-paste-doc.doc-base
@@ -1,10 +1,10 @@
-Document: python-paste
+Document: python-paste-doc
Title: Python Paste documentation
-Author: Ian Bicking
+Author: Ian Bicking
Abstract: Python Paste brings consistency to Python web development and web application
installation, providing tools for both developers and system administrators.
Section: Programming/Python
Format: HTML
-Index: /usr/share/doc/python-paste/docs/index.html
-Files: /usr/share/doc/python-paste/docs/*.html
+Index: /usr/share/doc/python-paste-doc/html/index.html
+Files: /usr/share/doc/python-paste-doc/html/*
diff --git a/debian/python-paste.dirs b/debian/python-paste.dirs
deleted file mode 100644
index 37a97c4..0000000
--- a/debian/python-paste.dirs
+++ /dev/null
@@ -1,2 +0,0 @@
-/usr/share/doc/python-paste/docs
-/usr/share/lintian/overrides
diff --git a/debian/python-paste.links b/debian/python-paste.links
new file mode 100644
index 0000000..2bb04cd
--- /dev/null
+++ b/debian/python-paste.links
@@ -0,0 +1 @@
+/usr/share/javascript/mochikit/MochiKit.js usr/lib/python2.7/dist-packages/paste/evalexception/media/MochiKit.packed.js
diff --git a/debian/python3-paste.dirs b/debian/python3-paste.dirs
deleted file mode 100644
index 27b5ade..0000000
--- a/debian/python3-paste.dirs
+++ /dev/null
@@ -1,2 +0,0 @@
-/usr/share/doc/python3-paste/docs
-/usr/share/lintian/overrides
diff --git a/debian/python3-paste.doc-base b/debian/python3-paste.doc-base
deleted file mode 100644
index baed890..0000000
--- a/debian/python3-paste.doc-base
+++ /dev/null
@@ -1,10 +0,0 @@
-Document: python3-paste
-Title: Python Paste documentation
-Author: Ian Bicking
-Abstract: Python Paste brings consistency to Python 3 web development and web application
- installation, providing tools for both developers and system administrators.
-Section: Programming/Python
-
-Format: HTML
-Index: /usr/share/doc/python3-paste/docs/index.html
-Files: /usr/share/doc/python3-paste/docs/*.html
diff --git a/debian/python3-paste.links b/debian/python3-paste.links
new file mode 100644
index 0000000..ec90584
--- /dev/null
+++ b/debian/python3-paste.links
@@ -0,0 +1 @@
+/usr/share/javascript/mochikit/MochiKit.js usr/lib/python3/dist-packages/paste/evalexception/media/MochiKit.packed.js
diff --git a/debian/rules b/debian/rules
index 74c0408..6afb5b4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,82 +1,15 @@
#!/usr/bin/make -f
#export DH_VERBOSE=1
+export PYBUILD_NAME = paste
+export PYBUILD_AFTER_INSTALL=rm {destdir}{install_dir}/*.pth
-DEB_UPSTREAM_VERSION=$(shell dpkg-parsechangelog | sed -rne 's,^Version: ([^-]+).*,\1,p')
-PYVERS=$(shell pyversions -vr)
-PY3VERS=$(shell py3versions -vr)
-PKGDIR=$(CURDIR)/debian/python-paste
-PKG3DIR=$(CURDIR)/debian/python3-paste
+%:
+ dh $@ --with python2,python3,sphinxdoc --buildsystem=pybuild
-include /usr/share/python/python.mk
-clean:
- dh_testdir
- dh_testroot
- rm -rf dist build
- find . -name *\.py[co] -delete
- dh_clean build-docs* $(PYVERS:%=install-python%) $(PY3VERS:%=install3-python%)
+ifeq (,$(findstring nodocs, $(DEB_BUILD_OPTIONS)))
+override_dh_sphinxdoc:
+ PYTHONPATH=. sphinx-build -bhtml docs/ $(CURDIR)/debian/python-paste-doc/usr/share/doc/python-paste-doc/html
-build: build-indep
-build-indep:2to3-stamp build-docs
-build-arch:
-
-2to3-stamp:
- rm -rf debian/tmp
- mkdir -p debian/tmp
- cp -a $(filter-out debian .svn, $(wildcard * .[^.]*)) debian/tmp
- 2to3 --write --nobackups debian/tmp
- touch $@
-
-build-docs: 2to3-stamp
- dh_testdir
- dh_installdirs
- PYTHONPATH=. sphinx-build -N -q -E -b html docs/ $(PKGDIR)/usr/share/doc/python-paste/docs/
- cd debian/tmp && PYTHONPATH=. /usr/share/sphinx/scripts/python3/sphinx-build -N -q -E -b html docs/ $(PKG3DIR)/usr/share/doc/python3-paste/docs/
- touch $@
-
-install: $(PYVERS:%=install-python%) $(PY3VERS:%=install3-python%)
-install-python%:
- python$* setup.py install --root $(PKGDIR) \
- --install-layout=deb $(py_setup_install_args)
- # pth file is not needed since all paste* packages are installed in same directory
- find $(PKGDIR) \( -name '*.pth' -or -name 'namespace_packages.txt' \) -delete
- touch $(PKGDIR)$(call py_libdir,$*)/paste/__init__.py
- dh_link -ppython-paste /usr/share/javascript/mochikit/MochiKit.js \
- $(call py_libdir,$*)/paste/evalexception/media/MochiKit.packed.js
- touch $@
-
-install3-python%: 2to3-stamp
- cd debian/tmp && python$* setup.py install --root $(PKG3DIR) \
- --install-layout=deb $(py_setup_install_args)
- # pth file is not needed since all paste* packages are installed in same directory
- find $(PKG3DIR) \( -name '*.pth' -or -name 'namespace_packages.txt' \) -delete
- touch $(PKG3DIR)$(call py_libdir,$*)/paste/__init__.py
- touch $@
-
-binary-indep: build install
- dh_testdir -i
- dh_testroot -i
- dh_link -ppython3-paste /usr/share/javascript/mochikit/MochiKit.js \
- /usr/lib/python3/dist-packages/paste/evalexception/media/MochiKit.packed.js
- dh_installchangelogs -i docs/news.txt
- dh_installdocs -i
- dh_sphinxdoc -i
- dh_python2 -i
- dh_python3 -i
- # it's not an extra license file
- echo "python-paste: extra-license-file usr/share/doc/python-paste/docs/_sources/license.txt" \
- >> $(PKGDIR)/usr/share/lintian/overrides/python-paste
- echo "python3-paste: extra-license-file usr/share/doc/python3-paste/docs/_sources/license.txt" \
- >> $(PKG3DIR)/usr/share/lintian/overrides/python3-paste
- dh_compress -i -X.py -X.js -Xobjects.inv
- dh_fixperms -i
- dh_installdeb -i
- dh_gencontrol -i
- dh_md5sums -i
- dh_builddeb -i -- -Z bzip2
-
-binary-arch:
-
-binary: binary-indep binary-arch
-
-.PHONY: build build-arch build-indep clean binary-indep binary-arch binary install
+ dh_sphinxdoc -O--buildsystem=pybuild
+endif
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/paste.git
More information about the Python-modules-commits
mailing list