diff -Nru libproxy-0.4.11/debian/changelog libproxy-0.4.11/debian/changelog --- libproxy-0.4.11/debian/changelog 2015-07-29 15:01:57.000000000 +0000 +++ libproxy-0.4.11/debian/changelog 2016-02-16 13:39:32.000000000 +0000 @@ -1,33 +1,48 @@ -libproxy (0.4.11-4ubuntu3~gcc5.3) wily; urgency=medium +libproxy (0.4.11-5ubuntu1) xenial; urgency=medium - * debian/rules: updated sed command to deal with v5 version - - -- Sebastien Bacher Wed, 29 Jul 2015 17:01:39 +0200 + * Resynchronise with Debian. Remaining change: + - Disable mozjs support. It's in universe. -libproxy (0.4.11-4ubuntu3~gcc5.2) wily; urgency=medium + -- Iain Lane Tue, 16 Feb 2016 13:39:32 +0000 - * Renamed library for gcc5 transition libproxy1 -> libproxy1v5 +libproxy (0.4.11-5) unstable; urgency=medium - -- Sebastien Bacher Wed, 29 Jul 2015 16:01:17 +0200 + [ Peter Pentchev ] + * Add explicit zlib build-dependency (Closes: #758465) + * Break a couple of build dependency loops (Closes: #758466) + * Add build profile annotations to debian/control (Closes: #758467) -libproxy (0.4.11-4ubuntu3~gcc5.1) wily; urgency=medium + [ Andreas Henriksson ] + * Build-depend on dpkg-dev (>= 1.17.2) and bump debhelper to >= 9.20140227 + - these versions introduced build profiles support. + * Bump Standards-Version to 3.9.5 - * No-change test rebuild for g++5 ABI transition + [ Iain Lane ] + * Ack the NMUs, thanks! + * Fix the build profiles syntax to the current version. + * debian/patches/0001-pacrunner_webkit-allow-linking-against-javascriptcor.patch: + Cherry-pick - allow building against webkit2gtk. Update BDs too. + * Add Enhances: from the plugin packages to the library so that people can + find them easier. (Closes: #768435, #768437) + * Use the substvar we just added to add Depends on our shared package. - -- Steve Langasek Wed, 15 Jul 2015 17:08:59 +0000 + -- Iain Lane Tue, 16 Feb 2016 13:17:41 +0000 -libproxy (0.4.11-4ubuntu2) vivid; urgency=medium +libproxy (0.4.11-4.2) unstable; urgency=medium - * No change rebuild to get debug symbols on all architectures. + * Non maintainer upload. + * libproxy1-plugin-mozjs: Fix dependency on new libproxy1v5. - -- Brian Murray Fri, 14 Nov 2014 14:13:18 -0800 + -- Matthias Klose Tue, 04 Aug 2015 21:42:23 +0200 -libproxy (0.4.11-4ubuntu1) utopic; urgency=low +libproxy (0.4.11-4.1) unstable; urgency=medium - * Merge from Debian unstable. Remaining changes: - - Disable mozjs support. It's in universe. + * Non maintainer upload. + * Rename library libproxy1 -> libproxy1v5, needed as a follow-up transition + for the libstdc++6 ABI changes (patch by Sebastien Bacher). + Addresses: #794402. - -- William Grant Fri, 02 May 2014 10:50:26 +1000 + -- Matthias Klose Tue, 04 Aug 2015 20:15:37 +0200 libproxy (0.4.11-4) unstable; urgency=low @@ -71,19 +86,6 @@ -- Laurent Bigonville Sat, 14 Sep 2013 15:35:03 +0200 -libproxy (0.4.11-0ubuntu4) saucy; urgency=low - - * Build libproxy1-plugin-kconfig on arm64 now that we have kdelibs5-dev. - - -- William Grant Tue, 15 Oct 2013 00:28:07 +1100 - -libproxy (0.4.11-0ubuntu3) saucy; urgency=low - - * Don't build libproxy1-plugin-kconfig on AArch64, kde5libs-dev - not yet available. - - -- Matthias Klose Mon, 14 Oct 2013 05:33:40 +0200 - libproxy (0.4.11-0ubuntu2) saucy; urgency=low * debian/patches/dont_segfault_on_exit.patch: diff -Nru libproxy-0.4.11/debian/control libproxy-0.4.11/debian/control --- libproxy-0.4.11/debian/control 2015-07-29 15:02:00.000000000 +0000 +++ libproxy-0.4.11/debian/control 2016-02-16 13:40:56.000000000 +0000 @@ -7,25 +7,27 @@ Priority: optional Maintainer: Ubuntu Developers XSBC-Original-Maintainer: Emilio Pozuelo Monfort -Uploaders: Debian GNOME Maintainers , Laurent Bigonville -Build-Depends-Indep: cli-common-dev (>= 0.5.7~), mono-devel (>= 2.4.3) -Build-Depends: debhelper (>= 9), +Uploaders: Debian GNOME Maintainers , Iain Lane , Laurent Bigonville +Build-Depends-Indep: cli-common-dev (>= 0.5.7~) , mono-devel (>= 2.4.3) +Build-Depends: debhelper (>= 9.20140227), + dpkg-dev (>= 1.17.2), gnome-pkg-tools, netbase, cmake, + zlib1g-dev, python-all-dev (>= 2.6.6-3~), network-manager-dev [linux-any], libdbus-1-dev, - kdelibs5-dev, - libqt4-dev, - libwebkitgtk-3.0-dev, - libjavascriptcoregtk-3.0-dev, - libglib2.0-dev (>= 2.26), - libxmu-dev -Standards-Version: 3.9.4 + kdelibs5-dev , + libqt4-dev , + libwebkit2gtk-4.0-dev , + libjavascriptcoregtk-4.0-dev , + libglib2.0-dev (>= 2.26) , + libxmu-dev +Standards-Version: 3.9.5 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: https://anonscm.debian.org/viewvc/pkg-gnome/packages/unstable/libproxy/ Homepage: http://code.google.com/p/libproxy/ Package: libproxy1v5 @@ -45,9 +47,11 @@ Package: libproxy1-plugin-gsettings Architecture: any Multi-Arch: same +Build-Profiles: Depends: ${shlibs:Depends}, ${misc:Depends}, - libproxy1v5 (= ${binary:Version}) + ${libproxy} (= ${binary:Version}) +Enhances: ${libproxy} 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. @@ -58,9 +62,11 @@ Package: libproxy1-plugin-kconfig Architecture: any Multi-Arch: same +Build-Profiles: Depends: ${shlibs:Depends}, ${misc:Depends}, - libproxy1v5 (= ${binary:Version}) + ${libproxy} (= ${binary:Version}) +Enhances: ${libproxy} 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. @@ -73,7 +79,8 @@ Multi-Arch: same Depends: ${shlibs:Depends}, ${misc:Depends}, - libproxy1v5 (= ${binary:Version}) + ${libproxy} (= ${binary:Version}) +Enhances: ${libproxy} 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. @@ -84,9 +91,11 @@ Package: libproxy1-plugin-webkit Architecture: any Multi-Arch: same +Build-Profiles: Depends: ${shlibs:Depends}, ${misc:Depends}, - libproxy1v5 (= ${binary:Version}) + ${libproxy} (= ${binary:Version}) +Enhances: ${libproxy} 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. @@ -98,10 +107,9 @@ Architecture: any Multi-Arch: same Section: libdevel -XS-Testsuite: autopkgtest Depends: ${shlibs:Depends}, ${misc:Depends}, - libproxy1v5 (= ${binary:Version}) + ${libproxy} (= ${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. @@ -125,7 +133,7 @@ Section: python Depends: ${python:Depends}, ${misc:Depends}, - libproxy1v5 (>= ${source:Version}) + ${libproxy} (>= ${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. @@ -135,6 +143,7 @@ Package: libproxy0.4-cil Architecture: all Section: cli-mono +Build-Profiles: Depends: ${cli:Depends}, ${misc:Depends} Description: automatic proxy configuration management library (CLI) @@ -146,6 +155,7 @@ Package: libproxy-cil-dev Architecture: all Section: cli-mono +Build-Profiles: Depends: ${cli:Depends}, ${misc:Depends}, libproxy0.4-cil (= ${binary:Version}) diff -Nru libproxy-0.4.11/debian/control.in libproxy-0.4.11/debian/control.in --- libproxy-0.4.11/debian/control.in 2015-07-29 14:01:17.000000000 +0000 +++ libproxy-0.4.11/debian/control.in 2016-02-16 13:40:54.000000000 +0000 @@ -4,24 +4,26 @@ Maintainer: Ubuntu Developers XSBC-Original-Maintainer: Emilio Pozuelo Monfort Uploaders: @GNOME_TEAM@ -Build-Depends-Indep: cli-common-dev (>= 0.5.7~), mono-devel (>= 2.4.3) -Build-Depends: debhelper (>= 9), +Build-Depends-Indep: cli-common-dev (>= 0.5.7~) , mono-devel (>= 2.4.3) +Build-Depends: debhelper (>= 9.20140227), + dpkg-dev (>= 1.17.2), gnome-pkg-tools, netbase, cmake, + zlib1g-dev, python-all-dev (>= 2.6.6-3~), network-manager-dev [linux-any], libdbus-1-dev, - kdelibs5-dev, - libqt4-dev, - libwebkitgtk-3.0-dev, - libjavascriptcoregtk-3.0-dev, - libglib2.0-dev (>= 2.26), - libxmu-dev -Standards-Version: 3.9.4 + kdelibs5-dev , + libqt4-dev , + libwebkit2gtk-4.0-dev , + libjavascriptcoregtk-4.0-dev , + libglib2.0-dev (>= 2.26) , + libxmu-dev +Standards-Version: 3.9.5 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: https://anonscm.debian.org/viewvc/pkg-gnome/packages/unstable/libproxy/ Homepage: http://code.google.com/p/libproxy/ Package: libproxy1v5 @@ -41,9 +43,11 @@ Package: libproxy1-plugin-gsettings Architecture: any Multi-Arch: same +Build-Profiles: Depends: ${shlibs:Depends}, ${misc:Depends}, - libproxy1v5 (= ${binary:Version}) + ${libproxy} (= ${binary:Version}) +Enhances: ${libproxy} 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. @@ -54,9 +58,11 @@ Package: libproxy1-plugin-kconfig Architecture: any Multi-Arch: same +Build-Profiles: Depends: ${shlibs:Depends}, ${misc:Depends}, - libproxy1v5 (= ${binary:Version}) + ${libproxy} (= ${binary:Version}) +Enhances: ${libproxy} 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. @@ -69,7 +75,8 @@ Multi-Arch: same Depends: ${shlibs:Depends}, ${misc:Depends}, - libproxy1v5 (= ${binary:Version}) + ${libproxy} (= ${binary:Version}) +Enhances: ${libproxy} 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. @@ -80,9 +87,11 @@ Package: libproxy1-plugin-webkit Architecture: any Multi-Arch: same +Build-Profiles: Depends: ${shlibs:Depends}, ${misc:Depends}, - libproxy1v5 (= ${binary:Version}) + ${libproxy} (= ${binary:Version}) +Enhances: ${libproxy} 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. @@ -94,10 +103,9 @@ Architecture: any Multi-Arch: same Section: libdevel -XS-Testsuite: autopkgtest Depends: ${shlibs:Depends}, ${misc:Depends}, - libproxy1v5 (= ${binary:Version}) + ${libproxy} (= ${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. @@ -121,7 +129,7 @@ Section: python Depends: ${python:Depends}, ${misc:Depends}, - libproxy1v5 (>= ${source:Version}) + ${libproxy} (>= ${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. @@ -131,6 +139,7 @@ Package: libproxy0.4-cil Architecture: all Section: cli-mono +Build-Profiles: Depends: ${cli:Depends}, ${misc:Depends} Description: automatic proxy configuration management library (CLI) @@ -142,6 +151,7 @@ Package: libproxy-cil-dev Architecture: all Section: cli-mono +Build-Profiles: Depends: ${cli:Depends}, ${misc:Depends}, libproxy0.4-cil (= ${binary:Version}) diff -Nru libproxy-0.4.11/debian/libproxy1-plugin-mozjs.install libproxy-0.4.11/debian/libproxy1-plugin-mozjs.install --- libproxy-0.4.11/debian/libproxy1-plugin-mozjs.install 2012-02-15 14:08:52.000000000 +0000 +++ libproxy-0.4.11/debian/libproxy1-plugin-mozjs.install 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -usr/lib/*/libproxy/*/modules/pacrunner_mozjs.so diff -Nru libproxy-0.4.11/debian/patches/0001-pacrunner_webkit-allow-linking-against-javascriptcor.patch libproxy-0.4.11/debian/patches/0001-pacrunner_webkit-allow-linking-against-javascriptcor.patch --- libproxy-0.4.11/debian/patches/0001-pacrunner_webkit-allow-linking-against-javascriptcor.patch 1970-01-01 00:00:00.000000000 +0000 +++ libproxy-0.4.11/debian/patches/0001-pacrunner_webkit-allow-linking-against-javascriptcor.patch 2016-02-16 13:02:58.000000000 +0000 @@ -0,0 +1,35 @@ +From 00975fa11220af11398f9d89ee2ee0cf17c655d2 Mon Sep 17 00:00:00 2001 +From: Dominique Leuenberger +Date: Mon, 18 Jan 2016 19:13:14 +0100 +Subject: [PATCH] pacrunner_webkit: allow linking against javascriptcore-4.0 + +--- + NEWS | 5 +++++ + libproxy/cmake/modules/pacrunner_webkit.cmk | 9 ++++++--- + 2 files changed, 11 insertions(+), 3 deletions(-) + +diff --git a/libproxy/cmake/modules/pacrunner_webkit.cmk b/libproxy/cmake/modules/pacrunner_webkit.cmk +index 0a99d18..c5afcc2 100644 +--- a/libproxy/cmake/modules/pacrunner_webkit.cmk ++++ b/libproxy/cmake/modules/pacrunner_webkit.cmk +@@ -13,11 +13,14 @@ elseif(APPLE) + endif() + else() + if(WITH_WEBKIT3) +- px_check_modules(WEBKIT "javascriptcoregtk-3.0 >= 1.5.0") ++ px_check_modules(WEBKIT "javascriptcoregtk-4.0") + if(NOT WEBKIT_LIBRARIES) +- px_check_modules(WEBKIT "webkitgtk-3.0 < 1.5.0") ++ px_check_modules(WEBKIT "javascriptcoregtk-3.0 >= 1.5.0") ++ if(NOT WEBKIT_LIBRARIES) ++ px_check_modules(WEBKIT "webkitgtk-3.0 < 1.5.0") ++ endif(NOT WEBKIT_LIBRARIES) + endif(NOT WEBKIT_LIBRARIES) +- else() ++ else(WITH_WEBKIT3) + px_check_modules(WEBKIT webkit-1.0) + endif() + endif() +-- +2.7.0 + diff -Nru libproxy-0.4.11/debian/patches/series libproxy-0.4.11/debian/patches/series --- libproxy-0.4.11/debian/patches/series 2014-05-02 00:49:42.000000000 +0000 +++ libproxy-0.4.11/debian/patches/series 2016-02-16 13:02:58.000000000 +0000 @@ -1,3 +1,4 @@ disable-pac-test.patch dont_segfault_on_exit.patch fix-mozjs-detection.patch +0001-pacrunner_webkit-allow-linking-against-javascriptcor.patch diff -Nru libproxy-0.4.11/debian/rules libproxy-0.4.11/debian/rules --- libproxy-0.4.11/debian/rules 2015-07-29 15:01:29.000000000 +0000 +++ libproxy-0.4.11/debian/rules 2016-02-16 13:32:21.000000000 +0000 @@ -3,33 +3,44 @@ include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk SHLIBVER := 0.4.11 -libproxy := $(shell sed -nr 's/^Package:[[:space:]]*(libproxy[0-9]+v5)[[:space:]]*$$/\1/p' debian/control.in) +libproxy := $(shell sed -nr 's/^Package:[[:space:]]*(libproxy[0-9]+(v5)?)[[:space:]]*$$/\1/p' debian/control.in) #export DH_VERBOSE=1 export LDFLAGS := $(shell dpkg-buildflags --get LDFLAGS) -Wl,--as-needed # 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 +ifneq (,$(wildcard /usr/share/perl5/Debian/Debhelper/Sequence/cli.pm)) +ifeq (,$(filter stage1,$(DEB_BUILD_PROFILES))) +WITH_CLI = --with cli +WITH_DOTNET = -DWITH_DOTNET=ON +endif endif DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) CONFIGURE_FLAGS = $(WITH_DOTNET) \ -DWITH_VALA=ON \ - -DWITH_GNOME3=ON \ - -DWITH_MOZJS=OFF \ - -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) +ifeq (,$(filter stage1,$(DEB_BUILD_PROFILES))) +CONFIGURE_FLAGS += \ + -DWITH_GNOME3=ON \ + -DWITH_MOZJS=OFF \ + -DWITH_WEBKIT3=ON +else +CONFIGURE_FLAGS += \ + -DWITH_GNOME3=OFF \ + -DWITH_MOZJS=OFF \ + -DWITH_WEBKIT3=OFF +endif + override_dh_auto_configure: dh_auto_configure -- $(CONFIGURE_FLAGS) @@ -40,11 +51,16 @@ override_dh_install-indep: dh_install +ifeq (,$(filter stage1,$(DEB_BUILD_PROFILES))) 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 +endif override_dh_makeshlibs: dh_makeshlibs -V '$(libproxy) (>= $(SHLIBVER))' -- -c4 +override_dh_gencontrol: + dh_gencontrol -- -Vlibproxy=${libproxy} + %: dh $@ $(WITH_CLI) --with python2