[SCM] LibreOffice packaging repository branch, ubuntu-oneiric-3.4, updated. libreoffice_3.4.1-4-157-ge8d44a8
The following commit has been merged in the ubuntu-oneiric-3.4 branch:
commit e8d44a846c8f014301a8014efa01ec1275285864
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date: Mon Aug 15 22:09:47 2011 +0200
add multiarch support for qt4
diff --git a/changelog b/changelog
index 2d006a0..17f2777 100644
--- a/changelog
+++ b/changelog
@@ -3,8 +3,9 @@ libreoffice (1:3.4.1-4ubuntu1) oneiric; urgency=low
* rename default theme back to default
* merge 3.4.1-4 from debian
* regenerate control
+ * add multiarch support for qt4
- -- Bjoern Michaelsen <bjoern.michaelsen@canonical.com> Mon, 15 Aug 2011 17:30:45 +0200
+ -- Bjoern Michaelsen <bjoern.michaelsen@canonical.com> Mon, 15 Aug 2011 22:09:30 +0200
libreoffice (1:3.4.1-4) experimental; urgency=low
diff --git a/rules b/rules
index 5f4f7ba..f6efd70 100755
--- a/rules
+++ b/rules
@@ -1821,6 +1821,7 @@ ifeq "$(BUILD_KDE)" "n"
endif
cd $(OOO_BUILD_TREE) ; \
+ QT4LIB=/usr/lib/$(DEB_BUILD_MULTIARCH) \
PATH=$(BUILD_PATH) \
LD_LIBRARY_PATH=$(BUILD_LD_LIBRARY_PATH) \
DEFAULT_TO_ENGLISH_FOR_PACKING=1 \
--
LibreOffice packaging repository
Reply to: