* Upstream Merge

  * Removing libappindicator from the tarball
* Autogen
* debian/control: Removing all libappindicator packages

8 files changed, 10 insertions, 122 deletions

diff --git a/debian/changelog b/debian/changelog
index 643534e..e974928 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+indicator-application (0.2.90-0ubuntu4~ppa1) UNRELEASED; urgency=low
+
+  * Upstream Merge
+    * Removing libappindicator from the tarball
+  * Autogen
+  * debian/control: Removing all libappindicator packages
+
+ -- Ted Gould <ted@ubuntu.com>  Wed, 08 Dec 2010 14:10:22 -0600
+
 indicator-application (0.2.90-0ubuntu3) UNRELEASED; urgency=low
 
   * debian/control
diff --git a/debian/control b/debian/control
index 44e5ea1..c843d36 100644
--- a/debian/control
+++ b/debian/control
@@ -8,45 +8,14 @@ Build-Depends: debhelper (>= 5.0),
                libgtk2.0-dev (>= 2.12.0),
                libdbus-glib-1-dev (>= 0.82),
                libjson-glib-dev,
-               gnome-doc-utils,
-               gtk-doc-tools,
                intltool,
-               python-all-dev,
-               python-gtk2-dev,
-               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),
-               cli-common-dev (>= 0.5.7),
-               mono-devel (>= 2.4.3),
-               gtk-sharp2-gapi,
-               libmono-dev,
-               libnunit-cil-dev,
-               libgtk2.0-cil-dev,
-               gobject-introspection,
-               libgirepository1.0-dev,
-               gir1.0-glib-2.0,
-               gir1.0-gtk-2.0,
-               valac-0.12
+               libdbusmenu-glib-dev (>= 0.3.90)
 Standards-Version: 3.8.4
 Homepage: https://launchpad.net/indicator-application
 Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-desktop/indicator-application/ubuntu
 
-Package: python-appindicator
-Section: python
-Architecture: any
-XB-Python-Version: ${python:Versions}
-Depends: ${shlibs:Depends},
-         ${misc:Depends},
-         ${python:Depends},
-         libappindicator1 (= ${binary:Version}),
-         python-gobject
-Provides: ${python:Provides}
-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}
@@ -54,81 +23,3 @@ Description: Application Indicators
  A library and indicator to take menus from applications and place them in
  the panel.
 
-Package: libappindicator1
-Section: libs
-Architecture: any
-Depends: ${shlibs:Depends},
-         ${misc:Depends}
-Recommends: indicator-application (= ${binary:Version})
-Description: Application Indicators
- A library and indicator to take menus from applications and place them in
- the panel.
- .
- This package contains shared libraries to be used by applications.
-
-Package: libappindicator-dev
-Section: libdevel
-Architecture: any
-Depends: ${shlibs:Depends},
-         ${misc:Depends},
-         libdbusmenu-glib-dev (>= 0.1.8),
-         libdbus-glib-1-dev (>= 0.76),
-         libappindicator1 (= ${binary:Version})
-Description: Application Indicators
- A library and indicator to take menus from applications and place them in
- the panel.
- .
- This package contains files that are needed to build applications.
-
-Package: libappindicator-doc
-Section: doc
-Architecture: all
-Depends: ${shlibs:Depends},
-         ${misc:Depends}
-Description:  Application Indicators
- A library and indicator to take menus from applications and place them in
- the panel.
- .
- This package contains developer documentation.
-
-Package: libappindicator0.1-cil
-Section: cli-mono
-Architecture: all
-Replaces: libappindicator0-cil (<= 0.0.19-0ubuntu4),
-          libappindicator0.0-cil (<= 0.2.0-0ubuntu4)
-Conflicts: libappindicator0-cil (<= 0.0.19-0ubuntu4)
-Provides: libappindicator0.0-cil
-Depends: ${shlibs:Depends},
-         ${misc:Depends},
-         ${cli:Depends}
-Description: CLI bindings for libappindicator
- This package provides the appindicator-sharp assembly that allows CLI (.NET)
- programs to take menus from applications and place them in the panel.
- .
- This package contains assemblies to be used by applications.
-
-Package: libappindicator0.1-cil-dev
-Section: libdevel
-Architecture: all
-Replaces: libappindicator-cil-dev (<= 0.0.19-0ubuntu4)
-Conflicts: libappindicator-cil-dev (<= 0.0.19-0ubuntu4)
-Depends: ${shlibs:Depends},
-         ${misc:Depends},
-         ${cli:Depends},
-         libappindicator0.1-cil (= ${binary:Version})
-Description: Application Indicators
- A library and indicator to take menus from applications and place them in
- the panel.
- .
- This package contains files that are needed to build applications.
-
-Package: gir1.0-appindicator-0.1
-Section: libs
-Architecture: any
-Depends: ${shlibs:Depends},
-         ${misc:Depends},
-         ${gir:Depends}
-Description: Typelib files for libappindicator1.
- .
- This package can be used by other packages using the GIRepository format
- to generate dynamic bindings.
diff --git a/debian/libappindicator-dev.install b/debian/libappindicator-dev.install
deleted file mode 100644
index 28598a4..0000000
--- a/debian/libappindicator-dev.install
+++ /dev/null
@@ -1,5 +0,0 @@
-debian/tmp/usr/include/libappindicator-0.1/*
-debian/tmp/usr/lib/libappindicator.so
-debian/tmp/usr/lib/pkgconfig/appindicator-0.1.pc
-debian/tmp/usr/share/gir-1.0/*
-debian/tmp/usr/share/vala/vapi/*
diff --git a/debian/libappindicator-doc.install b/debian/libappindicator-doc.install
deleted file mode 100644
index 313fe33..0000000
--- a/debian/libappindicator-doc.install
+++ /dev/null
@@ -1 +0,0 @@
-debian/tmp/usr/share/gtk-doc/html/libappindicator/*
diff --git a/debian/libappindicator0.1-cil-dev.install b/debian/libappindicator0.1-cil-dev.install
deleted file mode 100644
index 6185943..0000000
--- a/debian/libappindicator0.1-cil-dev.install
+++ /dev/null
@@ -1 +0,0 @@
-debian/tmp/usr/lib/pkgconfig/appindicator-sharp-0.1.pc
diff --git a/debian/libappindicator0.1-cil.install b/debian/libappindicator0.1-cil.install
deleted file mode 100644
index 106b727..0000000
--- a/debian/libappindicator0.1-cil.install
+++ /dev/null
@@ -1 +0,0 @@
-debian/tmp/usr/lib/cli/appindicator-sharp-0.1/* 
diff --git a/debian/libappindicator0.1-cil.installcligac b/debian/libappindicator0.1-cil.installcligac
deleted file mode 100644
index f3e5bfc..0000000
--- a/debian/libappindicator0.1-cil.installcligac
+++ /dev/null
@@ -1,3 +0,0 @@
-/usr/lib/cli/appindicator-sharp-0.1/appindicator-sharp.dll
-/usr/lib/cli/appindicator-sharp-0.1/policy.0.0.appindicator-sharp.dll
-/usr/lib/cli/appindicator-sharp-0.1/policy.0.1.appindicator-sharp.dll
diff --git a/debian/libappindicator1.install b/debian/libappindicator1.install
deleted file mode 100644
index a0b5976..0000000
--- a/debian/libappindicator1.install
+++ /dev/null
@@ -1 +0,0 @@
-debian/tmp/usr/lib/libappindicator.so.*