aboutsummaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorTed Gould <ted@canonical.com>2009-02-17 10:26:55 -0600
committerTed Gould <ted@canonical.com>2009-02-17 10:26:55 -0600
commit3fe3f9fe3f81402d47ddc50b7e16bffffc0874a6 (patch)
tree1372e434ea5620bcf8294be151302ee141cd71f6 /debian
parent4c82f21c8908e40e2d5f638b15c0e325ed859177 (diff)
parent23d66233aef2061ef5f9d1e6dee33a8632c0b943 (diff)
downloadlibayatana-indicator-3fe3f9fe3f81402d47ddc50b7e16bffffc0874a6.tar.gz
libayatana-indicator-3fe3f9fe3f81402d47ddc50b7e16bffffc0874a6.tar.bz2
libayatana-indicator-3fe3f9fe3f81402d47ddc50b7e16bffffc0874a6.zip
Cherry picking r136 from the ubuntu-core-dev packaging branch that cleans up the licensing, descriptions, and adds additional info
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog17
-rw-r--r--debian/control15
-rw-r--r--debian/copyright41
3 files changed, 57 insertions, 16 deletions
diff --git a/debian/changelog b/debian/changelog
index a05e8e4..c5559b4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,21 @@
-indicator-applet (0.1-0ubuntu1) UNRELEASED; urgency=low
+indicator-applet (0.1-0ubuntu2) UNRELEASED; urgency=low
+
+ * debian/control: Fix Vcs-Bzr.
+ * debian/control: Update package descriptions; the messaging part is
+ provided by indicator-messages.
+
+ -- Martin Pitt <martin.pitt@ubuntu.com> Tue, 17 Feb 2009 11:22:42 +0100
+
+indicator-applet (0.1-0ubuntu1) jaunty; urgency=low
* Initial release, based on DX team's PPA packaging branch.
(lp:~indicator-applet-developers/indicator-applet/applet-packaging)
+ * Repack orig.tar.gz with a copy of the LGPL 3, libindicate/* is
+ under that license.
* debian/control: Add Homepage:, Vcs-Bzr:, and proper package
descriptions.
+ * debian/copyright: Properly describe licenses.
+ * configure.ac: Add missing gio-2.0 pkgconfig check (from DX team
+ PPA packaging branch), and autoreconf to pick up the change.
- -- Martin Pitt <martin.pitt@ubuntu.com> Tue, 17 Feb 2009 09:10:51 +0100
+ -- Martin Pitt <martin.pitt@ubuntu.com> Tue, 17 Feb 2009 10:28:14 +0100
diff --git a/debian/control b/debian/control
index 6ee0c1d..933e50b 100644
--- a/debian/control
+++ b/debian/control
@@ -15,18 +15,19 @@ Build-Depends: debhelper (>= 5.0),
libgirepository-dev (>= 0.6)
Standards-Version: 3.8.0
Homepage: https://launchpad.net/indicator-applet
-Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-core-dev/indicator-applet/ubuntu/files
+Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-core-dev/indicator-applet/ubuntu
Package: indicator-applet
Architecture: any
Depends: ${shlibs:Depends},
${misc:Depends},
gnome-panel
-Description: GNOME panel message indicator applet
+Description: GNOME panel indicator applet
indicator-applet is an applet to display information from
various applications consistently in the GNOME panel.
.
- Currently this includes support for messaging applications.
+ Currently this includes support for messaging applications in the
+ indicator-messages package.
Package: libindicate0
Section: libs
@@ -35,12 +36,10 @@ Replaces: libindicate
Architecture: any
Depends: ${shlibs:Depends},
${misc:Depends}
-Description: GNOME panel message indicator applet - shared library
+Description: GNOME panel indicator applet - shared library
indicator-applet is an applet to display information from
various applications consistently in the GNOME panel.
.
- Currently this includes support for messaging applications.
- .
This package contains shared libraries to be used by applications.
Package: libindicate-dev
@@ -51,10 +50,8 @@ Depends: ${shlibs:Depends},
libindicate0 (= ${binary:Version}),
libdbus-glib-1-dev (>= 0.76),
libgtk2.0-dev (>= 2.12.0)
-Description: GNOME panel message indicator applet - shared library
+Description: GNOME panel indicator applet - shared library
indicator-applet is an applet to display information from
various applications consistently in the GNOME panel.
.
- Currently this includes support for messaging applications.
- .
This package contains files that are needed to build applications.
diff --git a/debian/copyright b/debian/copyright
index 56f5316..cf44847 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,20 +3,51 @@ Wed, 11 Feb 2009 15:41:06 -0600.
It was downloaded from <http://launchpad.net/indicate-applet/>
-Upstream Author(s):
+Upstream Author:
Ted Gould <ted@canonical.com>
Copyright:
- <Copyright (C) 2009 Canonical Ltd.>
+ Copyright (C) 2009 Canonical Ltd.
License:
- Licensed under the GPL v3
+ 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; either version 3 of the License.
- libindicate/
- Licensed under the LGPL v2.1 and/or v3
+ 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'.