[Pkg-utopia-commits] r880 - packages/unstable/dbus/debian

[Sebastian Dröge]

Author: slomo-guest
Date: 2006-07-07 23:27:11 +0000 (Fri, 07 Jul 2006)
New Revision: 880

Added:
   packages/unstable/dbus/debian/python-dbus.install
Removed:
   packages/unstable/dbus/debian/python2.4-dbus.install
Modified:
   packages/unstable/dbus/debian/changelog
   packages/unstable/dbus/debian/compat
   packages/unstable/dbus/debian/control
   packages/unstable/dbus/debian/dbus.install
   packages/unstable/dbus/debian/rules
Log:
* updated dbus to the new python policy


Modified: packages/unstable/dbus/debian/changelog
===================================================================
--- packages/unstable/dbus/debian/changelog	2006-07-05 22:50:21 UTC (rev 879)
+++ packages/unstable/dbus/debian/changelog	2006-07-07 23:27:11 UTC (rev 880)
@@ -1,3 +1,10 @@
+dbus (0.62-5) unstable; urgency=low
+
+  * Update python-dbus to the new Python Policy
+  * Bump Standards-Version to 3.7.2
+
+ -- Sebastian Dröge <slomo at ubuntu.com>  Sat,  8 Jul 2006 01:25:40 +0200
+
 dbus (0.62-4) unstable; urgency=low
 
   [ Sebastian Dröge ]

Modified: packages/unstable/dbus/debian/compat
===================================================================
--- packages/unstable/dbus/debian/compat	2006-07-05 22:50:21 UTC (rev 879)
+++ packages/unstable/dbus/debian/compat	2006-07-07 23:27:11 UTC (rev 880)
@@ -1 +1 @@
-4
+5

Modified: packages/unstable/dbus/debian/control
===================================================================
--- packages/unstable/dbus/debian/control	2006-07-05 22:50:21 UTC (rev 879)
+++ packages/unstable/dbus/debian/control	2006-07-07 23:27:11 UTC (rev 880)
@@ -3,9 +3,10 @@
 Priority: optional
 Maintainer: Utopia Maintenance Team <pkg-utopia-maintainers at lists.alioth.debian.org>
 Uploaders: Sjoerd Simons <sjoerd at debian.org>, Sebastian Dröge <slomo at ubuntu.com>
-Build-Depends: cdbs (>= 0.4.5.1), debhelper (>= 4.1.46), libglib2.0-dev, libexpat-dev, doxygen, docbook-utils, python2.4, libgtk2.0-dev, python-pyrex (>= 0.9.2.1-3), xmlto, python2.4-dev, libqt3-mt-dev, libqt4-dev (>= 4.1.3)
+Build-Depends: cdbs (>= 0.4.43), debhelper (>= 5.0.37.2), libglib2.0-dev, libexpat-dev, doxygen, docbook-utils, python2.4, libgtk2.0-dev, python-pyrex (>= 0.9.2.1-3), xmlto, python2.4-dev, libqt3-mt-dev, libqt4-dev (>= 4.1.3), python-central (>= 0.4.17)
 Build-Depends-Indep: libgtk-cil, cli-common-dev (>= 0.4.0), libmono-dev, mono-mcs, mono-gac, monodoc-base
-Standards-Version: 3.6.1.0
+Standards-Version: 3.7.2
+XS-Python-Version: current, >= 2.4, << 2.5
 
 Package: dbus
 Architecture: any
@@ -184,10 +185,14 @@
  .
  See the dbus description for more information about D-BUS in general.
 
-Package: python2.4-dbus
+Package: python-dbus
 Section: python
 Architecture: any
-Depends: ${shlibs:Depends}, ${python:Depends}, python2.4-libxml2
+Depends: ${shlibs:Depends}, ${python:Depends}, python-libxml2
+Replaces: python2.4-dbus
+Conflicts: python2.4-dbus
+Provides: ${python:Provides}
+XB-Python-Version: ${python:Versions}
 Description: simple interprocess messaging system (Python interface)
  D-BUS is a message bus, used for sending messages between applications.
  Conceptually, it fits somewhere in between raw sockets and CORBA in

