From aaf2c098253373978f5a42fedc37ead470d0bea9 Mon Sep 17 00:00:00 2001
From: unknown <sargentd@die-welt.net>
Date: Tue, 15 Jun 2010 19:27:15 +0200
Subject: Merge from Ubuntu.

* debian/control:
  - Set Maintainer to pkg-ayatana.
  - Add myself as Uploader.
---
 debian/changelog | 9 +++++++++
 debian/control   | 3 ++-
 2 files changed, 11 insertions(+), 1 deletion(-)

(limited to 'debian')

diff --git a/debian/changelog b/debian/changelog
index 773863f..5979a5f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+libdbusmenu (0.3.2-1) unstable; urgency=low
+
+  * Merge from Ubuntu.
+  * debian/control:
+    - Set Maintainer to pkg-ayatana.
+    - Add myself as Uploader.
+
+ -- Evgeni Golov <evgeni@debian.org>  Tue, 15 Jun 2010 19:25:56 +0200
+
 libdbusmenu (0.3.2-0ubuntu1) maverick; urgency=low
 
   * debian/control
diff --git a/debian/control b/debian/control
index 9ddb90b..44fcfb9 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: libdbusmenu
 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