diff options
| author | Jonas Smedegaard <dr@jones.dk> | 2008-04-24 10:13:53 (GMT) |
|---|---|---|
| committer | Jonas Smedegaard <dr@jones.dk> | 2008-04-24 10:13:53 (GMT) |
| commit | fe4fddeeabd4b73b51bbe8591272b67abc690099 (patch) | |
| tree | 12fec561551d6b5190cd681b427cec5e4efac890 | |
| parent | 64345fd2ba7516a35b60985002b51f3e5e3c5fb2 (diff) | |
Have python-gobject build-dependency fallback to python-gtk2 older than 2.9 (it provided gobject back then).debian/0.79.3-2
| -rw-r--r-- | debian/changelog | 7 | ||||
| -rw-r--r-- | debian/control | 2 | ||||
| -rwxr-xr-x | debian/rules | 3 |
3 files changed, 10 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog index a25c3b9..2db61e3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +sugar-presence-service (0.79.3-2) unstable; urgency=low + + * Have python-gobject build-dependency fallback to python-gtk2 older + than 2.9 (it provided gobject back then). + + -- Jonas Smedegaard <dr@jones.dk> Thu, 24 Apr 2008 12:10:02 +0200 + sugar-presence-service (0.79.3-1) unstable; urgency=low * New upstream release. diff --git a/debian/control b/debian/control index 552815f..6f8a59d 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: x11 Priority: optional Maintainer: Debian OLPC <debian-olpc-devel@lists.alioth.debian.org> Uploaders: Jonas Smedegaard <dr@jones.dk> -Build-Depends: cdbs (>= 0.4.39), devscripts (>= 2.10.7), python-dev (>= 2.3.5-11), python-central (>= 0.5.6), debhelper (>= 5.0.44), dh-buildinfo, python-dbus, python-gobject +Build-Depends: cdbs (>= 0.4.39), devscripts (>= 2.10.7), python-dev (>= 2.3.5-11), python-central (>= 0.5.6), debhelper (>= 5.0.44), dh-buildinfo, python-dbus, python-gobject | python-gtk2 (<< 2.9) Standards-Version: 3.7.3 Vcs-Git: git://git.debian.org/git/collab-maint/sugar-presence-service.git Vcs-Browser: http://git.debian.org/?p=collab-maint/sugar-presence-service.git;a=summary diff --git a/debian/rules b/debian/rules index 9c9f908..5b87360 100755 --- a/debian/rules +++ b/debian/rules @@ -20,7 +20,8 @@ DEB_UPSTREAM_TARBALL_MD5 = 3eb8ba37206621bf02ee23307cf544da DEB_MAKE_CHECK_TARGET = check # Needed by upstream unittests -CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), python-dbus, python-gobject +# pygtk << 2.9 contained gobject +CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), python-dbus, python-gobject | python-gtk2 (<< 2.9) # Merge duplicate build-dependencies CDBS_BUILD_DEPENDS := $(shell echo '$(CDBS_BUILD_DEPENDS)' | sed -e '/\bcdbs (>= 0.4.39)/ s/ *,* *\bcdbs (>= \(0.4.23-1.1\)) *,* */, /g' -e 's/^ *, *//' -e 's/ *, *$$//') |