[Pkg-libvirt-maintainers] Bug#582668: Tweaks to rules

[Loïc Minier]

Package: virt-manager
Version: 0.8.4-3
Severity: wishlist
Tags: patch

        Hi there

 While chasing an Ubuntu-only bug, I've noticed that virt-manager's
 rules were using two CDBS classes at the same time.  I am not sure this
 is supposed to be working.  Also, it would be great if you could use
 the gnome.mk class instead of the autotools.mk one as: a) it would call
 dh_gconf and others as needed, and b) it would include langpack.mk
 under Ubuntu.

 b) is only relevant for Ubuntu, this is not used under Debian; a) is
 not really relevant for Debian sid since gconf switched to triggers in
 Debian (but not yet in Ubuntu).  However a) might be relevant for
 Debian backports.

   Thanks a lot for considering the changes,
-- 
Loïc Minier
-------------- next part --------------
diff -Nru virt-manager-0.8.4/debian/changelog virt-manager-0.8.4/debian/changelog
--- virt-manager-0.8.4/debian/changelog	2010-05-18 15:45:13.000000000 +0200
+++ virt-manager-0.8.4/debian/changelog	2010-05-22 19:11:44.000000000 +0200
@@ -1,3 +1,16 @@
+virt-manager (0.8.4-4) UNRELEASED; urgency=low
+
+  * Don't include python-distutils class, I don't think it's reasonnable to
+    include multiple CDBS classes and this package has no setup.py anyway;
+    instead, add a binary-install/virt-manager:: target and call dh_pysupport
+    manually.
+  * Include gnome class instead of autotools class; this will call dh_gconf
+    and properly register/unregister the schemas, hopefully fixes LP: #583279.
+  * Include gnome class after the other includes, it used to make a
+    significant difference, but probably doesn't make one anymore nowadays.
+
+ -- Loïc Minier <lool at debian.org>  Sat, 22 May 2010 19:11:23 +0200
+
 virt-manager (0.8.4-3) unstable; urgency=low
 
   [ Guido Günther ]
diff -Nru virt-manager-0.8.4/debian/rules virt-manager-0.8.4/debian/rules
--- virt-manager-0.8.4/debian/rules	2010-05-12 05:35:47.000000000 +0200
+++ virt-manager-0.8.4/debian/rules	2010-05-22 19:11:19.000000000 +0200
@@ -1,13 +1,11 @@
 #!/usr/bin/make -f
 
-DEB_PYTHON_SYSTEM = pysupport
-
-include /usr/share/cdbs/1/class/autotools.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/python-distutils.mk
 include /usr/share/cdbs/1/rules/patchsys-quilt.mk
+include /usr/share/cdbs/1/class/gnome.mk
 
-DEB_PYTHON_SETUP_CMD = /dev/null
+binary-install/virt-manager::
+	dh_pysupport -p$(cdbs_curpkg)
 
 clean::
 	rm -f $(CURDIR)/debian/pycompat