[Pkg-utopia-commits] r1090 - packages/unstable/hal/debian

[Michael Biebl]

Author: biebl
Date: 2006-10-23 22:07:25 +0000 (Mon, 23 Oct 2006)
New Revision: 1090

Added:
   packages/unstable/hal/debian/pyversions
Modified:
   packages/unstable/hal/debian/control
   packages/unstable/hal/debian/rules
Log:
* debian/rules
  - DEB_PYTHON_COMPILE_VERSION is used by python-distutils.mk. We don't use 
    python-distutils.mk, so remove this variable
  - call dh_pysupport with the correct path to the private modules dir
  - call dh_pysupport on binary-install, so that the postinst/preinst scripts
    are included in deb.
* debian/pyversions
  Use the recommended way of python-support to specify the support python 
  versions (in this case python >= 2.4). Remove XS-Python-Version from 
  debian/control to avoid duplication of this information
* debian/control
  - Build-Depend on python (as we don't build public modules/extensions, 
    python-all-dev is not needed)
  - s/python2.4-gnome2/python-gnome2/ and s/python2.4-glade2/python-glade2/
    as recommended by the new python policy.



Modified: packages/unstable/hal/debian/control
===================================================================
--- packages/unstable/hal/debian/control	2006-10-23 19:52:31 UTC (rev 1089)
+++ packages/unstable/hal/debian/control	2006-10-23 22:07:25 UTC (rev 1090)
@@ -3,9 +3,8 @@
 Priority: optional
 Maintainer: Sjoerd Simons <sjoerd at debian.org>
 Uploaders: Sebastian Dröge <slomo at ubuntu.com>, Michael Biebl <biebl at debian.org>
-Build-Depends: debhelper (>= 5.0.37.2), cdbs, python-support (>= 0.3), python-dbus, libdbus-glib-1-dev (>= 0.60), libglib2.0-dev, libsysfs-dev, libexpat1-dev, libpopt-dev, pkg-config, pciutils, libcap-dev, doxygen, intltool (>= 0.22), libusb-dev, libvolume-id-dev, linux-kernel-headers (>= 2.6.17)
+Build-Depends: debhelper (>= 5.0.37.2), cdbs, python-support (>= 0.5.3), python-dbus, libdbus-glib-1-dev (>= 0.60), libglib2.0-dev, libsysfs-dev, libexpat1-dev, libpopt-dev, pkg-config, pciutils, libcap-dev, doxygen, intltool (>= 0.22), libusb-dev, libvolume-id-dev, linux-kernel-headers (>= 2.6.17), python
 Standards-Version: 3.7.2
-XS-Python-Version: 2.4
 
 Package: hal
 Architecture: any
@@ -23,7 +22,7 @@
 
 Package: hal-device-manager
 Architecture: all
-Depends: ${shlibs:Depends}, ${python:Depends}, python-dbus, python2.4-gnome2, python2.4-glade2, hal
+Depends: ${shlibs:Depends}, ${python:Depends}, python-dbus, python-gnome2, python-glade2, hal
 Conflicts: hal (<< 0.5)
 XB-Python-Version: ${python:Versions}
 Description: Hardware Abstraction Layer user interface

Added: packages/unstable/hal/debian/pyversions
===================================================================
--- packages/unstable/hal/debian/pyversions	                        (rev 0)
+++ packages/unstable/hal/debian/pyversions	2006-10-23 22:07:25 UTC (rev 1090)
@@ -0,0 +1 @@
+2.4-

Modified: packages/unstable/hal/debian/rules
===================================================================
--- packages/unstable/hal/debian/rules	2006-10-23 19:52:31 UTC (rev 1089)
+++ packages/unstable/hal/debian/rules	2006-10-23 22:07:25 UTC (rev 1090)
@@ -8,7 +8,6 @@
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 include /usr/share/cdbs/1/rules/utils.mk
 
-DEB_PYTHON_COMPILE_VERSION = 2.4
 DEB_CONFIGURE_EXTRA_FLAGS := --enable-hotplug-map  \
                              --with-pid-file=/var/run/hal/hald.pid \
                              --enable-pcmcia-support \
@@ -16,8 +15,8 @@
                              --without-macbookpro \
                              --disable-policy-kit
 
-binary-predeb/hal-device-manager::
-	dh_pysupport -phal-device-manager
+binary-install/hal-device-manager::
+	dh_pysupport -phal-device-manager /usr/share/hal/device-manager/
 	dh_python -phal-device-manager
 
 common-install-impl::