* Merging in Debian branch

* debian/control: Switching branch on this branch to be the
  dbusmenu-team.
* Merge from Ubuntu.
  Closes: #586069
* debian/control:
  - Set Maintainer to pkg-ayatana.
  - Add myself as Uploader.
  - Update package descriptions.
  - Standards-Version: 3.8.4
  - Fix Homepage URL.
  - Update Vcs-* fields.
* debian/copyright:
  - Convert to DEP5 format.
  - Add Ken and Sebastien, according to changelog.
  - Add Aurélien Gâteau, according to headers.

3 files changed, 119 insertions, 76 deletions

diff --git a/debian/changelog b/debian/changelog
index 773863f..9f8cbdd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,29 @@
+libdbusmenu (0.3.2-1ubuntu1~ppa1) UNRELEASED; urgency=low
+
+  * Merging in Debian branch
+  * debian/control: Switching branch on this branch to be the
+    dbusmenu-team.
+
+ -- Ted Gould <ted@ubuntu.com>  Wed, 16 Jun 2010 10:38:24 -0500
+
+libdbusmenu (0.3.2-1) unstable; urgency=low
+
+  * Merge from Ubuntu.
+    Closes: #586069
+  * debian/control:
+    - Set Maintainer to pkg-ayatana.
+    - Add myself as Uploader.
+    - Update package descriptions.
+    - Standards-Version: 3.8.4
+    - Fix Homepage URL.
+    - Update Vcs-* fields.
+  * debian/copyright:
+    - Convert to DEP5 format.
+    - Add Ken and Sebastien, according to changelog.
+    - Add Aurélien Gâteau, according to headers.
+
+ -- Evgeni Golov <evgeni@debian.org>  Wed, 16 Jun 2010 11:37:08 +0200
+
 libdbusmenu (0.3.2-0ubuntu1) maverick; urgency=low
 
   * debian/control
diff --git a/debian/control b/debian/control
index 9ddb90b..18222ae 100644
--- a/debian/control
+++ b/debian/control
@@ -2,6 +2,8 @@ Source: libdbusmenu
 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),
@@ -18,10 +20,10 @@ Build-Depends: debhelper (>= 5.0),
                gir1.0-glib-2.0,
                gir1.0-gtk-2.0,
                valac
-Standards-Version: 3.8.0
-Homepage: https://launchpad.net/libdbusmenu
-Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/dbusmenu/ubuntu
-Vcs-Browser: http://bazaar.launchpad.net/~ubuntu-desktop/dbusmenu/ubuntu
+Standards-Version: 3.8.4
+Homepage: https://launchpad.net/dbusmenu
+Vcs-Bzr: https://code.launchpad.net/~dbusmenu-team/dbusmenu/ubuntu
+Vcs-Browser: http://bazaar.launchpad.net/~dbusmenu-team/dbusmenu/ubuntu
 
 Package: libdbusmenu-glib1
 Section: libs
@@ -31,7 +33,11 @@ Depends: ${shlibs:Depends},
 Breaks: indicator-messages (<< 0.3.0),
         indicator-session (<< 0.2.0),
         libdbusmenu-glib0
-Description: Menus over DBus shared library for glib
+Description: library for passing menus over DBus
+ libdbusmenu passes a menu structure across DBus so that a program can
+ create a menu simply without worrying about how it is displayed on the
+ other side of the bus.
+ .
  This package contains shared libraries to be used by applications.
 
 Package: libdbusmenu-glib-dev
@@ -42,18 +48,24 @@ Depends: ${shlibs:Depends},
          libdbusmenu-glib1 (= ${binary:Version}),
          libdbus-glib-1-dev (>= 0.76),
          libgtk2.0-dev (>= 2.12.0)
-Description: Menus over DBus shared library
- This package contains files that are needed to build applications.
+Description: library for passing menus over DBus - development files
+ libdbusmenu passes a menu structure across DBus so that a program can
+ create a menu simply without worrying about how it is displayed on the
+ other side of the bus.
  .
- This package provides the development files.
+ This package contains files that are needed to build applications.
 
 Package: libdbusmenu-gtk1
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends}
-Description: Menus over DBus shared library for GTK
- This package contains shared libraries to be used by applications.
+Description: library for passing menus over DBus - GTK version
+ libdbusmenu passes a menu structure across DBus so that a program can
+ create a menu simply without worrying about how it is displayed on the
+ other side of the bus.
+ .
+ This package contains shared libraries to be used by GTK applications.
 
 Package: libdbusmenu-gtk-dev
 Section: libdevel
@@ -64,10 +76,12 @@ Depends: ${shlibs:Depends},
          libdbus-glib-1-dev (>= 0.76),
          libgtk2.0-dev (>= 2.12.0),
          libdbusmenu-glib-dev
-Description: Menus over DBus shared library for GTK
- This package contains files that are needed to build applications.
+Description: library for passing menus over DBus - GTK version developement files
+ libdbusmenu passes a menu structure across DBus so that a program can
+ create a menu simply without worrying about how it is displayed on the
+ other side of the bus.
  .
- This package provides the development files.
+ This package contains files that are needed to build GTK applications.
 
 Package: libdbusmenu-tools
 Section: devel
@@ -76,9 +90,13 @@ Depends: ${shlibs:Depends},
          ${misc:Depends},
          python,
          libdbusmenu-glib1 (= ${binary:Version})
-Description: Tools useful during development with libdbusmenu
+Description: tools useful during development with libdbusmenu
+ libdbusmenu passes a menu structure across DBus so that a program can
+ create a menu simply without worrying about how it is displayed on the
+ other side of the bus.
  .
- This package contains tools that are useful when building applications.
+ This package contains tools that are useful when developing and building
+ applications with libdbusmenu.
 
 Package: gir1.0-dbusmenu-glib-0.2
 Section: libs
@@ -86,10 +104,13 @@ Architecture: any
 Depends: ${misc:Depends},
          libdbusmenu-glib1 (= ${binary:Version}),
          gir1.0-glib-2.0
-Description: Typelib file for libdbusmenu-glib1
+Description: typelib file for libdbusmenu-glib1
+ libdbusmenu passes a menu structure across DBus so that a program can
+ create a menu simply without worrying about how it is displayed on the
+ other side of the bus.
  .
  This package can be used by other packages using the GIRepository format to
- generate dynamic bindings
+ generate dynamic bindings for libdbusmenu-glib1.
 
 Package: gir1.0-dbusmenu-gtk-0.2
 Section: libs
@@ -98,24 +119,33 @@ Depends: ${misc:Depends},
          libdbusmenu-gtk1 (= ${binary:Version}),
          gir1.0-dbusmenu-glib-0.2 (= ${binary:Version}),
          gir1.0-gtk-2.0
-Description: Typelib file for libdbusmenu-gtk1
+Description: typelib file for libdbusmenu-gtk1
+ libdbusmenu passes a menu structure across DBus so that a program can
+ create a menu simply without worrying about how it is displayed on the
+ other side of the bus.
  .
  This package can be used by other packages using the GIRepository format to
- generate dynamic bindings
+ generate dynamic bindings for libdbusmenu-gtk1.
 
 Package: libdbusmenu-glib-doc
 Section: doc
 Architecture: any
 Depends: ${misc:Depends}
-Description: Docs for libdbusmenu-glib
+Description: library for passing menus over DBus - documentation
+ libdbusmenu passes a menu structure across DBus so that a program can
+ create a menu simply without worrying about how it is displayed on the
+ other side of the bus.
  .
- This package contains developer documentation.
+ This package contains developer documentation for libdbusmenu-glib.
 
 Package: libdbusmenu-gtk-doc
 Section: doc
 Architecture: any
 Depends: ${misc:Depends}
-Description: Docs for libdbusmenu-gtk
+Description: library for passing menus over DBus - GTK version documentation
+ libdbusmenu passes a menu structure across DBus so that a program can
+ create a menu simply without worrying about how it is displayed on the
+ other side of the bus.
  .
- This package contains developer documentation.
+ This package contains developer documentation for libdbusmenu-gtk.
 
diff --git a/debian/copyright b/debian/copyright
index 074097c..6d7c11b 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,53 +1,40 @@
-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'.
-
-License for libindicate/* (libindicate0 and libindicate-dev packages):
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 or 3 of the License.
-
-    This library 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
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; 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 Lesser General Public License
-can be found in `/usr/share/common-licenses/LGPL-2.1' and
-`/usr/share/common-licenses/LGPL-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/dbusmenu
+
+Files: *
+Copyright: 2009-2010 Ted Gould <ted@canonical.com>, Canonical Ltd.
+License: GPL-3
+
+Files: libdbusmenu-{glib,gtk}/*
+Copyright: 2009-2010 Ted Gould <ted@canonical.com>, Canonical Ltd.
+License: LGPL-2.1 | LGPL-3
+
+Files: libdbusmenu-glib/dbus-menu.xml
+Copyright: 2009-2010 Ted Gould <ted@canonical.com>, Canonical Ltd.
+Copyright: 2009-2010 Aurélien Gâteau <aurelien.gateau@canonical.com>
+License: LGPL-2.1 | LGPL-3
+
+Files: tools/{dbusmenu-bench,testapp/main.c}
+Copyright: 2009-2010 Aurélien Gâteau <aurelien.gateau@canonical.com>
+License: LGPL-2.1 | LGPL-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'.
+
+License: LGPL-2.1
+ On Debian systems, the complete text of the GNU Lesser General
+ Public License version 2.1 can be found in `/usr/share/common-licenses/LGPL-2.1'.
+
+License: LGPL-3
+ On Debian systems, the complete text of the GNU Lesser General
+ Public License version 3 can be found in `/usr/share/common-licenses/LGPL-3'.