diff options
| author | Ted Gould <ted@canonical.com> | 2009-09-10 20:38:05 -0500 |
|---|---|---|
| committer | Ted Gould <ted@canonical.com> | 2009-09-10 20:38:05 -0500 |
| commit | 436a77d1e3be44199ff46fc9afc0b57994be05db (patch) | |
| tree | a3780b2324ddf9ce2119c5899782c1e6352a8e12 | |
| parent | a3611eae77d86da43efdf9567dba0e036e40dab4 (diff) | |
| parent | ee56ebc0caaf8a8188e8eb01fbe23478a897a967 (diff) | |
| download | ayatana-indicator-session-436a77d1e3be44199ff46fc9afc0b57994be05db.tar.gz ayatana-indicator-session-436a77d1e3be44199ff46fc9afc0b57994be05db.tar.bz2 ayatana-indicator-session-436a77d1e3be44199ff46fc9afc0b57994be05db.zip | |
Merge ubuntu-desktop work.
| -rw-r--r-- | debian/changelog | 8 | ||||
| -rw-r--r-- | debian/control | 1 |
2 files changed, 7 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog index bbee0c2..3ebae48 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,8 +8,12 @@ indicator-session (0.1.3-0ubuntu1~ppa1) UNRELEASED; urgency=low -- Ted Gould <ted@ubuntu.com> Thu, 10 Sep 2009 20:33:43 -0500 -indicator-session (0.1.2-0ubuntu1~ppa2) karmic; urgency=low +indicator-session (0.1.2-0ubuntu1) karmic; urgency=low + * debian/control: + - build-depends on libgconf2-dev + + [ Ted Gould ] * Upstream version 0.1.2 * Adds translation setup. (fixes LP: #425598) * Packaging fix to use upstream tarball. (fixes LP: #418769) @@ -17,7 +21,7 @@ indicator-session (0.1.2-0ubuntu1~ppa2) karmic; urgency=low * Adds GConf key for configure whether dialogs on shutdown and logout are shown. (fixes LP: #422025) - -- Ted Gould <ted@ubuntu.com> Tue, 08 Sep 2009 11:12:12 -0500 + -- Sebastien Bacher <seb128@ubuntu.com> Tue, 08 Sep 2009 18:15:03 +0200 indicator-session (0.1.2-0ubuntu1~ppa1) karmic; urgency=low diff --git a/debian/control b/debian/control index 43f2150..5ee9afa 100644 --- a/debian/control +++ b/debian/control @@ -5,6 +5,7 @@ Maintainer: Ubuntu Core Developers <ubuntu-devel-discuss@lists.ubuntu.com> Build-Depends: debhelper (>= 5.0), cdbs (>= 0.4.41), libgtk2.0-dev (>= 2.12.0), + libgconf2-dev, libdbus-glib-1-dev, gnome-doc-utils, scrollkeeper, |