[SCM] LibreOffice packaging repository branch, debian-experimental-3.6, updated. libreoffice_3.5.2-1-31-gc26fc3b
The following commit has been merged in the debian-experimental-3.6 branch:
commit c26fc3b40efe518fcb583c705cf8edd6d11c7d19
Author: Rene Engelhard <rene@debian.org>
Date: Sat Apr 7 03:09:45 2012 +0200
merge dev-install-only-en-US.diff into install-fixes.diff
diff --git a/patches/dev-install-only-en-US.diff b/patches/dev-install-only-en-US.diff
deleted file mode 100644
index a2aa34d..0000000
--- a/patches/dev-install-only-en-US.diff
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/Makefile-old 2012-04-07 02:25:12.933759413 +0200
-+++ b/Makefile 2012-04-07 02:46:00.766017382 +0200
-@@ -434,10 +434,10 @@
- @rm -rf $(OUTDIR)/installation
- @mkdir $(OUTDIR)/installation
- ifeq ($(DISABLE_LINKOO),TRUE)
-- @ooinstall $(OUTDIR)/installation/opt
-+ @export WITH_LANG="en-US"; ooinstall $(OUTDIR)/installation/opt
- @install-gdb-printers -L
- else
-- @ooinstall -l $(OUTDIR)/installation/opt
-+ @export WITH_LANG="en-US"; ooinstall -l $(OUTDIR)/installation/opt
- endif
- @rm -f $(SRCDIR)/install && ln -s $(OUTDIR)/installation/opt/ $(SRCDIR)/install
-
diff --git a/patches/install-fixes.diff b/patches/install-fixes.diff
index b677628..6dfdb32 100644
--- a/patches/install-fixes.diff
+++ b/patches/install-fixes.diff
@@ -176,3 +176,18 @@ index eaabf9c..c1b1ec6 100755
# mark the config files
RPM_CONFIG_FILE_TAGS=
if test "$OOO_VENDOR" = "Novell, Inc." -o "$OOO_VENDOR" = "RedHat"; then
+--- a/Makefile-old 2012-04-07 02:25:12.933759413 +0200
++++ b/Makefile 2012-04-07 02:46:00.766017382 +0200
+@@ -434,10 +434,10 @@
+ @rm -rf $(OUTDIR)/installation
+ @mkdir $(OUTDIR)/installation
+ ifeq ($(DISABLE_LINKOO),TRUE)
+- @ooinstall $(OUTDIR)/installation/opt
++ @export WITH_LANG="en-US"; ooinstall $(OUTDIR)/installation/opt
+ @install-gdb-printers -L
+ else
+- @ooinstall -l $(OUTDIR)/installation/opt
++ @export WITH_LANG="en-US"; ooinstall -l $(OUTDIR)/installation/opt
+ endif
+ @rm -f $(SRCDIR)/install && ln -s $(OUTDIR)/installation/opt/ $(SRCDIR)/install
+
diff --git a/patches/series b/patches/series
index 1bcca97..b9aa722 100644
--- a/patches/series
+++ b/patches/series
@@ -8,7 +8,6 @@ rhino-build-optional.diff
disable-dynamic-list-cpp.diff
fix-system-lpsolve-build.diff
install-fixes.diff
-dev-install-only-en-US.diff
mention-java-common-package.diff
help-msg-add-package-info.diff
sensible-lomua.diff
--
LibreOffice packaging repository
Reply to: