aboutsummaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorTed Gould <ted@gould.cx>2010-08-12 09:31:40 -0500
committerTed Gould <ted@gould.cx>2010-08-12 09:31:40 -0500
commit374ce0d9c90fb80b0fdf916a3fe170b050abb0fc (patch)
tree36d90bcb75ef8d9c4a7a07c25d16b5b30339c175 /debian
parent15f7dee1de99f6bceb4c714ef1a8ff2e7b0add09 (diff)
parent6769e30333d906eb69789aff69d58851fe08fc00 (diff)
downloadayatana-indicator-application-374ce0d9c90fb80b0fdf916a3fe170b050abb0fc.tar.gz
ayatana-indicator-application-374ce0d9c90fb80b0fdf916a3fe170b050abb0fc.tar.bz2
ayatana-indicator-application-374ce0d9c90fb80b0fdf916a3fe170b050abb0fc.zip
* Upstream Merge
* Add in ordering IDs
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog7
-rw-r--r--debian/indicator-application.install1
2 files changed, 8 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index 0921ab7..98cdd75 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+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:30:51 -0500
+
indicator-application (0.2.3-0ubuntu2~ppa5) maverick; urgency=low
* Autogen
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