[SCM] LibreOffice packaging repository branch, debian-experimental-3.6, updated. libreoffice_3.5.2-1-24-gfd09caa
The following commit has been merged in the debian-experimental-3.6 branch:
commit fd09caa854fad1c3fb1e2542d3c4ba3af4f34686
Author: Rene Engelhard <rene@debian.org>
Date: Fri Apr 6 18:31:54 2012 +0200
make debian-debug.diff and install-fixes.diff apply again
diff --git a/patches/debian-debug.diff b/patches/debian-debug.diff
index 74c08b4..fede0d6 100644
--- a/patches/debian-debug.diff
+++ b/patches/debian-debug.diff
@@ -48,18 +48,15 @@ index c73333f..9338110 100644
GCCNUMVERSION_CMD=-dumpversion $(PIPEERROR) $(AWK) -v num=true -f $(SOLARENV)/bin/getcompver.awk
--- libreoffice-3.5.0/solenv/gbuild/platform/unxgcc.mk.orig 2011-07-05 12:38:23.398653265 +0200
+++ libreoffice-3.5.0/solenv/gbuild/platform/unxgcc.mk 2011-07-05 14:10:50.598728992 +0200
-@@ -217,9 +217,14 @@
- gb_LinkTarget_CXXFLAGS := $(gb_CXXFLAGS) $(gb_CXXFLAGS_WERROR)
+@@ -188,7 +188,11 @@
+ GGDB2=-g2
+ endif
- ifeq ($(gb_SYMBOL),$(true))
+ifeq ($(ENABLE_SYMBOLS),SMALL)
-+gb_LinkTarget_CXXFLAGS += -g1
-+gb_LinkTarget_CFLAGS += -g1
++gb_DEBUG_CFLAGS := -g1 -finline-limit=0 -fno-inline
+else
- gb_LinkTarget_CXXFLAGS += -ggdb2
- gb_LinkTarget_CFLAGS += -ggdb2
- endif
+ gb_DEBUG_CFLAGS := $(GGDB2) -finline-limit=0 -fno-inline
+endif
+ gb_DEBUG_CXXFLAGS := -fno-default-inline
- # note that `cat $(extraobjectlist)` is needed to build with older gcc versions, e.g. 4.1.2 on SLED10
- # we want to use @$(extraobjectlist) in the long run
+ gb_COMPILERNOOPTFLAGS := -O0
diff --git a/patches/install-fixes.diff b/patches/install-fixes.diff
index 04b460d..b677628 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"
-@@ -365,163 +365,6 @@
+@@ -368,164 +368,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
@@ -70,7 +70,6 @@ index eaabf9c..c1b1ec6 100755
- create_package_directory gid_Module_Root_Files_5 pkg/libreoffice-common
- create_package_directory gid_Module_Root_Files_6 pkg/libreoffice-common
- create_package_directory gid_Module_Root_Files_7 pkg/libreoffice-common
-- create_package_directory gid_Module_Optional_Testtool pkg/libreoffice-qa-tools
- if [ -e gid_Module_Optional_Pymailmerge ]; then
- create_package_directory gid_Module_Optional_Pymailmerge pkg/libreoffice-emailmerge
- else # post m26
@@ -172,19 +171,8 @@ 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
-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
-@@ -83,7 +83,7 @@
- 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 "" && \
+ RPM_CONFIG_FILE_TAGS=
+ if test "$OOO_VENDOR" = "Novell, Inc." -o "$OOO_VENDOR" = "RedHat"; then
--
LibreOffice packaging repository
Reply to: