diff options
| author | Jonas Smedegaard <dr@jones.dk> | 2008-03-14 14:06:52 (GMT) |
|---|---|---|
| committer | Jonas Smedegaard <dr@jones.dk> | 2008-03-14 14:06:52 (GMT) |
| commit | fa5de8981c165b51fc2a41f59223e999c53fbaf2 (patch) | |
| tree | ff6b8cbca0886bd5240f056d0d31aa57d788f249 | |
| parent | 0880a372b22a739bf7ff0e6820cd24ca80064fd2 (diff) | |
Really use quilt as promised in changelog.
| -rw-r--r-- | debian/changelog | 2 | ||||
| -rw-r--r-- | debian/control | 2 | ||||
| -rwxr-xr-x | debian/rules | 3 |
3 files changed, 4 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog index 15af4f8..6cf0b8f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -15,8 +15,8 @@ sugar-datastore (0.8.0~git.13d354b-5) unstable; urgency=low + Add local autotools.mk, autotools-vars.mk, makefile.mk and makefile-vars.mk providing multi-flavor build support needed by py-compile.mk. + + Add patchsys-quilt.mk. + README.cdbs-tweaks updated to mention the above. - * Use quilt to handle patches. * Add already applied patch 1001 to use unversioned Python hashbang in getbuildpath.py script. * Add already applied patch 1002 to nest try-except in diff --git a/debian/control b/debian/control index ee4bcb8..6252c29 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: python Priority: optional Maintainer: Debian OLPC <pkg-olpc-devel@lists.alioth.debian.org> Uploaders: Jonas Smedegaard <dr@jones.dk> -Build-Depends: python-dev (>= 2.3.5-11), python-central (>= 0.6), cdbs (>= 0.4.23-1.1), libtool, automake, autoconf, debhelper (>= 5), devscripts (>= 2.10.7), dh-buildinfo +Build-Depends: quilt, patchutils (>= 0.2.25), cdbs (>= 0.4.27-1), python-dev (>= 2.3.5-11), python-central (>= 0.6), libtool, automake, autoconf, debhelper (>= 5), devscripts (>= 2.10.7), 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 ac71f2d..cc36e75 100755 --- a/debian/rules +++ b/debian/rules @@ -9,6 +9,7 @@ DEB_AUTO_UPDATE_AUTOCONF = 2.61 DEB_AUTO_UPDATE_LIBTOOL = pre DEB_PYTHON_SYSTEM = pycentral +include /usr/share/cdbs/1/rules/patchsys-quilt.mk include debian/cdbs/1/class/py-compile.mk include /usr/share/cdbs/1/rules/debhelper.mk include debian/cdbs/1/rules/copyright-check.mk @@ -40,4 +41,4 @@ clean:: 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/ *, *$$//') +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/ *, *$$//') |