[Python-modules-commits] r4676 - in packages/jinja/trunk/debian (9 files)

Sat Mar 1 20:49:07 UTC 2008

Date: Saturday, March 1, 2008 @ 20:49:06
  Author: piotr
Revision: 4676

* Build python-jinja-dbg package
* Documentation files moved to python-jinja-doc package
  + HTML files are now also installed
* Add disable_ez_setup and disable_copying_docs patches to clean setup.py
  a little bit (quilt added to build dependencies)
* Switch to python-support
* Replace python-setuptools runtime dependency with new python-pkg-resources
  (closes: 468722)
* Compress binary package with bzip2
* Strip the "-1" from setuptools' required build version
* Bump Standards-Version to 3.7.3 (no changes needed)

Added:
  packages/jinja/trunk/debian/patches/
  packages/jinja/trunk/debian/patches/disable_copying_docs.patch
  packages/jinja/trunk/debian/patches/disable_ez_setup.patch
  packages/jinja/trunk/debian/patches/series
  packages/jinja/trunk/debian/python-jinja-doc.dirs
  packages/jinja/trunk/debian/python-jinja-doc.docs
Modified:
  packages/jinja/trunk/debian/changelog
  packages/jinja/trunk/debian/control
  packages/jinja/trunk/debian/rules

Modified: packages/jinja/trunk/debian/changelog
===================================================================

--- packages/jinja/trunk/debian/changelog	2008-03-01 20:27:38 UTC (rev 4675)
+++ packages/jinja/trunk/debian/changelog	2008-03-01 20:49:06 UTC (rev 4676)
@@ -1,10 +1,24 @@
-jinja (1.2-2) UNRELEASED; urgency=low
+jinja (1.2-2) unstable; urgency=low
 
+  [ Sandro Tosi ]
   * debian/control
     - uniforming Vcs-Browser field
 
- -- Sandro Tosi <matrixhasu at gmail.com>  Thu, 03 Jan 2008 11:44:47 +0100
+  [ Piotr OÅ¼arowski ]
+  * Build python-jinja-dbg package
+  * Documentation files moved to python-jinja-doc package
+    + HTML files are now also installed
+  * Add disable_ez_setup and disable_copying_docs patches to clean setup.py
+    a little bit (quilt added to build dependencies)
+  * Switch to python-support
+  * Replace python-setuptools runtime dependency with new python-pkg-resources
+    (closes: 468722)
+  * Compress binary package with bzip2
+  * Strip the "-1" from setuptools' required build version
+  * Bump Standards-Version to 3.7.3 (no changes needed)
 
+ -- Piotr OÅ¼arowski <piotr at debian.org>  Sat, 01 Mar 2008 14:15:45 +0100
+
 jinja (1.2-1) unstable; urgency=low
 
   * New upstream release

Modified: packages/jinja/trunk/debian/control
===================================================================
--- packages/jinja/trunk/debian/control	2008-03-01 20:27:38 UTC (rev 4675)
+++ packages/jinja/trunk/debian/control	2008-03-01 20:49:06 UTC (rev 4676)
@@ -3,8 +3,9 @@
 Priority: optional
 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), python (>= 2.3.5-11), python-all-dev, python-central (>= 0.5.6), python-setuptools (>= 0.6b3-1)
-Standards-Version: 3.7.2
+Build-Depends: debhelper (>= 5), quilt (>= 0.40), python-support (>= 0.6.4),
+ python-setuptools (>= 0.6b3), python-all-dev (>= 2.3.5-11), python-all-dbg
+Standards-Version: 3.7.3
 Homepage: http://jinja.pocoo.org/
 XS-Python-Version: all
 Vcs-Svn: svn://svn.debian.org/python-modules/packages/jinja/trunk
@@ -14,8 +15,9 @@
 Architecture: any
 Depends: ${python:Depends}, ${shlibs:Depends}
 Provides: ${python:Provides}
-Recommends: python-textile (>=2.0.10-3.1), python-markdown (>=1.4-2),
- python-simplejson (>= 1.1-1.1), python-setuptools (>= 0.6b3-1)
+Recommends: python-textile (>= 2.0.10-3.1), python-markdown (>= 1.4-2),
+ python-simplejson (>= 1.1-1.1), python-pkg-resources
+Suggests: python-jinja-doc
 XB-Python-Version: ${python:Versions}
 Description: small but fast and easy to use stand-alone template engine
  Jinja provides a Django-like non-XML syntax and compiles templates
