[Python-modules-commits] r14932 - in packages/mako/trunk/debian (15 files)
piotr at users.alioth.debian.org
piotr at users.alioth.debian.org
Sat Nov 20 18:05:57 UTC 2010
Date: Saturday, November 20, 2010 @ 18:05:49
Author: piotr
Revision: 14932
* New upstream release
- make_sure_2to3_is_used patch removed (applied upstream)
* Switch from dh_pysupport to dh_python2
* Add python-mako-doc package (and move documentation, examples and VIM
files there), rebuild docs using Sphinx
* Run tests for all 2.X Python versions
Added:
packages/mako/trunk/debian/python-mako-doc.doc-base
(from rev 14927, packages/mako/trunk/debian/doc-base)
packages/mako/trunk/debian/python-mako-doc.examples
(from rev 14927, packages/mako/trunk/debian/examples)
packages/mako/trunk/debian/python-mako-doc.install
(from rev 14927, packages/mako/trunk/debian/install)
packages/mako/trunk/debian/python-mako.manpages
(from rev 14927, packages/mako/trunk/debian/manpages)
Modified:
packages/mako/trunk/debian/changelog
packages/mako/trunk/debian/control
packages/mako/trunk/debian/rules
packages/mako/trunk/debian/watch
Deleted:
packages/mako/trunk/debian/doc-base
packages/mako/trunk/debian/docs
packages/mako/trunk/debian/examples
packages/mako/trunk/debian/install
packages/mako/trunk/debian/manpages
packages/mako/trunk/debian/patches/
packages/mako/trunk/debian/preinst
Modified: packages/mako/trunk/debian/changelog
===================================================================
--- packages/mako/trunk/debian/changelog 2010-11-20 18:01:56 UTC (rev 14931)
+++ packages/mako/trunk/debian/changelog 2010-11-20 18:05:49 UTC (rev 14932)
@@ -1,3 +1,14 @@
+mako (0.3.6-1) unstable; urgency=low
+
+ * New upstream release
+ - make_sure_2to3_is_used patch removed (applied upstream)
+ * Switch from dh_pysupport to dh_python2
+ * Add python-mako-doc package (and move documentation, examples and VIM
+ files there), rebuild docs using Sphinx
+ * Run tests for all 2.X Python versions
+
+ -- Piotr Ożarowski <piotr at debian.org> Sat, 20 Nov 2010 16:26:01 +0100
+
mako (0.3.5-1) unstable; urgency=low
* New upstream release
Modified: packages/mako/trunk/debian/control
===================================================================
--- packages/mako/trunk/debian/control 2010-11-20 18:01:56 UTC (rev 14931)
+++ packages/mako/trunk/debian/control 2010-11-20 18:05:49 UTC (rev 14932)
@@ -4,19 +4,24 @@
Maintainer: Piotr Ożarowski <piotr at debian.org>
Uploaders: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
Build-Depends: debhelper (>= 5.0.38)
-Build-Depends-Indep: python (>= 2.3.5-11), python-all, python-support (>= 0.6.4), python-setuptools (>= 0.6b3-1~),
- python3-all (>= 3.1.2-8), python3-setuptools
+Build-Depends-Indep: python-all, python-setuptools,
+ python3-all, python3-setuptools,
+# to rebuild docs:
+ python-sphinx,
+# for tests:
+ python-nose, python-markupsafe
Standards-Version: 3.9.1
Homepage: http://www.makotemplates.org/
-XS-Python-Version: >= 2.4
+X-Python-Version: >= 2.4
X-Python3-Version: >= 3.0
Vcs-Svn: svn://svn.debian.org/python-modules/packages/mako/trunk
Vcs-Browser: http://svn.debian.org/viewsvn/python-modules/packages/mako/trunk/
Package: python-mako
Architecture: all
-Depends: ${python:Depends}, ${misc:Depends}, python-markupsafe
-Suggests: python-beaker (>= 1.1)
+Depends: ${python:Depends}, ${misc:Depends}
+Breaks: ${python:Breaks}
+Suggests: python-beaker (>= 1.1), python-mako-doc
Enhances: python-pylons, python-turbogears, python-pygments
XB-Python-Version: ${python:Versions}
Description: fast and lightweight templating for the Python platform
@@ -31,8 +36,8 @@
Package: python3-mako
Architecture: all
-Depends: ${python3:Depends}, ${misc:Depends}, python3-markupsafe
-Suggests: ${python3:Suggests}, python3-beaker
+Depends: ${python3:Depends}, ${misc:Depends}
+Suggests: ${python3:Suggests}, python3-beaker, python-mako-doc
Description: fast and lightweight templating for the Python 3 platform
Mako is a template library written in Python. It provides a familiar, non-XML
syntax which compiles into Python modules for maximum performance. Mako's
@@ -42,3 +47,17 @@
componentized layout and inheritance to produce one of the most
straightforward and flexible models available, while also maintaining close
ties to Python calling and scoping semantics.
+
+Package: python-mako-doc
+Section: doc
+Architecture: all
+Priority: extra
+Depends: libjs-jquery, ${misc:Depends}
+Breaks: python-mako (<< 0.3.6-1)
+Replaces: python-mako (<< 0.3.6-1)
+Suggests: python-mako, python3-mako
+Description: documentation for the Mako Python library
+ Mako is a template library written in Python.
+ .
+ This package contains the documentation for Mako in HTML and
+ reStructuredText formats.
Deleted: packages/mako/trunk/debian/doc-base
===================================================================
--- packages/mako/trunk/debian/doc-base 2010-11-20 18:01:56 UTC (rev 14931)
+++ packages/mako/trunk/debian/doc-base 2010-11-20 18:05:49 UTC (rev 14932)
@@ -1,16 +0,0 @@
-Document: mako
-Title: Mako Documentation
-Author: Mike Bayer
-Abstract: This document describes Mako - a template library written in Python.
- It provides a familiar, non-XML syntax which compiles into Python modules for
- maximum performance. Mako's syntax and API borrows from the best ideas of many
- others, including Django templates, Cheetah, Myghty, and Genshi. Conceptually,
- Mako is an embedded Python (i.e. Python Server Page) language, which refines
- the familiar ideas of componentized layout and inheritance to produce one of
- the most straightforward and flexible models available, while also maintaining
- close ties to Python calling and scoping semantics.
-Section: Programming/Python
-
-Format: HTML
-Index: /usr/share/doc/python-mako/doc/index.html
-Files: /usr/share/doc/python-mako/doc/*.html
Deleted: packages/mako/trunk/debian/docs
===================================================================
--- packages/mako/trunk/debian/docs 2010-11-20 18:01:56 UTC (rev 14931)
+++ packages/mako/trunk/debian/docs 2010-11-20 18:05:49 UTC (rev 14932)
@@ -1 +0,0 @@
-doc
Deleted: packages/mako/trunk/debian/examples
===================================================================
--- packages/mako/trunk/debian/examples 2010-11-20 18:01:56 UTC (rev 14931)
+++ packages/mako/trunk/debian/examples 2010-11-20 18:05:49 UTC (rev 14932)
@@ -1 +0,0 @@
-examples/*
Deleted: packages/mako/trunk/debian/install
===================================================================
--- packages/mako/trunk/debian/install 2010-11-20 18:01:56 UTC (rev 14931)
+++ packages/mako/trunk/debian/install 2010-11-20 18:05:49 UTC (rev 14932)
@@ -1,3 +0,0 @@
-debian/mako.vim /usr/share/vim/addons/syntax/
-debian/mako_indent.vim /usr/share/vim/addons/indent/
-debian/mako.yaml /usr/share/vim/registry
Deleted: packages/mako/trunk/debian/manpages
===================================================================
--- packages/mako/trunk/debian/manpages 2010-11-20 18:01:56 UTC (rev 14931)
+++ packages/mako/trunk/debian/manpages 2010-11-20 18:05:49 UTC (rev 14932)
@@ -1 +0,0 @@
-debian/mako-render.1
Deleted: packages/mako/trunk/debian/preinst
===================================================================
--- packages/mako/trunk/debian/preinst 2010-11-20 18:01:56 UTC (rev 14931)
+++ packages/mako/trunk/debian/preinst 2010-11-20 18:05:49 UTC (rev 14932)
@@ -1,9 +0,0 @@
-#!/bin/sh
-# TODO: remove this file after releasing Squeeze
-set -e
-if [ "$1" = upgrade ] && dpkg --compare-versions "$2" lt-nl 0.2.5-1~;
-then
- pycentral pkgremove python-mako
-fi
-
-#DEBHELPER#
Copied: packages/mako/trunk/debian/python-mako-doc.doc-base (from rev 14927, packages/mako/trunk/debian/doc-base)
===================================================================
--- packages/mako/trunk/debian/python-mako-doc.doc-base (rev 0)
+++ packages/mako/trunk/debian/python-mako-doc.doc-base 2010-11-20 18:05:49 UTC (rev 14932)
@@ -0,0 +1,16 @@
+Document: mako
+Title: Mako Documentation
+Author: Mike Bayer
+Abstract: This document describes Mako - a template library written in Python.
+ It provides a familiar, non-XML syntax which compiles into Python modules for
+ maximum performance. Mako's syntax and API borrows from the best ideas of many
+ others, including Django templates, Cheetah, Myghty, and Genshi. Conceptually,
+ Mako is an embedded Python (i.e. Python Server Page) language, which refines
+ the familiar ideas of componentized layout and inheritance to produce one of
+ the most straightforward and flexible models available, while also maintaining
+ close ties to Python calling and scoping semantics.
+Section: Programming/Python
+
+Format: HTML
+Index: /usr/share/doc/python-mako/doc/index.html
+Files: /usr/share/doc/python-mako/doc/*.html
Copied: packages/mako/trunk/debian/python-mako-doc.examples (from rev 14927, packages/mako/trunk/debian/examples)
===================================================================
--- packages/mako/trunk/debian/python-mako-doc.examples (rev 0)
+++ packages/mako/trunk/debian/python-mako-doc.examples 2010-11-20 18:05:49 UTC (rev 14932)
@@ -0,0 +1 @@
+examples/*
Copied: packages/mako/trunk/debian/python-mako-doc.install (from rev 14927, packages/mako/trunk/debian/install)
===================================================================
--- packages/mako/trunk/debian/python-mako-doc.install (rev 0)
+++ packages/mako/trunk/debian/python-mako-doc.install 2010-11-20 18:05:49 UTC (rev 14932)
@@ -0,0 +1,3 @@
+debian/mako.vim /usr/share/vim/addons/syntax/
+debian/mako_indent.vim /usr/share/vim/addons/indent/
+debian/mako.yaml /usr/share/vim/registry
Copied: packages/mako/trunk/debian/python-mako.manpages (from rev 14927, packages/mako/trunk/debian/manpages)
===================================================================
--- packages/mako/trunk/debian/python-mako.manpages (rev 0)
+++ packages/mako/trunk/debian/python-mako.manpages 2010-11-20 18:05:49 UTC (rev 14932)
@@ -0,0 +1 @@
+debian/mako-render.1
Modified: packages/mako/trunk/debian/rules
===================================================================
--- packages/mako/trunk/debian/rules 2010-11-20 18:01:56 UTC (rev 14931)
+++ packages/mako/trunk/debian/rules 2010-11-20 18:05:49 UTC (rev 14932)
@@ -17,32 +17,45 @@
build:
-install: $(PYVERS:%=install-python%) $(PY3VERS:%=install-python%)
+test: $(PYVERS:%=test-python%)
+test-python%:
+ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
+ python$* setup.py test --quiet
+endif
+
+build-docs:
+ dh_testdir
+ dh_installdirs -i
+ cd doc/build && sphinx-build -N -q -E -b html . \
+ $(call pkgdir,2.X)-doc/usr/share/doc/python-mako-doc/html/
+ rm -rf $(call pkgdir,2.X)-doc/usr/share/doc/python-mako-doc/html/.doctrees
+ touch $@
+
+install: $(PYVERS:%=install-python%) $(PY3VERS:%=install-python%) build-docs test
dh_install
- mv $(CURDIR)/debian/python-mako/usr/share/vim/addons/indent/mako_indent.vim \
- $(CURDIR)/debian/python-mako/usr/share/vim/addons/indent/mako.vim
+ mv $(CURDIR)/debian/python-mako-doc/usr/share/vim/addons/indent/mako_indent.vim \
+ $(CURDIR)/debian/python-mako-doc/usr/share/vim/addons/indent/mako.vim
+ #rm -rf debian/python-mako-doc/usr/share/doc/python-mako/doc/build
install-python%:
python$* setup.py build_scripts --executable=/usr/bin/python
python$* setup.py install $(py_setup_install_args) \
- --single-version-externally-managed \
--root $(call pkgdir,$*)
- # dpkg handles dependencies way better than Python
- find $(call pkgdir,$*) -name requires.txt -type f -delete
binary-indep: build install
dh_testdir -i
dh_testroot -i
- dh_installchangelogs -i CHANGES
+ dh_installchangelogs -i
+ dh_installchangelogs -p python-mako-doc CHANGES
dh_installdocs -i
dh_installexamples -i
+ dh_link -i
dh_installman -i
- rm -rf debian/python-mako/usr/share/doc/python-mako/doc/build
- dh_pysupport -i
+ dh_python2 -i
# TODO: new name for Py3k's mako-render
rm -f $(call pkgdir,3.X)/usr/bin/mako-render
dh_python3 -i
- dh_compress -i -X.py -Xmakotemplates.txt
+ dh_compress -i -X.py -X.js -Xmakotemplates.txt
dh_fixperms -i
dh_installdeb -i
dh_gencontrol -i
Modified: packages/mako/trunk/debian/watch
===================================================================
--- packages/mako/trunk/debian/watch 2010-11-20 18:01:56 UTC (rev 14931)
+++ packages/mako/trunk/debian/watch 2010-11-20 18:05:49 UTC (rev 14932)
@@ -1,2 +1,2 @@
version=3
-http://cheeseshop.python.org/packages/source/M/Mako/Mako-(.*)\.tar\.gz debian uupdate
+http://pypi.python.org/packages/source/M/Mako/Mako-(.+)\.tar\.gz debian uupdate
More information about the Python-modules-commits
mailing list