From aaf2c098253373978f5a42fedc37ead470d0bea9 Mon Sep 17 00:00:00 2001 From: unknown 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(-) 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 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 +Maintainer: The Ayatana Packagers +Uploaders: Evgeni Golov Build-Depends: debhelper (>= 5.0), cdbs (>= 0.4.41), libgtk2.0-dev (>= 2.12.0), -- cgit v1.2.3 From 4d513a2d48b3a9e2bb0108050166b83e3e41b69d Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 15 Jun 2010 19:28:37 +0200 Subject: debian/copyright: Convert to DEP5 format. --- debian/changelog | 4 +++- debian/copyright | 70 ++++++++++++++------------------------------------------ 2 files changed, 20 insertions(+), 54 deletions(-) diff --git a/debian/changelog b/debian/changelog index 5979a5f..a1e2f75 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,8 +4,10 @@ libdbusmenu (0.3.2-1) unstable; urgency=low * debian/control: - Set Maintainer to pkg-ayatana. - Add myself as Uploader. + * debian/copyright: + - Convert to DEP5 format. - -- Evgeni Golov Tue, 15 Jun 2010 19:25:56 +0200 + -- Evgeni Golov Tue, 15 Jun 2010 19:28:18 +0200 libdbusmenu (0.3.2-0ubuntu1) maverick; urgency=low diff --git a/debian/copyright b/debian/copyright index 074097c..f4035f6 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,53 +1,17 @@ -This package was debianized by Ted Gould on -Wed, 11 Feb 2009 15:41:06 -0600. - -It was downloaded from - -Upstream Author: - - Ted Gould - -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 +Source: https://launchpad.net/dbusmenu + +Files: * +Copyright: 2009-2010 Ted Gould , Canonical Ltd. +License: GPL-3 + +Files: debian/* +Copyright: 2009-2010 Evgeni Golov +Copyright: 2009-2010 Ted Gould , Canonical Ltd. +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'. -- cgit v1.2.3 From 05c812550569d64b3573a5fcf2fe8b66bb5906a9 Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 15 Jun 2010 19:30:24 +0200 Subject: Update package descriptions. --- debian/changelog | 3 ++- debian/control | 66 ++++++++++++++++++++++++++++++++++++++++---------------- 2 files changed, 49 insertions(+), 20 deletions(-) diff --git a/debian/changelog b/debian/changelog index a1e2f75..b45ea54 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,10 +4,11 @@ libdbusmenu (0.3.2-1) unstable; urgency=low * debian/control: - Set Maintainer to pkg-ayatana. - Add myself as Uploader. + - Update package descriptions. * debian/copyright: - Convert to DEP5 format. - -- Evgeni Golov Tue, 15 Jun 2010 19:28:18 +0200 + -- Evgeni Golov Tue, 15 Jun 2010 19:30:08 +0200 libdbusmenu (0.3.2-0ubuntu1) maverick; urgency=low diff --git a/debian/control b/debian/control index 44fcfb9..8041076 100644 --- a/debian/control +++ b/debian/control @@ -32,7 +32,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 @@ -43,18 +47,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 @@ -65,10 +75,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 @@ -77,9 +89,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 @@ -87,10 +103,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 @@ -99,24 +118,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. -- cgit v1.2.3 From 5272ac12e39c3a45d9f5016df7c48b3b6508c400 Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 15 Jun 2010 19:31:27 +0200 Subject: - Standards-Version: 3.8.4 - Fix Homepage URL. --- debian/changelog | 4 +++- debian/control | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index b45ea54..a31f749 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,10 +5,12 @@ libdbusmenu (0.3.2-1) unstable; urgency=low - Set Maintainer to pkg-ayatana. - Add myself as Uploader. - Update package descriptions. + - Standards-Version: 3.8.4 + - Fix Homepage URL. * debian/copyright: - Convert to DEP5 format. - -- Evgeni Golov Tue, 15 Jun 2010 19:30:08 +0200 + -- Evgeni Golov Tue, 15 Jun 2010 19:31:00 +0200 libdbusmenu (0.3.2-0ubuntu1) maverick; urgency=low diff --git a/debian/control b/debian/control index 8041076..47b64b1 100644 --- a/debian/control +++ b/debian/control @@ -19,8 +19,8 @@ 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 +Standards-Version: 3.8.4 +Homepage: https://launchpad.net/dbusmenu Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/dbusmenu/ubuntu Vcs-Browser: http://bazaar.launchpad.net/~ubuntu-desktop/dbusmenu/ubuntu -- cgit v1.2.3 From c7155ebdb13500400902b0600c77115375c193f2 Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 15 Jun 2010 19:39:34 +0200 Subject: Update Vcs-* fields. --- debian/changelog | 3 ++- debian/control | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index a31f749..47693e5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,10 +7,11 @@ libdbusmenu (0.3.2-1) unstable; urgency=low - Update package descriptions. - Standards-Version: 3.8.4 - Fix Homepage URL. + - Update Vcs-* fields. * debian/copyright: - Convert to DEP5 format. - -- Evgeni Golov Tue, 15 Jun 2010 19:31:00 +0200 + -- Evgeni Golov Tue, 15 Jun 2010 19:39:15 +0200 libdbusmenu (0.3.2-0ubuntu1) maverick; urgency=low diff --git a/debian/control b/debian/control index 47b64b1..ed86b8a 100644 --- a/debian/control +++ b/debian/control @@ -21,8 +21,8 @@ Build-Depends: debhelper (>= 5.0), valac Standards-Version: 3.8.4 Homepage: https://launchpad.net/dbusmenu -Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/dbusmenu/ubuntu -Vcs-Browser: http://bazaar.launchpad.net/~ubuntu-desktop/dbusmenu/ubuntu +Vcs-Bzr: http://bzr.debian.org/bzr/pkg-ayatana/libdbusmenu/debian +Vcs-Browser: http://bzr.debian.org/loggerhead/pkg-ayatana/libdbusmenu/debian Package: libdbusmenu-glib1 Section: libs -- cgit v1.2.3 From 55657e2b8c812cb5a829e59cbaf2125c94dcf138 Mon Sep 17 00:00:00 2001 From: Evgeni Golov Date: Wed, 16 Jun 2010 08:42:27 +0200 Subject: Add Ken and Sebastien, according to changelog. --- debian/changelog | 3 ++- debian/copyright | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 47693e5..198da55 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,8 +10,9 @@ libdbusmenu (0.3.2-1) unstable; urgency=low - Update Vcs-* fields. * debian/copyright: - Convert to DEP5 format. + - Add Ken and Sebastien, according to changelog. - -- Evgeni Golov Tue, 15 Jun 2010 19:39:15 +0200 + -- Evgeni Golov Wed, 16 Jun 2010 08:42:03 +0200 libdbusmenu (0.3.2-0ubuntu1) maverick; urgency=low diff --git a/debian/copyright b/debian/copyright index f4035f6..530ad85 100644 --- a/debian/copyright +++ b/debian/copyright @@ -10,6 +10,8 @@ License: GPL-3 Files: debian/* Copyright: 2009-2010 Evgeni Golov Copyright: 2009-2010 Ted Gould , Canonical Ltd. +Copyright: 2009-2010 Sebastien Bacher +Copyright: 2009-2010 Ken VanDine License: GPL-3 License: GPL-3 -- cgit v1.2.3 From acd48e74157f74bb50c451a7f47e7d8c2f45efbb Mon Sep 17 00:00:00 2001 From: Evgeni Golov Date: Wed, 16 Jun 2010 09:43:19 +0200 Subject: Add a Closes: #586069 --- debian/changelog | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 198da55..04dc307 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ libdbusmenu (0.3.2-1) unstable; urgency=low * Merge from Ubuntu. + Closes: #586069 * debian/control: - Set Maintainer to pkg-ayatana. - Add myself as Uploader. @@ -12,7 +13,7 @@ libdbusmenu (0.3.2-1) unstable; urgency=low - Convert to DEP5 format. - Add Ken and Sebastien, according to changelog. - -- Evgeni Golov Wed, 16 Jun 2010 08:42:03 +0200 + -- Evgeni Golov Wed, 16 Jun 2010 09:43:06 +0200 libdbusmenu (0.3.2-0ubuntu1) maverick; urgency=low -- cgit v1.2.3 From 614d3fc2311780a4011d24b5e59e18b857b36b9c Mon Sep 17 00:00:00 2001 From: Evgeni Golov Date: Wed, 16 Jun 2010 11:37:27 +0200 Subject: =?UTF-8?q?Add=20Aur=C3=A9lien=20G=C3=A2teau,=20according=20to=20h?= =?UTF-8?q?eaders.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- debian/changelog | 3 ++- debian/copyright | 7 +++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 04dc307..9551d8f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -12,8 +12,9 @@ libdbusmenu (0.3.2-1) unstable; urgency=low * debian/copyright: - Convert to DEP5 format. - Add Ken and Sebastien, according to changelog. + - Add Aurélien Gâteau, according to headers. - -- Evgeni Golov Wed, 16 Jun 2010 09:43:06 +0200 + -- Evgeni Golov Wed, 16 Jun 2010 11:37:08 +0200 libdbusmenu (0.3.2-0ubuntu1) maverick; urgency=low diff --git a/debian/copyright b/debian/copyright index 530ad85..161670c 100644 --- a/debian/copyright +++ b/debian/copyright @@ -7,6 +7,13 @@ Files: * Copyright: 2009-2010 Ted Gould , Canonical Ltd. License: GPL-3 +Files: libdbusmenu-glib/dbus-menu.xml, tools/{dbusmenu-bench,testapp/main.c} + +Copyright: 2009-2010 Ted Gould , Canonical Ltd. +Copyright: 2009-2010 Aurélien Gâteau + +License: GPL-3 + Files: debian/* Copyright: 2009-2010 Evgeni Golov Copyright: 2009-2010 Ted Gould , Canonical Ltd. -- cgit v1.2.3 From f589927de79fe437cdd2014d62e2f2e7b37ad266 Mon Sep 17 00:00:00 2001 From: Evgeni Golov Date: Wed, 16 Jun 2010 11:58:53 +0200 Subject: More parts are LGPL... --- debian/copyright | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/debian/copyright b/debian/copyright index 161670c..6d7c11b 100644 --- a/debian/copyright +++ b/debian/copyright @@ -7,12 +7,18 @@ Files: * Copyright: 2009-2010 Ted Gould , Canonical Ltd. License: GPL-3 -Files: libdbusmenu-glib/dbus-menu.xml, tools/{dbusmenu-bench,testapp/main.c} +Files: libdbusmenu-{glib,gtk}/* +Copyright: 2009-2010 Ted Gould , Canonical Ltd. +License: LGPL-2.1 | LGPL-3 +Files: libdbusmenu-glib/dbus-menu.xml Copyright: 2009-2010 Ted Gould , Canonical Ltd. Copyright: 2009-2010 Aurélien Gâteau +License: LGPL-2.1 | LGPL-3 -License: GPL-3 +Files: tools/{dbusmenu-bench,testapp/main.c} +Copyright: 2009-2010 Aurélien Gâteau +License: LGPL-2.1 | LGPL-3 Files: debian/* Copyright: 2009-2010 Evgeni Golov @@ -24,3 +30,11 @@ 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'. -- cgit v1.2.3