[Python-modules-commits] r5828 - in packages/python-couchdb/trunk/debian (rules watch)

[nslater-guest at users.alioth.debian.org]

    Date: Thursday, July 3, 2008 @ 20:28:34
  Author: nslater-guest
Revision: 5828

completed initial work on new upstream release

Modified:
  packages/python-couchdb/trunk/debian/rules
  packages/python-couchdb/trunk/debian/watch

Modified: packages/python-couchdb/trunk/debian/rules
===================================================================
--- packages/python-couchdb/trunk/debian/rules	2008-07-03 20:00:47 UTC (rev 5827)
+++ packages/python-couchdb/trunk/debian/rules	2008-07-03 20:28:34 UTC (rev 5828)
@@ -8,29 +8,32 @@
 # permitted in any medium without royalty provided the copyright notice and this
 # notice are preserved.
 
-DEB_PYTHON_SYSTEM := pysupport
+DEB_PYTHON_SYSTEM = pysupport
 
 include /usr/share/cdbs/1/rules/buildcore.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/python-distutils.mk
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 
+DEB_DESTDIR = debian/python-couchdb
+
+DEB_PYTHON_MODULE_PACKAGE = python-couchdb
+
+DEB_PYTHON_BUILD_ARGS = build_doc
+
 DEB_PYTHON_INSTALL_ARGS_ALL += --single-version-externally-managed
 
-PYTHON_VERSION_COMMAND = __import__('pkg_resources').get_distribution('CouchDB').version
+VERSION = __import__('pkg_resources').get_distribution('CouchDB').version
 
 clean::
 	rm -rf *.1 couchdb/tools/__init__.py doc/index.html doc/api
 
 cleanbuilddir::
-	sed -i -e "s/\"$(DEB_UPSTREAM_VERSION)\"/$(PYTHON_VERSION_COMMAND)/" couchdb/__init__.py
+	sed -i -e "s/\"$(DEB_UPSTREAM_VERSION)\"/$(VERSION)/" couchdb/__init__.py
 
 post-patches::
-	sed -i -e "s/$(PYTHON_VERSION_COMMAND)/\"$(DEB_UPSTREAM_VERSION)\"/" couchdb/__init__.py
-
-common-build-indep::
+	sed -i -e "s/$(VERSION)/\"$(DEB_UPSTREAM_VERSION)\"/" couchdb/__init__.py
 	touch couchdb/tools/__init__.py
-	@# ./setup.py build_doc > /dev/null
 
 install/python-couchdb::
 	chmod 755 couchpy

Modified: packages/python-couchdb/trunk/debian/watch
===================================================================
--- packages/python-couchdb/trunk/debian/watch	2008-07-03 20:00:47 UTC (rev 5827)
+++ packages/python-couchdb/trunk/debian/watch	2008-07-03 20:28:34 UTC (rev 5828)
@@ -1,3 +1,3 @@
-version = 3
+version=3
 
 http://pypi.python.org/packages/source/C/CouchDB/CouchDB-(.*)\.tar\.gz