[Python-modules-commits] r13210 - in packages/sqlalchemy/trunk/debian (changelog rules)

[piotr at users.alioth.debian.org]

    Date: Tuesday, June 1, 2010 @ 21:16:34
  Author: piotr
Revision: 13210

* New upstream release
* Add more hacks in debian/rules to workaround setuptools bugs
* get-orig-source target removed from debian/rules (no longer needed)
* Upload to unstable

Modified:
  packages/sqlalchemy/trunk/debian/changelog
  packages/sqlalchemy/trunk/debian/rules

Modified: packages/sqlalchemy/trunk/debian/changelog
===================================================================
--- packages/sqlalchemy/trunk/debian/changelog	2010-06-01 18:24:06 UTC (rev 13209)
+++ packages/sqlalchemy/trunk/debian/changelog	2010-06-01 21:16:34 UTC (rev 13210)
@@ -1,3 +1,12 @@
+sqlalchemy (0.6.1-1) unstable; urgency=low
+
+  * New upstream release
+  * Add more hacks in debian/rules to workaround setuptools bugs
+  * get-orig-source target removed from debian/rules (no longer needed)
+  * Upload to unstable
+
+ -- Piotr Ożarowski <piotr at debian.org>  Tue, 01 Jun 2010 21:27:25 +0200
+
 sqlalchemy (0.6.0-1) experimental; urgency=low
 
   * New upstream release

Modified: packages/sqlalchemy/trunk/debian/rules
===================================================================
--- packages/sqlalchemy/trunk/debian/rules	2010-06-01 18:24:06 UTC (rev 13209)
+++ packages/sqlalchemy/trunk/debian/rules	2010-06-01 21:16:34 UTC (rev 13210)
@@ -58,20 +58,29 @@
 
 install: build $(PYVERS:%=install-python%) install-python3.1
 install-python%: build
-	#python$* ./setup.py install --skip-build \
-	#	--root $(call pkgdir,$*) $(py_setup_install_args)
-	#touch $@
+	python$* ./setup.py install --skip-build \
+		--root $(call pkgdir,$*) $(py_setup_install_args)
+	# move extensions to -ext binary package
 	mkdir -p $(call pkgdir,$*)-ext$(call py_libdir,$*)/sqlalchemy
-	mv $(CURDIR)/build/lib.*-$*/sqlalchemy/*.so \
-	 $(call pkgdir,$*)-ext$(call py_libdir,$*)/sqlalchemy/
-	# hack to workaround distutils/setuptools bug:
-	mkdir -p $(call pkgdir,$*)$(call py_libdir,$*)
-	cp -R $(CURDIR)/build/lib.*-$*/* $(call pkgdir,$*)$(call py_libdir,$*)
-
+	mv $(call pkgdir,$*)$(call py_libdir,$*)/sqlalchemy/*so \
+	   $(call pkgdir,$*)-ext$(call py_libdir,$*)/sqlalchemy/
+	touch $@
+	
 install-python3.1:
+	# no extension for 3.1 yet...
 	python3.1 ./setup.py install $(py_setup_install_args) \
 		--root $(call pkgdir,3.1)
 
+install-python2.5: build-python2.5
+	# WTF? Why setuptools doesn't work with --skip-build in Python 2.5?
+	python2.5 ./setup.py install \
+		--root $(call pkgdir,2.5) $(py_setup_install_args)
+	# ... and *removes* .so files?
+	python2.5 ./setup.py --with-cextensions build_ext
+	mkdir -p $(call pkgdir,2.5)-ext$(call py_libdir,2.5)/sqlalchemy
+	mv $(CURDIR)/build/lib.*-2.5/sqlalchemy/*.so \
+	 $(call pkgdir,2.5)-ext$(call py_libdir,2.5)/sqlalchemy/
+
 binary-indep: build install install-docs
 	dh_testdir -i
 	dh_testroot -i
@@ -109,15 +118,4 @@
 
 binary: binary-indep binary-arch
 
-get-orig-source:
-	REV=$(shell dpkg-parsechangelog | sed -rne 's,^Version: .*svn([^-]+).*,\1,p'); \
-	VER=$(shell dpkg-parsechangelog | sed -rne 's,^Version: ([^-]+).*,\1,p'); \
-	if [ x$$REV = x ]; then \
-	 uscan --noconf --force-download --rename --download-version=$$VER --destdir=.; \
-	else \
-	 svn -q export -r $$REV http://svn.sqlalchemy.org/sqlalchemy/trunk sqlalchemy-r$$REV && \
-         tar -zcf ./sqlalchemy_$$VER.orig.tar.gz sqlalchemy-r$$REV; \
-	 rm -rf sqlalchemy-r$$REV; \
-	fi
-
 .PHONY: build clean binary-indep binary-arch binary install get-orig-source