r2514 - in van.pydeb/trunk/debian (5 files)

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

    Date: Tuesday, October 25, 2011 @ 15:24:04
  Author: menesis-guest
Revision: 2514

* debian/rules: rewrite to use dh. Fixes van-pydeb script to use default
  python (LP: #881041)
* debian/python-van.pydeb.pyinstall: add to install van/__init__.py

Added:
  van.pydeb/trunk/debian/python-van.pydeb.pyinstall
Modified:
  van.pydeb/trunk/debian/changelog
  van.pydeb/trunk/debian/compat
  van.pydeb/trunk/debian/control
  van.pydeb/trunk/debian/rules

Modified: van.pydeb/trunk/debian/changelog
===================================================================
--- van.pydeb/trunk/debian/changelog	2011-10-25 15:18:51 UTC (rev 2513)
+++ van.pydeb/trunk/debian/changelog	2011-10-25 15:24:04 UTC (rev 2514)
@@ -1,5 +1,6 @@
 van.pydeb (1.3.3-1) unstable; urgency=low
 
+  * Team upload.
   * New upstream release.
   * Switch to "3.0 (quilt)" source format.
   * rules_templates/rules.1.mk,
@@ -7,8 +8,11 @@
   * debian/copyright: convert to dep5 format.
   * Add debian/clean to get rid of egg-info/* to prevent FTBFS if
     built twice.
+  * debian/rules: rewrite to use dh. Fixes van-pydeb script to use default
+    python (LP: #881041)
+  * debian/python-van.pydeb.pyinstall: add to install van/__init__.py
 
- -- Gediminas Paulauskas <menesis at pov.lt>  Mon, 17 Oct 2011 14:32:30 +0300
+ -- Gediminas Paulauskas <menesis at pov.lt>  Tue, 25 Oct 2011 18:23:37 +0300
 
 van.pydeb (1.3.2-1) unstable; urgency=low
 

Modified: van.pydeb/trunk/debian/compat
===================================================================
--- van.pydeb/trunk/debian/compat	2011-10-25 15:18:51 UTC (rev 2513)
+++ van.pydeb/trunk/debian/compat	2011-10-25 15:24:04 UTC (rev 2514)
@@ -1 +1 @@
-5
+7

Modified: van.pydeb/trunk/debian/control
===================================================================
--- van.pydeb/trunk/debian/control	2011-10-25 15:18:51 UTC (rev 2513)
+++ van.pydeb/trunk/debian/control	2011-10-25 15:24:04 UTC (rev 2514)
@@ -4,9 +4,9 @@
 Maintainer: Debian/Ubuntu Zope Team <pkg-zope-developers at lists.alioth.debian.org>
 Uploaders: Brian Sutherland <brian at vanguardistas.net>,
            Fabio Tranchitella <kobold at debian.org>
-Build-Depends: debhelper (>= 5.0.38),
+Build-Depends: debhelper (>= 7.0.50~),
                python-all (>= 2.6.6-3~),
-               python-setuptools (>= 0.6b3)
+               python-setuptools
 Standards-Version: 3.9.2
 X-Python-Version: >= 2.4
 Homepage: http://pypi.python.org/pypi/van.pydeb
@@ -15,7 +15,7 @@
 
 Package: python-van.pydeb
 Architecture: all
-Depends: python-setuptools, ${python:Depends}
+Depends: python-setuptools, ${python:Depends}, ${misc:Depends}, ${perl:Depends}
 Provides: python-van
 Conflicts: python-van
 Replaces: python-van

Added: van.pydeb/trunk/debian/python-van.pydeb.pyinstall
===================================================================
--- van.pydeb/trunk/debian/python-van.pydeb.pyinstall	                        (rev 0)
+++ van.pydeb/trunk/debian/python-van.pydeb.pyinstall	2011-10-25 15:24:04 UTC (rev 2514)
@@ -0,0 +1 @@
+van/__init__.py van

Modified: van.pydeb/trunk/debian/rules
===================================================================
--- van.pydeb/trunk/debian/rules	2011-10-25 15:18:51 UTC (rev 2513)
+++ van.pydeb/trunk/debian/rules	2011-10-25 15:24:04 UTC (rev 2514)
@@ -1,19 +1,7 @@
 #!/usr/bin/make -f
 
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+%:
+	dh --with python2 $@
 
-# van-pydeb may not be available yet, so we do what it would otherwise do
-
-py_package=van.pydeb
-package=python-van.pydeb
-
-include debian/rules_templates/rules.1.mk
-
-dependencies-python%:
-	# we do our own dependency management
-	echo
-
-post-install-python%:
-	install -D -m 644 van/__init__.py \
-	    debian/$(package)$(call py_libdir,$*)/van/__init__.py
+override_dh_python2:
+	dh_python2 --no-guessing-deps