[SCM] Qt Assistant compatibility version packaging branch, master, updated. debian/4.6.3-4-5-g39fe682
Lisandro Damián Nicanor Pérez
lisandro at alioth.debian.org
Wed Jun 26 03:27:47 UTC 2013
Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qt-assistant-compat.git;a=commitdiff;h=ba2c6e0
The following commit has been merged in the master branch:
commit ba2c6e0343f072165722eb6d92220cd78c66fedf
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date: Wed Jun 26 00:25:14 2013 -0300
Fix FTBFS caused by the change of binaries path.
Closes: #713250
---
debian/changelog | 5 +++++
debian/qt-assistant-compat.install | 2 +-
debian/qt-assistant-compat.links.in | 1 +
debian/rules | 7 +++++++
4 files changed, 14 insertions(+), 1 deletion(-)
diff --git a/debian/changelog b/debian/changelog
index e5084df..24fe6c5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,11 @@ qt-assistant-compat (4.6.3-5) UNRELEASED; urgency=low
[ Lisandro Damián Nicanor Pérez Meyer ]
* Make sure we use Qt 4 for building by setting QT_SELECT = qt4.
Now there is no need to use lrelease-qt4 anymore.
+ * Fix FTBFS caused by the change of binaries path due to the introduction of
+ qtchooser (Closes: #713250).
+ - assistant_adp is now in a M-A qualified path. Fix install file.
+ - Create a link of the above binary to /usr/bin/. Use a template file to
+ create the correct path. Clean the generated file when running dh_clean.
-- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Wed, 26 Jun 2013 00:14:07 -0300
diff --git a/debian/qt-assistant-compat.install b/debian/qt-assistant-compat.install
index 2f4c046..797b747 100644
--- a/debian/qt-assistant-compat.install
+++ b/debian/qt-assistant-compat.install
@@ -1,4 +1,4 @@
-usr/bin/assistant_adp
+usr/lib/*/qt4/bin/assistant_adp
usr/share/qt4/translations/assistant_adp_de.qm
usr/share/qt4/translations/assistant_adp_ja.qm
usr/share/qt4/translations/assistant_adp_pl.qm
diff --git a/debian/qt-assistant-compat.links.in b/debian/qt-assistant-compat.links.in
new file mode 100644
index 0000000..b07f0d4
--- /dev/null
+++ b/debian/qt-assistant-compat.links.in
@@ -0,0 +1 @@
+usr/lib/DEB_HOST_MULTIARCH/qt4/bin/assistant_adp usr/bin/assistant_adp
diff --git a/debian/rules b/debian/rules
index cd6bba2..9916e54 100755
--- a/debian/rules
+++ b/debian/rules
@@ -24,6 +24,7 @@ override_dh_auto_clean:
dh_auto_clean --sourcedirectory=lib
rm -f translations/assistant_adp_*.qm
rm -rf lib/lib
+ rm -f debian/qt-assistant-compat.links
override_dh_auto_install:
dh_auto_install
@@ -45,3 +46,9 @@ override_dh_auto_install:
# Install missing headers
install -p -m0644 $(CURDIR)/debian/include/Q* \
$(CURDIR)/debian/tmp/usr/include/qt4/QtAssistant/
+
+override_dh_install:
+ # Replace the correct arch triplet using the templates.
+ sed s/%DEB_HOST_MULTIARCH%/$(DEB_HOST_MULTIARCH)/ \
+ debian/qt-assistant-compat.links.in > debian/qt-assistant-compat.links
+ dh_install
--
Qt Assistant compatibility version packaging
More information about the pkg-kde-commits
mailing list