Merge Trunk

3 files changed, 93 insertions, 9 deletions

diff --git a/debian/changelog b/debian/changelog
index 40d8cc9..8e259d3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,93 @@
+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 ]
+  * add Recommends: u-s-s | g-c-c to debian/control.
+
+  [ Nick Dedekind ]
+  * Fixed max-icon on volume control slider. (LP: #1206534)
+
+  [ Ubuntu daily release ]
+  * Automatic snapshot from revision 363
+
+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com>  Wed, 31 Jul 2013 02:02:57 +0000
+
+indicator-sound (12.10.2+13.10.20130726-0ubuntu1) saucy; urgency=low
+
+  [ Lars Uebernickel ]
+  * Actually export a phone menu.
+
+  [ Ubuntu daily release ]
+  * Automatic snapshot from revision 360
+
+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com>  Fri, 26 Jul 2013 02:03:50 +0000
+
+indicator-sound (12.10.2+13.10.20130725-0ubuntu1) saucy; urgency=low
+
+  [ Lars Uebernickel ]
+  * Specify fallback icons The *-panel suffix is only used by the
+    ubuntu-mono icon themes. . (LP: #1202932)
+
+  [ Ubuntu daily release ]
+  * Automatic snapshot from revision 358
+
+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com>  Thu, 25 Jul 2013 02:03:43 +0000
+
+indicator-sound (12.10.2+13.10.20130722-0ubuntu1) saucy; urgency=low
+
+  [ Lars Uebernickel ]
+  * Remove Rhythmbox from the default of the 'interested-media-players'
+    setting The sound menu should only contain players that have been
+    started before. (LP: #1202933)
+
+  [ Ubuntu daily release ]
+  * Automatic snapshot from revision 356
+
+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com>  Mon, 22 Jul 2013 02:03:34 +0000
+
+indicator-sound (12.10.2+13.10.20130716-0ubuntu1) saucy; urgency=low
+
+  [ Ted Gould ]
+  * Add phone profile to indicator config.
+
+  [ Lars Uebernickel ]
+  * Remove gtk and dbusmenu. Sorry for the big changeset. I'd appreciate
+    a good deal of testing before merging this into the wild ;).
+
+  [ Ubuntu daily release ]
+  * Automatic snapshot from revision 354
+
+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com>  Tue, 16 Jul 2013 02:02:55 +0000
+
 indicator-sound (12.10.2daily13.06.07-0ubuntu1) saucy; urgency=low
 
   [ Jeremy Bicha ]
diff --git a/debian/control b/debian/control
index 8abcf59..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,
@@ -27,6 +27,7 @@ Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends},
          pulseaudio,
+Recommends: ubuntu-system-settings | gnome-control-center,
 Description: System sound indicator.
  System sound indicator which provides easy control of the PulseAudio sound 
  daemon.
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