[SCM] qtwebsockets packaging branch, kubuntu_unstable, updated. debian/5.4.1-1-4-g7132db7

Rohan Garg rohangarg-guest at moszumanska.debian.org
Thu Mar 26 12:18:00 UTC 2015


Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtwebsockets.git;a=commitdiff;h=7132db7

The following commit has been merged in the kubuntu_unstable branch:
commit 7132db71ee43c175a017fcaf6d335df866796f52
Merge: 50502a6c654fba626969462da1e2cd57dd45a801 eeea2fe11eee627e916832b51bc4d61445230bbc
Author: Rohan Garg <rohan at garg.io>
Date:   Thu Mar 26 13:17:17 2015 +0100

    Merge branch 'experimental' into kubuntu_unstable
    
    Conflicts:
    	debian/qtwebsockets5-examples.install

 debian/changelog                        | 29 +++++++++++++++++++++++
 debian/control                          | 12 +++++-----
 debian/copyright                        | 39 +++++++++++-------------------
 debian/libqt5websockets5.symbols        |  3 ++-
 debian/patches/fix_qwebsocket_test.diff | 42 +++++++++++++++++++++++++++++++++
 debian/patches/series                   |  2 +-
 debian/watch                            |  2 +-
 7 files changed, 95 insertions(+), 34 deletions(-)

-- 
qtwebsockets packaging



More information about the pkg-kde-commits mailing list