[SCM] qtbase packaging branch, master, updated. debian/5.0.2+dfsg1-2-12-g9250d7a

Pino Toscano pino at alioth.debian.org
Mon Apr 22 09:03:38 UTC 2013


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

The following commit has been merged in the master branch:
commit 9250d7a820f80b6bdbf303ee1cc4635b356fe720
Author: Pino Toscano <pino at debian.org>
Date:   Mon Apr 22 11:03:08 2013 +0200

    limit gles on linux
---
 debian/changelog |    2 +-
 debian/control   |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 39cc621..3e65dbc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,7 +16,7 @@ qtbase-opensource-src (5.0.2+dfsg1-3) UNRELEASED; urgency=low
 
   [ Timo Jyrinki ]
   * Use -opengl es2 correctly on arm
-  * Allow EGL support also on desktop
+  * Allow EGL support also on desktop, on Linux only for now.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun, 21 Apr 2013 10:01:11 +0200
 
diff --git a/debian/control b/debian/control
index 434975a..250c369 100644
--- a/debian/control
+++ b/debian/control
@@ -19,7 +19,7 @@ Build-Depends: debhelper (>= 9),
                libfontconfig1-dev,
                libfreetype6-dev,
                libgl1-mesa-dev | libgl-dev,
-               libgles2-mesa-dev | libgles2-dev,
+               libgles2-mesa-dev [linux-any] | libgles2-dev [linux-any],
                libglib2.0-dev,
                libglu1-mesa-dev | libglu-dev,
                libicu-dev,

-- 
qtbase packaging



More information about the pkg-kde-commits mailing list