Source: libproxy Version: 0.4.11-4 Severity: wishlist Tags: patch Hi,
As promised, here's the second part of the patch; it adds build profile annotations to the control file and simplifies the changes to the rules file a bit. There's a little catch: since the build profile-aware versions of the build tools (dpkg-dev, debhelper, sbuild) have not hit a stable release yet, making this change might have to wait until Jessie is released, since right now the Debian archive build infrastructure cannot handle these annotations. Thanks again for your work on Debian! G'luck, Peter -- System Information: Debian Release: jessie/sid APT prefers testing APT policy: (990, 'testing') Architecture: amd64 (x86_64) Foreign Architectures: i386 Kernel: Linux 3.14-2-amd64 (SMP w/4 CPU cores) Locale: LANG=bg_BG.UTF-8, LC_CTYPE=bg_BG.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash
From 03b1656a6faeed50c66583566d9ab81f54f22038 Mon Sep 17 00:00:00 2001 From: Peter Pentchev <[email protected]> Date: Sat, 2 Aug 2014 02:25:32 +0300 Subject: [PATCH 1/2] Add build profile annotations to debian/control. Add the <!profile.stage1> and Build-Profiles: stage1 annotations to the debian/control file. Remove the -N... debhelper options from the rules file. --- debian/control.in | 26 ++++++++++++++------------ debian/rules | 10 ++++------ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/debian/control.in b/debian/control.in index a9c838b..d1fdf00 100644 --- a/debian/control.in +++ b/debian/control.in @@ -3,11 +3,7 @@ Section: libs Priority: optional Maintainer: Emilio Pozuelo Monfort <[email protected]> Uploaders: @GNOME_TEAM@ -# In the stage1 build profile, remove both cli-common-dev and mono-devel. -Build-Depends-Indep: cli-common-dev (>= 0.5.7~), mono-devel (>= 2.4.3) -# In the stage1 build profile, remove libmozjs185-dev, kdelibs5-dev, -# libqt4-dev, libwebkitgtk-3.0-dev, libjavascriptcoregtk-3.0-dev, -# libglib2.0-dev, libxmu-dev. +Build-Depends-Indep: cli-common-dev (>= 0.5.7~) <!profile.stage1>, mono-devel (>= 2.4.3) <!profile.stage1> Build-Depends: debhelper (>= 9), gnome-pkg-tools, netbase, @@ -16,13 +12,13 @@ Build-Depends: debhelper (>= 9), python-all-dev (>= 2.6.6-3~), network-manager-dev [linux-any], libdbus-1-dev, - libmozjs185-dev (>= 1.8.5), - kdelibs5-dev, - libqt4-dev, - libwebkitgtk-3.0-dev, - libjavascriptcoregtk-3.0-dev, - libglib2.0-dev (>= 2.26), - libxmu-dev + libmozjs185-dev (>= 1.8.5) <!profile.stage1>, + kdelibs5-dev <!profile.stage1>, + libqt4-dev <!profile.stage1>, + libwebkitgtk-3.0-dev <!profile.stage1>, + libjavascriptcoregtk-3.0-dev <!profile.stage1>, + libglib2.0-dev (>= 2.26) <!profile.stage1>, + libxmu-dev <!profile.stage1> Standards-Version: 3.9.4 X-Python-Version: >= 2.5 Vcs-Svn: svn://anonscm.debian.org/pkg-gnome/packages/unstable/libproxy @@ -44,6 +40,7 @@ Description: automatic proxy configuration management library (shared) Package: libproxy1-plugin-gsettings Architecture: any Multi-Arch: same +Build-Profiles: !stage1 Depends: ${shlibs:Depends}, ${misc:Depends}, libproxy1 (= ${binary:Version}) @@ -57,6 +54,7 @@ Description: automatic proxy configuration management library (GSettings plugin) Package: libproxy1-plugin-kconfig Architecture: any Multi-Arch: same +Build-Profiles: !stage1 Depends: ${shlibs:Depends}, ${misc:Depends}, libproxy1 (= ${binary:Version}) @@ -83,6 +81,7 @@ Description: automatic proxy configuration management library (Network Manager p Package: libproxy1-plugin-mozjs Architecture: any Multi-Arch: same +Build-Profiles: !stage1 Depends: ${shlibs:Depends}, ${misc:Depends}, libproxy1 (= ${binary:Version}) @@ -96,6 +95,7 @@ Description: automatic proxy configuration management library (mozjs plugin) Package: libproxy1-plugin-webkit Architecture: any Multi-Arch: same +Build-Profiles: !stage1 Depends: ${shlibs:Depends}, ${misc:Depends}, libproxy1 (= ${binary:Version}) @@ -147,6 +147,7 @@ Description: automatic proxy configuration management library (python) Package: libproxy0.4-cil Architecture: all Section: cli-mono +Build-Profiles: !stage1 Depends: ${cli:Depends}, ${misc:Depends} Description: automatic proxy configuration management library (CLI) @@ -158,6 +159,7 @@ Description: automatic proxy configuration management library (CLI) Package: libproxy-cil-dev Architecture: all Section: cli-mono +Build-Profiles: !stage1 Depends: ${cli:Depends}, ${misc:Depends}, libproxy0.4-cil (= ${binary:Version}) diff --git a/debian/rules b/debian/rules index ec42de8..02e23f9 100755 --- a/debian/rules +++ b/debian/rules @@ -34,32 +34,30 @@ CONFIGURE_FLAGS += \ -DWITH_GNOME3=ON \ -DWITH_MOZJS=ON \ -DWITH_WEBKIT3=ON -DH_EXCLUDE = else CONFIGURE_FLAGS += \ -DWITH_GNOME3=OFF \ -DWITH_MOZJS=OFF \ -DWITH_WEBKIT3=OFF -DH_EXCLUDE = -Nlibproxy1-plugin-gsettings -Nlibproxy1-plugin-kconfig -Nlibproxy1-plugin-mozjs -Nlibproxy1-plugin-webkit -Nlibproxy0.4-cil -Nlibproxy-cil-dev endif override_dh_auto_configure: dh_auto_configure -- $(CONFIGURE_FLAGS) override_dh_install-arch: - dh_install $(DH_EXCLUDE) + dh_install rm -f \ debian/libproxy-dev/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig/libproxy-sharp-*.pc override_dh_install-indep: - dh_install $(DH_EXCLUDE) + 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))' $(DH_EXCLUDE) -- -c4 + dh_makeshlibs -V '$(libproxy) (>= $(SHLIBVER))' -- -c4 %: - dh $@ $(WITH_CLI) --with python2 $(DH_EXCLUDE) + dh $@ $(WITH_CLI) --with python2 -- 2.1.0.rc1
From 25c68aaa3b30b7f118063f7138b28f4c281291af Mon Sep 17 00:00:00 2001 From: Peter Pentchev <[email protected]> Date: Sun, 17 Aug 2014 21:28:34 +0300 Subject: [PATCH 2/2] Regenerate the control file. --- debian/control | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/debian/control b/debian/control index 380c958..49331cc 100644 --- a/debian/control +++ b/debian/control @@ -8,11 +8,7 @@ Section: libs Priority: optional Maintainer: Emilio Pozuelo Monfort <[email protected]> Uploaders: Debian GNOME Maintainers <[email protected]>, Laurent Bigonville <[email protected]> -# In the stage1 build profile, remove both cli-common-dev and mono-devel. -Build-Depends-Indep: cli-common-dev (>= 0.5.7~), mono-devel (>= 2.4.3) -# In the stage1 build profile, remove libmozjs185-dev, kdelibs5-dev, -# libqt4-dev, libwebkitgtk-3.0-dev, libjavascriptcoregtk-3.0-dev, -# libglib2.0-dev, libxmu-dev. +Build-Depends-Indep: cli-common-dev (>= 0.5.7~) <!profile.stage1>, mono-devel (>= 2.4.3) <!profile.stage1> Build-Depends: debhelper (>= 9), gnome-pkg-tools, netbase, @@ -21,13 +17,13 @@ Build-Depends: debhelper (>= 9), python-all-dev (>= 2.6.6-3~), network-manager-dev [linux-any], libdbus-1-dev, - libmozjs185-dev (>= 1.8.5), - kdelibs5-dev, - libqt4-dev, - libwebkitgtk-3.0-dev, - libjavascriptcoregtk-3.0-dev, - libglib2.0-dev (>= 2.26), - libxmu-dev + libmozjs185-dev (>= 1.8.5) <!profile.stage1>, + kdelibs5-dev <!profile.stage1>, + libqt4-dev <!profile.stage1>, + libwebkitgtk-3.0-dev <!profile.stage1>, + libjavascriptcoregtk-3.0-dev <!profile.stage1>, + libglib2.0-dev (>= 2.26) <!profile.stage1>, + libxmu-dev <!profile.stage1> Standards-Version: 3.9.4 X-Python-Version: >= 2.5 Vcs-Svn: svn://anonscm.debian.org/pkg-gnome/packages/unstable/libproxy @@ -49,6 +45,7 @@ Description: automatic proxy configuration management library (shared) Package: libproxy1-plugin-gsettings Architecture: any Multi-Arch: same +Build-Profiles: !stage1 Depends: ${shlibs:Depends}, ${misc:Depends}, libproxy1 (= ${binary:Version}) @@ -62,6 +59,7 @@ Description: automatic proxy configuration management library (GSettings plugin) Package: libproxy1-plugin-kconfig Architecture: any Multi-Arch: same +Build-Profiles: !stage1 Depends: ${shlibs:Depends}, ${misc:Depends}, libproxy1 (= ${binary:Version}) @@ -88,6 +86,7 @@ Description: automatic proxy configuration management library (Network Manager p Package: libproxy1-plugin-mozjs Architecture: any Multi-Arch: same +Build-Profiles: !stage1 Depends: ${shlibs:Depends}, ${misc:Depends}, libproxy1 (= ${binary:Version}) @@ -101,6 +100,7 @@ Description: automatic proxy configuration management library (mozjs plugin) Package: libproxy1-plugin-webkit Architecture: any Multi-Arch: same +Build-Profiles: !stage1 Depends: ${shlibs:Depends}, ${misc:Depends}, libproxy1 (= ${binary:Version}) @@ -152,6 +152,7 @@ Description: automatic proxy configuration management library (python) Package: libproxy0.4-cil Architecture: all Section: cli-mono +Build-Profiles: !stage1 Depends: ${cli:Depends}, ${misc:Depends} Description: automatic proxy configuration management library (CLI) @@ -163,6 +164,7 @@ Description: automatic proxy configuration management library (CLI) Package: libproxy-cil-dev Architecture: all Section: cli-mono +Build-Profiles: !stage1 Depends: ${cli:Depends}, ${misc:Depends}, libproxy0.4-cil (= ${binary:Version}) -- 2.1.0.rc1
signature.asc
Description: Digital signature
