[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[SCM] LibreOffice packaging repository branch, debian-experimental-3.5, updated. libreoffice_3.5.4_dfsg-2-20-g2343635



The following commit has been merged in the debian-experimental-3.5 branch:
commit cd198ab4bcd07ad298d624718aa8dbfd59dde219
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 3cb6c49..e009d3f 100644
--- a/changelog
+++ b/changelog
@@ -5,6 +5,8 @@ libreoffice (1:3.5.6-1) UNRELEASED; urgency=low
 
   * debian/rules:
     - use generic python3.pc instead of pythonX.Y(mu).pc
+    - hack around broken "*" directory in debian/tmp/pkg on kfreebsd-*
+      extremely slowing down the install target...
   * debian/control.in:
     - remove obsolete sharutils, po-debconf and wget | curl build-deps
 
diff --git a/rules b/rules
index 5464fcf..3326150 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: