[SCM] LibreOffice packaging repository branch, ubuntu-saucy-4.1, updated. libreoffice_4.1.0_beta2-2-343-g6f91b7c
The following commit has been merged in the ubuntu-saucy-4.1 branch:
commit 2fb70360027a89af775b7896523ce4c58a79cb88
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date: Tue Jun 18 12:38:32 2013 +0200
trying to remove the workdir before installing on ppa builds to squeeze in size requirements
diff --git a/changelog b/changelog
index a2359a3..3e4d503 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,10 @@
+libreoffice (1:4.1.0~beta2~incompleteinternals1-0ubuntu1~ppa7) saucy; urgency=low
+
+ * trying to remove the workdir before installing on ppa builds to squeeze in
+ size requirements
+
+ -- Bjoern Michaelsen <bjoern.michaelsen@canonical.com> Wed, 19 Jun 2013 14:05:58 +0200
+
libreoffice (1:4.1.0~beta2~incompleteinternals1-0ubuntu1~ppa1) saucy; urgency=low
* smaller src-tarballs
diff --git a/rules b/rules
index d773fb0..ef19078 100755
--- a/rules
+++ b/rules
@@ -579,6 +579,9 @@ ifeq "$(DEB_VENDOR)" "Ubuntu"
endif
PARALLEL_BUILD=y
ENABLE_MERGELIBS=y
+ ifeq ($(ON_BUILDD),y)
+ buildd_discspace_hack:=find workdir/ -type f -name '*.o' -exec mv {} {}_org \; -exec touch -r {}_org {} \; -exec rm {}_org \;
+ endif
#temp. hacks
ENABLE_EVO2:=n
SYSTEM_STUFF := $(filter-out libodfgen harfbuzz libmwaw mdds, $(SYSTEM_STUFF))
@@ -1843,6 +1846,7 @@ install-common: $(STAMP_DIR)/install-common
$(STAMP_DIR)/install-common:
dh_testdir
dh_testroot
+ $(buildd_discspace_hack)
if [ -x /usr/bin/dh_prep ]; then dh_prep; else dh_clean -k; fi
rm -f debian/*.install debian/*.dirs
--
LibreOffice packaging repository
Reply to: