3 files changed, 19 insertions, 5 deletions
diff --git a/debian/changelog b/debian/changelog
index f02dc91..5d922a9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+indicator-messages (0.4.0-1) unstable; urgency=low
+
+  * Merge new upstream from Ubuntu.
+
+ -- Evgeni Golov <evgeni@debian.org>  Sun, 05 Jun 2011 13:13:40 +0200
+
 indicator-messages (0.4.0-0ubuntu1) natty; urgency=low
 
   * New upstream release.
@@ -8,6 +14,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 e299361..fba48e2 100644
--- a/debian/control
+++ b/debian/control
@@ -1,8 +1,7 @@
 Source: indicator-messages
 Section: gnome
 Priority: optional
-Maintainer: Ubuntu Core Developers <ubuntu-devel-discuss@lists.ubuntu.com>
-XSBC-Original-Maintainer: The Ayatana Packagers <pkg-ayatana-devel@lists.alioth.debian.org>
+Maintainer: The Ayatana Packagers <pkg-ayatana-devel@lists.alioth.debian.org>
 Uploaders: Evgeni Golov <evgeni@debian.org>
 Build-Depends: debhelper (>= 5.0),
                cdbs (>= 0.4.41),
@@ -18,8 +17,8 @@ Build-Depends: debhelper (>= 5.0),
                libdbusmenu-glib-dev (>= 0.3.94)
 Standards-Version: 3.9.1
 Homepage: https://launchpad.net/indicator-messages
-Vcs-Bzr: http://code.launchpad.net/~ubuntu-desktop/indicator-messages/ubuntu
-Vcs-Browser: http://bazaar.launchpad.net/~ubuntu-desktop/indicator-messages/ubuntu/files
+Vcs-Bzr: http://bzr.debian.org/bzr/pkg-ayatana/indicator-messages/debian
+Vcs-Browser: http://bzr.debian.org/loggerhead/pkg-ayatana/indicator-messages/debian
 
 Package: indicator-messages
 Architecture: any
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