[Pkg-uml-commit] r266 - in trunk/src/umlrun: . debian

[Stefano Melchior]

Author: stex-guest
Date: 2006-11-30 06:33:49 +0100 (Thu, 30 Nov 2006)
New Revision: 266

Added:
   trunk/src/umlrun/debian/pycompat
Modified:
   trunk/src/umlrun/Makefile
   trunk/src/umlrun/debian/control
   trunk/src/umlrun/debian/copyright
   trunk/src/umlrun/debian/rules
Log:
Changes to be compliant with debian python policy: rules, control, Makefile

Modified: trunk/src/umlrun/Makefile
===================================================================
--- trunk/src/umlrun/Makefile	2006-11-27 18:46:44 UTC (rev 265)
+++ trunk/src/umlrun/Makefile	2006-11-30 05:33:49 UTC (rev 266)
@@ -9,5 +9,6 @@
 	install -d $(DESTDIR)$(prefix)/lib/rootstrap/modules
 	install -m 755 rootstrap $(DESTDIR)$(prefix)/lib/rootstrap/modules/umlrun
 	install -d $(DESTDIR)$(prefix)/share/umlrun/scripts
-	install -d $(DESTDIR)$(prefix)/lib/site-python
-	install -m 644 umlrun.py $(DESTDIR)$(prefix)/lib/site-python
+	install -d $(DESTDIR)$(prefix)/lib/site-packages
+	install -d $(DESTDIR)$(prefix)/lib/site-packages/umlrun
+	install -m 644 umlrun.py $(DESTDIR)$(prefix)/lib/site-packages/umlrun

Modified: trunk/src/umlrun/debian/control
===================================================================
--- trunk/src/umlrun/debian/control	2006-11-27 18:46:44 UTC (rev 265)
+++ trunk/src/umlrun/debian/control	2006-11-30 05:33:49 UTC (rev 266)
@@ -3,7 +3,8 @@
 Priority: optional
 Maintainer: User Mode Linux Maintainers <pkg-uml-pkgs at lists.alioth.debian.org>
 Uploaders: Andreas Schuldei <andreas at schuldei.org>, Mattia Dongili <malattia at debian.org>, Stefano Melchior <stefano.melchior at openlabs.it>
-Build-Depends: debhelper (>> 4.0.0)
+Build-Depends: debhelper (>= 5.0.38), python-all-dev (>= 2.3.5-11), python-central (>= 0.5.6)
+XS-Python-Version: current
 Standards-Version: 3.7.2
 
 Package: umlrun
@@ -17,7 +18,8 @@
 
 Package: umlrun-uml
 Architecture: all
-Depends: python (>= 2.1)
+Depends: ${python:Depends}
+XB-Python-Version: ${python:Versions}
 Description: Components of umlrun to be installed inside UML
  This package is meant to be installed under User-Mode Linux in order
  to make it possible to use umlrun with it.

Modified: trunk/src/umlrun/debian/copyright
===================================================================
--- trunk/src/umlrun/debian/copyright	2006-11-27 18:46:44 UTC (rev 265)
+++ trunk/src/umlrun/debian/copyright	2006-11-30 05:33:49 UTC (rev 266)
@@ -3,7 +3,7 @@
 
 It has no home other than Debian.
 
-Upstream Author(s): Matt Zimmerman <mdz at debian.org>
+Upstream Author: Matt Zimmerman <mdz at debian.org>
 
 Copyright:
 
@@ -21,8 +21,8 @@
 
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
-	Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
-	MA 02110-1301, USA.
+    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
+    MA 02110-1301, USA.
 
 On Debian systems, a copy of the GNU General Public License can be
 found in /usr/share/common-licenses/GPL.

Added: trunk/src/umlrun/debian/pycompat
===================================================================
--- trunk/src/umlrun/debian/pycompat	2006-11-27 18:46:44 UTC (rev 265)
+++ trunk/src/umlrun/debian/pycompat	2006-11-30 05:33:49 UTC (rev 266)
@@ -0,0 +1 @@
+2

Modified: trunk/src/umlrun/debian/rules
===================================================================
--- trunk/src/umlrun/debian/rules	2006-11-27 18:46:44 UTC (rev 265)
+++ trunk/src/umlrun/debian/rules	2006-11-30 05:33:49 UTC (rev 266)
@@ -12,6 +12,11 @@
 # This is the debhelper compatibility version to use.
 export DH_COMPAT=4
 
+# Python version
+export PYVERSION=$(shell pyversions -vr)
+export PYDEF=$(shell pyversions -d)
+
+
 build-indep:  build-indep-stamp
 build-indep-stamp:
 	dh_testdir
@@ -19,6 +24,11 @@
 	touch build-indep-stamp
 
 build: build-indep
+	$(PYVERS:%=build-python%)
+	touch $@
+build-python%:
+	python$* setup.py build
+	touch $@
 
 clean:
 	dh_testdir
@@ -29,9 +39,20 @@
 	#-$(MAKE) clean
 
 	dh_clean
+	#New python policy
+	for python in $(PYVERS); do \
+                python=$$(echo $$python | sed "s/$(PYDEF)/python/"); \
+                $$python setup.py clean; \
+        done
+	rm -rf build-stamp build
+	dh_clean
 
 install: DH_OPTIONS=
-install: build
+	#New python policy
+install-python%:
+	python$* setup.py install --root $(CURDIR)/debian/tmp
+
+install: build $(PYVERS:%=install-python%)
 	dh_testdir
 	dh_testroot
 	dh_clean -k
@@ -39,9 +60,14 @@
 
 	# Add here commands to install the package into debian/umlrun.
 	$(MAKE) install prefix=/usr DESTDIR=$(CURDIR)/debian/tmp
+	# For new python policy
+	set -e; \
+	for python in $(PYVERS); do \
+		python=$$(echo $$python | sed "s/$(PYDEF)/python/"); \
+		$$python setup.py install --root=debian/tmp; \
+	done
+	#dh_movefiles
 
-	dh_movefiles
-
 binary-arch: build install
 	dh_testdir -a
 	dh_testroot -a
@@ -64,6 +90,8 @@
 	dh_fixperms -a
 	dh_installdeb -a
 #	dh_perl -a
+	dh_pycentral umlrun.py $(DESTDIR)/usr/lib/python$(PYVERSION)/site-packages/umlrun
+	dh_python
 	dh_gencontrol -a
 	dh_md5sums -a
 	dh_builddeb -a
@@ -90,6 +118,8 @@
 	dh_fixperms -i
 	dh_installdeb -i
 #	dh_perl -i
+	dh_pycentral umlrun.py $(DESTDIR)/usr/lib/python$(PYVERSION)/site-packages/umlrun
+	dh_python
 	dh_gencontrol -i
 	dh_md5sums -i
 	dh_builddeb -i