[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[SCM] LibreOffice packaging repository branch, debian-experimental-3.6, updated. libreoffice_3.5.3-2-60-g6e6c2dc



The following commit has been merged in the debian-experimental-3.6 branch:
commit 6e6c2dc75c5034c759886ed6a81293613fa7f339
Merge: c62978bd79d839a228335d37be9a51f103688630 7db3dc5155ddd56092ac67d306eb57952e5ca7e9
Author: Rene Engelhard <rene@debian.org>
Date:   Tue May 8 12:59:56 2012 +0200

    Merge remote-tracking branch 'origin/master' into debian-experimental-3.6

diff --combined changelog
index 9e1a37e,0fef14d..d2bb8b2
--- a/changelog
+++ b/changelog
@@@ -1,27 -1,21 +1,36 @@@
 +libreoffice (1:3.6.0~alpha0~git20120503-1) UNRELEASED; urgency=low
 +
 +  * new upstream snapshot 
 +    - fixes splashscreen location in multi-monitor setups
 +      (closes: #657444, #431473)
 +
 +  * debian/patches/build-dont-run-slowcheck.diff: as name says
 +
 +  * debian/rules:
 +    - new conditionals for: doxygen, libcdr, liblcms2
 +    - remove liblucene2-java stuff; now clucene is used
 +    - build-depend on libxml2-utils, xmllint now needed
 +
 + -- Rene Engelhard <rene@debian.org>  Thu, 03 May 2012 13:44:05 +0200
 +
- libreoffice (1:3.5.2-7) UNRELEASED; urgency=low
+ libreoffice (1:3.5.3-2) unstable; urgency=low
+ 
+   * upload to unstable
  
    * debian/patches/mozilla-profile-absolute-paths.diff: add patch from
-     upstream master to respect absolute paths for mozilla profile
+     libreoffice-3-5 branch to respect absolute paths for mozilla profile
      (closes: #659733) 
+   * debian/patches/more-robust-nss-initialization.diff: add patch from
+     master to fall back to without profile if path is invalid or profile
+     does not exist
+   * debian/patches/fix-bean.diff: add patch from master to fix bean after
+     switching to gbuild
+ 
+  -- Rene Engelhard <rene@debian.org>  Mon, 07 May 2012 19:11:04 +0200
  
-  -- Rene Engelhard <rene@debian.org>  Thu, 03 May 2012 23:37:38 +0200
+ libreoffice (1:3.5.3-1) experimental; urgency=low
  
- libreoffice (1:3.5.2-6) unstable; urgency=low
+   * LibreOffice 3.5.3 final (identical to rc2)
  
    [ Rene Engelhard ]
    * debian/patches/ignore-sc_cellrangesbase-fails.diff: as it says; gives
@@@ -37,25 -31,43 +46,43 @@@
    [ Björn Michaelsen ]
    * add missing mimetypes to impress.desktop (LP: #904212)
  
-  -- Rene Engelhard <rene@debian.org>  Fri, 27 Apr 2012 23:38:14 +0200
+  -- Rene Engelhard <rene@debian.org>  Wed, 02 May 2012 00:45:13 +0200
  
- libreoffice (1:3.5.2-5) unstable; urgency=low
+ libreoffice (1:3.5.3~rc2-1) experimental; urgency=low
+ 
+   * new upstream release candidate
  
    * debian/patches/gcc-4.4.dif: fix gtk3 build with gcc 4.4
  
    * debian/rules:
-     - build-depend on new g++-mingw-w64-i686 instead of the whole thing
-     - use gcc 4.4 on mips(el)
      - only ship (and build) unowinreg.dll for i386/amd64. Probably not used
        on other archs and it saves us the g++-mingw-w64-i686 build-dep there 
+     - use gcc 4.4 on mips a) for consistency b) as 3.5.3~rc1-1 bus errord on
+       ball, too
      - readd move of libdbalo.so to -base-core (closes: #670350)
    * debian/shell-lib-extension.sh: also set HOME to $INSTDIR for unopkg
      (as -env=UserInstallation doesn't work (anymore) - closes: #669271
    * debian/libreoffice-common.postrm.in: fix typo to actually try to rm -rf
      /var/lib/libreoffice/share/prereg
  
-  -- Rene Engelhard <rene@debian.org>  Wed, 25 Apr 2012 03:35:18 +0200
+  -- Rene Engelhard <rene@debian.org>  Wed, 25 Apr 2012 03:09:29 +0200
+ 
+ libreoffice (1:3.5.3~rc1-1) experimental; urgency=low
+ 
+   * new upstream release candidate
+ 
+   [ Rene Engelhard ]
+   * debian/rules:
+     - build-depend on new g++-mingw-w64-i686 instead of the whole thing
+     - use gcc 4.4 on mipsel
+   * debian/libreoffice-common.links: move ...
+   * debian/libreoffice-common.links.in: ... here again as we need to
+     subsitute @OODIR@ (closes: #669138)
+ 
+   [ Björn Michaelsen ]
+   * add visio mimetype to libreoffice draw desktop file
+ 
+  -- Rene Engelhard <rene@debian.org>  Sat, 21 Apr 2012 15:54:28 +0200
  
  libreoffice (1:3.5.2-4) unstable; urgency=medium
  
diff --combined control
index ca1f96c,b105927..8f31ee2
--- a/control
+++ b/control
@@@ -3,7 -3,7 +3,7 @@@ Section: editor
  Priority: optional
  Maintainer: Debian LibreOffice Maintainers <debian-openoffice@lists.debian.org>
  Uploaders: Rene Engelhard <rene@debian.org>
- Build-Depends: dpkg-dev (>= 1.16.1), lsb-release, bzip2, bison, flex | 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, libcups2-dev, libarchive-zip-perl, fastjar, xsltproc, libxkbfile-dev, libxinerama-dev, x11proto-render-dev, libxml-parser-perl, gperf, po-debconf, bc, wget | curl, gcc-4.4 [mips mipsel], g++-4.4 [mips mipsel], libgl1-mesa-dev [!armel !mips !mipsel], libglu1-mesa-dev [!armel !mips !mipsel], doxygen, libpoppler-dev (>= 0.8.0), libpoppler-private-dev, libpoppler-cpp-dev, libgraphite2-dev (>= 0.9.3) [!alpha !armel !sparc], libexttextcat-dev (>= 3.1.1), libjpeg-dev, libxml2-dev, libxml2-utils, libxslt1-dev, libexpat1-dev, unixodbc-dev (>= 2.2.11), libsane-dev, libxrender-dev, libpng12-dev, libssl-dev, librsvg2-dev, libdb-dev, python (>= 2.6.6-3+squeeze4), pyth
 on-dev (>= 2.6), python3-dev, debhelper (>= 7.2.3~), libcppunit-dev (>= 1.12), gdb, junit4 (>= 4.8.2-2), openjdk-6-jdk (>= 6b23~pre8-2) [alpha amd64 armel armhf i386 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc], openjdk-7-jdk [ia64], gcj-jdk [hppa kfreebsd-i386 kfreebsd-amd64], gcj-native-helper [hppa kfreebsd-amd64 kfreebsd-i386], libgcj-common (>= 1:4.4.1) [hppa kfreebsd-amd64 kfreebsd-i386], ant (>= 1.7.0), ant-optional (>= 1.7.0), g++-mingw-w64-i686 [i386 amd64], libcommons-codec-java, libcommons-httpclient-java, libcommons-lang-java, libcommons-logging-java (>= 1.1.1-9), libservlet2.5-java, libbase-java [!armel !armhf !hppa !powerpc !powerpcspe !ppc64 !kfreebsd-amd64 !kfreebsd-i386], libsac-java [!armel !armhf !hppa !powerpc !powerpcspe !ppc64 !kfreebsd-amd64 !kfreebsd-i386], libxml-java (>= 1.1.6) [!armel !armhf !hppa !powerpc !powerpcspe !ppc64 !kfreebsd-amd64 !kfreebsd-i386], libflute-java (>= 1.1.6) [!armel !armhf !hppa !powerpc !powerpcspe !ppc64 !kfreebs
 d-amd64 !kfreebsd-i386], libpentaho-reporting-flow-engine-java (>= 0.9.4) [!armel !armhf !hppa !powerpc !powerpcspe !ppc64 !kfreebsd-amd64 !kfreebsd-i386], liblayout-java (>= 0.2.10) [!armel !armhf !hppa !powerpc !powerpcspe !ppc64 !kfreebsd-amd64 !kfreebsd-i386], libloader-java (>= 1.1.6) [!armel !armhf !hppa !powerpc !powerpcspe !ppc64 !kfreebsd-amd64 !kfreebsd-i386], libformula-java (>= 1.1.7) [!armel !armhf !hppa !powerpc !powerpcspe !ppc64 !kfreebsd-amd64 !kfreebsd-i386], librepository-java (>= 1.1.6) [!armel !armhf !hppa !powerpc !powerpcspe !ppc64 !kfreebsd-amd64 !kfreebsd-i386], libfonts-java (>= 1.1.6) [!armel !armhf !hppa !powerpc !powerpcspe !ppc64 !kfreebsd-amd64 !kfreebsd-i386], libserializer-java (>= 1.1.6) [!armel !armhf !hppa !powerpc !powerpcspe !ppc64 !kfreebsd-amd64 !kfreebsd-i386], libcommons-logging-java (>= 1.1.1-9), libservlet2.5-java, javahelper (>= 0.37~), libnss3-dev (>= 3.12.3), xulrunner-dev [!s390x], dmake (>= 1:4.11), libhunspell-dev (>= 1.1.5-2
 ), libhyphen-dev (>= 2.4), libstlport4.6-dev (>= 4.6.2-3) [i386], libboost-dev (>= 1.38), libmdds-dev (>= 0.5.0), libvigraimpex-dev, libsampleicc-dev, libicc-utils-dev, libwpd-dev (>= 0.9.0), libmythes-dev (>= 2:1.2), libwps-dev (>= 0.2.0), libwpg-dev (>= 0.2.0), libvisio-dev, libcdr-dev, libcmis-dev, liblcms2-dev, libicu-dev (>= 4.0), libcairo2-dev, kdelibs5-dev (>= 4:4.3.4), libqt4-dev (>= 4:4.5), libmysqlclient-dev, libmysqlcppconn-dev (>= 1.1.0~r791), libgtk2.0-dev (>= 2.10), libgtk-3-dev (>= 3.2~), libebook1.2-dev [!armel !armhf !powerpc !powerpcspe !ppc64], libpq-dev (>= 9.0~), libxrandr-dev, 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.70), libgstreamer-plugins-base0.10-dev, libneon27-gnutls-dev, librdf0-dev (>= 1.0.8), libglib2.0-dev (>= 2.15.0), libgconf2-dev, liborbit2-dev, gettext, make (>= 3.81-8.2), libldap2-dev
 -Build-Depends: dpkg-dev (>= 1.16.1), lsb-release, bzip2, bison, flex | 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, libcups2-dev, libarchive-zip-perl, fastjar, xsltproc, libxkbfile-dev, libxinerama-dev, x11proto-render-dev, libxml-parser-perl, gperf, po-debconf, bc, wget | curl, gcc-4.4 [mips mipsel], g++-4.4 [mips mipsel], libgl1-mesa-dev [!armel !mips !mipsel], libglu1-mesa-dev [!armel !mips !mipsel], libpoppler-dev (>= 0.8.0), libpoppler-private-dev, libpoppler-cpp-dev, libgraphite2-dev (>= 0.9.3) [!alpha !armel !sparc], libexttextcat-dev (>= 3.1.1), libjpeg-dev, libxml2-dev, libxslt1-dev, libexpat1-dev, unixodbc-dev (>= 2.2.11), libsane-dev, libxrender-dev, libpng12-dev, libssl-dev, librsvg2-dev, libdb-dev, python (>= 2.6.6-3+squeeze4), python-dev (>= 2.6), python3
 -dev, debhelper (>= 7.2.3~), libcppunit-dev (>= 1.12), gdb, junit4 (>= 4.8.2-2), openjdk-6-jdk (>= 6b23~pre8-2) [alpha amd64 armel armhf i386 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc], openjdk-7-jdk [ia64], gcj-jdk [hppa kfreebsd-i386 kfreebsd-amd64], gcj-native-helper [hppa kfreebsd-amd64 kfreebsd-i386], libgcj-common (>= 1:4.4.1) [hppa kfreebsd-amd64 kfreebsd-i386], ant (>= 1.7.0), ant-optional (>= 1.7.0), g++-mingw-w64-i686 [i386 amd64], libcommons-codec-java, libcommons-httpclient-java, libcommons-lang-java, libcommons-logging-java (>= 1.1.1-9), libservlet2.5-java, libbase-java [!armel !armhf !hppa !powerpc !powerpcspe !ppc64 !kfreebsd-amd64 !kfreebsd-i386], libsac-java [!armel !armhf !hppa !powerpc !powerpcspe !ppc64 !kfreebsd-amd64 !kfreebsd-i386], libxml-java (>= 1.1.6) [!armel !armhf !hppa !powerpc !powerpcspe !ppc64 !kfreebsd-amd64 !kfreebsd-i386], libflute-java (>= 1.1.6) [!armel !armhf !hppa !powerpc !powerpcspe !ppc64 !kfreebsd-amd64 !kfreebsd-i386],
  libpentaho-reporting-flow-engine-java (>= 0.9.4) [!armel !armhf !hppa !powerpc !powerpcspe !ppc64 !kfreebsd-amd64 !kfreebsd-i386], liblayout-java (>= 0.2.10) [!armel !armhf !hppa !powerpc !powerpcspe !ppc64 !kfreebsd-amd64 !kfreebsd-i386], libloader-java (>= 1.1.6) [!armel !armhf !hppa !powerpc !powerpcspe !ppc64 !kfreebsd-amd64 !kfreebsd-i386], libformula-java (>= 1.1.7) [!armel !armhf !hppa !powerpc !powerpcspe !ppc64 !kfreebsd-amd64 !kfreebsd-i386], librepository-java (>= 1.1.6) [!armel !armhf !hppa !powerpc !powerpcspe !ppc64 !kfreebsd-amd64 !kfreebsd-i386], libfonts-java (>= 1.1.6) [!armel !armhf !hppa !powerpc !powerpcspe !ppc64 !kfreebsd-amd64 !kfreebsd-i386], libserializer-java (>= 1.1.6) [!armel !armhf !hppa !powerpc !powerpcspe !ppc64 !kfreebsd-amd64 !kfreebsd-i386], libcommons-logging-java (>= 1.1.1-9), libservlet2.5-java, javahelper (>= 0.37~), libnss3-dev (>= 3.12.3), xulrunner-dev [!s390x], dmake (>= 1:4.11), libhunspell-dev (>= 1.1.5-2), libhyphen-dev (>= 2.4
 ), libstlport4.6-dev (>= 4.6.2-3) [i386], libboost-dev (>= 1.38), libmdds-dev (>= 0.5.0), libvigraimpex-dev, libsampleicc-dev, libicc-utils-dev, libwpd-dev (>= 0.9.0), libmythes-dev (>= 2:1.2), libwps-dev (>= 0.2.0), libwpg-dev (>= 0.2.0), libvisio-dev, libcmis-dev, libicu-dev (>= 4.0), libcairo2-dev, kdelibs5-dev (>= 4:4.3.4), libqt4-dev (>= 4:4.8), libmysqlclient-dev, libmysqlcppconn-dev (>= 1.1.0~r791), libgtk2.0-dev (>= 2.10), libgtk-3-dev (>= 3.2~), libebook1.2-dev [!armel !armhf !powerpc !powerpcspe !ppc64], libpq-dev (>= 9.0~), 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.70), libgstreamer-plugins-base0.10-dev, libneon27-gnutls-dev, librdf0-dev (>= 1.0.8), libglib2.0-dev (>= 2.15.0), libgconf2-dev, liborbit2-dev, gettext, make (>= 3.81-8.2), libldap2-dev
++Build-Depends: dpkg-dev (>= 1.16.1), lsb-release, bzip2, bison, flex | 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, libcups2-dev, libarchive-zip-perl, fastjar, xsltproc, libxkbfile-dev, libxinerama-dev, x11proto-render-dev, libxml-parser-perl, gperf, po-debconf, bc, wget | curl, gcc-4.4 [mips mipsel], g++-4.4 [mips mipsel], libgl1-mesa-dev [!armel !mips !mipsel], libglu1-mesa-dev [!armel !mips !mipsel], doxygen, libpoppler-dev (>= 0.8.0), libpoppler-private-dev, libpoppler-cpp-dev, libgraphite2-dev (>= 0.9.3) [!alpha !armel !sparc], libexttextcat-dev (>= 3.1.1), libjpeg-dev, libxml2-dev, libxml2-utils, libxslt1-dev, libexpat1-dev, unixodbc-dev (>= 2.2.11), libsane-dev, libxrender-dev, libpng12-dev, libssl-dev, librsvg2-dev, libdb-dev, python (>= 2.6.6-3+squeeze4), pyth
 on-dev (>= 2.6), python3-dev, debhelper (>= 7.2.3~), libcppunit-dev (>= 1.12), gdb, junit4 (>= 4.8.2-2), openjdk-6-jdk (>= 6b23~pre8-2) [alpha amd64 armel armhf i386 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc], openjdk-7-jdk [ia64], gcj-jdk [hppa kfreebsd-i386 kfreebsd-amd64], gcj-native-helper [hppa kfreebsd-amd64 kfreebsd-i386], libgcj-common (>= 1:4.4.1) [hppa kfreebsd-amd64 kfreebsd-i386], ant (>= 1.7.0), ant-optional (>= 1.7.0), g++-mingw-w64-i686 [i386 amd64], libcommons-codec-java, libcommons-httpclient-java, libcommons-lang-java, libcommons-logging-java (>= 1.1.1-9), libservlet2.5-java, libbase-java [!armel !armhf !hppa !powerpc !powerpcspe !ppc64 !kfreebsd-amd64 !kfreebsd-i386], libsac-java [!armel !armhf !hppa !powerpc !powerpcspe !ppc64 !kfreebsd-amd64 !kfreebsd-i386], libxml-java (>= 1.1.6) [!armel !armhf !hppa !powerpc !powerpcspe !ppc64 !kfreebsd-amd64 !kfreebsd-i386], libflute-java (>= 1.1.6) [!armel !armhf !hppa !powerpc !powerpcspe !ppc64 !kfreebs
 d-amd64 !kfreebsd-i386], libpentaho-reporting-flow-engine-java (>= 0.9.4) [!armel !armhf !hppa !powerpc !powerpcspe !ppc64 !kfreebsd-amd64 !kfreebsd-i386], liblayout-java (>= 0.2.10) [!armel !armhf !hppa !powerpc !powerpcspe !ppc64 !kfreebsd-amd64 !kfreebsd-i386], libloader-java (>= 1.1.6) [!armel !armhf !hppa !powerpc !powerpcspe !ppc64 !kfreebsd-amd64 !kfreebsd-i386], libformula-java (>= 1.1.7) [!armel !armhf !hppa !powerpc !powerpcspe !ppc64 !kfreebsd-amd64 !kfreebsd-i386], librepository-java (>= 1.1.6) [!armel !armhf !hppa !powerpc !powerpcspe !ppc64 !kfreebsd-amd64 !kfreebsd-i386], libfonts-java (>= 1.1.6) [!armel !armhf !hppa !powerpc !powerpcspe !ppc64 !kfreebsd-amd64 !kfreebsd-i386], libserializer-java (>= 1.1.6) [!armel !armhf !hppa !powerpc !powerpcspe !ppc64 !kfreebsd-amd64 !kfreebsd-i386], libcommons-logging-java (>= 1.1.1-9), libservlet2.5-java, javahelper (>= 0.37~), libnss3-dev (>= 3.12.3), xulrunner-dev [!s390x], dmake (>= 1:4.11), libhunspell-dev (>= 1.1.5-2
 ), libhyphen-dev (>= 2.4), libstlport4.6-dev (>= 4.6.2-3) [i386], libboost-dev (>= 1.38), libmdds-dev (>= 0.5.0), libvigraimpex-dev, libsampleicc-dev, libicc-utils-dev, libwpd-dev (>= 0.9.0), libmythes-dev (>= 2:1.2), libwps-dev (>= 0.2.0), libwpg-dev (>= 0.2.0), libvisio-dev, libcdr-dev, libcmis-dev, liblcms2-dev, libicu-dev (>= 4.0), libcairo2-dev, kdelibs5-dev (>= 4:4.3.4), libqt4-dev (>= 4:4.8), libmysqlclient-dev, libmysqlcppconn-dev (>= 1.1.0~r791), libgtk2.0-dev (>= 2.10), libgtk-3-dev (>= 3.2~), libebook1.2-dev [!armel !armhf !powerpc !powerpcspe !ppc64], libpq-dev (>= 9.0~), libxrandr-dev, 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.70), libgstreamer-plugins-base0.10-dev, libneon27-gnutls-dev, librdf0-dev (>= 1.0.8), libglib2.0-dev (>= 2.15.0), libgconf2-dev, liborbit2-dev, gettext, make (>= 3.81-8.2), libldap2-dev
  Build-Depends-Indep: fdupes, xml-core, imagemagick, 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], libc0.1-dev (= 2.13-26) [kfreebsd-i386 kfreebsd-amd64], nvidia-glx-dev, nvidia-glx-legacy-dev, 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~), qt3-dev-tools, ant (= 1.8.0-1) [hppa kfreebsd-i386 kfreebsd-amd64], ant (= 1.8.0-2) [hppa kfreebsd-i386 kfreebsd-amd64], ant (= 1.8.0-3) [hppa kfreebsd-i386 kfreebsd-amd64], g++-4.6 (= 4.6.1-10), g++-4.6 (= 4.6.1-11), gcc (>= 4:4.7~) [!i386 !amd64 !kfreebsd-i386 !kfreebsd-amd64], g++ (>= 4:4.7~) [!i386 !amd64 !kfreebsd-i386 !kfreebsd-amd64], base-files (= 6.0), base-files (= 6.0squeeze1), libhsqldb-java (>= 1.8.1~)
  Standards-Version: 3.9.1
