The following commit has been merged in the debian-experimental-3.7 branch:
commit 1a3c5fac0ed4e67663823eb7617382485dbf5aa6
Author: Rene Engelhard <[email protected]>
Date: Thu Nov 15 00:43:49 2012 +0100
git update; use new bin/get_config_variables; set CHECK_PARALLELISM=1
diff --git a/changelog b/changelog
index 2a9dcb9..46d00a3 100644
--- a/changelog
+++ b/changelog
@@ -1,4 +1,4 @@
-libreoffice (1:4.0.0~alpha0~git20121112-1) UNRELEASED; urgency=low
+libreoffice (1:4.0.0~alpha0~git20121114-1) UNRELEASED; urgency=low
* new upstream snapshot
- contains new driver for mozab (mork). Automatically enabled thus
diff --git a/rules b/rules
index 4be4635..4ceb61c 100755
--- a/rules
+++ b/rules
@@ -1650,7 +1650,7 @@ endif
export HOME=$$t; \
export SAL_USE_VCLPLUGIN="svp"; \
if [ -x /usr/bin/gdb ]; then ulimit -c unlimited; fi && \
- $(MAKE) -k check gb_FULLDEPS= gb_Deliver_HARDLINK=T && \
+ CHECK_PARALLELISM=1 $(MAKE) -k check gb_FULLDEPS=
gb_Deliver_HARDLINK=T && \
rm -rf $$t
ifneq (,$(findstring $(DEB_HOST_ARCH),$(OOO_NO_BASE_ARCHS)))
@@ -2195,11 +2195,11 @@ ifeq "$(BUILD_PYUNO)" "y"
| sed -e "s/$(PYMAJOR).$(PYMINOR)/$(PY3MAJOR).$(PY3MINOR)/" \
> debian/python3-uno/$(OODIR)/program/pythonloader.unorc
for i in py3uno.so libpy3uno.so; do \
- install -m644 $(SOURCE_TREE)/workdir/$(shell .
$(SOURCE_TREE)/config_host.mk.source; echo
$$OUTPATH$$PROEXT)/LinkTarget/Library/$$i \
+ install -m644 $(SOURCE_TREE)/workdir/$(shell .
$(SOURCE_TREE)/bin/get_config_variables OUTPATH PROEXT; echo
$$OUTPATH$$PROEXT)/LinkTarget/Library/$$i \
debian/python3-uno/$(OODIR)/program/$$i; \
ln -s $$i debian/python3-uno/$(OODIR)/program/`echo $$i
| sed -e s/3//`; \
done
- install -m644 $(SOURCE_TREE)/workdir/$(shell .
$(SOURCE_TREE)/config_host.mk.source; echo
$$OUTPATH$$PROEXT)/LinkTarget/Library/python3loader.uno.so \
+ install -m644 $(SOURCE_TREE)/workdir/$(shell .
$(SOURCE_TREE)/bin/get_config_variables OUTPATH PROEXT; echo
$$OUTPATH$$PROEXT)/LinkTarget/Library/python3loader.uno.so \
debian/python3-uno/$(OODIR)/program/python3loader.uno.so
ln -s python3loader.uno.so
debian/python3-uno/$(OODIR)/program/pythonloader.uno.so
cp debian/python-uno/$(OODIR)/program/pythonloader.py \
@@ -2278,7 +2278,7 @@ ifeq "$(PACKAGE_SDK)" "y"
# install gsicheck into -dev
mkdir -p $(PKGDIR)-dev/$(OODIR)/program
- install -m755 $(SOURCE_TREE)/solver/$(shell .
$(SOURCE_TREE)/config_host.mk.source; echo $$OUTPATH$$PROEXT)/bin/gsicheck \
+ install -m755 $(SOURCE_TREE)/solver/$(shell .
$(SOURCE_TREE)/bin/get_config_variables OUTPATH PROEXT; echo
$$OUTPATH$$PROEXT)/bin/gsicheck \
$(PKGDIR)-dev/$(OODIR)/program/gsicheck.bin
( \
echo '#! /bin/sh'; \
@@ -2314,7 +2314,7 @@ ifeq "$(PACKAGE_SDK)" "y"
ifeq "$(ENABLE_JAVA)" "y"
# install the UNO Java sources for e.g. eclipse
mkdir -p $(CURDIR)/$(PKGDIR)-dev/usr/share/java
- cd $(SOURCE_TREE)/solver/$(shell .
$(SOURCE_TREE)/config_host.mk.source; echo $$OUTPATH$$PROEXT)/pck && \
+ cd $(SOURCE_TREE)/solver/$(shell .
$(SOURCE_TREE)/bin/get_config_variables OUTPATH PROEXT; echo
$$OUTPATH$$PROEXT)/pck && \
for i in juh jurt jut ridl unoloader; do \
cp $${i}_src.zip \
$(CURDIR)/$(PKGDIR)-dev/usr/share/java; \
@@ -2367,9 +2367,9 @@ endif
#ifeq "$(PACKAGE_SDK)" "y"
# # install gengal stuff into -dev
# mkdir -p $(PKGDIR)-dev/$(OODIR)/program
-# install -m755 $(SOURCE_TREE)/svx/$(shell .
$(SOURCE_TREE)/config_host.mk.source; echo $$OUTPATH$$PROEXT)/bin/gengal \
+# install -m755 $(SOURCE_TREE)/svx/$(shell .
$(SOURCE_TREE)/bin/get_config_variables OUTPATH PROEXT; echo
$$OUTPATH$$PROEXT)/bin/gengal \
# $(PKGDIR)-dev/$(OODIR)/program/gengal
-# install -m755 $(SOURCE_TREE)/svx/$(shell .
$(SOURCE_TREE)/config_host.mk.source; echo $$OUTPATH$$PROEXT)/bin/gengal.bin \
+# install -m755 $(SOURCE_TREE)/svx/$(shell .
$(SOURCE_TREE)/bin/get_config_variables OUTPATH PROEXT; echo
$$OUTPATH$$PROEXT)/bin/gengal.bin \
# $(PKGDIR)-dev/$(OODIR)/program/gengal.bin
#endif
@@ -2748,7 +2748,7 @@ endif
#ifeq "$(PACKAGE_SDK)" "y"
# # install gengal stuff into -dev
# mkdir -p $(PKGDIR)-dev/$(OODIR)/program
-# install -m644 $(SOURCE_TREE)/svx/$(shell .
$(SOURCE_TREE)/config_host.mk.source; echo $$OUTPATH$$PROEXT)/bin/gengalrc \
+# install -m644 $(SOURCE_TREE)/svx/$(shell .
$(SOURCE_TREE)/bin/get_config_variables OUTPATH PROEXT; echo
$$OUTPATH$$PROEXT)/bin/gengalrc \
# $(PKGDIR)-common/$(OODIR)/program/gengalrc
#endif
@@ -2756,7 +2756,7 @@ ifeq "$(PACKAGE_LIBRELOGO)" "y"
rm -rf $(PKGDIR)-librelogo
mkdir -p $(PKGDIR)-librelogo/$(OODIR)/share/extensions/librelogo
cd $(PKGDIR)-librelogo/$(OODIR)/share/extensions/librelogo && \
- unzip $(CURDIR)/solver/$(shell .
$(SOURCE_TREE)/config_host.mk.source; echo $$OUTPATH$$PROEXT)/bin/librelogo.oxt
+ unzip $(CURDIR)/solver/$(shell .
$(SOURCE_TREE)/bin/get_config_variables OUTPATH PROEXT; echo
$$OUTPATH$$PROEXT)/bin/librelogo.oxt
endif
touch $@
@@ -2774,7 +2774,7 @@ $(STAMP_DIR)/binary-arch: $(STAMP_DIR)/install-arch
debian/control $(STAMP_DIR)/
dh_installdocs -s -A
for p in $(ARCH_DEP_PACKAGES); do \
mkdir -p debian/$$p/usr/share/doc/$$p; \
- cat solver/$(shell . $(SOURCE_TREE)/config_host.mk.source; echo
$$OUTPATH$$PROEXT)/bin/osl/README_en-US \
+ cat solver/$(shell . $(SOURCE_TREE)/bin/get_config_variables
OUTPATH PROEXT; echo $$OUTPATH$$PROEXT)/bin/osl/README_en-US \
| sed -e 's/$${PRODUCTNAME}/LibreOffice/g' \
| sed -e 's/$${PRODUCTVERSION}/3.6/g' \
> debian/$$p/usr/share/doc/$$p/README; \
@@ -2935,7 +2935,7 @@ endif
ifeq "$(PACKAGE_BASE)" "y"
ifeq "$(ENABLE_MYSQLNATIVE)" "y"
dh_gencontrol -plibreoffice$(VER)-mysql-connector -- \
- -v$(shell grep "<version" $(SOURCE_TREE)/mysqlc/$(shell .
$(SOURCE_TREE)/config_host.mk.source; echo
$$OUTPATH$$PROEXT)/misc/description.xml | perl -pi -e 's,<version
value=\"(.*)\" />,\1,; s/^\s+//; s/\s+$$//')+LibO`echo $(BINARY_VERSION) | cut
-d: -f2`
+ -v$(shell grep "<version" $(SOURCE_TREE)/mysqlc/$(shell .
$(SOURCE_TREE)/bin/get_config_variables OUTPATH PROEXT; echo
$$OUTPATH$$PROEXT)/misc/description.xml | perl -pi -e 's,<version
value=\"(.*)\" />,\1,; s/^\s+//; s/\s+$$//')+LibO`echo $(BINARY_VERSION) | cut
-d: -f2`
endif
endif
endif
@@ -2996,7 +2996,7 @@ endif
dh_installdocs -i -A
for p in $(ARCH_INDEP_PACKAGES); do \
mkdir -p debian/$$p/usr/share/doc/$$p; \
- cat solver/$(shell . $(SOURCE_TREE)/config_host.mk.source; echo
$$OUTPATH$$PROEXT)/bin/osl/README_en-US \
+ cat solver/$(shell . $(SOURCE_TREE)/bin/get_config_variables
OUTPATH PROEXT; echo $$OUTPATH$$PROEXT)/bin/osl/README_en-US \
| sed -e 's/$${PRODUCTNAME}/LibreOffice/g' \
| sed -s 's/$${PRODUCTVERSION}/3.6/g' \
> debian/$$p/usr/share/doc/$$p/README; \
--
LibreOffice packaging repository
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
Archive: http://lists.debian.org/[email protected]
