[SCM] qttools packaging branch, master, updated. debian/5.2.0-7-6-g6b7e319

Lisandro Damián Nicanor Pérez lisandro at moszumanska.debian.org
Fri Jan 31 17:36:26 UTC 2014


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

The following commit has been merged in the master branch:
commit 6b7e319417b82cc5829b89cc4ceb40cbf257efd0
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Fri Jan 31 14:35:47 2014 -0300

    Move mkspec files to their new location.
    
    B-D on qtbase 5.2.0+dfsg-7~, which introduces the new location.
---
 debian/changelog                    |  2 ++
 debian/control                      |  4 ++--
 debian/qttools5-dev.install         |  6 +++---
 debian/qttools5-private-dev.install | 10 +++++-----
 4 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 16c802a..cabb07e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ qttools-opensource-src (5.2.0-8) UNRELEASED; urgency=medium
 
   [ Lisandro Damián Nicanor Pérez Meyer ]
   * Update symbols files with buildd's logs.
+  * Move mkspec files to their new location.
+    - B-D on qtbase 5.2.0+dfsg-7~, which introduces the new location.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Fri, 31 Jan 2014 13:25:58 -0300
 
diff --git a/debian/control b/debian/control
index 0d8a5bd..75649e9 100644
--- a/debian/control
+++ b/debian/control
@@ -11,9 +11,9 @@ Uploaders: Fathi Boudra <fabo at debian.org>,
            Timo Jyrinki <timo at debian.org>,
            Dmitry Shachnev <mitya57 at gmail.com>
 Build-Depends: debhelper (>= 9),
-               libqt5sql5-sqlite (>= 5.2.0+dfsg~),
+               libqt5sql5-sqlite (>= 5.2.0+dfsg-7~),
                pkg-kde-tools,
-               qtbase5-private-dev (>= 5.2.0+dfsg~),
+               qtbase5-private-dev (>= 5.2.0+dfsg-7~),
                zlib1g-dev
 Build-Depends-Indep: qtbase5-doc-html
 Standards-Version: 3.9.5
diff --git a/debian/qttools5-dev.install b/debian/qttools5-dev.install
index c3820a4..8042358 100644
--- a/debian/qttools5-dev.install
+++ b/debian/qttools5-dev.install
@@ -145,6 +145,6 @@ usr/lib/*/pkgconfig/Qt5Designer.pc
 usr/lib/*/pkgconfig/Qt5DesignerComponents.pc
 usr/lib/*/pkgconfig/Qt5Help.pc
 usr/lib/*/pkgconfig/Qt5UiTools.pc
-usr/share/qt5/mkspecs/modules/qt_lib_designer.pri
-usr/share/qt5/mkspecs/modules/qt_lib_help.pri
-usr/share/qt5/mkspecs/modules/qt_lib_uitools.pri
+usr/lib/*/qt5/mkspecs/modules/qt_lib_designer.pri
+usr/lib/*/qt5/mkspecs/modules/qt_lib_help.pri
+usr/lib/*/qt5/mkspecs/modules/qt_lib_uitools.pri
diff --git a/debian/qttools5-private-dev.install b/debian/qttools5-private-dev.install
index c864142..89128c3 100644
--- a/debian/qttools5-private-dev.install
+++ b/debian/qttools5-private-dev.install
@@ -117,8 +117,8 @@ usr/include/qt5/QtHelp/*/QtHelp/private/qhelpsearchindexreader_p.h
 usr/include/qt5/QtHelp/*/QtHelp/private/qhelpsearchindexwriter_clucene_p.h
 usr/include/qt5/QtHelp/*/QtHelp/private/qhelpsearchindexwriter_default_p.h
 usr/include/qt5/QtUiTools/*/QtUiTools/private/quiloader_p.h
-usr/share/qt5/mkspecs/modules/qt_lib_clucene_private.pri
-usr/share/qt5/mkspecs/modules/qt_lib_designer_private.pri
-usr/share/qt5/mkspecs/modules/qt_lib_designercomponents_private.pri
-usr/share/qt5/mkspecs/modules/qt_lib_help_private.pri
-usr/share/qt5/mkspecs/modules/qt_lib_uitools_private.pri
+usr/lib/*/qt5/mkspecs/modules/qt_lib_clucene_private.pri
+usr/lib/*/qt5/mkspecs/modules/qt_lib_designer_private.pri
+usr/lib/*/qt5/mkspecs/modules/qt_lib_designercomponents_private.pri
+usr/lib/*/qt5/mkspecs/modules/qt_lib_help_private.pri
+usr/lib/*/qt5/mkspecs/modules/qt_lib_uitools_private.pri

-- 
qttools packaging



More information about the pkg-kde-commits mailing list