[SCM] Qt DBusMenu library packaging branch, master, updated. debian/0.9.0-1-44-gf97f90a

[Pino Toscano]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/krap/libdbusmenu-qt.git;a=commitdiff;h=32ec896

The following commit has been merged in the master branch:
commit 32ec8960978a82359809e5f6a13d9380fdfa8d8a
Author: Pino Toscano <pino at debian.org>
Date:   Mon May 13 18:01:14 2013 +0200

    copyright: convert to copyright-format v1.0, update it
---
 debian/changelog |    1 +
 debian/copyright |   33 +++++++++++++++++++++++++++++----
 2 files changed, 30 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 3f36d22..7c69ef6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -25,6 +25,7 @@ libdbusmenu-qt (0.9.0-2) unstable; urgency=low
   * Update symbols file, still not used yet.
   * rules: turn echo into comments.
   * Slightly improve libdbusmenu-qt-dev.install.
+  * Convert copyright to copyright-format v1.0, and update it.
 
  -- Debian Krap Maintainers <debian-qt-kde at lists.debian.org>  Thu, 01 Sep 2011 19:29:20 +0530
 
diff --git a/debian/copyright b/debian/copyright
index 45bfc24..7786e40 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,13 +1,40 @@
-Format: http://dep.debian.net/deps/dep5/
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: libdbusmenu-qt
 Upstream-Contact: Aurelien Gateau <aurelien.gateau at canonical.com>
-Source: http://people.canonical.com/~agateau/dbusmenu/index.html
+Source: https://launchpad.net/libdbusmenu-qt
 
 Files: src/*
 Copyright: 2009-2010, Canonical
 Author: Aurelien Gateau <aurelien.gateau at canonical.com>
 License: LGPL-2+
 
+Files: src/com.canonical.dbusmenu.xml
+Copyright: 2009 Canonical Ltd.
+License: LGPL-3 or LGPL-2.1 or (LGPL-3 and LGPL-2.1)
+ This program is free software: you can redistribute it and/or modify it
+ under the terms of either or both of the following licenses:
+ .
+ 1) the GNU Lesser General Public License version 3, as published by the
+ Free Software Foundation; and/or
+ 2) the GNU Lesser General Public License version 2.1, as published by
+ the Free Software Foundation.
+ .
+ This program is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranties of
+ MERCHANTABILITY, SATISFACTORY QUALITY or FITNESS FOR A PARTICULAR
+ PURPOSE.  See the applicable version of the GNU Lesser General Public
+ License for more details.
+ .
+ You should have received a copy of both the GNU Lesser General Public
+ License version 3 and version 2.1 along with this program.  If not, see
+ <http://www.gnu.org/licenses/>
+ .
+ On Debian systems, the complete text of the GNU Library General Public License
+ version 2.1 can be found in /usr/share/common-licenses/LGPL-2.1.
+ .
+ On Debian systems, the complete text of the GNU Library General Public License
+ version 3 can be found in /usr/share/common-licenses/LGPL-3.
+
 Files: debian/*
 Copyright: 2010-2012, Praveen Arimbrathodiyil <pravi.a at gmail.com>
 License: LGPL-2+
@@ -31,5 +58,3 @@ License: LGPL-2+
  .
  On Debian systems, the complete text of the GNU Library General Public
  License, version 2, can be found in /usr/share/common-licenses/LGPL-2.
-
-

-- 
Qt DBusMenu library packaging