diff options
| -rw-r--r-- | debian/changelog | 37 | ||||
| -rw-r--r-- | debian/control | 14 | ||||
| -rw-r--r-- | debian/copyright | 42 |
3 files changed, 57 insertions, 36 deletions
diff --git a/debian/changelog b/debian/changelog index 4abbcdd..8b624a2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,39 @@ +libindicator (0.3.8-2ubuntu1~ppa1) UNRELEASED; urgency=low + + * Merge debian changes + * Drop debian/source/* + * debian/control: Switch VCS for this branch to be the indicator + applet developers branch. + + -- Ted Gould <ted@ubuntu.com> Wed, 16 Jun 2010 13:27:29 -0500 + +libindicator (0.3.8-2) unstable; urgency=low + + * Revert cdbs drop, as requested by the Ubuntu maintainers. + * Update Maintainer and Vcs-* fields for pkg-ayatana. + + -- Evgeni Golov <evgeni@debian.org> Wed, 16 Jun 2010 09:54:50 +0200 + +libindicator (0.3.8-1) unstable; urgency=low + + * Merge Ubuntu package into Debian. + Closes: #549999 + * debian/copyright: + + Update to machine readable format. + * debian/control: + + Drop cdbs Build-Dep, bump debhelper to >=7. + + Standards-Version 3.8.4. + + Update Vcs-* fields. + + Drop GNOME from Description, the package is not GNOME specific. + + Slightly update Description, thanks lintian. + * debian/rules: + + Use minimal debhelper 7 rules without cdbs. + + Disable tests for now, they fail (launchpad 587811) + * debian/source/format: + + Add file, make package 3.0 (quilt). + + -- Evgeni Golov <evgeni@debian.org> Mon, 07 Jun 2010 11:21:32 +0200 + libindicator (0.3.8-0ubuntu1) lucid; urgency=low * New upstream release. @@ -142,4 +178,3 @@ libindicator (0.2.0~bzr325-0ubuntu1) karmic; urgency=low * debian/control: Fix Vcs-* links. -- Ken VanDine <ken.vandine@canonical.com> Tue, 25 Aug 2009 08:35:00 +0200 - diff --git a/debian/control b/debian/control index 686f637..af01ed9 100644 --- a/debian/control +++ b/debian/control @@ -2,6 +2,8 @@ Source: libindicator Section: libs 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>, Kartik Mistry <kartik@debian.org> Build-Depends: debhelper (>= 5.0), cdbs (>= 0.4.41), libglib2.0-dev (>= 2.22), @@ -10,21 +12,21 @@ Build-Depends: debhelper (>= 5.0), libtool, intltool, gtk-doc-tools -Standards-Version: 3.8.0 +Standards-Version: 3.8.4 Homepage: https://launchpad.net/libindicator -Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/libindicator/ubuntu -Vcs-Browser: http://bazaar.launchpad.net/~ubuntu-desktop/libindicator/ubuntu +Vcs-Bzr: https://code.launchpad.net/~indicator-applet-developers/libindicator/ubuntu +Vcs-Browser: http://bazaar.launchpad.net/~indicator-applet-developers/libindicator/ubuntu Package: libindicator0 Section: libs Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} -Description: GNOME panel indicator applet - shared library +Description: panel indicator applet - shared library This library contains information to build indicators to go into the indicator applet. . - This package contains files that are needed to build applications. + This package contains the library itself. Package: libindicator-dev Section: libdevel @@ -33,7 +35,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, libgtk2.0-dev (>= 2.12.0), libindicator0 (= ${binary:Version}) -Description: GNOME panel indicator applet - shared library +Description: panel indicator applet - library development files This library contains information to build indicators to go into the indicator applet. . diff --git a/debian/copyright b/debian/copyright index ca1ebdd..f47fefc 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,33 +1,17 @@ -This package was debianized by Ted Gould <ted@canonical.com> on -Wed, 11 Feb 2009 15:41:06 -0600. +Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=135 +Name: libindicator +Maintainer: Ted Gould <ted@canonical.com> +Source: https://launchpad.net/libindicator -It was downloaded from <http://launchpad.net/indicator-applet/> +Files: * +Copyright: 2009-2010 Ted Gould <ted@canonical.com>, Canonical Ltd. +License: GPL-3 -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 +Files: debian/* +Copyright: 2009-2010 Evgeni Golov <evgeni@debian.org> +Copyright: 2009-2010 Ted Gould <ted@canonical.com>, Canonical Ltd. +License: GPL-3 +License: GPL-3 On Debian systems, the complete text of the GNU General -Public License can be found in `/usr/share/common-licenses/GPL-3'. - -The Debian packaging is (C) 2009, Canonical Ltd. and -is licensed under the GPLv3, see `/usr/share/common-licenses/GPL-3'. + Public License version 3 can be found in `/usr/share/common-licenses/GPL-3'. |