The following commit has been merged in the debian-experimental-3.5 branch:
commit bc5ea6858ca068b6a99aae2c55c9c0a8f03ac594
Author: Rene Engelhard <r...@debian.org>
Date: Mon Jan 16 14:11:14 2012 +0100
revert 5608ffe43a8933ff5331ec7aaff3f7b428079bb; rm configure aclocal.m4 in
clean instead
diff --git a/changelog b/changelog
index f2b22b0..bbc33c7 100644
--- a/changelog
+++ b/changelog
@@ -29,7 +29,7 @@ libreoffice (1:3.5.0~beta3-1) UNRELEASED; urgency=low
- no dependencies needed for full builds
+ propagate gb_FULLDEPS
- -- Rene Engelhard <r...@debian.org> Fri, 13 Jan 2012 10:22:35 +0100
+ -- Rene Engelhard <r...@debian.org> Sat, 14 Jan 2012 00:28:25 +0100
libreoffice (1:3.5.0~beta2-2) experimental; urgency=low
diff --git a/patches/series b/patches/series
index ad83192..454f45c 100644
--- a/patches/series
+++ b/patches/series
@@ -28,4 +28,3 @@ revert-468fe685e3c58c84bce6d9a48b931dcc21682679.diff
propagate-gb_FULLDEPS.diff
ppc-fix-soffice.sh.diff
jdbc-driver-threading.diff
-autoreconf.diff
diff --git a/rules b/rules
index 6ef69d5..832edd1 100755
--- a/rules
+++ b/rules
@@ -1218,6 +1218,8 @@ clean:
fi
rm -rf $(SOURCE_TREE)/file-lists
rm -rf $(SOURCE_TREE)/pyuno-py3
+ rm -f configure aclocal.m4
+ rm -f build_error.log
ifeq "$(HELPISOS)" ""
rm -rf images*
@@ -1524,7 +1526,6 @@ config.status:
for FILE in debian/scripts/move-if-change \
debian/scripts/cleandupes \
debian/scripts/get_libebook_dep.sh \
- configure \
autogen.sh; \
do \
chmod 755 $$FILE ;\
@@ -1558,11 +1559,7 @@ endif
# Make sure we have /proc mounted - otherwise idlc will fail later.
test -r /proc/version
- if [ -x ./configure ]; then \
- PATH=$(BUILD_PATH) LD_LIBRARY_PATH=$(BUILD_LD_LIBRARY_PATH)
./configure $(CONFIGURE_FLAGS); \
- else \
- PATH=$(BUILD_PATH) LD_LIBRARY_PATH=$(BUILD_LD_LIBRARY_PATH)
./autogen.sh $(CONFIGURE_FLAGS); \
- fi
+ PATH=$(BUILD_PATH) LD_LIBRARY_PATH=$(BUILD_LD_LIBRARY_PATH)
./autogen.sh $(CONFIGURE_FLAGS)
touch $@
--
LibreOffice packaging repository
--
To UNSUBSCRIBE, email to debian-openoffice-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1rmmmo-0003u6...@vasks.debian.org
