[SCM] qtcreator packaging branch, master, updated. debian/4.3.1-1-7-gd11ed44

Lisandro Damián Nicanor Pérez lisandro at moszumanska.debian.org
Fri Nov 24 23:24:35 UTC 2017


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

The following commit has been merged in the master branch:
commit d11ed4400bb20ca491400ef8860e3e64b38c2b58
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Fri Nov 24 20:23:55 2017 -0300

    No-op wrap-and-sort.
---
 debian/control                | 4 ++--
 debian/qtcreator-data.install | 2 +-
 debian/qtcreator-doc.install  | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/debian/control b/debian/control
index 484e66b..c9231d2 100644
--- a/debian/control
+++ b/debian/control
@@ -5,17 +5,17 @@ Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
 Uploaders: Adam Majer <adamm at zombino.com>,
            Jeremy Lainé <jeremy.laine at m4x.org>,
            Lisandro Damián Nicanor Pérez Meyer <lisandro at debian.org>,
-           Simon Quigley <tsimonq2 at ubuntu.com>,
+           Simon Quigley <tsimonq2 at ubuntu.com>
 Build-Depends: debhelper (>= 10),
                libbotan1.10-dev,
                libclang-3.9-dev [amd64],
-               llvm-dev [amd64],
                libicu-dev,
                libjs-jquery,
                libqt5opengl5-dev (>= 5.6.0~),
                libqt5sql5-sqlite (>= 5.6.0~),
                libqt5webkit5-dev (>= 5.6.0~),
                libqt5x11extras5-dev (>= 5.6.0~),
+               llvm-dev [amd64],
                pkg-config,
                qbs-dev (>= 1.8.1~),
                qml-module-qtquick2 (>= 5.6.0~),
diff --git a/debian/qtcreator-data.install b/debian/qtcreator-data.install
index b3bfead..f953b8a 100644
--- a/debian/qtcreator-data.install
+++ b/debian/qtcreator-data.install
@@ -1,5 +1,5 @@
 debian/Nokia-QtCreator.xml usr/share/mime/packages/
 usr/share/applications/org.qt-project.qtcreator.desktop
-usr/share/metainfo/org.qt-project.qtcreator.appdata.xml
 usr/share/icons/hicolor/*
+usr/share/metainfo/org.qt-project.qtcreator.appdata.xml
 usr/share/qtcreator/*
diff --git a/debian/qtcreator-doc.install b/debian/qtcreator-doc.install
index dfe407b..653d9a7 100644
--- a/debian/qtcreator-doc.install
+++ b/debian/qtcreator-doc.install
@@ -1,4 +1,4 @@
-usr/share/doc/qtcreator/qtcreator.qch usr/share/qtcreator/doc
 usr/share/doc/qtcreator/qtcreator-dev.qch usr/share/qtcreator/doc
-usr/share/doc/qtcreator/qtcreator/* usr/share/doc/qtcreator/html
 usr/share/doc/qtcreator/qtcreator-dev/* usr/share/doc/qtcreator/html-dev
+usr/share/doc/qtcreator/qtcreator.qch usr/share/qtcreator/doc
+usr/share/doc/qtcreator/qtcreator/* usr/share/doc/qtcreator/html

-- 
qtcreator packaging



More information about the pkg-kde-commits mailing list