------------------------------------------------------------ revno: 2369 committer: Rene Engelhard <r...@debian.org> branch nick: unstable timestamp: Wed 2011-02-09 10:12:46 +0100 message: update to 3.3.1 rc1 git tag removed: patches/fix-mesa-headers-check.diff patches/fixed-close-parentheses-with-icu-4.4.diff patches/nsplugin-LibreOffice.diff modified: changelog control control.in patches/series rules
=== modified file 'changelog' --- a/changelog 2011-02-09 00:23:30 +0000 +++ b/changelog 2011-02-09 09:12:46 +0000 @@ -1,3 +1,9 @@ +libreoffice (1:3.3.1~rc1-1) UNRELEASED; urgency=low + + * new upstream release candidate + + -- Rene Engelhard <r...@debian.org> Tue, 08 Feb 2011 22:43:57 +0100 + libreoffice (1:3.3.0-3) UNRELEASED; urgency=low * debian/rules:
=== modified file 'control' --- a/control 2011-02-08 21:41:05 +0000 +++ b/control 2011-02-09 09:12:46 +0000 @@ -3,13 +3,13 @@ Priority: optional Maintainer: Debian LibreOffice Maintainers <debian-openoffice@lists.debian.org> Uploaders: Rene Engelhard <r...@debian.org> -Build-Depends: lsb-release, bzip2, bison, flex (>= 2.5.25-7) | flex-old, libxaw7-dev, unzip, zip, autoconf, automake, sharutils, pkg-config, libfontconfig1-dev, libc0.1 (>= 2.10.2-7) [kfreebsd-i386 kfreebsd-amd64], zlib1g-dev, libfreetype6-dev, libx11-dev, libsm-dev, libxt-dev, libxext-dev, libxtst-dev, libice-dev, libsane-dev, libxrender-dev, libcups2-dev, libarchive-zip-perl, libpng12-dev, libjpeg-dev, libxml2-dev, libexpat1-dev, fastjar, xsltproc, libxkbfile-dev, libxinerama-dev, x11proto-render-dev, unixodbc-dev (>= 2.2.11), libxml-parser-perl, gperf, libpq-dev, po-debconf, bc, wget | curl, g++ (>> 4.3.0) [s390], gcc (>> 4.3.0) [s390], g++-4.4 (>= 4.4.2-5) [armel], dpkg-dev (>= 1.15.1), libgl1-mesa-dev [!armel !armhf !mips !mipsel], libglu1-mesa-dev [!armel !armhf !mips !mipsel], libpoppler-dev (>= 0.8.0), libgraphite-dev, libcurl4-gnutls-dev, libssl-dev, libdb-dev, python-central (>= 0.5), python-dev, debhelper (>= 7.2.3~), epm, libcppunit-dev (>= 1.12), openjdk-6-jdk [ alpha amd64 armel armhf i386 powerpc powerpcspe ppc64 s390 s390x sparc], gcj-native-helper [!powerpc !powerpcspe !ppc64], libgcj-common (>= 1:4.4.1) [!powerpc !powerpcspe !ppc64], ant (>= 1.7.0), ant-optional (>= 1.7.0), gcc-mingw32, mingw32-runtime, libcommons-codec-java, libcommons-httpclient-java, libcommons-lang-java, libcommons-logging-java, libservlet2.5-java, libbase-java-openoffice.org [!armel], libsac-java [!armel], libxml-java-openoffice.org [!armel], libflute-java-openoffice.org [!armel], libpentaho-reporting-flow-engine-java-openoffice.org [!armel], liblayout-java-openoffice.org [!armel], libloader-java-openoffice.org [!armel], libformula-java-openoffice.org [!armel], librepository-java-openoffice.org [!armel], libfonts-java-openoffice.org [!armel], libserializer-java-openoffice.org [!armel], libcommons-logging-java, libservlet2.5-java, xulrunner-dev, libnss3-dev (>= 3.12.3), dmake (>= 1:4.11), mono-devel (>= 2.4.2.3) [amd64 i386 ia64 kfreebsd-amd64 kfreebsd-i386 ], libmono-dev (>= 2.4.2.3) [amd64 i386 ia64 kfreebsd-amd64 kfreebsd-i386], mono-utils (>= 2.4.2.3) [amd64 i386 ia64 kfreebsd-amd64 kfreebsd-i386], cli-common-dev (>= 0.5.7) [amd64 i386 ia64 kfreebsd-amd64 kfreebsd-i386], libhunspell-dev (>= 1.1.5-2), libhyphen-dev (>= 2.4), libstlport4.6-dev (>= 4.6.2-3) [i386], libboost-dev (>= 1.38), libmdds-dev, libvigraimpex-dev, libwpd-dev (>= 0.9.0), libmythes-dev (>= 2:1.2), libwps-dev (>= 0.2.0), libwpg-dev (>= 0.2.0), libicu-dev (>= 4.0), libxslt1-dev, libcairo2-dev, kdelibs5-dev (>= 4:4.3.4), libqt4-dev (>= 4.5), libmysqlclient-dev, libmysqlcppconn-dev (>= 1.1.0~r791), libebook1.2-dev [!armel], libxrandr-dev, liblucene2-java (>= 2.3.2), libhsqldb-java (>> 1.8.0.10), bsh (>= 2.0b4), liblpsolve55-dev (>= 5.5.0.13-5+b1), lp-solve (>= 5.5.0.13-5+b1), libsuitesparse-dev (>= 1:3.4.0), libdbus-glib-1-dev (>= 0.60), libgstreamer-plugins-base0.10-dev, libneon27-gnutls-dev, librdf0-dev (>= 1.0.8), libgtk2.0-dev (>= 2.10), libgnomevfs2-dev, libgconf2-dev, libldap2-dev +Build-Depends: lsb-release, bzip2, bison, flex (>= 2.5.25-7) | flex-old, libxaw7-dev, unzip, zip, autoconf, automake, sharutils, pkg-config, libfontconfig1-dev, libc0.1 (>= 2.10.2-7) [kfreebsd-i386 kfreebsd-amd64], zlib1g-dev, libfreetype6-dev, libx11-dev, libsm-dev, libxt-dev, libxext-dev, libxtst-dev, libice-dev, libsane-dev, libxrender-dev, libcups2-dev, libarchive-zip-perl, libpng12-dev, libjpeg-dev, libxml2-dev, libexpat1-dev, fastjar, xsltproc, libxkbfile-dev, libxinerama-dev, x11proto-render-dev, unixodbc-dev (>= 2.2.11), libxml-parser-perl, gperf, libpq-dev, po-debconf, bc, wget | curl, g++ (>> 4.3.0) [s390], gcc (>> 4.3.0) [s390], g++-4.4 (>= 4.4.2-5) [armel], git, rsync, dpkg-dev (>= 1.15.1), libgl1-mesa-dev [!armel !armhf !mips !mipsel], libglu1-mesa-dev [!armel !armhf !mips !mipsel], libpoppler-dev (>= 0.8.0), libgraphite-dev, libcurl4-gnutls-dev, libssl-dev, libdb-dev, python-central (>= 0.5), python-dev, debhelper (>= 7.2.3~), epm, libcppunit-dev (>= 1.12), ope njdk-6-jdk [alpha amd64 armel armhf i386 powerpc powerpcspe ppc64 s390 s390x sparc], gcj-native-helper [!powerpc !powerpcspe !ppc64], libgcj-common (>= 1:4.4.1) [!powerpc !powerpcspe !ppc64], ant (>= 1.7.0), ant-optional (>= 1.7.0), gcc-mingw32, mingw32-runtime, libcommons-codec-java, libcommons-httpclient-java, libcommons-lang-java, libcommons-logging-java, libservlet2.5-java, libbase-java-openoffice.org [!armel], libsac-java [!armel], libxml-java-openoffice.org [!armel], libflute-java-openoffice.org [!armel], libpentaho-reporting-flow-engine-java-openoffice.org [!armel], liblayout-java-openoffice.org [!armel], libloader-java-openoffice.org [!armel], libformula-java-openoffice.org [!armel], librepository-java-openoffice.org [!armel], libfonts-java-openoffice.org [!armel], libserializer-java-openoffice.org [!armel], libcommons-logging-java, libservlet2.5-java, xulrunner-dev, libnss3-dev (>= 3.12.3), dmake (>= 1:4.11), mono-devel (>= 2.4.2.3) [amd64 i386 ia64 kfreebsd-amd64 k freebsd-i386], libmono-dev (>= 2.4.2.3) [amd64 i386 ia64 kfreebsd-amd64 kfreebsd-i386], mono-utils (>= 2.4.2.3) [amd64 i386 ia64 kfreebsd-amd64 kfreebsd-i386], cli-common-dev (>= 0.5.7) [amd64 i386 ia64 kfreebsd-amd64 kfreebsd-i386], libhunspell-dev (>= 1.1.5-2), libhyphen-dev (>= 2.4), libstlport4.6-dev (>= 4.6.2-3) [i386], libboost-dev (>= 1.38), libmdds-dev, libvigraimpex-dev, libwpd-dev (>= 0.9.0), libmythes-dev (>= 2:1.2), libwps-dev (>= 0.2.0), libwpg-dev (>= 0.2.0), libicu-dev (>= 4.0), libxslt1-dev, libcairo2-dev, kdelibs5-dev (>= 4:4.3.4), libqt4-dev (>= 4.5), libmysqlclient-dev, libmysqlcppconn-dev (>= 1.1.0~r791), libebook1.2-dev [!armel], libxrandr-dev, liblucene2-java (>= 2.3.2), libhsqldb-java (>> 1.8.0.10), bsh (>= 2.0b4), liblpsolve55-dev (>= 5.5.0.13-5+b1), lp-solve (>= 5.5.0.13-5+b1), libsuitesparse-dev (>= 1:3.4.0), libdbus-glib-1-dev (>= 0.60), libgstreamer-plugins-base0.10-dev, libneon27-gnutls-dev, librdf0-dev (>= 1.0.8), libgtk2.0-dev (>= 2.10), libgno mevfs2-dev, libgconf2-dev, libldap2-dev Build-Depends-Indep: fdupes, xml-core, imagemagick, libtextcat-data-utf8, fontforge Build-Conflicts: libcairo2 (= 1.4.8-1), libxul-dev (= 1.8.0.13~pre070720-0etch1), gjdoc (= 0.7.8-2), libc6-dev (= 2.6.1-3) [i386 amd64], libc6-dev (= 2.6.1-4) [i386 amd64], nvidia-glx-dev, nvidia-glx-legacy-dev, libmono-dev (= 1.2.6+dfsg-1), libmono-dev (= 1.2.6+dfsg-2), libmono-dev (= 1.2.6+dfsg-3), libmono-dev (= 1.2.6+dfsg-4), libmono-dev (= 2.4+dfsg-2) [sparc], gcj-4.2 (= 4.2.2-6), flex (= 2.5.34-1) [amd64], libboost1.39-dev (<< 1.39.0-2), graphicsmagick-imagemagick-compat (<< 1.3.9~), ant (= 1.8.0-1) [hppa ia64 kfreebsd-i386 kfreebsd-amd64 mips mipsel], ant (= 1.8.0-2) [hppa ia64 kfreebsd-i386 kfreebsd-amd64 mips mipsel], ant (= 1.8.0-3) [hppa ia64 kfreebsd-i386 kfreebsd-amd64 mips mipsel], base-files (= 5), base-files (= 6.0), libhsqldb-java (>= 1.8.1~) Standards-Version: 3.8.4 XS-Python-Version: current -Vcs-Bzr: nosmart+http://bzr.debian.org/pkg-openoffice/packages/libreoffice/3.3.0/unstable -Vcs-Browser: http://bzr.debian.org/loggerhead/pkg-openoffice/packages/libreoffice/3.3.0/unstable/files +Vcs-Bzr: nosmart+http://bzr.debian.org/pkg-openoffice/packages/libreoffice/3.3.1/unstable +Vcs-Browser: http://bzr.debian.org/loggerhead/pkg-openoffice/packages/libreoffice/3.3.1/unstable/files Bugs: Homepage: http://www.libreoffice.org === modified file 'control.in' --- a/control.in 2011-02-04 01:27:41 +0000 +++ b/control.in 2011-02-09 09:12:46 +0000 @@ -49,8 +49,8 @@ Build-Conflicts: libcairo2 (= 1.4.8-1), libxul-dev (= 1.8.0.13~pre070720-0etch1), gjdoc (= 0.7.8-2), libc6-dev (= 2.6.1-3) [i386 amd64], libc6-dev (= 2.6.1-4) [i386 amd64], nvidia-glx-dev, nvidia-glx-legacy-dev, libmono-dev (= 1.2.6+dfsg-1), libmono-dev (= 1.2.6+dfsg-2), libmono-dev (= 1.2.6+dfsg-3), libmono-dev (= 1.2.6+dfsg-4), libmono-dev (= 2.4+dfsg-2) [sparc], gcj-4.2 (= 4.2.2-6), flex (= 2.5.34-1) [amd64], libboost1.39-dev (<< 1.39.0-2), graphicsmagick-imagemagick-compat (<< 1.3.9~), ant (= 1.8.0-1) [%OOO_GCJ_JDK_ARCHS%], ant (= 1.8.0-2) [%OOO_GCJ_JDK_ARCHS%], ant (= 1.8.0-3) [%OOO_GCJ_JDK_ARCHS%] Standards-Version: 3.8.4 XS-Python-Version: @PYTHON_VERSION@ -Vcs-Bzr: nosmart+http://bzr.debian.org/pkg-openoffice/packages/libreoffice/3.3.0/unstable -Vcs-Browser: http://bzr.debian.org/loggerhead/pkg-openoffice/packages/libreoffice/3.3.0/unstable/files +Vcs-Bzr: nosmart+http://bzr.debian.org/pkg-openoffice/packages/libreoffice/3.3.1/unstable +Vcs-Browser: http://bzr.debian.org/loggerhead/pkg-openoffice/packages/libreoffice/3.3.1/unstable/files Bugs: @BUGS@ Homepage: http://www.libreoffice.org === removed file 'patches/fix-mesa-headers-check.diff' --- a/patches/fix-mesa-headers-check.diff 2011-01-14 00:32:38 +0000 +++ b/patches/fix-mesa-headers-check.diff 1970-01-01 00:00:00 +0000 @@ -1,104 +0,0 @@ ---- /dev/null 2010-12-28 14:11:38.191102592 +0100 -+++ libreoffice-3.3.0/libreoffice-build/patches/dev300/fix-mesa-headers-check.diff 2010-12-29 21:25:14.000000000 +0100 -@@ -0,0 +1,90 @@ -+diff --git a/configure.in b/configure.in -+index e431cbf..5fbe4d3 100644 -+--- configure.in -++++ configure.in -+@@ -5564,26 +5564,6 @@ -+ AC_SUBST(ENABLE_RANDR) -+ -+ dnl =================================================================== -+-dnl Check for system Mesa -+-dnl =================================================================== -+-AC_MSG_CHECKING([which Mesa headers to use]) -+-if test "$with_system_mesa_headers" = "no"; then -+- AC_MSG_RESULT([internal]) -+- SYSTEM_MESA_HEADERS=NO -+- BUILD_TYPE="$BUILD_TYPE MESA" -+-else -+- AC_MSG_RESULT([external]) -+- SYSTEM_MESA_HEADERS=YES -+- AC_LANG_PUSH(C) -+- AC_CHECK_HEADER(GL/glxext.h, [], -+- [ AC_MSG_ERROR(mesa headers not found.)], [#include <GL/glx.h>]) -+- AC_MSG_CHECKING([whether GL/glxext.h defines PFNGLXBINDTEXIMAGEEXTPROC]) -+- AC_EGREP_HEADER(PFNGLXBINDTEXIMAGEEXTPROC, GL/glxext.h, [AC_MSG_RESULT([yes])], AC_MSG_ERROR(no)) -+- AC_LANG_POP(C) -+-fi -+-AC_SUBST(SYSTEM_MESA_HEADERS) -+- -+-dnl =================================================================== -+ dnl Check for building neon -+ dnl =================================================================== -+ AC_MSG_CHECKING([whether to use neon]) -+@@ -6330,22 +6316,45 @@ dnl =================================================================== -+ AC_MSG_CHECKING([whether to build the OpenGL Transitions component]) -+ ENABLE_OPENGL= -+ -+-if test "x$enable_opengl" != "xno" ; then -+- save_LDFLAGS=$LDFLAGS -+- LDFLAGS="$LDFLAGS -lm" -+- AC_MSG_RESULT([yes]) -+- AC_CHECK_HEADER(GL/gl.h, [], -+- [AC_MSG_ERROR([OpenGL headers not found])], []) -+- AC_CHECK_LIB(GL, main, [], -+- [AC_MSG_ERROR(libGL not installed or functional)], []) -+- AC_CHECK_LIB(GLU, main, [], -+- [AC_MSG_ERROR(libGLU not installed or functional)], []) -+- ENABLE_OPENGL=TRUE -+- LDFLAGS=$save_LDFLAGS -++ if test "x$enable_opengl" != "xno" ; then -++ if test "$_os" != "WINNT"; then -++ save_LDFLAGS=$LDFLAGS -++ LDFLAGS="$LDFLAGS -lm" -++ AC_MSG_RESULT([yes]) -++ AC_CHECK_LIB(GL, main, [], -++ [AC_MSG_ERROR(libGL not installed or functional)], []) -++ AC_CHECK_LIB(GLU, main, [], -++ [AC_MSG_ERROR(libGLU not installed or functional)], []) -++ ENABLE_OPENGL=TRUE -++ LDFLAGS=$save_LDFLAGS -++ -++ dnl =================================================================== -++ dnl Check for system Mesa -++ dnl =================================================================== -++ AC_MSG_CHECKING([which Mesa headers to use]) -++ if test -n "$with_system_mesa_headers" -o -n "$with_system_headers" && \ -++ test "$with_system_mesa_headers" != "no"; then -++ AC_MSG_RESULT([external]) -++ SYSTEM_MESA_HEADERS=YES -++ AC_LANG_PUSH(C) -++ AC_CHECK_HEADER(GL/glxext.h, [], -++ [ AC_MSG_ERROR(mesa headers not found.)], [#include <GL/glx.h>]) -++ AC_MSG_CHECKING([whether GL/glxext.h defines PFNGLXBINDTEXIMAGEEXTPROC]) -++ AC_EGREP_HEADER(PFNGLXBINDTEXIMAGEEXTPROC, GL/glxext.h, [AC_MSG_RESULT([yes])], AC_MSG_ERROR(no)) -++ AC_LANG_POP(C) -++ else -++ AC_MSG_RESULT([internal]) -++ SYSTEM_MESA_HEADERS=NO -++ BUILD_TYPE="$BUILD_TYPE MESA" -++ fi -++ else -++ AC_MSG_RESULT([not on windows]) -++ fi -+ else -+- AC_MSG_RESULT([no]) -++ AC_MSG_RESULT([no]) -+ fi -+ -++AC_SUBST(SYSTEM_MESA_HEADERS) -+ AC_SUBST(ENABLE_OPENGL) -+ -+ AC_MSG_CHECKING([whether to build extra presenter ui]) ---- libreoffice-3.3.0/libreoffice-build/patches/dev300/apply-old 2010-12-29 21:27:25.000000000 +0100 -+++ libreoffice-3.3.0/libreoffice-build/patches/dev300/apply 2010-12-29 21:27:48.000000000 +0100 -@@ -1548,6 +1548,8 @@ - - transogl-more-transitions.diff - -+fix-mesa-headers-check.diff -+ - [ OpenGLTransitionsMesa703 ] - - # very hacky build fix for Mesa-7.0.3; used on openSUSE-10.2 === removed file 'patches/fixed-close-parentheses-with-icu-4.4.diff' --- a/patches/fixed-close-parentheses-with-icu-4.4.diff 2011-01-27 19:44:38 +0000 +++ b/patches/fixed-close-parentheses-with-icu-4.4.diff 1970-01-01 00:00:00 +0000 @@ -1,116 +0,0 @@ -diff --git a/patches/dev300/apply b/patches/dev300/apply -index 70f28fd..89ff428 100755 ---- libreoffice-3.3.0/libreoffice-build/patches/dev300/apply -+++ libreoffice-3.3.0/libreoffice-build/patches/dev300/apply -@@ -1800,6 +1800,8 @@ goodies-eps-filter-unix.diff, n#200053, rodo - # internationalized ordinal suffix autocorrection. Needs ICU 4.2 - svx-i18n-ordinal-autocorr.diff, i#20348, cbosdo - -+fixed-close-parentheses-with-icu-4.4.diff -+ - # hack to install the problematic gdocs_2.1.0.oxt; can be removed with new gdocs version - scp2_extensions-gdocs_2.1.0_modified_installation.diff, pmladek - ---- /dev/null 2011-01-25 18:07:07.612942750 +0100 -+++ libreoffice-3.3.0/libreoffice-build/patches/dev300/fixed-close-parentheses-with-icu-4.4.diff 2011-01-26 03:24:00.000000000 +0100 -@@ -0,0 +1,100 @@ -+diff --git a/configure.in b/configure.in -+index 5fefd14..e02d016 100755 -+--- configure.in -++++ configure.in -+@@ -5314,18 +5314,21 @@ if test -n "$with_system_icu" -o -n "$with_system_libs" && \ -+ if test -z "$SYSTEM_GENCMN"; then -+ AC_MSG_ERROR([\"gencmn\" not found in \$PATH, install the icu development tool \"gencmn"\]) -+ fi -++ -++ AC_PATH_PROG( ICUCONFIG, icu-config) -+ AC_MSG_CHECKING([ICU version]) -+- AC_TRY_RUN([ -+-#include <unicode/uversion.h> -++ ICU_VERSION=`$ICUCONFIG --version` -++ ICU_MAJOR=`$ICUCONFIG --version | cut -d"." -f1` -++ ICU_MINOR=`$ICUCONFIG --version | cut -d"." -f2` -++ ICU_MICRO=`$ICUCONFIG --version | cut -d"." -f3` -+ -+-int main(int argc, char **argv) { -+- if(U_ICU_VERSION_MAJOR_NUM < 4) -+- return 1; -+- else -+- return 0; -+-} -+- ], [AC_MSG_RESULT(OK)], [AC_MSG_ERROR([not suitable, only >= 4.0 supported currently])]) -+- AC_LANG_POP([C++]) -++ if test "$ICU_MAJOR" -ge "4"; then -++ AC_MSG_RESULT([OK]) -++ else -++ AC_MSG_ERROR([not suitable, only >= 4.0 supported currently]) -++ fi -++ -++ AC_LANG_POP([C++]) -+ else -+ AC_MSG_RESULT([internal]) -+ SYSTEM_ICU=NO -+@@ -5335,6 +5338,9 @@ AC_SUBST(SYSTEM_ICU) -+ AC_SUBST(SYSTEM_GENBRK) -+ AC_SUBST(SYSTEM_GENCCODE) -+ AC_SUBST(SYSTEM_GENCMN) -++AC_SUBST(ICU_MAJOR) -++AC_SUBST(ICU_MINOR) -++AC_SUBST(ICU_MICRO) -+ -+ dnl =================================================================== -+ dnl Graphite -+diff --git a/set_soenv.in b/set_soenv.in -+index 0533441..f48d5e3 100755 -+--- set_soenv.in -++++ set_soenv.in -+@@ -1906,6 +1906,9 @@ if ($SYSTEM_PYTHON eq "NO") { -+ ToFile( "HOME", "@HOME@", "e" ); -+ } -+ ToFile( "SYSTEM_ICU", "@SYSTEM_ICU@", "e" ); -++ToFile( "ICU_MAJOR", "@ICU_MAJOR@", "e" ); -++ToFile( "ICU_MINOR", "@ICU_MINOR@", "e" ); -++ToFile( "ICU_MICRO", "@ICU_MICRO@", "e" ); -+ ToFile( "SYSTEM_GENBRK", "@SYSTEM_GENBRK@", "e" ); -+ ToFile( "SYSTEM_GENCCODE", "@SYSTEM_GENCCODE@", "e" ); -+ ToFile( "SYSTEM_GENCMN", "@SYSTEM_GENCMN@", "e" ); -+diff --git a/icu/icuversion.mk b/icu/icuversion.mk -+index eedf627..a170642 100755 -+--- icu/icuversion.mk -++++ icu/icuversion.mk -+@@ -25,9 +25,9 @@ -+ # -+ #************************************************************************* -+ # major -+-ICU_MAJOR=4 -++ICU_MAJOR*=4 -+ # minor -+-ICU_MINOR=2 -++ICU_MINOR*=2 -+ # micro -+-ICU_MICRO=1 -++ICU_MICRO*=1 -+ -+diff --git a/i18npool/source/breakiterator/makefile.mk b/i18npool/source/breakiterator/makefile.mk -+index f308812..fc6561c 100644 -+--- i18npool/source/breakiterator/makefile.mk -++++ i18npool/source/breakiterator/makefile.mk -+@@ -79,7 +79,17 @@ GENBRK:=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)$/genbrk -+ GENCCODE:=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)$/genccode -+ .ENDIF -+ -+-$(MISC)$/%.brk : data/%.txt -++.INCLUDE .IGNORE : icuversion.mk -++ -++$(MISC)$/%.txt : data/%.txt -++# fdo#31271 ")" reclassified in more recent ICU/Unicode Standards -++.IF "$(ICU_MAJOR)" >= "5" || ("$(ICU_MAJOR)" == "4" && "$(ICU_MINOR)" >= "4") -++ $(SED) "s#\[:LineBreak = Close_Punctuation:\]#\[\[:LineBreak = Close_Punctuation:\] \[:LineBreak = Close_Parenthesis:\]\]#" $< > $@ -++.ELSE -++ $(COPY) $< $@ -++.ENDIF -++ -++$(MISC)$/%.brk : $(MISC)/%.txt -+ $(WRAPCMD) $(GENBRK) -r $< -o $(MISC)$/$*.brk -+ -+ $(MISC)$/%_brk.c : $(MISC)$/%.brk === removed file 'patches/nsplugin-LibreOffice.diff' --- a/patches/nsplugin-LibreOffice.diff 2011-02-02 23:46:19 +0000 +++ b/patches/nsplugin-LibreOffice.diff 1970-01-01 00:00:00 +0000 @@ -1,31 +0,0 @@ ---- /dev/null 2011-01-31 20:18:12.949141037 +0100 -+++ libreoffice-3.3.0/libreoffice-build/patches/dev300/nsplugin-LibreOffice.diff 2011-02-03 00:39:03.000000000 +0100 -@@ -0,0 +1,19 @@ -+From 13519789cd6c9f86067251c5566f29a96bdaac44 Mon Sep 17 00:00:00 2001 -+From: Rene Engelhard <r...@debian.org> -+Date: Wed, 02 Feb 2011 23:37:15 +0000 -+Subject: another s/OpenOffice.org/LibreOffice/ in nsplugin -+ -+--- -+diff --git a/extensions/source/nsplugin/source/nsplugin_oo.rc b/extensions/source/nsplugin/source/nsplugin_oo.rc -+index 42a2a64..9d30de3 100644 -+--- extensions/source/nsplugin/source/nsplugin_oo.rc -++++ extensions/source/nsplugin/source/nsplugin_oo.rc -+@@ -26,5 +26,5 @@ -+ ************************************************************************/ -+ #define ADDITIONAL_VERINFO1 value "FileExtents", "sdc|sds|sda|sdd|sdp|smf|vor|sgl|sdw|sxc|stc|sxd|std|sxi|sti|sxm|sxw|sxg|stw|odt|ott|odm|oth|ods|ots|odg|otg|odp|otp|odf\0"\ -+ value "FileOpenName", "StarCalc 3.0 - 5.0|StarChart 3.0 - 5.0|StarDraw 3.0 - 5.0|StarImpress 3.0 - 5.0|StarImpress-packed 3.0 - 5.0|StarMath 3.0 - 5.0|StarWriter Template 3.0 - 5.0|StarWriter Global 3.0 - 5.0|StarWriter 3.0 - 5.0|StarOffice 6.0/7 Spreadsheet|StarOffice 6.0/7 Spreadsheet Template|StarOffice 6.0/7 Drawing|StarOffice 6.0/7 Drawing Template|StarOffice 6.0/7 Presentation|StarOffice 6.0/7 Presentation Template|StarOffice 6.0/7 Formula|StarOffice 6.0/7 Text Document|StarOffice 6.0/7 Master Document|StarOffice 6.0/7 Text Document Template|OpenDocument Text|OpenDocument Text Template|OpenDocument Master Document|HTML Document Template|OpenDocument Spreadsheet|OpenDocument Spreadsheet Template|OpenDocument Drawing|OpenDocument Drawing Template|OpenDocument Presentation|OpenDocument Presentation Template|OpenDocument Formula\0" -+-#define ADDITIONAL_VERINFO2 value "FileDescription", "OpenOffice.org Plug-in handles all its documents" value "ProductName", "OpenOffice.org Plug-in" value "MIMEType", "application/vnd.stardivision.calc|application/vnd.stardivision.chart|application/vnd.stardivision.draw|application/vnd.stardivision.impress|application/vnd.stardivision.impress-packed|application/vnd.stardivision.math|application/vnd.stardivision.writer|application/vnd.stardivision.writer-global|application/vnd.staroffice.writer|application/vnd.sun.xml.calc|application/vnd.sun.xml.calc.template|application/vnd.sun.xml.draw|application/vnd.sun.xml.draw.template|" -++#define ADDITIONAL_VERINFO2 value "FileDescription", "LibreOffice Plug-in handles all its documents" value "ProductName", "LibreOffice Plug-in" value "MIMEType", "application/vnd.stardivision.calc|application/vnd.stardivision.chart|application/vnd.stardivision.draw|application/vnd.stardivision.impress|application/vnd.stardivision.impress-packed|application/vnd.stardivision.math|application/vnd.stardivision.writer|application/vnd.stardivision.writer-global|application/vnd.staroffice.writer|application/vnd.sun.xml.calc|application/vnd.sun.xml.calc.template|application/vnd.sun.xml.draw|application/vnd.sun.xml.draw.template|" -+ #define ADDITIONAL_VERINFO3 "application/vnd.sun.xml.impress|application/vnd.sun.xml.impress.template|application/vnd.sun.xml.math|application/vnd.sun.xml.writer|application/vnd.sun.xml.writer.global|application/vnd.sun.xml.writer.template|application/vnd.oasis.opendocument.text|application/vnd.oasis.opendocument.text-template|application/vnd.oasis.opendocument.text-master|application/vnd.oasis.opendocument.text-web|application/vnd.oasis.opendocument.spreadsheet|application/vnd.oasis.opendocument.spreadsheet-template|application/vnd.oasis.opendocument.graphics|application/vnd.oasis.opendocument.graphics-template|application/vnd.oasis.opendocument.presentation|application/vnd.oasis.opendocument.presentation-template|application/vnd.oasis.opendocument.formula\0" -+-- -+cgit v0.8.3-6-g21f6 ---- libreoffice-3.3.0/libreoffice-build/patches/dev300/apply-old 2011-02-03 00:42:30.000000000 +0100 -+++ libreoffice-3.3.0/libreoffice-build/patches/dev300/apply 2011-02-03 00:43:13.000000000 +0100 -@@ -2390,3 +2390,6 @@ - - [ TemporaryHacks ] - hack-no-rm-fr-of-smoketest-userconfig.diff -+ -+[ Fixes ] -+nsplugin-LibreOffice.diff === modified file 'patches/series' --- a/patches/series 2011-02-02 23:46:19 +0000 +++ b/patches/series 2011-02-09 09:12:46 +0000 @@ -3,8 +3,5 @@ buildfix-patches.diff hack-no-rm-fr-of-smoketest-userconfig.diff do-not-switch-workspaces-of-wm.diff -fix-mesa-headers-check.diff bridges-mkstemp-error-better-message.diff pyuno-demo-fix-PYTHONPATH.diff -fixed-close-parentheses-with-icu-4.4.diff -nsplugin-LibreOffice.diff === modified file 'rules' --- a/rules 2011-02-09 00:23:30 +0000 +++ b/rules 2011-02-09 09:12:46 +0000 @@ -81,8 +81,8 @@ MILESTONE=m19 TAG=$(shell echo $(MWS) | tr A-Z a-z)-$(MILESTONE) GIT_TAG=$(MWS)_$(MILESTONE) -OOO_BUILD_BRANCH=libreoffice-3-3-0 -OOO_BUILD_VERSION=3.3.0.4 +OOO_BUILD_BRANCH=libreoffice-3-3-1 +OOO_BUILD_VERSION=3.3.1.1 # in ooo-build releases the same as OOO_BUILD_VERSION OOO_BUILD_TARBALL_VERSION=$(OOO_BUILD_VERSION) OOO_BUILD_TAG=libreoffice-$(OOO_BUILD_TARBALL_VERSION) @@ -91,7 +91,7 @@ STAMP_DIR=debian/stampdir TARFILE_LOCATION=$(CURDIR)/ext-sources export TARFILE_LOCATION -USE_SOURCE_TARBALLS=y +USE_SOURCE_TARBALLS=n ifeq "$(DISTREL)" "lenny" LENNY_BACKPORT=y
