* Merged changes from ~ubuntu-desktop package

* Intial release.
* debian/rules
  - Changes to build targets to get it building multipass for 
    python 2.6 and 2.7 

4 files changed, 23 insertions, 21 deletions

diff --git a/debian/changelog b/debian/changelog
index 31c80a6..cf186b4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,20 @@
+libappindicator (0.2.90+r175-0ubuntu2) natty; urgency=low
+
+  * Merged changes from ~ubuntu-desktop package
+
+ -- Ken VanDine <ken.vandine@canonical.com>  Thu, 06 Jan 2011 10:03:56 -0500
+
+libappindicator (0.2.90+r175-0ubuntu1) natty; urgency=low
+
+  [ Ted Gould ]
+  * Intial release.
+
+  [ Ken VanDine ]
+  * debian/rules
+    - Changes to build targets to get it building multipass for 
+      python 2.6 and 2.7 
+
+ -- Ken VanDine <ken.vandine@canonical.com>  Fri, 10 Dec 2010 16:37:17 -0500
 indicator-application (0.2.90-0ubuntu4) natty; urgency=low
 
   * Updated for the gir abi transition
diff --git a/debian/control b/debian/control
index 02ca13c..5781aa3 100644
--- a/debian/control
+++ b/debian/control
@@ -1,4 +1,4 @@
-Source: indicator-application
+Source: libappindicator
 Section: gnome
 Priority: optional
 XS-Python-Version: all
@@ -16,8 +16,8 @@ Build-Depends: debhelper (>= 5.0),
                libindicate-dev (>= 0.2.0),
                libindicate-gtk-dev (>= 0.2.0),
                libindicator-dev (>= 0.3.14),
-               libdbusmenu-gtk-dev (>= 0.3.90),
-               libdbusmenu-glib-dev (>= 0.3.90),
+               libdbusmenu-gtk-dev (>= 0.3.90+r175),
+               libdbusmenu-glib-dev (>= 0.3.90+r175),
                cli-common-dev (>= 0.5.7),
                mono-devel (>= 2.4.3),
                gtk-sharp2-gapi,
@@ -47,13 +47,6 @@ Description: Python bindings for libappindicator
  This package provides Python bindings so that you can use libappindicator from 
  a Python program.
 
-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: libappindicator1
 Section: libs
 Architecture: any
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/rules b/debian/rules
index cfb2f4b..4c624b6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -63,28 +63,24 @@ configure-stamp:
 		$(DEB_CONFIGURE_SCRIPT) $(DEB_CONFIGURE_NORMAL_ARGS) $(DEB_CONFIGURE_EXTRA_FLAGS)
 	touch $@
 
-configure/indicator-application:: configure-stamp
+configure/libappindicator1:: configure-stamp
 
 build-stamp:
 	$(MAKE) -C $(DEB_BUILDDIR)
 	touch $@
 
-build/indicator-application:: build-stamp
+build/libappindicator1:: build-stamp
 
 install-stamp:
 	$(MAKE) -C $(DEB_BUILDDIR) install DESTDIR=$(CURDIR)/debian/tmp
 	touch $@
 
-install/indicator-application:: install-stamp
+install/libappindicator1:: 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 {} \;
-
 common-binary-predeb-arch:: list-missing
 	dh_fixperms
 	dh_strip