aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTed Gould <ted@gould.cx>2010-01-08 15:54:43 -0600
committerTed Gould <ted@gould.cx>2010-01-08 15:54:43 -0600
commita7e0e795012857968170fd3c331d3fe37d11b71e (patch)
tree35d7a64460b83295fdc84525cf0c4aea93769053
parent21f677f00decc48e2e635844d16d5b6ae0ee486c (diff)
parent60e78aa5b49972bb34b5049d2d54e1be4b7ad992 (diff)
downloadayatana-indicator-application-a7e0e795012857968170fd3c331d3fe37d11b71e.tar.gz
ayatana-indicator-application-a7e0e795012857968170fd3c331d3fe37d11b71e.tar.bz2
ayatana-indicator-application-a7e0e795012857968170fd3c331d3fe37d11b71e.zip
Merging with the desktop branch
-rw-r--r--debian/changelog32
-rw-r--r--debian/control4
-rw-r--r--debian/libappindicator0-cil.install1
3 files changed, 18 insertions, 19 deletions
diff --git a/debian/changelog b/debian/changelog
index e103081..04121e1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-indicator-application (0.0.6-0ubuntu1~ppa6) karmic; urgency=low
+indicator-application (0.0.6-0ubuntu2~ppa6) karmic; urgency=low
* Upstream merge:
* Making the Notification Watcher register for it's own DBus
@@ -6,7 +6,7 @@ indicator-application (0.0.6-0ubuntu1~ppa6) karmic; urgency=low
-- Ted Gould <ted@ubuntu.com> Fri, 08 Jan 2010 15:44:47 -0600
-indicator-application (0.0.6-0ubuntu1~ppa5) karmic; urgency=low
+indicator-application (0.0.6-0ubuntu2~ppa5) karmic; urgency=low
* Upstream merge:
* Adding support for icons changing through the service and
@@ -16,14 +16,14 @@ indicator-application (0.0.6-0ubuntu1~ppa5) karmic; urgency=low
-- Ted Gould <ted@ubuntu.com> Fri, 08 Jan 2010 15:39:49 -0600
-indicator-application (0.0.6-0ubuntu1~ppa4) karmic; urgency=low
+indicator-application (0.0.6-0ubuntu2~ppa4) karmic; urgency=low
* Upstream update
* Adding in icon path support.
-- Ted Gould <ted@ubuntu.com> Fri, 08 Jan 2010 11:08:40 -0600
-indicator-application (0.0.6-0ubuntu1~ppa3) karmic; urgency=low
+indicator-application (0.0.6-0ubuntu2~ppa3) karmic; urgency=low
* Upstream update
* Switching DBus interface to org.freedesktop
@@ -31,7 +31,7 @@ indicator-application (0.0.6-0ubuntu1~ppa3) karmic; urgency=low
-- Ted Gould <ted@ubuntu.com> Fri, 08 Jan 2010 11:02:09 -0600
-indicator-application (0.0.6-0ubuntu1~ppa2) karmic; urgency=low
+indicator-application (0.0.6-0ubuntu2~ppa2) karmic; urgency=low
* Upstream update
* Adding ChangeLog to dist
@@ -39,21 +39,15 @@ indicator-application (0.0.6-0ubuntu1~ppa2) karmic; urgency=low
-- Ted Gould <ted@ubuntu.com> Thu, 07 Jan 2010 13:58:33 -0600
-indicator-application (0.0.6-0ubuntu1~ppa1) karmic; urgency=low
+indicator-application (0.0.6-0ubuntu1) UNRELEASED; urgency=low
* Upstream release 0.0.6
- * Keeping a constant signature for the library instead of
- building it each time.
-
- -- Ted Gould <ted@ubuntu.com> Thu, 17 Dec 2009 14:45:50 -0600
-
-indicator-application (0.0.5-0ubuntu1~ppa1) karmic; urgency=low
-
- * Upstream release 0.0.5
* Include Python binding
* Include Mono binding
* Minor bug fixes
- * Fixing when menus are set twice. (LP: #497812)
+ * Fixing when menus are set twice. (LP: #497812)
+ * Keeping a constant signature for the library instead of
+ building it each time.
* debian/control, debian/python-appindicator.install: Building
a binary package for the python bindings.
* debian/control: Adding python building build deps
@@ -61,12 +55,16 @@ indicator-application (0.0.5-0ubuntu1~ppa1) karmic; urgency=low
a binary package for the Mono bindings.
* debian/control: Adding Mono building build deps
- [ Ken VanDine ]
+ [Ken VanDine]
+ * Added mono bindings
+ - debian/libappindicator0-cil.install
+ - debian/libappindicator0-cil-dev.install
+ - debian/control
* debian/rules
- don't use gnome.mk, specify all the targets to build python
bindings for each supported python version
- -- Ted Gould <ted@ubuntu.com> Thu, 17 Dec 2009 13:21:47 -0600
+ -- Ted Gould <ted@ubuntu.com> Thu, 17 Dec 2009 14:45:50 -0600
indicator-application (0.0.4-0ubuntu2) lucid; urgency=low
diff --git a/debian/control b/debian/control
index 6df04a7..7e9550c 100644
--- a/debian/control
+++ b/debian/control
@@ -22,8 +22,8 @@ Build-Depends: debhelper (>= 5.0),
mono-devel (>= 2.0.1),
gtk-sharp2-gapi,
libmono-dev,
- libgtk2.0-cil,
- nunit
+ libnunit2.4-cil,
+ libgtk2.0-cil
Standards-Version: 3.8.3
Homepage: https://launchpad.net/indicator-application
Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-desktop/indicator-application/ubuntu
diff --git a/debian/libappindicator0-cil.install b/debian/libappindicator0-cil.install
index 17c04e9..6158914 100644
--- a/debian/libappindicator0-cil.install
+++ b/debian/libappindicator0-cil.install
@@ -1 +1,2 @@
debian/tmp/usr/lib/appindicator-sharp-0.1/*
+debian/tmp/usr/lib/mono/*