diff options
| author | Jonas Smedegaard <dr@jones.dk> | 2008-03-11 01:10:26 (GMT) |
|---|---|---|
| committer | Jonas Smedegaard <dr@jones.dk> | 2008-03-11 01:10:26 (GMT) |
| commit | 64bd51454a783bb7355ee50f3f72e17c0ca31278 (patch) | |
| tree | 670c5f70802d819cab6e997d41d8c8dfd036c5ab | |
| parent | 0fb77bdc7a02d2fa79a4b4f8e3cc677ae788441d (diff) | |
* Update CDBS tweaks:debian/0.79.0-2
+ Replace virtual automake1.10 build-dependency with automake
* Semi-auto-update debian/control to update build-dependencies:
DEB_AUTO_UPDATE_DEBIAN_CONTROL=yes fakeroot debian/rules clean
| -rw-r--r-- | debian/changelog | 8 | ||||
| -rw-r--r-- | debian/control | 2 | ||||
| -rwxr-xr-x | debian/rules | 3 |
3 files changed, 10 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog index 9b2d2b7..83614b6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -sugar-toolkit (0.79.0-2) UNRELEASED; urgency=low +sugar-toolkit (0.79.0-2) unstable; urgency=low * Depend on sugar-base, python-gtk2, python-dbus, python-gobject, python-cairo, python-gnome2-desktop (new enough to include rsvg), @@ -8,8 +8,12 @@ sugar-toolkit (0.79.0-2) UNRELEASED; urgency=low * Suggest git-core, subversion and ttf-dejavu-extra. * Patch sugar/activity/activity.py to work on Python < 2.5 missing hashlib module. + * Update CDBS tweaks: + + Replace virtual automake1.10 build-dependency with automake + * Semi-auto-update debian/control to update build-dependencies: + DEB_AUTO_UPDATE_DEBIAN_CONTROL=yes fakeroot debian/rules clean - -- Jonas Smedegaard <dr@jones.dk> Sun, 09 Mar 2008 02:20:49 +0100 + -- Jonas Smedegaard <dr@jones.dk> Tue, 11 Mar 2008 02:10:15 +0100 sugar-toolkit (0.79.0-1) unstable; urgency=low diff --git a/debian/control b/debian/control index eeb92aa..f4bfec0 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: sugar-toolkit Section: x11 Priority: optional Maintainer: Jonas Smedegaard <dr@jones.dk> -Build-Depends: cdbs (>= 0.4.39), autotools-dev, libtool, automake1.10, debhelper (>= 5), devscripts (>= 2.10.7), dh-buildinfo, libglib2.0-dev, python-gtk2-dev, gettext, intltool, libxml-parser-perl, python-central +Build-Depends: cdbs (>= 0.4.39), autotools-dev, libtool, automake, debhelper (>= 5), devscripts (>= 2.10.7), dh-buildinfo, libglib2.0-dev, python-gtk2-dev, gettext, intltool, libxml-parser-perl, python-central Standards-Version: 3.7.3 Vcs-Git: git://git.debian.org/git/collab-maint/sugar-toolkit.git Vcs-Browser: http://git.debian.org/?p=collab-maint/sugar-toolkit.git;a=summary diff --git a/debian/rules b/debian/rules index d071964..8f616de 100755 --- a/debian/rules +++ b/debian/rules @@ -30,5 +30,8 @@ CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), libglib2.0-dev, python-gtk2-dev, ge # Needed for our packaging routines CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), python-central +# Replace virtual automake1.10 build-dependency with automake +CDBS_BUILD_DEPENDS := $(shell echo '$(CDBS_BUILD_DEPENDS)' | sed -e 's/\bautomake1\.10\b/automake/') + # 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/ *, *$$//') |