[SCM] LibreOffice packaging repository branch, debian-wheezy-3.5, updated. libreoffice_3.5.4_dfsg2-1-8-g05b8778
The following commit has been merged in the debian-wheezy-3.5 branch:
commit 9278e1a77989ab882fd26c0a581fa25c079c1251
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-*
Conflicts:
changelog
diff --git a/changelog b/changelog
index a68f004..ff0f11c 100644
--- a/changelog
+++ b/changelog
@@ -3,6 +3,8 @@ libreoffice (1:3.5.4+dfsg2-0+deb7u2) stable; urgency=low
* debian/rules:
- work around possible failure install-common target with missing
ca-XV .dirs/.install...
+ - hack around broken "*" directory in debian/tmp/pkg on kfreebsd-*
+ extremely slowing down the install target...
-- Rene Engelhard <rene@debian.org> Mon, 27 Aug 2012 13:11:47 +0200
diff --git a/rules b/rules
index 5af9814..08c2d43 100755
--- a/rules
+++ b/rules
@@ -1671,6 +1671,11 @@ $(STAMP_DIR)/install: $(STAMP_DIR)/build
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: