[SCM] LibreOffice packaging repository branch, debian-experimental-3.6, updated. libreoffice_3.5.2-6-58-g7a208db
The following commit has been merged in the debian-experimental-3.6 branch:
commit 3a3015f5c9735b43a178e346e62e4e10c0cd4ae4
Author: Rene Engelhard <rene@debian.org>
Date: Thu May 3 13:48:16 2012 +0200
fix install-fixes.diff
diff --git a/patches/install-fixes.diff b/patches/install-fixes.diff
index 61a1a80..b206f99 100644
--- a/patches/install-fixes.diff
+++ b/patches/install-fixes.diff
@@ -11,7 +11,7 @@ index eaabf9c..c1b1ec6 100755
BUILDDIR=`pwd`
FILELISTSDIR="$BUILDDIR/file-lists"
-@@ -368,164 +368,6 @@
+@@ -372,162 +372,6 @@
# the British fixes can be removed after the issue #54113 is fixed
remove_duplicity_from_flists common_list.txt lang_en-GB_list.txt $INSTALLDIR/presets/config/standard.sog
@@ -171,23 +171,21 @@ index eaabf9c..c1b1ec6 100755
- fi
- # Warn for any remaining files
- find . -path './pkg' -prune -o -not -name 'gid_Module_*' -not -type d -exec echo "File not packaged: {}" \;
--fi
--
+ fi
+
# 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
+@@ -450,10 +450,10 @@
+ @rm -rf $(DEVINSTALLDIR)
+ @mkdir $(DEVINSTALLDIR)
ifeq ($(DISABLE_LINKOO),TRUE)
-- @ooinstall $(OUTDIR)/installation/opt
-+ @export WITH_LANG="en-US"; ooinstall $(OUTDIR)/installation/opt
+- @ooinstall $(DEVINSTALLDIR)/opt
++ @export WITH_LANG="en-US"; ooinstall $(DEVINSTALLDIR)/opt
@install-gdb-printers -L
else
-- @ooinstall -l $(OUTDIR)/installation/opt
-+ @export WITH_LANG="en-US"; ooinstall -l $(OUTDIR)/installation/opt
+- @ooinstall -l $(DEVINSTALLDIR)/opt
++ @export WITH_LANG="en-US"; ooinstall -l $(DEVINSTALLDIR)/opt
endif
- @rm -f $(SRCDIR)/install && ln -s $(OUTDIR)/installation/opt/ $(SRCDIR)/install
+ @rm -f $(SRCDIR)/install && ln -s $(DEVINSTALLDIR)/opt/ $(SRCDIR)/install
--
LibreOffice packaging repository
Reply to: