* New upstream release:

  - Require GTK3 in Indicators (lp: #996607)
* Dropped GTK2 build
* Updated packaging to the current standards

7 files changed, 48 insertions, 73 deletions

diff --git a/debian/changelog b/debian/changelog
index f16d2b8..42d1f50 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+indicator-application (12.10.0-0ubuntu1) UNRELEASED; urgency=low
+
+  * New upstream release:
+    - Require GTK3 in Indicators (lp: #996607)
+  * Dropped GTK2 build
+  * Updated packaging to the current standards
+
+ -- Sebastien Bacher <seb128@ubuntu.com>  Wed, 22 Aug 2012 13:41:13 +0200
+
 indicator-application (0.5.0-0ubuntu1) precise; urgency=low
 
   * New upstream release.
diff --git a/debian/compat b/debian/compat
index 7ed6ff8..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-5
+9
diff --git a/debian/control b/debian/control
index b25bb5a..8050c9e 100644
--- a/debian/control
+++ b/debian/control
@@ -1,39 +1,25 @@
 Source: indicator-application
 Section: gnome
 Priority: optional
-XS-Python-Version: all
 Maintainer: Ubuntu Desktop Team <ubuntu-desktop@lists.ubuntu.com>
-Build-Depends: debhelper (>= 5.0),
-               cdbs (>= 0.4.41),
-               libgtk2.0-dev (>= 2.12.0),
+Build-Depends: debhelper (>= 9.0),
+               dh-translations,
                libgtk-3-dev (>= 2.91),
                libdbus-glib-1-dev (>= 0.82),
                libjson-glib-dev,
                intltool,
-               libappindicator-dev (>= 0.2.91),
                libappindicator3-dev (>= 0.2.91),
-               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)
-Standards-Version: 3.9.2
+Standards-Version: 3.9.3
 Homepage: https://launchpad.net/indicator-application
 Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-desktop/indicator-application/ubuntu
 
 Package: indicator-application
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: Application Indicators
- A library and indicator to take menus from applications and place them in
- the panel.
-
-Package: indicator-application-gtk2
-Architecture: any
-Depends: ${shlibs:Depends},
-         ${misc:Depends},
-         indicator-application (= ${binary:Version})
-Replaces: indicator-application (<< 0.3.90)
+Depends: ${shlibs:Depends}, 
+         ${misc:Depends}
 Description: Application Indicators
  A library and indicator to take menus from applications and place them in
  the panel.
diff --git a/debian/copyright b/debian/copyright
index fcfcc8a..68a49fd 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,30 +1,28 @@
-This package was debianized by Robert Collins <robert@canonical.com> on
-Thu, 29 Oct 2009 15:44:14 +1100
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: indicator-application
+Source: http://launchpad.net/indicator-application
+
+Files: *
+Copyright: 2009-2012, Canonical Ltd.
+License: GPL-3
+
+Files: debian/*
+Copyright: 2009-2012, Canonical Ltd.
+License: GPL-3
+
+License: GPL-3
+ This package is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; version 3 of the License.
+ .
+ This package is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>
+ .
+ On Debian systems, the complete text of the GNU General
+ Public License version 3 can be found in "/usr/share/common-licenses/GPL-3".
 
-It was downloaded from <http://launchpad.net/indicator-application/>
-
-Upstream Author:
-
-    Ted Gould <ted@canonical.com>
-
-Copyright:
-
-    Copyright (C) 2009-2010 Canonical Ltd.
-
-License:
-
-  This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation, version 3 of the License.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
-
-On Debian/Ubuntu systems, the full text of the GPL v3 can be found in
-`/usr/share/common-licenses/GPL-3'
diff --git a/debian/indicator-application-gtk2.install b/debian/indicator-application-gtk2.install
deleted file mode 100644
index 8d1fc9f..0000000
--- a/debian/indicator-application-gtk2.install
+++ /dev/null
@@ -1 +0,0 @@
-debian/tmp/gtk2/usr/lib/indicators /usr/lib/
diff --git a/debian/indicator-application.install b/debian/indicator-application.install
deleted file mode 100644
index 19a45de..0000000
--- a/debian/indicator-application.install
+++ /dev/null
@@ -1 +0,0 @@
-debian/tmp/gtk3/usr /
diff --git a/debian/rules b/debian/rules
index 0c35db9..8e07208 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,25 +1,9 @@
 #!/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
-
-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
-
-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
-	cd po; intltool-update --pot --verbose
+%:
+	dh $@ --with translations
 
+override_dh_install:
+	find debian/indicator-application/usr/lib -name *.la -delete
+	find debian/indicator-application/usr/lib -name *.a -delete
+	dh_install --fail-missing