[SCM] LibreOffice packaging repository branch, debian-experimental-3.6, updated. libreoffice_3.6.1-1-8-g5e923f8
The following commit has been merged in the debian-experimental-3.6 branch:
commit 5e923f8443b546464f6ee9ffb824b77bb51bb785
Author: Rene Engelhard <rene@debian.org>
Date: Mon Sep 10 18:38:18 2012 +0200
hack around broken * directory in debian/tmp/pkg on kfreebsd-*
diff --git a/changelog b/changelog
index 3d4786b..0e1a445 100644
--- a/changelog
+++ b/changelog
@@ -9,6 +9,8 @@ libreoffice (1:3.6.1-2) UNRELEASED; urgency=low
* debian/rules:
- fix native-hars dependeny to depend on install-common ...
- ... but as this doesn't build then disable it for now...
+ - hack around broken "*" directory in debian/tmp/pkg on kfreebsd-*
+ extremely slowing down the install target...
-- Rene Engelhard <rene@debian.org> Wed, 05 Sep 2012 14:26:21 +0200
diff --git a/rules b/rules
index 5b2c597..8b0fb9f 100755
--- a/rules
+++ b/rules
@@ -1691,6 +1691,11 @@ $(STAMP_DIR)/install-common:
export OOINSTBASE=$(OODIR); \
export OOO_LANGS_LIST="$(ISOS)"; \
$(CURDIR)/debian/scripts/gid2pkgdirs.sh
+
+ # FIXME
+ if echo $(DEB_HOST_ARCH) | grep -q kfreebsd; then \
+ cd $(CURDIR)/debian/tmp/pkg && rm -rf \*; \
+ fi
# prepare install/dir files for dh
for i in `cd $(CURDIR)/debian/tmp/pkg; ls -1 | xargs`; do \
--
LibreOffice packaging repository
Reply to: