[Pkg-sugar-commit] [sugar] 01/01: Enable cdbs autotools reconfiguration, and semi-auto-update debian/control.

[Jonas Smedegaard]

This is an automated email from the git hooks/post-receive script.

js pushed a commit to annotated tag debian/0.79.2.git-1
in repository sugar.

commit bcbf825552f72d40b1e5f1291de8c5405fc6473a
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Mon Apr 7 20:21:08 2008 +0200

    Enable cdbs autotools reconfiguration, and semi-auto-update debian/control.
---
 debian/changelog |  4 ++++
 debian/control   |  2 +-
 debian/rules     | 20 +++++++++++++++++++-
 3 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a6b9188..e63eeae 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,10 @@ sugar (0.79.2~git-1) unstable; urgency=low
   * Update copyright-check cdbs snippet to store newline-delimited
     hints.  Update hints.
   * Drop patch 2991 against no longer provided upstream automade files.
+  * Enable cdbs autotools reconfiguration.  Merge yet another duplicate
+    cdbs build-dependency.
+  * Semi-auto-update debian/control to update build-dependencies:
+      DEB_AUTO_UPDATE_DEBIAN_CONTROL=yes fakeroot debian/rules clean
 
  -- Jonas Smedegaard <dr at jones.dk>  Sat, 05 Apr 2008 10:54:56 +0200
 
diff --git a/debian/control b/debian/control
index 5bc0e9f..103e143 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: x11
 Priority: optional
 Maintainer: Debian OLPC <debian-olpc-devel at lists.alioth.debian.org>
 Uploaders: Jonas Smedegaard <dr at jones.dk>
-Build-Depends: cdbs (>= 0.4.39), autotools-dev, devscripts (>= 2.10.7), quilt, patchutils (>= 0.2.25), cdbs (>= 0.4.27-1), python-dev (>= 2.3.5-11), python-central (>= 0.6), debhelper (>= 5), dh-buildinfo, libglib2.0-dev, python-gtk2-dev, gettext, intltool, shared-mime-info, python-empy
+Build-Depends: cdbs (>= 0.4.39), devscripts (>= 2.10.7), quilt, patchutils (>= 0.2.25), cdbs (>= 0.4.27-1), automake1.10, autoconf, python-dev (>= 2.3.5-11), python-central (>= 0.6), debhelper (>= 5), dh-buildinfo, libglib2.0-dev, python-gtk2-dev, gettext, intltool, shared-mime-info, python-empy
 Standards-Version: 3.7.3
 Vcs-Git: git://git.debian.org/git/collab-maint/sugar.git
 Vcs-Browser: http://git.debian.org/?p=collab-maint/sugar.git;a=summary
diff --git a/debian/rules b/debian/rules
index c148f88..6084b03 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,6 +5,9 @@
 # NB! Local CDBS tweaks in use. More info in README.cdbs-tweaks
 DEB_BUILDDIR = build
 DEB_PYTHON_SYSTEM = pycentral
+DEB_AUTO_UPDATE_ACLOCAL = 1.10
+DEB_AUTO_UPDATE_AUTOMAKE = 1.10
+DEB_AUTO_UPDATE_AUTOCONF = 2.61
 include debian/cdbs/1/rules/upstream-tarball.mk
 include debian/cdbs/1/rules/copyright-check.mk
 include /usr/share/cdbs/1/rules/patchsys-quilt.mk
@@ -18,6 +21,21 @@ DEB_UPSTREAM_URL = http://dev.laptop.org/pub/sugar/sources/$(DEB_UPSTREAM_PACKAG
 DEB_UPSTREAM_TARBALL_EXTENSION = tar.bz2
 DEB_UPSTREAM_TARBALL_MD5 = e10b794279af18fc4fd0d7de04c76bc8
 
+# Workaround: can't pass --install to autotools through CDBS
+pre-build::
+	mkdir -p m4
+	[ -e configure ] || autoreconf -i
+	[ -e intltool-update.in ] || intltoolize
+
+# Cleanup automade files
+clean::
+	rm -f aclocal.m4 compile config.guess config.sub configure
+	rm -f intltool-extract intltool-merge intltool-update po/.intltool-merge-cache
+	rm -f m4/intltool.m4
+	[ ! -d m4 ] || rmdir --ignore-fail-on-non-empty m4
+	find -name Makefile.in -exec rm '{}' ';'
+
+
 # Needed by upstream build process
 CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), libglib2.0-dev, python-gtk2-dev, gettext, intltool, shared-mime-info
 
@@ -25,4 +43,4 @@ CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), libglib2.0-dev, python-gtk2-dev, ge
 CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), python-empy
 
 # 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.39)/ s/ *,* *\bcdbs (>= \(0.4.23-1.1\|0.4.27-1\)) *,* */, /g' -e 's/^ *, *//' -e 's/ *, *$$//')

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-sugar/sugar.git