[xml/sgml-commit] r381 - packages/libxslt/trunk/debian

Mike Hommey glandium@costa.debian.org
Sun, 27 Mar 2005 22:13:57 +0000


Author: glandium
Date: 2005-03-27 22:13:54 +0000 (Sun, 27 Mar 2005)
New Revision: 381

Added:
   packages/libxslt/trunk/debian/python-libxslt1.examples.in
   packages/libxslt/trunk/debian/python-libxslt1.install.in
Removed:
   packages/libxslt/trunk/debian/python2.3-libxslt1.examples
   packages/libxslt/trunk/debian/python2.3-libxslt1.install
Modified:
   packages/libxslt/trunk/debian/changelog
   packages/libxslt/trunk/debian/control
   packages/libxslt/trunk/debian/rules
   packages/libxslt/trunk/debian/watch
Log:
use svn-upgrade instead of uupdate in the watch file
Added support for several python bindings packages.


Modified: packages/libxslt/trunk/debian/changelog
===================================================================
--- packages/libxslt/trunk/debian/changelog	2005-03-27 20:34:31 UTC (rev 380)
+++ packages/libxslt/trunk/debian/changelog	2005-03-27 22:13:54 UTC (rev 381)
@@ -1,3 +1,14 @@
+libxslt (1.1.12-7) UNRELEASED; urgency=low
+
+  * NOT RELEASED YET
+  * debian/watch: use svn-upgrade instead of uupdate.
+  * debian/control, debian/rules, debian/python-libxslt1.*.in:
+    Added support for several python bindings packages. Currently for python
+    2.2, 2.3 and 2.4.
+  * debian/python2.3-libxslt1.*: Removed.
+
+ -- Mike Hommey <glandium@debian.org>  Mon, 28 Mar 2005 00:12:21 +0200
+
 libxslt (1.1.12-6) unstable; urgency=high
 
   * Urgency set to high because we avoid breaking packages depending on us

Modified: packages/libxslt/trunk/debian/control
===================================================================
--- packages/libxslt/trunk/debian/control	2005-03-27 20:34:31 UTC (rev 380)
+++ packages/libxslt/trunk/debian/control	2005-03-27 22:13:54 UTC (rev 381)
@@ -4,7 +4,7 @@
 Maintainer: Debian XML/SGML Group <debian-xml-sgml-pkgs@lists.alioth.debian.org>
 Uploaders: Mike Hommey <glandium@debian.org>
 Standards-Version: 3.6.1
-Build-Depends: debhelper (>= 4.1.67), libxml2-dev (>= 2.6.15), python, python2.3-libxml2 (>= 2.6.15), python2.3-dev, zlib1g-dev (>= 1:1.1.4), libgcrypt11-dev
+Build-Depends: debhelper (>= 4.1.67), libxml2-dev (>= 2.6.15), python, python2.4-dev, python2.3-dev, python2.2-dev, python2.4-libxml2 (>= 2.6.15), python2.3-libxml2 (>= 2.6.15), python2.2-libxml2 (>= 2.6.15), zlib1g-dev | libz-dev, libgcrypt11-dev, autotools-dev
 
 Package: libxslt1-dev
 Section: libdevel
@@ -12,7 +12,7 @@
 Architecture: any
 Provides: libxslt-dev
 Conflicts: libxslt-dev, libxslt0-dev
-Depends: libxslt1.1 (= ${Source-Version}), libxml2-dev (>= 2.6.15), libc6-dev | libc-dev, pkg-config, libz-dev, libgcrypt11-dev
+Depends: libxslt1.1 (= ${Source-Version}), libxml2-dev (>= 2.6.15), zlib1g-dev | libz-dev, libgcrypt11-dev
 Description: XSLT processing library - development kit
  XSLT is an XML language for defining transformations of XML files from
  XML to some other arbitrary format, such as XML, HTML, plain text, etc.
@@ -63,6 +63,29 @@
  This package contains a command line tool that facilitates XSLT
  transformations.
 
