[SCM] LibreOffice packaging repository branch, master, updated. ae161aa34866c5490b1c49b9ea78dd2fea0d1e4f
The following commit has been merged in the master branch:
commit ae161aa34866c5490b1c49b9ea78dd2fea0d1e4f
Author: Rene Engelhard <rene@debian.org>
Date: Tue Mar 22 12:38:15 2011 +0000
call dh_python2 with -ppython-uno to work around #619005
diff --git a/changelog b/changelog
index 9ec79fe..560f83b 100644
--- a/changelog
+++ b/changelog
@@ -12,6 +12,7 @@ libreoffice (1:3.3.2~rc2-2) UNRELEASED; urgency=low
- remove lenny-backport support; lenny hasn't a dpkg-maintscript-helper
- make base-files build-conflict also work after 6.0.1
- build with system libtextcat now that that is patched
+ - call dh_python2 with -ppython-uno to work around #619005
* debian/libreoffice-common.p*.in:
- remove hardcoded rm_conffile. use dpkg-maintscript-helper
- move psprint.conf, sofficerc and soffice.sh (closes: #619113)
@@ -20,7 +21,7 @@ libreoffice (1:3.3.2~rc2-2) UNRELEASED; urgency=low
- Standards-Version: 3.9.1 (no changes needed)
- make conflicts on libtextcat-data versioned
- -- Rene Engelhard <rene@debian.org> Tue, 22 Mar 2011 01:37:38 +0000
+ -- Rene Engelhard <rene@debian.org> Tue, 22 Mar 2011 12:37:33 +0000
libreoffice (1:3.3.2~rc2-1) unstable; urgency=low
diff --git a/rules b/rules
index 01e670a..a686f59 100755
--- a/rules
+++ b/rules
@@ -3164,7 +3164,7 @@ ifeq "$(BUILD_JARS_NATIVE)" "y"
dh_nativejava -plibreoffice$(VER)-gcj -o
endif
ifeq ($(PYTHON_HELPER),dh_python2)
- dh_python2 --no-guessing-versions --no-guessing-deps
+ dh_python2 -ppython-uno --no-guessing-versions --no-guessing-deps
else ifeq ($(PYTHON_HELPER),dh_pycentral)
dh_pycentral -ppython-uno
ifeq "$(PYTHON_VERSION)" "current"
--
LibreOffice packaging repository
Reply to: