r42201 - in /packages/unstable/libproxy/debian: changelog control control.in rules
ah at users.alioth.debian.org
ah at users.alioth.debian.org
Mon Aug 18 19:11:33 UTC 2014
Author: ah
Date: Mon Aug 18 19:11:33 2014
New Revision: 42201
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=42201
Log:
Add build profile annotations to debian/control (Closes: #758467)
Modified:
packages/unstable/libproxy/debian/changelog
packages/unstable/libproxy/debian/control
packages/unstable/libproxy/debian/control.in
packages/unstable/libproxy/debian/rules
Modified: packages/unstable/libproxy/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/libproxy/debian/changelog?rev=42201&op=diff
==============================================================================
--- packages/unstable/libproxy/debian/changelog [utf-8] (original)
+++ packages/unstable/libproxy/debian/changelog [utf-8] Mon Aug 18 19:11:33 2014
@@ -3,6 +3,7 @@
[ 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)
-- Andreas Henriksson <andreas at fatal.se> Mon, 18 Aug 2014 21:07:56 +0200
Modified: packages/unstable/libproxy/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/libproxy/debian/control?rev=42201&op=diff
==============================================================================
--- packages/unstable/libproxy/debian/control [utf-8] (original)
+++ packages/unstable/libproxy/debian/control [utf-8] Mon Aug 18 19:11:33 2014
@@ -8,11 +8,7 @@
Priority: optional
Maintainer: Emilio Pozuelo Monfort <pochu at debian.org>
Uploaders: Andreas Henriksson <andreas at fatal.se>, Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Laurent Bigonville <bigon at debian.org>
-# 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 @@
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 @@
Package: libproxy1-plugin-gsettings
Architecture: any
Multi-Arch: same
+Build-Profiles: !stage1
Depends: ${shlibs:Depends},
${misc:Depends},
libproxy1 (= ${binary:Version})
@@ -62,6 +59,7 @@
Package: libproxy1-plugin-kconfig
Architecture: any
Multi-Arch: same
+Build-Profiles: !stage1
Depends: ${shlibs:Depends},
${misc:Depends},
libproxy1 (= ${binary:Version})
@@ -88,6 +86,7 @@
Package: libproxy1-plugin-mozjs
Architecture: any
Multi-Arch: same
+Build-Profiles: !stage1
Depends: ${shlibs:Depends},
${misc:Depends},
libproxy1 (= ${binary:Version})
@@ -101,6 +100,7 @@
Package: libproxy1-plugin-webkit
Architecture: any
Multi-Arch: same
+Build-Profiles: !stage1
Depends: ${shlibs:Depends},
${misc:Depends},
libproxy1 (= ${binary:Version})
@@ -152,6 +152,7 @@
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 @@
Package: libproxy-cil-dev
Architecture: all
Section: cli-mono
+Build-Profiles: !stage1
Depends: ${cli:Depends},
${misc:Depends},
libproxy0.4-cil (= ${binary:Version})
Modified: packages/unstable/libproxy/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/libproxy/debian/control.in?rev=42201&op=diff
==============================================================================
--- packages/unstable/libproxy/debian/control.in [utf-8] (original)
+++ packages/unstable/libproxy/debian/control.in [utf-8] Mon Aug 18 19:11:33 2014
@@ -3,11 +3,7 @@
Priority: optional
Maintainer: Emilio Pozuelo Monfort <pochu at debian.org>
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 @@
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 @@
Package: libproxy1-plugin-gsettings
Architecture: any
Multi-Arch: same
+Build-Profiles: !stage1
Depends: ${shlibs:Depends},
${misc:Depends},
libproxy1 (= ${binary:Version})
@@ -57,6 +54,7 @@
Package: libproxy1-plugin-kconfig
Architecture: any
Multi-Arch: same
+Build-Profiles: !stage1
Depends: ${shlibs:Depends},
${misc:Depends},
libproxy1 (= ${binary:Version})
@@ -83,6 +81,7 @@
Package: libproxy1-plugin-mozjs
Architecture: any
Multi-Arch: same
+Build-Profiles: !stage1
Depends: ${shlibs:Depends},
${misc:Depends},
libproxy1 (= ${binary:Version})
@@ -96,6 +95,7 @@
Package: libproxy1-plugin-webkit
Architecture: any
Multi-Arch: same
+Build-Profiles: !stage1
Depends: ${shlibs:Depends},
${misc:Depends},
libproxy1 (= ${binary:Version})
@@ -147,6 +147,7 @@
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 @@
Package: libproxy-cil-dev
Architecture: all
Section: cli-mono
+Build-Profiles: !stage1
Depends: ${cli:Depends},
${misc:Depends},
libproxy0.4-cil (= ${binary:Version})
Modified: packages/unstable/libproxy/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/libproxy/debian/rules?rev=42201&op=diff
==============================================================================
--- packages/unstable/libproxy/debian/rules [utf-8] (original)
+++ packages/unstable/libproxy/debian/rules [utf-8] Mon Aug 18 19:11:33 2014
@@ -34,32 +34,30 @@
-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
More information about the pkg-gnome-commits
mailing list