bin/distro-install-file-lists | 3 +++ bin/repo-list | 1 + mysqlc/source/makefile.mk | 2 -- 3 files changed, 4 insertions(+), 2 deletions(-)
New commits: commit b0eb7231a9643d71be3125be7248c91242339ab1 Author: Tomas Chvatal <[email protected]> Date: Tue Dec 18 17:05:47 2012 +0100 Do not define CPPCONN_LIB if using system version This is used for dlopen internal library only anyway and breaks when building in strict-multilib environment. Change-Id: I9dea9e37161aab17ab605bec33482ddb48beeb46 diff --git a/mysqlc/source/makefile.mk b/mysqlc/source/makefile.mk index 207d785..fee18728 100644 --- a/mysqlc/source/makefile.mk +++ b/mysqlc/source/makefile.mk @@ -88,8 +88,6 @@ CFLAGS+=-DSYSTEM_MYSQL_CPPCONN CDEFS+=-DCPPDBC_EXPORTS -DCPPCONN_LIB_BUILD .IF "$(SYSTEM_MYSQL_CPPCONN)" != "YES" CDEFS += -DCPPCONN_LIB=\"$(DLLPRE)mysqlcppconn$(DLLPOST)\" -.ELSE -CDEFS += -DCPPCONN_LIB=\"$(shell readlink /usr/lib/libmysqlcppconn.so)\" .ENDIF # --------------- MySQL settings ------------------ commit 498a9c9c02ff53d3b148d2399eaaf63841f25075 Author: Tomas Chvatal <[email protected]> Date: Wed Dec 19 07:53:22 2012 +0100 Add py script provider to pyuno Change-Id: Ib2791daa0e2c219aee089c4417289316bd0759c9 diff --git a/bin/distro-install-file-lists b/bin/distro-install-file-lists index 9a9375d..442e404 100755 --- a/bin/distro-install-file-lists +++ b/bin/distro-install-file-lists @@ -135,6 +135,7 @@ if test "z$OOO_VENDOR" != "zDebian" ; then merge_flists gid_Module_Optional_Javafilter $FILELISTSDIR/common_list.txt merge_flists gid_Module_Optional_Pymailmerge $FILELISTSDIR/pyuno_list.txt merge_flists gid_Module_Optional_Pyuno $FILELISTSDIR/pyuno_list.txt + merge_flists gid_Module_Optional_Extensions_Script_Provider_For_Python $FILELISTSDIR/pyuno_list.txt merge_flists gid_Module_Optional_Xsltfiltersamples $FILELISTSDIR/common_list.txt else merge_flists gid_Module_Optional_Grfflt $FILELISTSDIR/common_list.txt @@ -142,6 +143,7 @@ if test "z$OOO_VENDOR" != "zDebian" ; then merge_flists gid_Module_Optional_Javafilter $FILELISTSDIR/filters_list.txt merge_flists gid_Module_Optional_Pymailmerge $FILELISTSDIR/mailmerge_list.txt merge_flists gid_Module_Optional_Pyuno $FILELISTSDIR/pyuno_list.txt + merge_flists gid_Module_Optional_Extensions_Script_Provider_For_Python $FILELISTSDIR/pyuno_list.txt merge_flists gid_Module_Optional_Xsltfiltersamples $FILELISTSDIR/filters_list.txt fi else @@ -150,6 +152,7 @@ if test "z$OOO_VENDOR" != "zDebian" ; then merge_flists gid_Module_Optional_Javafilter $FILELISTSDIR/common_list.txt merge_flists gid_Module_Optional_Pymailmerge $FILELISTSDIR/common_list.txt merge_flists gid_Module_Optional_Pyuno $FILELISTSDIR/common_list.txt + merge_flists gid_Module_Optional_Extensions_Script_Provider_For_Python $FILELISTSDIR/common_list.txt merge_flists gid_Module_Optional_Xsltfiltersamples $FILELISTSDIR/common_list.txt fi diff --git a/bin/repo-list b/bin/repo-list new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/bin/repo-list @@ -0,0 +1 @@ + _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
