[Pkg-utopia-commits] r1229 - packages/experimental/dbus-python/debian

[Simon McVittie]

Author: smcv-guest
Date: 2007-01-24 16:49:42 +0100 (Wed, 24 Jan 2007)
New Revision: 1229

Modified:
   packages/experimental/dbus-python/debian/changelog
   packages/experimental/dbus-python/debian/rules
Log:
Update to version 0.80.0 (in-place, since 0.80~rc4 was never uploaded to Debian)
- adjust debian/rules for dbus-python.h moving from /usr/include to
  /usr/include/dbus-1.0/dbus


Modified: packages/experimental/dbus-python/debian/changelog
===================================================================
--- packages/experimental/dbus-python/debian/changelog	2007-01-22 21:08:32 UTC (rev 1228)
+++ packages/experimental/dbus-python/debian/changelog	2007-01-24 15:49:42 UTC (rev 1229)
@@ -1,10 +1,12 @@
-dbus-python (0.80~rc4-1) UNRELEASED; urgency=low
+dbus-python (0.80.0-1) UNRELEASED; urgency=low
 
-  * New upstream release candidate (internally, version 0.79.94):
+  * New upstream release:
     - debian/control, debian/rules: build HTML documentation with
       python-docutils
     - debian/rules: config.guess and config.sub aren't in the autotools
       subdirectory any more, adjust auto-update code
+    - debian/rules: header has moved from /usr/include to
+      /usr/include/dbus-1.0/dbus, adjust accordingly
 
  -- Simon McVittie <smcv at ianadd.pseudorandom.co.uk>  Mon, 22 Jan 2007 16:59:58 +0000
 

Modified: packages/experimental/dbus-python/debian/rules
===================================================================
--- packages/experimental/dbus-python/debian/rules	2007-01-22 21:08:32 UTC (rev 1228)
+++ packages/experimental/dbus-python/debian/rules	2007-01-24 15:49:42 UTC (rev 1229)
@@ -28,7 +28,8 @@
 	cd build-$* && PYTHON=/usr/bin/python$* \
 		../configure --host=$(DEB_HOST_GNU_TYPE) \
 			--build=$(DEB_BUILD_GNU_TYPE) \
-			--prefix=/usr --docdir=/usr/share/doc/python-dbus
+			--prefix=/usr --docdir=/usr/share/doc/python-dbus \
+			--enable-html-docs
 	touch $@
 
 build-%/build-stamp: build-%/configure-stamp
@@ -49,7 +50,7 @@
 	$(MAKE) -C build-$* install DESTDIR=$(CURDIR)/debian/python-dbus
 	# keep a copy of /usr/include/debian-python.h and
 	# /usr/lib/pkgconfig/debian-python.pc to verify they match later
-	cp debian/python-dbus/usr/include/dbus-python.h debian/tmp-$*.h
+	cp debian/python-dbus/usr/include/dbus-1.0/dbus/dbus-python.h debian/tmp-$*.h
 	cp debian/python-dbus/usr/lib/pkgconfig/dbus-python.pc debian/tmp-$*.pc
 
 install: build install-clean $(PYVERS:%=install-%)
@@ -57,7 +58,7 @@
 	# compare installed .pc and .h, asserting that the ones all versions
 	# wanted are the same as what we ended up with
 	for v in $(PYVERS); do \
-		diff --brief debian/python-dbus/usr/include/dbus-python.h \
+		diff --brief debian/python-dbus/usr/include/dbus-1.0/dbus/dbus-python.h \
 			debian/tmp-$$v.h || exit 1; \
 		diff --brief debian/python-dbus/usr/lib/pkgconfig/dbus-python.pc \
 			debian/tmp-$$v.pc || exit 1; \