From 9c2824cd2339d7b9f33c03786444f3162a4a15c0 Mon Sep 17 00:00:00 2001
From: Evgeni Golov <evgeni@debian.org>
Date: Thu, 17 Jun 2010 11:40:13 +0200
Subject: Merge from Ubuntu. Closes: #586132

---
 debian/changelog | 7 +++++++
 debian/control   | 3 ++-
 2 files changed, 9 insertions(+), 1 deletion(-)

(limited to 'debian')

diff --git a/debian/changelog b/debian/changelog
index 2b7c7f5..55cd35c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+indicator-messages (0.3.7-1) unstable; urgency=low
+
+  * Merge from Ubuntu.
+    Closes: #586132
+
+ -- Evgeni Golov <evgeni@debian.org>  Thu, 17 Jun 2010 11:39:37 +0200
+
 indicator-messages (0.3.7-0ubuntu1~ppa1) lucid; urgency=low
 
   * New upstream release.
diff --git a/debian/control b/debian/control
index 0900501..f6e9ba8 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: indicator-messages
 Section: gnome
 Priority: optional
-Maintainer: Ubuntu Core Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+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),
                libgtk2.0-dev (>= 2.12.0),
-- 
cgit v1.2.3