diff options
| author | Ted Gould <ted@gould.cx> | 2011-07-17 21:24:30 -0500 |
|---|---|---|
| committer | Ted Gould <ted@gould.cx> | 2011-07-17 21:24:30 -0500 |
| commit | d7e5e470e3abc7b1ef9c1854b4078f4952642615 (patch) | |
| tree | 377595ad973b399b95c03cd7196a8fbe19c27008 /debian | |
| parent | 1abb5d8d40f9c1fe7d554ae24608432fad226183 (diff) | |
| parent | c209314fabefb37157663a0b7e3f39c7d0a71b2e (diff) | |
| download | ayatana-indicator-messages-d7e5e470e3abc7b1ef9c1854b4078f4952642615.tar.gz ayatana-indicator-messages-d7e5e470e3abc7b1ef9c1854b4078f4952642615.tar.bz2 ayatana-indicator-messages-d7e5e470e3abc7b1ef9c1854b4078f4952642615.zip | |
Merging from Debian
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 16 | ||||
| -rw-r--r-- | debian/control | 2 | ||||
| -rw-r--r-- | debian/copyright | 2 |
3 files changed, 18 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog index 3ab87f5..684e194 100644 --- a/debian/changelog +++ b/debian/changelog @@ -52,6 +52,13 @@ indicator-messages (0.4.90-0ubuntu1) oneiric; urgency=low -- Ken VanDine <ken.vandine@canonical.com> Wed, 22 Jun 2011 12:34:43 -0400 +indicator-messages (0.4.0-1) unstable; urgency=low + + * Merge new upstream from Ubuntu. + * Standards-Version: 3.9.2 + + -- Evgeni Golov <evgeni@debian.org> Sun, 05 Jun 2011 13:16:03 +0200 + indicator-messages (0.4.0-0ubuntu1) natty; urgency=low * New upstream release. @@ -62,6 +69,15 @@ indicator-messages (0.4.0-0ubuntu1) natty; urgency=low -- Ted Gould <ted@ubuntu.com> Thu, 07 Apr 2011 12:35:36 -0500 +indicator-messages (0.3.92-1) unstable; urgency=low + + * Merge new upstream from Ubuntu. + * Fix 0.3.11-0ubuntu3 changelog entry (missed a space), so that + bzr builddeb won't go crazy (see Debian Bug #620242) + * Fix debian/copyright, was refering to libdbusmenu by mistake. + + -- Evgeni Golov <evgeni@debian.org> Sun, 03 Apr 2011 13:37:33 +0200 + indicator-messages (0.3.92-0ubuntu3) natty; urgency=low * debian/patches/lp_690668.patch diff --git a/debian/control b/debian/control index 605f65b..dc8e19b 100644 --- a/debian/control +++ b/debian/control @@ -1,7 +1,7 @@ Source: indicator-messages Section: gnome Priority: optional -Maintainer: Ubuntu Core Developers <ubuntu-devel-discuss@lists.ubuntu.com> +Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com> XSBC-Original-Maintainer: The Ayatana Packagers <pkg-ayatana-devel@lists.alioth.debian.org> Uploaders: Evgeni Golov <evgeni@debian.org> Build-Depends: debhelper (>= 5.0), diff --git a/debian/copyright b/debian/copyright index 8bb99ba..ba41392 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,5 +1,5 @@ Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=135 -Name: libdbusmenu +Name: indicator-messages Maintainer: Ted Gould <ted@canonical.com> Source: https://launchpad.net/indicator-messages |