Merge lp:~therve/landscape-client/natty-packaging into lp:~landscape/landscape-client/trunk

[Thomas Herve]

The branch builds for 2.7 on natty, using dh_python2. It also tries to only refer to old versions instead of listing every one of them.

[Free Ekanayaka (free.ekanayaka)]

Looks good. +1!

review: Approve

[Andreas Hasenack (ahasenack)]

+1

I will still try the build on all distros, but don't want to block on that.

[Andreas Hasenack (ahasenack)]

Oh, forgot to formally approve it

[Andreas Hasenack (ahasenack)]

Formal approval that I forgot at the time.

review: Approve

=== modified file 'debian/control'
--- debian/control	2010-08-02 15:45:12 +0000
+++ debian/control	2011-01-11 23:17:26 +0000
@@ -5,7 +5,7 @@
 XSBC-Original-Maintainer: Landscape Team <[e-mail]>
 Build-Depends: debhelper (>= 5), po-debconf, python-dev, python-central | python-support, lsb-release, gawk, python-twisted-core
 Standards-Version: 3.8.0
-XS-Python-Version: >= 2.4, << 2.7
+XS-Python-Version: >= 2.4, << 2.8
 
 Package: landscape-common
 Architecture: any

=== modified file 'debian/rules'
--- debian/rules	2010-06-28 16:07:01 +0000
+++ debian/rules	2011-01-11 23:17:26 +0000
@@ -4,6 +4,9 @@
 ifneq ($(dist_release),dapper)
   use_pycentral = yes
 endif
+ifeq (,$(filter $(dist_release), dapper hardy karmic lucid maverick))
+  use_dhpython2 = yes
+endif
 
 -include /usr/share/python/python.mk
 ifeq (,$(py_sitename))
@@ -86,34 +89,28 @@
 	echo "extra:Depends=python-smartpm (>= 1.1.1~bzr20081010-0ubuntu1.8.04.1), python2.4-dbus" >> $(landscape_common_substvars)
 	echo "extra:Depends=python2.4-pycurl" >> $(landscape_client_substvars)
 endif
-ifneq (,$(findstring $(dist_release),"intrepid"))
-	# We want the SRU-ed smart 1.1.1 on intrepid
-	echo "extra:Depends=update-motd, python-smartpm (>= 1.1.1~bzr20081010-0ubuntu1.8.10.0), python2.5-dbus" >> $(landscape_common_substvars)
-	echo "extra:Depends=python2.5-pycurl" >> $(landscape_client_substvars)
-endif
-ifneq (,$(findstring $(dist_release),"jaunty"))
-	# We want update-motd on jaunty, and the SRU-ed smart 1.2
-	echo "extra:Depends=update-motd, python-smartpm (>= 1.2-0ubuntu1.9.04.1), python2.6-dbus" >> $(landscape_common_substvars)
-	echo "extra:Depends=python2.6-pycurl" >> $(landscape_client_substvars)
-endif
-ifneq (,$(findstring $(dist_release),"karmic lucid maverick"))
+ifeq (,$(filter $(dist_release),dapper hardy))
 	# We want libpam-modules in karmic, and smart 1.2
-	echo "extra:Depends=libpam-modules (>= 1.0.1-9ubuntu3), python-smartpm (>= 1.2-4), python2.6-dbus" >> $(landscape_common_substvars)
-	echo "extra:Depends=python2.6-pycurl" >> $(landscape_client_substvars)
+	echo "extra:Depends=libpam-modules (>= 1.0.1-9ubuntu3), python-smartpm (>= 1.2-4), python-dbus" >> $(landscape_common_substvars)
+	echo "extra:Depends=python-pycurl" >> $(landscape_client_substvars)
 endif
-ifneq (,$(findstring $(dist_release),"lucid maverick"))
+ifeq (,$(filter $(dist_release),dapper hardy karmic))
 	# The python-image-store-proxy package is needed for the eucalyptus plugin
 	echo "extra:Suggests=python-image-store-proxy" >> $(landscape_common_substvars)
 endif
 
-ifeq ($(use_pycentral),yes)
-   ifneq (,$(py_setup_install_args))
-	DH_PYCENTRAL=include-links dh_pycentral
-   else
-	DH_PYCENTRAL=nomove dh_pycentral
-   endif
+ifeq ($(use_dhpython2),yes)
+	dh_python2 --no-guessing-versions
 else
-	dh_python
+  ifeq ($(use_pycentral),yes)
+     ifneq (,$(py_setup_install_args))
+		DH_PYCENTRAL=include-links dh_pycentral
+     else
+		DH_PYCENTRAL=nomove dh_pycentral
+     endif
+  else
+		dh_python
+  endif
 endif
 	dh_installdeb
 	dh_gencontrol