Merging in Debian changes

3 files changed, 45 insertions, 42 deletions

diff --git a/debian/changelog b/debian/changelog
index a750f17..e4c9806 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,21 @@ indicator-messages (0.3.8-0ubuntu1) maverick; urgency=low
 
  -- Ken VanDine <ken.vandine@canonical.com>  Thu, 29 Jul 2010 13:33:14 -0400
 
+indicator-messages (0.3.7-1) unstable; urgency=low
+
+  * Merge from Ubuntu.
+    Closes: #586132
+  * debian/control:
+    - Homepage is at LP/indicator-messages, not -applet.
+    - Update package description.
+    - Update Vcs-* fields.
+    - Standards-Version: 3.8.4.
+  * debian/copyright:
+    - Convert to DEP5 format.
+    - Add missing copyright holders of debian/.
+
+ -- Evgeni Golov <evgeni@debian.org>  Thu, 17 Jun 2010 13:02: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..bb668b1 100644
--- a/debian/control
+++ b/debian/control
@@ -2,6 +2,8 @@ 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>
+Uploaders: Evgeni Golov <evgeni@debian.org>
 Build-Depends: debhelper (>= 5.0),
                cdbs (>= 0.4.41),
                libgtk2.0-dev (>= 2.12.0),
@@ -14,18 +16,18 @@ Build-Depends: debhelper (>= 5.0),
                libindicator-dev (>= 0.3.5),
                libdbusmenu-gtk-dev (>= 0.2.5),
                libdbusmenu-glib-dev (>= 0.2.8)
-Standards-Version: 3.8.0
-Homepage: https://launchpad.net/indicator-applet
-Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-desktop/indicator-messages/ubuntu
+Standards-Version: 3.8.4
+Homepage: https://launchpad.net/indicator-messages
+Vcs-Bzr: http://code.launchpad.net/~indicator-applet-developers/indicator-messages/ubuntu
+Vcs-Browser: http://bazaar.launchpad.net/~indicator-applet-developers/indicator-messages/ubuntu/files
 
 Package: indicator-messages
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Recommends: indicator-applet | indicator-renderer
 Breaks: indicator-applet (<< 0.3.0)
-Description: GNOME panel indicator applet for messages
- indicator-applet is an applet to display information from
- various applications consistently in the GNOME panel.
- .
- This package provides support for messaging applications.
-
+Description: indicator that collects messages that need a response
+ A place on the user's desktop that collects messages that need a response.
+ This menu provides a condenced and collected view of all of those messages
+ for quick access, but without making them annoying in times that you want
+ to ignore them.
diff --git a/debian/copyright b/debian/copyright
index ca1ebdd..8bb99ba 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,33 +1,19 @@
-This package was debianized by Ted Gould <ted@canonical.com> on
-Wed, 11 Feb 2009 15:41:06 -0600.
-
-It was downloaded from <http://launchpad.net/indicator-applet/>
-
-Upstream Author:
-
-    Ted Gould <ted@canonical.com>
-
-Copyright:
-
-    Copyright (C) 2009 Canonical Ltd.
-
-License:
-
-  This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation, version 3 of the License.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
-
-On Debian systems, the complete text of the GNU General
-Public License can be found in `/usr/share/common-licenses/GPL-3'.
-
-The Debian packaging is (C) 2009, Canonical Ltd. and
-is licensed under the GPLv3, see `/usr/share/common-licenses/GPL-3'.
+Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=135
+Name: libdbusmenu
+Maintainer: Ted Gould <ted@canonical.com>
+Source: https://launchpad.net/indicator-messages
+
+Files: *
+Copyright: 2009-2010 Ted Gould <ted@canonical.com>, Canonical Ltd.
+License: GPL-3
+
+Files: debian/*
+Copyright: 2009-2010 Evgeni Golov <evgeni@debian.org>
+Copyright: 2009-2010 Ted Gould <ted@canonical.com>, Canonical Ltd.
+Copyright: 2009-2010 Sebastien Bacher <seb128@ubuntu.com>
+Copyright: 2009-2010 Ken VanDine <ken.vandine@canonical.com>
+License: GPL-3
+
+License: GPL-3
+ On Debian systems, the complete text of the GNU General
+ Public License version 3 can be found in `/usr/share/common-licenses/GPL-3'.