[SCM] Qt 4 packaging branch, master, updated. debian/4.8.6+git49-gbc62005+dfsg-1-2-g4ab97ed

[Lisandro Damián Nicanor Pérez]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qt4-x11.git;a=commitdiff;h=4ab97ed

The following commit has been merged in the master branch:
commit 4ab97ed656f9cea79df22c375ddb721ead49596b
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Fri Aug 15 12:05:03 2014 -0300

    Disable system proxy.
---
 debian/changelog | 8 ++++++++
 debian/rules     | 1 -
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index ee19d76..850e71d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+qt4-x11 (4:4.8.6+git49-gbc62005+dfsg-2) UNRELEASED; urgency=medium
+
+  [ Lisandro Damián Nicanor Pérez Meyer ]
+  * Disable the use of system proxies by default. It seems that if http_proxy
+    is setted then all protocols try to use the proxy.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Fri, 15 Aug 2014 12:02:33 -0300
+
 qt4-x11 (4:4.8.6+git49-gbc62005+dfsg-1) unstable; urgency=medium
 
   * New upstream GIT snapshot.
diff --git a/debian/rules b/debian/rules
index ccf17f5..049b4bb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -150,7 +150,6 @@ endif
 	            -system-libtiff \
 	            -system-libpng \
 	            -system-libjpeg \
-	            -system-proxies \
 	            -no-rpath \
 	            -optimized-qmake \
 	            -dbus-linked \

-- 
Qt 4 packaging