[SCM] Qt 4 packaging branch, master, updated. debian/4.8.6+dfsg-2-5-ge21eb76

Lisandro Damián Nicanor Pérez lisandro at moszumanska.debian.org
Thu Jun 26 13:22:27 UTC 2014


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

The following commit has been merged in the master branch:
commit e8ce3d2519951d17f1913aabfee5b1318e11c417
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Thu Jun 26 10:20:50 2014 -0300

    Enable using system network proxies by default.
---
 debian/changelog | 3 +++
 debian/rules     | 1 +
 2 files changed, 4 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 06fd151..a89408f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,8 @@
 qt4-x11 (4:4.8.6+dfsg-3) UNRELEASED; urgency=medium
 
+  [ Lisandro Damián Nicanor Pérez Meyer ]
+  * Enable using system network proxies by default.
+
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu, 26 Jun 2014 10:18:02 -0300
 
 qt4-x11 (4:4.8.6+dfsg-2) unstable; urgency=medium
diff --git a/debian/rules b/debian/rules
index 2840f4f..dac44ea 100755
--- a/debian/rules
+++ b/debian/rules
@@ -150,6 +150,7 @@ endif
 	            -system-libtiff \
 	            -system-libpng \
 	            -system-libjpeg \
+	            -system-proxies \
 	            -no-rpath \
 	            -optimized-qmake \
 	            -dbus-linked \

-- 
Qt 4 packaging



More information about the pkg-kde-commits mailing list