+Package: python-libxslt1
+Section: python
+Priority: optional
+Architecture: all
+Depends: ${python:Depends}
+Description:  Python bindings for libxslt1
+ This package is a dummy package that will bring you the libxslt bindings
+ for the current Python version.
+
+Package: python2.4-libxslt1
+Section: python
+Priority: optional
+Architecture: any
+Depends: ${shlibs:Depends}, python2.4-libxml2 (>= 2.6.15), python2.4
+Description:  Python 2.4 bindings for libxslt1
+ XSLT is an XML language for defining transformations of XML files from
+ XML to some other arbitrary format, such as XML, HTML, plain text, etc.
+ using standard XSLT stylesheets. libxslt is a C library which
+ implements XSLT.
+ .
+ This package contains Python 2.4 binding for libxslt, needed to use
+ libxslt in Python programs.
+
 Package: python2.3-libxslt1
 Section: python
 Priority: optional
@@ -79,6 +102,20 @@
  This package contains Python 2.3 binding for libxslt, needed to use
  libxslt in Python programs.
 
+Package: python2.2-libxslt1
+Section: python
+Priority: optional
+Architecture: any
+Depends: ${shlibs:Depends}, python2.2-libxml2 (>= 2.6.15), python2.2
+Description:  Python 2.2 bindings for libxslt1
+ XSLT is an XML language for defining transformations of XML files from
+ XML to some other arbitrary format, such as XML, HTML, plain text, etc.
+ using standard XSLT stylesheets. libxslt is a C library which
+ implements XSLT.
+ .
+ This package contains Python 2.2 binding for libxslt, needed to use
+ libxslt in Python programs.
+
 Package: libxslt1-python2.3
 Section: python
 Priority: optional

Copied: packages/libxslt/trunk/debian/python-libxslt1.examples.in (from rev 349, packages/libxslt/trunk/debian/python2.3-libxslt1.examples)

