The following commit has been merged in the debian-experimental-3.6 branch:
commit 391b07723b30af90e34a5f508644371a44e06fd8
Author: Rene Engelhard <[email protected]>
Date: Tue Aug 14 23:10:40 2012 +0200
unfuzzy install-fixes.diff
diff --git a/patches/install-fixes.diff b/patches/install-fixes.diff
index fbee10e..26fb2b3 100644
--- a/patches/install-fixes.diff
+++ b/patches/install-fixes.diff
@@ -177,9 +177,9 @@ index eaabf9c..c1b1ec6 100755
# mark the config files
--- a/Makefile.top-old 2012-04-07 02:25:12.933759413 +0200
+++ b/Makefile.top 2012-04-07 02:46:00.766017382 +0200
-@@ -450,10 +450,10 @@
- @rm -rf $(DEVINSTALLDIR)
- @mkdir $(DEVINSTALLDIR)
+@@ -429,10 +429,10 @@
+ mv "$(DEVINSTALLDIR)"/LibO*_install-arc_en-US/* "$(DEVINSTALLDIR)"/opt
+ else
ifeq ($(DISABLE_LINKOO),TRUE)
- @ooinstall $(DEVINSTALLDIR)/opt
+ @export WITH_LANG="en-US"; ooinstall $(DEVINSTALLDIR)/opt
@@ -188,5 +188,5 @@ index eaabf9c..c1b1ec6 100755
- @ooinstall -l $(DEVINSTALLDIR)/opt
+ @export WITH_LANG="en-US"; ooinstall -l $(DEVINSTALLDIR)/opt
endif
+ endif
@rm -f $(SRCDIR)/install && ln -s $(DEVINSTALLDIR)/opt/
$(SRCDIR)/install
-
--
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]