@@ -42,3 +44,25 @@
   * Dynamic syntax. You don't like the Django block syntax? You can override
     the syntax elements on environment initialisation. It's no problem to use
     ASP/PHP/Ruby syntax, html comments for blocks etc.
+
+Package: python-jinja-doc
+Section: doc
+Architecture: all
+Priority: extra
+Recommends: python-jinja
+Description: Documentation for the Jinja Python library
+ Jinja is a small but fast and easy to use stand-alone template engine
+ .
+ This package contains the documentation for Jinja in HTML and
+ reStructuredText formats.
+
+Package: python-jinja-dbg
+Architecture: any
+Priority: extra
+Depends: python-jinja (= ${binary:Version}), python-dbg, ${shlibs:Depends}
+Provides: ${python:Provides}
+XB-Python-Version: ${python:Versions}
+Description: small but fast and easy to use stand-alone template engine
+ Jinja is a small but fast and easy to use stand-alone template engine
+ .
+ This package contains the extension built for the Python debug interpreter.

Added: packages/jinja/trunk/debian/patches/disable_copying_docs.patch
===================================================================
--- packages/jinja/trunk/debian/patches/disable_copying_docs.patch	                        (rev 0)
+++ packages/jinja/trunk/debian/patches/disable_copying_docs.patch	2008-03-01 20:49:06 UTC (rev 4676)
@@ -0,0 +1,19 @@
+Index: jinja-1.2/setup.py
+===================================================================
+--- jinja-1.2.orig/setup.py
++++ jinja-1.2/setup.py
+@@ -78,10 +78,10 @@ setup(
+     ],
+     keywords=['python.templating.engines'],
+     packages=['jinja', 'jinja.translators'],
+-    data_files=[
+-        ('docs/html', list(list_files('docs/html'))),
+-        ('docs/txt', list(list_files('docs/src')))
+-    ],
++    #data_files=[
++    #    ('docs/html', list(list_files('docs/html'))),
++    #    ('docs/txt', list(list_files('docs/src')))
++    #],
+     entry_points='''
+     [python.templating.engines]
+     jinja = jinja.plugin:BuffetPlugin

Added: packages/jinja/trunk/debian/patches/disable_ez_setup.patch
===================================================================
--- packages/jinja/trunk/debian/patches/disable_ez_setup.patch	                        (rev 0)
+++ packages/jinja/trunk/debian/patches/disable_ez_setup.patch	2008-03-01 20:49:06 UTC (rev 4676)
@@ -0,0 +1,15 @@
+Index: jinja-1.2/setup.py
+===================================================================
+--- jinja-1.2.orig/setup.py
++++ jinja-1.2/setup.py
+@@ -2,8 +2,8 @@
+ import jinja
+ import os
+ import sys
+-import ez_setup
+-ez_setup.use_setuptools()
++#import ez_setup
++#ez_setup.use_setuptools()
+ 
+ from distutils.command.build_ext import build_ext
+ from distutils.errors import CCompilerError, DistutilsError

Added: packages/jinja/trunk/debian/patches/series
===================================================================
--- packages/jinja/trunk/debian/patches/series	                        (rev 0)
+++ packages/jinja/trunk/debian/patches/series	2008-03-01 20:49:06 UTC (rev 4676)
@@ -0,0 +1,2 @@
+disable_ez_setup.patch
+disable_copying_docs.patch

Added: packages/jinja/trunk/debian/python-jinja-doc.dirs
===================================================================
--- packages/jinja/trunk/debian/python-jinja-doc.dirs	                        (rev 0)
+++ packages/jinja/trunk/debian/python-jinja-doc.dirs	2008-03-01 20:49:06 UTC (rev 4676)
@@ -0,0 +1 @@
+/usr/share/doc/python-jinja/

Added: packages/jinja/trunk/debian/python-jinja-doc.docs
===================================================================
--- packages/jinja/trunk/debian/python-jinja-doc.docs	                        (rev 0)
+++ packages/jinja/trunk/debian/python-jinja-doc.docs	2008-03-01 20:49:06 UTC (rev 4676)
@@ -0,0 +1 @@
+docs/*

Modified: packages/jinja/trunk/debian/rules
===================================================================
--- packages/jinja/trunk/debian/rules	2008-03-01 20:27:38 UTC (rev 4675)
+++ packages/jinja/trunk/debian/rules	2008-03-01 20:49:06 UTC (rev 4676)
@@ -2,52 +2,80 @@
 
 #export DH_VERBOSE=1
 
-DEB_UPSTREAM_VERSION=$(shell dpkg-parsechangelog \
-	| sed -rne 's,^Version: ([^-]+).*,\1,p')
+include /usr/share/quilt/quilt.make
 
-PYVERS=$(shell pyversions -vr debian/control)
+PYVERS=$(shell pyversions -vr)
+PKGDIR=$(CURDIR)/debian/python-jinja
 
-clean:
+clean: unpatch
 	dh_testdir
 	dh_testroot
 	rm -rf dist build
 	find . -name '*\.pyc' -delete
-	dh_clean build-*
+	dh_clean install-stamp build-stamp \
+		$(PYVERS:%=install-python%) $(PYVERS:%=build-python%) \
+		$(PYVERS:%=install-debug-python%) $(PYVERS:%=build-debug-python%)
 
-build: build-stamp
-build-stamp: $(PYVERS:%=build-python%)
+build: patch build-stamp
+
+build-stamp: $(PYVERS:%=build-python%) $(PYVERS:%=build-debug-python%)
 	touch $@
-build-python%:
+
+build-python%: patch
 	python$* setup.py build
 	touch $@
 
-install: build $(PYVERS:%=install-python%)
-install-python%:
+build-debug-python%: patch
+	python$*-dbg setup.py build
+	touch $@
+
+install: $(PYVERS:%=install-python%) $(PYVERS:%=install-debug-python%)
+
+install-python%: build
 	python$* setup.py install \
-		--single-version-externally-managed \
-		--root $(CURDIR)/debian/python-jinja
-	# share Egg dir
-	mv debian/python-jinja/usr/lib/python$*/site-packages/Jinja-${DEB_UPSTREAM_VERSION}-py$*.egg-info \
-	   debian/python-jinja/usr/lib/python$*/site-packages/Jinja-${DEB_UPSTREAM_VERSION}.egg-info
+		--skip-build --single-version-externally-managed --root $(PKGDIR)
+	touch $@
 
+install-debug-python%: build
+	python$*-dbg setup.py install \
+		--skip-build --single-version-externally-managed --root $(PKGDIR)-dbg/
+	find $(PKGDIR)-dbg/usr/lib/python$*/ ! -type d ! -name '*_d\.so' -delete
+	find $(PKGDIR)-dbg/usr/lib/python$*/ -depth -empty -delete
+	touch $@
+
 binary-arch: build install
-	dh_testdir -a
-	dh_testroot -a
+	dh_testdir
+	dh_testroot
 	dh_installchangelogs -a CHANGES
 	dh_installdocs -a
-	mv debian/python-jinja/usr/docs/txt/* debian/python-jinja/usr/share/doc/python-jinja/
-	-rm -rf debian/python-jinja/usr/docs
-	dh_pycentral -a
-	dh_strip -a
+	dh_pysupport -a
+	dh_makeshlibs -a
+	dh_strip -ppython-jinja --dbg-package=python-jinja-dbg
+	rm -rf $(PKGDIR)-dbg/usr/share/doc/python-jinja-dbg
+	ln -s python-jinja $(PKGDIR)-dbg/usr/share/doc/python-jinja-dbg
+	find $(CURDIR)/debian -depth -empty -delete
 	dh_compress -a -X.py
 	dh_fixperms -a
 	dh_installdeb -a
 	dh_shlibdeps -a
 	dh_gencontrol -a
 	dh_md5sums -a
-	dh_builddeb -a
+	dh_builddeb -a -- -Z bzip2
 
 binary-indep:
+	dh_testdir -i
+	dh_testroot -i
+	dh_installchangelogs -i CHANGES
+	dh_installdirs -i
+	dh_installdocs -i
+	dh_link -i /usr/share/doc/python-jinja-doc/html /usr/share/doc/python-jinja/html
+	dh_link -i /usr/share/doc/python-jinja-doc/src /usr/share/doc/python-jinja/rst
+	dh_compress -i -X.txt -X.html
+	dh_fixperms -i
+	dh_installdeb -i
+	dh_gencontrol -i
+	dh_md5sums -i
+	dh_builddeb -i -- -Z bzip2
 
 binary: binary-indep binary-arch
 


