Sync to Ubuntu Desktop

7 files changed, 46 insertions, 136 deletions

diff --git a/debian/changelog b/debian/changelog
index 0176c5f..5bae3da 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,16 +1,43 @@
-indicator-application (0.2.90-0ubuntu4~ppa1) natty; urgency=low
+indicator-application (0.2.91-0ubuntu2) natty; urgency=low
 
+  * debian/rules
+    - Don't ship the .la files 
+
+ -- Ken VanDine <ken.vandine@canonical.com>  Fri, 14 Jan 2011 11:42:13 -0600
+
+indicator-application (0.2.91-0ubuntu1) natty; urgency=low
+
+  [ Ted Gould ]
   * Upstream Merge
     * Removing libappindicator from the tarball
-  * Autogen
   * debian/control: Removing all libappindicator packages
 
- -- Ted Gould <ted@ubuntu.com>  Wed, 08 Dec 2010 14:26:42 -0600
+  [ Ken VanDine ]
+  * New upstream release
+    - Ported to gdbus and dbusmenu 0.4
+  * debian/control
+    - Bump build depends for dbusmenu to >= 0.3.91
+    - Bump build depends for libindicator-dev to >= 0.3.16
+    - Added build depends for libappindicator-dev >= 0.2.91
+  * debian/rules
+    - Removed all the extra build targets, we don't build those
+      packages anymore
+  * debian/copyright
+    - Removed references to LGPL sources, those moved to libappindicator
+
+ -- Ken VanDine <ken.vandine@canonical.com>  Fri, 14 Jan 2011 10:25:42 -0600
+
+indicator-application (0.2.90-0ubuntu4) natty; urgency=low
+
+  * Updated for the gir abi transition
+
+ -- Ken VanDine <ken.vandine@canonical.com>  Thu, 16 Dec 2010 10:05:55 -0500
 
-indicator-application (0.2.90-0ubuntu3) UNRELEASED; urgency=low
+indicator-application (0.2.90-0ubuntu3) natty; urgency=low
 
   * debian/control
     - build depend on dbusmenu >= 0.3.90
