[SCM] LibreOffice packaging repository branch, debian-experimental-4.1, updated. libreoffice_4.0.3-2-119-gb5c40a8
The following commit has been merged in the debian-experimental-4.1 branch:
commit a410468d5ee90ef68f0a3990abc4626b6cf22069
Author: Rene Engelhard <rene@debian.org>
Date: Sat May 18 18:29:51 2013 +0200
git update; gengal is back and remove obsolete DEFAULT_TO_ENGLISH_FOR_PACKING=1
diff --git a/changelog b/changelog
index c7faaf2..1580b87 100644
--- a/changelog
+++ b/changelog
@@ -1,4 +1,4 @@
-libreoffice (1:4.1.0~beta1~git20130510-1) UNRELEASED; urgency=low
+libreoffice (1:4.1.0~beta1~git20130518-1) UNRELEASED; urgency=low
* new upstream snapshot
diff --git a/copyright b/copyright
index 3d03c5a..ad503f4 100644
--- a/copyright
+++ b/copyright
@@ -13,6 +13,10 @@ Files: */*.mk
Files: solenv/gbuild/*.mk
License: MPL-2.0
+Files: swext/mediawiki/src/filter/odt2mediawiki.xsl
+Copyright: Copyright (C) 2007-2013 Bernhard Haumacher (haui@haumacher.de)
+License: Apache-2.0
+
Files: debian/*
Copyright: Copyright (C) 2002-2009 Software in the Public Interest, Inc.
License: GPL-2
diff --git a/patches/split-evoab.diff b/patches/split-evoab.diff
index 5257758..403c848 100644
--- a/patches/split-evoab.diff
+++ b/patches/split-evoab.diff
@@ -1,29 +1,35 @@
---- libreoffice-3.5.0/scp2/source/ooo/file_library_ooo.scp-old 2011-12-20 05:11:44.000000000 +0100
-+++ libreoffice-3.5.0/scp2/source/ooo/file_library_ooo.scp 2011-12-20 05:12:07.000000000 +0100
-@@ -446,6 +446,13 @@
-
- STD_LIB_FILE( gid_File_Lib_Evoab , evoab)
-
+diff --git a/scp2/source/gnome/file_gnome.scp b/scp2/source/gnome/file_gnome.scp
+index 68f413f..96baa6f 100644
+--- a/scp2/source/gnome/file_gnome.scp
++++ b/scp2/source/gnome/file_gnome.scp
+@@ -34,3 +34,13 @@ File gid_File_Share_Registry_Gnome_Xcd
+ Name = "gnome.xcd";
+ End
+ #endif
++
++#ifdef ENABLE_EVOAB2
+File gid_File_Share_Registry_Evoab_Xcd
+ TXT_FILE_BODY;
+ Styles = (PACKED);
+ Dir = gid_Brand_Dir_Share_Registry;
+ Name = "evoab.xcd";
+End
++#endif
+
- #endif // #ifdef ENABLE_EVOAB2
-
- #endif // #ifdef UNX
---- libreoffice-3.5.0/scp2/source/gnome/module_gnome.scp-old 2011-12-20 05:15:16.000000000 +0100
-+++ libreoffice-3.5.0/scp2/source/gnome/module_gnome.scp 2011-12-20 05:15:30.000000000 +0100
-@@ -43,6 +43,7 @@ Module gid_Module_Optional_Gnome
- Files = (
- #ifdef ENABLE_EVOAB2
- gid_File_Lib_Evoab,
-+ gid_File_Share_Registry_Evoab_Xcd,
+diff --git a/scp2/source/gnome/module_gnome.scp b/scp2/source/gnome/module_gnome.scp
+index 9f4d0b8..da58fe2 100644
+--- a/scp2/source/gnome/module_gnome.scp
++++ b/scp2/source/gnome/module_gnome.scp
+@@ -42,6 +42,9 @@ Module gid_Module_Optional_Gnome
+ #if (defined ENABLE_GNOMEVFS && defined ENABLE_LOCKDOWN) || defined ENABLE_GIO
+ gid_File_Share_Registry_Gnome_Xcd,
#endif
- #ifdef ENABLE_GTK
- gid_File_Lib_Fps_Gnome,
++#ifdef ENABLE_EVOAB2
++ gid_File_Share_Registry_Evoab_Xcd,
++#endif
+ gid_File_Bin_Gnome_Open_Url,
+ gid_File_Bin_Gnome_Open_Url_Bin
+ );
diff --git a/postprocess/CustomTarget_registry.mk b/postprocess/CustomTarget_registry.mk
index 181c782..33f4640 100644
--- a/postprocess/CustomTarget_registry.mk
diff --git a/patches/wheezy-backports-python.diff b/patches/wheezy-backports-python.diff
index 9302c8c..80783b4 100644
--- a/patches/wheezy-backports-python.diff
+++ b/patches/wheezy-backports-python.diff
@@ -2,18 +2,18 @@ diff --git a/configure.ac b/configure.ac
index 0241d92..7e521ee 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -7310,7 +7318,7 @@ no|disable)
+@@ -7463,7 +7463,7 @@ no|disable)
# Unset variables set by the above AM_PATH_PYTHON so that
# we actually do check anew.
- unset PYTHON am_cv_pathless_PYTHON ac_cv_path_PYTHON
+ unset PYTHON am_cv_pathless_PYTHON ac_cv_path_PYTHON am_cv_python_version am_cv_python_platform am_cv_python_pythondir am_cv_python_pyexecdir
- AM_PATH_PYTHON([3.3],, [:])
+ AM_PATH_PYTHON([2.6],, [:])
if test "$PYTHON" = :; then
AC_MSG_RESULT([internal])
enable_python=internal
-@@ -7367,7 +7375,7 @@ if test $enable_python = system; then
+@@ -7517,7 +7517,7 @@ if test $enable_python = system; then
# we actually do check anew.
- unset PYTHON am_cv_pathless_PYTHON ac_cv_path_PYTHON
+ unset PYTHON am_cv_pathless_PYTHON ac_cv_path_PYTHON am_cv_python_version am_cv_python_platform am_cv_python_pythondir am_cv_python_pyexecdir
# This causes an error if no python command is found
- AM_PATH_PYTHON([3.3])
+ AM_PATH_PYTHON([2.6])
diff --git a/rules b/rules
index b4fc0a8..963ea23 100755
--- a/rules
+++ b/rules
@@ -1704,7 +1704,7 @@ ifneq "$(WHEEZY_BACKPORT)" "y"
perl -pi -e 's/export PYTHON_FOR_BUILD=.*/export PYTHON_FOR_BUILD=$(PYTHON)/' config_host.mk
endif
- PATH=$(BUILD_PATH) LD_LIBRARY_PATH=$(BUILD_LD_LIBRARY_PATH) DEFAULT_TO_ENGLISH_FOR_PACKING=1 ARCH_FLAGS=$(ARCH_FLAGS) TMP=`mktemp -q -d` $(MAKE) build-nocheck
+ PATH=$(BUILD_PATH) LD_LIBRARY_PATH=$(BUILD_LD_LIBRARY_PATH) ARCH_FLAGS=$(ARCH_FLAGS) TMP=`mktemp -q -d` $(MAKE) build-nocheck
ifneq "$(WHEEZY_BACKPORT)" "y"
ifeq "$(ENABLE_PYTHON)" "y"
@@ -1755,7 +1755,7 @@ ifneq "$(WHEEZY_BACKPORT)" "y"
perl -pi -e 's/export PYTHON_FOR_BUILD=.*/export PYTHON_FOR_BUILD=$(PYTHON)/' config_host.mk
endif
- PATH=$(BUILD_PATH) LD_LIBRARY_PATH=$(BUILD_LD_LIBRARY_PATH) DEFAULT_TO_ENGLISH_FOR_PACKING=1 ARCH_FLAGS=$(ARCH_FLAGS) TMP=`mktemp -q -d` $(MAKE) build-nocheck
+ PATH=$(BUILD_PATH) LD_LIBRARY_PATH=$(BUILD_LD_LIBRARY_PATH) ARCH_FLAGS=$(ARCH_FLAGS) TMP=`mktemp -q -d` $(MAKE) build-nocheck
touch $@
@@ -2488,20 +2488,20 @@ ifeq "$(ENABLE_MEDIAWIKI)" "y"
rm -f $(PKGDIR)-wiki-publisher/$(OODIR)/share/extensions/wiki-publisher/registration/LICENSE
endif
-#ifeq "$(PACKAGE_SDK)" "y"
-# # install gengal stuff into -dev
-# mkdir -p $(PKGDIR)-dev/$(OODIR)/program
-# install -m755 $(SOURCE_TREE)/svx/$(shell . $(SOURCE_TREE)/bin/get_config_variables OUTPATH PROEXT; echo $$OUTPATH$$PROEXT)/bin/gengal \
-# $(PKGDIR)-dev/$(OODIR)/program/gengal
-# install -m755 $(SOURCE_TREE)/svx/$(shell . $(SOURCE_TREE)/bin/get_config_variables OUTPATH PROEXT; echo $$OUTPATH$$PROEXT)/bin/gengal.bin \
-# $(PKGDIR)-dev/$(OODIR)/program/gengal.bin
-#endif
ifeq "$(PACKAGE_SDK)" "y"
+ # move gengal stuff into -dev
+ mkdir -p $(PKGDIR)-dev/$(OODIR)/program
+ mv $(PKGDIR)-core/$(OODIR)/program/gengal.bin \
+ $(PKGDIR)-dev/$(OODIR)/program
+ mv $(PKGDIR)-common/$(OODIR)/program/gengal \
+ $(PKGDIR)-dev/$(OODIR)/program
# move ui-previewer into -dev
mkdir -p $(PKGDIR)-dev/$(OODIR)/program
mv $(PKGDIR)-core/$(OODIR)/program/ui-previewer \
$(PKGDIR)-dev/$(OODIR)/program
else
+ rm -f $(PKGDIR)-core/$(OODIR)/program/gengal.bin
+ rm -f $(PKGDIR)-common/$(OODIR)/program/gengal
rm -f $(PKGDIR)-core/$(OODIR)/program/ui-previewer
endif
--
LibreOffice packaging repository
Reply to: