* Drop GTK2 build since ido stopped providing support for that version

* debian/control: build with the current vala version

5 files changed, 10 insertions, 31 deletions

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 <seb128@ubuntu.com>  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