[SCM] qtbase packaging branch, master, updated. c86160605aa2e36ba0a26ff954cdd71230be1c71

Timo Jyrinki timo at alioth.debian.org
Fri Dec 14 15:55:27 UTC 2012


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

The following commit has been merged in the master branch:
commit c86160605aa2e36ba0a26ff954cdd71230be1c71
Author: Timo Jyrinki <timo.jyrinki at canonical.com>
Date:   Fri Dec 14 15:54:23 2012 +0000

    Sync with functional rc2 packaging from lp:~timo-jyrinki/+junk/qtbase.
    
    Note that this has the binary renaming approach which should be replaced
    by changing bindir and utilizing the upcoming qtchooser instead.
---
 debian/changelog                                   |    2 +-
 debian/control                                     |  101 +-
 debian/copyright                                   |    2 +
 debian/libqt5concurrent5.install                   |    1 +
 debian/libqt5core5.install                         |    1 +
 debian/libqt5dbus5.install                         |    1 +
 debian/{libqtgui5.install => libqt5gui5.install}   |    4 +-
 ...ibqtnetwork5.install => libqt5network5.install} |    2 +-
 ...engl5-dev.install => libqt5opengl5-dev.install} |   51 +-
 debian/libqt5opengl5.install                       |    1 +
 ...upport5.install => libqt5printsupport5.install} |    2 +-
 ...sql5-ibase.install => libqt5sql5-ibase.install} |    0
 ...sql5-mysql.install => libqt5sql5-mysql.install} |    0
 ...qtsql5-odbc.install => libqt5sql5-odbc.install} |    0
 ...qtsql5-psql.install => libqt5sql5-psql.install} |    0
 ...l5-sqlite.install => libqt5sql5-sqlite.install} |    0
 ...ibqtsql5-tds.install => libqt5sql5-tds.install} |    0
 debian/libqt5sql5.install                          |    1 +
 debian/libqt5test5.install                         |    1 +
 ...ibqtwidgets5.install => libqt5widgets5.install} |    2 +-
 debian/libqt5xml5.install                          |    1 +
 debian/libqtconcurrent5.install                    |    1 -
 debian/libqtcore5.install                          |    1 -
 debian/libqtdbus5.install                          |    1 -
 debian/libqtopengl5.install                        |    1 -
 debian/libqtsql5.install                           |    1 -
 debian/libqttest5.install                          |    1 -
 debian/libqtxml5.install                           |    1 -
 debian/patches/append_qt_version_suffix.patch      |   45 +-
 debian/patches/append_qt_version_suffix2.patch     |   70 +
 debian/patches/series                              |    3 +-
 debian/qtbase5-dev-tools.install                   |    6 +-
 debian/qtbase5-dev-tools.postinst                  |    9 +
 debian/qtbase5-dev.install                         | 3625 ++++++++------------
 debian/qtbase5-private-dev.install                 |  969 +++---
 debian/rules                                       |   11 +-
 36 files changed, 2168 insertions(+), 2750 deletions(-)

The diff has been stripped from this email because it exceeds 50KB


-- 
qtbase packaging



More information about the pkg-kde-commits mailing list