[SCM] qtbase packaging branch, master, updated. debian/5.0.2+dfsg1-5-11-g4e5d26a

Lisandro Damián Nicanor Pérez lisandro at alioth.debian.org
Wed Jun 19 21:19:32 UTC 2013


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

The following commit has been merged in the master branch:
commit 4e5d26a2bac59692420248c43722f45efe5bf459
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Wed Jun 19 18:18:27 2013 -0300

    No-op run of wrap-and-sort.
---
 debian/control |   13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/debian/control b/debian/control
index 55f0274..981b389 100644
--- a/debian/control
+++ b/debian/control
@@ -24,6 +24,7 @@ Build-Depends: debhelper (>= 9),
                libgles2-mesa-dev [linux-any] | libgles2-dev [linux-any],
                libglib2.0-dev,
                libglu1-mesa-dev | libglu-dev,
+               libgtk2.0-dev,
                libicu-dev,
                libjpeg-dev,
                libmysqlclient-dev,
@@ -50,10 +51,8 @@ Build-Depends: debhelper (>= 9),
                libxrender-dev,
                pkg-kde-tools (>= 0.14.2),
                unixodbc-dev,
-               zlib1g-dev,
-               libgtk2.0-dev
-Build-Depends-Indep: libqt5sql5-sqlite,
-                     qttools5-dev-tools (>= 5.0.2~)
+               zlib1g-dev
+Build-Depends-Indep: libqt5sql5-sqlite, qttools5-dev-tools (>= 5.0.2~)
 Standards-Version: 3.9.3
 Homepage: http://qt-project.org/
 Vcs-Git: git://anonscm.debian.org/pkg-kde/qt/qtbase.git
@@ -310,7 +309,7 @@ Section: libdevel
 Pre-Depends: dpkg (>= 1.15.6~)
 Depends: libqt5opengl5 (= ${binary:Version}),
          qtbase5-dev (= ${binary:Version}),
-         ${misc:Depends},
+         ${misc:Depends}
 Description: Qt 5 OpenGL library development files
  Qt is a cross-platform C++ application framework. Qt's primary feature
  is its rich set of widgets that provide standard GUI functionality.
@@ -323,7 +322,7 @@ Architecture: any
 Multi-Arch: foreign
 Section: devel
 Pre-Depends: dpkg (>= 1.15.6~)
-Depends: qtchooser, ${misc:Depends}, ${shlibs:Depends}, ${perl:Depends}
+Depends: qtchooser, ${misc:Depends}, ${perl:Depends}, ${shlibs:Depends}
 Description: Qt 5 base development programs
  Qt is a cross-platform C++ application framework. Qt's primary feature
  is its rich set of widgets that provide standard GUI functionality.
@@ -404,7 +403,7 @@ Description: Qt 5 base examples debugging symbols
 
 Package: qt5-default
 Architecture: any
-Depends: qtchooser, qtbase5-dev, ${misc:Depends}
+Depends: qtbase5-dev, qtchooser, ${misc:Depends}
 Conflicts: qt4-default
 Suggests: qt5-qmake, qtbase5-dev-tools
 Description: Qt 5 development defaults package

-- 
qtbase packaging



More information about the pkg-kde-commits mailing list