r47349 - in /packages/unstable/libproxy/debian: changelog control control.in libproxy1.install libproxy1v5.install rules
laney at users.alioth.debian.org
laney at users.alioth.debian.org
Tue Feb 16 12:43:34 UTC 2016
Author: laney
Date: Tue Feb 16 12:43:33 2016
New Revision: 47349
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=47349
Log:
Incorporate and ack NMUs, fix build profiles syntax so source can be built
Added:
packages/unstable/libproxy/debian/libproxy1v5.install
- copied unchanged from r47348, packages/unstable/libproxy/debian/libproxy1.install
Removed:
packages/unstable/libproxy/debian/libproxy1.install
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=47349&op=diff
==============================================================================
--- packages/unstable/libproxy/debian/changelog [utf-8] (original)
+++ packages/unstable/libproxy/debian/changelog [utf-8] Tue Feb 16 12:43:33 2016
@@ -10,7 +10,27 @@
- these versions introduced build profiles support.
* Bump Standards-Version to 3.9.5
+ [ Iain Lane ]
+ * Ack the NMUs, thanks!
+ * Fix the build profiles syntax to the current version.
+
-- Andreas Henriksson <andreas at fatal.se> Mon, 18 Aug 2014 21:07:56 +0200
+
+libproxy (0.4.11-4.2) unstable; urgency=medium
+
+ * Non maintainer upload.
+ * libproxy1-plugin-mozjs: Fix dependency on new libproxy1v5.
+
+ -- Matthias Klose <doko at debian.org> Tue, 04 Aug 2015 21:42:23 +0200
+
+libproxy (0.4.11-4.1) unstable; urgency=medium
+
+ * 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.
+
+ -- Matthias Klose <doko at debian.org> Tue, 04 Aug 2015 20:15:37 +0200
libproxy (0.4.11-4) unstable; urgency=low
Modified: packages/unstable/libproxy/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/libproxy/debian/control?rev=47349&op=diff
==============================================================================
--- packages/unstable/libproxy/debian/control [utf-8] (original)
+++ packages/unstable/libproxy/debian/control [utf-8] Tue Feb 16 12:43:33 2016
@@ -2,13 +2,12 @@
#
# 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 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>
-Build-Depends-Indep: cli-common-dev (>= 0.5.7~) <!profile.stage1>, mono-devel (>= 2.4.3) <!profile.stage1>
+Build-Depends-Indep: cli-common-dev (>= 0.5.7~) <!stage1>, mono-devel (>= 2.4.3) <!stage1>
Build-Depends: debhelper (>= 9.20140227),
dpkg-dev (>= 1.17.2),
gnome-pkg-tools,
@@ -18,25 +17,27 @@
python-all-dev (>= 2.6.6-3~),
network-manager-dev [linux-any],
libdbus-1-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>
+ libmozjs185-dev (>= 1.8.5) <!stage1>,
+ kdelibs5-dev <!stage1>,
+ libqt4-dev <!stage1>,
+ libwebkitgtk-3.0-dev <!stage1>,
+ libjavascriptcoregtk-3.0-dev <!stage1>,
+ libglib2.0-dev (>= 2.26) <!stage1>,
+ libxmu-dev <!stage1>
Standards-Version: 3.9.5
X-Python-Version: >= 2.5
Vcs-Svn: svn://anonscm.debian.org/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: libproxy1
+Package: libproxy1v5
Architecture: any
Multi-Arch: same
Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends},
${misc:Depends}
+Conflicts: libproxy1
+Replaces: libproxy1
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.
@@ -46,10 +47,10 @@
Package: libproxy1-plugin-gsettings
Architecture: any
Multi-Arch: same
-Build-Profiles: !stage1
+Build-Profiles: <!stage1>
Depends: ${shlibs:Depends},
${misc:Depends},
- libproxy1 (= ${binary:Version})
+ libproxy1v5 (= ${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.
@@ -60,10 +61,10 @@
Package: libproxy1-plugin-kconfig
Architecture: any
Multi-Arch: same
-Build-Profiles: !stage1
+Build-Profiles: <!stage1>
Depends: ${shlibs:Depends},
${misc:Depends},
- libproxy1 (= ${binary:Version})
+ libproxy1v5 (= ${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.
@@ -76,7 +77,7 @@
Multi-Arch: same
Depends: ${shlibs:Depends},
${misc:Depends},
- libproxy1 (= ${binary:Version})
+ libproxy1v5 (= ${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.
@@ -87,10 +88,10 @@
Package: libproxy1-plugin-mozjs
Architecture: any
Multi-Arch: same
-Build-Profiles: !stage1
+Build-Profiles: <!stage1>
Depends: ${shlibs:Depends},
${misc:Depends},
- libproxy1 (= ${binary:Version})
+ libproxy1v5 (= ${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.
@@ -101,10 +102,10 @@
Package: libproxy1-plugin-webkit
Architecture: any
Multi-Arch: same
-Build-Profiles: !stage1
+Build-Profiles: <!stage1>
Depends: ${shlibs:Depends},
${misc:Depends},
- libproxy1 (= ${binary:Version})
+ libproxy1v5 (= ${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.
@@ -118,7 +119,7 @@
Section: libdevel
Depends: ${shlibs:Depends},
${misc:Depends},
- libproxy1 (= ${binary:Version})
+ libproxy1v5 (= ${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.
@@ -142,7 +143,7 @@
Section: python
Depends: ${python:Depends},
${misc:Depends},
- libproxy1 (>= ${source:Version})
+ libproxy1v5 (>= ${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.
@@ -152,7 +153,7 @@
Package: libproxy0.4-cil
Architecture: all
Section: cli-mono
-Build-Profiles: !stage1
+Build-Profiles: <!stage1>
Depends: ${cli:Depends},
${misc:Depends}
Description: automatic proxy configuration management library (CLI)
@@ -164,7 +165,7 @@
Package: libproxy-cil-dev
Architecture: all
Section: cli-mono
-Build-Profiles: !stage1
+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=47349&op=diff
==============================================================================
--- packages/unstable/libproxy/debian/control.in [utf-8] (original)
+++ packages/unstable/libproxy/debian/control.in [utf-8] Tue Feb 16 12:43:33 2016
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Emilio Pozuelo Monfort <pochu at debian.org>
Uploaders: @GNOME_TEAM@
-Build-Depends-Indep: cli-common-dev (>= 0.5.7~) <!profile.stage1>, mono-devel (>= 2.4.3) <!profile.stage1>
+Build-Depends-Indep: cli-common-dev (>= 0.5.7~) <!stage1>, mono-devel (>= 2.4.3) <!stage1>
Build-Depends: debhelper (>= 9.20140227),
dpkg-dev (>= 1.17.2),
gnome-pkg-tools,
@@ -13,25 +13,27 @@
python-all-dev (>= 2.6.6-3~),
network-manager-dev [linux-any],
libdbus-1-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>
+ libmozjs185-dev (>= 1.8.5) <!stage1>,
+ kdelibs5-dev <!stage1>,
+ libqt4-dev <!stage1>,
+ libwebkitgtk-3.0-dev <!stage1>,
+ libjavascriptcoregtk-3.0-dev <!stage1>,
+ libglib2.0-dev (>= 2.26) <!stage1>,
+ libxmu-dev <!stage1>
Standards-Version: 3.9.5
X-Python-Version: >= 2.5
Vcs-Svn: svn://anonscm.debian.org/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: libproxy1
+Package: libproxy1v5
Architecture: any
Multi-Arch: same
Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends},
${misc:Depends}
+Conflicts: libproxy1
+Replaces: libproxy1
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.
@@ -41,10 +43,10 @@
Package: libproxy1-plugin-gsettings
Architecture: any
Multi-Arch: same
-Build-Profiles: !stage1
+Build-Profiles: <!stage1>
Depends: ${shlibs:Depends},
${misc:Depends},
- libproxy1 (= ${binary:Version})
+ libproxy1v5 (= ${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.
@@ -55,10 +57,10 @@
Package: libproxy1-plugin-kconfig
Architecture: any
Multi-Arch: same
-Build-Profiles: !stage1
+Build-Profiles: <!stage1>
Depends: ${shlibs:Depends},
${misc:Depends},
- libproxy1 (= ${binary:Version})
+ libproxy1v5 (= ${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.
@@ -71,7 +73,7 @@
Multi-Arch: same
Depends: ${shlibs:Depends},
${misc:Depends},
- libproxy1 (= ${binary:Version})
+ libproxy1v5 (= ${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.
@@ -82,10 +84,10 @@
Package: libproxy1-plugin-mozjs
Architecture: any
Multi-Arch: same
-Build-Profiles: !stage1
+Build-Profiles: <!stage1>
Depends: ${shlibs:Depends},
${misc:Depends},
- libproxy1 (= ${binary:Version})
+ libproxy1v5 (= ${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.
@@ -96,10 +98,10 @@
Package: libproxy1-plugin-webkit
Architecture: any
Multi-Arch: same
-Build-Profiles: !stage1
+Build-Profiles: <!stage1>
Depends: ${shlibs:Depends},
${misc:Depends},
- libproxy1 (= ${binary:Version})
+ libproxy1v5 (= ${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.
@@ -113,7 +115,7 @@
Section: libdevel
Depends: ${shlibs:Depends},
${misc:Depends},
- libproxy1 (= ${binary:Version})
+ libproxy1v5 (= ${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.
@@ -137,7 +139,7 @@
Section: python
Depends: ${python:Depends},
${misc:Depends},
- libproxy1 (>= ${source:Version})
+ libproxy1v5 (>= ${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.
@@ -147,7 +149,7 @@
Package: libproxy0.4-cil
Architecture: all
Section: cli-mono
-Build-Profiles: !stage1
+Build-Profiles: <!stage1>
Depends: ${cli:Depends},
${misc:Depends}
Description: automatic proxy configuration management library (CLI)
@@ -159,7 +161,7 @@
Package: libproxy-cil-dev
Architecture: all
Section: cli-mono
-Build-Profiles: !stage1
+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=47349&op=diff
==============================================================================
--- packages/unstable/libproxy/debian/rules [utf-8] (original)
+++ packages/unstable/libproxy/debian/rules [utf-8] Tue Feb 16 12:43:33 2016
@@ -3,7 +3,7 @@
include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
SHLIBVER := 0.4.11
-libproxy := $(shell sed -nr 's/^Package:[[:space:]]*(libproxy[0-9]+)[[: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
More information about the pkg-gnome-commits
mailing list