[Pkg-utopia-commits] r312 - packages/experimental/avahi/debian

[Ross Burton]

Author: ross
Date: 2005-09-09 10:01:33 +0000 (Fri, 09 Sep 2005)
New Revision: 312

Added:
   packages/experimental/avahi/debian/python2.4-avahi.install
Modified:
   packages/experimental/avahi/debian/control
   packages/experimental/avahi/debian/rules
Log:
Add python2.4-avahi

Modified: packages/experimental/avahi/debian/control
===================================================================
--- packages/experimental/avahi/debian/control	2005-09-09 07:48:13 UTC (rev 311)
+++ packages/experimental/avahi/debian/control	2005-09-09 10:01:33 UTC (rev 312)
@@ -2,7 +2,7 @@
 Section: net
 Priority: optional
 Maintainer: Ross Burton <ross at debian.org>
-Build-Depends: debhelper (>= 4.2.28), cdbs, libglib2.0-dev (>= 2.4), libgtk2.0-dev (>= 2.4), libglade2-dev, libexpat-dev, libdaemon-dev, libdbus-1-dev (>= 0.30), python2.4 (>= 2.4), python2.4-dbus, libqt3-mt-dev, libqt4-dev, xmltoman
+Build-Depends: debhelper (>= 4.2.28), cdbs, libglib2.0-dev (>= 2.4), libgtk2.0-dev (>= 2.4), libglade2-dev, libexpat-dev, libdaemon-dev, libdbus-1-dev (>= 0.30), python2.4 (>= 2.4), python2.4-gdbm, python2.4-dbus, libqt3-mt-dev, libqt4-dev, xmltoman
 Standards-Version: 3.6.2
 
 Package: avahi-daemon
@@ -38,9 +38,21 @@
  networks where there is no other mechanism to automatically configure
  a DNS server.
 
+Package: python2.4-avahi
+Architecture: all
+Depends: ${python:Depends}, libavahi-common0
+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
+ running on a local network with no specific configuration.  For
+ example you can plug into a network and instantly find printers to
+ print to, files to look at and people to talk to.
+ .
+ This package contains utility modules to talk to Avahi with Python easier.
+
 Package: avahi-utils
 Architecture: all
-Depends: ${python:Depends}, python2.4-dbus, python2.4-gtk2, ${shlibs:Depends}, ${misc:Depends}, avahi-daemon
+Depends: ${python:Depends}, python2.4-dbus, python2.4-gtk2, avahi-daemon, ${misc:Depends}
 Recommends: python2.4-twisted
 Description: Avahi browsing, publishing and discovery utilities
  Avahi is a fully LGPL framework for Multicast DNS Service Discovery.

Added: packages/experimental/avahi/debian/python2.4-avahi.install
===================================================================
--- packages/experimental/avahi/debian/python2.4-avahi.install	2005-09-09 07:48:13 UTC (rev 311)
+++ packages/experimental/avahi/debian/python2.4-avahi.install	2005-09-09 10:01:33 UTC (rev 312)
@@ -0,0 +1 @@
+debian/tmp/usr/lib/python2.4/site-packages/avahi

Modified: packages/experimental/avahi/debian/rules
===================================================================
--- packages/experimental/avahi/debian/rules	2005-09-09 07:48:13 UTC (rev 311)
+++ packages/experimental/avahi/debian/rules	2005-09-09 10:01:33 UTC (rev 312)
@@ -1,13 +1,10 @@
 #! /usr/bin/make -f 
 
-# Nasty hack to stop building avahi-utils as python2.4-gtk2 doesn't exist
-include /usr/share/cdbs/1/rules/buildvars.mk
-DEB_INDEP_PACKAGES := $(filter-out avahi-utils, $(DEB_INDEP_PACKAGES))
-
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/autotools.mk
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 
+# List any files which are not installed
 include /usr/share/cdbs/1/rules/utils.mk
 common-binary-post-install-arch:: list-missing
 
@@ -25,7 +22,11 @@
 
 binary-install/avahi-utils::
 	dh_python -p$(cdbs_curpkg)
-	rm debian/tmp/usr/lib/python*/site-packages/avahi/*.py[co]
+	rm -f debian/tmp/usr/lib/python*/site-packages/avahi/*.py[co]
 
+binary-install/python2.4-avahi::
+	dh_python -p$(cdbs_curpkg)
+	rm -f debian/tmp/usr/lib/python*/site-packages/avahi/*.py[co]
+
 binary-fixup/avahi-daemon binary-fixup/avahi-dnsconfd::
 	chmod +x debian/$(cdbs_curpkg)/etc/dbus-1/event.d/*