Copied: packages/libxslt/trunk/debian/python-libxslt1.install.in (from rev 349, packages/libxslt/trunk/debian/python2.3-libxslt1.install)
===================================================================
--- packages/libxslt/trunk/debian/python2.3-libxslt1.install	2005-02-06 14:30:56 UTC (rev 349)
+++ packages/libxslt/trunk/debian/python-libxslt1.install.in	2005-03-27 22:13:54 UTC (rev 381)
@@ -0,0 +1,2 @@
+usr/lib/pythonPYVERS/site-packages/*.py*
+usr/lib/pythonPYVERS/site-packages/*.so

Deleted: packages/libxslt/trunk/debian/python2.3-libxslt1.examples
===================================================================
--- packages/libxslt/trunk/debian/python2.3-libxslt1.examples	2005-03-27 20:34:31 UTC (rev 380)
+++ packages/libxslt/trunk/debian/python2.3-libxslt1.examples	2005-03-27 22:13:54 UTC (rev 381)
@@ -1,2 +0,0 @@
-python/tests/*.py
-python/tests/test.*

Deleted: packages/libxslt/trunk/debian/python2.3-libxslt1.install
===================================================================
--- packages/libxslt/trunk/debian/python2.3-libxslt1.install	2005-03-27 20:34:31 UTC (rev 380)
+++ packages/libxslt/trunk/debian/python2.3-libxslt1.install	2005-03-27 22:13:54 UTC (rev 381)
@@ -1,2 +0,0 @@
-usr/lib/python*/site-packages/*.py*
-usr/lib/python*/site-packages/*.so

Modified: packages/libxslt/trunk/debian/rules
===================================================================
--- packages/libxslt/trunk/debian/rules	2005-03-27 20:34:31 UTC (rev 380)
+++ packages/libxslt/trunk/debian/rules	2005-03-27 22:13:54 UTC (rev 381)
@@ -7,6 +7,9 @@
 ## uncomment this to turn on verbose mode
 #export DH_VERBOSE=1
 
+# The versions of python currently supported
+PYVERS=$(subst -dev,,$(subst python,,$(filter python%-dev,$(shell sed -n '/^Build-Depends/s/,//gp' debian/control))))
+
 WORKAROUND_REMOVED_FILES=libexslt/exsltconfig.h libxslt/xsltconfig.h libxslt/xsltwin32config.h libxslt.spec
 WORKAROUND_MODIFIED_FILES=python/libxslt-py.c
 
@@ -49,9 +52,7 @@
 
 	# ./configure
 	CFLAGS="$(CFLAGS)" \
-	./configure $(CONFFLAGS) \
-		--prefix=/usr \
-		--with-python=/usr/bin/python2.3
+	./configure $(CONFFLAGS) --prefix=/usr
 
 	touch configure-stamp
 
@@ -59,15 +60,19 @@
 build-stamp: configure-stamp
 	dh_testdir
 
+	mv python/Makefile python/Makefile.bak
+	echo all: > python/Makefile
 	# Build libxslt
 	$(MAKE)
+	mv python/Makefile.bak python/Makefile
 
 	touch build-stamp 
 
 clean:
 	dh_testdir
 	dh_testroot
-	rm -f build-stamp configure-stamp
+	rm -f build-stamp configure-stamp install*-stamp
+	rm -f debian/python*.examples debian/python*.install
 
 	-$(MAKE) distclean
 	
@@ -84,15 +89,17 @@
 
 	dh_clean -X.orig
 
-install: build
+install: install-stamp install-python-stamp
+install-stamp: build-stamp
 	dh_testdir
 	dh_testroot
 	dh_clean -k -X.orig
 	dh_installdirs
 
-	$(MAKE) prefix=$(PWD)/$(TMP_DIR)/usr \
-		PYTHON_SITE_PACKAGES=$(PWD)/$(TMP_DIR)/usr/lib/python2.3/site-packages \
-		install
+	mv -f python/Makefile python/Makefile.bak
+	echo install: > python/Makefile
+	$(MAKE) prefix=$(PWD)/$(TMP_DIR)/usr install
+	mv -f python/Makefile.bak python/Makefile
 
 	# Properly install documentation in /usr/share/doc/libxslt1-dev
 	install -d debian/tmp/usr/share/doc/libxslt1-dev/EXSLT
@@ -117,11 +124,29 @@
 		cat $${file}-tmp > $${file}; \
 	done
 
+build-python%-stamp: build-stamp
+	cd python && $(MAKE) clean && $(MAKE) PYTHON=/usr/bin/python$* pythondir=`pwd`/../debian/tmp/usr/lib/python$*/site-packages PYTHON_VERSION=$* PYTHON_INCLUDES=/usr/include/python$*
+	
+	touch $@
+
+install-python%-stamp: build-python%-stamp
+	rm build-python$*-stamp
+	cd python && $(MAKE) PYTHON=/usr/bin/python$* pythondir=`pwd`/../debian/tmp/usr/lib/python$*/site-packages PYTHON_VERSION=$* PYTHON_INCLUDES=/usr/include/python$* install
+
+	sed s/PYVERS/$*/ debian/python-libxslt1.install.in > debian/python$*-libxslt1.install
+	cp debian/python-libxslt1.examples.in debian/python$*-libxslt1.examples
+
+	touch $@
+
+install-python-stamp: $(PYVERS:%=install-python%-stamp)
+	touch $@
+
 binary-indep:
 	dh_testdir
 	dh_testroot
 	dh_installdocs -i
 	dh_installchangelogs -i
+	dh_python -i
 	dh_gencontrol -i
 	dh_md5sums -i
 	dh_builddeb -i
@@ -134,7 +159,7 @@
 	dh_installdocs -a -A AUTHORS FEATURES NEWS README TODO
 	dh_installexamples -a
 	dh_installchangelogs -a ChangeLog
-	dh_python -a -V 2.3
+	dh_python -a
 	dh_link -a
 	dh_strip -a
 	dh_compress -a -Xexamples/

Modified: packages/libxslt/trunk/debian/watch
===================================================================
--- packages/libxslt/trunk/debian/watch	2005-03-27 20:34:31 UTC (rev 380)
+++ packages/libxslt/trunk/debian/watch	2005-03-27 22:13:54 UTC (rev 381)
@@ -1,2 +1,2 @@
 version=2
-ftp://xmlsoft.org/libxslt-([\d\.]+)\.tar\.gz debian  uupdate
+ftp://xmlsoft.org/libxslt-([\d\.]+)\.tar\.gz debian svn-upgrade