The following commit has been merged in the debian-experimental-3.6 branch:
commit f9517bff807832a5c1c62fa5724332fa1573ac5f
Merge: 519411cd90a17a0fe102761f7db4af1452608ec1
6947704dab4d1f976933e9eea119b2f827bf1fda
Author: Rene Engelhard <r...@debian.org>
Date: Sat Apr 14 21:40:57 2012 +0200
Merge remote branch 'origin/master' into debian-experimental-3.6
diff --combined changelog
index 5d1d3a6,3e9e736..1a22875
--- a/changelog
+++ b/changelog
@@@ -1,22 -1,40 +1,53 @@@
+libreoffice (1:3.6.0~alpha0~git20120409-1) UNRELEASED; urgency=low
+
+ * new upstream snapshot
+ - fixes splashscreen location in multi-monitor setups
+ (closes: #657444, #431473)
+
+ * 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 <r...@debian.org> Mon, 09 Apr 2012 15:39:15 +0200
+
libreoffice (1:3.5.2-4) UNRELEASED; urgency=low
* debian/patches/icu-4.9.diff: backport fix from libreoffice-3-5
for ICU >= 4.9 support
+ * debian/patches/fix-system-lpsolve-build.diff: use -Wl$(COMMA)-rpath as
+ otherwise gbuild strips everything after the , away;
+ makes it actually set the rpath and fixes gcc 4.7 build
+ * debian/patches/tests-fix-build-with-jdk7.diff: fix tests (connecticity
+ and dbaccess) build with OpenJDK7 for some modules, thanks Douglas Mencken
+ for the hint. Not complete yet so this disables sfx2,sw,unoxml tests for
+ jdk7
+ * debian/patches/gcc-4.7.diff: add also fix for sal/qa/osl/osl_Mutex.cxx
+ * debian/patches/disable-sc-sw-unoapi-subsequentcheck-for-now.diff: move ..
+ * debian/patches/disable-unoapi-subsequentcheck-for-now.diff: ... here and
+ disable all unoapi tests, still too flaky (should be better in master...)
- -- Rene Engelhard <r...@debian.org> Wed, 11 Apr 2012 20:04:43 +0200
+ * debian/rules:
+ - readd gcc-$(GCC_VERSION), g++-$(GCC_VERSION) build-deps if
+ GCC_VERSION != ""....
+ - actually add epoch to libqt4-dev builddeps...
+ - revert JDK7 test workaround from last upload again
+ - build-depend on make >= 3.81-8.2 instead of 3.82 now that sid is also
fixed;
+ PARALLEL_BUILD=y again
+ * debian/python{,3}-uno.preinst.in: only run extension stuff when upgrading
+ from version where the extension was here ...
+ * debian/libreoffice-script-provider-python.preinst.in: ... and copy
+ (old version) here
+ * debian/control.in:
+ - readd libreoffice-core (<< 1:3.5~), libreoffice-common (<< 1:3.5~)
+ conflicts again (lost when moved to -script-provider-python) to help
+ upgrades (closes: #666523)
+ - make libreoffice-core Pre-Depend on ure
+ * debian/debian/shell-lib-extensions.sh: run unopkg list before trying
+ to sync; hopefully catches cases where unopkg doesn't (yet) work
+ (closes: #668193)
+
+ -- Rene Engelhard <r...@frodo.fritz.box> Sat, 14 Apr 2012 21:27:11 +0200
libreoffice (1:3.5.2-3) unstable; urgency=low
diff --combined control
index 7cc37e2,b8d51f7..3f623dc
--- 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 <r...@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), 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: 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: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, 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, 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: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-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
@@@ -89,7 -89,8 +89,8 @@@ Description: office productivity suite
Package: libreoffice-core
Architecture: alpha amd64 armel armhf hppa i386 ia64 mips mipsel powerpc
powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386
- Depends: libreoffice-common (>> ${base-version}), fonts-opensymbol |
ttf-opensymbol (>= 1:3.0), ${shlibs:Depends}, ure (>= 1.5.1+OOo3.1.1-15),
fontconfig, ${misc:Depends}
+ Depends: libreoffice-common (>> ${base-version}), fonts-opensymbol |
ttf-opensymbol (>= 1:3.0), ${shlibs:Depends}, fontconfig, ${misc:Depends}
+ Pre-Depends: ure (>= 1.5.1+OOo3.1.1-15)
Conflicts: libreoffice-calc (<< ${binary:Version}), libreoffice-writer (<<
${binary:Version}), libreoffice-impress (<< ${binary:Version}),
libreoffice-draw (<< ${binary:Version}), libreoffice-base (<<
${binary:Version}), libreoffice-gtk (<< ${binary:Version}), libreoffice-gnome
(<< ${binary:Version}), libreoffice-kde (<< ${binary:Version}),
libreoffice-evolution (<< ${binary:Version}), libreoffice-filter-so52 (<<
${binary:Version}), libreoffice-officebean (<< ${binary:Version}),
libreoffice-dev (<< ${binary:Version}), libreoffice-style-crystal (<<
1:3.3.0-1), libreoffice-style-oxygen (<< 1:3.3.0-1), libreoffice-style-tango
(<< 1:3.3.0-1), libreoffice-style-hicontrast (<< 1:3.3.0-1),
libreoffice-style-galaxy (<< 1:3.3.0-1), libreoffice-style-andromeda (<<
1:3.3.0-1), libcairo2 (= 1.4.8-1), libicu38 (= 3.8~d01-1), cli-uno-bridge (<<
1:3.0.0~dev300m22), cacao-oj6-jre, mozilla-plugin-vlc (<< 1.0)
Breaks: myspell-ru (<< 0.99g5-8.1), myspell-lv (<< 0.7.3-3.1), myspell-et (<<
1:20030606-12.1), myspell-fi (<< 0.7-17.2), myspell-cs-cz (<< 20040229-4.1),
myspell-el-gr (<< 0.3-1.1), myspell-nn (<< 2.0.10-3.1), myspell-nb (<<
2.0.10-3.1), hunspell-ar (<< 0.0.0+20080110-1.1), myspell-hu (<< 0.99.4-1.2),
hunspell-gl-es (<< 2.2a-6), myspell-gv (<< 0.50-8), myspell-en-au (<< 2.1-5),
myspell-fa (<< 0.20070816-2), hunspell-uz (<< 0.6-3.1), hunspell-ko (<<
0.3.3-1), hunspell-se (<< 1.0~beta6.20081222-1.1), hunspell-de-med (<<
20090825-1), hunspell-en-us (<< 20070829-3), myspell-sv-se (<< 1.3.8-6-2.2),
myspell-sk (<< 0.5.5a-2.1), myspell-fo (<< 0.2.36-3), myspell-nl (<< 1:1.10-3),
myspell-pt-br (<< 2009.03.30-1.1), myspell-pl (<< 20090830-1), myspell-pt-pt
(<< 20090309-1.1), myspell-ga (<< 2.0-19), myspell-gd (<< 0.50-7), myspell-ku
(<< 0.20.0-1.1), myspell-hr (<< 20060617-2), myspell-fr-gut (<< 1:1.0-26.1),
myspell-eo (<< 2.1.2000.02.25-41), myspell-de-de-oldspell (<< 1:2-25.1), m
yspell-da (<< 1.6.18-1.1), myspell-es (<< 1.10-7), myspell-de-at (<<
20071211-2), myspell-de-ch (<< 20071211-2), myspell-de-de (<< 20071211-2),
hunspell-de-at (<< 20071211-2), hunspell-de-ch (<< 20071211-2), hunspell-de-de
(<< 20071211-2), myspell-ca (<< 0.6-8), myspell-tl (<< 0.4-0-5), myspell-ne (<<
1.0-4.1), myspell-fr (<< 1.4-25), myspell-hy (<< 0.10.1-1.1), myspell-en-us (<<
1:3.1.0-3), myspell-en-gb (<< 1:3.1.0-3), myspell-en-za (<< 1:3.1.0-3),
myspell-af (<< 1:3.1.0-3), myspell-it (<< 1:3.1.0-3), myspell-sw (<<
1:3.1.0-3), myspell-th (<< 1:3.1.0-3), hunspell-en-ca (<< 1:3.1.0-3),
hunspell-ne (<< 1:3.1.0-3), hunspell-da (<< 1:3.1.0-3), hunspell-fr (<<
1:3.1.0-3), hunspell-vi (<< 1:3.1.0-3), hunspell-hu (<< 1:3.1.0-3), hunspell-sr
(<< 1:3.1.0-3), hunspell-sh (<< 1:3.1.0-3), myspell-lv (<< 0.7.3-3.1),
myspell-et (<< 1:20030606-12.1), myspell-nn (<< 2.0.10-3.1), myspell-nb (<<
2.0.10-3.1), libreoffice-filter-binfilter (<< 1:3.4.1~), libreoffice-evolution
(<< 1:3.4.1~), li
breoffice-kab (<< 1:3.4.1~), libreoffice-sdbc-postgresql (<< 0.8.1~),
mozilla-libreoffice (<< 1:3.5.0~beta~)
Provides: libreoffice-bundled
@@@ -360,7 -361,7 +361,7 @@@ Section: pytho
Architecture: alpha amd64 armel armhf hppa i386 ia64 mips mipsel powerpc
powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386
Enhances: libreoffice
Depends: libreoffice-core (= ${binary:Version}), ${python:Depends},
${shlibs:Depends}, ${misc:Depends}
- Conflicts: python3-uno
+ Conflicts: python3-uno, libreoffice-core (<< 1:3.5~), libreoffice-common (<<
1:3.5~)
Description: Python-UNO bridge
The Python-UNO bridge allows use of the standard LibreOffice API
with the Python scripting language. It additionally allows
diff --combined patches/fix-system-lpsolve-build.diff
index 6c6ad17,531d238..1737924
--- a/patches/fix-system-lpsolve-build.diff
+++ b/patches/fix-system-lpsolve-build.diff
@@@ -2,17 -2,17 +2,17 @@@ diff --git a/configure.in b/configure.i
index d9d28ff..4fcbe7c 100644
--- libreoffice-3.5.0/configure.in
+++ libreoffice-3.5.0/configure.in
-@@ -6474,8 +6474,9 @@ if test -n "$with_system_lpsolve" -o -n
"$with_system_libs" && \
+@@ -7982,8 +7982,9 @@
# some systems need this. Like Ubuntu....
AC_CHECK_LIB(m, floor)
AC_CHECK_LIB(dl, dlopen)
+ AC_CHECK_LIB(colamd, colamd)
- AC_CHECK_LIB(lpsolve55, make_lp, ,
+ AC_CHECK_LIB([lpsolve55], [make_lp], [:],
- [ AC_MSG_ERROR(lpsolve library not found or too old.)], [])
+ [ AC_MSG_ERROR(lpsolve library not found or too old.)],
[-L/usr/lib/lpsolve])
- MINGW_EXTERNAL_DLLS="$MINGW_EXTERNAL_DLLS lpsolve55.dll"
+ LIBS=$save_LIBS
+ libo_MINGW_CHECK_DLL([LPSOLVE], [lpsolve55])
else
- AC_MSG_RESULT([internal])
diff --git a/solenv/inc/libs.mk b/solenv/inc/libs.mk
index 91161f1..eb9885e 100644
--- libreoffice-3.5.0/solenv/inc/libs.mk
@@@ -41,7 -41,7 +41,7 @@@ index ba9493a..93874b4 10064
+ifeq ($(SYSTEM_LPSOLVE),YES)
+$(eval $(call gb_Library_add_ldflags,solver, \
- + /usr/lib/lp_solve/liblpsolve55.so -Wl,-rpath=/usr/lib/lp_solve \
+ + /usr/lib/lp_solve/liblpsolve55.so -Wl$(COMMA)-rpath=/usr/lib/lp_solve \
+))
+else
$(eval $(call gb_Library_use_external,solver,lpsolve55))
diff --combined patches/series
index d7dae3c,cdea811..6f01600
--- a/patches/series
+++ b/patches/series
@@@ -8,6 -8,7 +8,6 @@@ rhino-build-optional.dif
disable-dynamic-list-cpp.diff
fix-system-lpsolve-build.diff
install-fixes.diff
-smoketest-only-en-US.diff
mention-java-common-package.diff
help-msg-add-package-info.diff
sensible-lomua.diff
@@@ -18,10 -19,20 +18,12 @@@ mysqlcppconn-mysqlclient-SONAME.dif
make-pyuno-work-with-system-wide-module-install.diff
search-usr-share-for-images.diff
make-package-modules-not-suck.diff
-fix-ARM-detection-in-set-soenv.diff
add-debian-multiarch-support.diff
- disable-sc-sw-unoapi-subsequentcheck-for-now.diff
+ propagate-gb_FULLDEPS.diff
+ disable-unoapi-subsequentcheck-for-now.diff
mediwiki-oor-replace.diff
-armhf-bridges.diff
-armhf-bridges-fix-armv4t-armel.diff
-move-binfilter-mimetypes-in-extra-desktop-file.diff
pythonloader.uno.so-libpyuno-and-pyuno-are-duplicate.diff
-armhf-bridges-doubles.diff
debian-hardened-buildflags.diff
gtk3-hack-explicit-gmodule.diff
-gcc-4.7.diff
-gcc-4.7-i386.diff
-gcc-4.7-amd64.diff
-icu-4.9.diff
+pyuno-py3-module.diff
+ tests-fix-build-with-jdk7.diff
diff --combined rules
index 405362f,f02688e..7df41d1
--- 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
@@@ -158,9 -157,10 +158,10 @@@ BUILD_KDE=
# not ported to KDE 4
ENABLE_KDEAB=n
ifeq "$(SYSTEM_GCC_VERSION)" "4.7"
- QT_MINVER= (>= 4.8)
+ # < 4.8 fails with gcc 4.7, see #667911
+ QT_MINVER= (>= 4:4.8)
else
- QT_MINVER= (>= 4.5)
+ QT_MINVER= (>= 4:4.5)
endif
KDELIBS_MINVER= (>= 4:4.3.4)
BUILD_DBG_PACKAGE=y
@@@ -181,6 -181,7 +182,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
@@@ -192,7 -193,6 +193,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
@@@ -206,9 -206,6 +207,6 @@@
else
ENABLE_JUNIT4=n
endif
- ifeq "$(JAVA_MAINVER)" "7"
- ENABLE_JUNIT4=n
- endif
endif
else
RUN_MAKE_CHECK=n
@@@ -222,7 -219,7 +220,7 @@@ CURL_SECTYPE=gnutl
USE_SYSTEM_DMAKE=y
USE_LIBSUITESPARSE=y
SUITESPARSE_MIN_VERSION= (>= 1:3.4.0)
- PARALLEL_BUILD=n
+ PARALLEL_BUILD=y
ENABLE_LDAP=y
USE_OPENLDAP=y
ENABLE_OPENGL=y
@@@ -294,8 -291,6 +292,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= \
@@@ -471,7 -466,7 +469,7 @@@ endi
# Debian Squeeze
ifeq "$(SQUEEZE_BACKPORT)" "y"
BUGS=mailto:debian-backpo...@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
@@@ -481,6 -476,12 +479,12 @@@ CONFIGURE_FLAGS += $(foreach i, $(SYSTE
CC_PREFIX:=$(shell gcc -dumpmachine)-
+ ifneq "$(GCC_VERSION)" ""
+ ifneq "$(SYSTEM_GCC_VERSION)" "$(GCC_VERSION)"
+ BUILD_DEPS += , gcc-$(GCC_VERSION), g++-$(GCC_VERSION)
+ endif
+ endif
+
BUILDDEB_OPTIONS = -- -Zbzip2
ifneq "$(OOO_OGLTRANS_ARCHS)" ""
@@@ -494,13 -495,6 +498,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"
@@@ -547,7 -541,7 +551,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
@@@ -917,10 -911,6 +921,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)
@@@ -940,19 -930,12 +944,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
@@@ -1045,6 -1028,13 +1049,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)~)
@@@ -1150,7 -1140,7 +1154,7 @@@ NUM_CPUS=$(shell echo "$(DEB_BUILD_OPTI
AVAIL_CPUS := $(shell getconf _NPROCESSORS_ONLN 2>/dev/null || echo 1)
ifeq "$(PARALLEL_BUILD)" "y"
# http://bugs.debian.org/622644
- BUILD_DEPS += , make (>= 3.82)
+ BUILD_DEPS += , make (>= 3.81-8.2)
ifneq "$(NUM_CPUS)" "$(AVAIL_CPUS)"
CONFIGURE_FLAGS += --with-num-cpus=$(NUM_CPUS)
endif
@@@ -1582,7 -1572,11 +1586,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
@@@ -1640,6 -1634,7 +1644,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
@@@ -2149,7 -2144,7 +2153,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 \
@@@ -2224,7 -2219,7 +2228,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'; \
@@@ -2847,6 -2842,7 +2851,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)' \
@@@ -2877,7 -2873,7 +2881,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
@@@ -2941,7 -2937,6 +2945,6 @@@ ifeq "$(PACKAGE_SDK)" "y
perl -pi -e 's,html/,html /,g'
debian/libreoffice-dev-doc.doc-base.udk-common-ref
endif
dh_installdocs -i -A debian/README.Debian
- # note libreoffice.1 is already installed into -common by
libreoffice-builds package-ooo
dh_installman -i
for i in `find $(PKGDIR)-common -type l -name "lo*.1"`; do \
mv $$i $$i.gz; \
@@@ -2960,7 -2955,9 +2963,7 @@@
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 \
@@@ -2975,6 -2972,8 +2978,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)' \
@@@ -2987,6 -2986,7 +2990,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
@@@ -2995,7 -2995,7 +2998,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
--
To UNSUBSCRIBE, email to debian-openoffice-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1sj8sh-0008r5...@vasks.debian.org
