[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:39 UTC 2014
Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtbase.git;a=commitdiff;h=dd85a4c
The following commit has been merged in the master branch:
commit dd85a4c4d6eb19a01e75959d4725f7298b63b852
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date: Fri Jan 24 02:42:51 2014 +0000
Install qmake's arch-specific data in an arch-specific path.
---
debian/changelog | 4 ++++
debian/qt5-qmake.install | 2 +-
debian/rules | 1 +
3 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/debian/changelog b/debian/changelog
index e106dc9..74cadf5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,10 @@ qtbase-opensource-src (5.2.0+dfsg-7) UNRELEASED; urgency=medium
[ Dmitry Shachnev ]
* Use canonical Vcs-Browser field.
+ [ Lisandro Damián Nicanor Pérez Meyer ]
+ * Install qmake's arch-specific data in an arch-specific path by using the
+ hostdatadir option while calling configure.
+
-- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Mon, 20 Jan 2014 20:09:33 +0400
qtbase-opensource-src (5.2.0+dfsg-6) experimental; urgency=medium
diff --git a/debian/qt5-qmake.install b/debian/qt5-qmake.install
index 7d12a15..d771d6f 100644
--- a/debian/qt5-qmake.install
+++ b/debian/qt5-qmake.install
@@ -1,2 +1,2 @@
usr/lib/*/qt5/bin/qmake
-usr/share/qt5/mkspecs/*
+usr/lib/*/qt5/mkspecs/
diff --git a/debian/rules b/debian/rules
index 0f1b270..fd799b1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -92,6 +92,7 @@ override_dh_auto_configure:
-plugindir "/usr/lib/$(DEB_HOST_MULTIARCH)/qt5/plugins" \
-importdir "/usr/lib/$(DEB_HOST_MULTIARCH)/qt5/imports" \
-translationdir "/usr/share/qt5/translations" \
+ -hostdatadir "/usr/lib/$(DEB_HOST_MULTIARCH)/qt5" \
-sysconfdir "/etc/xdg" \
-examplesdir "/usr/lib/$(DEB_HOST_MULTIARCH)/qt5/examples" \
-opensource \
--
qtbase packaging
More information about the pkg-kde-commits
mailing list