5 files changed, 53 insertions, 6 deletions
diff --git a/debian/changelog b/debian/changelog
index d368614..aba04e3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,52 @@ indicator-application (0.2.3-0ubuntu2) maverick; urgency=low
 
  -- Sebastien Bacher <seb128@ubuntu.com>  Wed, 11 Aug 2010 11:07:51 +0200
 
+indicator-application (0.2.3-0ubuntu2~ppa6) maverick; urgency=low
+
+  * Upstream Merge
+    * Add in ordering IDs
+
+ -- Ted Gould <ted@ubuntu.com>  Thu, 12 Aug 2010 09:36:12 -0500
+
+indicator-application (0.2.3-0ubuntu2~ppa5) maverick; urgency=low
+
+  * Autogen
+
+ -- Ted Gould <ted@ubuntu.com>  Wed, 11 Aug 2010 09:19:46 -0500
+
+indicator-application (0.2.3-0ubuntu2~ppa4) maverick; urgency=low
+
+  * Upstream Merge
+    * Breaking the ABI in order to get more space in the class
+      structure.
+  * debian/control: Moving libappindicator0 to libappindicator1
+  * debian/rules: Moving libappindicator0 to libappindicator1
+
+ -- Ted Gould <ted@ubuntu.com>  Tue, 10 Aug 2010 10:08:27 -0500
+
+indicator-application (0.2.3-0ubuntu2~ppa3) maverick; urgency=low
+
+  * Upstream Merge
+    * Adding label support into the library
+    * Adding label support into the indicator
+  * Autogen
+
+ -- Ted Gould <ted@ubuntu.com>  Tue, 10 Aug 2010 09:31:57 -0500
+
+indicator-application (0.2.3-0ubuntu2~ppa1) lucid; urgency=low
+
+  * Upstream Merge
+    * Allow the icon theme path to be changed dynamically (LP: #607831)
+
+ -- Ted Gould <ted@ubuntu.com>  Thu, 05 Aug 2010 16:12:10 -0500
+
+indicator-application (0.2.3-0ubuntu2~ppa1~label2) lucid; urgency=low
+
+  * Upstream Merge
+    * Fixing the check of the function signature
+
+ -- Ted Gould <ted@ubuntu.com>  Wed, 04 Aug 2010 15:27:43 -0500
+
 indicator-application (0.2.3-0ubuntu1) maverick; urgency=low
 
   * New upstream release.
diff --git a/debian/control b/debian/control
index 8ea4878..bfd75b6 100644
--- a/debian/control
+++ b/debian/control
@@ -41,7 +41,7 @@ XB-Python-Version: ${python:Versions}
 Depends: ${shlibs:Depends},
          ${misc:Depends},
          ${python:Depends},
-         libappindicator0 (= ${binary:Version}),
+         libappindicator1 (= ${binary:Version}),
          python-gobject
 Provides: ${python:Provides}
 Description: Python bindings for libappindicator
@@ -55,7 +55,7 @@ Description: Application Indicators
  A library and indicator to take menus from applications and place them in
  the panel.
 
-Package: libappindicator0
+Package: libappindicator1
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends},
@@ -74,7 +74,7 @@ Depends: ${shlibs:Depends},
          ${misc:Depends},
          libdbusmenu-glib-dev (>= 0.1.8),
          libdbus-glib-1-dev (>= 0.76),
-         libappindicator0 (= ${binary:Version})
+         libappindicator1 (= ${binary:Version})
 Description: Application Indicators
  A library and indicator to take menus from applications and place them in
  the panel.
@@ -129,7 +129,7 @@ Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends},
          ${gir:Depends}
-Description: Typelib files for libappindicator0.
+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/indicator-application.install b/debian/indicator-application.install
index 4429197..c525a81 100644
--- a/debian/indicator-application.install
+++ b/debian/indicator-application.install
@@ -1,3 +1,4 @@
 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/libappindicator0.install b/debian/libappindicator1.install
index a0b5976..a0b5976 100644
--- a/debian/libappindicator0.install
+++ b/debian/libappindicator1.install
diff --git a/debian/rules b/debian/rules
index f34e925..6e31d41 100755
--- a/debian/rules
+++ b/debian/rules
@@ -13,7 +13,7 @@ include /usr/share/cdbs/1/rules/simple-patchsys.mk
 DEB_CONFIGURE_EXTRA_FLAGS += --enable-gtk-doc
 API_VERSION = 0.1
 
-DEB_DH_MAKESHLIBS_ARGS_libappindicator0 := -V 'libappindicator0 (>= 0.0.19)'
+DEB_DH_MAKESHLIBS_ARGS_libappindicator1 := -V 'libappindicator1 (>= 0.0.19)'
 
 configure-stamp-%:
 	mkdir build-$*
@@ -47,7 +47,7 @@ binary-install/libappindicator0.1-cil::
 binary-predeb/gir1.0-appindicator-0.1::
 	dh_girepository -p$(cdbs_curpkg)
 
-binary-predeb/libappindicator0.1-cil:: binary-fixup/libappindicator0
+binary-predeb/libappindicator0.1-cil:: binary-fixup/libappindicator1
 	dh_clideps -plibappindicator0.1-cil
 
 configure-stamp: