[Python-apps-commits] r6458 - in packages/ibid/trunk/debian (5 files)

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

    Date: Monday, January 3, 2011 @ 20:17:14
  Author: stefanor-guest
Revision: 6458

Switch to dh_python2, and use X-Python-Version

Added:
  packages/ibid/trunk/debian/install
Modified:
  packages/ibid/trunk/debian/changelog
  packages/ibid/trunk/debian/control
  packages/ibid/trunk/debian/copyright
  packages/ibid/trunk/debian/rules

Modified: packages/ibid/trunk/debian/changelog
===================================================================
--- packages/ibid/trunk/debian/changelog	2011-01-03 20:04:36 UTC (rev 6457)
+++ packages/ibid/trunk/debian/changelog	2011-01-03 20:17:14 UTC (rev 6458)
@@ -1,10 +1,14 @@
 ibid (0.1.0+dfsg-3) UNRELEASED; urgency=low
 
+  [ Jakub Wilk ]
   * Set maintainer to Python Applications Packaging Team.
+
+  [ Stefano Rivera ]
   * Don't compress objects.inv. Thanks to Michael Fladischer for the report.
     (Closes: #608753)
+  * Switch to dh_python2, and use X-Python-Version
 
- -- Stefano Rivera <stefano at rivera.za.net>  Mon, 03 Jan 2011 19:28:27 +0200
+ -- Stefano Rivera <stefano at rivera.za.net>  Mon, 03 Jan 2011 19:42:13 +0200
 
 ibid (0.1.0+dfsg-2) unstable; urgency=low
 

Modified: packages/ibid/trunk/debian/control
===================================================================
--- packages/ibid/trunk/debian/control	2011-01-03 20:04:36 UTC (rev 6457)
+++ packages/ibid/trunk/debian/control	2011-01-03 20:17:14 UTC (rev 6458)
@@ -5,9 +5,8 @@
 Uploaders: Stefano Rivera <stefano at rivera.za.net>
 Build-Depends:
  debhelper (>= 7.0.50~),
- python-all,
+ python-all (>= 2.6.5-13~),
  python-beautifulsoup,
- python-central (>= 0.6.7~),
  python-configobj (>= 4.7),
  python-dateutil,
  python-html5lib,
@@ -24,11 +23,11 @@
 Homepage: http://ibid.omnia.za.net/
 Vcs-Svn: svn://svn.debian.org/python-apps/packages/ibid/trunk/
 Vcs-Browser: http://svn.debian.org/viewsvn/python-apps/packages/ibid/trunk/
-XS-Python-Version: >= 2.5
+X-Python-Version: >= 2.5
 
 Package: ibid
 Architecture: all
-XB-Python-Version: ${python:Versions}
+Breaks: ${python:Breaks}
 Depends:
  libjs-jquery,
  python (>= 2.6) | python-simplejson,

Modified: packages/ibid/trunk/debian/copyright
===================================================================
--- packages/ibid/trunk/debian/copyright	2011-01-03 20:04:36 UTC (rev 6457)
+++ packages/ibid/trunk/debian/copyright	2011-01-03 20:17:14 UTC (rev 6458)
@@ -20,7 +20,7 @@
   zippy.json:     Zippy the Pinhead quotes
 
 Files: debian/*
-Copyright: 2008-2010, Michael Gorven, Stefano Rivera
+Copyright: 2008-2011, Michael Gorven, Stefano Rivera
 License: MIT
 
 Files: ibid/factpacks/divine.json:

Added: packages/ibid/trunk/debian/install
===================================================================
--- packages/ibid/trunk/debian/install	                        (rev 0)
+++ packages/ibid/trunk/debian/install	2011-01-03 20:17:14 UTC (rev 6458)
@@ -0,0 +1,6 @@
+ibid/config.ini     /usr/share/ibid
+ibid/configspec.ini /usr/share/ibid
+ibid/data           /usr/share/ibid
+ibid/logging.ini    /usr/share/ibid
+ibid/static         /usr/share/ibid
+ibid/templates      /usr/share/ibid

Modified: packages/ibid/trunk/debian/rules
===================================================================
--- packages/ibid/trunk/debian/rules	2011-01-03 20:04:36 UTC (rev 6457)
+++ packages/ibid/trunk/debian/rules	2011-01-03 20:17:14 UTC (rev 6458)
@@ -3,7 +3,7 @@
 PKGDIR=$(CURDIR)/debian/ibid
 
 %:
-	dh --with python-central $@
+	dh $@ --with python2
 
 TRIAL=$(shell which trial)
 
@@ -21,6 +21,11 @@
 	mkdir -p docs/html docs/_static
 	sphinx-build -N -bhtml docs/ docs/html/
 
+override_dh_auto_install:
+	dh_auto_install
+	rm -rf $(PKGDIR)/usr/lib/python*/*-packages/ibid/test
+	rm -rf $(PKGDIR)/usr/lib/python*/*-packages/*.egg-info/requires.txt
+
 override_dh_auto_clean:
 	dh_auto_clean
 	rm -rf docs/html
@@ -36,19 +41,12 @@
 	dh_installexamples
 	cd $(PKGDIR)/usr/share/doc/ibid/examples/factpacks && rm -f *.py *.sh
 
-override_dh_pycentral:
-	rm -rf $(wildcard $(PKGDIR)/usr/lib/python*/*-packages/ibid/templates)
-	rm -rf $(wildcard $(PKGDIR)/usr/lib/python*/*-packages/ibid/test)
-	rm -rf $(wildcard $(PKGDIR)/usr/lib/python*/*-packages/*.egg-info/requires.txt)
-	dh_pycentral
-	set -e; \
-	for DATA in data configspec.ini logging.ini config.ini static templates; do \
-		cp -a ibid/$$DATA $(PKGDIR)/usr/share/ibid/; \
-	done
-
 override_dh_compress:
 	dh_compress -X.js -X.inv
 
+override_dh_python2:
+	dh_python2 --no-guessing-deps
+
 REV=$(shell dpkg-parsechangelog | sed -rne 's,^Version: .*bzr([0-9]+).*,\1,p')
 VER=$(shell dpkg-parsechangelog | sed -rne 's,^Version: (.+)\+dfsg.*,\1,p')
 BZR_REPO?=lp:ibid