[SCM] LibreOffice packaging repository branch, debian-experimental-3.6, updated. libreoffice_3.5.2-6-58-g7a208db
The following commit has been merged in the debian-experimental-3.6 branch:
commit 7337e5ad4e2f4d359c615e29bfbd2876f33215f4
Author: Rene Engelhard <rene@debian.org>
Date: Thu May 3 13:51:25 2012 +0200
git update; make gcj-safe-jni-h-include.diff and make-package-modules-not-suck.diff apply again
diff --git a/changelog b/changelog
index 71805d2..4fe812c 100644
--- a/changelog
+++ b/changelog
@@ -1,4 +1,4 @@
-libreoffice (1:3.6.0~alpha0~git20120423-1) UNRELEASED; urgency=low
+libreoffice (1:3.6.0~alpha0~git20120503-1) UNRELEASED; urgency=low
* new upstream snapshot
- fixes splashscreen location in multi-monitor setups
@@ -9,7 +9,7 @@ libreoffice (1:3.6.0~alpha0~git20120423-1) UNRELEASED; urgency=low
- remove liblucene2-java stuff; now clucene is used
- build-depend on libxml2-utils, xmllint now needed
- -- Rene Engelhard <rene@debian.org> Mon, 23 Apr 2012 22:09:28 +0200
+ -- Rene Engelhard <rene@debian.org> Thu, 03 May 2012 13:44:05 +0200
libreoffice (1:3.5.2-6) unstable; urgency=low
diff --git a/patches/gcj-safe-jni-h-include.diff b/patches/gcj-safe-jni-h-include.diff
index cd58bd1..847f2af 100644
--- a/patches/gcj-safe-jni-h-include.diff
+++ b/patches/gcj-safe-jni-h-include.diff
@@ -20,7 +20,7 @@
dnl Checks for specific files.
--- a/config_host.mk.in-old 2012-04-07 02:57:37.475759985 +0200
+++ b/config_host.mk.in 2012-04-07 02:58:17.976557350 +0200
-@@ -420,8 +420,8 @@
+@@ -430,8 +430,8 @@
export SIZEOF_POINTER=@SIZEOF_POINTER@
export SIZEOF_SHORT=@SIZEOF_SHORT@
export SOLARENV=@SRC_ROOT@/solenv
@@ -30,4 +30,4 @@
+export SOLARINC_FOR_BUILD=@SOLARINC_FOR_BUILD@ @GCJ_JNI_INCLUDE@
export SOLARLIB=@SOLARLIB@
export SOLARLIB_FOR_BUILD=@SOLARLIB_FOR_BUILD@
- export SOLARVER=@SRC_ROOT@/solver
+ export SOLARVER=@SOLARVER@
diff --git a/patches/make-package-modules-not-suck.diff b/patches/make-package-modules-not-suck.diff
index ed8cbf0..cc74cac 100644
--- a/patches/make-package-modules-not-suck.diff
+++ b/patches/make-package-modules-not-suck.diff
@@ -27,17 +27,15 @@ diff --git a/scp2/source/calc/module_calc.scp b/scp2/source/calc/module_calc.scp
index 0e5e790..e5ba644 100644
--- a/scp2/source/calc/module_calc.scp
+++ b/scp2/source/calc/module_calc.scp
-@@ -42,8 +42,9 @@ Module gid_Module_Prg_Calc_Bin
+@@ -42,7 +42,7 @@
Minimal = YES;
Default = YES;
Styles = (HIDDEN_ROOT);
- Files = (gid_File_Share_Registry_Calc_Xcd,gid_File_Lib_Calc,gid_File_Lib_Sc,gid_File_Lib_Scui,gid_File_Lib_Scfilt,gid_File_Lib_Scd,gid_File_Extra_Urldesktop_Calc,gid_File_Extra_Urlnew_Calc,gid_File_Extra_Urlstart_Calc,gid_File_Extra_Urltasks_Calc,gid_File_Oo_Office_Filter_Calc_Pkg,gid_File_Share_Config_Sofficecfg_Calc_Menubar_Xml,
+ Files = (gid_File_Share_Registry_Calc_Xcd,gid_File_Lib_Sc,gid_File_Lib_Scui,gid_File_Lib_Scfilt,gid_File_Lib_Scd,gid_File_Extra_Urldesktop_Calc,gid_File_Extra_Urlnew_Calc,gid_File_Extra_Urlstart_Calc,gid_File_Extra_Urltasks_Calc,gid_File_Oo_Office_Filter_Calc_Pkg,gid_File_Share_Config_Sofficecfg_Calc_Menubar_Xml,
gid_File_Lib_Solver,gid_File_Lib_Lpsolve,
-+ gid_File_Lib_Vbaobj,
+ gid_File_Lib_Vbaobj,
gid_File_Tmp_Userinstall_Calc_Inf);
- End
-
diff --git a/scp2/source/draw/module_draw.scp b/scp2/source/draw/module_draw.scp
index b5bec12..920fc4e 100644
--- a/scp2/source/draw/module_draw.scp
@@ -180,12 +178,11 @@ diff --git a/scp2/source/writer/module_writer.scp b/scp2/source/writer/module_wr
index e66214b..44107d8 100644
--- a/scp2/source/writer/module_writer.scp
+++ b/scp2/source/writer/module_writer.scp
-@@ -60,6 +60,8 @@ Module gid_Module_Prg_Wrt_Bin
- gid_File_Jar_Mail,
- gid_File_Jar_Activation,
- gid_File_Share_Registry_Writer_Xcd,
+@@ -45,6 +45,7 @@
+ Files = (gid_File_Bin_Cde_Sagenda,gid_File_Bin_Cde_Sfax,gid_File_Bin_Cde_Slabel,
+ gid_File_Bin_Cde_Sletter,gid_File_Bin_Cde_Smemo,gid_File_Bin_Cde_Svcard,
+ gid_File_Lib_Hwpreader,
+ gid_File_Lib_Sw,
-+ gid_File_Lib_Vbaswobj,
- gid_File_Tmp_Userinstall_Wrt_Inf);
- End
-
+ gid_File_Lib_Swd,
+ gid_File_Lib_Swui,
+ gid_File_Lib_Msword,
--
LibreOffice packaging repository
Reply to: