11 files changed, 20 insertions, 44 deletions

diff --git a/debian/changelog b/debian/changelog
index e539c5c..3dc75af 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+indicator-messages (0.6.0-0ubuntu2) UNRELEASED; urgency=low
+
+  * Drop gtk2 build from the packaging since support for it was 
+    dropped in trunk, thanks Lars Uebernickel
+
+ -- Sebastien Bacher <seb128@ubuntu.com>  Wed, 20 Jun 2012 18:59:18 +0200
+
 indicator-messages (0.6.0-0ubuntu1) precise; urgency=low
 
   * New upstream release.
diff --git a/debian/control b/debian/control
index 40b8dd5..68b2d19 100644
--- a/debian/control
+++ b/debian/control
@@ -7,20 +7,16 @@ Uploaders: Evgeni Golov <evgeni@debian.org>
 Build-Depends: debhelper (>= 5.0),
                cdbs (>= 0.4.41),
                dh-autoreconf,
-               libgtk2.0-dev (>= 2.12.0),
                libgtk-3-dev,
                libdbus-glib-1-dev,
                intltool,
                libindicate-dev (>= 0.6.90),
-               libindicate-gtk-dev (>= 0.6.90),
                libindicate-gtk3-dev (>= 0.6.90),
-               libindicator-dev (>= 0.3.90),
                libindicator3-dev (>= 0.3.90),
                libdbusmenu-glib-dev (>= 0.5.90),
-               libdbusmenu-gtk-dev (>= 0.5.90),
                libdbusmenu-gtk3-dev (>= 0.5.90),
                libtelepathy-glib-dev (>= 0.9.0)
-Standards-Version: 3.9.2
+Standards-Version: 3.9.3
 Homepage: https://launchpad.net/indicator-messages
 Vcs-Bzr: http://code.launchpad.net/~ubuntu-desktop/indicator-messages/ubuntu
 Vcs-Browser: http://bazaar.launchpad.net/~ubuntu-desktop/indicator-messages/ubuntu/files
@@ -38,20 +34,6 @@ Description: indicator that collects messages that need a response
  for quick access, but without making them annoying in times that you want
  to ignore them.
 
-Package: indicator-messages-gtk2
-Architecture: any
-Depends: ${shlibs:Depends},
-         ${misc:Depends},
-         indicator-messages (= ${binary:Version})
-Recommends: indicator-applet | indicator-renderer
-Replaces: indicator-messages (<< 0.4.90)
-Breaks: indicator-applet (<< 0.3.0)
-Description: indicator that collects messages that need a response
- A place on the user's desktop that collects messages that need a response.
- This menu provides a condensed and collected view of all of those messages
- for quick access, but without making them annoying in times that you want
- to ignore them.
-
 Package: libindicator-messages-status-provider1
 Architecture: any
 Section: libs
diff --git a/debian/indicator-messages-gtk2.install b/debian/indicator-messages-gtk2.install
deleted file mode 100644
index 8d1fc9f..0000000
--- a/debian/indicator-messages-gtk2.install
+++ /dev/null
@@ -1 +0,0 @@
-debian/tmp/gtk2/usr/lib/indicators /usr/lib/
diff --git a/debian/indicator-messages.install b/debian/indicator-messages.install
index ebbf1eb..ccb15ce 100644
--- a/debian/indicator-messages.install
+++ b/debian/indicator-messages.install
@@ -1,4 +1,4 @@
-debian/tmp/gtk3/usr/lib/indicators3 /usr/lib/
-debian/tmp/gtk3/usr/lib/indicator-messages/indicator-messages-service /usr/lib/indicator-messages/
-debian/tmp/gtk3/usr/share/dbus-1 /usr/share/
-debian/tmp/gtk3/usr/share/libindicator /usr/share/
+debian/tmp/usr/lib/indicators3 /usr/lib/
+debian/tmp/usr/lib/indicator-messages/indicator-messages-service /usr/lib/indicator-messages/
+debian/tmp/usr/share/dbus-1 /usr/share/
+debian/tmp/usr/share/libindicator /usr/share/
diff --git a/debian/indicator-status-provider-emesene.install b/debian/indicator-status-provider-emesene.install
index 3a16809..c01ab0b 100644
--- a/debian/indicator-status-provider-emesene.install
+++ b/debian/indicator-status-provider-emesene.install
@@ -1 +1 @@
-debian/tmp/gtk3/usr/lib/indicator-messages/status-providers/1/libemesene.so /usr/lib/indicator-messages/status-providers/1/
+debian/tmp/usr/lib/indicator-messages/status-providers/1/libemesene.so /usr/lib/indicator-messages/status-providers/1/
diff --git a/debian/indicator-status-provider-mc5.install b/debian/indicator-status-provider-mc5.install
index e8d3f25..8778c00 100644
--- a/debian/indicator-status-provider-mc5.install
+++ b/debian/indicator-status-provider-mc5.install
@@ -1 +1 @@
-debian/tmp/gtk3/usr/lib/indicator-messages/status-providers/1/libmc5.so /usr/lib/indicator-messages/status-providers/1/
+debian/tmp/usr/lib/indicator-messages/status-providers/1/libmc5.so /usr/lib/indicator-messages/status-providers/1/
diff --git a/debian/indicator-status-provider-pidgin.install b/debian/indicator-status-provider-pidgin.install
index 701f499..45f7b9b 100644
--- a/debian/indicator-status-provider-pidgin.install
+++ b/debian/indicator-status-provider-pidgin.install
@@ -1 +1 @@
-debian/tmp/gtk3/usr/lib/indicator-messages/status-providers/1/libpidgin.so /usr/lib/indicator-messages/status-providers/1/
+debian/tmp/usr/lib/indicator-messages/status-providers/1/libpidgin.so /usr/lib/indicator-messages/status-providers/1/
diff --git a/debian/indicator-status-provider-telepathy.install b/debian/indicator-status-provider-telepathy.install
index 8a3b666..69e0964 100644
--- a/debian/indicator-status-provider-telepathy.install
+++ b/debian/indicator-status-provider-telepathy.install
@@ -1 +1 @@
-debian/tmp/gtk3/usr/lib/indicator-messages/status-providers/1/libtelepathy.so /usr/lib/indicator-messages/status-providers/1/
+debian/tmp/usr/lib/indicator-messages/status-providers/1/libtelepathy.so /usr/lib/indicator-messages/status-providers/1/
diff --git a/debian/libindicator-messages-status-provider-dev.install b/debian/libindicator-messages-status-provider-dev.install
index 1b53b59..e1fdad8 100644
--- a/debian/libindicator-messages-status-provider-dev.install
+++ b/debian/libindicator-messages-status-provider-dev.install
@@ -1,3 +1,3 @@
-debian/tmp/gtk3/usr/lib/libindicator-messages-status-provider.so /usr/lib/
-debian/tmp/gtk3/usr/include /usr/
-debian/tmp/gtk3/usr/lib/pkgconfig /usr/lib/
+debian/tmp/usr/lib/libindicator-messages-status-provider.so /usr/lib/
+debian/tmp/usr/include /usr/
+debian/tmp/usr/lib/pkgconfig /usr/lib/
diff --git a/debian/libindicator-messages-status-provider1.install b/debian/libindicator-messages-status-provider1.install
index cdf5aa3..dad5858 100644
--- a/debian/libindicator-messages-status-provider1.install
+++ b/debian/libindicator-messages-status-provider1.install
@@ -1 +1 @@
-debian/tmp/gtk3/usr/lib/libindicator-messages-status-provider.so.* /usr/lib/
+debian/tmp/usr/lib/libindicator-messages-status-provider.so.* /usr/lib/
diff --git a/debian/rules b/debian/rules
index f5faa84..8f7e68b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,23 +1,11 @@
 #!/usr/bin/make -f
 
-DEB_BUILDDIR = build
-DEB_MAKE_FLAVORS = gtk2 gtk3
-
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/gnome.mk
 include /usr/share/cdbs/1/rules/autoreconf.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
-
 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
 	cd po; intltool-update --pot --verbose