[Python-modules-commits] r8543 - in packages/foolscap/trunk/debian (6 files)

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

    Date: Wednesday, May 20, 2009 @ 10:09:28
  Author: speijnik-guest
Revision: 8543

Preparations for foolscap 0.4.0. Switched to python-support.

Added:
  packages/foolscap/trunk/debian/preinst
Modified:
  packages/foolscap/trunk/debian/changelog
  packages/foolscap/trunk/debian/control
  packages/foolscap/trunk/debian/docs
  packages/foolscap/trunk/debian/rules
  packages/foolscap/trunk/debian/watch

Modified: packages/foolscap/trunk/debian/changelog
===================================================================
--- packages/foolscap/trunk/debian/changelog	2009-05-20 09:12:24 UTC (rev 8542)
+++ packages/foolscap/trunk/debian/changelog	2009-05-20 10:09:28 UTC (rev 8543)
@@ -1,3 +1,15 @@
+foolscap (0.4.0+dfsg-1) unreleased; urgency=low
+
+  * NOT RELEASED YET
+  * New upstream release
+  * Switched to python-support
+  * Bumped Standards-Version to 3.8.1, no changes needed
+  * Documentation should end up in /usr/share/python-foolscap, but
+    /usr/share/python-foolscap/doc now.
+  * TODO: why isn't slicers/__init__.py and logging/__init__.py in the .deb?
+
+ -- Stephan Peijnik <debian at sp.or.at>  Wed, 20 May 2009 12:08:41 +0200
+
 foolscap (0.3.2.dfsg-2) unstable; urgency=low
 
   * Fixed missing build dependency on python-setuptools (Closes: #510901).

Modified: packages/foolscap/trunk/debian/control
===================================================================
--- packages/foolscap/trunk/debian/control	2009-05-20 09:12:24 UTC (rev 8542)
+++ packages/foolscap/trunk/debian/control	2009-05-20 10:09:28 UTC (rev 8543)
@@ -4,9 +4,9 @@
 Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
 Uploaders: Stephan Peijnik <debian at sp.or.at>
 Build-Depends: debhelper (>= 5)
-Build-Depends-Indep: python-central (>= 0.6), python-openssl, python-twisted-core, python-twisted-web, python-setuptools
+Build-Depends-Indep: python-support (>= 0.6.4), python-openssl, python-twisted-core, python-twisted-web, python-setuptools
 XS-Python-Version: all
-Standards-Version: 3.8.0
+Standards-Version: 3.8.1
 Homepage: http://foolscap.lothar.com/
 Vcs-Svn: svn://svn.debian.org/python-modules/packages/foolscap/trunk/
 Vcs-Browser: http://svn.debian.org/viewsvn/python-modules/packages/foolscap/trunk/

Modified: packages/foolscap/trunk/debian/docs
===================================================================
--- packages/foolscap/trunk/debian/docs	2009-05-20 09:12:24 UTC (rev 8542)
+++ packages/foolscap/trunk/debian/docs	2009-05-20 10:09:28 UTC (rev 8543)
@@ -1,2 +1,2 @@
 README
-doc/*
+doc/

Added: packages/foolscap/trunk/debian/preinst
===================================================================
--- packages/foolscap/trunk/debian/preinst	                        (rev 0)
+++ packages/foolscap/trunk/debian/preinst	2009-05-20 10:09:28 UTC (rev 8543)
@@ -0,0 +1,9 @@
+#!/bin/sh
+# TODO: remove this file after squeeze has been released
+set -e
+if [ "$1" = upgrade ] && dpkg --compare-versions "$2" lt-nl 0.4.0+dfsg-0;
+then
+	pycentral pkgremove python-foolscap
+fi
+
+#DEBHELPER#
\ No newline at end of file

Modified: packages/foolscap/trunk/debian/rules
===================================================================
--- packages/foolscap/trunk/debian/rules	2009-05-20 09:12:24 UTC (rev 8542)
+++ packages/foolscap/trunk/debian/rules	2009-05-20 10:09:28 UTC (rev 8543)
@@ -4,17 +4,20 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-SRC_VERSION := $(shell dpkg-parsechangelog | sed -ne 's/^Version: \(.*\)-.*/\1/p' | sed -ne 's/\.dfsg//p')
+DEB_UPSTREAM_VERSION=$(shell dpkg-parsechangelog | sed -rne 's,^Version: ([^-]+).*,\1,p' | sed -rne 's,(.*)\+dfsg,\1,p')
 
 get-orig-source:
-	wget http://foolscap.lothar.com/releases/foolscap-$(SRC_VERSION).tar.gz
-	tar xzf foolscap-$(SRC_VERSION).tar.gz
+	uscan --force-download --destdir=. \
+		--download-version=$(DEB_UPSTREAM_VERSION)
 
+	tar xzf foolscap-$(DEB_UPSTREAM_VERSION).tar.gz
+
 	# Remove unused misc/testutils directory.
 	rm -rf misc/testutils/
 
-	tar czf foolscap_$(SRC_VERSION).dfsg.orig.tar.gz foolscap-$(SRC_VERSION)
-	rm -r foolscap-$(SRC_VERSION) foolscap-$(SRC_VERSION).tar.gz
+	tar czf foolscap_$(DEB_UPSTREAM_VERSION)+dfsg.orig.tar.gz foolscap-$(DEB_UPSTREAM_VERSION)
+	rm -r foolscap-$(DEB_UPSTREAM_VERSION) foolscap-$(DEB_UPSTREAM_VERSION).tar.gz
+	-rm -f foolscap_$(DEB_UPSTREAM_VERSION).orig.tar.gz
 
 clean:
 	dh_testdir
@@ -24,9 +27,13 @@
 	dh_clean
 
 build:
+	python setup.py build
 
 install:
-	python setup.py install --root $(CURDIR)/debian/python-foolscap
+	python setup.py install --root $(CURDIR)/debian/python-foolscap \
+		--install-layout=deb
+	# No need to include the unit tests in the deb file.
+	rm -rf $(CURDIR)/debian/python-foolscap/usr/lib/python2.5/site-packages/foolscap/test
 
 # Build architecture-independent files here.
 binary-indep: build install
@@ -36,9 +43,9 @@
 	dh_installchangelogs NEWS
 	dh_installdocs README
 	dh_installman
-	dh_pycentral
+	dh_pysupport
 	dh_compress -X.py -X.xhtml -X.txt
-	dh_fixperms
+	dh_fixperms 
 	dh_installdeb
 	dh_gencontrol
 	dh_md5sums

Modified: packages/foolscap/trunk/debian/watch
===================================================================
--- packages/foolscap/trunk/debian/watch	2009-05-20 09:12:24 UTC (rev 8542)
+++ packages/foolscap/trunk/debian/watch	2009-05-20 10:09:28 UTC (rev 8543)
@@ -1,3 +1,3 @@
 version=3
-opts=dversionmangle=s/\.dfsg$// \
+opts=dversionmangle=s/\+dfsg$// \
      http://foolscap.lothar.com/releases/foolscap-(.*)\.tar\.gz