The following commit has been merged in the debian-experimental-4.2 branch:
commit 2138a18deb033b974652b82e6cbd376abfe634b5
Author: Rene Engelhard <[email protected]>
Date: Mon Jul 1 18:54:52 2013 +0200
git update; port patches and adapt to even more auto-installed stuff...
diff --git a/changelog b/changelog
index 7e3452c..8317097 100644
--- a/changelog
+++ b/changelog
@@ -1,4 +1,4 @@
-libreoffice (1:4.2.0~alpha0~git20130724-1) UNRELEASED; urgency=low
+libreoffice (1:4.2.0~alpha0~git20130701-1) UNRELEASED; urgency=low
* new upstream snapshot
diff --git a/patches/fix-kk-in-lo-xlate-lang.diff
b/patches/fix-kk-in-lo-xlate-lang.diff
deleted file mode 100644
index 9fe91e6..0000000
--- a/patches/fix-kk-in-lo-xlate-lang.diff
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/bin/lo-xlate-lang b/bin/lo-xlate-lang
-index 7549f85..7e16a6c 100755
---- a/bin/lo-xlate-lang
-+++ b/bin/lo-xlate-lang
-@@ -157,7 +157,7 @@
- :ka:georgian
- :eo:esperanto
- :uk:ukrainian
--:kk:kazahk
-+:kk:kazakh
- :dz:dzongkha
- :kn:kannada
- :gl:galician
diff --git a/patches/gtk3-hack-explicit-gmodule.diff
b/patches/gtk3-hack-explicit-gmodule.diff
index 08188bf..81621b2 100644
--- a/patches/gtk3-hack-explicit-gmodule.diff
+++ b/patches/gtk3-hack-explicit-gmodule.diff
@@ -12,11 +12,12 @@ For whatever reason we get undefined referenced to
g_module_*.
-lSM \
--- a/configure.ac-old 2012-04-01 23:57:57.091193585 +0200
+++ a/configure.ac 2012-04-01 23:58:51.926693332 +0200
-@@ -9346,10 +9349,13 @@ if test "x$enable_gtk3" = "xyes"; then
+@@ -9393,11 +9393,14 @@ if test "x$enable_gtk3" = "xyes"; then
else
AC_MSG_ERROR([gtk3 libraries of the correct versions, not found])
fi
+ PKG_CHECK_MODULES(GMODULE, gmodule-2.0,,AC_MSG_ERROR([requirements to
build the gtk3-plugin not met. Use --disable-gtk3 or install the missing
packages]))
+ GTK3_CFLAGS=$(printf '%s' "$GTK3_CFLAGS" | sed -e "s/-I/${ISYSTEM?}/g")
fi
AC_SUBST(GTK3_LIBS)
AC_SUBST(GTK3_CFLAGS)
diff --git a/patches/javadoc-optional.diff b/patches/javadoc-optional.diff
index ebbd831..e934cae 100644
--- a/patches/javadoc-optional.diff
+++ b/patches/javadoc-optional.diff
@@ -4,20 +4,22 @@ Gemeinsame Unterverzeichnisse: odk-old/examples und
odk/examples.
diff -u odk-old/Module_odk.mk odk/Module_odk.mk
--- a/odk-old/Module_odk.mk 2013-05-22 16:12:06.000000000 +0200
+++ b/odk/Module_odk.mk 2013-05-27 18:25:34.811316443 +0200
-@@ -55,9 +55,11 @@
+@@ -52,11 +52,13 @@ ifneq ($(SOLAR_JAVA),)
$(eval $(call gb_Module_add_targets,odk,\
$(if $(filter YESGCC,$(BUILD_UNOWINREG)$(COM)),CustomTarget_unowinreg) \
CustomTarget_classes \
- CustomTarget_javadoc \
+ GeneratedPackage_uno_loader_classes \
$(if $(filter WNT,$(OS)),Library_unowinreg) \
- Package_javadoc \
+ Package_unowinreg \
+ $(if $(JAVADOC),\
+ CustomTarget_javadoc \
+ Package_javadoc \
+ ) \
- Package_uno_loader_classes \
- Package_unowinreg \
))
+ endif
+
Gemeinsame Unterverzeichnisse: odk-old/pack und odk/pack.
Gemeinsame Unterverzeichnisse: odk-old/qa und odk/qa.
Gemeinsame Unterverzeichnisse: odk-old/settings und odk/settings.
@@ -42,7 +44,7 @@ Gemeinsame Unterverzeichnisse: odk-old/util und odk/util.
+ [with_javadoc=yes])
+
AC_ARG_WITH(visual-studio,
- AS_HELP_STRING([--with-visual-studio=<2012/2010/2008>],
+ AS_HELP_STRING([--with-visual-studio=<2012/2010>],
[Specify which Visual Studio version to use in case several are
@@ -6290,35 +6302,45 @@
dnl ===================================================================
diff --git a/patches/make-package-modules-not-suck.diff
b/patches/make-package-modules-not-suck.diff
index ca45691..306f148 100644
--- a/patches/make-package-modules-not-suck.diff
+++ b/patches/make-package-modules-not-suck.diff
@@ -1,340 +1,209 @@
-diff --git a/scp2/source/base/module_base.scp
b/scp2/source/base/module_base.scp
-index 57f8b81..7274823 100644
---- a/scp2/source/base/module_base.scp
-+++ b/scp2/source/base/module_base.scp
-@@ -27,6 +27,8 @@
+diff --git a/scp2/InstallModule_draw.mk b/scp2/InstallModule_draw.mk
+index 63a29f8..5e455a5 100644
+--- a/scp2/InstallModule_draw.mk
++++ b/scp2/InstallModule_draw.mk
+@@ -9,6 +9,8 @@
- #include "macros.inc"
+ $(eval $(call gb_InstallModule_InstallModule,scp2/draw))
-+#include "AutoInstallLibs/base"
++$(eval $(call gb_InstallModule_use_auto_install_libs,scp2/draw,draw))
+
- Module gid_Module_Prg_Base
- MOD_NAME_DESC(MODULE_PRG_BASE);
- ParentID = gid_Module_Prg;
-@@ -51,6 +51,14 @@ Module gid_Module_Prg_Base_Bin
- ,gid_File_Lib_Abp
- ,gid_File_Lib_Dbp
- ,gid_File_Lib_Dbu
-+ ,auto_Base_Lib_ALL
-+ gid_File_Lib_Dbpool
-+ ,gid_File_Lib_Sdbc_2
-+#ifdef SOLAR_JAVA
-+ ,gid_File_Lib_Jdbc
-+ ,gid_File_Lib_Hsqldb_2
-+#endif
-+ ,gid_File_Lib_Calc
- );
- End
-
-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,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,
-+ 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_Lib_Solver,gid_File_Lib_Lpsolve,
- gid_File_Lib_Vbaobj,
- gid_File_Tmp_Userinstall_Calc_Inf);
+ $(eval $(call gb_InstallModule_add_templates,scp2/draw,\
+ scp2/source/templates/module_langpack_draw \
+ ))
diff --git a/scp2/source/draw/module_draw.scp
b/scp2/source/draw/module_draw.scp
-index b5bec12..920fc4e 100644
+index f7d92c1..a102275 100644
--- a/scp2/source/draw/module_draw.scp
+++ b/scp2/source/draw/module_draw.scp
-@@ -27,6 +27,8 @@
-
+@@ -18,6 +18,8 @@
+
#include "macros.inc"
-
-+#include "AutoInstallLibs/draw"
+
++#include "AutoInstall/draw"
+
Module gid_Module_Prg_Draw
MOD_NAME_DESC ( MODULE_PRG_DRAW );
ParentID = gid_Module_Prg;
-@@ -43,6 +43,7 @@ Module gid_Module_Prg_Draw_Bin
+@@ -33,7 +35,8 @@ Module gid_Module_Prg_Draw_Bin
+ Minimal = YES;
Default = YES;
Styles = (HIDDEN_ROOT);
- Files =
(gid_File_Extra_Urldesktop_Draw,gid_File_Extra_Urlnew_Draw,gid_File_Extra_Urlstart_Draw,gid_File_Extra_Urltasks_Draw,
-+ auto_Draw_Lib_ALL
+- Files =
(gid_File_Extra_Urldesktop_Draw,gid_File_Extra_Urlnew_Draw,gid_File_Extra_Urlstart_Draw,gid_File_Extra_Urltasks_Draw,
++ Files = (auto_draw_ALL
++
gid_File_Extra_Urldesktop_Draw,gid_File_Extra_Urlnew_Draw,gid_File_Extra_Urlstart_Draw,gid_File_Extra_Urltasks_Draw,
gid_File_Share_Registry_Draw_Xcd,
gid_File_Tmp_Userinstall_Draw_Inf);
End
-diff --git a/scp2/source/impress/module_impress.scp
b/scp2/source/impress/module_impress.scp
-index 29164ac..030d004 100644
---- a/scp2/source/impress/module_impress.scp
-+++ b/scp2/source/impress/module_impress.scp
-@@ -27,6 +27,8 @@
-
- #include "macros.inc"
-
-+#include "AutoInstallLibs/impress"
-+
- Module gid_Module_Prg_Impress
- MOD_NAME_DESC ( MODULE_PRG_IMPRESS );
- ParentID = gid_Module_Prg;
-@@ -43,6 +46,7 @@ Module gid_Module_Prg_Impress_Bin
- Default = YES;
- Styles = (HIDDEN_ROOT);
- Files =
(gid_File_Extra_Urldesktop_Impress,gid_File_Extra_Urlnew_Impress,gid_File_Extra_Urlstart_Impress,gid_File_Extra_Urltasks_Impress,gid_File_Lib_Placeware,
-+ auto_Impress_Lib_ALL
- gid_File_Lib_PresenterScreen,
- gid_File_Share_Registry_Impress_Xcd,
- gid_File_Lib_Animcore,
-diff --git a/scp2/source/kde/module_kde.scp b/scp2/source/kde/module_kde.scp
-index f066710..08a1c1c 100644
---- a/scp2/source/kde/module_kde.scp
-+++ b/scp2/source/kde/module_kde.scp
-@@ -36,5 +36,11 @@ Module gid_Module_Optional_Kde
- MOD_NAME_DESC(MODULE_OPTIONAL_KDE);
- Styles = ();
- Files = (auto_Kde_Lib_ALL
-+#ifdef ENABLE_KDE
-+ gid_File_Lib_Vclplug_Kde
-+#endif
-+#ifdef ENABLE_KDE4
-+ gid_File_Lib_Vclplug_Kde4
-+#endif
- );
- End
-diff --git a/scp2/source/ooo/module_hidden_ooo.scp
b/scp2/source/ooo/module_hidden_ooo.scp
-index ed7729e..5a03e3d 100644
---- a/scp2/source/ooo/module_hidden_ooo.scp
-+++ b/scp2/source/ooo/module_hidden_ooo.scp
-@@ -166,8 +166,6 @@ Module gid_Module_Root_Files_4
- gid_File_Lib_BaseBmp,
- gid_File_Lib_Zip,
- gid_File_Lib_Vclplug_Tde,
-- gid_File_Lib_Vclplug_Kde,
-- gid_File_Lib_Vclplug_Kde4,
- gid_File_Lib_Vclplug_Svp);
- End
-
-@@ -197,7 +195,6 @@ Module gid_Module_Root_Files_5
- #endif
- gid_File_Lib_Curl,
- gid_Unixlink_File_Lib_Curl,
-- gid_File_Lib_Dbpool,
- gid_File_Lib_Embobj,
- gid_File_Lib_Emboleobj,
- gid_File_Lib_Macab_1,
+diff --git a/scp2/AutoInstall.mk b/scp2/AutoInstall.mk
+index 66edd78..47f17b6 100644
+--- a/scp2/AutoInstall.mk
++++ b/scp2/AutoInstall.mk
+@@ -11,6 +11,7 @@ $(eval $(call gb_AutoInstall_AutoInstall))
+
+ $(eval $(call gb_AutoInstall_add_module,base,LIBO_LIB_FILE))
+ $(eval $(call gb_AutoInstall_add_module,calc,LIBO_LIB_FILE))
++$(eval $(call gb_AutoInstall_add_module,draw,LIBO_LIB_FILE))
+ $(eval $(call gb_AutoInstall_add_module,gnome,LIBO_LIB_FILE))
+ $(eval $(call gb_AutoInstall_add_module,graphicfilter,LIBO_LIB_FILE))
+ $(eval $(call gb_AutoInstall_add_module,impress,LIBO_LIB_FILE))
diff --git a/Repository.mk b/Repository.mk
-index 4b2c1f0..9423f87 100644
+index 51089bb..3cffd92 100644
--- a/Repository.mk
+++ b/Repository.mk
-@@ -229,11 +229,8 @@ $(eval $(call
gb_Helper_register_libraries_for_install,OOOLIBS,OOO, \
- configmgr \
- ctl \
- cui \
-- dba \
-- dbase \
- dbmm \
- $(if $(DISABLE_DBCONNECTIVITY),,dbtools) \
-- dbaxml \
- deploymentmisc \
- $(if $(filter-out MACOSX WNT,$(OS)),desktopbe1) \
- $(if $(filter unx,$(GUIBASE)),desktop_detector) \
-@@ -260,7 +260,6 @@
- eti \
- evtatt \
- exp \
-- flat \
- file \
- filterconfig \
- for \
-@@ -292,9 +291,6 @@
- lnth \
- $(if $(MERGELIBS),merged) \
- msfilter \
-- mysql \
-- odbc \
-- odbcbase \
- odfflatxml \
- offacc \
- pcr \
-@@ -294,10 +291,6 @@ $(eval $(call
gb_Helper_register_libraries_for_install,OOOLIBS,OOO, \
- sb \
- sdbt \
- scn \
-- sd \
-- sdd \
-- sdfilt \
-- sdui \
- sfx \
- sot \
- $(if $(ENABLE_HEADLESS),,spl) \
-@@ -327,7 +327,6 @@ $(eval $(call
gb_Helper_register_libraries_for_install,OOOLIBS,OOO, \
- svt \
- svx \
- svxcore \
-- sw \
- $(if $(ENABLE_TDEAB),tdeab1) \
- $(if $(ENABLE_TDEAB),tdeabdrv1) \
- textconversiondlgs \
-@@ -325,10 +317,32 @@ $(eval $(call
gb_Helper_register_libraries_for_install,OOOLIBS,OOO, \
- xsltfilter \
+@@ -146,13 +146,24 @@ endif
+
+ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,base, \
+ abp \
++ calc \
++ dba \
++ dbase \
++ dbaxml \
+ dbp \
++ dbpool2 \
+ dbu \
++ flat \
++ $(if $(SOLAR_JAVA),hsqldb) \
++ $(if $(SOLAR_JAVA),jdbc) \
++ mysql \
++ odbc \
++ odbcbase \
++ sdbc2 \
))
-+$(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,BASE, \
-+ dba \
-+ dbase \
-+ dbaxml \
-+ flat \
-+ mysql \
-+ odbc \
-+ odbcbase \
-+))
-+
-+$(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,DRAW, \
-+ sd \
-+ sdd \
-+ sdfilt \
-+ sdui \
-+))
-+
-+$(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,IMPRESS, \
-+ slideshow \
+ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,calc, \
+ analysis \
+- calc \
+ date \
+ pricing \
+ sc \
+@@ -163,6 +175,13 @@ $(eval $(call
gb_Helper_register_libraries_for_install,OOOLIBS,calc, \
+ $(if $(DISABLE_SCRIPTING),,vbaobj) \
+ ))
+
++$(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,draw, \
++ sd \
++ sdd \
++ sdfilt \
++ sdui \
+))
+
- $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,WRITER, \
+ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,graphicfilter,
\
+ svgfilter \
+ flash \
+@@ -178,6 +197,7 @@ $(eval $(call
gb_Helper_register_libraries_for_install,OOOLIBS,impress, \
+ animcore \
+ placeware \
+ PresenterScreen \
++ slideshow \
+ ))
+
+ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,onlineupdate, \
+@@ -199,6 +219,8 @@ $(eval $(call
gb_Helper_register_libraries_for_install,OOOLIBS,gnome, \
+ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,kde, \
+ $(if $(ENABLE_KDE),kdebe1) \
+ $(if $(ENABLE_KDE4),kde4be1) \
++ $(if $(ENABLE_KDE),vclplug_kde) \
++ $(if $(ENABLE_KDE4),vclplug_kde4) \
+ ))
+
+ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,math, \
+@@ -222,11 +244,8 @@ $(eval $(call
gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \
+ configmgr \
+ ctl \
+ cui \
+- dba \
+- dbase \
+ dbmm \
+ $(if $(DISABLE_DBCONNECTIVITY),,dbtools) \
+- dbaxml \
+ deploymentmisc \
+ $(if $(filter-out MACOSX WNT,$(OS)),desktopbe1) \
+ $(if $(filter unx,$(GUIBASE)),desktop_detector) \
+@@ -248,7 +267,6 @@ $(eval $(call
gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \
+ exp \
+ expwrap \
+ fastsax \
+- flat \
+ file \
+ filterconfig \
+ fpicker \
+@@ -281,7 +299,6 @@ $(eval $(call
gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \
+ ira \
+ itg \
+ iti \
+- $(if $(SOLAR_JAVA),jdbc) \
+ $(if $(ENABLE_KAB),kab1) \
+ $(if $(ENABLE_KAB),kabdrv1) \
+ ldapbe2 \
+@@ -296,9 +313,6 @@ $(eval $(call
gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \
+ msfilter \
+ $(if $(DISABLE_SCRIPTING),,msforms) \
+ mtfrenderer \
+- mysql \
+- odbc \
+- odbcbase \
+ odfflatxml \
+ offacc \
+ passwordcontainer \
+@@ -310,13 +324,8 @@ $(eval $(call
gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \
+ sb \
+ sdbt \
+ scn \
+- sd \
+- sdd \
+- sdfilt \
+- sdui \
+ sfx \
+ simplecanvas \
+- slideshow \
+ sot \
+ $(if $(ENABLE_HEADLESS),,spl) \
+ $(if $(DISABLE_SCRIPTING),,stringresource) \
+@@ -325,7 +334,6 @@ $(eval $(call
gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \
+ svt \
+ svx \
+ svxcore \
+- sw \
+ syssh \
+ $(if $(ENABLE_TDEAB),tdeab1) \
+ $(if $(ENABLE_TDEAB),tdeabdrv1) \
+@@ -372,6 +380,7 @@ $(eval $(call
gb_Helper_register_libraries_for_install,OOOLIBS,writer, \
hwp \
$(if $(ENABLE_LWP),lwpft) \
msword \
-+ sw \
++ sw \
swd \
swui \
t602filter \
-@@ -628,7 +628,6 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
- postgresql-sdbc-impl \
- pythonloader \
- simplecanvas \
-- slideshow \
- stringresource \
- syssh \
- ucpcmis1 \
-diff --git a/scp2/InstallModule_base.mk b/scp2/InstallModule_base.mk
-index 225cf94..53ad321 100644
---- a/scp2/InstallModule_base.mk
-+++ b/scp2/InstallModule_base.mk
-@@ -27,6 +27,8 @@
-
- $(eval $(call gb_InstallModule_InstallModule,scp2/base))
-
-+$(eval $(call gb_InstallModule_use_auto_install_libs,scp2/base,base))
-+
- # Not sure about that?
- #$(eval $(call gb_InstallModule_define_if_set,scp2/base,\
- # ENABLE_REPORTBUILDER \
-diff --git a/scp2/InstallModule_draw.mk b/scp2/InstallModule_draw.mk
-index 63a29f8..d5bbf6c 100644
---- a/scp2/InstallModule_draw.mk
-+++ b/scp2/InstallModule_draw.mk
-@@ -9,6 +9,8 @@
-
- $(eval $(call gb_InstallModule_InstallModule,scp2/draw))
-
-+$(eval $(call gb_InstallModule_use_auto_install_libs,scp2/draw,draw))
-+
- $(eval $(call gb_InstallModule_add_templates,scp2/draw,\
- scp2/source/templates/module_langpack_draw \
- ))
-diff --git a/scp2/InstallModule_impress.mk b/scp2/InstallModule_impress.mk
-index 0deac66..48b786d 100644
---- a/scp2/InstallModule_impress.mk
-+++ b/scp2/InstallModule_impress.mk
-@@ -9,6 +9,8 @@
-
- $(eval $(call gb_InstallModule_InstallModule,scp2/impress))
-
-+$(eval $(call gb_InstallModule_use_auto_install_libs,scp2/impress,impress))
-+
- $(eval $(call gb_InstallModule_define_if_set,scp2/impress,\
- ENABLE_OPENGL \
+@@ -404,8 +412,6 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
+ spell \
+ sts \
+ vclplug_tde \
+- vclplug_kde \
+- vclplug_kde4 \
+ vclplug_svp \
))
---- a/scp2/InstallModule_kde.mk 2013-05-04 18:30:06.777713287 +0200
-+++ b/scp2/InstallModule_kde.mk 2013-05-07 01:20:44.616196512 +0200
-@@ -11,6 +11,12 @@
-
- $(eval $(call gb_InstallModule_use_auto_install_libs,scp2/kde,kde))
-
-+$(eval $(call gb_InstallModule_define_if_set,scp2/kde,\
-+ ENABLE_KAB \
-+ ENABLE_KDE \
-+ ENABLE_KDE4 \
-+))
-+
- $(eval $(call gb_InstallModule_add_localized_scpfiles,scp2/kde,\
- scp2/source/kde/module_kde \
- ))
-diff --git a/solenv/gbuild/Helper.mk b/solenv/gbuild/Helper.mk
-index ded46b9..447c331 100644
---- a/solenv/gbuild/Helper.mk
-+++ b/solenv/gbuild/Helper.mk
-@@ -118,7 +118,7 @@ endef
- define gb_Helper_init_registries
- gb_Executable_VALIDGROUPS := UREBIN SDK OOO NONE
- gb_Library_VALIDGROUPS := OOOLIBS PLAINLIBS_NONE PLAINLIBS_URE PLAINLIBS_OOO
RTVERLIBS UNOLIBS_URE UNOVERLIBS EXTENSIONLIBS
--gb_Library_VALIDINSTALLMODULES := GRAPHICFILTER GNOME TDE KDE OOO URE WRITER
-+gb_Library_VALIDINSTALLMODULES := GRAPHICFILTER GNOME TDE KDE OOO URE WRITER
BASE DRAW IMPRESS
- gb_StaticLibrary_VALIDGROUPS := PLAINLIBS
- gb_Jar_VALIDGROUPS := URE OOO OXT NONE
-
---- /dev/null 2012-07-03 16:36:49.000000000 +0200
-+++ b/scp2/AutoInstallLibs_base.mk 2013-04-15 18:21:21.695428073 +0200
-@@ -0,0 +1,12 @@
-+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-+#
-+# This file is part of the LibreOffice project.
-+#
-+# This Source Code Form is subject to the terms of the Mozilla Public
-+# License, v. 2.0. If a copy of the MPL was not distributed with this
-+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-+#
-+
-+$(eval $(call
gb_AutoInstallLibs_AutoInstallLibs,base,BASE,LIBO_LIB_FILE,auto_Base_Lib))
-+
-+# vim: set noet sw=4 ts=4:
---- /dev/null 2012-07-03 16:36:49.000000000 +0200
-+++ b/scp2/AutoInstallLibs_draw.mk 2013-04-15 18:21:21.695428073 +0200
-@@ -0,0 +1,12 @@
-+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-+#
-+# This file is part of the LibreOffice project.
-+#
-+# This Source Code Form is subject to the terms of the Mozilla Public
-+# License, v. 2.0. If a copy of the MPL was not distributed with this
-+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-+#
-+
-+$(eval $(call
gb_AutoInstallLibs_AutoInstallLibs,draw,DRAW,LIBO_LIB_FILE,auto_Draw_Lib))
-+
-+# vim: set noet sw=4 ts=4:
---- /dev/null 2012-07-03 16:36:49.000000000 +0200
-+++ b/scp2/AutoInstallLibs_impress.mk 2013-04-15 18:21:21.695428073 +0200
-@@ -0,0 +1,12 @@
-+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-+#
-+# This file is part of the LibreOffice project.
-+#
-+# This Source Code Form is subject to the terms of the Mozilla Public
-+# License, v. 2.0. If a copy of the MPL was not distributed with this
-+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-+#
-+
-+$(eval $(call
gb_AutoInstallLibs_AutoInstallLibs,impress,IMPRESS,LIBO_LIB_FILE,auto_Impress_Lib))
-+
-+# vim: set noet sw=4 ts=4:
-diff --git a/scp2/Module_scp2.mk b/scp2/Module_scp2.mk
-index 9d856d7..dad7605 100644
---- a/scp2/Module_scp2.mk
-+++ b/scp2/Module_scp2.mk
-@@ -13,6 +13,9 @@ $(eval $(call gb_Module_add_targets,scp2,\
- AutoInstallLibs_kde \
- AutoInstallLibs_ooo \
- AutoInstallLibs_ure \
-+ AutoInstallLibs_base \
-+ AutoInstallLibs_draw \
-+ AutoInstallLibs_impress \
- AutoInstallLibs_writer \
- CustomTarget_langmacros \
- InstallModule_accessories \
+
+@@ -488,14 +494,12 @@ $(eval $(call
gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo, \
+ cached1 \
+ collator_data \
+ comphelper \
+- dbpool2 \
+ deployment \
+ deploymentgui \
+ dict_ja \
+ dict_zh \
+ embobj \
+ fileacc \
+- $(if $(SOLAR_JAVA),hsqldb) \
+ i18nlangtag \
+ i18nutil \
+ index_data \
+@@ -506,7 +510,6 @@ $(eval $(call
gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo, \
+ mcnttype \
+ package2 \
+ $(if $(DISABLE_SCRIPTING),,scriptframe) \
+- sdbc2 \
+ sofficeapp \
+ srtrs1 \
+ textconv_dict \
diff --git a/patches/py2uno-module.diff b/patches/py2uno-module.diff
index 248bc25..030f20a 100644
--- a/patches/py2uno-module.diff
+++ b/patches/py2uno-module.diff
@@ -2,24 +2,24 @@ diff --git a/Repository.mk b/Repository.mk
index 16ef7ba..ea257b1 100755
--- a/Repository.mk
+++ b/Repository.mk
-@@ -481,7 +481,9 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
- mozbootstrap \
- officebean \
- pyuno \
-+ py2uno \
- pyuno_wrapper \
-+ py2uno_wrapper \
- recentfile \
- scriptframe \
- sdbc2 \
-@@ -609,6 +609,7 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
- postgresql-sdbc \
- postgresql-sdbc-impl \
- pythonloader \
-+ python2loader \
- simplecanvas \
- stringresource \
- syssh \
+@@ -533,7 +533,9 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
+ mozbootstrap \
+ officebean \
+ pyuno \
++ py2uno \
+ pyuno_wrapper \
++ py2uno_wrapper \
+ recentfile \
+ ucpdav1 \
+ xsec_xmlsec \
+@@ -590,6 +592,7 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
+ postgresql-sdbc \
+ postgresql-sdbc-impl \
+ pythonloader \
++ python2loader \
+ ))
+
+ $(eval $(call gb_Helper_register_libraries,UNOLIBS_URE, \
diff --git a/RepositoryFixes.mk b/RepositoryFixes.mk
index 6beb818..1a570e4 100644
--- a/RepositoryFixes.mk
diff --git a/patches/pyuno-copy-for-python2.diff
b/patches/pyuno-copy-for-python2.diff
index 3d274fc..5d24281 100644
--- a/patches/pyuno-copy-for-python2.diff
+++ b/patches/pyuno-copy-for-python2.diff
@@ -295,7 +295,7 @@ diff -urN pyuno/Library_pyuno.mk py2uno/Library_pyuno.mk
diff -urN pyuno/Module_py2uno.mk py2uno/Module_py2uno.mk
--- pyuno/Module_py2uno.mk 1970-01-01 01:00:00.000000000 +0100
+++ py2uno/Module_py2uno.mk 2012-09-17 21:37:10.060921827 +0200
-@@ -0,0 +1,71 @@
+@@ -0,0 +1,72 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
@@ -314,6 +314,7 @@ diff -urN pyuno/Module_py2uno.mk py2uno/Module_py2uno.mk
+ Library_python2loader \
+ Package_pyunorc \
+ Package_python_scripts \
++ Rdb_pyuno \
+))
+
+ifneq ($(OS),WNT)
@@ -370,7 +371,7 @@ diff -urN pyuno/Module_py2uno.mk py2uno/Module_py2uno.mk
diff -urN pyuno/Module_pyuno.mk py2uno/Module_pyuno.mk
--- pyuno/Module_pyuno.mk 2012-07-20 11:13:03.401545847 +0200
+++ py2uno/Module_pyuno.mk 1970-01-01 01:00:00.000000000 +0100
-@@ -1,71 +0,0 @@
+@@ -1,72 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
@@ -389,6 +390,7 @@ diff -urN pyuno/Module_pyuno.mk py2uno/Module_pyuno.mk
- Library_pythonloader \
- Package_pyunorc \
- Package_python_scripts \
+- Rdb_pyuno \
-))
-
-ifneq ($(OS),WNT)
diff --git a/patches/series b/patches/series
index 74888d3..55af955 100644
--- a/patches/series
+++ b/patches/series
@@ -27,4 +27,3 @@ wheezy-backports-python.diff
fix-internal-hsqldb-build.diff
javadoc-optional.diff
show-the-startcenter.diff
-fix-kk-in-lo-xlate-lang.diff
--
LibreOffice packaging repository
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
Archive: http://lists.debian.org/[email protected]
