[SCM] LibreOffice packaging repository branch, debian-experimental-3.6, updated. libreoffice_3.5.2-2-32-g1e431e8
The following commit has been merged in the debian-experimental-3.6 branch:
commit a61794d0e65769e6e92045771d57a80d874bbf85
Author: Rene Engelhard <rene@debian.org>
Date: Mon Apr 9 15:46:47 2012 +0200
git update
diff --git a/changelog b/changelog
index cff2b88..8372e74 100644
--- a/changelog
+++ b/changelog
@@ -1,4 +1,4 @@
-libreoffice (1:3.6.0~alpha0~git20120406-1) UNRELEASED; urgency=low
+libreoffice (1:3.6.0~alpha0~git20120409-1) UNRELEASED; urgency=low
* new upstream snapshot
@@ -7,7 +7,7 @@ libreoffice (1:3.6.0~alpha0~git20120406-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, 09 Apr 2012 15:26:28 +0200
+ -- Rene Engelhard <rene@debian.org> Mon, 09 Apr 2012 15:39:15 +0200
libreoffice (1:3.5.2-2) unstable; urgency=low
diff --git a/patches/fix-mysqlcppconn-version-check.diff b/patches/fix-mysqlcppconn-version-check.diff
deleted file mode 100644
index 688de95..0000000
--- a/patches/fix-mysqlcppconn-version-check.diff
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/configure.in-old 2012-04-08 23:14:14.294482576 +0200
-+++ b/configure.in 2012-04-08 23:16:50.266434228 +0200
-@@ -6500,6 +6500,8 @@
- [AC_MSG_ERROR(mysql_driver.h not found. install MySQL C++ Connectivity)], [])
- AC_CHECK_LIB([mysqlcppconn], [main], [:],
- [AC_MSG_ERROR(MySQL C++ Connectivity lib not found or functional)], [])
-+ save_LDFLAGS=$LDFLAGS
-+ LDFLAGS="$LDFLAGS -lmysqlcppconn"
- AC_MSG_CHECKING([version])
- AC_RUN_IFELSE([AC_LANG_SOURCE([[
- #include <mysql_driver.h>
-@@ -6517,7 +6519,7 @@
- ]])],[AC_MSG_RESULT(OK)],[AC_MSG_ERROR([not suitable, we need >= 1.0.6])],[])
-
- AC_LANG_POP([C++])
--
-+ LDFLAGS=$save_LDFLAGS
- else
- AC_MSG_RESULT([internal])
- AC_MSG_CHECKING([for mysqlcppconn module])
diff --git a/patches/make-package-modules-not-suck.diff b/patches/make-package-modules-not-suck.diff
index d3f271e..ed8cbf0 100644
--- a/patches/make-package-modules-not-suck.diff
+++ b/patches/make-package-modules-not-suck.diff
@@ -189,13 +189,3 @@ index e66214b..44107d8 100644
gid_File_Tmp_Userinstall_Wrt_Inf);
End
---- a/scp2/source/graphicfilter/module_graphicfilter.scp-old 2012-04-09 15:21:06.270597639 +0200
-+++ b/scp2/source/graphicfilter/module_graphicfilter.scp 2012-04-09 15:21:25.535151378 +0200
-@@ -34,5 +34,6 @@
- ParentID = gid_Module_Optional;
- Default = YES;
- Files = (gid_File_Lib_Svg, gid_File_Lib_Flash, gid_File_Lib_WPGImport,
-- gid_File_Lib_VisioImport, gid_File_Share_Registry_Graphicfilter_Xcd);
-+ gid_File_Lib_VisioImport, gid_File_Lib_CDRImport,
-+ gid_File_Share_Registry_Graphicfilter_Xcd);
- End
diff --git a/patches/pyuno-py3-module.diff b/patches/pyuno-py3-module.diff
index aac8226..c03604f 100644
--- a/patches/pyuno-py3-module.diff
+++ b/patches/pyuno-py3-module.diff
@@ -1,10 +1,10 @@
--- a/Makefile-old 2012-04-06 14:26:46.828238642 +0200
+++ b/Makefile 2012-04-06 14:26:58.308239187 +0200
-@@ -212,6 +212,7 @@
+@@ -215,6 +215,7 @@
postprocess\
python\
pyuno\
+pyuno-py3\
- rdbmaker\
readlicense_oo\
redland\
+ registry\
diff --git a/patches/rhino-build-optional.diff b/patches/rhino-build-optional.diff
index 857284b..29a36a8 100644
--- a/patches/rhino-build-optional.diff
+++ b/patches/rhino-build-optional.diff
@@ -54,6 +54,6 @@ index 2bd4c61..f874898 100644
--- libreoffice-3.5.0/tail_build/prj/build.lst-old 2011-10-20 22:44:37.000000000 +0000
+++ libreoffice-3.5.0/tail_build/prj/build.lst 2011-10-20 22:44:49.000000000 +0000
@@ -1,2 +1,2 @@
--tb tail_build : AFMS:afms APACHE_COMMONS:apache-commons BSH:beanshell BERKELEYDB:berkeleydb BOOST:boost CAIRO:cairo CURL:curl FONTCONFIG:fontconfig FREETYPE:freetype GRAPHITE:graphite HUNSPELL:hunspell HYPHEN:hyphen ICU:icu DESKTOP:l10ntools JPEG:jpeg LCMS2:lcms2 LIBCDR:libcdr LIBCMIS:libcmis LIBEXTTEXTCAT:libexttextcat LIBXML2:libxml2 LIBXMLSEC:libxmlsec LIBXSLT:libxslt LIBWPG:libwpg LIBWPS:libwps LIBWPD:libwpd LIBVISIO:libvisio LPSOLVE:lpsolve MDDS:mdds MYTHES:mythes NEON:neon NSS:nss OPENSSL:openssl PYTHON:python REDLAND:redland SANE:sane SAXON:saxon TRANSLATIONS:translations TWAIN:twain VIGRA:vigra X11_EXTENSIONS:x11_extensions XPDF:xpdf ZLIB:zlib basegfx bridges comphelper DBCONNECTIVITY:connectivity cppu cppuhelper cpputools i18npool i18nutil icc javaunohelper jurt jvmaccess jvmfwk offapi officecfg oovbaapi QADEVOOO:qadevOOo DESKTOP:rdbmaker readlicense_oo rhino ridljar rsc sal salhelper sax shell solenv soltools sot stoc svl sysui tools ucbhelper udkapi unoil un
otest unotools ure DESKTOP:xmlhelp xmlreader xsltml NULL
-+tb tail_build : AFMS:afms APACHE_COMMONS:apache-commons BSH:beanshell BERKELEYDB:berkeleydb BOOST:boost CAIRO:cairo CURL:curl FONTCONFIG:fontconfig FREETYPE:freetype GRAPHITE:graphite HUNSPELL:hunspell HYPHEN:hyphen ICU:icu DESKTOP:l10ntools JPEG:jpeg LCMS2:lcms2 LIBCDR:libcdr LIBCMIS:libcmis LIBEXTTEXTCAT:libexttextcat LIBXML2:libxml2 LIBXMLSEC:libxmlsec LIBXSLT:libxslt LIBWPG:libwpg LIBWPS:libwps LIBWPD:libwpd LIBVISIO:libvisio LPSOLVE:lpsolve MDDS:mdds MYTHES:mythes NEON:neon NSS:nss OPENSSL:openssl PYTHON:python REDLAND:redland SANE:sane SAXON:saxon TRANSLATIONS:translations TWAIN:twain VIGRA:vigra X11_EXTENSIONS:x11_extensions XPDF:xpdf ZLIB:zlib basegfx bridges comphelper DBCONNECTIVITY:connectivity cppu cppuhelper cpputools i18npool i18nutil icc javaunohelper jurt jvmaccess jvmfwk offapi officecfg oovbaapi QADEVOOO:qadevOOo DESKTOP:rdbmaker readlicense_oo RHINO:rhino ridljar rsc sal salhelper sax shell solenv soltools sot stoc svl sysui tools ucbhelper udkapi un
oil unotest unotools ure DESKTOP:xmlhelp xmlreader xsltml NULL
+-tb tail_build : AFMS:afms APACHE_COMMONS:apache-commons BSH:beanshell BERKELEYDB:berkeleydb BOOST:boost CAIRO:cairo CURL:curl FONTCONFIG:fontconfig FREETYPE:freetype GRAPHITE:graphite HUNSPELL:hunspell HYPHEN:hyphen ICU:icu DESKTOP:l10ntools JPEG:jpeg LCMS2:lcms2 LIBCDR:libcdr LIBCMIS:libcmis LIBEXTTEXTCAT:libexttextcat LIBXML2:libxml2 LIBXMLSEC:libxmlsec LIBXSLT:libxslt LIBWPG:libwpg LIBWPS:libwps LIBWPD:libwpd LIBVISIO:libvisio LPSOLVE:lpsolve MDDS:mdds MYTHES:mythes NEON:neon NSS:nss OPENSSL:openssl PYTHON:python REDLAND:redland SANE:sane SAXON:saxon TRANSLATIONS:translations TWAIN:twain VIGRA:vigra X11_EXTENSIONS:x11_extensions XPDF:xpdf ZLIB:zlib basegfx bridges comphelper DBCONNECTIVITY:connectivity cppu cppuhelper cpputools i18npool i18nutil icc javaunohelper jurt jvmaccess jvmfwk offapi officecfg oovbaapi QADEVOOO:qadevOOo DESKTOP:rdbmaker readlicense_oo rhino ridljar rsc sal salhelper sax shell solenv soltools sot stoc svl sysui tools ucbhelper udkapi unoil un
otest unotools ure xmlreader xsltml NULL
++tb tail_build : AFMS:afms APACHE_COMMONS:apache-commons BSH:beanshell BERKELEYDB:berkeleydb BOOST:boost CAIRO:cairo CURL:curl FONTCONFIG:fontconfig FREETYPE:freetype GRAPHITE:graphite HUNSPELL:hunspell HYPHEN:hyphen ICU:icu DESKTOP:l10ntools JPEG:jpeg LCMS2:lcms2 LIBCDR:libcdr LIBCMIS:libcmis LIBEXTTEXTCAT:libexttextcat LIBXML2:libxml2 LIBXMLSEC:libxmlsec LIBXSLT:libxslt LIBWPG:libwpg LIBWPS:libwps LIBWPD:libwpd LIBVISIO:libvisio LPSOLVE:lpsolve MDDS:mdds MYTHES:mythes NEON:neon NSS:nss OPENSSL:openssl PYTHON:python REDLAND:redland SANE:sane SAXON:saxon TRANSLATIONS:translations TWAIN:twain VIGRA:vigra X11_EXTENSIONS:x11_extensions XPDF:xpdf ZLIB:zlib basegfx bridges comphelper DBCONNECTIVITY:connectivity cppu cppuhelper cpputools i18npool i18nutil icc javaunohelper jurt jvmaccess jvmfwk offapi officecfg oovbaapi QADEVOOO:qadevOOo DESKTOP:rdbmaker readlicense_oo RHINO:rhino ridljar rsc sal salhelper sax shell solenv soltools sot stoc svl sysui tools ucbhelper udkapi un
oil unotest unotools ure xmlreader xsltml NULL
tb tail_build\prj nmake - all tb_prj NULL
diff --git a/patches/series b/patches/series
index cc82c99..d7dae3c 100644
--- a/patches/series
+++ b/patches/series
@@ -25,4 +25,3 @@ pythonloader.uno.so-libpyuno-and-pyuno-are-duplicate.diff
debian-hardened-buildflags.diff
gtk3-hack-explicit-gmodule.diff
pyuno-py3-module.diff
-fix-mysqlcppconn-version-check.diff
--
LibreOffice packaging repository
Reply to: