The following commit has been merged in the debian-experimental-3.5 branch:
commit d095cb5c8bdcda8a4e55d5a80eccae017bcc9d9e
Author: Rene Engelhard <[email protected]>
Date: Mon Dec 12 19:55:32 2011 +0100
fix install again (duplicate try, remove build dependency) and consolidate
patches
diff --git a/patches/cleanup-distro-install-file-lists.diff
b/patches/install-fixes.diff
similarity index 86%
rename from patches/cleanup-distro-install-file-lists.diff
rename to patches/install-fixes.diff
index 17d9d55..66be5bf 100644
--- a/patches/cleanup-distro-install-file-lists.diff
+++ b/patches/install-fixes.diff
@@ -175,3 +175,41 @@ index eaabf9c..c1b1ec6 100755
fi
# mark the config files
+diff --git a/solenv/gbuild/extensions/post_AuxTargets.mk
b/solenv/gbuild/extensions/post_AuxTargets.mk
+index 7622047..9978cda 100644
+--- libreoffice-3.5.0/solenv/gbuild/extensions/post_AuxTargets.mk
++++ libreoffice-3.5.0/solenv/gbuild/extensions/post_AuxTargets.mk
+@@ -37,10 +37,12 @@ docs:
+ @mkdocs.sh $(SRCDIR)/docs $(SOLARENV)/inc/doxygen.cfg
+
+ distro-pack-install: install
+- $(SRCDIR)/bin/distro-install-clean-up
+- $(SRCDIR)/bin/distro-install-desktop-integration
+- $(SRCDIR)/bin/distro-install-sdk
+- $(SRCDIR)/bin/distro-install-file-lists
++ if [ ! -d "$(SRCDIR)/file-lists" ]; then \
++ $(SRCDIR)/bin/distro-install-clean-up; \
++ $(SRCDIR)/bin/distro-install-desktop-integration; \
++ $(SRCDIR)/bin/distro-install-sdk; \
++ $(SRCDIR)/bin/distro-install-file-lists; \
++ fi
+
+ $(SRCDIR)/src.downloaded: $(SRCDIR)/ooo.lst $(SRCDIR)/download
+ $(if $(filter YES,$(DO_FETCH_TARBALLS)),cd $(SRCDIR) && ./download
./ooo.lst && touch $@,touch $@)
+@@ -75,12 +77,14 @@ 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:
++ if [ ! -d "$(DESTDIR)/$(INSTALLDIR)" ]; then \
+ echo "Installing in $(INSTALLDIR)..." && \
+ ooinstall "$(INSTALLDIR)" && \
+ echo "" && \
+ echo "Installation finished, you can now execute:" && \
+- echo "$(INSTALLDIR)/program/soffice"
++ echo "$(INSTALLDIR)/program/soffice"; \
++ fi
+
+ endif
+
diff --git a/patches/install-no-dependency-on-build.diff
b/patches/install-no-dependency-on-build.diff
deleted file mode 100644
index b2f7212..0000000
--- a/patches/install-no-dependency-on-build.diff
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/solenv/gbuild/extensions/post_AuxTargets.mk
b/solenv/gbuild/extensions/post_AuxTargets.mk
-index 7622047..9978cda 100644
---- libreoffice-3.5.0/solenv/gbuild/extensions/post_AuxTargets.mk
-+++ libreoffice-3.5.0/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:
- echo "Installing in $(INSTALLDIR)..." && \
- ooinstall "$(INSTALLDIR)" && \
- echo "" && \
diff --git a/patches/series b/patches/series
index 3ef96cf..61f14b4 100644
--- a/patches/series
+++ b/patches/series
@@ -10,8 +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
-cleanup-distro-install-file-lists.diff
+install-fixes.diff
smoketest-only-en-US.diff
getMIMEDescription-mismatch.diff
mention-java-common-package.diff
--
LibreOffice packaging repository
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
Archive: http://lists.debian.org/[email protected]
