Merge trunk

3 files changed, 32 insertions, 9 deletions

diff --git a/debian/changelog b/debian/changelog
index e84645a..8e259d3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,33 @@
+indicator-sound (12.10.2+13.10.20130822-0ubuntu1) saucy; urgency=low
+
+  [ Charles Kerr ]
+  * Don't use deprecated GSimpleActionGroup APIs.
+
+  [ Ubuntu daily release ]
+  * Automatic snapshot from revision 369
+
+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com>  Thu, 22 Aug 2013 20:29:51 +0000
+
+indicator-sound (12.10.2+13.10.20130820-0ubuntu1) saucy; urgency=low
+
+  [ Pete Woods ]
+  * Re-write build scripts using cmake.
+
+  [ Ubuntu daily release ]
+  * Automatic snapshot from revision 367
+
+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com>  Tue, 20 Aug 2013 10:08:24 +0000
+
+indicator-sound (12.10.2+13.10.20130812.1-0ubuntu1) saucy; urgency=low
+
+  [ Charles Kerr ]
+  * Add back an accessible_desc property to the sound indicator.
+
+  [ Ubuntu daily release ]
+  * Automatic snapshot from revision 365
+
+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com>  Mon, 12 Aug 2013 06:06:47 +0000
+
 indicator-sound (12.10.2+13.10.20130731-0ubuntu1) saucy; urgency=low
 
   [ Charles Kerr ]
diff --git a/debian/control b/debian/control
index 64ae720..2c263a3 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: extra
 Maintainer: Ubuntu Desktop Team <ubuntu-desktop@lists.ubuntu.com>
 XSBC-Original-Maintainer: Conor Curran <conor.curran@canonical.com>
 Build-Depends: debhelper (>= 9.0),
-               dh-autoreconf,
+               cmake,
                dh-translations,
                gnome-common,
                autotools-dev,
diff --git a/debian/rules b/debian/rules
index 2ce3519..9a276dc 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,12 +3,5 @@
 export DPKG_GENSYMBOLS_CHECK_LEVEL=4
 
 %:
-	dh $@ --with translations,autoreconf
+	dh $@ --parallel --fail-missing --with translations
 
-override_dh_autoreconf:
-	NOCONFIGURE=1 dh_autoreconf ./autogen.sh
-
-override_dh_install:
-	find debian/indicator-sound/usr/lib -name *.la -delete
-	find debian/indicator-sound/usr/lib -name *.a -delete
-	dh_install --fail-missing