[SCM] qtbase packaging branch, master, updated. debian/5.2.0+dfsg-6-3-gdd85a4c
Lisandro Damián Nicanor Pérez
lisandro at moszumanska.debian.org
Fri Jan 31 15:35:28 UTC 2014
Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtbase.git;a=commitdiff;h=31d2cde
The following commit has been merged in the master branch:
commit 31d2cdecdabad0d1d1e65bdbf0a16460fb100f1c
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date: Tue Nov 26 19:37:32 2013 +0400
Fix two wrongly sorted lines in qtbase5-private-dev.install.
Taken from Timo's Ubuntu branch.
---
debian/changelog | 2 ++
debian/qtbase5-private-dev.install | 2 +-
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/debian/changelog b/debian/changelog
index 45063e9..4e3802a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,7 @@
qtbase-opensource-src (5.2.0~beta1+dfsg-4) UNRELEASED; urgency=low
+ [ Dmitry Shachnev ]
+ * Fix two wrongly sorted lines in qtbase5-private-dev.install (thanks Timo).
-- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Tue, 26 Nov 2013 19:31:35 +0400
diff --git a/debian/qtbase5-private-dev.install b/debian/qtbase5-private-dev.install
index 69b257b..2353982 100644
--- a/debian/qtbase5-private-dev.install
+++ b/debian/qtbase5-private-dev.install
@@ -123,8 +123,8 @@ usr/include/qt5/QtCore/*/QtCore/private/qtextstream_p.h
usr/include/qt5/QtCore/*/QtCore/private/qthread_p.h
usr/include/qt5/QtCore/*/QtCore/private/qthreadpool_p.h
usr/include/qt5/QtCore/*/QtCore/private/qtimerinfo_unix_p.h
-usr/include/qt5/QtCore/*/QtCore/private/qtimezoneprivate_p.h
usr/include/qt5/QtCore/*/QtCore/private/qtimezoneprivate_data_p.h
+usr/include/qt5/QtCore/*/QtCore/private/qtimezoneprivate_p.h
usr/include/qt5/QtCore/*/QtCore/private/qtldurl_p.h
usr/include/qt5/QtCore/*/QtCore/private/qtools_p.h
usr/include/qt5/QtCore/*/QtCore/private/qtranslator_p.h
--
qtbase packaging
More information about the pkg-kde-commits
mailing list