From 30f1ae42f91519b8f06660c8c352a5fefb301c4b Mon Sep 17 00:00:00 2001 From: Evgeni Golov Date: Wed, 16 Jun 2010 09:50:48 +0200 Subject: Apply 0.3.8-1 changes * 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). --- debian/changelog | 21 ++++++++++++++++++++- debian/control | 18 +++++++++--------- debian/copyright | 42 +++++++++++++----------------------------- debian/rules | 12 +++++++++--- debian/source/format | 1 + 5 files changed, 52 insertions(+), 42 deletions(-) create mode 100644 debian/source/format (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 4abbcdd..cd22c14 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,23 @@ +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 Mon, 07 Jun 2010 11:21:32 +0200 + libindicator (0.3.8-0ubuntu1) lucid; urgency=low * New upstream release. @@ -142,4 +162,3 @@ libindicator (0.2.0~bzr325-0ubuntu1) karmic; urgency=low * debian/control: Fix Vcs-* links. -- Ken VanDine Tue, 25 Aug 2009 08:35:00 +0200 - diff --git a/debian/control b/debian/control index 686f637..6edb124 100644 --- a/debian/control +++ b/debian/control @@ -1,30 +1,30 @@ Source: libindicator Section: libs Priority: optional -Maintainer: Ubuntu Core Developers -Build-Depends: debhelper (>= 5.0), - cdbs (>= 0.4.41), +Maintainer: Evgeni Golov +Uploaders: Kartik Mistry +Build-Depends: debhelper (>= 7.0.50~), libglib2.0-dev (>= 2.22), libgtk2.0-dev (>= 2.12.0), libdbus-glib-1-dev, 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-Git: git://git.debian.org/collab-maint/libindicator.git +Vcs-Browser: http://git.debian.org/?p=collab-maint/libindicator.git 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 +33,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 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 +Source: https://launchpad.net/libindicator -It was downloaded from +Files: * +Copyright: 2009-2010 Ted Gould , Canonical Ltd. +License: GPL-3 -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 +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 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'. diff --git a/debian/rules b/debian/rules index 151c78d..9612514 100755 --- a/debian/rules +++ b/debian/rules @@ -1,8 +1,14 @@ #!/usr/bin/make -f -include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/gnome.mk +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 LDFLAGS += -Wl,-z,defs -Wl,--as-needed -DEB_DH_MAKESHLIBS_ARGS_libindicator0 += -V 'libindicator0 (>= 0.3.6)' +%: + dh $@ + +override_dh_auto_test: + +override_dh_makeshlibs: + dh_makeshlibs -V 'libindicator0 (>= 0.3.6)' diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 0000000..163aaf8 --- /dev/null +++ b/debian/source/format @@ -0,0 +1 @@ +3.0 (quilt) -- cgit v1.2.3 From e3df28309fff9d052b6474821870beb724b64ce5 Mon Sep 17 00:00:00 2001 From: Evgeni Golov Date: Wed, 16 Jun 2010 09:52:28 +0200 Subject: Revert cdbs drop, as requested by the Ubuntu maintainers. --- debian/changelog | 6 ++++++ debian/control | 3 ++- debian/rules | 12 +++--------- 3 files changed, 11 insertions(+), 10 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index cd22c14..4a78988 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +libindicator (0.3.8-2) unstable; urgency=low + + * Revert cdbs drop, as requested by the Ubuntu maintainers. + + -- Evgeni Golov Wed, 16 Jun 2010 09:51:54 +0200 + libindicator (0.3.8-1) unstable; urgency=low * Merge Ubuntu package into Debian. diff --git a/debian/control b/debian/control index 6edb124..8748c62 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,8 @@ Section: libs Priority: optional Maintainer: Evgeni Golov Uploaders: Kartik Mistry -Build-Depends: debhelper (>= 7.0.50~), +Build-Depends: debhelper (>= 5.0), + cdbs (>= 0.4.41), libglib2.0-dev (>= 2.22), libgtk2.0-dev (>= 2.12.0), libdbus-glib-1-dev, diff --git a/debian/rules b/debian/rules index 9612514..151c78d 100755 --- a/debian/rules +++ b/debian/rules @@ -1,14 +1,8 @@ #!/usr/bin/make -f -# Uncomment this to turn on verbose mode. -#export DH_VERBOSE=1 +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/class/gnome.mk LDFLAGS += -Wl,-z,defs -Wl,--as-needed -%: - dh $@ - -override_dh_auto_test: - -override_dh_makeshlibs: - dh_makeshlibs -V 'libindicator0 (>= 0.3.6)' +DEB_DH_MAKESHLIBS_ARGS_libindicator0 += -V 'libindicator0 (>= 0.3.6)' -- cgit v1.2.3 From 34b4a4d73f886573fc992d0618f44817ec12c3a5 Mon Sep 17 00:00:00 2001 From: Evgeni Golov Date: Wed, 16 Jun 2010 09:55:10 +0200 Subject: Update Maintainer and Vcs-* fields for pkg-ayatana. --- debian/changelog | 3 ++- debian/control | 8 ++++---- 2 files changed, 6 insertions(+), 5 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 4a78988..b9f01e2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,9 @@ 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 Wed, 16 Jun 2010 09:51:54 +0200 + -- Evgeni Golov Wed, 16 Jun 2010 09:54:50 +0200 libindicator (0.3.8-1) unstable; urgency=low diff --git a/debian/control b/debian/control index 8748c62..5e1dfe8 100644 --- a/debian/control +++ b/debian/control @@ -1,8 +1,8 @@ Source: libindicator Section: libs Priority: optional -Maintainer: Evgeni Golov -Uploaders: Kartik Mistry +Maintainer: The Ayatana Packagers +Uploaders: Evgeni Golov , Kartik Mistry Build-Depends: debhelper (>= 5.0), cdbs (>= 0.4.41), libglib2.0-dev (>= 2.22), @@ -13,8 +13,8 @@ Build-Depends: debhelper (>= 5.0), gtk-doc-tools Standards-Version: 3.8.4 Homepage: https://launchpad.net/libindicator -Vcs-Git: git://git.debian.org/collab-maint/libindicator.git -Vcs-Browser: http://git.debian.org/?p=collab-maint/libindicator.git +Vcs-Bzr: http://bzr.debian.org/bzr/pkg-ayatana/libindicator/debian +Vcs-Browser: http://bzr.debian.org/loggerhead/pkg-ayatana/libindicator/debian Package: libindicator0 Section: libs -- cgit v1.2.3 From 589e659020e5653c8a2f4e83b9fdc440d43272a3 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 16 Jun 2010 13:29:19 -0500 Subject: releasing version 0.3.8-2ubuntu1~ppa1 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 8b624a2..c6db7f6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,11 +1,11 @@ -libindicator (0.3.8-2ubuntu1~ppa1) UNRELEASED; urgency=low +libindicator (0.3.8-2ubuntu1~ppa1) lucid; urgency=low * Merge debian changes * Drop debian/source/* * debian/control: Switch VCS for this branch to be the indicator applet developers branch. - -- Ted Gould Wed, 16 Jun 2010 13:27:29 -0500 + -- Ted Gould Wed, 16 Jun 2010 13:29:16 -0500 libindicator (0.3.8-2) unstable; urgency=low -- cgit v1.2.3 From 359c67088ee6eeefc1a7fc28316b94e04ba0feec Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 6 Jul 2010 11:07:22 -0500 Subject: releasing version 0.3.8-2ubuntu1~ppa2 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 6e1d128..87dd9b1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,9 @@ -libindicator (0.3.8-2ubuntu1~ppa2) UNRELEASED; urgency=low +libindicator (0.3.8-2ubuntu1~ppa2) lucid; urgency=low * Upstream Merge * Make it so that a watcher dying is the same as unregistering. - -- Ted Gould Tue, 06 Jul 2010 11:05:57 -0500 + -- Ted Gould Tue, 06 Jul 2010 11:07:20 -0500 libindicator (0.3.8-2ubuntu1~ppa1) lucid; urgency=low -- cgit v1.2.3 From 2b3087f569dc7f4db6bb94f48cdf902c4d402b6d Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 8 Jul 2010 09:25:29 -0500 Subject: releasing version 0.3.8-2ubuntu1~ppa3 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 4394823..c4b3ef5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,10 @@ -libindicator (0.3.8-2ubuntu1~ppa3) UNRELEASED; urgency=low +libindicator (0.3.8-2ubuntu1~ppa3) lucid; urgency=low * Merge Upstream * Removing checking for style properties that aren't used. * Make it so that a watcher dying is the same as unregistering. - -- Ted Gould Thu, 08 Jul 2010 09:21:55 -0500 + -- Ted Gould Thu, 08 Jul 2010 09:25:25 -0500 libindicator (0.3.8-2ubuntu1~ppa1) lucid; urgency=low -- cgit v1.2.3 From 3fc3179d758ccef92bbc8e33d4ae20b5ab79a8b7 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 8 Jul 2010 15:19:11 -0500 Subject: releasing version 0.3.9-0ubuntu1~ppa1 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 5cc8b50..e9f1326 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -libindicator (0.3.9-0ubuntu1~ppa1) UNRELEASED; urgency=low +libindicator (0.3.9-0ubuntu1~ppa1) lucid; urgency=low * New upstream release. * Removing checking for style properties that aren't used. @@ -8,7 +8,7 @@ libindicator (0.3.9-0ubuntu1~ppa1) UNRELEASED; urgency=low * debian/control: Switch VCS for this branch to be the indicator applet developers branch. - -- Ted Gould Thu, 08 Jul 2010 15:17:32 -0500 + -- Ted Gould Thu, 08 Jul 2010 15:19:08 -0500 libindicator (0.3.8-2) unstable; urgency=low -- cgit v1.2.3