Modified: packages/unstable/dbus/debian/dbus.install
===================================================================
--- packages/unstable/dbus/debian/dbus.install	2006-07-05 22:50:21 UTC (rev 879)
+++ packages/unstable/dbus/debian/dbus.install	2006-07-07 23:27:11 UTC (rev 880)
@@ -9,6 +9,5 @@
 debian/tmp/usr/share/man/man1/dbus-daemon.1
 debian/tmp/usr/share/man/man1/dbus-cleanup-sockets.1
 debian/tmp/usr/share/dbus-1/services
-debian/tmp/usr/share/dbus-1/services/*
 debian/tmp/usr/share/man/man1/dbus-launch.1
 debian/tmp/usr/share/man/man1/dbus-send.1

Copied: packages/unstable/dbus/debian/python-dbus.install (from rev 873, packages/unstable/dbus/debian/python2.4-dbus.install)
===================================================================
--- packages/unstable/dbus/debian/python2.4-dbus.install	2006-06-26 08:25:16 UTC (rev 873)
+++ packages/unstable/dbus/debian/python-dbus.install	2006-07-07 23:27:11 UTC (rev 880)
@@ -0,0 +1 @@
+debian/tmp/usr/lib/python2.4/site-packages/dbus/*.{so,py}

Deleted: packages/unstable/dbus/debian/python2.4-dbus.install
===================================================================
--- packages/unstable/dbus/debian/python2.4-dbus.install	2006-07-05 22:50:21 UTC (rev 879)
+++ packages/unstable/dbus/debian/python2.4-dbus.install	2006-07-07 23:27:11 UTC (rev 880)
@@ -1 +0,0 @@
-debian/tmp/usr/lib/python2.4/site-packages/dbus

Modified: packages/unstable/dbus/debian/rules
===================================================================
--- packages/unstable/dbus/debian/rules	2006-07-05 22:50:21 UTC (rev 879)
+++ packages/unstable/dbus/debian/rules	2006-07-07 23:27:11 UTC (rev 880)
@@ -3,10 +3,6 @@
 # Copyright © 2003 Daniel Stone <daniels at debian.org>
 # Copyright © 2006 Sjoerd Simons <sjoerd at debian.org>
 
-binary/python2.4-dbus::
-	rm debian/python2.4-dbus/usr/lib/python2.4/site-packages/dbus/dbus_bindings.*a
-	dh_python -ppython2.4-dbus
-
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 include /usr/share/cdbs/1/rules/utils.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
@@ -38,7 +34,7 @@
 DEB_SHLIBDEPS_INCLUDE_dbus-1-utils := debian/libdbus-1-2/usr/lib/ debian/libdbus-glib-1-2/usr/lib/
 DEB_SHLIBDEPS_INCLUDE_libdbus-qt-1-1c2 := debian/libdbus-1-2/usr/lib/
 DEB_SHLIBDEPS_INCLUDE_libdbus-qt4-1-1 := debian/libdbus-1-2/usr/lib/
-DEB_SHLIBDEPS_INCLUDE_python2.4-dbus := debian/libdbus-1-2/usr/lib/
+DEB_SHLIBDEPS_INCLUDE_python-dbus := debian/libdbus-1-2/usr/lib/
 
 # Strict library versioning
 DEB_DH_MAKESHLIBS_ARGS_ALL := -V
@@ -59,6 +55,12 @@
 	dh_makeclilibs -m0.60
 	dh_clideps -d
 
+binary-install/python-dbus::
+	rm -f debian/python-dbus/usr/lib/python*/site-packages/dbus/dbus_bindings.*a
+	rm -f debian/python-dbus/usr/lib/python*/site-packages/dbus/*.py[co]
+	dh_pycentral -p$(cdbs_curpkg)
+	dh_python -p$(cdbs_curpkg)
+
 common-configure-indep::
 	mkdir -p $(MONO_SHARED_DIR)/.wapi