diff options
author | Ted Gould <ted@canonical.com> | 2009-08-24 14:07:34 -0500 |
---|---|---|
committer | Ted Gould <ted@canonical.com> | 2009-08-24 14:07:34 -0500 |
commit | 18ad21b36433dd10124a1065d4ba6652ce1983c9 (patch) | |
tree | 2f288507bbab1494f20d871935f82a925689991c | |
parent | 9f3f886876c7d663040cc70e458acb47da0b57bd (diff) | |
parent | 58da09e028051cc6ed03de553d8bc0883760d771 (diff) | |
download | ayatana-indicator-session-18ad21b36433dd10124a1065d4ba6652ce1983c9.tar.gz ayatana-indicator-session-18ad21b36433dd10124a1065d4ba6652ce1983c9.tar.bz2 ayatana-indicator-session-18ad21b36433dd10124a1065d4ba6652ce1983c9.zip |
Merging in from the ubuntu-desktop branch
-rw-r--r-- | debian/changelog | 20 | ||||
-rw-r--r-- | debian/control | 4 |
2 files changed, 11 insertions, 13 deletions
diff --git a/debian/changelog b/debian/changelog index 62f5111..e7914c3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,18 +1,16 @@ -indicator-session (0.1~bzr17-0ubuntu1~ppa1) karmic; urgency=low - - * Merging in trunk with rename from 'sus' to 'session' - * debian/control: Switching to indicator-session and conflicting - and replacing indicator-sus - * debian/watch: Switching to indicator-session* - - -- Ted Gould <ted@ubuntu.com> Tue, 18 Aug 2009 17:07:35 -0500 - -indicator-sus (0.1-0ubuntu3~ppa1) karmic; urgency=low +indicator-session (0.1~bzr17-0ubuntu1) UNRELEASED; urgency=low + * New snapshot (LP: #417035) + * Package rename from 'indicator-sus' to 'indicator-session' * Merging in the branch that adds in the status icons to the panel. + * debian/control: + - Switching to indicator-session and conflicting + - Changed Vcs-Bzr to point to ~ubuntu-desktop + and replacing indicator-sus + * debian/watch: Switching to indicator-session* - -- Ted Gould <ted@ubuntu.com> Mon, 17 Aug 2009 09:08:53 -0500 + -- Ken VanDine <ken.vandine@canonical.com> Fri, 21 Aug 2009 12:28:13 -0400 indicator-sus (0.1-0ubuntu2) UNRELEASE; urgency=low diff --git a/debian/control b/debian/control index 4c76aa7..7d9b612 100644 --- a/debian/control +++ b/debian/control @@ -15,8 +15,8 @@ Build-Depends: debhelper (>= 5.0), intltool Standards-Version: 3.8.2 Homepage: https://launchpad.net/indicator-applet -Vcs-Bzr: lp:~ubuntu-core-dev/indicator-applet/sus-ubuntu -Vcs-Bzr-Browser: http://bazaar.launchpad.net/~ubuntu-core-dev/indicator-applet/sus-ubuntu +Vcs-Bzr: lp:~ubuntu-desktop/indicator-applet/indicator-session-ubuntu +Vcs-Bzr-Browser: http://bazaar.launchpad.net/~ubuntu-desktop/indicator-applet/indicator-session-ubuntu Package: indicator-session Architecture: any |