@@@ -193,7 -193,7 +193,7 @@@ Description: office productivity suite 
  Package: libreoffice-base-core
  Architecture: alpha amd64 hppa i386 ia64 mips mipsel s390 s390x sparc kfreebsd-amd64 kfreebsd-i386
  Depends: libreoffice-core (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
- Replaces: libreoffice-base (<< 1:3.5.2-5)
+ Replaces: libreoffice-base (<< 1:3.5.3~rc2-1)
  Suggests: libreoffice-base
  Description: office productivity suite -- shared library
   LibreOffice is a full-featured office productivity suite that provides
diff --combined rules
index ecaf634,adc3257..bf8be2e
--- a/rules
+++ b/rules
@@@ -61,17 -61,23 +61,23 @@@ export DH_ALWAYS_EXCLUDE=CVS:.svn:.bzr:
  export QUILT_PATCHES=debian/patches
  export QUILT_OPTIONS="-p1 -F0"
  
- GIT_BASEURL:=git://anongit.freedesktop.org/libreoffice
- # NOT in proper libreoffice-3-5 branch
- # use ./g checkout -b tag-libreoffice-3.5.2.2 libreoffice-3.5.2.2
- GIT_TAG=libreoffice-3.5.2.2
- GIT_BRANCH=tag-libreoffice-3.5.2.2
  SOURCE_TREE=.
  STAMP_DIR=debian/stampdir
  TARFILE_LOCATION=$(CURDIR)/src
  export TARFILE_LOCATION
 -USE_SOURCE_TARBALLS=y
 +USE_SOURCE_TARBALLS=n
  USE_GIT_TARBALLS=n
+ ifeq "$(USE_GIT_TARBALLS)" "y"
+ GIT_BASEURL:=git://anongit.freedesktop.org/libreoffice
+ lo_sources_ver=3.5.3.2
+ # NOT in proper libreoffice-3-5 branch
+ # use ./g checkout -b tag-libreoffice-3.5.3.2 libreoffice-3.5.3.2
+ GIT_TAG=libreoffice-$(lo_sources_ver)
+ GIT_BRANCH=tag-libreoffice-$(lo_sources_ver)
+ endif
+ ifeq "$(USE_SOURCE_TARBALLS)" "y"
+ lo_sources_ver=$(shell cat $(CURDIR)/sources.ver | cut -d= -f2)
+ endif
  
  ifeq "$(DISTREL)" "squeeze"
   SQUEEZE_BACKPORT=y
@@@ -149,7 -155,6 +155,7 @@@ SYSTEM_STUFF += ic
  ICU_MINVER= (>= 4.0)
  SYSTEM_STUFF += libwpd libwpg libwps
  SYSTEM_STUFF += libvisio
 +SYSTEM_STUFF += libcdr
  #SYSTEM_STUFF += xmlsec
  BUILD_CAIROCANVAS=y
  SYSTEM_STUFF += cairo
@@@ -182,6 -187,7 +188,6 @@@ ifeq "$(ENABLE_JAVA)" "y
    # It does *NOT* fail with _plain_ saxon 9.0.0.8 built with OOos build.xml
    # for UOF, but still for e.g. M$.
    #SYSTEM_STUFF += saxon
 -  SYSTEM_STUFF += lucene
  endif
  SYSTEM_STUFF += lpsolve
  USE_SHARED_LPSOLVE=y
@@@ -193,7 -199,6 +199,7 @@@ NEON_SECTYPE=gnutl
  NEONSONR=27
  SYSTEM_STUFF += redland
  PACKAGE_SDK=y
 +PACKAGE_SDK_DOCS=y
  ifeq "$(ENABLE_JAVA)" "y"
    ifeq "$(JDK)" "openjdk"
      RUN_MAKE_CHECK=y
@@@ -292,8 -297,6 +298,8 @@@ SYSTEM_STUFF += libpn
  SYSTEM_STUFF += nss
  SYSTEM_STUFF += mozilla-headers
  SYSTEM_STUFF += sampleicc
 +#SYSTEM_STUFF += clucene
 +SYSTEM_STUFF += lcms2
  PACKAGE_UNOWINREG_DLL=y
  ifeq "$(DEB_VENDOR)" "Debian"
  BUILD_UNOWINREG_DLL=y
@@@ -485,7 -488,7 +491,7 @@@ endi
  # Debian Squeeze
  ifeq "$(SQUEEZE_BACKPORT)" "y"
    BUGS=mailto:debian-backports@lists.debian.org
 -  SYSTEM_STUFF := $(filter-out libwpd libwpg libwps mythes mdds libexttextcat graphite jfreereport libvisio poppler libcmis, $(SYSTEM_STUFF))
 +  SYSTEM_STUFF := $(filter-out libwpd libwpg libwps mythes mdds libexttextcat graphite jfreereport libvisio poppler libcmis libcdr, $(SYSTEM_STUFF))
    JUNIT_MIN_VER=
    PARALLEL_BUILD=n
    ENABLE_PDFIMPORT=n
@@@ -514,13 -517,6 +520,13 @@@ endi
  
  ifneq "$(PACKAGE_SDK)" "y"
  	CONFIGURE_FLAGS += --disable-odk
 + ifneq "$(PACKAGE_SDK_DOCS)" "y"
 +	CONFIGURE_FLAGS += --without-doxygen
 + endif
 +else
 +  ifeq "$(PACKAGE_SDK_DOCS)" "y"
 +	BUILD_DEPS += , doxygen
 +  endif
  endif
  
  ifneq "$(ENABLE_MINIMIZER)" "y"
@@@ -567,7 -563,7 +573,7 @@@ ifneq (,$(filter jpeg, $(SYSTEM_STUFF))
         BUILD_DEPS += , libjpeg-dev
  endif
  ifneq (,$(filter libxml, $(SYSTEM_STUFF)))
 -       BUILD_DEPS += , libxml2-dev
 +       BUILD_DEPS += , libxml2-dev, libxml2-utils
         BUILD_DEPS += , libxslt1-dev
         DBG_DBG_SUGGESTS+= , libxslt1-dbg
  endif
@@@ -939,10 -935,6 +945,10 @@@ ifneq (,$(filter sampleicc, $(SYSTEM_ST
  	BUILD_DEPS += , libsampleicc-dev, libicc-utils-dev
  endif
  
 +ifneq (,$(filter clucene, $(SYSTEM_STUFF)))
 +	BUILD_DEPS += , libclucene-dev
 +endif
 +
  ifeq "$(USE_EXTERNAL_CXXLIBS)" "y"
    ifneq (,$(filter libwpd, $(SYSTEM_STUFF)))
  	BUILD_DEPS += , libwpd-dev (>= 0.9.0)
@@@ -962,19 -954,12 +968,19 @@@
    ifneq (,$(filter libvisio, $(SYSTEM_STUFF)))
  	BUILD_DEPS += , libvisio-dev
    endif
 +  ifneq (,$(filter libcdr, $(SYSTEM_STUFF)))
 +	BUILD_DEPS += , libcdr-dev
 +  endif
    ifneq (,$(filter libcmis, $(SYSTEM_STUFF)))
  	BUILD_DEPS += , libcmis-dev
    endif
  endif
  	CONFIGURE_FLAGS += --with-external-thes-dir=$(THES_DIR)
  
 +ifneq (,$(filter lcms2, $(SYSTEM_STUFF)))
 +	BUILD_DEPS += , liblcms2-dev
 +endif
 +
  ifneq (,$(filter icu, $(SYSTEM_STUFF)))
  	BUILD_DEPS += , libicu-dev $(ICU_MINVER)
  endif
@@@ -1067,6 -1052,13 +1073,6 @@@ ifneq "$(BUILD_PYUNO)" "y
  endif
  
  ifeq "$(ENABLE_JAVA)" "y"
 -  ifneq (,$(filter lucene, $(SYSTEM_STUFF)))
 -	BUILD_DEPS += , liblucene2-java (>= 2.3.2)$(OOO_NO_JAVA_ARCHS)
 -	LUCENE_DEPENDS = liblucene2-java (>= 2.3.2)
 -        # safety measure; e.g. lucene 2.9 index cannot be handled by lucene 2.4
 -        LUCENE_CONFLICTS = liblucene2-java (<< $(shell dpkg -l liblucene2-java | grep ^ii | awk '{ print $$3 }' | cut -d. -f1,2)~)
 -	CONFIGURE_FLAGS += --with-lucene-core-jar=/usr/share/java/lucene-core.jar --with-lucene-analyzers-jar=/usr/share/java/lucene-analyzers.jar
 -  endif
    ifneq (,$(filter hsqldb, $(SYSTEM_STUFF)))
  	BUILD_DEPS += , libhsqldb-java $(HSQLDB_MINVER)$(OOO_NO_JAVA_ARCHS)
  	BASE_HSQLDB_DEPENDS = libhsqldb-java $(HSQLDB_MINVER), libhsqldb-java (<< $(HSQLDB_TOONEWVER)~)
@@@ -1612,8 -1604,11 +1618,8 @@@ ifeq "$(BUILD_PYUNO)" "y
  	# then...
  	rm -rf $(SOURCE_TREE)/pyuno-py3
  	cp -ra $(SOURCE_TREE)/pyuno $(SOURCE_TREE)/pyuno-py3
 -	cd $(SOURCE_TREE)/pyuno-py3; \
 -		rm -rf $(shell . $(SOURCE_TREE)/Env.Host.sh; echo $$OUTPATH$$PROEXT); \
 -		. $(CURDIR)/$(SOURCE_TREE)/Env.Host.sh; \
 -		PATH=$(BUILD_PATH) PYTHON=$(PYTHON3) PYTHON_CFLAGS=$(shell pkg-config --cflags python-$(PY3MAJOR).$(PY3MINOR)mu) PYTHON_LIBS=$(shell pkg-config --libs python-$(PY3MAJOR).$(PY3MINOR)mu) \
 -		../solenv/bin/build.pl	# NO DELIVER!
 +	rm -rf pyuno-py3/$(shell make -s cmd cmd="env | grep OUTPATH\= | cut -d= -f2" | grep -v custom)$(shell make -s cmd cmd="env | grep PROEXT\= | cut -d= -f2" | grep -v custom)
 +	$(MAKE) cmd cmd="cd pyuno-py3; PYTHON=$(PYTHON3) PYTHON_CFLAGS=$(shell pkg-config --cflags python-$(PY3MAJOR).$(PY3MINOR)mu) PYTHON_LIBS=$(shell pkg-config --libs python-$(PY3MAJOR).$(PY3MINOR)mu) ../solenv/bin/build.pl"
    endif
  endif
  
@@@ -1669,6 -1664,7 +1675,6 @@@ $(STAMP_DIR)/install: $(STAMP_DIR)/buil
  
  	# install LibreOffice.
  	cd $(SOURCE_TREE)/; \
 -		 . $(CURDIR)/$(SOURCE_TREE)/Env.Host.sh; \
  		 PATH=$(BUILD_PATH) \
  		 DESTDIR=$(CURDIR)/debian/tmp \
  		 $(MAKE) distro-pack-install
@@@ -2129,7 -2125,7 +2135,7 @@@ ifeq "$(ENABLE_JAVA)" "y
  		$(PKGDIR)-officebean/$(shell echo $(OODIR) | sed -e s/lib/share/)/program/classes
  	ln -s $(shell echo /$(OODIR) | sed -e s/lib/share/)/program/classes/officebean.jar \
  		 $(PKGDIR)-officebean/$(OODIR)/program/classes/officebean.jar
- 	mv $(PKGDIR)-core/$(OODIR)/program/libofficebeanlo.so \
+ 	mv $(PKGDIR)-core/$(OODIR)/program/libofficebean.so \
  		$(PKGDIR)-officebean/$(OODIR)/program
  endif
  
@@@ -2184,7 -2180,7 +2190,7 @@@ ifeq "$(BUILD_PYUNO)" "y
  		| sed -e "s/$(PYMAJOR).$(PYMINOR)/$(PY3MAJOR).$(PY3MINOR)/" \
  		> debian/python3-uno/$(OODIR)/program/pythonloader.unorc
  	for i in pyuno.so pythonloader.uno.so libpyuno.so; do \
 -		install -m644 $(SOURCE_TREE)/pyuno-py3/$(shell . $(SOURCE_TREE)/Env.Host.sh; echo $$OUTPATH$$PROEXT)/lib/$$i \
 +		install -m644 $(SOURCE_TREE)/pyuno-py3/$(shell make -s cmd cmd="env | grep OUTPATH\= | cut -d= -f2" | grep -v custom)$(shell make -s cmd cmd="env | grep PROEXT\= | cut -d= -f2" | grep -v custom)/lib/$$i \
  			debian/python3-uno/$(OODIR)/program/$$i; \
  	done
  	cp debian/python-uno/$(OODIR)/program/pythonloader.py \
@@@ -2263,7 -2259,7 +2269,7 @@@ ifeq "$(PACKAGE_SDK)" "y
  
  	# install gsicheck into -dev
  	mkdir -p $(PKGDIR)-dev/$(OODIR)/program
 -	install -m755 $(SOURCE_TREE)/solver/$(shell . $(SOURCE_TREE)/Env.Host.sh; echo $$OUTPATH$$PROEXT)/bin/gsicheck \
 +	install -m755 $(SOURCE_TREE)/solver/$(shell make -s cmd cmd="env | grep OUTPATH\= | cut -d= -f2" | grep -v custom)$(shell make -s cmd cmd="env | grep PROEXT\= | cut -d= -f2" | grep -v custom)/bin/gsicheck \
  		$(PKGDIR)-dev/$(OODIR)/program/gsicheck.bin
  	( \
  	  echo '#! /bin/sh'; \
@@@ -2299,7 -2295,7 +2305,7 @@@ ifeq "$(PACKAGE_SDK)" "y
    ifeq "$(ENABLE_JAVA)" "y"
  	# install the UNO Java sources for e.g. eclipse
  	mkdir -p $(CURDIR)/$(PKGDIR)-dev/usr/share/java
 -	cd $(SOURCE_TREE)/solver/$(shell . $(SOURCE_TREE)/*Env*.sh; echo $$OUTPATH$$PROEXT)/bin && \
 +	cd $(SOURCE_TREE)/solver/$(shell make -s cmd cmd="env | grep OUTPATH\= | cut -d= -f2" | grep -v custom)$(shell make -s cmd cmd="env | grep PROEXT\= | cut -d= -f2" | grep -v custom)/pck && \
  		for i in juh jurt jut ridl unoloader; do \
  			cp $${i}_src.zip \
  			  $(CURDIR)/$(PKGDIR)-dev/usr/share/java; \
@@@ -2353,9 -2349,9 +2359,9 @@@ endi
  #ifeq "$(PACKAGE_SDK)" "y"
  #	# install gengal stuff into -dev
  #	mkdir -p $(PKGDIR)-dev/$(OODIR)/program
 -#	install -m755 $(SOURCE_TREE)/svx/$(shell . $(SOURCE_TREE)/*Env*.sh; echo $$OUTPATH$$PROEXT)/bin/gengal \
 +#	install -m755 $(SOURCE_TREE)/svx/$(shell make -s cmd cmd="env | grep OUTPATH\= | cut -d= -f2" | grep -v custom)$(shell make -s cmd cmd="env | grep PROEXT\= | cut -d= -f2" | grep -v custom)/bin/gengal \
  #		$(PKGDIR)-dev/$(OODIR)/program/gengal
 -#	install -m755 $(SOURCE_TREE)/svx/$(shell . $(SOURCE_TREE)/*Env*.sh; echo $$OUTPATH$$PROEXT)/bin/gengal.bin \
 +#	install -m755 $(SOURCE_TREE)/svx/$(shell make -s cmd cmd="env | grep OUTPATH\= | cut -d= -f2" | grep -v custom)$(shell make -s cmd cmd="env | grep PROEXT\= | cut -d= -f2" | grep -v custom)/bin/gengal.bin \
  #		$(PKGDIR)-dev/$(OODIR)/program/gengal.bin
  #endif
  
@@@ -2740,7 -2736,7 +2746,7 @@@ endi
  #ifeq "$(PACKAGE_SDK)" "y"
  #	# install gengal stuff into -dev
  #	mkdir -p $(PKGDIR)-dev/$(OODIR)/program
 -#	install -m644 $(SOURCE_TREE)/svx/$(shell . $(SOURCE_TREE)/*Env*.sh; echo $$OUTPATH$$PROEXT)/bin/gengalrc \
 +#	install -m644 $(SOURCE_TREE)/svx/$(shell make -s cmd cmd="env | grep OUTPATH\= | cut -d= -f2" | grep -v custom)$(shell make -s cmd cmd="env | grep PROEXT\= | cut -d= -f2" | grep -v custom)/bin/gengalrc \
  #		$(PKGDIR)-common/$(OODIR)/program/gengalrc
  #endif
  	touch $@
@@@ -2886,6 -2882,7 +2892,6 @@@ endi
  		-V'java-common-depends=$(JAVA_COMMON_DEPENDS) $(JAVA_COMMON_DEPENDS_VERSION)' \
  		-V'java-runtime-depends=$(JAVA_RUNTIME_DEPENDS)' \
  		-V'java-gcj-depends=$(JAVA_GCJ_DEPENDS)' \
 -		-V'lucene-depends=$(LUCENE_DEPENDS)' \
  		-V'Binary-Version=$(BINARY_VERSION)' \
  		-V'ooo-binfilter-dep=$(OOO_BINFILTER_DEP)' \
  		-V'ooo-officebean-dep=$(OOO_OFFICEBEAN_DEP)' \
@@@ -2916,7 -2913,7 +2922,7 @@@ endi
  ifeq "$(PACKAGE_BASE)" "y"
    ifeq "$(ENABLE_MYSQLNATIVE)" "y"
  	dh_gencontrol -plibreoffice$(VER)-mysql-connector -- \
 -		-v$(shell grep "<version" $(SOURCE_TREE)/mysqlc/$(shell . $(SOURCE_TREE)/Env.Host.sh; echo $$OUTPATH$$PROEXT)/misc/description.xml | perl -pi -e 's,<version value=\"(.*)\" />,\1,; s/^\s+//; s/\s+$$//')+LibO`echo $(BINARY_VERSION) | cut -d: -f2`
 +		-v$(shell grep "<version" $(SOURCE_TREE)/mysqlc/$(shell make -s cmd cmd="env | grep OUTPATH\= | cut -d= -f2" | grep -v custom)$(shell make -s cmd cmd="env | grep PROEXT\= | cut -d= -f2" | grep -v custom)/misc/description.xml | perl -pi -e 's,<version value=\"(.*)\" />,\1,; s/^\s+//; s/\s+$$//')+LibO`echo $(BINARY_VERSION) | cut -d: -f2`
    endif
  endif
  endif
@@@ -2998,7 -2995,9 +3004,7 @@@ endi
  	dh_compress -i -X.py -X.mk -X.sxd -X.xcd.sample
  	dh_installdeb -i
  ifeq "$(ENABLE_JAVA)" "y"
 -	# the help recommends lucene. this is enough. no need for a hard depend in
 -        # -common, IMHO
 -	jh_depends -i -Xlibreoffice$(VER)-gcj -Xlibreoffice$(VER)-dbg -Xliblucene2-java
 +	jh_depends -i -Xlibreoffice$(VER)-gcj -Xlibreoffice$(VER)-dbg
  endif
  	dh_gencontrol -i $(DEBHELPER_OPTIONS) \
  		-Nlibreoffice$(VER)-report-builder \
@@@ -3013,6 -3012,8 +3019,6 @@@
  		-V'bsh-depends=$(BSH_DEPENDS)' \
  		-V'java-common-depends=$(JAVA_COMMON_DEPENDS)' \
  		-V'java-runtime-depends=$(JAVA_RUNTIME_DEPENDS)' \
 -		-V'lucene-depends=$(LUCENE_DEPENDS)' \
 -		-V'lucene-conflicts=$(LUCENE_CONFLICTS)' \
  		-V'textcat-data-recommends=$(TEXTCAT_DATA_RECOMMENDS)' \
  		-V'Binary-Version=$(BINARY_VERSION)' \
  		-V'ooo-binfilter-dep=$(OOO_BINFILTER_DEP)' \
@@@ -3025,6 -3026,7 +3031,6 @@@ endi
  ifeq "$(ENABLE_MEDIAWIKI)" "y"
  	dh_gencontrol -plibreoffice$(VER)-wiki-publisher -- \
  		-V'mediawiki-jar-depends=$(MEDIAWIKI_JAR_DEPENDS)' \
 -		-V'lucene-depends=$(LUCENE_DEPENDS)' \
  		-V'java-runtime-depends=$(JAVA_RUNTIME_DEPENDS)' \
  		-v$(shell grep "<version" $(SOURCE_TREE)/swext/mediawiki/src/description.xml | perl -pi -e 's,<version value=\"(.*)\"/>,\1,; s/^\s+//')+LibO`echo $(BINARY_VERSION) | cut -d: -f2`
  endif
@@@ -3033,7 -3035,7 +3039,7 @@@ ifeq "$(ENABLE_REPORTDESIGN)" "y
  		-V'base-version=$(BASE_VERSION)' \
  		-V'report-builder-jar-depends=$(REPORT_BUILDER_JAR_DEPENDS)' \
  		-V'java-runtime-depends=$(JAVA_RUNTIME_DEPENDS)' \
 -		-v`echo $(BINARY_VERSION) | cut -d: -f1`:$(shell grep "<version" $(SOURCE_TREE)/reportbuilder/$(shell . $(SOURCE_TREE)/Env.Host.sh; echo $$OUTPATH$$PROEXT)/misc/description.xml | perl -pi -e 's,<version value=\"(.*)\"/>,\1,; s/^\s+//')+LibO`echo $(BINARY_VERSION) | cut -d: -f2`
 +		-v`echo $(BINARY_VERSION) | cut -d: -f1`:$(shell grep "<version" $(SOURCE_TREE)/reportbuilder/$(shell make -s cmd cmd="env | grep OUTPATH\= | cut -d= -f2" | grep -v custom)$(shell make -s cmd cmd="env | grep PROEXT\= | cut -d= -f2" | grep -v custom)/misc/description.xml | perl -pi -e 's,<version value=\"(.*)\"/>,\1,; s/^\s+//')+LibO`echo $(BINARY_VERSION) | cut -d: -f2`
  endif
  	dh_gencontrol -popenoffice.org-dtd-officedocument1.0 -- \
  		-v$(shell echo `echo $(BINARY_VERSION) | cut -d: -f1` + 1 | bc):1.0+LibO`echo $(BINARY_VERSION) | cut -d: -f2`

-- 
LibreOffice packaging repository


Reply to: