[SCM] qtbase packaging branch, master, updated. debian/5.0.2+dfsg1-3-8-g191c16a

Lisandro Damián Nicanor Pérez lisandro at alioth.debian.org
Thu May 9 23:16:08 UTC 2013


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

The following commit has been merged in the master branch:
commit 7fd1925cb51252417524b862d0a9206c3e76e258
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Thu May 9 20:11:23 2013 -0300

    Move qt5.conf from qtbase5-dev to libqt5core5.
    
    It will not be strange to find apps explicitely calling the qt5 config.
---
 debian/changelog           |    4 ++++
 debian/libqt5core5.install |    1 +
 debian/qtbase5-dev.install |    1 -
 3 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 654bfc5..90d30ad 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,10 @@ qtbase-opensource-src (5.0.2+dfsg1-4) UNRELEASED; urgency=low
   [ Timo Jyrinki ]
   * libqt5sql5-sqlite listed as first in recommends, being the lightest.
 
+  [ Lisandro Damián Nicanor Pérez Meyer ]
+  * Move qt5.conf from qtbase5-dev to libqt5core5. It will not be strange to find
+    apps explicitely calling the qt5 config.
+
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Fri, 26 Apr 2013 13:21:51 +0200
 
 qtbase-opensource-src (5.0.2+dfsg1-3) experimental; urgency=low
diff --git a/debian/libqt5core5.install b/debian/libqt5core5.install
index 9e7ea9b..4358b7f 100644
--- a/debian/libqt5core5.install
+++ b/debian/libqt5core5.install
@@ -1 +1,2 @@
 usr/lib/*/libQt5Core.so.*
+usr/share/qtchooser/qt5.conf
diff --git a/debian/qtbase5-dev.install b/debian/qtbase5-dev.install
index f7e52ab..3b465e8 100644
--- a/debian/qtbase5-dev.install
+++ b/debian/qtbase5-dev.install
@@ -1490,4 +1490,3 @@ usr/share/qt5/doc/global/template/images/spinner.gif
 usr/share/qt5/doc/global/template/images/sprites-combined.png
 usr/share/qt5/doc/global/template/style/offline.css
 usr/share/qt5/doc/global/template/style/online.css
-usr/share/qtchooser/qt5.conf

-- 
qtbase packaging



More information about the pkg-kde-commits mailing list