Merge lp:~ahasenack/landscape-client/drop-gnupginterface into lp:~landscape/landscape-client/trunk

[Andreas Hasenack]

Bug #1045237 asked us to remove the dependency on python-gnupginterface for quantal and up. Later, they committed to the ubuntu landscape-client package a change that drops it for raring. This branch conditionally drops this dependency for releases >= quantal.

[lp:~ahasenack/landscape-client/drop-gnupginterface]

591. By Andreas Hasenack on 2012-11-20

Drop gnupginterface for quantal too.

[Alberto Donato (ack)]

Looks good, +1!

review: Approve

[Chris Glass (tribaal)]

Looks good! +1

review: Approve

=== modified file 'debian/control'
--- debian/control	2012-09-26 14:18:10 +0000
+++ debian/control	2012-11-20 20:17:22 +0000
@@ -11,7 +11,6 @@
 Architecture: any
 Depends: ${python:Depends}, ${misc:Depends}, ${extra:Depends},
          ${shlibs:Depends},
-         python-gnupginterface,
          python-twisted-core,
          python-apt,
          ca-certificates,

=== modified file 'debian/rules'
--- debian/rules	2012-09-26 14:04:47 +0000
+++ debian/rules	2012-11-20 20:17:22 +0000
@@ -88,6 +88,7 @@
 	dh_fixperms
 	dh_shlibdeps
 
+# hardy only
 ifneq (,$(findstring $(dist_release),hardy))
 	# We depend on bug-fixed versions of python-dbus and pycurl on hardy
 	echo "extra:Depends=python-dbus" >> $(landscape_common_substvars)
@@ -95,17 +96,23 @@
 	# The python-image-store-proxy package is needed for the eucalyptus plugin
 	echo "extra:Suggests=python-image-store-proxy" >> $(landscape_common_substvars)
 endif
+# lucid only
 ifneq (,$(filter $(dist_release),lucid))
 	# We want libpam-modules in lucid
 	echo "extra:Depends=libpam-modules (>= 1.0.1-9ubuntu3), python-dbus" >> $(landscape_common_substvars)
 	echo "extra:Depends=python-pycurl, hal" >> $(landscape_client_substvars)
 endif
+# not hardy, not lucid
 ifeq (,$(filter $(dist_release),hardy lucid))
 	# Starting natty, no more hal or dbus
 	echo "extra:Depends=libpam-modules (>= 1.0.1-9ubuntu3)" >> $(landscape_common_substvars)
 	echo "extra:Depends=python-pycurl, gir1.2-gudev-1.0 (>= 165-0ubuntu2), python-gi" >> $(landscape_client_substvars)
 	echo "extra:Suggests=python-dbus, hal" >> $(landscape_client_substvars)
 endif
+# from quantal onwards, we don't want python-gnupginterface anymore (#1045237)
+ifneq (,$(filter $(dist_release),hardy lucid oneiric precise))
+	echo "extra:Depends=python-gnupginterface" >> $(landscape_common_substvars)
+endif
 
 ifeq ($(use_dhpython2),yes)
 	dh_python2 --no-guessing-versions