[SCM] LibreOffice packaging repository branch, debian-experimental-3.7, updated. libreoffice_3.6.3_rc2-1-109-g0560699
The following commit has been merged in the debian-experimental-3.7 branch:
commit 81ebf5a9b0b5afc680a14878b9ce77a15a4139c4
Author: Rene Engelhard <rene@debian.org>
Date: Fri Nov 9 09:29:50 2012 +0100
git update; add conditional for librelogo
diff --git a/changelog b/changelog
index 336ce8b..9e29284 100644
--- a/changelog
+++ b/changelog
@@ -1,4 +1,4 @@
-libreoffice (1:3.7.0~alpha0~git20121106-1) UNRELEASED; urgency=low
+libreoffice (1:3.7.0~alpha0~git20121108-1) UNRELEASED; urgency=low
* new upstream snapshot
- contains new driver for mozab (mork). Automatically enabled thus
diff --git a/control b/control
index 7c671db..3ffc920 100644
--- a/control
+++ b/control
@@ -807,20 +807,18 @@ Description: office productivity suite -- Evolution addressbook support
This package allows LibreOffice to access Evolution address books.
You need to install evolution separately.
-Package: libreoffice-filter-binfilter
+Package: libreoffice-librelogo
Section: misc
-Architecture: amd64 hppa i386 ia64 powerpc powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386
-Depends: libreoffice-core (= ${binary:Version}), libreoffice-common (>= 1:3.4.0~), ${shlibs:Depends}, ${misc:Depends}
-Conflicts: ure (<< 1.5.1+OOo3.1.1-15)
-Description: office productivity suite -- legacy filters (e.g. StarOffice 5.2)
+Architecture: all
+Depends: libreoffice-core (>= 1:3.4~), python-uno, ${misc:Depends}
+Description: Logo-like progamming language for LibreOffice
LibreOffice is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
.
- This package contains the "binfilters", legacy filters for
- - the old StarOffice 5.2 formats
- - StarWriter 1.0/2.0
- - StarWriter/DOS
- - *Writer* filters for
- + Excel
- + Lotus
+ This package contains the Librelogo extension, which is is a Logo-like progamming
+ language with interactive vectorgraphics for education and DTP
+ - basic Logo syntax for back compability with educational Logo systems
+ - interactive vectorgraphics in LibreOffice Writer
+ - native commands (easily translatable)
+ - Python data structures (list, tuple, set, dictionary) and other Python features
diff --git a/patches/config_host-fix-envvars.diff b/patches/config_host-fix-envvars.diff
index 6628c9c..22bd0d2 100644
--- a/patches/config_host-fix-envvars.diff
+++ b/patches/config_host-fix-envvars.diff
@@ -1,6 +1,6 @@
--- a/config_host.mk.in-old 2012-10-26 17:45:36.855715506 +0200
+++ b/config_host.mk.in 2012-10-26 17:45:57.315816943 +0200
-@@ -53,9 +53,7 @@ export CC_FOR_BUILD=@CC_FOR_BUILD@
+@@ -54,9 +54,7 @@ export CC_FOR_BUILD=@CC_FOR_BUILD@
export CDR_CFLAGS=@CDR_CFLAGS@
export CDR_LIBS=@CDR_LIBS@
export CDR_TARBALL=@CDR_TARBALL@
@@ -10,7 +10,7 @@
export CHECK_PARALLELISM=@CHECK_PARALLELISM@
export CLANGPLUGIN_CPPFLAGS=@CLANGPLUGIN_CPPFLAGS@
export CLUCENE_CFLAGS=@CLUCENE_CFLAGS@
-@@ -89,9 +92,7 @@ export CURL_LIBS=@CURL_LIBS@
+@@ -91,9 +89,7 @@ export CURL_LIBS=@CURL_LIBS@
export CXX=@CXX@
export CXX_FOR_BUILD=@CXX_FOR_BUILD@
export CXX_X64_BINARY=@CXX_X64_BINARY@
@@ -20,19 +20,19 @@
export DATADIR=@DATADIR@
export DBGHELP_DLL=@DBGHELP_DLL@
export DBUSMENUGTK_CFLAGS=@DBUSMENUGTK_CFLAGS@
-@@ -312,9 +315,7 @@ export LANGUAGETOOL_TARBALL=@LANGUAGETOOL_TARBALL@
- export L10N_MODULE=@L10N_MODULE@
+@@ -313,9 +309,7 @@ export L10N_MODULE=@L10N_MODULE@
export LCMS2_CFLAGS=@LCMS2_CFLAGS@
export LCMS2_LIBS=@LCMS2_LIBS@
+ export LCMS2_TARBALL==@LCMS2_TARBALL@
-ifneq ($(strip @LDFLAGS@),)
export LDFLAGS=@LDFLAGS@
-endif
export LFS_CFLAGS=@LFS_CFLAGS@
export LIBBASE_JAR=@LIBBASE_JAR@
export LIBDIR=@LIBDIR@
-@@ -442,12 +443,8 @@ export nodep=@nodep@
- export NSS_CFLAGS=@NSS_CFLAGS@
+@@ -451,12 +445,8 @@ export NSS_CFLAGS=@NSS_CFLAGS@
export NSS_LIBS=@NSS_LIBS@
+ export NSS_TARBALL=@NSS_TARBALL@
export NUMBERTEXT_EXTENSION_PACK=@NUMBERTEXT_EXTENSION_PACK@
-ifneq ($(strip @OBJCFLAGS@),)
export OBJCFLAGS=@OBJCFLAGS@
diff --git a/patches/debian-opt.diff b/patches/debian-opt.diff
index d29f94d..282e87d 100644
--- a/patches/debian-opt.diff
+++ b/patches/debian-opt.diff
@@ -18,8 +18,8 @@ index c0b76f8..d10222f 100644
dnl ===================================================================
--- a/config_host.mk.in-old 2012-04-06 14:08:12.755739649 +0200
+++ b/config_host.mk.in 2012-04-06 14:08:35.351739800 +0200
-@@ -55,6 +55,7 @@
- export CPPUNIT_LIBS=@CPPUNIT_LIBS@
+@@ -81,6 +81,7 @@ export CPPUNIT_LIBS=@CPPUNIT_LIBS@
+ export CPPUNIT_TARBALL=@CPPUNIT_TARBALL@
export CPU=@CPU@
export CPUNAME=@CPUNAME@
+export CDEFAULTOPT=@CDEFAULTOPT@
diff --git a/patches/fix-system-lpsolve-build.diff b/patches/fix-system-lpsolve-build.diff
index 99d4efb..ffa625f 100644
--- a/patches/fix-system-lpsolve-build.diff
+++ b/patches/fix-system-lpsolve-build.diff
@@ -31,21 +31,16 @@ index 91161f1..eb9885e 100644
SOFFICELIB=-lsofficeapp
UNOPKGAPPLIB=-lunopkgapp
TESTLIB=-ltest
-diff --git a/sccomp/Library_solver.mk b/sccomp/Library_solver.mk
-index ba9493a..93874b4 100644
---- libreoffice-3.5.0/sccomp/Library_solver.mk
-+++ libreoffice-3.5.0/sccomp/Library_solver.mk
-@@ -41,7 +41,13 @@ $(eval $(call gb_Library_use_libraries,solver,\
- $(gb_UWINAPI) \
- ))
+diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
+index 7688e42..c8f3fa2 100644
+--- a/RepositoryExternal.mk
++++ b/RepositoryExternal.mk
+@@ -1233,7 +1233,7 @@ endif # SYSTEM_LCMS2
+ ifeq ($(SYSTEM_LPSOLVE),YES)
-+ifeq ($(SYSTEM_LPSOLVE),YES)
-+$(eval $(call gb_Library_add_ldflags,solver, \
-+ /usr/lib/lp_solve/liblpsolve55.so -Wl$(COMMA)-rpath=/usr/lib/lp_solve \
-+))
-+else
- $(eval $(call gb_Library_use_external,solver,lpsolve55))
-+endif
-
- $(eval $(call gb_Library_add_exception_objects,solver,\
- sccomp/source/solver/solver \
+ define gb_LinkTarget__use_lpsolve
+-$(call gb_LinkTarget_add_libs,$(1),-llpsolve55)
++$(call gb_LinkTarget_add_ldflags,$(1),/usr/lib/lp_solve/liblpsolve55.so -Wl$(COMMA)-rpath=/usr/lib/lp_solve)
+ $(call gb_LinkTarget_add_defs,$(1),\
+ -DSYSTEM_LPSOLVE \
+ )
diff --git a/rules b/rules
index d20ad33..9a5b9bd 100755
--- a/rules
+++ b/rules
@@ -99,6 +99,7 @@ BUILD_PYUNO=y
ENABLE_PYTHON3=y
ifeq "$(BUILD_PYUNO)" "y"
ENABLE_SCRIPT_PROVIDER_PYTHON=y
+ PACKAGE_LIBRELOGO=y
endif
# THIS IS ONLY FOR TESTING. When building against a specified pythonX.Y
# this will work inside OOo but *not* from outside OOo unless the user
@@ -122,7 +123,7 @@ ifeq "$(ENABLE_PYTHON3)" "y"
endif
endif
PACKAGE_TTF_OPENSYMBOL=y
-BUILD_BINFILTERS=y
+BUILD_BINFILTERS=n
BUILD_ONLY_EN_US=y
ENABLE_HELP=y
ENABLE_JAVA=y
@@ -1470,6 +1471,10 @@ ifeq "$(ENABLE_KDEAB)" "y"
sed -e "s|libreofficeVER|libreoffice$(VER)|g" \
>> debian/control < debian/control.kab.in
endif
+ifeq "$(PACKAGE_LIBRELOGO)" "y"
+ sed -e "s|libreofficeVER|libreoffice$(VER)|g" \
+ >> debian/control < debian/control.librelogo.in
+endif
perl -pi -e "s,%OOO_ARCHS%,$(OOO_ARCHS),g" debian/control
perl -pi -e "s,%OOO_BASE_ARCHS%,$(OOO_BASE_ARCHS),g" debian/control
@@ -2769,6 +2774,13 @@ endif
# install -m644 $(SOURCE_TREE)/svx/$(shell . $(SOURCE_TREE)/config_host.mk.source; echo $$OUTPATH$$PROEXT)/bin/gengalrc \
# $(PKGDIR)-common/$(OODIR)/program/gengalrc
#endif
+
+ifeq "$(PACKAGE_LIBRELOGO)" "y"
+ rm -rf $(PKGDIR)-librelogo
+ mkdir -p $(PKGDIR)-librelogo/$(OODIR)/share/extensions/librelogo && \
+ unzip -d solver/$(shell . $(SOURCE_TREE)/config_host.mk.source; echo $$OUTPATH$$PROEXT)/bin/librelogo.oxt
+endif
+
touch $@
binary-arch: $(STAMP_DIR)/binary-arch
@@ -2950,6 +2962,10 @@ ifeq "$(PACKAGE_BASE)" "y"
endif
endif
endif
+ifeq "$(PACKAGE_LIBRELOGO)" "y"
+ dh_gencontrol -plibreoffice$(VER)-librelogo -- \
+ -v$(shell grep "<version" $(SOURCE_TREE)/librelogo/description.xml | perl -pi -e 's,<version value=\"(.*)\" />,\1,; s/^\s+//; s/\s+$$//')+LibO`echo $(BINARY_VERSION) | cut -d: -f2`
+endif
dh_gencontrol -pure -pure-dbg -puno-libs3 -puno-libs3-dbg -- \
-V"ure:Version=`echo $(BINARY_VERSION) | cut -d: -f2`" \
-v"`echo $(BINARY_VERSION) | cut -d: -f2`"
--
LibreOffice packaging repository
Reply to: