aboutsummaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog21
-rw-r--r--debian/control8
-rw-r--r--debian/copyright36
3 files changed, 25 insertions, 40 deletions
diff --git a/debian/changelog b/debian/changelog
index 643534e..fb134f4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,24 @@
-indicator-application (0.2.90-0ubuntu3) UNRELEASED; urgency=low
+indicator-application (0.2.91-0ubuntu1) natty; urgency=low
+ [ Ted Gould ]
+ * Upstream Merge
+ * Removing libappindicator from the tarball
+ * debian/control: Removing all libappindicator packages
+
+ [ Ken VanDine ]
+ * New upstream release
+ - Ported to gdbus and dbusmenu 0.4
* debian/control
- - build depend on dbusmenu >= 0.3.90
+ - Bump build depends for dbusmenu to >= 0.3.91
+ - Bump build depends for libindicator-dev to >= 0.3.16
+ - Added build depends for libappindicator-dev >= 0.2.91
+ * debian/rules
+ - Removed all the extra build targets, we don't build those
+ packages anymore
+ * debian/copyright
+ - Removed references to LGPL sources, those moved to libappindicator
- -- Ken VanDine <ken.vandine@canonical.com> Wed, 08 Dec 2010 13:32:07 -0500
+ -- Ken VanDine <ken.vandine@canonical.com> Fri, 14 Jan 2011 10:25:42 -0600
indicator-application (0.2.90-0ubuntu2) natty; urgency=low
diff --git a/debian/control b/debian/control
index 723bdcd..62a270e 100644
--- a/debian/control
+++ b/debian/control
@@ -9,10 +9,10 @@ Build-Depends: debhelper (>= 5.0),
libdbus-glib-1-dev (>= 0.82),
libjson-glib-dev,
intltool,
- libindicator-dev (>= 0.3.14),
- libdbusmenu-gtk-dev (>= 0.3.90),
- libdbusmenu-glib-dev (>= 0.3.90),
- libappindicator-dev (>= 0.2.90+r170)
+ libindicator-dev (>= 0.3.16),
+ libdbusmenu-gtk-dev (>= 0.3.91),
+ libdbusmenu-glib-dev (>= 0.3.91),
+ libappindicator-dev (>= 0.2.91)
Standards-Version: 3.8.4
Homepage: https://launchpad.net/indicator-application
Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-desktop/indicator-application/ubuntu
diff --git a/debian/copyright b/debian/copyright
index ba92c05..fcfcc8a 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -9,7 +9,7 @@ Upstream Author:
Copyright:
- Copyright (C) 2009 Canonical Ltd.
+ Copyright (C) 2009-2010 Canonical Ltd.
License:
@@ -26,35 +26,5 @@ License:
along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-Two files (app-indicator.c and app-indicator.h) are under:
-
- 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.
-
- 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 of the License, or (at your option) any later version.
-
- 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 Street, Fifth Floor,
- Boston, MA 02110-1301 USA
-
-On Debian/Ubuntu systems, the full text of the LGPL v2.1 can be found in
-`/usr/share/common-licenses/LGPL-2.1', the full text of the LGPL v3 can be found in
-`/usr/share/common-licenses/LGPL-3, and the full text of the GPL v3 can be
-found in `/usr/share/common-licenses/GPL-3'
+On Debian/Ubuntu systems, the full text of the GPL v3 can be found in
+`/usr/share/common-licenses/GPL-3'