r2411 - in van.pydeb/trunk/debian (4 files)

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

    Date: Monday, October 17, 2011 @ 11:40:32
  Author: menesis-guest
Revision: 2411

Take changes from ubuntu:
* New upstream release.
* rules_templates/rules.1.mk,
  debian/dh_pydeb: do not guess py_package, use setup.py --name

Modified:
  van.pydeb/trunk/debian/changelog
  van.pydeb/trunk/debian/control
  van.pydeb/trunk/debian/dh_pydeb
  van.pydeb/trunk/debian/rules_templates/rules.1.mk

Modified: van.pydeb/trunk/debian/changelog
===================================================================
--- van.pydeb/trunk/debian/changelog	2011-10-15 11:39:41 UTC (rev 2410)
+++ van.pydeb/trunk/debian/changelog	2011-10-17 11:40:32 UTC (rev 2411)
@@ -1,8 +1,11 @@
-van.pydeb (1.3.2-2) UNRELEASED; urgency=low
+van.pydeb (1.3.3-1) UNRELEASED; urgency=low
 
+  * New upstream release.
   * Switch to "3.0 (quilt)" source format.
+  * rules_templates/rules.1.mk,
+    debian/dh_pydeb: do not guess py_package, use setup.py --name
 
- -- Arnaud Fontaine <arnau at debian.org>  Sun, 01 May 2011 17:58:40 +0900
+ -- Gediminas Paulauskas <menesis at pov.lt>  Mon, 17 Oct 2011 14:32:30 +0300
 
 van.pydeb (1.3.2-1) unstable; urgency=low
 
@@ -11,7 +14,7 @@
   * Do not add provides for metapackages, because it contains only itself.
 
   [ Matthias Klose ]
-  * Build using dh_python2 instead of dh_pycentral.
+  * Build using dh_python2 instead of dh_pycentral. (Closes: #617139)
 
   [ Brian Sutherland ]
   * require python-setuptools, our command line scripts don't work without it. 
@@ -86,7 +89,7 @@
     a oneliner. Makefile targets post-install-python% and
     dependencies-python% can be overridden for slightly more complex
     situations.
-  * Use riles template to simplify our own rules file.
+  * Use rules template to simplify our own rules file.
 
  -- Brian Sutherland <brian at vanguardistas.net>  Wed, 03 Jun 2009 09:02:06 +0200
 

Modified: van.pydeb/trunk/debian/control
===================================================================
--- van.pydeb/trunk/debian/control	2011-10-15 11:39:41 UTC (rev 2410)
+++ van.pydeb/trunk/debian/control	2011-10-17 11:40:32 UTC (rev 2411)
@@ -16,8 +16,7 @@
 Package: python-van.pydeb
 Architecture: all
 Depends: python-setuptools, ${python:Depends}
-Provides: python-van, ${python:Provides}
-Breaks: ${python:Breaks}
+Provides: python-van
 Conflicts: python-van
 Replaces: python-van
 Description: introspection of Python metadata and conversion to Debian package metadata

Modified: van.pydeb/trunk/debian/dh_pydeb
===================================================================
--- van.pydeb/trunk/debian/dh_pydeb	2011-10-15 11:39:41 UTC (rev 2410)
+++ van.pydeb/trunk/debian/dh_pydeb	2011-10-17 11:40:32 UTC (rev 2411)
@@ -5,8 +5,8 @@
 # XXX: This should be written in perl, but the original author only knows python well. Volunteers?
 
 # Figure out what packages to operate on
-echo pydeb: Working on source package ${PYDEB_SRC_PACKAGE:=`grep 'Source: ' debian/control | sed 's/Source: //'`}
-echo pydeb: Working on python distribution ${PYDEB_PY_PACKAGE:=`van-pydeb src_to_py $PYDEB_SRC_PACKAGE`}
+echo pydeb: Working on source package ${PYDEB_SRC_PACKAGE:=`grep -m1 '^Source: ' debian/control | sed 's/Source: //'`}
+echo pydeb: Working on python distribution ${PYDEB_PY_PACKAGE:=`python setup.py --name`}
 echo pydeb: Working on binary package ${PYDEB_BIN_PACKAGE:=`van-pydeb py_to_bin $PYDEB_PY_PACKAGE`}
 
 # Sanity checks

Modified: van.pydeb/trunk/debian/rules_templates/rules.1.mk
===================================================================
--- van.pydeb/trunk/debian/rules_templates/rules.1.mk	2011-10-15 11:39:41 UTC (rev 2410)
+++ van.pydeb/trunk/debian/rules_templates/rules.1.mk	2011-10-17 11:40:32 UTC (rev 2411)
@@ -5,20 +5,14 @@
 PYVERS=$(shell pyversions -vr debian/control)
 
 ifeq ($(origin py_package), undefined)
-  py_package=$(shell van-pydeb src_to_py `dpkg-parsechangelog -c1 -ldebian/changelog | grep 'Source: ' | sed 's/Source: //'`)
+  py_package=$(shell python setup.py --name)
 endif
 
 ifeq ($(origin package), undefined)
   package=$(shell van-pydeb py_to_bin $(py_package))
 endif
 
--include /usr/share/python/python.mk
-ifeq (,$(py_sitename))
-  py_sitename = site-packages
-  py_libdir = /usr/lib/python$(subst python,,$(1))/site-packages
-  py_sitename_sh = $(py_sitename)
-  py_libdir_sh = $(py_libdir)
-endif
+include /usr/share/python/python.mk
 
 build: $(PYVERS:%=build-python%)
 	touch $@
@@ -45,7 +39,7 @@
 install: build
 	dh_testdir
 	dh_testroot
-	dh_clean -k
+	dh_prep
 	dh_installdirs
 	$(MAKE) -f debian/rules $(PYVERS:%=install-python%)