* debian/rules:

  - Convert from cdbs to debhelper 9.

2 files changed, 54 insertions, 112 deletions

diff --git a/debian/changelog b/debian/changelog
index 4568946..c60324c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-libappindicator (12.10.0-0ubuntu2) UNRELEASED; urgency=low
+libappindicator (12.10.1-0ubuntu1) UNRELEASED; urgency=low
 
   * debian/control:
     - Update style: use trailing commas at the end of dependency lists.
@@ -6,6 +6,8 @@ libappindicator (12.10.0-0ubuntu2) UNRELEASED; urgency=low
     - Bump Build-Depends on debhelper to (>= 9).
     - Drop Build-Depends on cdbs.
   * debian/compat: bump to compat level 9.
+  * debian/rules:
+    - Convert from cdbs to debhelper 9.
 
  -- Mathieu Trudel-Lapierre <mathieu-tl@ubuntu.com>  Mon, 26 Nov 2012 11:02:18 -0500
 
diff --git a/debian/rules b/debian/rules
index 666d331..832d635 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,126 +1,66 @@
 #!/usr/bin/make -f
 
-DEB_SRCDIR = .
-DEB_BUILDDIR = $(DEB_SRCDIR)/build
-
-DEB_PYTHON_SYSTEM=dh_python2
+FLAVORS = gtk2 gtk3
 PY_VERSIONS = $(shell pyversions --requested debian/control)
-export MONO_SHARED_DIR=$(CURDIR)
-export CSC=/usr/bin/mono-csc
+API_VERSION = 0.1
 
-include /usr/share/cdbs/1/rules/patchsys-quilt.mk
-include /usr/share/cdbs/1/rules/autoreconf.mk
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/gnome.mk
-include /usr/share/cdbs/1/rules/utils.mk
+CONFIGURE_COMMON_FLAGS = --disable-scrollkeeper --enable-introspection
+CONFIGURE_FLAGS_gtk2 = --with-gtk=2 --enable-gtk-doc
+CONFIGURE_FLAGS_gtk3 = --with-gtk=3 --enable-gtk-doc=no
 
-API_VERSION = 0.1
+export CSC=/usr/bin/mono-csc
 
-#DEB_MAKE_CHECK_TARGET := check
+CFLAGS += -fPIC
 
-DEB_CONFIGURE_EXTRA_FLAGS += --disable-scrollkeeper --enable-gtk-doc --enable-introspection
+%:
+	dh $@ --with autoreconf,python2,cli,gir
 
-configure-stamp-%:
-	mkdir build-$*
-	cd build-$* && PYTHON=`which $*` \
-		$(DEB_CONFIGURE_SCRIPT) $(DEB_CONFIGURE_NORMAL_ARGS) --srcdir=..
-	touch $@
+override_dh_auto_configure: $(FLAVORS:%=doconfigure-%)
 
-configure/python-appindicator:: $(addprefix configure-stamp-, $(PY_VERSIONS))
+doconfigure-%:
+	dh_auto_configure --builddirectory=build/$* -- $(CONFIGURE_FLAGS_$*) $(CONFIGURE_COMMON_FLAGS)
 
-build-stamp-%:
+doconfigure-gtk2: $(PY_VERSIONS:%=doconfiguregtk2-%)
+	# GTK2 flavor configure was run on a per-python-version basis.
+
+doconfiguregtk2-%:
 	PYTHON=`which $*` \
-		$(MAKE) -C build-$*
-	touch $@
+		dh_auto_configure --builddirectory=build/gtk2 -- $(CONFIGURE_FLAGS_gtk2) $(CONFIGURE_COMMON_FLAGS)
+
+override_dh_auto_build: $(FLAVORS:%=dobuild-%)
 
-build/python-appindicator:: $(addprefix build-stamp-, $(PY_VERSIONS))
+dobuild-%:
+	dh_auto_build --builddirectory=build/$*
 
-install-stamp-%:
+dobuild-gtk2: $(PY_VERSIONS:%=dobuildgtk2-%)
+	# GTK2 flavor build was run on a per-python-version basis.
+
+dobuildgtk2-%:
 	PYTHON=`which $*` \