+    - Fixes FTBFS (LP: #684949)
 
  -- Ken VanDine <ken.vandine@canonical.com>  Wed, 08 Dec 2010 13:32:07 -0500
 
diff --git a/debian/control b/debian/control
index c843d36..62a270e 100644
--- a/debian/control
+++ b/debian/control
@@ -9,9 +9,10 @@ Build-Depends: debhelper (>= 5.0),
                libdbus-glib-1-dev (>= 0.82),
                libjson-glib-dev,
                intltool,
-               libindicator-dev (>= 0.3.14),
-               libdbusmenu-gtk-dev (>= 0.3.90),
-               libdbusmenu-glib-dev (>= 0.3.90)
+               libindicator-dev (>= 0.3.16),
+               libdbusmenu-gtk-dev (>= 0.3.91),
+               libdbusmenu-glib-dev (>= 0.3.91),
+               libappindicator-dev (>= 0.2.91)
 Standards-Version: 3.8.4
 Homepage: https://launchpad.net/indicator-application
 Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-desktop/indicator-application/ubuntu
diff --git a/debian/copyright b/debian/copyright
index ba92c05..fcfcc8a 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -9,7 +9,7 @@ Upstream Author:
 
 Copyright:
 
-    Copyright (C) 2009 Canonical Ltd.
+    Copyright (C) 2009-2010 Canonical Ltd.
 
 License:
 
@@ -26,35 +26,5 @@ License:
   along with this program; if not, write to the Free Software
   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 
-Two files (app-indicator.c and app-indicator.h) are under:
-
-  1) the GNU Lesser General Public License version 3, as published by the
-     Free Software Foundation; and/or
-  2) the GNU Lesser General Public License version 2.1, as published by
-     the Free Software Foundation.
-
-  This program is distributed in the hope that it will be useful, but
-  WITHOUT ANY WARRANTY; without even the implied warranties of
-  MERCHANTABILITY, SATISFACTORY QUALITY or FITNESS FOR A PARTICULAR
-  PURPOSE.  See the applicable version of the GNU Lesser General Public
-  License for more details.
-
-  This library is free software; you can redistribute it and/or
-  modify it under the terms of the GNU Lesser General Public
-  License as published by the Free Software Foundation; either
-  version 2.1 of the License, or (at your option) any later version.
-
-  This library 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
-  Lesser General Public License for more details.
-
-  You should have received a copy of the GNU Lesser General Public
-  License along with this library; if not, write to the
-  Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-  Boston, MA 02110-1301 USA
-
-On Debian/Ubuntu systems, the full text of the LGPL v2.1 can be found in
-`/usr/share/common-licenses/LGPL-2.1', the full text of the LGPL v3 can be found in
-`/usr/share/common-licenses/LGPL-3, and the full text of the GPL v3 can be
-found in `/usr/share/common-licenses/GPL-3'
+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/gir1.0-appindicator-0.1.install b/debian/gir1.0-appindicator-0.1.install
deleted file mode 100644
index 0791348..0000000
--- a/debian/gir1.0-appindicator-0.1.install
+++ /dev/null
@@ -1 +0,0 @@
-debian/tmp/usr/lib/girepository-1.0/*
diff --git a/debian/indicator-application.install b/debian/indicator-application.install
deleted file mode 100644
index c525a81..0000000
--- a/debian/indicator-application.install
+++ /dev/null
@@ -1,4 +0,0 @@
-debian/tmp/usr/lib/indicators/*
-debian/tmp/usr/lib/indicator-application/indicator-application-service
-debian/tmp/usr/share/dbus-1/services/indicator-application.service
-debian/tmp/usr/share/indicator-application/ordering-override.keyfile
diff --git a/debian/python-appindicator.install b/debian/python-appindicator.install
deleted file mode 100644
index 00bdd51..0000000
--- a/debian/python-appindicator.install
+++ /dev/null
@@ -1,2 +0,0 @@
-debian/tmp/usr/lib/python2.*
-debian/tmp/usr/share/pygtk/*
diff --git a/debian/rules b/debian/rules
index cfb2f4b..dd456c1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,97 +1,16 @@
 #!/usr/bin/make -f
 
-DEB_SRCDIR = .
-DEB_BUILDDIR = $(DEB_SRCDIR)/build
-
-DEB_PYTHON_SYSTEM=dh_python2
-PY_VERSIONS = $(shell pyversions --requested debian/control)
-export MONO_SHARED_DIR=$(CURDIR)
-export CSC=/usr/bin/mono-csc
-
 include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/autotools-vars.mk
+include /usr/share/cdbs/1/class/gnome.mk
 include /usr/share/cdbs/1/rules/utils.mk
 
-DEB_CONFIGURE_EXTRA_FLAGS += --enable-gtk-doc
-API_VERSION = 0.1
-
-DEB_DH_MAKESHLIBS_ARGS_libappindicator1 := -V 'libappindicator1 (>= 0.0.19)'
-
-configure-stamp-%:
-	mkdir build-$*
-	cd build-$* && PYTHON=`which $*` \
-		$(DEB_CONFIGURE_SCRIPT) $(DEB_CONFIGURE_NORMAL_ARGS) --srcdir=..
-	touch $@
-
-configure/python-appindicator:: $(addprefix configure-stamp-, $(PY_VERSIONS))
-
-build-stamp-%:
-	PYTHON=`which $*` \
-		$(MAKE) -C build-$*
-	touch $@
-
-build/python-appindicator:: $(addprefix build-stamp-, $(PY_VERSIONS))
-
-install-stamp-%:
-	PYTHON=`which $*` \
-		$(MAKE) -C build-$*/bindings/python install DESTDIR=$(CURDIR)/debian/tmp
-	dh_installdirs -ppython-appindicator -s
-	dh_install -ppython-appindicator -s
-	touch $@
-
-install/python-appindicator:: $(addprefix install-stamp-, $(PY_VERSIONS))
-
-binary-predeb/python-appindicator::
-	dh_python2 -ppython-appindicator
-	find debian/python-appindicator/usr/lib -name \*.la -exec rm {} \;
-	find debian/python-appindicator/usr/lib -name \*.a -exec rm {} \;
-
-binary-install/libappindicator0.1-cil::
-	dh_clistrip
-	dh_clifixperms
-	dh_makeclilibs -V
-	dh_installcligac
-
-binary-predeb/gir1.0-appindicator-0.1::
-	dh_girepository -p$(cdbs_curpkg)
-
-binary-predeb/libappindicator0.1-cil:: binary-fixup/libappindicator1
-	dh_clideps -plibappindicator0.1-cil
-
-configure-stamp:
-	cd $(DEB_BUILDDIR) && \
-		$(DEB_CONFIGURE_SCRIPT) $(DEB_CONFIGURE_NORMAL_ARGS) $(DEB_CONFIGURE_EXTRA_FLAGS)
-	touch $@
-
-configure/indicator-application:: configure-stamp
-
-build-stamp:
-	$(MAKE) -C $(DEB_BUILDDIR)
-	touch $@
-
-build/indicator-application:: build-stamp
-
-install-stamp:
-	$(MAKE) -C $(DEB_BUILDDIR) install DESTDIR=$(CURDIR)/debian/tmp
-	touch $@
-
-install/indicator-application:: install-stamp
-
-binary-predeb/libappindicator1:: install-stamp
-	dh_fixperms
-	dh_strip
-
-binary-post-install/indicator-application::
-	find debian/indicator-application/usr/lib -name \*.la -exec rm {} \;
-	find debian/indicator-application/usr/lib -name \*.a -exec rm {} \;
+LDFLAGS += -Wl,-z,defs -Wl,--as-needed
 
 common-binary-predeb-arch:: list-missing
-	dh_fixperms
-	dh_strip
 
-clean::
-	-rm -rf $(addprefix build-, $(PY_VERSIONS))
-	-rm -rf $(addprefix configure-stamp-, $(PY_VERSIONS))
-	-rm -rf $(addprefix build-stamp-, $(PY_VERSIONS))
-	-rm -rf $(addprefix install-stamp-, $(PY_VERSIONS))
-	rm -rf $(MONO_SHARED_DIR)/.wapi
+DEB_DH_MAKESHLIBS_ARGS = -Xusr/lib/indicators
+
+binary-install/indicator-application::
+	# remove .a/.la clutter
+	rm -f debian/$(cdbs_curpkg)/usr/lib/indicators/*/*.a
+	rm -f debian/$(cdbs_curpkg)/usr/lib/indicators/*/*.la