[SCM] LibreOffice packaging repository branch, debian-experimental-3.6, updated. libreoffice_3.5.3-5-65-gca0042a
The following commit has been merged in the debian-experimental-3.6 branch:
commit 95cf74fc65cba424bb4a5fdf25ae8bbf503cbbb9
Author: Rene Engelhard <rene@debian.org>
Date: Sun May 27 17:29:57 2012 +0200
git update; update patches
diff --git a/changelog b/changelog
index 0d79865..f0fce3e 100644
--- a/changelog
+++ b/changelog
@@ -1,4 +1,4 @@
-libreoffice (1:3.6.0~alpha0~git20120508-1) UNRELEASED; urgency=low
+libreoffice (1:3.6.0~alpha0~git20120527-1) UNRELEASED; urgency=low
* new upstream snapshot
- fixes splashscreen location in multi-monitor setups
diff --git a/patches/install-fixes.diff b/patches/install-fixes.diff
index b206f99..fbee10e 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"
-@@ -372,162 +372,6 @@
+@@ -380,163 +380,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
@@ -62,6 +62,7 @@ index eaabf9c..c1b1ec6 100755
- create_package_directory gid_Module_Brand_Prg_Base pkg/libreoffice-base
- create_package_directory gid_Module_Optional_Pyuno pkg/python-uno
- create_package_directory gid_Module_Optional_Gnome pkg/libreoffice-gnome
+- create_package_directory gid_Module_Optional_Tde pkg/libreoffice-tde
- create_package_directory gid_Module_Optional_Kde pkg/libreoffice-kde
-
- create_package_directory gid_Module_Root_Files_2 pkg/libreoffice-common
@@ -140,7 +141,7 @@ index eaabf9c..c1b1ec6 100755
- fi &&
- ( cd pkg/libreoffice-common/$d
- find -maxdepth 1 \
-- -regex '\./\(.*\.so.*\|.*\.bin\|pagein\|nsplugin\|kdefilepicker\|msfontextract\|.*\.rdb\|javaldx\|uri-encode\)' \
+- -regex '\./\(.*\.so.*\|.*\.bin\|pagein\|nsplugin\|tdefilepicker\|kdefilepicker\|msfontextract\|.*\.rdb\|javaldx\|uri-encode\)' \
- -exec mv {} $DESTDIR/pkg/libreoffice-core/$d \;
- ); \
- done
@@ -174,8 +175,8 @@ index eaabf9c..c1b1ec6 100755
fi
# mark the config files
---- a/Makefile-old 2012-04-07 02:25:12.933759413 +0200
-+++ b/Makefile 2012-04-07 02:46:00.766017382 +0200
+--- a/Makefile.top-old 2012-04-07 02:25:12.933759413 +0200
++++ b/Makefile.top 2012-04-07 02:46:00.766017382 +0200
@@ -450,10 +450,10 @@
@rm -rf $(DEVINSTALLDIR)
@mkdir $(DEVINSTALLDIR)
diff --git a/patches/make-package-modules-not-suck.diff b/patches/make-package-modules-not-suck.diff
index cc74cac..f94c379 100644
--- a/patches/make-package-modules-not-suck.diff
+++ b/patches/make-package-modules-not-suck.diff
@@ -113,10 +113,10 @@ diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidd
index 024ec68..a46e972 100644
--- a/scp2/source/ooo/module_hidden_ooo.scp
+++ b/scp2/source/ooo/module_hidden_ooo.scp
-@@ -83,7 +83,6 @@ Module gid_Module_Root_Files_2
- Default = YES;
+@@ -84,7 +84,6 @@
Styles = (HIDDEN_ROOT);
Files = (gid_File_Bin_Cde_Open_Url,
+ gid_File_Bin_Tde_Open_Url,
- gid_File_Bin_Kde_Open_Url,
gid_File_Bin_Open_Url,
gid_File_Bin_Pagein,
@@ -149,10 +149,10 @@ index 024ec68..a46e972 100644
gid_File_Lib_Sfx,
gid_File_Lib_Sot,
gid_File_Lib_Spa,
-@@ -277,8 +269,6 @@ Module gid_Module_Root_Files_4
- gid_File_Lib_Odfflatxml,
+@@ -275,8 +274,6 @@
gid_File_Lib_Zip,
gid_File_Lib_Vclplug_Gen,
+ gid_File_Lib_Vclplug_Tde,
- gid_File_Lib_Vclplug_Kde,
- gid_File_Lib_Vclplug_Kde4,
gid_File_Lib_Vclplug_Svp,
diff --git a/patches/pyuno-py3-module.diff b/patches/pyuno-py3-module.diff
index 178eda4..82e1480 100644
--- a/patches/pyuno-py3-module.diff
+++ b/patches/pyuno-py3-module.diff
@@ -1,5 +1,5 @@
---- a/Makefile-old 2012-04-06 14:26:46.828238642 +0200
-+++ b/Makefile 2012-04-06 14:26:58.308239187 +0200
+--- a/Makefile.top-old 2012-04-06 14:26:46.828238642 +0200
++++ b/Makefile.top 2012-04-06 14:26:58.308239187 +0200
@@ -220,6 +220,7 @@
postprocess\
python\
--
LibreOffice packaging repository
Reply to: