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

[Lisandro Damián Nicanor Pérez]

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

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

    Merge branch 'master' of git+ssh://git.debian.org/git/pkg-kde/qt/qt4-x11
    
    Conflicts:
    	debian/changelog

 debian/changelog                                    | 4 +++-
 debian/patches/07_trust_dpkg-arch_over_uname-m.diff | 2 +-
 debian/rules                                        | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --cc debian/changelog
index a89408f,4294653..38640f2
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,10 +1,11 @@@
  qt4-x11 (4:4.8.6+dfsg-3) UNRELEASED; urgency=medium
  
    [ Lisandro Damián Nicanor Pérez Meyer ]
+   * Update 07_trust_dpkg-arch_over_uname-m.diff and debian/rules in order to
+     let mips64[el] build (Closes: #719763). Thanks Yunqiang Su for the patch.
 +  * 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
+  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu, 26 Jun 2014 01:19:21 -0300
  
  qt4-x11 (4:4.8.6+dfsg-2) unstable; urgency=medium
  

-- 
Qt 4 packaging