The following commit has been merged in the debian-experimental-3.4.0 branch:
commit 2e2a1b55e3d05ec420b5b9efd16041449ebc5026
Author: Rene Engelhard <[email protected]>
Date: Mon May 30 22:46:14 2011 +0000
Revert "remove ext-sources-libreoffice-build"
This reverts commit 6ae9be8215aa31ebd0a3cf574b3afcf37ed34460.
diff --git a/rules b/rules
index f9528ad..7e0f7bc 100755
--- a/rules
+++ b/rules
@@ -1249,6 +1249,10 @@ endif
rm -f $(OOO_BUILD_TREE)/src/libreoffice-$(OOO_BUILD_TARBAL_VERSION)*
rm -f $(OOO_BUILD_TREE)/src/GSI*
+ for i in ext-sources-$(OOO_BUILD_TREE)/*; do \
+ rm -f $(OOO_BUILD_TREE)/src/`basename $$i`; \
+ done
+
for i in `find $(OOO_BUILD_TREE)/patches/dev300 -name "*.in" ! -name
"Makefile*"`; do \
if [ -e `echo $$i | sed -e s/\.in$$//` ]; then \
rm `echo $$i | sed -e s/\.in$$//`; \
@@ -1550,6 +1554,7 @@ $(OOO_BUILD_TREE)/config.status:
$(OOO_BUILD_TREE)/configure
ifeq "$(USE_SOURCE_TARBALLS)" "y"
cp -a sources/* $(OOO_BUILD_TREE)/src
endif
+ cp -a ext-sources-$(OOO_BUILD_TREE)/* $(OOO_BUILD_TREE)/src
ifneq ($(GCC_VERSION),)
ifneq ($(GCC_VERSION),snapshot)
diff --git a/source/components b/source/components
index e98ada6..f63fef7 100644
--- a/source/components
+++ b/source/components
@@ -1,2 +1,4 @@
ext-sources
libreoffice-build
+ext-sources-libreoffice-build
+translation-updates-20100529
--
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]
