diff options
| author | Jonas Smedegaard <dr@jones.dk> | 2008-03-11 01:36:33 (GMT) |
|---|---|---|
| committer | Jonas Smedegaard <dr@jones.dk> | 2008-03-11 01:36:33 (GMT) |
| commit | cc425eab5b2e5c7ee461044e18ac93444f196248 (patch) | |
| tree | de5aef070f0db0d60bcd26280bf61526b75b404d | |
| parent | bb13000b7a5e4ba129d8e18cd973f3407d559ea4 (diff) | |
* Update CDBS tweaks:debian/0.8.0.git.13d354b-4
+ 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 dbbd401..5921557 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,12 @@ -sugar-datastore (0.8.0~git.13d354b-4) UNRELEASED; urgency=low +sugar-datastore (0.8.0~git.13d354b-4) unstable; urgency=low * Fix watch file (no tarball yet - just guessing the upcoming name). + * 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> Mon, 10 Mar 2008 16:35:05 +0100 + -- Jonas Smedegaard <dr@jones.dk> Tue, 11 Mar 2008 02:36:26 +0100 sugar-datastore (0.8.0~git.13d354b-3) unstable; urgency=low diff --git a/debian/control b/debian/control index ba42f1e..bd7f80a 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: sugar-datastore Section: misc Priority: optional Maintainer: Jonas Smedegaard <dr@jones.dk> -Build-Depends: cdbs (>= 0.4.23-1.1), libtool, automake1.10, autoconf, debhelper (>= 5), devscripts (>= 2.10.7), dh-buildinfo, python-all-dev, python-central +Build-Depends: cdbs (>= 0.4.23-1.1), libtool, automake, autoconf, debhelper (>= 5), devscripts (>= 2.10.7), dh-buildinfo, python-all-dev, python-central Standards-Version: 3.7.3 Vcs-Git: git://git.debian.org/git/collab-maint/sugar-datastore.git Vcs-Browser: http://git.debian.org/?p=collab-maint/sugar-datastore.git;a=summary diff --git a/debian/rules b/debian/rules index 0a775da..6c57d7c 100755 --- a/debian/rules +++ b/debian/rules @@ -47,5 +47,8 @@ CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), python-all-dev # 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/ *, *$$//') |