From a0c4ef48ed2f9d70aada553ddf45cdabc8b696da Mon Sep 17 00:00:00 2001 From: Ken VanDine Date: Thu, 11 Feb 2010 22:11:07 -0500 Subject: Initial release --- debian/control | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 debian/control (limited to 'debian/control') diff --git a/debian/control b/debian/control new file mode 100644 index 0000000..2a5437b --- /dev/null +++ b/debian/control @@ -0,0 +1,30 @@ +Source: indicator-sound +Section: sound +Priority: extra +Maintainer: Conor Curran +Build-Depends: debhelper (>= 7), + cdbs (>= 0.4.41), + autotools-dev, + libglib2.0-dev (>= 2.22.3), + libgtk2.0-dev (>= 2.12.0), + libdbus-glib-1-dev, + libdbusmenu-glib-dev (>= 0.2.3), + libdbusmenu-gtk-dev (>= 0.2.3) , + libindicator-dev (>= 0.3.0), + libpulse-dev (>= 0.9.18), + libpulse-mainloop-glib0 (>= 0.9.18), + libido-0.1-dev (>= 0.1.1), + libgconf2-dev +Standards-Version: 3.8.4 +Homepage: https://launchpad.net/indicator-sound + +Package: indicator-sound +Architecture: any +Section: libs +Depends: ${shlibs:Depends}, + ${misc:Depends} +Description: A system sound indicator. + A system sound indicator which provides easy control of the PulseAudio sound + daemon. + + -- cgit v1.2.3 From 4f387f6677b55d5de4a94809957ea43284099cb2 Mon Sep 17 00:00:00 2001 From: Sebastien Bacher Date: Fri, 12 Feb 2010 11:34:47 +0100 Subject: releasing version 0.1.0-0ubuntu1 --- debian/changelog | 11 +++++++++-- debian/control | 7 ++++--- debian/rules | 2 ++ 3 files changed, 15 insertions(+), 5 deletions(-) (limited to 'debian/control') diff --git a/debian/changelog b/debian/changelog index 0975f2c..70ec901 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,12 @@ -indicator-sound (0.1.0-0ubuntu1) UNRELEASED; urgency=low +indicator-sound (0.1.0-0ubuntu1) lucid; urgency=low + * debian/control: + - depends on pulseaudio + - don't set lib section, the applet is not a library + * debian/rules: + - build using --as-needed to avoid unnecessary depends + + [ Ken VanDine ] * Initial release - -- Ken VanDine Thu, 11 Feb 2010 17:34:49 -0500 + -- Sebastien Bacher Fri, 12 Feb 2010 11:13:22 +0100 diff --git a/debian/control b/debian/control index 2a5437b..7754b96 100644 --- a/debian/control +++ b/debian/control @@ -1,7 +1,8 @@ Source: indicator-sound Section: sound Priority: extra -Maintainer: Conor Curran +Maintainer: Ubuntu Desktop Team +XSBC-Original-Maintainer: Conor Curran Build-Depends: debhelper (>= 7), cdbs (>= 0.4.41), autotools-dev, @@ -20,9 +21,9 @@ Homepage: https://launchpad.net/indicator-sound Package: indicator-sound Architecture: any -Section: libs Depends: ${shlibs:Depends}, - ${misc:Depends} + ${misc:Depends}, + pulseaudio Description: A system sound indicator. A system sound indicator which provides easy control of the PulseAudio sound daemon. diff --git a/debian/rules b/debian/rules index a341f53..0bae2ff 100755 --- a/debian/rules +++ b/debian/rules @@ -8,6 +8,8 @@ include /usr/share/cdbs/1/rules/simple-patchsys.mk include /usr/share/cdbs/1/rules/utils.mk common-binary-post-install-arch:: list-missing +LDFLAGS += -Wl,-z,defs -Wl,-O1 -Wl,--as-needed + DEB_DH_MAKESHLIBS_ARGS = -Xusr/lib/indicators binary-install/indicator-sound:: -- cgit v1.2.3 From 75f17bec7d4a9b0ffc4cfceeb099b014f882363f Mon Sep 17 00:00:00 2001 From: Ken VanDine Date: Thu, 17 Jun 2010 17:09:09 -0400 Subject: * debian/control - bumped build-dep version of libdbusmenu-glib-dev to (>= 0.3.1) - Added build-dep for libindicate-dev (>= 0.4.1) --- debian/changelog | 3 +++ debian/control | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) (limited to 'debian/control') diff --git a/debian/changelog b/debian/changelog index a5cd64d..b0bf30e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,9 @@ indicator-sound (0.3.1-0ubuntu1) UNRELEASED; urgency=low * New upstream release. + * debian/control + - bumped build-dep version of libdbusmenu-glib-dev to (>= 0.3.1) + - Added build-dep for libindicate-dev (>= 0.4.1) -- Ken VanDine Thu, 17 Jun 2010 16:50:31 -0400 diff --git a/debian/control b/debian/control index 80b4d05..aa10b82 100644 --- a/debian/control +++ b/debian/control @@ -9,7 +9,7 @@ Build-Depends: debhelper (>= 7), libglib2.0-dev (>= 2.22.3), libgtk2.0-dev (>= 2.12.0), libdbus-glib-1-dev, - libdbusmenu-glib-dev (>= 0.2.3), + libdbusmenu-glib-dev (>= 0.3.1), libdbusmenu-gtk-dev (>= 0.2.3) , libindicator-dev (>= 0.3.6), libpulse-dev (>= 0.9.18), @@ -17,7 +17,7 @@ Build-Depends: debhelper (>= 7), libido-0.1-dev (>= 0.1.2), libgconf2-dev, libgee-dev, - libindicate-dev, + libindicate-dev (>= 0.4.1), valac Standards-Version: 3.8.4 Homepage: https://launchpad.net/indicator-sound -- cgit v1.2.3 From f71758b3b9f3222bd6b6902d9d14154903c47b1b Mon Sep 17 00:00:00 2001 From: Didier Roche Date: Wed, 22 Sep 2010 11:18:03 +0200 Subject: * Rebuild for libindicator ABI change (LP: #637692) * debian/control: depends on latest libindicator-dev --- debian/changelog | 7 +++++++ debian/control | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) (limited to 'debian/control') diff --git a/debian/changelog b/debian/changelog index 3d0c335..01d56d9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +indicator-sound (0.4.7-0ubuntu2) UNRELEASED; urgency=low + + * Rebuild for libindicator ABI change (LP: #637692) + * debian/control: depends on latest libindicator-dev + + -- Didier Roche Wed, 22 Sep 2010 11:17:45 +0200 + indicator-sound (0.4.7-0ubuntu1) maverick; urgency=low * New upstream release. diff --git a/debian/control b/debian/control index 3a43379..0c4ffbb 100644 --- a/debian/control +++ b/debian/control @@ -11,7 +11,7 @@ Build-Depends: debhelper (>= 7), libdbus-glib-1-dev, libdbusmenu-glib-dev (>= 0.3.1), libdbusmenu-gtk-dev (>= 0.2.3) , - libindicator-dev (>= 0.3.6), + libindicator-dev (>= 0.3.14), libpulse-dev (>= 0.9.18), libpulse-mainloop-glib0 (>= 0.9.18), libido-0.1-dev (>= 0.1.11), -- cgit v1.2.3 From ce000aacc3fe96dae098fbea9bbc639e08ddf632 Mon Sep 17 00:00:00 2001 From: Ken VanDine Date: Thu, 9 Dec 2010 13:08:57 -0500 Subject: releasing version 0.5.2-0ubuntu2 --- debian/changelog | 7 +++++++ debian/control | 4 ++-- 2 files changed, 9 insertions(+), 2 deletions(-) (limited to 'debian/control') diff --git a/debian/changelog b/debian/changelog index a49266f..a762724 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +indicator-sound (0.5.2-0ubuntu2) natty; urgency=low + + * debian/control + - Bump build depends for libdbusmenu-* to >= 0.3.90 + + -- Ken VanDine Thu, 09 Dec 2010 11:44:02 -0500 + indicator-sound (0.5.2-0ubuntu1) natty; urgency=low * New upstream release. diff --git a/debian/control b/debian/control index 6429cfc..dab145b 100644 --- a/debian/control +++ b/debian/control @@ -9,8 +9,8 @@ Build-Depends: debhelper (>= 7), libglib2.0-dev (>= 2.22.3), libgtk2.0-dev (>= 2.12.0), libdbus-glib-1-dev, - libdbusmenu-glib-dev (>= 0.3.1), - libdbusmenu-gtk-dev (>= 0.2.3) , + libdbusmenu-glib-dev (>= 0.3.90), + libdbusmenu-gtk-dev (>= 0.3.90) , libindicator-dev (>= 0.3.14), libpulse-dev (>= 0.9.18), libpulse-mainloop-glib0 (>= 0.9.18), -- cgit v1.2.3 From ec6b5962ff35174b341621edc7728b5ce1eaf7fd Mon Sep 17 00:00:00 2001 From: Ken VanDine Date: Thu, 17 Feb 2011 15:48:18 -0500 Subject: releasing version 0.5.9-0ubuntu2 --- debian/changelog | 13 +++++++++++++ debian/control | 7 ++++--- debian/rules | 1 + src/Makefile.am | 2 +- 4 files changed, 19 insertions(+), 4 deletions(-) (limited to 'debian/control') diff --git a/debian/changelog b/debian/changelog index 0a4e6b0..284a61c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,16 @@ +indicator-sound (0.5.9-0ubuntu2) natty; urgency=low + + * debian/control + - bump build depends for libindicator-dev to >= 0.3.19 + - bump build depends for libdbusmenu-glib-dev to >= 0.3.97 + - added build depends on dh-autoreconf + * src/Makefile.am + - Hand Dbusmenu-Glib-0.4 rename to Dbusmenu-0.4 + * debian/rules + - include autoreconf.mk to handle the Dbusmenu rename + + -- Ken VanDine Thu, 17 Feb 2011 15:21:33 -0500 + indicator-sound (0.5.9-0ubuntu1) natty; urgency=low * New upstream release. diff --git a/debian/control b/debian/control index a748f0b..dd27d1c 100644 --- a/debian/control +++ b/debian/control @@ -8,9 +8,9 @@ Build-Depends: debhelper (>= 7), autotools-dev, libglib2.0-dev (>= 2.22.3), libgtk2.0-dev (>= 2.12.0), - libdbusmenu-glib-dev (>= 0.3.91), + libdbusmenu-glib-dev (>= 0.3.97), libdbusmenu-gtk-dev (>= 0.3.91) , - libindicator-dev (>= 0.3.14), + libindicator-dev (>= 0.3.19), libpulse-dev (>= 0.9.18), libpulse-mainloop-glib0 (>= 0.9.18), libido-0.1-dev (>= 0.1.11), @@ -18,7 +18,8 @@ Build-Depends: debhelper (>= 7), libgee-dev, libxml2-dev, libnotify-dev, - valac-0.12 + valac-0.12, + dh-autoreconf Standards-Version: 3.9.1 Homepage: https://launchpad.net/indicator-sound diff --git a/debian/rules b/debian/rules index 0bae2ff..d778ba1 100755 --- a/debian/rules +++ b/debian/rules @@ -3,6 +3,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/gnome.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk +include /usr/share/cdbs/1/rules/autoreconf.mk # List any files which are not installed include /usr/share/cdbs/1/rules/utils.mk diff --git a/src/Makefile.am b/src/Makefile.am index 63d6d5a..23bda3d 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -65,7 +65,7 @@ music_bridge_VALAFLAGS = \ --vapidir=./ \ --thread \ --pkg gee-1.0 \ - --pkg Dbusmenu-Glib-0.4 \ + --pkg Dbusmenu-0.4 \ --pkg common-defs \ --pkg gio-2.0 \ --pkg gio-unix-2.0 \ -- cgit v1.2.3 From 46ce85550e1349998561f82146a3828cc94e311e Mon Sep 17 00:00:00 2001 From: Ken VanDine Date: Thu, 9 Feb 2012 16:49:44 -0500 Subject: releasing version 0.8.0.0-0ubuntu4 --- debian/changelog | 11 ++++ debian/control | 6 +- debian/patches/dbusmenu_05_90.patch | 109 ++++++++++++++++++++++++++++++++++++ debian/patches/series | 2 + debian/patches/sound_nua.patch | 13 +++++ 5 files changed, 138 insertions(+), 3 deletions(-) create mode 100644 debian/patches/dbusmenu_05_90.patch create mode 100644 debian/patches/sound_nua.patch (limited to 'debian/control') diff --git a/debian/changelog b/debian/changelog index 0cb0725..8835e39 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,14 @@ +indicator-sound (0.8.0.0-0ubuntu4) precise; urgency=low + + * debian/patches/sound_nua.patch + - open the new sound-nua panel in gnome-control-center + * debian/patches/dbusmenu_05_90.patch + - fixed FTBFS with dbusmenu 0.5.90 + * debian/control + - bump build depends for dbusmenu to >= 0.5.90 + + -- Ken VanDine Thu, 09 Feb 2012 16:49:15 -0500 + indicator-sound (0.8.0.0-0ubuntu3) precise; urgency=low * rebuild for libindicator7 diff --git a/debian/control b/debian/control index 8dea28e..296f82e 100644 --- a/debian/control +++ b/debian/control @@ -10,9 +10,9 @@ Build-Depends: debhelper (>= 7), libglib2.0-dev (>= 2.22.3), libgtk2.0-dev (>= 2.12.0), libgtk-3-dev, - libdbusmenu-glib-dev (>= 0.3.101), - libdbusmenu-gtk-dev (>= 0.3.101), - libdbusmenu-gtk3-dev (>= 0.3.101), + libdbusmenu-glib-dev (>= 0.5.90), + libdbusmenu-gtk-dev (>= 0.5.90), + libdbusmenu-gtk3-dev (>= 0.5.90), libindicator-dev (>= 0.3.90), libindicator3-dev (>= 0.3.90), libpulse-dev (>= 0.9.18), diff --git a/debian/patches/dbusmenu_05_90.patch b/debian/patches/dbusmenu_05_90.patch new file mode 100644 index 0000000..c477c68 --- /dev/null +++ b/debian/patches/dbusmenu_05_90.patch @@ -0,0 +1,109 @@ +=== modified file 'configure.ac' +--- old/configure.ac 2012-01-13 13:43:00 +0000 ++++ new/configure.ac 2012-02-01 03:15:46 +0000 +@@ -42,7 +42,7 @@ + GTK_REQUIRED_VERSION=2.22 + GTK3_REQUIRED_VERSION=3.0 + INDICATOR_REQUIRED_VERSION=0.3.19 +-DBUSMENUGTK_REQUIRED_VERSION=0.3.101 ++DBUSMENUGTK_REQUIRED_VERSION=0.5.90 + POLKIT_REQUIRED_VERSION=0.92 + PULSE_AUDIO_REQUIRED_VERSION=0.9.19 + INDICATOR_DISPLAY_OBJECTS=0.1.11 + +=== modified file 'src/indicator-sound.c' +--- old/src/indicator-sound.c 2012-01-25 02:57:50 +0000 ++++ new/src/indicator-sound.c 2012-02-01 03:20:44 +0000 +@@ -23,11 +23,7 @@ + #include + #include + #include +-#if GTK_CHECK_VERSION(3, 0, 0) +-#include +-#else + #include +-#endif + #include + + #include + +=== modified file 'src/metadata-widget.h' +--- old/src/metadata-widget.h 2011-06-22 19:19:49 +0000 ++++ new/src/metadata-widget.h 2012-02-01 03:20:44 +0000 +@@ -20,11 +20,7 @@ + #define __METADATA_WIDGET_H__ + + #include +-#if GTK_CHECK_VERSION(3, 0, 0) +-#include +-#else + #include +-#endif + + G_BEGIN_DECLS + + +=== modified file 'src/mute-widget.h' +--- old/src/mute-widget.h 2011-07-17 02:40:00 +0000 ++++ new/src/mute-widget.h 2012-02-01 03:20:44 +0000 +@@ -22,11 +22,7 @@ + #include + #include + #include +-#if GTK_CHECK_VERSION(3, 0, 0) +-#include +-#else + #include +-#endif + #include + + G_BEGIN_DECLS + +=== modified file 'src/transport-widget.h' +--- old/src/transport-widget.h 2011-06-22 19:19:49 +0000 ++++ new/src/transport-widget.h 2012-02-01 03:20:44 +0000 +@@ -20,11 +20,7 @@ + #define __TRANSPORT_WIDGET_H__ + + #include +-#if GTK_CHECK_VERSION(3, 0, 0) +-#include +-#else + #include +-#endif + + #include "common-defs.h" + + +=== modified file 'src/voip-input-widget.h' +--- old/src/voip-input-widget.h 2011-06-22 19:19:49 +0000 ++++ new/src/voip-input-widget.h 2012-02-01 03:20:44 +0000 +@@ -22,11 +22,7 @@ + #include + #include + #include +-#if GTK_CHECK_VERSION(3, 0, 0) +-#include +-#else + #include +-#endif + + G_BEGIN_DECLS + + +=== modified file 'src/volume-widget.h' +--- old/src/volume-widget.h 2011-06-22 19:19:49 +0000 ++++ new/src/volume-widget.h 2012-02-01 03:20:44 +0000 +@@ -22,11 +22,7 @@ + #include + #include + #include +-#if GTK_CHECK_VERSION(3, 0, 0) +-#include +-#else + #include +-#endif + #include + + G_BEGIN_DECLS + diff --git a/debian/patches/series b/debian/patches/series index 20dfb03..424fc6e 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1,3 @@ lazy_init.patch +sound_nua.patch +dbusmenu_05_90.patch diff --git a/debian/patches/sound_nua.patch b/debian/patches/sound_nua.patch new file mode 100644 index 0000000..4b31b61 --- /dev/null +++ b/debian/patches/sound_nua.patch @@ -0,0 +1,13 @@ +=== modified file 'src/sound-service-dbus.c' +--- old/src/sound-service-dbus.c 2011-08-10 16:58:49 +0000 ++++ new/src/sound-service-dbus.c 2012-02-09 21:32:58 +0000 +@@ -228,7 +228,7 @@ + { + GError * error = NULL; + if (!g_spawn_command_line_async("gnome-volume-control --page=applications", &error) && +- !g_spawn_command_line_async("gnome-control-center sound", &error) && ++ !g_spawn_command_line_async("gnome-control-center sound-nua", &error) && + !g_spawn_command_line_async("xfce4-mixer", &error)) + { + g_warning("Unable to show dialog: %s", error->message); + -- cgit v1.2.3 From 0e1e045b9344bf6cdbaec5d9fb3019010fedddef Mon Sep 17 00:00:00 2001 From: Sebastien Bacher Date: Wed, 22 Aug 2012 11:59:54 +0200 Subject: * Drop GTK2 build since ido stopped providing support for that version * debian/control: build with the current vala version --- debian/changelog | 7 +++++++ debian/control | 18 ++---------------- debian/indicator-sound-gtk2.install | 1 - debian/indicator-sound.install | 1 - debian/rules | 14 +------------- 5 files changed, 10 insertions(+), 31 deletions(-) delete mode 100644 debian/indicator-sound-gtk2.install delete mode 100644 debian/indicator-sound.install (limited to 'debian/control') diff --git a/debian/changelog b/debian/changelog index f5d4ffa..07919ff 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +indicator-sound (12.10.0-0ubuntu2) UNRELEASED; urgency=low + + * Drop GTK2 build since ido stopped providing support for that version + * debian/control: build with the current vala version + + -- Sebastien Bacher Wed, 22 Aug 2012 11:49:41 +0200 + indicator-sound (12.10.0-0ubuntu1) quantal; urgency=low * New upstream release. diff --git a/debian/control b/debian/control index 296f82e..e6e6b3f 100644 --- a/debian/control +++ b/debian/control @@ -8,23 +8,19 @@ Build-Depends: debhelper (>= 7), quilt, autotools-dev, libglib2.0-dev (>= 2.22.3), - libgtk2.0-dev (>= 2.12.0), libgtk-3-dev, libdbusmenu-glib-dev (>= 0.5.90), - libdbusmenu-gtk-dev (>= 0.5.90), libdbusmenu-gtk3-dev (>= 0.5.90), - libindicator-dev (>= 0.3.90), libindicator3-dev (>= 0.3.90), libpulse-dev (>= 0.9.18), libpulse-mainloop-glib0 (>= 0.9.18), - libido-0.1-dev (>= 0.1.11), libido3-0.1-dev (>= 0.2.90), libgee-dev, libxml2-dev, libnotify-dev, - valac-0.14, + valac-0.18, dh-autoreconf -Standards-Version: 3.9.2 +Standards-Version: 3.9.3 Homepage: https://launchpad.net/indicator-sound Package: indicator-sound @@ -36,13 +32,3 @@ Description: System sound indicator. System sound indicator which provides easy control of the PulseAudio sound daemon. -Package: indicator-sound-gtk2 -Architecture: any -Depends: ${shlibs:Depends}, - ${misc:Depends}, - indicator-sound (= ${binary:Version}), - pulseaudio -Replaces: indicator-sound (<< 0.7.1) -Description: System sound indicator. - System sound indicator which provides easy control of the PulseAudio sound - daemon. diff --git a/debian/indicator-sound-gtk2.install b/debian/indicator-sound-gtk2.install deleted file mode 100644 index 8d1fc9f..0000000 --- a/debian/indicator-sound-gtk2.install +++ /dev/null @@ -1 +0,0 @@ -debian/tmp/gtk2/usr/lib/indicators /usr/lib/ diff --git a/debian/indicator-sound.install b/debian/indicator-sound.install deleted file mode 100644 index 19a45de..0000000 --- a/debian/indicator-sound.install +++ /dev/null @@ -1 +0,0 @@ -debian/tmp/gtk3/usr / diff --git a/debian/rules b/debian/rules index f6ead0e..4ffb502 100755 --- a/debian/rules +++ b/debian/rules @@ -1,25 +1,13 @@ #!/usr/bin/make -f -DEB_BUILDDIR = build -DEB_MAKE_FLAVORS = gtk2 gtk3 - include /usr/share/cdbs/1/rules/autoreconf.mk include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/gnome.mk -DEB_MAKE_DESTDIRSKEL = $(CURDIR)/debian/tmp/@FLAVOR@ -DEB_DESTDIR = $(CURDIR)/debian/tmp/$(cdbs_make_curflavor)/ - -DEB_CONFIGURE_FLAGS_gtk2 = --with-gtk=2 -DEB_CONFIGURE_FLAGS_gtk3 = --with-gtk=3 DEB_CONFIGURE_EXTRA_FLAGS = --disable-static CFLAGS += -Wno-error=deprecated-declarations LDFLAGS += -Wl,-z,defs -Wl,--as-needed -debian/stamp-autotools/gtk2: cdbs_configure_flags += $(DEB_CONFIGURE_FLAGS_gtk2) -debian/stamp-autotools/gtk3: cdbs_configure_flags += $(DEB_CONFIGURE_FLAGS_gtk3) - common-install-arch:: - find debian/tmp -name \*.la -delete - find debian/tmp -name \*.a -delete + find debian/indicator-sound -name \*.la -delete -- cgit v1.2.3 From 89211f0b3c8d438bd4d4cba9f9f451637e6285fd Mon Sep 17 00:00:00 2001 From: unknown Date: Fri, 26 Oct 2012 16:32:54 +0200 Subject: * debian/control: update to debhelper 9.0 * debian/rules: change to debhelper 9.0 --- debian/changelog | 7 +++++++ debian/control | 3 +-- debian/rules | 15 ++++++--------- 3 files changed, 14 insertions(+), 11 deletions(-) (limited to 'debian/control') diff --git a/debian/changelog b/debian/changelog index 5e301ab..a74b7a1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +indicator-sound (12.10.1-0ubuntu2~ppa1) UNRELEASED; urgency=low + + * debian/control: update to debhelper 9.0 + * debian/rules: change to debhelper 9.0 + + -- Allan LeSage Fri, 26 Oct 2012 16:31:06 +0200 + indicator-sound (12.10.1-0ubuntu1) quantal; urgency=low * New upstream release. diff --git a/debian/control b/debian/control index e6e6b3f..dcf4014 100644 --- a/debian/control +++ b/debian/control @@ -3,8 +3,7 @@ Section: sound Priority: extra Maintainer: Ubuntu Desktop Team XSBC-Original-Maintainer: Conor Curran -Build-Depends: debhelper (>= 7), - cdbs (>= 0.4.41), +Build-Depends: debhelper (>= 9.0), quilt, autotools-dev, libglib2.0-dev (>= 2.22.3), diff --git a/debian/rules b/debian/rules index 4ffb502..400a07b 100755 --- a/debian/rules +++ b/debian/rules @@ -1,13 +1,10 @@ #!/usr/bin/make -f -include /usr/share/cdbs/1/rules/autoreconf.mk -include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/gnome.mk -DEB_CONFIGURE_EXTRA_FLAGS = --disable-static +%: + dh $@ --with translations,autoreconf -CFLAGS += -Wno-error=deprecated-declarations -LDFLAGS += -Wl,-z,defs -Wl,--as-needed - -common-install-arch:: - find debian/indicator-sound -name \*.la -delete +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 -- cgit v1.2.3 From 79bc986e51e4e45a55d00d1667c10e3c12f55683 Mon Sep 17 00:00:00 2001 From: Mathieu Trudel-Lapierre Date: Wed, 14 Nov 2012 10:02:34 -0500 Subject: * debian/control: - add gnome-common to Build-Depends for use by dh_autoreconf. - update style for constency: use trailing commas at the end of dep lists. - Add Vcs-Bzr, Vcs-Browser fields with comment for uploaders. --- debian/changelog | 9 +++++++++ debian/control | 10 ++++++++-- 2 files changed, 17 insertions(+), 2 deletions(-) (limited to 'debian/control') diff --git a/debian/changelog b/debian/changelog index 613d588..7c89a6f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +indicator-sound (12.10.2-0ubuntu1) UNRELEASED; urgency=low + + * debian/control: + - add gnome-common to Build-Depends for use by dh_autoreconf. + - update style for constency: use trailing commas at the end of dep lists. + - Add Vcs-Bzr, Vcs-Browser fields with comment for uploaders. + + -- Mathieu Trudel-Lapierre Wed, 14 Nov 2012 10:01:19 -0500 + indicator-sound (12.10.1-0ubuntu2) raring; urgency=low [ Allan LeSage ] diff --git a/debian/control b/debian/control index 18a0a38..b62a37e 100644 --- a/debian/control +++ b/debian/control @@ -19,15 +19,21 @@ Build-Depends: debhelper (>= 9.0), libnotify-dev, valac-0.18, dh-autoreconf, - dh-translations + dh-translations, + gnome-common, Standards-Version: 3.9.3 Homepage: https://launchpad.net/indicator-sound +# If you aren't a member of ~indicator-applet-developers but need to upload +# packaging changes, # just go ahead. ~indicator-applet-developers will notice +# and sync up the code again. +Vcs-Bzr: https://code.launchpad.net/~indicator-applet-developers/indicator-sound/trunk.13.04 +Vcs-Browser: https://bazaar.launchpad.net/~indicator-applet-developers/indicator-sound/trunk.13.04/files Package: indicator-sound Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, - pulseaudio + pulseaudio, Description: System sound indicator. System sound indicator which provides easy control of the PulseAudio sound daemon. -- cgit v1.2.3 From be7764ffed261cfa1f936d28825fb466dd5530be Mon Sep 17 00:00:00 2001 From: Mathieu Trudel-Lapierre Date: Wed, 14 Nov 2012 10:23:03 -0500 Subject: Reorganise Build-Depends for clarity. --- debian/control | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'debian/control') diff --git a/debian/control b/debian/control index b62a37e..b674220 100644 --- a/debian/control +++ b/debian/control @@ -4,8 +4,12 @@ Priority: extra Maintainer: Ubuntu Desktop Team XSBC-Original-Maintainer: Conor Curran Build-Depends: debhelper (>= 9.0), + dh-autoreconf, + dh-translations, quilt, + gnome-common, autotools-dev, + valac-0.18, libglib2.0-dev (>= 2.22.3), libgtk-3-dev, libdbusmenu-glib-dev (>= 0.5.90), @@ -17,10 +21,6 @@ Build-Depends: debhelper (>= 9.0), libgee-dev, libxml2-dev, libnotify-dev, - valac-0.18, - dh-autoreconf, - dh-translations, - gnome-common, Standards-Version: 3.9.3 Homepage: https://launchpad.net/indicator-sound # If you aren't a member of ~indicator-applet-developers but need to upload -- cgit v1.2.3 From ae4b903d1e9c26dc8ae93ba8965e9477ee12049a Mon Sep 17 00:00:00 2001 From: Mathieu Trudel-Lapierre Date: Wed, 14 Nov 2012 16:43:14 -0500 Subject: Remove extra # typo in notice to uploaders in debian/control. --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian/control') diff --git a/debian/control b/debian/control index b674220..320f8b7 100644 --- a/debian/control +++ b/debian/control @@ -24,7 +24,7 @@ Build-Depends: debhelper (>= 9.0), Standards-Version: 3.9.3 Homepage: https://launchpad.net/indicator-sound # If you aren't a member of ~indicator-applet-developers but need to upload -# packaging changes, # just go ahead. ~indicator-applet-developers will notice +# packaging changes, just go ahead. ~indicator-applet-developers will notice # and sync up the code again. Vcs-Bzr: https://code.launchpad.net/~indicator-applet-developers/indicator-sound/trunk.13.04 Vcs-Browser: https://bazaar.launchpad.net/~indicator-applet-developers/indicator-sound/trunk.13.04/files -- cgit v1.2.3