diff options
author | Jonas Smedegaard <dr@jones.dk> | 2008-08-16 12:42:07 (GMT) |
---|---|---|
committer | Jonas Smedegaard <dr@jones.dk> | 2008-08-16 12:42:07 (GMT) |
commit | 0a07004818526dc825bb4e328941dd5e5f0a9267 (patch) | |
tree | 9766419f662eaf767f95c198670b79dda34f5d2e /debian/rules | |
parent | e90287c423640c36344d8aa3d64bfeace1752016 (diff) |
Update cdbs snippets and copyright-hints.
* Update cdbs snippets:
+ Move dependency cleanup to new local snippet package-relations.mk.
+ Update copyright-check output to more closely match proposed new
copyright file format. Update copyright-hints.
+ Internal restructuring of flavor-enhanced autotools- and makefile-
snippets.
+ Update README.cdbs-tweaks.
* Add DEB_MAINTAINER_MODE in debian/rules (thanks to Romain Beauxis).
Diffstat (limited to 'debian/rules')
-rwxr-xr-x | debian/rules | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/debian/rules b/debian/rules index 49c47b9..8f19889 100755 --- a/debian/rules +++ b/debian/rules @@ -5,6 +5,11 @@ # NB! Local CDBS tweaks in use. More info in README.cdbs-tweaks DEB_BUILDDIR = build DEB_PYTHON_SYSTEM = pycentral +ifneq (,$(DEB_MAINTAINER_MODE)) + # Enable stuff not policy compliant (eg. unsuitable for build daemons) + DEB_COPYRIGHT_CHECK_STRICT = yes + DEB_AUTO_UPDATE_DEBIAN_CONTROL = yes +endif include debian/cdbs/1/rules/upstream-tarball.mk include /usr/share/cdbs/1/rules/patchsys-quilt.mk include debian/cdbs/1/rules/copyright-check.mk @@ -29,5 +34,5 @@ pkg = python-olpc-datastore # (temporarily disabled: python-sugar-toolkit is not yet in Debian) #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.39)/ s/ *,* *\bcdbs (>= \(0.4.23-1.1\|0.4.27\)) *,* */, /g' -e 's/^ *, *//' -e 's/ *, *$$//') +# Resolve, cleanup and apply CDBS-declared dependencies +include debian/cdbs/1/rules/package-relations.mk |