[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.2-3-33-gda4004d



The following commit has been merged in the debian-experimental-3.6 branch:
commit da4004d2bd8110a03f00abb3d7efe72b905b8df6
Merge: 1e431e8f9f8b22f636d97296c55b895fe621ff12 8c2526592fc14812aa8797243cfdc034ded49d1b
Author: Rene Engelhard <rene@debian.org>
Date:   Wed Apr 11 15:33:53 2012 +0200

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

diff --combined changelog
index 8372e74,91f2912..c664717
--- a/changelog
+++ b/changelog
@@@ -1,14 -1,19 +1,30 @@@
 +libreoffice (1:3.6.0~alpha0~git20120409-1) UNRELEASED; urgency=low
 +
 +  * new upstream snapshot 
 +
 +  * 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>  Mon, 09 Apr 2012 15:39:15 +0200
 +
+ libreoffice (1:3.5.2-3) unstable; urgency=low
+ 
+   * brown paper bag release;
+     rebuild .dsc/.debian.tar.gz with correct gcc epoch in
+     Build-Conflicts: and with proper arch-qualifiers...
+  
+   * debian/rules:
+     - use gnutls for neon again
+     - disable junit tests on OpenJDK7-using archs, building
+       fails
+     - add ulimit -c unlimited before make check call to catch
+       backtraces on sporatic soffice.bin crashes "failing" the build;
+       build-depend on gdb if RUN_MAKE_CHECK=y
+ 
+  -- Rene Engelhard <rene@debian.org>  Wed, 11 Apr 2012 13:44:02 +0200
+ 
  libreoffice (1:3.5.2-2) unstable; urgency=low
  
    * debian/patches/gcc-4.7{,-i386.-amd64}.diff: backport gcc 4.7 build and
diff --combined control
index 9aa84af,d222d35..7cc37e2
--- 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, 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), python-dev (>= 2.6), python3-dev, debhelper (>= 7.
 2.3~), libcppunit-dev (>= 1.12), 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), mingw-w64 (>= 1.0), 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, libcdr-dev, libcmis-dev, liblcms2-dev, libicu-dev (>= 4.0), libcairo2-dev, kdelibs5-dev (>= 4:4.3.4), libqt4-dev (>= 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-dev, librdf0-dev (>= 1.0.8), libglib2.0-dev (>= 2.15.0), libgconf2-dev, liborbit2-dev, gettext, 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, 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), mingw-w64 (>= 1.0), 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.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, 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, 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, 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), 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), mingw-w64 (>= 1.0), 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-j
 ava (>= 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.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, 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
diff --combined rules
index 70dcef5,1efb297..405362f
--- a/rules
+++ b/rules
@@@ -70,7 -70,7 +70,7 @@@ 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 "$(DISTREL)" "squeeze"
@@@ -149,7 -149,6 +149,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
@@@ -181,6 -180,7 +181,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
@@@ -188,11 -188,10 +188,11 @@@ LPSOLVE_MIN_VERSION= (>= 5.5.0.13-5+b1
  USE_DBUS=y
  USE_GSTREAMER=y
  SYSTEM_STUFF += neon
- NEON_SECTYPE=openssl
+ NEON_SECTYPE=gnutls
  NEONSONR=27
  SYSTEM_STUFF += redland
  PACKAGE_SDK=y
 +PACKAGE_SDK_DOCS=y
  ifeq "$(ENABLE_JAVA)" "y"
    ifeq "$(JDK)" "openjdk"
      RUN_MAKE_CHECK=y
@@@ -206,6 -205,9 +206,9 @@@
      else
        ENABLE_JUNIT4=n
      endif
+     ifeq "$(JAVA_MAINVER)" "7"
+       ENABLE_JUNIT4=n
+     endif
    endif
  else
    RUN_MAKE_CHECK=n
@@@ -291,8 -293,6 +294,8 @@@ SYSTEM_STUFF += libpn
  SYSTEM_STUFF += nss
  SYSTEM_STUFF += mozilla-headers
  SYSTEM_STUFF += sampleicc
 +#SYSTEM_STUFF += clucene
 +SYSTEM_STUFF += lcms2
  
  # Default flags to pass to configure
  CONFIGURE_FLAGS= \
@@@ -468,7 -468,7 +471,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
@@@ -491,13 -491,6 +494,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"
@@@ -544,7 -537,7 +547,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
@@@ -659,6 -652,7 +662,7 @@@ ifneq (,$(filter cppunit, $(SYSTEM_STUF
  	BUILD_DEPS += , libcppunit-dev (>= 1.12)
  endif
  ifeq "$(RUN_MAKE_CHECK)" "y"
+ 	BUILD_DEPS += , gdb
    ifeq "$(ENABLE_JUNIT4)" "y"
  	BUILD_DEPS += , junit4 $(JUNIT_MIN_VER)
    else
@@@ -913,10 -907,6 +917,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)
@@@ -936,19 -926,12 +940,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
@@@ -1041,6 -1024,13 +1045,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)~)
@@@ -1578,7 -1568,11 +1582,7 @@@ 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!
 +	$(MAKE) pyuno-py3
    endif
  endif
  
@@@ -1605,6 -1599,7 +1609,7 @@@ endi
  		export TMPDIR=$$t; \
  		export HOME=$$t; \
  		export SAL_USE_VCLPLUGIN="svp"; \
+ 		if [ -x /usr/bin/gdb ]; then ulimit -c unlimited; fi && \
  		$(MAKE) check gb_FULLDEPS= gb_Deliver_HARDLINK=T && \
  	rm -rf $$t
  
@@@ -1635,6 -1630,7 +1640,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
@@@ -2144,7 -2140,7 +2149,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="echo $$OUTPATH$$PROEXT" | grep -v "^custom cmd")/lib/$$i \
  			debian/python3-uno/$(OODIR)/program/$$i; \
  	done
  	cp debian/python-uno/$(OODIR)/program/pythonloader.py \
@@@ -2219,7 -2215,7 +2224,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="echo $$OUTPATH$$PROEXT" | grep -v "^custom cmd")/bin/gsicheck \
  		$(PKGDIR)-dev/$(OODIR)/program/gsicheck.bin
  	( \
  	  echo '#! /bin/sh'; \
@@@ -2842,6 -2838,7 +2847,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)' \
@@@ -2872,7 -2869,7 +2877,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="echo $$OUTPATH$$PROEXT" | grep -v "^custom cmd")/misc/description.xml | perl -pi -e 's,<version value=\"(.*)\" />,\1,; s/^\s+//; s/\s+$$//')+LibO`echo $(BINARY_VERSION) | cut -d: -f2`
    endif
  endif
  endif
@@@ -2955,7 -2952,9 +2960,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 \
@@@ -2970,6 -2969,8 +2975,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)' \
@@@ -2982,6 -2983,7 +2987,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
@@@ -2990,7 -2992,7 +2995,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="echo $$OUTPATH$$PROEXT" | grep -v "^custom cmd")/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: