r25393 - in /packages/unstable/libproxy/debian: changelog control control.in
joss at users.alioth.debian.org
joss at users.alioth.debian.org
Tue Oct 19 06:54:58 UTC 2010
Author: joss
Date: Tue Oct 19 06:54:56 2010
New Revision: 25393
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=25393
Log:
* Re-enable webkit support. The build-dependency loop is not a problem
for a stable release. (But the issue will arise again later.)
* Recommend libwebkit-1.0-2 | libmozjs2d. Closes: #597864.
Modified:
packages/unstable/libproxy/debian/changelog
packages/unstable/libproxy/debian/control
packages/unstable/libproxy/debian/control.in
Modified: packages/unstable/libproxy/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/libproxy/debian/changelog?rev=25393&op=diff
==============================================================================
--- packages/unstable/libproxy/debian/changelog [utf-8] (original)
+++ packages/unstable/libproxy/debian/changelog [utf-8] Tue Oct 19 06:54:56 2010
@@ -8,6 +8,9 @@
[ Josselin Mouette ]
* 01_pac_http.patch: new patch from Julien Blache. Don’t assume HTTP
header names are case sensitive. Closes: #600196.
+ * Re-enable webkit support. The build-dependency loop is not a problem
+ for a stable release. (But the issue will arise again later.)
+ * Recommend libwebkit-1.0-2 | libmozjs2d. Closes: #597864.
-- Josselin Mouette <joss at debian.org> Tue, 19 Oct 2010 08:46:05 +0200
Modified: packages/unstable/libproxy/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/libproxy/debian/control?rev=25393&op=diff
==============================================================================
--- packages/unstable/libproxy/debian/control [utf-8] (original)
+++ packages/unstable/libproxy/debian/control [utf-8] Tue Oct 19 06:54:56 2010
@@ -1,8 +1,13 @@
+# This file is autogenerated. DO NOT EDIT!
+#
+# Modifications should be made to debian/control.in instead.
+# This file is regenerated automatically in the clean target.
+
Source: libproxy
Section: libs
Priority: optional
-Maintainer: Emilio Pozuelo Monfort <pochu at ubuntu.com>
-Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
+Maintainer: Emilio Pozuelo Monfort <pochu at debian.org>
+Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Josselin Mouette <joss at debian.org>
Build-Depends: cdbs,
debhelper (>= 5),
gnome-pkg-tools,
@@ -12,11 +17,13 @@
network-manager-dev [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64],
libdbus-1-dev,
libmozjs-dev,
-# we have a build-depends loop with webkit
-# libwebkit-dev,
- libgconf2-dev,
+ kdelibs5-dev,
+ libqt4-dev,
+# /!\ we have a build-depends loop with webkit
+ libwebkit-dev,
+ gconf2,
libxmu-dev
-Standards-Version: 3.8.2
+Standards-Version: 3.8.3
XS-Python-Version: >= 2.5
Vcs-Svn: svn://svn.debian.org/svn/pkg-gnome/packages/unstable/libproxy
Vcs-Browser: http://svn.debian.org/viewsvn/pkg-gnome/packages/unstable/libproxy
@@ -26,6 +33,7 @@
Architecture: any
Depends: ${shlibs:Depends},
${misc:Depends}
+Recommends: libwebkit-1.0-2 | libmozjs2d
Description: automatic proxy configuration management library (shared)
libproxy is a lightweight library which makes it easy to develop
applications proxy-aware with a simple and stable API.
@@ -45,6 +53,7 @@
This package contains the development files.
Package: libproxy-tools
+Section: utils
Architecture: any
Depends: ${shlibs:Depends},
${misc:Depends}
Modified: packages/unstable/libproxy/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/libproxy/debian/control.in?rev=25393&op=diff
==============================================================================
--- packages/unstable/libproxy/debian/control.in [utf-8] (original)
+++ packages/unstable/libproxy/debian/control.in [utf-8] Tue Oct 19 06:54:56 2010
@@ -14,8 +14,8 @@
libmozjs-dev,
kdelibs5-dev,
libqt4-dev,
-# we have a build-depends loop with webkit
-# libwebkit-dev,
+# /!\ we have a build-depends loop with webkit
+ libwebkit-dev,
gconf2,
libxmu-dev
Standards-Version: 3.8.3
@@ -28,6 +28,7 @@
Architecture: any
Depends: ${shlibs:Depends},
${misc:Depends}
+Recommends: libwebkit-1.0-2 | libmozjs2d
Description: automatic proxy configuration management library (shared)
libproxy is a lightweight library which makes it easy to develop
applications proxy-aware with a simple and stable API.
More information about the pkg-gnome-commits
mailing list