[SCM] LibreOffice packaging repository branch, debian-experimental-3.5, updated. libreoffice_3.4.4-1-127-g8062df1
The following commit has been merged in the debian-experimental-3.5 branch:
commit 9d399fd1581be3f4f8ba08bf1a8fb4595aeffcd3
Author: Rene Engelhard <rene@debian.org>
Date: Sun Dec 11 20:38:41 2011 +0000
update install-no-dependency-on-build.diff
diff --git a/patches/install-no-dependency-on-build.diff b/patches/install-no-dependency-on-build.diff
index 59fc615..55e9dac 100644
--- a/patches/install-no-dependency-on-build.diff
+++ b/patches/install-no-dependency-on-build.diff
@@ -1,13 +1,13 @@
-diff --git a/Makefile.in b/Makefile.in
-index 197eb8e..faa5816 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -67,7 +67,7 @@ cross-build-toolset:
- cd cross_toolset && \
- build.pl -P@BUILD_NCPUS@ --all -- -P@BUILD_MAX_JOBS@
+diff --git a/solenv/gbuild/extensions/post_AuxTargets.mk b/solenv/gbuild/extensions/post_AuxTargets.mk
+index 7622047..9978cda 100644
+--- solenv/gbuild/extensions/post_AuxTargets.mk
++++ solenv/gbuild/extensions/post_AuxTargets.mk
+@@ -75,7 +75,7 @@ distclean: clean
+ desktop/scripts/soffice.sh ooo.lst post_download post_download.log \
+ set_soenv set_soenv.last set_soenv.stamp src.downloaded warn
-install: build
+install:
- @. ./Env.Host.sh && \
- echo "Installing in @INSTALLDIR@..." && \
- ooinstall "@INSTALLDIR@" && \
+ echo "Installing in $(INSTALLDIR)..." && \
+ ooinstall "$(INSTALLDIR)" && \
+ echo "" && \
diff --git a/patches/series b/patches/series
index d7b5d69..3ef96cf 100644
--- a/patches/series
+++ b/patches/series
@@ -10,7 +10,7 @@ disable-dynamic-list-cpp.diff
libebook-1.2.so.12.diff
make-gengal-work-again.diff
fix-system-lpsolve-build.diff
-#install-no-dependency-on-build.diff
+install-no-dependency-on-build.diff
cleanup-distro-install-file-lists.diff
smoketest-only-en-US.diff
getMIMEDescription-mismatch.diff
--
LibreOffice packaging repository
Reply to: