[SCM] qtbase packaging branch, kubuntu_unstable, updated. debian/5.5.0+dfsg-4-47-gc387b32

[Rohan Garg]

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

The following commit has been merged in the kubuntu_unstable branch:
commit d9a8dafaa49859ddc0dc28e0485e159dd5d825dc
Author: Timo Jyrinki <timo.jyrinki at canonical.com>
Date:   Fri May 22 11:09:32 2015 +0000

    Import Ubuntu debian/control changes
---
 debian/control | 55 +++++++++++++++++++++++++++++++++++++++++++++++++------
 1 file changed, 49 insertions(+), 6 deletions(-)

diff --git a/debian/control b/debian/control
index b8e674e..7acc4c0 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: qtbase-opensource-src
 Section: libs
 Priority: optional
-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss at lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
 Uploaders: Sune Vuorela <debian at pusling.com>,
            Pino Toscano <pino at debian.org>,
            Lisandro Damián Nicanor Pérez Meyer <lisandro at debian.org>,
@@ -9,7 +10,6 @@ Uploaders: Sune Vuorela <debian at pusling.com>,
            Dmitry Shachnev <mitya57 at debian.org>
 Build-Depends: debhelper (>= 9),
                dpkg-dev (>= 1.16.1),
-               firebird-dev [amd64 armel i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sh4 sparc],
                freetds-dev,
                gdb,
                libasound2-dev [linux-any],
@@ -58,6 +58,7 @@ Build-Depends: debhelper (>= 9),
                libxrender-dev,
                pkg-kde-tools (>= 0.15.17),
                unixodbc-dev,
+               xvfb,
                zlib1g-dev
 Build-Conflicts: libmariadbclient-dev
 Standards-Version: 3.9.6
@@ -138,7 +139,7 @@ Architecture: any
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends}, ${shlibs:Depends}
-Recommends: libqt5sql5-sqlite | libqt5sql5-mysql | libqt5sql5-odbc | libqt5sql5-psql | libqt5sql5-ibase [amd64 armel i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sh4 sparc]
+Recommends: libqt5sql5-sqlite | libqt5sql5-mysql | libqt5sql5-odbc | libqt5sql5-psql
 Description: Qt 5 SQL module
  Qt is a cross-platform C++ application framework. Qt's primary feature
  is its rich set of widgets that provide standard GUI functionality.
@@ -282,7 +283,7 @@ Architecture: any
 Multi-Arch: same
 Section: libdevel
 Depends: libgl1-mesa-dev [!armel !armhf] | libgl-dev [!armel !armhf],
-         libgles2-mesa-dev [armel armhf] | libgles2-dev [armel armhf],
+         libgles2-mesa-dev | libgles2-dev,
          libglu1-mesa-dev [!armel !armhf] | libglu-dev [!armel !armhf],
          libqt5concurrent5 (= ${binary:Version}),
          libqt5core5a (= ${binary:Version}),
@@ -300,8 +301,7 @@ Depends: libgl1-mesa-dev [!armel !armhf] | libgl-dev [!armel !armhf],
          qtchooser,
          ${misc:Depends}
 Recommends: libqt5opengl5-dev (= ${binary:Version})
-Suggests: firebird-dev,
-          libegl1-mesa-dev,
+Suggests: libegl1-mesa-dev,
           libgl1-mesa-dev,
           libmysqlclient-dev,
           libpq-dev,
@@ -382,6 +382,47 @@ Description: Qt 5 qmake Makefile generator tool
  .
  This package contains also these platform specifications.
 
+Package: qt5-qmake-cross-armhf
+Architecture: amd64 i386
+Multi-Arch: same
+Section: oldlibs
+Depends: qt5-qmake-arm-linux-gnueabihf, ${misc:Depends}
+Description: Transitional dummy package for qt5-qmake-arm-linux-gnueabihf
+ Qt is a cross-platform C++ application framework. Qt's primary feature
+ is its rich set of widgets that provide standard GUI functionality.
+ .
+ This is a transitional dummy package for qt5-qmake-arm-linux-gnueabihf
+ which can be safely removed.
+
+Package: qt5-qmake-arm-linux-gnueabihf
+Architecture: amd64 i386 
+Multi-Arch: same
+Section: devel
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Breaks: qt5-qmake-cross-armhf (<< 5.3.2+dfsg-4ubuntu5)
+Replaces: qt5-qmake-cross-armhf (<< 5.3.2+dfsg-4ubuntu5)
+Description: Qt 5 qt5-qmake-arm-linux-gnueabihf Makefile generator tool
+ Qt is a cross-platform C++ application framework. Qt's primary feature
+ is its rich set of widgets that provide standard GUI functionality.
+ .
+ This package contains the Qt 5 qt5-qmake-arm-linux-gnueabihf, a tool 
+ that helps simplify the build process for development project across 
+ different platforms.
+ qmake-cross-armhf automates the generation of Makefiles so that only 
+ a few lines of information are needed to create each Makefile. 
+ qmake can be used for any software project, whether it is written 
+ using Qt or not.
+ .
+ Qt 5 qt5-qmake-arm-linux-gnueabihf requires a platform and compiler 
+ description file which contains many default values used to generate 
+ appropriate Makefiles.
+ .
+ This package contains also these platform specifications.
+ .
+ The qt5-qmake-arm-linux-gnueabihf is made for creating Makefile in 
+ multiarch build environment. It can be used for example in a i386 chroot 
+ with armhf development packages.
+
 Package: qtbase5-examples
 Architecture: any
 Multi-Arch: foreign
@@ -434,8 +475,10 @@ Description: Qt 5 base examples debugging symbols
 
 Package: qt5-default
 Architecture: any
+Multi-Arch: same
 Depends: qtbase5-dev, qtchooser, ${misc:Depends}
 Conflicts: qt4-default
+Provides: qt-default
 Suggests: qt5-qmake, qtbase5-dev-tools
 Description: Qt 5 development defaults package
  Qt is a cross-platform C++ application framework. Qt's primary feature

-- 
qtbase packaging