[Pkg-utopia-commits] r1343 - packages/unstable/dbus-python/debian

Sjoerd Simons sjoerd at alioth.debian.org
Mon Apr 9 20:49:56 UTC 2007 

Author: sjoerd
Date: 2007-04-09 20:49:56 +0000 (Mon, 09 Apr 2007)
New Revision: 1343

Modified:
   packages/unstable/dbus-python/debian/changelog
   packages/unstable/dbus-python/debian/control
   packages/unstable/dbus-python/debian/copyright
   packages/unstable/dbus-python/debian/rules
Log:
* Upload to unstable
* Merge experimental branch
* Add Conflicts with gnome-osd (<< 0.12.0) and gajim (<< 0.11.1) which don't
  work correctly with this version
* New upstream release, fixing numerous memory and reference leaks.
* Update debian/copyright (some files are now more permissively licensed)
  and also add the actual copyright statements to that file
* 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
* New upstream release candidate (internally, version 0.79.93):
  - build system is now autotools
  - install a header file for external mainloops (not bothering with a
    separate -dev package since it's so small)
* Convert debian/rules to do a series of autotools builds, one per version
  (based on debian/rules from pygobject)
* Drop dependency on libxml2 (no longer needed upstream)
* Recommend python-gobject (or python-gtk < 2.10 for those with the
  pre-split version)
* debian/control:
  + Update to use my debian.org mail address
* New upstream release candidate with changed API:
  - dbus_bindings rewritten in C with improved API, and renamed to
    _dbus_bindings, leaving behind a partial emulation stub
    (note: this may break applications that were using it
    directly, but this was never meant to be supported)
  - exported-method parameters, proxy-method return values, signal-handler
    parameter types are now unambiguous
  - there is no longer a Variant type, just a variant_level attribute
    on the D-Bus types
  - generalized main-loop integration (only for native-code main loops
    so far)
* Remove Build-Depends on Pyrex (no longer used upstream)
* Add myself to Uploaders

Modified: packages/unstable/dbus-python/debian/changelog
===================================================================
--- packages/unstable/dbus-python/debian/changelog	2007-04-09 20:44:20 UTC (rev 1342)
+++ packages/unstable/dbus-python/debian/changelog	2007-04-09 20:49:56 UTC (rev 1343)
@@ -1,3 +1,69 @@
+dbus-python (0.80.2-2) unstable; urgency=low
+
+  * Upload to unstable
+  * Merge experimental branch
+  * Add Conflicts with gnome-osd (<< 0.12.0) and gajim (<< 0.11.1) which don't
+    work correctly with this version
+
+ -- Sjoerd Simons <sjoerd at debian.org>  Mon, 09 Apr 2007 22:48:32 +0200
+
+dbus-python (0.80.2-1) experimental; urgency=low
+
+  * New upstream release, fixing numerous memory and reference leaks.
+  * Update debian/copyright (some files are now more permissively licensed)
+    and also add the actual copyright statements to that file
+
+ -- Simon McVittie <smcv at ianadd.pseudorandom.co.uk>  Tue, 13 Feb 2007 17:35:12 +0000
+
+dbus-python (0.80.1-1) experimental; urgency=low
+
+  * 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
+
+dbus-python (0.80~rc3-1) UNRELEASED; urgency=low
+
+  [ Simon McVittie ]
+  * New upstream release candidate (internally, version 0.79.93):
+    - build system is now autotools
+    - install a header file for external mainloops (not bothering with a
+      separate -dev package since it's so small)
+  * Convert debian/rules to do a series of autotools builds, one per version
+    (based on debian/rules from pygobject)
+  * Drop dependency on libxml2 (no longer needed upstream)
+  * Recommend python-gobject (or python-gtk < 2.10 for those with the
+    pre-split version)
+
+  [ Sebastian Dröge ]
+  * debian/control:
+    + Update to use my debian.org mail address
+
+ -- Simon McVittie <smcv at ianadd.pseudorandom.co.uk>  Mon,  8 Jan 2007 02:01:32 +0100
+
+dbus-python (0.80~rc2-1) experimental; urgency=low
+
+  * New upstream release candidate with changed API:
+    - dbus_bindings rewritten in C with improved API, and renamed to
+      _dbus_bindings, leaving behind a partial emulation stub
+      (note: this may break applications that were using it
+      directly, but this was never meant to be supported)
+    - exported-method parameters, proxy-method return values, signal-handler
+      parameter types are now unambiguous
+    - there is no longer a Variant type, just a variant_level attribute
+      on the D-Bus types
+    - generalized main-loop integration (only for native-code main loops
+      so far)
+  * Remove Build-Depends on Pyrex (no longer used upstream)
+  * Add myself to Uploaders
+
+ -- Simon McVittie <smcv at ianadd.pseudorandom.co.uk>  Wed, 13 Dec 2006 15:30:29 +0000
+
 dbus-python (0.71-3) unstable; urgency=low
 
   * debian/python-dbus.postinst:

Modified: packages/unstable/dbus-python/debian/control
===================================================================
--- packages/unstable/dbus-python/debian/control	2007-04-09 20:44:20 UTC (rev 1342)
+++ packages/unstable/dbus-python/debian/control	2007-04-09 20:49:56 UTC (rev 1343)
@@ -2,16 +2,17 @@
 Section: devel
 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.43), debhelper (>= 5.0.37.2), python-pyrex (>= 0.9.2.1-3), xmlto, python-all-dev (>= 2.3.5-11), python-support (>= 0.3), libdbus-glib-1-dev (>= 0.71)
+Uploaders: Sjoerd Simons <sjoerd at debian.org>, Sebastian Dröge <slomo at debian.org>, Simon McVittie <smcv at ianadd.pseudorandom.co.uk>
+Build-Depends: cdbs (>= 0.4.43), debhelper (>= 5.0.37.2), xmlto, python-all-dev (>= 2.3.5-11), python-support (>= 0.3), libdbus-glib-1-dev (>= 0.71), python-docutils
 Standards-Version: 3.7.2
 
 Package: python-dbus
 Section: python
 Architecture: any
-Depends: ${shlibs:Depends}, ${python:Depends}, python-libxml2
+Depends: ${shlibs:Depends}, ${python:Depends}
+Recommends: python-gobject | python-gtk (<< 2.10)
 Replaces: python2.4-dbus
-Conflicts: python2.4-dbus
+Conflicts: python2.4-dbus, gnome-osd (<< 0.12.0), gajim (<< 0.11.1)
 Provides: ${python:Provides}
 XB-Python-Version: ${python:Versions}
 Description: simple interprocess messaging system (Python interface)

Modified: packages/unstable/dbus-python/debian/copyright
===================================================================
--- packages/unstable/dbus-python/debian/copyright	2007-04-09 20:44:20 UTC (rev 1342)
+++ packages/unstable/dbus-python/debian/copyright	2007-04-09 20:49:56 UTC (rev 1343)
@@ -3,12 +3,19 @@
 
 It was downloaded from http://www.freedesktop.org/software/dbus
 
+Copyright (C) 2003-2006 Red Hat Inc. <http://www.redhat.com/>
+Copyright (C) 2003 David Zeuthen
+Copyright (C) 2004 Rob Taylor
+Copyright (C) 2004 Anders Carlsson
+Copyright (C) 2005-2007 Collabora Ltd. <http://www.collabora.co.uk/>
+
 This package is dual-licensed under the Academic Free License, and the
 GPL.  For a description of the GPL, see /usr/share/common-licenses/GPL
 on your Debian system.
 
-Portions of the package are only licensed under the GPL (notably 
-tools/dbus-cleanup-sockets.c and test/decode-gcov.c ).
+Portions of the package are instead dual-licensed more permissively,
+under the Academic Free License and the LGPL version 2.1
+(which may be found in /usr/share/common-licenses/LGPL-2.1 on Debian systems).
 
 The Academic Free License follows:
 

Modified: packages/unstable/dbus-python/debian/rules
===================================================================
--- packages/unstable/dbus-python/debian/rules	2007-04-09 20:44:20 UTC (rev 1342)
+++ packages/unstable/dbus-python/debian/rules	2007-04-09 20:49:56 UTC (rev 1343)
@@ -6,6 +6,99 @@
 DEB_PYTHON_SYSTEM=pysupport
 
 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
-include /usr/share/cdbs/1/class/python-distutils.mk
+
+# These are used for cross-compiling and for saving the configure script
+# from having to guess our platform (since we know it already)
+DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+
+ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
+        CFLAGS += -g
+endif
+ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
+        INSTALL_PROGRAM += -s
+endif
+
+PYVERS := $(shell pyversions --requested --version debian/control)
+PYDEFAULTVER := $(shell pyversions --default --version)
+
+build-%/configure-stamp:
+	dh_testdir
+	mkdir -p build-$*
+	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 \
+			--enable-html-docs
+	touch $@
+
+build-%/build-stamp: build-%/configure-stamp
+	dh_testdir
+	$(MAKE) -C build-$*
+	touch $@
+
+build: apply-patches $(PYVERS:%=build-%/build-stamp)
+
+install-clean:
+	dh_testdir
+	dh_testroot
+	dh_clean -k
+
+install-%: build-%/build-stamp
+	dh_testdir
+	dh_testroot
+	$(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-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-%)
+	rm -f debian/python-dbus/usr/lib/python*/site-packages/*.la
+	# 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-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; \
+	done
+	rm -f debian/tmp-*.pc debian/tmp-*.h
+
+clean:: reverse-patches
+	dh_testdir
+	dh_testroot
+	rm -Rf debian/tmp-*
+	rm -Rf build-*
+	-test -f config.sub && \
+		test -r /usr/share/misc/config.sub && \
+		cp -f /usr/share/misc/config.sub config.sub
+	-test -f config.guess && \
+		test -r /usr/share/misc/config.guess && \
+		cp -f /usr/share/misc/config.guess config.guess
+	dh_clean
+
+# We have no arch-indep packages
+binary-indep: build install
+	:
+
+# Build architecture-dependent files here.
+binary-arch: build install
+	dh_testdir -a
+	dh_testroot -a
+	dh_installdocs -a
+	dh_installexamples -a
+	dh_installchangelogs ChangeLog -a
+	dh_strip -a
+	dh_link -a
+	dh_compress -a -X.py
+	dh_fixperms -a
+	dh_pysupport -a
+	dh_installdeb -a
+	dh_shlibdeps -a
+	dh_gencontrol -a
+	dh_md5sums -a
+	dh_builddeb -a
+
+binary: binary-arch binary-indep
+.PHONY: build clean binary-indep binary-arch binary install

More information about the Pkg-utopia-commits mailing list