[SCM] LibreOffice packaging repository branch, debian-experimental-3.5, updated. libreoffice_3.4.4-1-89-g62be4cc
The following commit has been merged in the debian-experimental-3.5 branch:
commit c465f6e3d855874e90b47abda9df86ae1390775d
Author: Rene Engelhard <rene@debian.org>
Date: Mon Nov 21 19:18:01 2011 +0100
make patches apply again
diff --git a/patches/cleanup-distro-install-file-lists.diff b/patches/cleanup-distro-install-file-lists.diff
index f1ecd68..17d9d55 100644
--- a/patches/cleanup-distro-install-file-lists.diff
+++ b/patches/cleanup-distro-install-file-lists.diff
@@ -11,9 +11,9 @@ index eaabf9c..c1b1ec6 100755
BUILDDIR=`pwd`
FILELISTSDIR="$BUILDDIR/file-lists"
-@@ -365,163 +367,6 @@ if test "z$OOO_VENDOR" != "zDebian" ; then
+@@ -365,163 +365,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/basis$PRODUCTVERSION/presets/config/standard.sog
+ remove_duplicity_from_flists common_list.txt lang_en-GB_list.txt $INSTALLDIR/presets/config/standard.sog
-else
-
@@ -74,9 +74,9 @@ index eaabf9c..c1b1ec6 100755
- if [ -e gid_Module_Optional_Pymailmerge ]; then
- create_package_directory gid_Module_Optional_Pymailmerge pkg/libreoffice-emailmerge
- else # post m26
-- mkdir -p pkg/libreoffice-emailmerge/$INSTALLDIR/basis$PRODUCTVERSION/program
-- mv pkg/libreoffice-common/$INSTALLDIR/basis$PRODUCTVERSION/program/mailmerge.py \
-- pkg/libreoffice-emailmerge/$INSTALLDIR/basis$PRODUCTVERSION/program/mailmerge.py
+- mkdir -p pkg/libreoffice-emailmerge/$INSTALLDIR/program
+- mv pkg/libreoffice-common/$INSTALLDIR/program/mailmerge.py \
+- pkg/libreoffice-emailmerge/$INSTALLDIR/program/mailmerge.py
- fi
- create_package_directory gid_Module_Optional_OGLTrans pkg/libreoffice-ogltrans
-
@@ -100,9 +100,9 @@ index eaabf9c..c1b1ec6 100755
- # some help files are in _Langpack_{Writer,Impress,...}_<lang>
- # move them from -l10n to -help
- if [ "$l" = "en-US" ]; then d=en; else d=$l; fi
-- mv pkg/libreoffice-l10n-$l/$INSTALLDIR/basis$PRODUCTVERSION/help/$d/* \
-- pkg/libreoffice-help-$l/$INSTALLDIR/basis$PRODUCTVERSION/help/$d && \
-- rmdir pkg/libreoffice-l10n-$l/$INSTALLDIR/basis$PRODUCTVERSION/help/$d
+- mv pkg/libreoffice-l10n-$l/$INSTALLDIR/help/$d/* \
+- pkg/libreoffice-help-$l/$INSTALLDIR/help/$d && \
+- rmdir pkg/libreoffice-l10n-$l/$INSTALLDIR/help/$d
- done
-
- # move_wrappers <directory_name> <name> [...]
@@ -135,7 +135,7 @@ index eaabf9c..c1b1ec6 100755
- move_wrappers pkg/libreoffice-draw lodraw
-
- # Move all libraries, binaries, *.rdb from -common to -core
-- for d in $INSTALLDIR/basis$PRODUCTVERSION/program $INSTALLDIR/program; do \
+- for d in $INSTALLDIR/program $INSTALLDIR/program; do \
- if [ ! -d $DESTDIR/pkg/libreoffice-core/$d ]; then \
- mkdir -p $DESTDIR/pkg/libreoffice-core/$d; \
- fi &&
@@ -161,13 +161,13 @@ index eaabf9c..c1b1ec6 100755
- fi
- mv etc/bash_completion.d/libreoffice$BINSUFFIX.sh \
- pkg/libreoffice-common/etc/bash_completion.d
-- mv .$INSTALLDIR/basis$PRODUCTVERSION/program/java-set-classpath \
+- mv .$INSTALLDIR/program/java-set-classpath \
- pkg/libreoffice-common/$INSTALLDIR/program
- if echo $WITH_LANG_LIST | grep -q en-US; then
- for i in forms/resume.ott officorr/project-proposal.ott; do \
-- mkdir -p pkg/libreoffice-common/$INSTALLDIR/basis$PRODUCTVERSION/share/template/en-US/`dirname $i`; \
-- mv .$INSTALLDIR/basis$PRODUCTVERSION/share/template/en-US/$i \
-- pkg/libreoffice-common/$INSTALLDIR/basis$PRODUCTVERSION/share/template/en-US/$i; \
+- mkdir -p pkg/libreoffice-common/$INSTALLDIR/share/template/en-US/`dirname $i`; \
+- mv .$INSTALLDIR/share/template/en-US/$i \
+- pkg/libreoffice-common/$INSTALLDIR/share/template/en-US/$i; \
- done; \
- fi
- # Warn for any remaining files
diff --git a/patches/debian-debug.diff b/patches/debian-debug.diff
index 48e2d24..74c08b4 100644
--- a/patches/debian-debug.diff
+++ b/patches/debian-debug.diff
@@ -48,9 +48,9 @@ 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
-@@ -314,9 +314,14 @@
+@@ -217,9 +217,14 @@
gb_LinkTarget_CXXFLAGS := $(gb_CXXFLAGS) $(gb_CXXFLAGS_WERROR)
-
+
ifeq ($(gb_SYMBOL),$(true))
+ifeq ($(ENABLE_SYMBOLS),SMALL)
+gb_LinkTarget_CXXFLAGS += -g1
@@ -60,6 +60,6 @@ index c73333f..9338110 100644
gb_LinkTarget_CFLAGS += -ggdb2
endif
+endif
-
- gb_LinkTarget_INCLUDE := $(filter-out %/stl, $(subst -I. , ,$(SOLARINC)))
- gb_LinkTarget_INCLUDE_STL := $(filter %/stl, $(subst -I. , ,$(SOLARINC)))
+
+ # 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
diff --git a/patches/rhino-build-optional.diff b/patches/rhino-build-optional.diff
index 1ad05be..61b87dc 100644
--- a/patches/rhino-build-optional.diff
+++ b/patches/rhino-build-optional.diff
@@ -54,6 +54,6 @@ index 2bd4c61..f874898 100644
--- libreoffice-3.5.0/tail_build/prj/build.lst-old 2011-10-20 22:44:37.000000000 +0000
+++ libreoffice-3.5.0/tail_build/prj/build.lst 2011-10-20 22:44:49.000000000 +0000
@@ -1,2 +1,2 @@
--tb tail_build : APACHE_COMMONS:apache-commons BSH:beanshell BERKELEYDB:berkeleydb BOOST:boost l10ntools LIBXML2:libxml2 LIBXMLSEC:libxmlsec LIBXSLT:libxslt LIBWPG:libwpg LIBWPS:libwps LIBWPD:libwpd LIBVISIO:libvisio LPSOLVE:lpsolve MDDS:mdds NEON:neon NSS:nss OPENSSL:openssl PYTHON:python REDLAND:redland SAXON:saxon TRANSLATIONS:translations XPDF:xpdf avmedia basegfx basic bridges canvas comphelper connectivity cppcanvas cppu cppuhelper fpicker javaunohelper jurt jvmaccess offapi officecfg oovbaapi qadevOOo DESKTOP:rdbmaker readlicense_oo rhino ridljar sal sax sfx2 solenv soltools sot stoc svtools svx sysui test toolkit tools ucbhelper udkapi unoil unotools ure vcl xmlhelp xmloff xmlscript xsltml NULL
-+tb tail_build : APACHE_COMMONS:apache-commons BSH:beanshell BERKELEYDB:berkeleydb BOOST:boost l10ntools LIBXML2:libxml2 LIBXMLSEC:libxmlsec LIBXSLT:libxslt LIBWPG:libwpg LIBWPS:libwps LIBWPD:libwpd LIBVISIO:libvisio LPSOLVE:lpsolve MDDS:mdds NEON:neon NSS:nss OPENSSL:openssl PYTHON:python REDLAND:redland SAXON:saxon TRANSLATIONS:translations XPDF:xpdf avmedia basegfx basic bridges canvas comphelper connectivity cppcanvas cppu cppuhelper fpicker javaunohelper jurt jvmaccess offapi officecfg oovbaapi qadevOOo DESKTOP:rdbmaker readlicense_oo RHINO:rhino ridljar sal sax sfx2 solenv soltools sot stoc svtools svx sysui test toolkit tools ucbhelper udkapi unoil unotools ure vcl xmlhelp xmloff xmlscript xsltml NULL
+-tb tail_build : APACHE_COMMONS:apache-commons BSH:beanshell BERKELEYDB:berkeleydb BOOST:boost DESKTOP:l10ntools LIBXML2:libxml2 LIBXMLSEC:libxmlsec LIBXSLT:libxslt LIBWPG:libwpg LIBWPS:libwps LIBWPD:libwpd LIBVISIO:libvisio LPSOLVE:lpsolve MDDS:mdds NEON:neon NSS:nss OPENSSL:openssl PYTHON:python REDLAND:redland SAXON:saxon TRANSLATIONS:translations XPDF:xpdf avmedia basegfx basic bridges canvas comphelper configmgr connectivity cppcanvas cppu cppuhelper fpicker javaunohelper jurt jvmaccess offapi officecfg oovbaapi qadevOOo DESKTOP:rdbmaker readlicense_oo rhino ridljar sal sax sfx2 solenv soltools sot stoc svtools svx sysui test toolkit tools ucbhelper udkapi unoil unotools ure vcl xmlhelp xmloff xmlscript xsltml NULL
++tb tail_build : APACHE_COMMONS:apache-commons BSH:beanshell BERKELEYDB:berkeleydb BOOST:boost DESKTOP:l10ntools LIBXML2:libxml2 LIBXMLSEC:libxmlsec LIBXSLT:libxslt LIBWPG:libwpg LIBWPS:libwps LIBWPD:libwpd LIBVISIO:libvisio LPSOLVE:lpsolve MDDS:mdds NEON:neon NSS:nss OPENSSL:openssl PYTHON:python REDLAND:redland SAXON:saxon TRANSLATIONS:translations XPDF:xpdf avmedia basegfx basic bridges canvas comphelper configmgr connectivity cppcanvas cppu cppuhelper fpicker javaunohelper jurt jvmaccess offapi officecfg oovbaapi qadevOOo DESKTOP:rdbmaker readlicense_oo RHINO:rhino ridljar sal sax sfx2 solenv soltools sot stoc svtools svx sysui test toolkit tools ucbhelper udkapi unoil unotools ure vcl xmlhelp xmloff xmlscript xsltml NULL
tb tail_build\prj nmake - all tb_prj NULL
--
LibreOffice packaging repository
Reply to: