r40213 - in /packages/unstable/libproxy: ./ debian/ debian/patches/ debian/tests/
bigon at users.alioth.debian.org
bigon at users.alioth.debian.org
Sun Nov 3 14:18:44 UTC 2013
Author: bigon
Date: Sun Nov 3 14:18:44 2013
New Revision: 40213
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=40213
Log:
Merge from experimental branch
Added:
packages/unstable/libproxy/debian/libgproxy1-plugin-gsettings.install
- copied unchanged from r40212, packages/experimental/libproxy/debian/libgproxy1-plugin-gsettings.install
packages/unstable/libproxy/debian/libproxy-cil-dev.install
- copied unchanged from r40212, packages/experimental/libproxy/debian/libproxy-cil-dev.install
packages/unstable/libproxy/debian/libproxy-tools.manpages
- copied unchanged from r40212, packages/experimental/libproxy/debian/libproxy-tools.manpages
packages/unstable/libproxy/debian/libproxy0.4-cil.install
- copied unchanged from r40212, packages/experimental/libproxy/debian/libproxy0.4-cil.install
packages/unstable/libproxy/debian/libproxy0.4-cil.installcligac
- copied unchanged from r40212, packages/experimental/libproxy/debian/libproxy0.4-cil.installcligac
packages/unstable/libproxy/debian/libproxy1-plugin-gsettings.install
- copied unchanged from r40212, packages/experimental/libproxy/debian/libproxy1-plugin-gsettings.install
packages/unstable/libproxy/debian/libproxy1-plugin-kconfig.install
- copied unchanged from r40212, packages/experimental/libproxy/debian/libproxy1-plugin-kconfig.install
packages/unstable/libproxy/debian/libproxy1-plugin-mozjs.install
- copied unchanged from r40212, packages/experimental/libproxy/debian/libproxy1-plugin-mozjs.install
packages/unstable/libproxy/debian/libproxy1-plugin-networkmanager.install
- copied unchanged from r40212, packages/experimental/libproxy/debian/libproxy1-plugin-networkmanager.install
packages/unstable/libproxy/debian/libproxy1-plugin-webkit.install
- copied unchanged from r40212, packages/experimental/libproxy/debian/libproxy1-plugin-webkit.install
packages/unstable/libproxy/debian/libproxy1.install
- copied unchanged from r40212, packages/experimental/libproxy/debian/libproxy1.install
packages/unstable/libproxy/debian/patches/disable-pac-test.patch
- copied unchanged from r40212, packages/experimental/libproxy/debian/patches/disable-pac-test.patch
packages/unstable/libproxy/debian/patches/dont_segfault_on_exit.patch
- copied unchanged from r40212, packages/experimental/libproxy/debian/patches/dont_segfault_on_exit.patch
packages/unstable/libproxy/debian/patches/fix-mozjs-detection.patch
- copied unchanged from r40212, packages/experimental/libproxy/debian/patches/fix-mozjs-detection.patch
packages/unstable/libproxy/debian/proxy.1
- copied unchanged from r40212, packages/experimental/libproxy/debian/proxy.1
packages/unstable/libproxy/debian/tests/
- copied from r40212, packages/experimental/libproxy/debian/tests/
Removed:
packages/unstable/libproxy/debian/libproxy0.install
packages/unstable/libproxy/debian/patches/01_pac_http.patch
packages/unstable/libproxy/debian/patches/02_url_user.patch
packages/unstable/libproxy/debian/patches/03_format-security.patch
packages/unstable/libproxy/debian/patches/cve-2012-4505.patch
Modified:
packages/unstable/libproxy/ (props changed)
packages/unstable/libproxy/debian/changelog
packages/unstable/libproxy/debian/compat
packages/unstable/libproxy/debian/control
packages/unstable/libproxy/debian/control.in
packages/unstable/libproxy/debian/copyright
packages/unstable/libproxy/debian/libproxy-dev.install
packages/unstable/libproxy/debian/patches/series
packages/unstable/libproxy/debian/rules
packages/unstable/libproxy/debian/watch
Propchange: packages/unstable/libproxy/
------------------------------------------------------------------------------
svn:mergeinfo = /packages/experimental/libproxy:39536-40212
Modified: packages/unstable/libproxy/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/libproxy/debian/changelog?rev=40213&op=diff
==============================================================================
--- packages/unstable/libproxy/debian/changelog [utf-8] (original)
+++ packages/unstable/libproxy/debian/changelog [utf-8] Sun Nov 3 14:18:44 2013
@@ -1,3 +1,143 @@
+libproxy (0.4.11-4) unstable; urgency=low
+
+ * Upload to unstable
+
+ -- Laurent Bigonville <bigon at debian.org> Sun, 03 Nov 2013 13:34:28 +0100
+
+libproxy (0.4.11-3) experimental; urgency=low
+
+ * debian/control.in: Build-depend on netbase, this will hopefully fix the
+ FTBFS
+
+ -- Laurent Bigonville <bigon at debian.org> Thu, 10 Oct 2013 16:06:21 +0200
+
+libproxy (0.4.11-2) experimental; urgency=low
+
+ * debian/control.in: Only build networkmanager plugin on linux-any
+ architectures
+ * Drop debian/libproxy1.symbols: .symbols file with C++ libraries is just a
+ nightmare, rely on the good old shlibs file
+
+ -- Laurent Bigonville <bigon at debian.org> Sat, 28 Sep 2013 13:34:14 +0200
+
+libproxy (0.4.11-1) experimental; urgency=low
+
+ * Upload new upstream release to debian, thanks to the Ubuntu guys for the
+ changes (Closes: #604934)
+ * Re-enable mozjs plugin, this new version is built against mozjs185, this
+ fix the current FTBFS and the stability of the ABI/API we build against
+ (Closes: #707419, #722685)
+ * debian/rules:
+ - Re-add uploaders.mk magic
+ - Bump SHLIBVER to 0.4.11
+ - Make the build fails if symbols are missing the .symbols file
+ * debian/patches/fix-mozjs-detection.patch: Properly detect mozjs, patch
+ from upstream VCS.
+ * debian/libproxy1.symbols: Add symbols file
+ * debian/watch: Update to work with Google Code website, again.
+ * debian/proxy.1, debian/libproxy-tools.manpages: Install a manpage for the
+ proxy command (Closes: #660327)
+
+ -- Laurent Bigonville <bigon at debian.org> Sat, 14 Sep 2013 15:35:03 +0200
+
+libproxy (0.4.11-0ubuntu2) saucy; urgency=low
+
+ * debian/patches/dont_segfault_on_exit.patch:
+ - drop buggy unref calls to fix a segfault (lp: #1182043)
+
+ -- Sebastien Bacher <seb128 at ubuntu.com> Thu, 30 May 2013 13:20:43 +0200
+
+libproxy (0.4.11-0ubuntu1) raring; urgency=low
+
+ * New upstream release
+ - Build fixes with cmake 2.8.10+
+ - Quick release without built binaries / files
+ + Remove these from debian/clean
+ * debian/watch: Update to work with current Google Code website (once more
+ with feeling)
+
+ -- Iain Lane <iain.lane at canonical.com> Thu, 10 Jan 2013 12:17:22 +0000
+
+libproxy (0.4.10-0ubuntu1) raring; urgency=low
+
+ * New upstream release 0.4.10 (LP: #1078915). Selected fixes since 0.4.7:
+ - Fix infinite loop uppon network errors
+ - Only support standalone mozjs185 as mozilla js engine. xulrunner being
+ part of the now lightning fast moving firefox is impossible to be tracked
+ as a dependency and it is not supported by Mozilla to be used in this
+ scenario.
+ - Support building with javascritpcoregtk 1.5 (got split out of webkitgtk).
+ * debian/watch: Update to work with Google code again .
+ * Remove all patches - all applied upstream.
+ * Clean accidently shipped built binaries to ensure we ship those built from
+ this source.
+ * debian/patches/disable-pac-test.patch: Steal patch from Gentoo to disable
+ the get-pac-test which hangs when run from the build.
+ * Bump Standards-Version to 3.9.4, no changes required.
+ * Add basic compile/link/run autopkgtest - thanks to Rafal Cieślak (LP:
+ #1079102)
+
+ -- Iain Lane <iain.lane at canonical.com> Thu, 15 Nov 2012 12:06:57 +0000
+
+libproxy (0.4.7-0ubuntu6) quantal; urgency=low
+
+ * debian/patches/CVE-2012-4504.patch: Cherry-pick upstream r853 to fix
+ buffer overflow when downloading large PAC files.
+
+ -- Iain Lane <iain.lane at canonical.com> Wed, 10 Oct 2012 17:56:14 +0100
+
+libproxy (0.4.7-0ubuntu5) quantal; urgency=low
+
+ * debian/patches/libproxy-gcc-4.7.diff: Cherry-pick patch from upstream svn
+ r833 to fix FTBFS with GCC-4.7 due to missing includes.
+
+ -- Iain Lane <iain.lane at canonical.com> Tue, 25 Sep 2012 12:51:03 +0100
+
+libproxy (0.4.7-0ubuntu4) precise; urgency=low
+
+ * Re-enable webkit pacrunner and build it into its own module package
+ (adding a patch to the upstream build system required to achieve this).
+ (LP: #934088)
+ * Build with webkit3.
+
+ -- Iain Lane <laney at ubuntu.com> Fri, 17 Feb 2012 10:10:45 +0000
+
+libproxy (0.4.7-0ubuntu3) precise; urgency=low
+
+ * Drop libwebkitgtk-dev build dependency. We just got rid of the old
+ webkit-gtk2 stack, we don't want to pull that back in. We already had to
+ disable the webkit plugin as this needs mozjs. (LP: #933913)
+
+ -- Martin Pitt <martin.pitt at ubuntu.com> Fri, 17 Feb 2012 07:54:22 +0100
+
+libproxy (0.4.7-0ubuntu2) precise; urgency=low
+
+ * debian/control: Drop mozjs build dependency and mozjs/webkit plugin
+ packages, mozjs is in universe (and supposed to stay there).
+ * debian/rules: Disable WITH_MOZJS.
+
+ -- Martin Pitt <martin.pitt at ubuntu.com> Wed, 15 Feb 2012 16:21:24 +0100
+
+libproxy (0.4.7-0ubuntu1) precise; urgency=low
+
+ [ Iain Lane ]
+ * New upstream release.
+ * Convert to dh7.
+ * SONAME bump, rename packages accordingly
+ * Remove obsolete patches
+ * Add CLI/Vala bindings.
+ * Also install vala bindings (in -dev package)
+ * Update Standards-Version to 3.9.2
+ * Split modules into individual packages
+ * Link with --as-needed to avoid unnecessary deps
+ * Update copyright
+ * Make library multiarch compatible
+
+ [ Ken VanDine ]
+ * Build against libmozjs185.
+
+ -- Iain Lane <laney at debian.org> Wed, 15 Feb 2012 14:42:54 +0100
+
libproxy (0.3.1-6) unstable; urgency=low
* Swap libmozjs and webkitgtk Recommends. Closes: #699788.
Modified: packages/unstable/libproxy/debian/compat
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/libproxy/debian/compat?rev=40213&op=diff
==============================================================================
--- packages/unstable/libproxy/debian/compat [utf-8] (original)
+++ packages/unstable/libproxy/debian/compat [utf-8] Sun Nov 3 14:18:44 2013
@@ -1 +1 @@
-8
+9
Modified: packages/unstable/libproxy/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/libproxy/debian/control?rev=40213&op=diff
==============================================================================
--- packages/unstable/libproxy/debian/control [utf-8] (original)
+++ packages/unstable/libproxy/debian/control [utf-8] Sun Nov 3 14:18:44 2013
@@ -7,56 +7,122 @@
Section: libs
Priority: optional
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>, Michael Biebl <biebl at debian.org>
-Build-Depends: cdbs (>= 0.4.93~),
- debhelper (>= 8.1.3~),
+Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Laurent Bigonville <bigon at debian.org>
+Build-Depends-Indep: cli-common-dev (>= 0.5.7~), mono-devel (>= 2.4.3)
+Build-Depends: debhelper (>= 9),
gnome-pkg-tools,
- autotools-dev,
+ netbase,
+ cmake,
python-all-dev (>= 2.6.6-3~),
network-manager-dev [linux-any],
libdbus-1-dev,
- libmozjs-dev (>= 6),
+ libmozjs185-dev (>= 1.8.5),
kdelibs5-dev,
libqt4-dev,
- libwebkitgtk-dev,
- gconf2,
+ libwebkitgtk-3.0-dev,
+ libjavascriptcoregtk-3.0-dev,
+ libglib2.0-dev (>= 2.26),
libxmu-dev
-Standards-Version: 3.9.3
+Standards-Version: 3.9.4
X-Python-Version: >= 2.5
Vcs-Svn: svn://anonscm.debian.org/pkg-gnome/packages/unstable/libproxy
-Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-gnome/packages/unstable/libproxy
+Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-gnome/packages/unstable/libproxy/
Homepage: http://code.google.com/p/libproxy/
-Package: libproxy0
+Package: libproxy1
Architecture: any
Multi-Arch: same
Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends},
${misc:Depends}
-Recommends: ${moz:Recommends} | ${webkit:Recommends}
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.
.
This package contains the shared library.
+Package: libproxy1-plugin-gsettings
+Architecture: any
+Multi-Arch: same
+Depends: ${shlibs:Depends},
+ ${misc:Depends},
+ libproxy1 (= ${binary:Version})
+Description: automatic proxy configuration management library (GSettings plugin)
+ libproxy is a lightweight library which makes it easy to develop
+ applications proxy-aware with a simple and stable API.
+ .
+ This package contains the plugin to allow libproxy to read proxy settings from
+ GSettings (GNOME 3)
+
+Package: libproxy1-plugin-kconfig
+Architecture: any
+Multi-Arch: same
+Depends: ${shlibs:Depends},
+ ${misc:Depends},
+ libproxy1 (= ${binary:Version})
+Description: automatic proxy configuration management library (KConfig plugin)
+ libproxy is a lightweight library which makes it easy to develop
+ applications proxy-aware with a simple and stable API.
+ .
+ This package contains the plugin to allow libproxy to read proxy settings from
+ KConfig (KDE 4)
+
+Package: libproxy1-plugin-networkmanager
+Architecture: linux-any
+Multi-Arch: same
+Depends: ${shlibs:Depends},
+ ${misc:Depends},
+ libproxy1 (= ${binary:Version})
+Description: automatic proxy configuration management library (Network Manager plugin)
+ libproxy is a lightweight library which makes it easy to develop
+ applications proxy-aware with a simple and stable API.
+ .
+ This package contains the plugin to allow libproxy to read information from
+ Network Manager.
+
+Package: libproxy1-plugin-mozjs
+Architecture: any
+Multi-Arch: same
+Depends: ${shlibs:Depends},
+ ${misc:Depends},
+ libproxy1 (= ${binary:Version})
+Description: automatic proxy configuration management library (mozjs plugin)
+ libproxy is a lightweight library which makes it easy to develop
+ applications proxy-aware with a simple and stable API.
+ .
+ This package contains the plugin to allow libproxy to interpret PAC files
+ using mozjs
+
+Package: libproxy1-plugin-webkit
+Architecture: any
+Multi-Arch: same
+Depends: ${shlibs:Depends},
+ ${misc:Depends},
+ libproxy1 (= ${binary:Version})
+Description: automatic proxy configuration management library (Webkit plugin)
+ libproxy is a lightweight library which makes it easy to develop
+ applications proxy-aware with a simple and stable API.
+ .
+ This package contains the plugin to allow libproxy to interpret PAC files
+ using Webkit
+
Package: libproxy-dev
Architecture: any
Multi-Arch: same
Section: libdevel
+XS-Testsuite: autopkgtest
Depends: ${shlibs:Depends},
${misc:Depends},
- libproxy0 (= ${binary:Version})
+ libproxy1 (= ${binary:Version})
Description: automatic proxy configuration management library (devel)
libproxy is a lightweight library which makes it easy to develop
applications proxy-aware with a simple and stable API.
.
- This package contains the development files.
+ This package contains the development files including vala bindings.
Package: libproxy-tools
Section: utils
Architecture: any
-Multi-Arch: foreign
Depends: ${shlibs:Depends},
${misc:Depends}
Description: automatic proxy configuration management library (tools)
@@ -71,9 +137,33 @@
Section: python
Depends: ${python:Depends},
${misc:Depends},
- libproxy0 (>= ${source:Version})
+ libproxy1 (>= ${source:Version})
Description: automatic proxy configuration management library (python)
libproxy is a lightweight library which makes it easy to develop
applications proxy-aware with a simple and stable API.
.
This package contains the Python bindings.
+
+Package: libproxy0.4-cil
+Architecture: all
+Section: cli-mono
+Depends: ${cli:Depends},
+ ${misc:Depends}
+Description: automatic proxy configuration management library (CLI)
+ libproxy is a lightweight library which makes it easy to develop
+ applications proxy-aware with a simple and stable API.
+ .
+ This package contains the CLI bindings.
+
+Package: libproxy-cil-dev
+Architecture: all
+Section: cli-mono
+Depends: ${cli:Depends},
+ ${misc:Depends},
+ libproxy0.4-cil (= ${binary:Version})
+Description: automatic proxy configuration management library (CLI devel)
+ libproxy is a lightweight library which makes it easy to develop
+ applications proxy-aware with a simple and stable API.
+ .
+ This package contains development files for the CLI bindings, and should be
+ used for compilation.
Modified: packages/unstable/libproxy/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/libproxy/debian/control.in?rev=40213&op=diff
==============================================================================
--- packages/unstable/libproxy/debian/control.in [utf-8] (original)
+++ packages/unstable/libproxy/debian/control.in [utf-8] Sun Nov 3 14:18:44 2013
@@ -3,55 +3,121 @@
Priority: optional
Maintainer: Emilio Pozuelo Monfort <pochu at debian.org>
Uploaders: @GNOME_TEAM@
-Build-Depends: cdbs (>= 0.4.93~),
- debhelper (>= 8.1.3~),
+Build-Depends-Indep: cli-common-dev (>= 0.5.7~), mono-devel (>= 2.4.3)
+Build-Depends: debhelper (>= 9),
gnome-pkg-tools,
- autotools-dev,
+ netbase,
+ cmake,
python-all-dev (>= 2.6.6-3~),
network-manager-dev [linux-any],
libdbus-1-dev,
- libmozjs-dev (>= 6),
+ libmozjs185-dev (>= 1.8.5),
kdelibs5-dev,
libqt4-dev,
- libwebkitgtk-dev,
- gconf2,
+ libwebkitgtk-3.0-dev,
+ libjavascriptcoregtk-3.0-dev,
+ libglib2.0-dev (>= 2.26),
libxmu-dev
-Standards-Version: 3.9.3
+Standards-Version: 3.9.4
X-Python-Version: >= 2.5
Vcs-Svn: svn://anonscm.debian.org/pkg-gnome/packages/unstable/libproxy
-Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-gnome/packages/unstable/libproxy
+Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-gnome/packages/unstable/libproxy/
Homepage: http://code.google.com/p/libproxy/
-Package: libproxy0
+Package: libproxy1
Architecture: any
Multi-Arch: same
Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends},
${misc:Depends}
-Recommends: ${moz:Recommends} | ${webkit:Recommends}
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.
.
This package contains the shared library.
+Package: libproxy1-plugin-gsettings
+Architecture: any
+Multi-Arch: same
+Depends: ${shlibs:Depends},
+ ${misc:Depends},
+ libproxy1 (= ${binary:Version})
+Description: automatic proxy configuration management library (GSettings plugin)
+ libproxy is a lightweight library which makes it easy to develop
+ applications proxy-aware with a simple and stable API.
+ .
+ This package contains the plugin to allow libproxy to read proxy settings from
+ GSettings (GNOME 3)
+
+Package: libproxy1-plugin-kconfig
+Architecture: any
+Multi-Arch: same
+Depends: ${shlibs:Depends},
+ ${misc:Depends},
+ libproxy1 (= ${binary:Version})
+Description: automatic proxy configuration management library (KConfig plugin)
+ libproxy is a lightweight library which makes it easy to develop
+ applications proxy-aware with a simple and stable API.
+ .
+ This package contains the plugin to allow libproxy to read proxy settings from
+ KConfig (KDE 4)
+
+Package: libproxy1-plugin-networkmanager
+Architecture: linux-any
+Multi-Arch: same
+Depends: ${shlibs:Depends},
+ ${misc:Depends},
+ libproxy1 (= ${binary:Version})
+Description: automatic proxy configuration management library (Network Manager plugin)
+ libproxy is a lightweight library which makes it easy to develop
+ applications proxy-aware with a simple and stable API.
+ .
+ This package contains the plugin to allow libproxy to read information from
+ Network Manager.
+
+Package: libproxy1-plugin-mozjs
+Architecture: any
+Multi-Arch: same
+Depends: ${shlibs:Depends},
+ ${misc:Depends},
+ libproxy1 (= ${binary:Version})
+Description: automatic proxy configuration management library (mozjs plugin)
+ libproxy is a lightweight library which makes it easy to develop
+ applications proxy-aware with a simple and stable API.
+ .
+ This package contains the plugin to allow libproxy to interpret PAC files
+ using mozjs
+
+Package: libproxy1-plugin-webkit
+Architecture: any
+Multi-Arch: same
+Depends: ${shlibs:Depends},
+ ${misc:Depends},
+ libproxy1 (= ${binary:Version})
+Description: automatic proxy configuration management library (Webkit plugin)
+ libproxy is a lightweight library which makes it easy to develop
+ applications proxy-aware with a simple and stable API.
+ .
+ This package contains the plugin to allow libproxy to interpret PAC files
+ using Webkit
+
Package: libproxy-dev
Architecture: any
Multi-Arch: same
Section: libdevel
+XS-Testsuite: autopkgtest
Depends: ${shlibs:Depends},
${misc:Depends},
- libproxy0 (= ${binary:Version})
+ libproxy1 (= ${binary:Version})
Description: automatic proxy configuration management library (devel)
libproxy is a lightweight library which makes it easy to develop
applications proxy-aware with a simple and stable API.
.
- This package contains the development files.
+ This package contains the development files including vala bindings.
Package: libproxy-tools
Section: utils
Architecture: any
-Multi-Arch: foreign
Depends: ${shlibs:Depends},
${misc:Depends}
Description: automatic proxy configuration management library (tools)
@@ -66,9 +132,33 @@
Section: python
Depends: ${python:Depends},
${misc:Depends},
- libproxy0 (>= ${source:Version})
+ libproxy1 (>= ${source:Version})
Description: automatic proxy configuration management library (python)
libproxy is a lightweight library which makes it easy to develop
applications proxy-aware with a simple and stable API.
.
This package contains the Python bindings.
+
+Package: libproxy0.4-cil
+Architecture: all
+Section: cli-mono
+Depends: ${cli:Depends},
+ ${misc:Depends}
+Description: automatic proxy configuration management library (CLI)
+ libproxy is a lightweight library which makes it easy to develop
+ applications proxy-aware with a simple and stable API.
+ .
+ This package contains the CLI bindings.
+
+Package: libproxy-cil-dev
+Architecture: all
+Section: cli-mono
+Depends: ${cli:Depends},
+ ${misc:Depends},
+ libproxy0.4-cil (= ${binary:Version})
+Description: automatic proxy configuration management library (CLI devel)
+ libproxy is a lightweight library which makes it easy to develop
+ applications proxy-aware with a simple and stable API.
+ .
+ This package contains development files for the CLI bindings, and should be
+ used for compilation.
Modified: packages/unstable/libproxy/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/libproxy/debian/copyright?rev=40213&op=diff
==============================================================================
--- packages/unstable/libproxy/debian/copyright [utf-8] (original)
+++ packages/unstable/libproxy/debian/copyright [utf-8] Sun Nov 3 14:18:44 2013
@@ -5,23 +5,35 @@
Upstream Authors:
- Nathaniel McCallum <nathaniel at natemccallum.com>
- Alex Panait <kippled at gmail.com>
+ Nathaniel McCallum <nathaniel at natemccallum.com>
+ Alex Panait <kippled at gmail.com>
+ Dominique Leuenberger <dominique at leuenberger.net>
Copyright:
- Copyright (C) 2006 Nathaniel McCallum <nathaniel at natemccallum.com>
+ Copyright (C) 2006-2010 Nathaniel McCallum <nathaniel at natemccallum.com>
The file pacutils.js is:
Copyright (c) Netscape Communications Corporation. 1998
+ The file libproxy/Findlibproxy.cmake.in is:
+ Copyright (c) 2010, Dominique Leuenberger
+
+ The file libproxy/modules/pxgsettings.cpp is additionally:
+ Copyright (C) 2011 Dominique Leuenberger <dominique at leuenberger.net>
+
+ The file libproxy/url.cpp is based on work which is:
+ Copyright (C) 2006-2007 Red Hat, Inc.
+
+ The file libproxy/modules/config_sysconfig.cpp is:
+ Copyright (C) 2010 Novell Inc
License:
This package 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 of the License, or (at your option) any later version.
+ version 2.1 of the License, or (at your option) any later version.
This package is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -33,27 +45,27 @@
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
On Debian systems, the complete text of the GNU Lesser General
-Public License can be found in `/usr/share/common-licenses/LGPL'.
+Public License can be found in `/usr/share/common-licenses/LGPL-2.1'.
The Debian packaging is copyright 2008, Emilio Pozuelo Monfort <pochu at ubuntu.com> and
is licensed under the GPL, see `/usr/share/common-licenses/GPL'.
+For cmake/CMakeCSharpInformation.cmake and
+cmake/CMakeDetermineCSharpCompiler.cmake the following applies:
-For src/plugins/xhasclient.c, the following applies:
- Copyright 1989, 1998 The Open Group
+ copyright (c) 2007, 2009 Arno Rehn <arno at arnorehn.de>
+ copyright (c) 2008 Helio castro <helio at kde.org>
- Permission to use, copy, modify, distribute, and sell this software and its
- documentation for any purpose is hereby granted without fee, provided that
- the above copyright notice appear in all copies and that both that
- copyright notice and this permission notice appear in supporting
- documentation.
+ 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; either version 2
+ of the License, or (at your option) any later version.
- The above copyright notice and this permission notice shall be included in
- all copies or substantial portions of the Software.
+ 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.
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
- AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ 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 Street, Fifth Floor, Boston, MA 02110-1301, USA.
Modified: packages/unstable/libproxy/debian/libproxy-dev.install
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/libproxy/debian/libproxy-dev.install?rev=40213&op=diff
==============================================================================
--- packages/unstable/libproxy/debian/libproxy-dev.install [utf-8] (original)
+++ packages/unstable/libproxy/debian/libproxy-dev.install [utf-8] Sun Nov 3 14:18:44 2013
@@ -1,3 +1,4 @@
usr/include
usr/lib/*/pkgconfig
usr/lib/*/libproxy.so
+usr/share/vala/vapi
Modified: packages/unstable/libproxy/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/libproxy/debian/patches/series?rev=40213&op=diff
==============================================================================
--- packages/unstable/libproxy/debian/patches/series [utf-8] (original)
+++ packages/unstable/libproxy/debian/patches/series [utf-8] Sun Nov 3 14:18:44 2013
@@ -1,4 +1,3 @@
-01_pac_http.patch
-02_url_user.patch
-03_format-security.patch
-cve-2012-4505.patch
+disable-pac-test.patch
+dont_segfault_on_exit.patch
+fix-mozjs-detection.patch
Modified: packages/unstable/libproxy/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/libproxy/debian/rules?rev=40213&op=diff
==============================================================================
--- packages/unstable/libproxy/debian/rules [utf-8] (original)
+++ packages/unstable/libproxy/debian/rules [utf-8] Sun Nov 3 14:18:44 2013
@@ -1,24 +1,50 @@
#!/usr/bin/make -f
-include /usr/share/cdbs/1/class/autotools.mk
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/utils.mk
-include /usr/share/cdbs/1/class/gnome.mk
include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
-SHLIBVER := 0.2.3
-libproxy := $(shell sed -nr 's/^Package:[[:space:]]*(libproxy[0-9]+)[[:space:]]*$$/\1/p' debian/control)
+SHLIBVER := 0.4.11
+libproxy := $(shell sed -nr 's/^Package:[[:space:]]*(libproxy[0-9]+)[[:space:]]*$$/\1/p' debian/control.in)
-DEB_DH_MAKESHLIBS_ARGS_$(libproxy) = -V '$(libproxy) (>= $(SHLIBVER))'
-DEB_DH_SHLIBDEPS_ARGS_$(libproxy) := -Xmodules
-DEB_DH_GENCONTROL_ARGS_$(libproxy) = -- \
- -Vmoz:Recommends=$(shell grep -o "libmoz[a-z0-9]*" debian/libproxy0.substvars) \
- -Vwebkit:Recommends=$(shell grep -o "libwebkit[a-z0-9.-]*" debian/libproxy0.substvars)
-DEB_CONFIGURE_EXTRA_FLAGS += --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH)
+#export DH_VERBOSE=1
-binary-install/python-libproxy::
- dh_python2 -p$(cdbs_curpkg)
+export LDFLAGS := $(shell dpkg-buildflags --get LDFLAGS) -Wl,--as-needed
-binary-install/$(libproxy)::
- dh_shlibdeps -plibproxy0 -- -pmodules
- rm debian/$(libproxy)/usr/lib/*/libproxy/*/modules/wpad_dnsdevolution.so
+# only invoke dh --with cli if cli-common-dev is present
+WITH_CLI = --with cli
+WITH_DOTNET = -DWITH_DOTNET=ON
+ifeq (,$(wildcard /usr/share/perl5/Debian/Debhelper/Sequence/cli.pm))
+WITH_CLI =
+WITH_DOTNET = -DWITH_DOTNET=OFF
+endif
+
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+
+CONFIGURE_FLAGS = $(WITH_DOTNET) \
+ -DWITH_VALA=ON \
+ -DWITH_GNOME3=ON \
+ -DWITH_MOZJS=ON \
+ -DWITH_WEBKIT3=ON \
+ -DGMCS_EXECUTABLE=/usr/bin/mono-csc \
+ -DCMAKE_SKIP_RPATH=ON \
+ -DBIPR=0 \
+ -DLIB_INSTALL_DIR=/usr/lib/$(DEB_HOST_MULTIARCH) \
+ -DLIBEXEC_INSTALL_DIR=/usr/lib/$(DEB_HOST_MULTIARCH)/libproxy/$(SHLIBVER)
+
+override_dh_auto_configure:
+ dh_auto_configure -- $(CONFIGURE_FLAGS)
+
+override_dh_install-arch:
+ dh_install
+ rm -f \
+ debian/libproxy-dev/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig/libproxy-sharp-*.pc
+
+override_dh_install-indep:
+ dh_install
+ sed -i 's!/usr/lib/mono/libproxy-sharp!/usr/lib/cli/libproxy-sharp-0.4!' \
+ debian/libproxy-cil-dev/usr/lib/pkgconfig/libproxy-sharp-1.0.pc
+
+override_dh_makeshlibs:
+ dh_makeshlibs -V '$(libproxy) (>= $(SHLIBVER))' -- -c4
+
+%:
+ dh $@ $(WITH_CLI) --with python2
Modified: packages/unstable/libproxy/debian/watch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/libproxy/debian/watch?rev=40213&op=diff
==============================================================================
--- packages/unstable/libproxy/debian/watch [utf-8] (original)
+++ packages/unstable/libproxy/debian/watch [utf-8] Sun Nov 3 14:18:44 2013
@@ -1,4 +1,4 @@
version=3
http://code.google.com/p/libproxy/downloads/list \
- http://libproxy.googlecode.com/files/libproxy-(.*).tar.bz2
+ .*/libproxy-(\d\S*)\.(?:zip|tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz)))
More information about the pkg-gnome-commits
mailing list