* New upstream release.

  * A race fix on the dbus name (LP: #526499)
  * Fixing the Watcher Interface
  * Fixes to build with GTK 2/3
  * Fixes to build with valac-0.12
* debian/control
  - Changed the valac build depends to valac-0.12 
* debian/python-appindicator.install
  - Make sure python2.6 and python2.7 files get included
* debian/rules
  - Fix builds for multiple python versions
  - disable parallel builds, it breaks the mono binding generation

4 files changed, 44 insertions, 11 deletions

diff --git a/debian/changelog b/debian/changelog
index 1fd1402..dc2de87 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,23 @@
+indicator-application (0.2.90-0ubuntu1) UNRELEASED; urgency=low
+
+  [ Ted Gould ]
+  * New upstream release.
+    * A race fix on the dbus name (LP: #526499)
+    * Fixing the Watcher Interface
+    * Fixes to build with GTK 2/3
+    * Fixes to build with valac-0.12
+
+  [ Ken VanDine ]
+  * debian/control
+    - Changed the valac build depends to valac-0.12 
+  * debian/python-appindicator.install
+    - Make sure python2.6 and python2.7 files get included
+  * debian/rules
+    - Fix builds for multiple python versions
+    - disable parallel builds, it breaks the mono binding generation
+
+ -- Ken VanDine <ken.vandine@canonical.com>  Wed, 08 Dec 2010 00:42:58 -0500
+
 indicator-application (0.2.9-0ubuntu1) maverick; urgency=low
 
   [ Ted Gould ]
diff --git a/debian/control b/debian/control
index 87682af..2114116 100644
--- a/debian/control
+++ b/debian/control
@@ -29,7 +29,7 @@ Build-Depends: debhelper (>= 5.0),
                libgirepository1.0-dev,
                gir1.0-glib-2.0,
                gir1.0-gtk-2.0,
-               valac
+               valac-0.12
 Standards-Version: 3.8.4
 Homepage: https://launchpad.net/indicator-application
 Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-desktop/indicator-application/ubuntu
diff --git a/debian/python-appindicator.install b/debian/python-appindicator.install
index 7a7f049..00bdd51 100644
--- a/debian/python-appindicator.install
+++ b/debian/python-appindicator.install
@@ -1,2 +1,2 @@
-debian/tmp/usr/lib/python2.6/*
+debian/tmp/usr/lib/python2.*
 debian/tmp/usr/share/pygtk/*
diff --git a/debian/rules b/debian/rules
index 6e31d41..267a43b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,5 +1,9 @@
 #!/usr/bin/make -f
 
+export DH_VERBOSE=1
+DEB_SRCDIR = .
+DEB_BUILDDIR = $(DEB_SRCDIR)/build
+
 DEB_PYTHON_SYSTEM=pycentral
 PY_VERSIONS = $(shell pyversions --requested debian/control)
 export MONO_SHARED_DIR=$(CURDIR)
@@ -8,8 +12,8 @@ export CSC=/usr/bin/mono-csc
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/autotools-vars.mk
 include /usr/share/cdbs/1/rules/utils.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
-
+DEB_BUILD_PARALLEL = no
+DEB_PARALLEL_JOBS:=1
 DEB_CONFIGURE_EXTRA_FLAGS += --enable-gtk-doc
 API_VERSION = 0.1
 
@@ -24,19 +28,23 @@ configure-stamp-%:
 configure/python-appindicator:: $(addprefix configure-stamp-, $(PY_VERSIONS))
 
 build-stamp-%:
-	make -C build-$*/bindings/python
+	PYTHON=`which $*` \
+		$(MAKE) -C build-$*
 	touch $@
 
 build/python-appindicator:: $(addprefix build-stamp-, $(PY_VERSIONS))
 
 install-stamp-%:
-	make -C build-$*/bindings/python install DESTDIR=$(CURDIR)/debian/tmp
+	PYTHON=`which $*` \
+		$(MAKE) -C build-$*/bindings/python install DESTDIR=$(CURDIR)/debian/tmp
+	dh_installdirs -ppython-appindicator -s
+	dh_install -ppython-appindicator -s
 	touch $@
 
 install/python-appindicator:: $(addprefix install-stamp-, $(PY_VERSIONS))
 
-binary-install/python-appindicator::
-	dh_pycentral
+binary-predeb/python-appindicator::
+	DH_PYCENTRAL=include-links dh_pycentral -ppython-appindicator -s
 
 binary-install/libappindicator0.1-cil::
 	dh_clistrip
@@ -51,23 +59,28 @@ binary-predeb/libappindicator0.1-cil:: binary-fixup/libappindicator1
 	dh_clideps -plibappindicator0.1-cil
 
 configure-stamp:
-	$(DEB_CONFIGURE_SCRIPT) $(DEB_CONFIGURE_NORMAL_ARGS) $(DEB_CONFIGURE_EXTRA_FLAGS)
+	cd $(DEB_BUILDDIR) && \
+		$(DEB_CONFIGURE_SCRIPT) $(DEB_CONFIGURE_NORMAL_ARGS) $(DEB_CONFIGURE_EXTRA_FLAGS)
 	touch $@
 
 configure/indicator-application:: configure-stamp
 
 build-stamp:
-	make
+	$(MAKE) -C $(DEB_BUILDDIR)
 	touch $@
 
 build/indicator-application:: build-stamp
 
 install-stamp:
-	make install DESTDIR=$(CURDIR)/debian/tmp
+	$(MAKE) -C $(DEB_BUILDDIR) install DESTDIR=$(CURDIR)/debian/tmp
 	touch $@
 
 install/indicator-application:: install-stamp
 
+binary-predeb/libappindicator1:: install-stamp
+	dh_fixperms
+	dh_strip
+
 binary-post-install/indicator-application::
 	find debian/indicator-application/usr/lib -name \*.la -exec rm {} \;
 	find debian/indicator-application/usr/lib -name \*.a -exec rm {} \;