[Pkg-utopia-commits] r878 - packages/unstable/avahi/debian

[Sjoerd Simons]

Author: sjoerd
Date: 2006-06-29 21:47:09 +0000 (Thu, 29 Jun 2006)
New Revision: 878

Added:
   packages/unstable/avahi/debian/pycompat
Modified:
   packages/unstable/avahi/debian/changelog
   packages/unstable/avahi/debian/control
   packages/unstable/avahi/debian/rules
Log:
Start updating avahi for the new python policy

Modified: packages/unstable/avahi/debian/changelog
===================================================================
--- packages/unstable/avahi/debian/changelog	2006-06-28 18:05:20 UTC (rev 877)
+++ packages/unstable/avahi/debian/changelog	2006-06-29 21:47:09 UTC (rev 878)
@@ -1,4 +1,4 @@
-avahi (0.6.11-1) unstable; urgency=low
+avahi (0.6.11-1) UNRELEASED; urgency=low
 
   [ Sjoerd Simons ]
   * debian/copyright: Obfuscate Lennart poettering's e-mail address on his
@@ -10,8 +10,11 @@
     Add /etc/default/avahi-daemon and /etc/default/avahi-dnsconfd to allow
     disabling of the startup of both daemons (Closes: #349603)
 
- -- Sebastian Dröge <slomo at ubuntu.com>  Mon, 26 Jun 2006 09:56:01 +0200
+  [ Sjoerd Simons ]
+  * Update the python packages for the new policy. FIXME not finished yet
 
+ -- Sjoerd Simons <sjoerd at debian.org>  Thu, 29 Jun 2006 23:45:53 +0200
+
 avahi (0.6.10-1) unstable; urgency=high
 
   * New upstream release

Modified: packages/unstable/avahi/debian/control
===================================================================
--- packages/unstable/avahi/debian/control	2006-06-28 18:05:20 UTC (rev 877)
+++ packages/unstable/avahi/debian/control	2006-06-29 21:47:09 UTC (rev 878)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Ross Burton <ross at debian.org>
 Uploaders: Sjoerd Simons <sjoerd at debian.org>, Sebastian Dröge <slomo at ubuntu.com>
-Build-Depends: debhelper (>= 4.2.28), cdbs, libcap-dev [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64 !netbsd-i386], libgdbm-dev, libglib2.0-dev (>= 2.4), libgtk2.0-dev (>= 2.4), libglade2-dev, libexpat-dev, libdaemon-dev, libdbus-1-dev (>= 0.60), python2.4 (>= 2.4), python2.4-gdbm, python2.4-dbus, python2.4-gtk2, libqt3-mt-dev, libqt4-dev, xmltoman
+Build-Depends: debhelper (>= 5.0.37.2), cdbs (>= 0.4.43), python-support (>= 0.3), libcap-dev [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64 !netbsd-i386], libgdbm-dev, libglib2.0-dev (>= 2.4), libgtk2.0-dev (>= 2.4), libglade2-dev, libexpat-dev, libdaemon-dev, libdbus-1-dev (>= 0.60), python2.4 (>= 2.4), python-gdbm (>= 2.4.3-1), python2.4-dbus, python-gtk2 (>= 2.8.6-2), libqt3-mt-dev, libqt4-dev, xmltoman
 Standards-Version: 3.6.2
 
 Package: avahi-daemon
@@ -39,11 +39,15 @@
  them to resolvconf so it can use them.  This is very useful on autoconfigured 
  IPv6 networks.
 
-Package: python2.4-avahi
+Package: python-avahi
 Section: python
 Architecture: all
 Replaces: avahi-utils (<< 0.4)
-Depends: ${python:Depends}, python2.4-gdbm, python2.4-glade2, libavahi-common-data
+Depends: ${python:Depends}, python-gdbm (>= 2.4.3-1), python-glade2 (>= 2.8.6-2), libavahi-common-data
+Provides: ${python:Provides}
+Replaces: python2.4-avahi (<< 0.6.11)
+Conflicts: python2.4-avahi (<< 0.6.11)
+XB-Python-Version: ${python:Versions}
 Description: Python utility package for Avahi
  Avahi is a fully LGPL framework for Multicast DNS Service Discovery.
  It allows programs to publish and discover services and hosts
@@ -70,7 +74,8 @@
 Package: avahi-discover
 Section: net
 Architecture: all
-Depends: ${python:Depends}, python2.4-avahi, python2.4-dbus, python2.4-gtk2, avahi-daemon, python-glade2, ${misc:Depends}
+Depends: ${python:Depends}, python-avahi, python2.4-dbus, python-gtk2 (>= 2.8.6-2), avahi-daemon, ${misc:Depends}
+XB-Python-Version: ${python:Versions}
 Conflicts: avahi-utils (<< 0.6.1-2)
 Description: Service discover user interface for avahi 
  Avahi is a fully LGPL framework for Multicast DNS Service Discovery.

Added: packages/unstable/avahi/debian/pycompat
===================================================================
--- packages/unstable/avahi/debian/pycompat	2006-06-28 18:05:20 UTC (rev 877)
+++ packages/unstable/avahi/debian/pycompat	2006-06-29 21:47:09 UTC (rev 878)
@@ -0,0 +1 @@
+2

Modified: packages/unstable/avahi/debian/rules
===================================================================
--- packages/unstable/avahi/debian/rules	2006-06-28 18:05:20 UTC (rev 877)
+++ packages/unstable/avahi/debian/rules	2006-06-29 21:47:09 UTC (rev 878)
@@ -23,10 +23,12 @@
                          debian/libavahi-client3/usr/lib
 
 binary-install/avahi-discover::
+	dh_pysupport -p$(cdbs_curpkg)
 	dh_python -p$(cdbs_curpkg)
 	rm -f debian/tmp/usr/lib/python*/site-packages/avahi/*.py[co]
 
 binary-install/python2.4-avahi::
+	dh_pysupport -p$(cdbs_curpkg)
 	dh_python -p$(cdbs_curpkg)
 	rm -f debian/tmp/usr/lib/python*/site-packages/avahi/*.py[co]