Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonas Smedegaard <dr@jones.dk>2008-05-26 10:23:44 (GMT)
committer Jonas Smedegaard <dr@jones.dk>2008-05-26 10:23:44 (GMT)
commit6a400beeb367c8cba7547b0687ad9a7cdd7f87ea (patch)
treee4121554e08970bcdbafe6afc3ca345c8093bbc1
parenta8ff974c599e29980f49de31c2fd160c9f9828e1 (diff)
Really update build-dependencies as promised in 0.8.1-1.debian/0.8.1-2
-rw-r--r--debian/changelog6
-rw-r--r--debian/control2
-rwxr-xr-xdebian/rules5
3 files changed, 8 insertions, 5 deletions
diff --git a/debian/changelog b/debian/changelog
index b110761..dc2583b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+sugar-datastore (0.8.1-2) unstable; urgency=low
+
+ * Really update build-dependencies as promised in 0.8.1-1.
+
+ -- Jonas Smedegaard <dr@jones.dk> Mon, 26 May 2008 12:23:09 +0200
+
sugar-datastore (0.8.1-1) unstable; urgency=low
* New upstream release (only version number bumped, compared to prior
diff --git a/debian/control b/debian/control
index ab555f6..df7be7a 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: python
Priority: optional
Maintainer: Debian OLPC <debian-olpc-devel@lists.alioth.debian.org>
Uploaders: Jonas Smedegaard <dr@jones.dk>
-Build-Depends: quilt, patchutils (>= 0.2.25), cdbs (>= 0.4.27), devscripts (>= 2.10.7), libtool, automake, autoconf, python-dev (>= 2.3.5-11), python-central (>= 0.5.6), debhelper (>= 5.0.44), dh-buildinfo
+Build-Depends: cdbs (>= 0.4.39), quilt, patchutils (>= 0.2.25), devscripts (>= 2.10.7), python-dev (>= 2.3.5-11), python-central (>= 0.5.6), debhelper (>= 5.0.44), dh-buildinfo
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 34b8561..f501697 100755
--- a/debian/rules
+++ b/debian/rules
@@ -30,7 +30,4 @@ pkg = python-olpc-datastore
#CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), python-setuptools, python-dbus, python-gobject, python-sugar-toolkit
# Merge duplicate build-dependencies
-CDBS_BUILD_DEPENDS := $(shell echo '$(CDBS_BUILD_DEPENDS)' | sed -e '/\bcdbs (>= 0.4.27-1)/ s/ *,* *\bcdbs (>= \(0.4.23-1.1\)) *,* */, /g' -e 's/^ *, *//' -e 's/ *, *$$//')
-
-# Avoid 1-revision in build-dependency
-CDBS_BUILD_DEPENDS := $(shell echo '$(CDBS_BUILD_DEPENDS)' | sed -e 's/\bcdbs (>= 0.4.27-1)/cdbs (>= 0.4.27)/')
+CDBS_BUILD_DEPENDS := $(shell echo '$(CDBS_BUILD_DEPENDS)' | sed -e '/\bcdbs (>= 0.4.39)/ s/ *,* *\bcdbs (>= \(0.4.23-1.1\|0.4.27-1\)) *,* */, /g' -e 's/^ *, *//' -e 's/ *, *$$//')