-		$(MAKE) -C build-$*/bindings/python install DESTDIR=$(CURDIR)/debian/tmp
-	dh_installdirs -ppython-appindicator 
-	dh_install -ppython-appindicator
-	touch $@
-
-binary-install/python-appindicator:: $(addprefix install-stamp-, $(PY_VERSIONS))
-
-configure-stamp: 
-	cd $(DEB_BUILDDIR) && \
-		$(DEB_CONFIGURE_SCRIPT) $(DEB_CONFIGURE_NORMAL_ARGS) $(DEB_CONFIGURE_EXTRA_FLAGS) --enable-gtk-doc
-	touch $@
-
-configure/libappindicator1:: configure-stamp
-
-build-stamp: 
-	$(MAKE) -C $(DEB_BUILDDIR)
-	touch $@
-
-build/libappindicator1:: build-stamp
-
-install-stamp:
-	$(MAKE) -C $(DEB_BUILDDIR) install DESTDIR=$(CURDIR)/debian/tmp
-	touch $@
-
-binary-install/libappindicator1:: install-stamp install-stamp-gtk3
-	dh_makeshlibs -plibappindicator1
-
-configure-stamp-gtk3:
-	: # configure for GTK+ 3.0
-	rm -rf build-gtk3; \
-	mkdir build-gtk3; \
-	cd build-gtk3; \
-	$(DEB_CONFIGURE_SCRIPT_ENV) ../configure --with-gtk=3 \
-		$(filter-out --enable-gtk-doc, $(filter-out --srcdir=%, $(DEB_CONFIGURE_NORMAL_ARGS) $(DEB_CONFIGURE_EXTRA_FLAGS))) \
-		--enable-gtk-doc=no; \
-	cd ..;
-	touch $@
-
-configure/libappindicator3-1:: configure-stamp-gtk3
-
-build-stamp-gtk3:
-	: # build for GTK+ 3.0
-	$(MAKE) -C build-gtk3/src;
-	$(MAKE) -C build-gtk3/bindings/vala;
-	touch $@
-
-build/libappindicator3-1:: build-stamp-gtk3
-
-install-stamp-gtk3:
-	: # install for GTK+ 3.0
-	$(MAKE) -C build-gtk3/src DESTDIR=$(CURDIR)/debian/tmp install
-	$(MAKE) -C build-gtk3/bindings/vala DESTDIR=$(CURDIR)/debian/tmp install
-	touch $@
-
-binary-install/libappindicator3-1:: install-stamp-gtk3
-	dh_makeshlibs -plibappindicator3-1
-
-binary-install/libappindicator0.1-cil:: binary-fixup/libappindicator1
-	dh_clistrip
-	dh_clifixperms
-	dh_makeclilibs -V
-	dh_installcligac
-
-binary-fixup/python-appindicator::
-	dh_python2 -ppython-appindicator
-	find debian/python-appindicator/usr/lib -name \*.la -exec rm {} \;
-	find debian/python-appindicator/usr/lib -name \*.a -exec rm {} \;
-
-binary-predeb/gir%::
-	dh_girepository -p$(cdbs_curpkg)
-
-binary-predeb/libappindicator0.1-cil:: binary-fixup/libappindicator1
-	dh_clideps -plibappindicator0.1-cil
-
-common-binary-predeb-arch:: list-missing
-	dh_fixperms
-	dh_strip
-	cd po; intltool-update --pot --verbose
-
-clean::
-	rm -f configure-stamp*
-	rm -f build-stamp*
-	rm -f install-stamp*
+		dh_auto_build --builddirectory=build/gtk2
+
+override_dh_auto_install: $(FLAVORS:%=doinstall-%)
+
+doinstall-%:
+	dh_auto_install --builddirectory=build/$* --destdir=debian/tmp/$*
+
+override_dh_install:
+	find debian/tmp -name \*.la -exec rm {} \;
+	find debian/tmp -name \*.a -exec rm {} \;
+	rm -rf debian/tmp/*/usr/lib/mono
+	rm -rf debian/tmp/*/usr/share/vala/vapi/appindicator*-0.1.deps
+	dh_install -ppython-appindicator --fail-missing --sourcedir=debian/tmp/gtk2
+	dh_install -plibappindicator1 --fail-missing --sourcedir=debian/tmp/gtk2
+	dh_install -pgir1.2-appindicator-0.1 --fail-missing --sourcedir=debian/tmp/gtk2
+	dh_install -plibappindicator-dev --fail-missing --sourcedir=debian/tmp/gtk2
+	dh_install -plibappindicator-doc --fail-missing --sourcedir=debian/tmp/gtk2
+	dh_install -plibappindicator3-1 --fail-missing --sourcedir=debian/tmp/gtk3
+	dh_install -plibappindicator3-dev --fail-missing --sourcedir=debian/tmp/gtk3
+	dh_install -pgir1.2-appindicator3-0.1 --fail-missing --sourcedir=debian/tmp/gtk3
+	dh_install -plibappindicator0.1-cil --fail-missing --sourcedir=debian/tmp/gtk2
+	dh_install -plibappindicator0.1-cil-dev --fail-missing --sourcedir=debian/tmp/gtk2
+
+override_dh_auto_clean:
+	dh_auto_clean
 	rm -rf build
-	rm -rf build-gtk3
-	rm -rf build-python*
-	rm -rf $(MONO_SHARED_DIR)/.wapi
+