[SCM] Qt 4 packaging branch, master, updated. debian/4.8.2+dfsg-11-5-gf69781d

[Lisandro Damián Nicanor Pérez]

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

The following commit has been merged in the master branch:
commit f69781dd0779c23655bfd72302cf208ee7e08707
Merge: dab937e42a8494fad131bd96b59ac0e8c59293f1 039f69b789920460a297ee878ad2d38eb41921fd
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Fri May 24 12:42:12 2013 -0300

    Merge branch 'wheezy'
    
    Conflicts:
    	debian/changelog
    	debian/control
    	debian/patches/series
    
    We finally didn't make an upload to Squeeze, so we merge
    back the wheezy branch.

 debian/changelog                                   |   73 ++++++++++-
 debian/control                                     |    3 +
 debian/libqt4-designer.symbols                     |    6 +-
 ..._incompatibility_between_openssl_versions.patch |   80 +++++++++++
 ...cates-blacklist-mis-issued-Turktrust-cert.patch |  107 ++++++++++++++
 ..._all_shmget_calls_to_use_user-only_memory.patch |  148 ++++++++++++++++++++
 debian/patches/series                              |    3 +
 debian/rules                                       |    6 +-
 8 files changed, 418 insertions(+), 8 deletions(-)

-- 
Qt 4 packaging