r21368 - in /desktop/experimental/devhelp/debian: changelog control control.in copyright libdevhelp-1-0.install libdevhelp-1-1.install patches/01_do_not_clober_global_w_on_el.patch patches/03html2diff_close_sub.patch patches/series rules
pochu at users.alioth.debian.org
pochu at users.alioth.debian.org
Fri Sep 18 17:07:11 UTC 2009
Author: pochu
Date: Fri Sep 18 17:07:11 2009
New Revision: 21368
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=21368
Log:
* New upstream release. Devhelp gonna use a completely new
versioning to follow GNOME's way.
- New tabs should not steal focus. (Closes: #499274)
* debian/control:
- added homepage field.
- added a B-D on libunique-dev, needed to the configure run to
work properly.
- libwebkit B-D bumped to >= 1.1.14, this is a new require for
the new upstream release. (we need to upload this package to
experimental cause of this)
- added a B-D on libsoup2.4-0 (>= 2.27.92) to fix a FTBFS cause
a broken dependency on the webkit shared library.
- bumped libdevhelp binary to libdevhelp-1-1 to prevent a breakage
after the soname change.
- changed libdevhelp-1-dev dependency on libdevhelp-1-0 to
libdevhelp-1-0 because of the package rename.
- removed chrpath B-D, it's no more needed.
* debian/libdevhelp-1-0.install:
- renamed to libdevhelp-1-1.install since the package name changed.
* debian/patches/01_do_not_clober_global_w_on_el.patch:
- removed, applied upstream.
* debian/patches/03html2diff_close_sub.patch:
- removed, applied upstream.
* debian/patches/series:
- updated
* debian/rules:
- removed all chrpath's calls, it seems they are no no more needed.
Thanks Emilio for the hint on this.
- bumped libdevhelp shlibs version to 2.27.92, since the library changed
the API.
* debian/copyright:
- added missing copyright holders.
- added missing LGPL header.
Added:
desktop/experimental/devhelp/debian/libdevhelp-1-1.install
- copied unchanged from r21365, desktop/experimental/devhelp/debian/libdevhelp-1-0.install
Removed:
desktop/experimental/devhelp/debian/libdevhelp-1-0.install
desktop/experimental/devhelp/debian/patches/01_do_not_clober_global_w_on_el.patch
desktop/experimental/devhelp/debian/patches/03html2diff_close_sub.patch
Modified:
desktop/experimental/devhelp/debian/changelog
desktop/experimental/devhelp/debian/control
desktop/experimental/devhelp/debian/control.in
desktop/experimental/devhelp/debian/copyright
desktop/experimental/devhelp/debian/patches/series
desktop/experimental/devhelp/debian/rules
Modified: desktop/experimental/devhelp/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/devhelp/debian/changelog?rev=21368&op=diff
==============================================================================
--- desktop/experimental/devhelp/debian/changelog [utf-8] (original)
+++ desktop/experimental/devhelp/debian/changelog [utf-8] Fri Sep 18 17:07:11 2009
@@ -1,9 +1,45 @@
-devhelp (0.23.1-2) UNRELEASED; urgency=low
-
+devhelp (2.27.92-1) experimental; urgency=low
+
+ [ Emilio Pozuelo Monfort ]
* debian/devhelp.postrm: Removed, it only rmdirs the /etc directories
on purge, but that was to workaround a bug in dpkg. See e.g. #198128.
* Standards-Version is 3.8.3, no changes needed.
* debian/control.in: Remove old Conflicts/Replaces no longer needed.
+
+ [ Andrea Veri ]
+ * New upstream release. Devhelp gonna use a completely new
+ versioning to follow GNOME's way.
+ - New tabs should not steal focus. (Closes: #499274)
+ * debian/control:
+ - added homepage field.
+ - added a B-D on libunique-dev, needed to the configure run to
+ work properly.
+ - libwebkit B-D bumped to >= 1.1.14, this is a new require for
+ the new upstream release. (we need to upload this package to
+ experimental cause of this)
+ - added a B-D on libsoup2.4-0 (>= 2.27.92) to fix a FTBFS cause
+ a broken dependency on the webkit shared library.
+ - bumped libdevhelp binary to libdevhelp-1-1 to prevent a breakage
+ after the soname change.
+ - changed libdevhelp-1-dev dependency on libdevhelp-1-0 to
+ libdevhelp-1-0 because of the package rename.
+ - removed chrpath B-D, it's no more needed.
+ * debian/libdevhelp-1-0.install:
+ - renamed to libdevhelp-1-1.install since the package name changed.
+ * debian/patches/01_do_not_clober_global_w_on_el.patch:
+ - removed, applied upstream.
+ * debian/patches/03html2diff_close_sub.patch:
+ - removed, applied upstream.
+ * debian/patches/series:
+ - updated
+ * debian/rules:
+ - removed all chrpath's calls, it seems they are no no more needed.
+ Thanks Emilio for the hint on this.
+ - bumped libdevhelp shlibs version to 2.27.92, since the library changed
+ the API.
+ * debian/copyright:
+ - added missing copyright holders.
+ - added missing LGPL header.
-- Emilio Pozuelo Monfort <pochu at debian.org> Thu, 27 Aug 2009 11:56:08 +0200
Modified: desktop/experimental/devhelp/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/devhelp/debian/control?rev=21368&op=diff
==============================================================================
--- desktop/experimental/devhelp/debian/control [utf-8] (original)
+++ desktop/experimental/devhelp/debian/control [utf-8] Fri Sep 18 17:07:11 2009
@@ -3,6 +3,7 @@
Priority: optional
Maintainer: Bradley Smith <bradsmith at debian.org>
Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Emilio Pozuelo Monfort <pochu at debian.org>, Gustavo Noronha Silva <kov at debian.org>, Josselin Mouette <joss at debian.org>, Loïc Minier <lool at dooz.org>
+Homepage: http://live.gnome.org/devhelp
Build-Depends: cdbs,
quilt,
debhelper (>= 5),
@@ -10,7 +11,7 @@
libgtk2.0-dev (>= 2.14.7),
libglade2-dev (>= 1:2.4.0),
libgconf2-dev (>= 2.6.0),
- libwebkit-dev,
+ libwebkit-dev (>= 1.1.13),
libwnck-dev (>= 2.14.1),
libxml-parser-perl,
gnome-pkg-tools,
@@ -18,10 +19,12 @@
libglib2.0-dev (>= 2.8.0),
python-dev,
python-support (>= 0.3),
- chrpath
+ libunique-dev (>= 1.1),
+# Workaround for a wrong dependency on libwebkit-1.0-2
+ libsoup2.4-1 (>= 2.27.92)
Standards-Version: 3.8.3
-Package: libdevhelp-1-0
+Package: libdevhelp-1-1
Section: libs
Architecture: any
Depends: ${misc:Depends},
@@ -37,7 +40,7 @@
Architecture: any
Depends: ${misc:Depends},
libgtk2.0-dev (>= 2.8.17-1),
- libdevhelp-1-0 (= ${binary:Version}),
+ libdevhelp-1-1 (= ${binary:Version}),
libwnck-dev (>= 2.14.1),
libgconf2-dev (>= 2.6.0),
libwebkit-dev,
Modified: desktop/experimental/devhelp/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/devhelp/debian/control.in?rev=21368&op=diff
==============================================================================
--- desktop/experimental/devhelp/debian/control.in [utf-8] (original)
+++ desktop/experimental/devhelp/debian/control.in [utf-8] Fri Sep 18 17:07:11 2009
@@ -3,6 +3,7 @@
Priority: optional
Maintainer: Bradley Smith <bradsmith at debian.org>
Uploaders: @GNOME_TEAM@
+Homepage: http://live.gnome.org/devhelp
Build-Depends: cdbs,
quilt,
debhelper (>= 5),
@@ -10,7 +11,7 @@
libgtk2.0-dev (>= 2.14.7),
libglade2-dev (>= 1:2.4.0),
libgconf2-dev (>= 2.6.0),
- libwebkit-dev,
+ libwebkit-dev (>= 1.1.13),
libwnck-dev (>= 2.14.1),
libxml-parser-perl,
gnome-pkg-tools,
@@ -18,10 +19,12 @@
libglib2.0-dev (>= 2.8.0),
python-dev,
python-support (>= 0.3),
- chrpath
+ libunique-dev (>= 1.1),
+# Workaround for a wrong dependency on libwebkit-1.0-2
+ libsoup2.4-1 (>= 2.27.92)
Standards-Version: 3.8.3
-Package: libdevhelp-1-0
+Package: libdevhelp-1-1
Section: libs
Architecture: any
Depends: ${misc:Depends},
@@ -37,7 +40,7 @@
Architecture: any
Depends: ${misc:Depends},
libgtk2.0-dev (>= 2.8.17-1),
- libdevhelp-1-0 (= ${binary:Version}),
+ libdevhelp-1-1 (= ${binary:Version}),
libwnck-dev (>= 2.14.1),
libgconf2-dev (>= 2.6.0),
libwebkit-dev,
Modified: desktop/experimental/devhelp/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/devhelp/debian/copyright?rev=21368&op=diff
==============================================================================
--- desktop/experimental/devhelp/debian/copyright [utf-8] (original)
+++ desktop/experimental/devhelp/debian/copyright [utf-8] Fri Sep 18 17:07:11 2009
@@ -1,8 +1,21 @@
Author: Mikael Hallendal <micke at imendio.com>
Download: http://www.imendio.com/projects/devhelp/
+Copyright holders: Copyright (c) 2001-2003 Mikael Hallendal <micke at imendio.com>,
+ Copyright (c) 2001-2003 CodeFactory AB,
+ Copyright (c) 2004-2008 Imendio AB,
+ Copyright (c) 2004 Marc Britten <mbritten at monochromatic.net>,
+ Copyright (c) 2008 Sven Herzberg
+
Files: *
-Copyright: (C) 2000, 2001 The Free Software Foundation
+Copyright:
+ Copyright (C) 1996, 2008 The Free Software Foundation
+ Copyright (c) 2001-2003 Mikael Hallendal <micke at imendio.com>,
+ Copyright (c) 2001-2003 CodeFactory AB,
+ Copyright (c) 2004-2008 Imendio AB,
+ Copyright (c) 2004 Marc Britten <mbritten at monochromatic.net>,
+ Copyright (c) 2008 Sven Herzberg
+
License: GPL-2+
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
@@ -27,5 +40,22 @@
FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
more details.
+Files: src/eggfindbar.h, src/eggfindbar.c
+Copyright: Copyright (C) 2004 Red Hat, Inc.
+License: LGPL
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Library General Public License as
+ published by the Free Software Foundation; either version 2 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
+ Library General Public License for more details.
+
On Debian GNU/Linux systems, the full text of the GNU General Public License
can be found in the file /usr/share/common-licenses/GPL-2.
+
+On Debian GNU/Linux systems, the full text of the GNU Library General Public License
+can be found in the file /usr/share/common-licenses/LGPL-2.
+
Modified: desktop/experimental/devhelp/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/devhelp/debian/patches/series?rev=21368&op=diff
==============================================================================
--- desktop/experimental/devhelp/debian/patches/series [utf-8] (original)
+++ desktop/experimental/devhelp/debian/patches/series [utf-8] Fri Sep 18 17:07:11 2009
@@ -1,3 +1,1 @@
00install-devhelp-el.patch
-01_do_not_clober_global_w_on_el.patch
-03html2diff_close_sub.patch
Modified: desktop/experimental/devhelp/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/devhelp/debian/rules?rev=21368&op=diff
==============================================================================
--- desktop/experimental/devhelp/debian/rules [utf-8] (original)
+++ desktop/experimental/devhelp/debian/rules [utf-8] Fri Sep 18 17:07:11 2009
@@ -10,7 +10,7 @@
libdevhelp-1-N := $(shell sed -rn 's/^Package:[[:space:]]*(libdevhelp-1-[0-9]+)[[:space:]]*$$/\1/p' debian/control)
-DEB_DH_MAKESHLIBS_ARGS_ALL += -V '$(libdevhelp-1-N) (>= 0.14)'
+DEB_DH_MAKESHLIBS_ARGS_ALL += -V '$(libdevhelp-1-N) (>= 2.27.92)'
X_TOOLS += misc/devhelp.vim \
misc/html2funcs.py \
@@ -27,14 +27,12 @@
# this creates a debian/shlibs.local forcing very strict interdependencies
binary-post-install/$(libdevhelp-1-N)::
- chrpath -d `pwd`/debian/$(cdbs_curpkg)/usr/lib/libdevhelp-1.so.0.0.0
dh_makeshlibs -p$(cdbs_curpkg) -n \
-V "$(libdevhelp-1-N) (= $(DEB_VERSION))"
mv debian/$(cdbs_curpkg)/DEBIAN/shlibs \
debian/shlibs.local
binary-post-install/devhelp::
- chrpath -d `pwd`/debian/devhelp/usr/bin/devhelp
dh_link -pdevhelp usr/share/man/man1/devhelp.1.gz \
usr/share/man/man1/devhelp-bin.1.gz
install -d `pwd`/debian/devhelp/usr/share/pixmaps/
More information about the pkg-gnome-commits
mailing list