[SCM] LibreOffice packaging repository branch, debian-experimental-3.5, updated. libreoffice_3.4.3-4-91-gd071d15
The following commit has been merged in the debian-experimental-3.5 branch:
commit 8965e0709e821c95e9f6a00871cfe232c2994c14
Merge: 1789703eaa3527608e4a6b116bf8351259150bcd 5b75815566494001da677c0a3cb84cd2dbf6a898
Author: Rene Engelhard <rene@debian.org>
Date: Tue Nov 8 00:28:35 2011 +0000
Merge remote branch 'origin/master' into debian-experimental-3.5
Conflicts:
changelog
patches/autogen.diff
patches/series
patches/update-sdbc-postgresql.diff
rules
diff --combined changelog
index f839b12,66fbb44..1884349
--- a/changelog
+++ b/changelog
@@@ -1,29 -1,29 +1,55 @@@
+libreoffice (1:3.5.0~alpha0~git20111108-1) UNRELEASED; urgency=low
+
+ * new upstream snapshot
+
+ * use "core" sources, no libreoffice-build anymore.
+
+ * debian/patches/*: move from patches/hotfixes to patch the code
+ directly without libreoffice-build
+
+ * debian/rules, debian/vars.*, debian/*.links.in:
+ - loads of updates for new envfile name and gone LIBSUFFIX
+ * debian/rules:
+ - enable new build against Gtk3
+ - bump python b-d to >= 2.6 as we don't work with earlier anymore.
+ Also build python3-uno
+ - add new conditionals and build-deps for new libvisio,librsvg,gettext,
+ libcmis usage and libexttextcat switch - and those we needed to move
+ from libreoffice-builds' distro-configs
+ - run new "make check" instead of solenv/bin/subsequenttests and
+ manual smoketest
+ * debian/rules, debian/control.in:
+ - move from self-defined UPSTREAM_VERSION/ARCH etc. to use
+ /usr/share/dpkg/*.mk
+
+ -- Rene Engelhard <rene@debian.org> Tue, 08 Nov 2011 00:29:34 +0100
+
+ libreoffice (1:3.4.4~rc2-1) UNRELEASED; urgency=low
+
+ * New upstream release
+ - repackage liblayout and seamonkey in ext-sources to remove
+ RFC/I-Ds (closes: #645753)
+
+ * debian/patches/update-sdbc-postgresql.diff: update to 0.8.1
+ * debian/patches/update-libreoffice.1.diff: update libreoffice.1 for
+ new long parameters (closes: #646800)
+
+ * debian/rules:
+ - don't try to use internal jfreereport on ia64; disable the SRB
+ instead.
+ - fix USE_SYSTEM_TEXTCAT_DATA for squeeze
+ - change debug in DEB_BUILD_OPTIONS not to do -g only but also
+ --enable-debug
+ * debian/watch:
+ - point to libreoffice-bootstrap-(\d.\d.\d).\d.tar.bz2 in debian/watch;
+ does not suffice but we should reference the source and not binaries
+ * debian/rules, debian/*.menu.in:
+ - also add icon version to debian menus (closes: #645953)
+ * debian/control.in:
+ - remove suggests on menu (closes: #647371)
+
+ -- Rene Engelhard <rene@debian.org> Mon, 07 Nov 2011 23:21:51 +0100
+
libreoffice (1:3.4.3-4) unstable; urgency=low
* debian/patches/poppler-0.17.x.diff: backport patches from master to
diff --combined control
index 2212cb6,85691ef..22c0a4e
--- a/control
+++ b/control
@@@ -3,8 -3,8 +3,8 @@@ Section: editor
Priority: optional
Maintainer: Debian LibreOffice Maintainers <debian-openoffice@lists.debian.org>
Uploaders: Rene Engelhard <rene@debian.org>
-Build-Depends: 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, 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, po-debconf, bc, wget | curl, libgl1-mesa-dev [!armel !mips !mipsel], libglu1-mesa-dev [!armel !mips !mipsel], libpoppler-dev (>= 0.8.0), libpoppler-cpp-dev, libgraphite2-dev (>= 0.9.3) [!armel !sparc], libtextcat-dev (>= 2.2-8), libcurl4-gnutls-dev, libssl-dev, libdb-dev, dpkg-dev (>= 1.15.6), python (>= 2.6.6-3+squeeze4), python-dev, debhelper (>= 7.2.3~), libcppunit-dev (>= 1.12), openjdk-6-jdk (>= 6b23~pre8-2) [alpha amd64 armel armh
f 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, libservlet2.5-java, libbase-java [!armel], libsac-java [!armel], libxml-java (>= 1.1.6) [!armel], libflute-java (>= 1.1.6) [!armel], libpentaho-reporting-flow-engine-java (>= 0.9.4) [!armel], liblayout-java (>= 0.2.10) [!armel], libloader-java (>= 1.1.6) [!armel], libformula-java (>= 1.1.7) [!armel], librepository-java (>= 1.1.6) [!armel], libfonts-java (>= 1.1.6) [!armel], libserializer-java (>= 1.1.6) [!armel], libcommons-logging-java, libservlet2.5-java, javahelper (>= 0.37~), xulrunner-dev, libnss3-dev (>= 3.12.3), dmake (>= 1:4.11), mono-devel (>= 2.4.2.3) [amd64 i386 i
a64 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 (>= 0.5.0), 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], 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.60), libgstreamer-plugins-base0.10-dev, libneon27-gnutls-dev, lib
rdf0-dev (>= 1.0.8), libgtk2.0-dev (>= 2.10), libgnomevfs2-dev, libgconf2-dev, liborbit2-dev, libldap2-dev
-Build-Depends-Indep: fdupes, xml-core, imagemagick, fontforge, translate-toolkit (>= 1.9)
+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, git, rsync, libgl1-mesa-dev [!armel !mips !mipsel], libglu1-mesa-dev [!armel !mips !mipsel], libpoppler-dev (>= 0.8.0), libpoppler-cpp-dev, libpoppler-cpp-dev, libgraphite2-dev (>= 0.9.3) [!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), tcsh, 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, libservlet2.5-java, libbase-java [!armel], libsac-java [!armel], libxml-java (>= 1.1.6) [!armel], libflute-java (>= 1.1.6) [!armel], libpentaho-reporting-flow-engine-java (>= 0.9.4) [!armel], liblayout-java (>= 0.2.10) [!armel], libloader-java (>= 1.1.6) [!armel], libformula-java (>= 1.1.7) [!armel], librepository-java (>= 1.1.6) [!armel], libfonts-java (>= 1.1.6) [!armel], libserializer-java (>= 1.1.6) [!armel], libcommons-logging-java, libservlet2.5-java, javahelper (>= 0.37~), libnss3-dev (>= 3.12.3), x
ulrunner-dev, 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, 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), libgtk-3-dev (>= 3.2~), libebook1.2-dev [!armel], 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.60), libgstreamer-plugins-base0.10-dev, libneon27-gnutls-dev, librdf0-dev (>= 1.0.8), libgtk2.0-dev (>= 2.10), libgnomevfs2-dev, 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], 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~), 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), base-files (= 6.0), base-files (= 6.0squeeze1), libhsqldb-java (>= 1.8.1~)
Standards-Version: 3.9.1
XS-Python-Version: current
@@@ -17,7 -17,7 +17,7 @@@ Package: libreoffic
Architecture: alpha amd64 armel armhf hppa i386 ia64 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386
Depends: libreoffice-core (= ${binary:Version}), libreoffice-writer, libreoffice-calc, libreoffice-impress, libreoffice-draw, libreoffice-math, libreoffice-base [!armel], libreoffice-report-builder-bin [!armel], ttf-dejavu, ttf-sil-gentium-basic, libreoffice-filter-mobiledev, ${lucene-depends}, ${java-common-depends}, ${misc:Depends}
Recommends: ttf-liberation | ttf-mscorefonts-installer, libpaper-utils
- Suggests: hunspell-dictionary, myspell-dictionary, libreoffice-help-${help-l10n-virtual-version}, libreoffice-l10n-${help-l10n-virtual-version}, menu, unixodbc, cups-bsd, libsane, hyphen-hyphenation-patterns, mythes-thesaurus, libxrender1, libgl1, libreoffice-gnome | libreoffice-kde, iceweasel | firefox | icedove | thunderbird | iceape-browser | mozilla-browser, ${java-runtime-depends}, openclipart-libreoffice, pstoedit, imagemagick | graphicsmagick-imagemagick-compat, ${gstreamer-plugins-suggests}, ${libldap-suggests}, ${ooo-binfilter-dep}, ${ooo-officebean-dep}
+ Suggests: hunspell-dictionary, myspell-dictionary, libreoffice-help-${help-l10n-virtual-version}, libreoffice-l10n-${help-l10n-virtual-version}, unixodbc, cups-bsd, libsane, hyphen-hyphenation-patterns, mythes-thesaurus, libxrender1, libgl1, libreoffice-gnome | libreoffice-kde, iceweasel | firefox | icedove | thunderbird | iceape-browser | mozilla-browser, ${java-runtime-depends}, openclipart-libreoffice, pstoedit, imagemagick | graphicsmagick-imagemagick-compat, ${gstreamer-plugins-suggests}, ${libldap-suggests}, ${ooo-binfilter-dep}, ${ooo-officebean-dep}
Description: office productivity suite
LibreOffice is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
@@@ -43,7 -43,6 +43,6 @@@
QuickStarter for GNOMEs notification are
* libreoffice-gnome: GNOME VFS, GConf backend
* libreoffice-kde: KDE UI Plugin and KDE File Picker support
- * menu: Will add libreoffice menu entries for every Debian window manager.
* unixodbc: ODBC database support
* cups-bsd: Allows LibreOffice to detect your CUPS printer queues
automatically
@@@ -91,7 -90,7 +90,7 @@@ Package: libreoffice-cor
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}), ttf-opensymbol (>= 1:3.0), ${shlibs:Depends}, ure (>= 1.5.1+OOo3.1.1-15), fontconfig, ${mozilla-nss-depends}, ${misc:Depends}
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~)
+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~)
Provides: libreoffice-bundled
Replaces: libreoffice-calc (<< 1:3.3.2-5)
Description: office productivity suite -- arch-dependent files
@@@ -308,19 -307,6 +307,19 @@@ Description: office productivity suite
with Gtk+ and a Gtk/GNOMEish File Picker when running under GNOME. It
also contains a QuickStarter for the "notification area".
+Package: libreoffice-gtk3
+Architecture: alpha amd64 armel armhf hppa i386 ia64 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386
+Depends: libreoffice-core (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
+Recommends: libreoffice-style-tango
+Section: gnome
+Enhances: libreoffice
+Description: office productivity suite -- GTK+ 3.0 integration
+ LibreOffice is a full-featured office productivity suite that provides
+ a near drop-in replacement for Microsoft(R) Office.
+ .
+ This package contains the Gtk plugin for drawing LibreOffices widgets
+ with Gtk+ 3.0
+
Package: libreoffice-gnome
Architecture: alpha amd64 armel armhf hppa i386 ia64 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386
Depends: libreoffice-core (= ${binary:Version}), libreoffice-gtk, gconf2, ${shlibs:Depends}, ${misc:Depends}
@@@ -359,23 -345,6 +358,23 @@@ 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
+Description: Python-UNO bridge
+ The Python-UNO bridge allows use of the standard LibreOffice API
+ with the Python scripting language. It additionally allows
+ others to develop UNO components in Python, thus Python UNO components
+ may be run within the LibreOffice process and can be called from C++
+ or the built in StarBasic scripting language.
+Homepage: http://udk.openoffice.org/python/python-bridge.html
+
+Package: python3-uno
+Provides: ${python:Provides}, libreoffice-script-provider-python
+XB-Python-Version: ${python:Versions}
+Section: python
+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: python-uno
Description: Python-UNO bridge
The Python-UNO bridge allows use of the standard LibreOffice API
with the Python scripting language. It additionally allows
@@@ -3109,6 -3078,77 +3108,6 @@@ Description: office productivity suite
.
This package has NO effect with Suns/Blackdowns/IBMs/etc. JDK.
-Package: cli-uno-bridge
-Section: cli-mono
-Architecture: amd64 i386 ia64 kfreebsd-amd64 kfreebsd-i386
-Depends: ${shlibs:Depends}, libreoffice-core (>> ${base-version}), libuno-cli-basetypes1.0-cil, libuno-cli-uretypes1.0-cil, libuno-cli-oootypes1.0-cil, libuno-cli-cppuhelper1.0-cil, libuno-cli-ure1.0-cil, ${cli:Depends}, ${misc:Depends}
-Conflicts: libuno-cil, libuno-cli-types1.1-cil
-Provides: libuno-cil
-Replaces: libuno-cil
-Description: LibreOffice bindings for Mono CLI
- LibreOffice is a full-featured office productivity suite that provides
- a near drop-in replacement for Microsoft(R) Office.
- .
- This package contains the CLI bindings to LibreOffice for
- accessing the LibreOffice API from Mono languages (e.g. C# and Boo) and
- for using Mono for components.
-
-Package: libuno-cli-basetypes1.0-cil
-Section: cli-mono
-Architecture: all
-Depends: ${cli:Depends}, ${misc:Depends}
-Description: LibreOffice bindings for Mono CLI -- base types
- LibreOffice is a full-featured office productivity suite that provides
- a near drop-in replacement for Microsoft(R) Office.
- .
- This package contains cli_basetypes.dll, which, as the name implies, provides
- some base types.
-
-Package: libuno-cli-uretypes1.0-cil
-Section: cli-mono
-Architecture: all
-Depends: ${cli:Depends}, ${misc:Depends}
-Description: LibreOffice bindings for Mono CLI -- URE type library
- LibreOffice is a full-featured office productivity suite that provides
- a near drop-in replacement for Microsoft(R) Office.
- .
- This package contains cli_uretypes.dll, a CLI library which provides classes
- and interfaces for components and client programs. It contains the URE types.
-
-Package: libuno-cli-oootypes1.0-cil
-Section: cli-mono
-Architecture: all
-Depends: ${cli:Depends}, ${misc:Depends}
-Description: LibreOffice bindings for Mono CLI -- LibreOffice type library
- LibreOffice is a full-featured office productivity suite that provides
- a near drop-in replacement for Microsoft(R) Office.
- .
- This package contains cli_oootypes.dll, a CLI library which provides classes
- and interfaces for components and client programs. It contains the OOo types.
-
-Package: libuno-cli-cppuhelper1.0-cil
-Section: cli-mono
-Architecture: all
-Depends: ${cli:Depends}, cli-uno-bridge, ${misc:Depends}
-Description: LibreOffice bindings for Mono CLI -- bootstrapping library
- LibreOffice is a full-featured office productivity suite that provides
- a near drop-in replacement for Microsoft(R) Office.
- .
- This package contains cli_cppuhelper.dll, a CLI library which provides
- bootstrapping code to bootstrap native UNO (use various UNO services
- implemented in different languages).
-
-Package: libuno-cli-ure1.0-cil
-Section: cli-mono
-Architecture: all
-Depends: ${cli:Depends}, ${misc:Depends}
-Description: LibreOffice bindings for Mono CLI -- helper classes
- LibreOffice is a full-featured office productivity suite that provides
- a near drop-in replacement for Microsoft(R) Office.
- .
- This package contains cli_ure.dll, a CLI library which contains helper
- classes for implementing UNO interfaces.
-
Package: mozilla-libreoffice
Section: net
Architecture: alpha amd64 armel armhf hppa i386 ia64 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386
@@@ -3327,7 -3367,7 +3326,7 @@@ Description: office productivity suite
Package: libreoffice-sdbc-postgresql
Section: misc
Architecture: alpha amd64 armhf hppa i386 ia64 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386
- Depends: ${shlibs:Depends}, libreoffice-core, ${misc:Depends}
+ Depends: ${shlibs:Depends}, libreoffice-core (>= 1:3.4.4~), ${misc:Depends}
Conflicts: ure (<< 1.5.1+OOo3.1.1-15)
Suggests: postgresql (>= 8.4)
Description: LibreOffice extension for PostgreSQL SDBC driver
diff --combined control.in
index a894df2,f7bd563..5215968
--- a/control.in
+++ b/control.in
@@@ -3,8 -3,7 +3,8 @@@ Section: editor
Priority: optional
Maintainer: Debian LibreOffice Maintainers <debian-openoffice@lists.debian.org>
Uploaders: Rene Engelhard <rene@debian.org>
-Build-Depends: lsb-release,
+Build-Depends: dpkg-dev (>= 1.16.1),
+ lsb-release,
bzip2,
bison,
flex | flex-old,
@@@ -25,13 -24,20 +25,13 @@@
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,
po-debconf,
@@@ -68,7 -74,6 +68,6 @@@ Suggests: hunspell-dictionary
myspell-dictionary,
libreofficeVER-help-${help-l10n-virtual-version},
libreofficeVER-l10n-${help-l10n-virtual-version},
- menu,
unixodbc,
cups-bsd,
libsane,
@@@ -110,7 -115,6 +109,6 @@@ Description: office productivity suit
* libreofficeVER-gtk: Gtk UI Plugin, GNOME File Picker support,
QuickStarter for GNOMEs notification are
* libreofficeVER-gnome: GNOME VFS, GConf backend
- * menu: Will add libreoffice menu entries for every Debian window manager.
* unixodbc: ODBC database support
* cups-bsd: Allows LibreOffice to detect your CUPS printer queues
automatically
@@@ -187,7 -191,7 +185,7 @@@ Conflicts: libreofficeVER-unbundled
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~)
+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~)
Provides: libreofficeVER-bundled
Replaces: libreofficeVER-calc (<< 1:3.3.2-5)
Description: office productivity suite -- arch-dependent files
@@@ -444,21 -448,6 +442,21 @@@ Description: office productivity suite
with Gtk+ and a Gtk/GNOMEish File Picker when running under GNOME. It
also contains a QuickStarter for the "notification area".
+Package: libreofficeVER-gtk3
+Architecture: %OOO_ARCHS%
+Depends: libreofficeVER-core (= ${binary:Version}),
+ ${shlibs:Depends},
+ ${misc:Depends}
+Recommends: libreofficeVER-style-tango
+Section: gnome
+Enhances: libreofficeVER
+Description: office productivity suite -- GTK+ 3.0 integration
+ LibreOffice is a full-featured office productivity suite that provides
+ a near drop-in replacement for Microsoft(R) Office.
+ .
+ This package contains the Gtk plugin for drawing LibreOffices widgets
+ with Gtk+ 3.0
+
Package: libreofficeVER-gnome
Architecture: %OOO_ARCHS%
Depends: libreofficeVER-core (= ${binary:Version}),
@@@ -504,26 -493,6 +502,26 @@@ Depends: libreofficeVER-core (= ${binar
${python:Depends},
${shlibs:Depends},
${misc:Depends}
+Conflicts: python3-uno
+Description: Python-UNO bridge
+ The Python-UNO bridge allows use of the standard LibreOffice API
+ with the Python scripting language. It additionally allows
+ others to develop UNO components in Python, thus Python UNO components
+ may be run within the LibreOffice process and can be called from C++
+ or the built in StarBasic scripting language.
+Homepage: http://udk.openoffice.org/python/python-bridge.html
+
+Package: python3-uno
+Provides: ${python:Provides}, libreofficeVER-script-provider-python
+XB-Python-Version: ${python:Versions}
+Section: python
+Architecture: %OOO_ARCHS%
+Enhances: libreofficeVER
+Depends: libreofficeVER-core (= ${binary:Version}),
+ ${python:Depends},
+ ${shlibs:Depends},
+ ${misc:Depends}
+Conflicts: python-uno
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 rules
index 877d8d3,9a68675..e22ad35
--- a/rules
+++ b/rules
@@@ -15,14 -15,19 +15,14 @@@
################################################################################
vafilt = $(subst $(2)=,,$(filter $(2)=%,$(1)))
-CHANGELOG_VARS := $(shell dpkg-parsechangelog | \
- sed -n 's/ /_/g;/^[^_]/s/^\([^:]*\):_\(.*\)/\1=\2/p')
-PKGSOURCE := $(call vafilt,$(CHANGELOG_VARS),Source)
-SOURCE_VERSION:=$(shell head -1 debian/changelog | cut -d\( -f2 | cut -d\) -f1)
-UPSTREAM_VERSION:=$(shell echo "$(SOURCE_VERSION)"| cut -d: -f2 | cut -d- -f1)
-BASE_VERSION:=$(shell echo $(SOURCE_VERSION) | cut -d: -f1):$(UPSTREAM_VERSION)
-BINARY_VERSION=$(SOURCE_VERSION)
-#BINARY_VERSION=1:2.4.0-$(shell dpkg-parsechangelog | grep urgency \
- | awk '{print $$2}' | sed -e s/"("// -e s/")"// | cut -d"-" -f2)
-#HELP_L10N_VIRTUAL_VERSION:=$(shell echo $(UPSTREAM_VERSION) | cut -d: -f2 | tr [~] [\\-])
-HELP_L10N_VIRTUAL_VERSION:=3.4
+
+include /usr/share/dpkg/pkg-info.mk
+BASE_VERSION:=$(shell echo $(DEB_VERSION) | cut -d: -f1):$(DEB_VERSION_UPSTREAM)
+BINARY_VERSION=$(DEB_VERSION)
+HELP_L10N_VIRTUAL_VERSION:=$(shell echo $(DEB_VERSION_UPSTREAM) | cut -d: -f2 | tr [~] [\\-])
+#HELP_L10N_VIRTUAL_VERSION:=3.5
#VER:=3
-OOVER:=3.4
+OOVER:=3.5
BASIS_VERSION:=$(OOVER)
NEXT_OOVER:=$(shell echo "$(OOVER) + 0.1" | bc)
NEXT_BASIS_VERSION:=$(NEXT_OOVER)
@@@ -31,9 -36,13 +31,9 @@@ ARCH_INDEP_PACKAGES := $(shell dh_listp
ARCH_DEP_PACKAGES := $(shell dh_listpackages -s)
PACKAGES := $(ARCH_INDEP_PACKAGES) $(ARCH_DEP_PACKAGES)
-DPKG_VARS := $(shell dpkg-architecture)
-OS := $(call vafilt,$(DPKG_VARS),DEB_HOST_ARCH_OS)
-ARCH := $(call vafilt,$(DPKG_VARS),DEB_HOST_ARCH)
-DIST := $(shell if [ -x /usr/bin/dpkg-vendor ]; then dpkg-vendor --query Vendor; else lsb_release -is; fi)
+include /usr/share/dpkg/architecture.mk
+include /usr/share/dpkg/vendor.mk
DISTREL := $(shell lsb_release -cs)
-DEB_HOST_GNU_TYPE ?= $(call vafilt,$(DPKG_VARS),DEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE ?= $(call vafilt,$(DPKG_VARS),DEB_BUILD_GNU_TYPE)
SHELL:=/bin/bash
SYSTEM_GCC_VERSION = $(shell gcc --version | sed -n '/^gcc/s/.*\(.\..\)\..$$/\1/p')
@@@ -52,7 -61,7 +52,7 @@@ OODIR:=$(OOBASISDIR
# Figure out who's building this package.
OOO_VENDOR:=The Document Foundation/Debian
-ifeq "$(DIST)" "Ubuntu"
+ifeq "$(DEB_VENDOR)" "Ubuntu"
OOO_VENDOR=The Document Foundation, Debian and Ubuntu
endif
export OOO_VENDOR
@@@ -68,14 -77,21 +68,14 @@@ export QUILT_OPTIONS="-p1 -F0
# work around tcsh bugs.debian.org/339034: tcsh: Unknown colorls variable `su'
unexport LS_COLORS
-MWS=OOO340
-MILESTONE=m1
-TAG=$(shell echo $(MWS) | tr A-Z a-z)-$(MILESTONE)
-GIT_TAG=$(MWS)_$(MILESTONE)
-OOO_BUILD_BRANCH=libreoffice-3-4-4
-OOO_BUILD_VERSION=3.4.4.2
-# 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)
-OOO_BUILD_TREE=libreoffice-build
-SOURCE_TREE=$(OOO_BUILD_TREE)/build/libreoffice-$(OOO_BUILD_TARBALL_VERSION)
+MWS=OOO350
+GIT_TAG=libreoffice-3.4.3.2
+GIT_BRANCH=
+SOURCE_TREE=.
STAMP_DIR=debian/stampdir
TARFILE_LOCATION=$(CURDIR)/ext-sources
export TARFILE_LOCATION
-USE_SOURCE_TARBALLS=y
+USE_SOURCE_TARBALLS=n
ifeq "$(DISTREL)" "squeeze"
SQUEEZE_BACKPORT=y
@@@ -85,7 -101,7 +85,7 @@@ endi
# Default package configuration
#
OOO_ARCHS = alpha amd64 armel armhf hppa i386 ia64 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386
-PATCHSET=$(DIST)
+PATCHSET=$(DEB_VENDOR)
BUILD_DEPS=
# These are components which can be built from internal copies, or used from the
@@@ -93,31 -109,21 +93,31 @@@
SYSTEM_STUFF = dicts
BUILD_PYUNO=y
+ENABLE_PYTHON3=y
ifeq "$(BUILD_PYUNO)" "y"
ENABLE_SCRIPT_PROVIDER_PYTHON=y
endif
# THIS IS ONLY FOR TESTING. When building against a specified pythonX.Y
# this will work inside OOo but *not* from outside OOo unless the user
# uses pythonX.Y directly (and the dh_pycentral-created dependencies allow
-# also the non-working default python then) - see e.g. #587402
+# also the non-working default python then) - see e.g. #587402. Also
+# note we are NOT working with python < 2.6 anymore!
PYTHON_VERSION=current
ifeq "$(PYTHON_VERSION)" "current"
- PYTHON=python
+ PYTHON=python (>= 2.6)
export PYTHON=python
else
PYTHON=python$(PYTHON_VERSION)
export PYTHON=python$(PYTHON_VERSION)
endif
+ifeq "$(ENABLE_PYTHON3)" "y"
+ PYTHON3_VERSION=current
+ ifeq "$(PYTHON3_VERSION)" "current"
+ PYTHON3=python3
+ else
+ PYTHON3=python$(PYTHON3_VERSION)
+ endif
+endif
PACKAGE_TTF_OPENSYMBOL=y
BUILD_BINFILTERS=y
BUILD_ONLY_EN_US=n
@@@ -125,11 -131,18 +125,11 @@@ ENABLE_JAVA=
ifeq "$(ENABLE_JAVA)" "y"
JDK=openjdk
JAVA_MAINVER=6
- ifneq (,$(filter hppa kfreebsd%, $(ARCH)))
+ ifneq (,$(filter hppa kfreebsd%, $(DEB_HOST_ARCH)))
JDK=gcj-jdk
endif
endif
JAVAHELPER_MIN_VERSION= (>= 0.37~)
-ENABLE_MONO=y
-MONO2=y
-ifeq "$(MONO2)" "y"
- MONO_MINVER= (>= 2.4.2.3)
-else
- MONO_MINVER= (>= 1.2.3)
-endif
SYSTEM_STUFF += hunspell
HUNSPELL_MIN_VER= (>= 1.1.5-2)
SYSTEM_STUFF += altlinuxhyph
@@@ -150,11 -163,11 +150,11 @@@ SYSTEM_STUFF += mdd
SYSTEM_STUFF += vigra
USE_EXTERNAL_CXXLIBS=y
#SYSTEM_STUFF += sablot
-SYSTEM_STUFF += libxslt
SYSTEM_STUFF += mythes
SYSTEM_STUFF += icu
ICU_MINVER= (>= 4.0)
SYSTEM_STUFF += libwpd libwpg libwps
+SYSTEM_STUFF += libvisio
#SYSTEM_STUFF += xmlsec
BUILD_CAIROCANVAS=y
SYSTEM_STUFF += cairo
@@@ -189,13 -202,22 +189,13 @@@ SYSTEM_STUFF += neo
NEON_SECTYPE=gnutls
NEONSONR=27
SYSTEM_STUFF += redland
-USE_OOO_BUILD_DESKTOPS=n
PACKAGE_SDK=y
-# FIXME: subsequenttests breaks with to high debug level 11
ifeq "$(ENABLE_JAVA)" "y"
ifeq "$(JDK)" "openjdk"
- RUN_SMOKETEST=n
- RUN_SUBSEQUENT_TESTS=n
- else
- ifneq ($(ON_BUILDD),y)
- RUN_SMOKETEST=n
- RUN_SUBSEQUENT_TESTS=n
- endif
+ RUN_MAKE_CHECK=y
endif
else
- RUN_SMOKETEST=n
- RUN_SUBSEQUENT_TESTS=n
+ RUN_MAKE_CHECK=n
endif
# "Unfortunately, running the unoapi tests is still not stable enough to give
# useful results. Therefore, running subsequenttests has been disabled in the
@@@ -209,6 -231,7 +209,6 @@@ USE_SYSTEM_DMAKE=
USE_LIBSUITESPARSE=y
SUITESPARSE_MIN_VERSION= (>= 1:3.4.0)
PARALLEL_BUILD=n
-MOZILLA=libxul
ENABLE_LDAP=y
USE_OPENLDAP=y
ENABLE_OPENGL=y
@@@ -233,7 -256,6 +233,7 @@@ ENABLE_MINIMIZER=
ENABLE_PRESENTER_CONSOLE=y
ENABLE_PDFIMPORT=y
BUILD_GTK=y
+BUILD_GTK3=y
ENABLE_EVO2=y
ENABLE_GVFS=y
ENABLE_GCONF=y
@@@ -248,14 -270,14 +248,14 @@@ PACKAGE_BASE=
ENABLE_GRAPHITE=y
SYSTEM_STUFF += graphite
ALLOC=system
-SYSTEM_STUFF += libtextcat
-USE_SYSTEM_TEXTCAT_DATA=y
+SYSTEM_STUFF += libexttextcat
SYSTEM_STUFF += cppunit
-
+ENABLE_LIBRSVG=y
+SYSTEM_LIBRSVG=y
# when we have a package we want to have to be installed on older things with some older
# C++ ABI (like it was the case with libreoffice2), we need to set this. Don't touch
# otherwise
-INTERNAL_STDLIBS=n
+SYSTEM_STUFF += stdlibs
DEFAULT_IMAGE=galaxy
IMAGES:=$(DEFAULT_IMAGE) crystal hicontrast tango oxygen
ENABLE_MYSQLNATIVE=y
@@@ -265,41 -287,27 +265,41 @@@ MYSQLCPPCONN_MINVER= (>= 1.1.0~r791
DICT_DIR=/usr/share/hunspell
HYPH_DIR=/usr/share/hyphen
THES_DIR=/usr/share/mythes
+SYSTEM_STUFF += libcmis
+SYSTEM_STUFF += jpeg
+SYSTEM_STUFF += libxml
+SYSTEM_STUFF += expat
+SYSTEM_STUFF += odbc
+SYSTEM_STUFF += curl
+SYSTEM_STUFF += sane
+SYSTEM_STUFF += xrender-headers
+SYSTEM_STUFF += mesa-headers
+SYSTEM_STUFF += db
+SYSTEM_STUFF += poppler
+SYSTEM_STUFF += libpng
+SYSTEM_STUFF += nss
+SYSTEM_STUFF += mozilla-headers
# Default flags to pass to configure of ooo-build
-CONFIGURE_FLAGS= --disable-post-install-scripts \
- --with-tag=$(TAG) \
- --with-distro=$(PATCHSET) \
+CONFIGURE_FLAGS= \
--with-vendor='$(OOO_VENDOR)' \
- --enable-package-directories \
- --with-installed-ooo-dirname=$(OODIRNAME) \
+ --with-install-dirname=$(OODIRNAME) \
--prefix=/usr --mandir=/usr/share/man \
--with-docdir=/usr/share/doc/libreoffice \
- --with-build-version="tag $(OOO_BUILD_TAG), $(DIST) package $(BINARY_VERSION)" \
--disable-strip \
--enable-lockdown \
- --with-drink=coffee \
--libdir=/usr/lib \
--host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \
- --with-additional-sections="$(ADDITIONAL_SECTIONS)" \
--enable-broffice \
- --with-extension-integration \
+ --enable-extension-integration \
--disable-online-update \
- --disable-fetch-external
+ --disable-fetch-external \
+ --enable-release-build \
+ --disable-linkoo
+
+ifneq ($(ON_BUILDD),y)
+CONFIGURE_FLAGS += --enable-verbose
+endif
ifeq "$(USE_SOURCE_TARBALLS)" "y"
CONFIGURE_FLAGS += --without-git
@@@ -323,19 -331,20 +323,19 @@@ define gen_no_arch
$$(_no_arch_macro) = $$(if $$(_no_arch_tmp_$1),$$(_empty) [$$(_no_arch_tmp_$1)])
endef
-LIBSUFFIX := $(shell grep LIBSUFFIX debian/scripts/vars.$(ARCH) | cut -d"=" -f2)
-PLATFORMID := $(shell grep PLATFORMID debian/scripts/vars.$(ARCH) | cut -d"=" -f2)
+PLATFORMID := $(shell grep PLATFORMID debian/scripts/vars.$(DEB_HOST_ARCH) | cut -d"=" -f2)
# ./configure defaults to STLport on i386 and we should keep it for
# ABI-compatability
OOO_STLPORT_ARCHS= i386
-ifeq "$(ARCH)" "i386"
+ifeq "$(DEB_HOST_ARCH)" "i386"
LINK_TO_STLPORT=y
endif
ifeq "$(ENABLE_OPENGL)" "y"
# doesn't make that much sense on armel and mips(el), does it? :)
OOO_OGLTRANS_ARCHS = $(filter-out armel mips%, $(OOO_ARCHS))
- ifeq (,$(filter $(ARCH),$(OOO_OGLTRANS_ARCHS)))
+ ifeq (,$(filter $(DEB_HOST_ARCH),$(OOO_OGLTRANS_ARCHS)))
ENABLE_OPENGL=n
endif
$(eval $(call gen_no_archs,OOO_OGLTRANS_ARCHS))
@@@ -361,7 -370,7 +361,7 @@@ $(eval $(call gen_no_archs,OOO_BASE_ARC
OOO_REPORTDESIGN_ARCHS := $(filter-out armel,$(OOO_JAVA_ARCHS))
$(eval $(call gen_no_archs,OOO_REPORTDESIGN_ARCHS))
-ifneq (,$(findstring $(ARCH),$(OOO_NO_BASE_ARCHS)))
+ifneq (,$(findstring $(DEB_HOST_ARCH),$(OOO_NO_BASE_ARCHS)))
PACKAGE_BASE=n
ENABLE_SDBC_POSTGRESQL=n
ENABLE_MYSQLNATIVE=n
@@@ -374,7 -383,7 +374,7 @@@
DEBHELPER_OPTIONS += -Nlibreoffice$(VER)-report-builder-bin -Nlibreoffice$(VER)-report-builder
endif
-ifeq (,$(findstring $(ARCH),$(OOO_ARCH_DEP_EXTENSIONS_ARCHS)))
+ifeq (,$(findstring $(DEB_HOST_ARCH),$(OOO_ARCH_DEP_EXTENSIONS_ARCHS)))
ENABLE_MINIMIZER=n
ENABLE_PDFIMPORT=n
ENABLE_PRESENTER_CONSOLE=n
@@@ -382,21 -391,44 +382,34 @@@
ENABLE_MYSQLNATIVE=n
endif
-ifeq (,$(filter $(ARCH),$(OOO_JAVA_ARCHS)))
+ifeq (,$(filter $(DEB_HOST_ARCH),$(OOO_JAVA_ARCHS)))
ENABLE_JAVA=n
ENABLE_REPORTDESIGN=n
ENABLE_MEDIAWIKI=n
+ DEBHELPER_OPTIONS += -Nlibreoffice$(VER)-wiki-publisher
+ DEBHELPER_OPTIONS += -Nlibreoffice$(VER)-report-builder-bin -Nlibreoffice$(VER)-report-builder
endif
-ifeq ($(ARCH),$(findstring $(ARCH),$(OOO_GCJ_JDK_ARCHS)))
- ifneq ($(ARCH),$(findstring $(ARCH),$(OOO_OPENJDK_ARCHS)))
+ifeq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH),$(OOO_GCJ_JDK_ARCHS)))
+ ifneq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH),$(OOO_OPENJDK_ARCHS)))
ENABLE_REPORTDESIGN=n
SYSTEM_STUFF := $(filter-out jfreereport, $(SYSTEM_STUFF))
+ DEBHELPER_OPTIONS += -Nlibreoffice$(VER)-report-builder-bin -Nlibreoffice$(VER)-report-builder
+ endif
+ endif
+ # disable SRB on ia64 when building with internal jfreereport.
+ # fails to build. ("The system is out of resources."). FIXME.
+ ifeq (ia64,$(findstring ia64,$(OOO_OPENJDK_ARCHS)))
+ ifeq (,$(findstring jfreereport,$(SYSTEM_STUFF)))
+ OOO_REPORTDESIGN_ARCHS := $(filter-out ia64,$(OOO_REPORTDESIGN_ARCHS))
+ ifeq "$(ARCH)" "ia64"
+ ENABLE_REPORTDESIGN=n
+ endif
endif
endif
-ifneq (,$(filter $(ARCH),$(OOO_GCJ_ARCHS)))
- BUILD_JARS_NATIVE=y
-endif
-ifeq "$(ENABLE_MONO)" "y"
-# mono
-# ppc fails (#412967), arm(el), too
-OOO_MONO_ARCHS = $(filter amd64 i386 ia64 kfreebsd-amd64 kfreebsd-i386, $(OOO_ARCHS))
-ifeq (,$(filter $(ARCH),$(OOO_MONO_ARCHS)))
- ENABLE_MONO=n
-endif
-else
-OOO_MONO_ARCHS=
+ifneq (,$(filter $(DEB_HOST_ARCH),$(OOO_GCJ_ARCHS)))
+ BUILD_JARS_NATIVE=y
endif
ifeq "$(PACKAGE_NPSOPLUGIN)" "y"
@@@ -406,7 -438,7 +419,7 @@@ OOO_NPSOPLUGIN_ARCHS
endif
# builds long and is for legacy filters. probably not needed on {arm,mips}{,el}
-ifneq (,$(filter arm% mips% m68k, $(ARCH)))
+ifneq (,$(filter arm% mips% m68k, $(DEB_HOST_ARCH)))
BUILD_BINFILTERS=n
endif
OOO_BINFILTER_ARCHS:=$(filter-out arm% mips% m68k, $(OOO_ARCHS))
@@@ -415,7 -447,7 +428,7 @@@
# Distro-specific overrides
# Debian
-ifeq "$(DIST)" "Debian"
+ifeq "$(DEB_VENDOR)" "Debian"
# we don't need to build all languages and the thesaurus on the buildds;
# they do binary-only builds anyway
ifeq ($(ON_BUILDD),y)
@@@ -426,10 -458,9 +439,10 @@@ endi
# Debian Squeeze
ifeq "$(SQUEEZE_BACKPORT)" "y"
BUGS=mailto:debian-backports@lists.debian.org
- SYSTEM_STUFF := $(filter-out libwpd libwpg libwps mythes mdds libtextcat graphite jfreereport, $(SYSTEM_STUFF))
+ SYSTEM_STUFF := $(filter-out libwpd libwpg libwps mythes mdds libexttextcat graphite jfreereport libvisio poppler libcmis, $(SYSTEM_STUFF))
JUNIT_MIN_VER=
PARALLEL_BUILD=n
+ ENABLE_PDFIMPORT=n
endif
CONFIGURE_FLAGS += $(foreach i, $(SYSTEM_STUFF),--with-system-$(i))
@@@ -438,14 -469,14 +451,14 @@@ CC_PREFIX:=$(shell gcc -dumpmachine)
ifeq "$(GCC_VERSION)" ""
ifneq "$(OOO_GCJ_JDK_ARCHS)" ""
- ifeq ($(ARCH),$(findstring $(ARCH),$(OOO_GCJ_ARCHS)))
+ ifeq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH),$(OOO_GCJ_ARCHS)))
GCJ_JDK_PACKAGE=$(shell dpkg -s gcj-jdk | grep Depends | sed -e 's/.*\(gcj-[0-9]\.[0-9]-jdk\).*/\1/')
GCJ_JDK_VERSION=$(shell echo $(GCJ_JDK_PACKAGE) | cut -d- -f2)
ifneq "$(SYSTEM_GCC_VERSION)" "$(GCJ_JDK_VERSION)"
BUILD_DEPS += , gcc-$(GCJ_JDK_VERSION) [$(OOO_GCJ_JDK_ARCHS)], g++-$(GCJ_JDK_VERSION) [$(OOO_GCJ_JDK_ARCHS)]
- ifeq ($(ARCH),$(findstring $(ARCH),$(OOO_GCJ_JDK_ARCHS)))
+ ifeq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH),$(OOO_GCJ_JDK_ARCHS)))
# sanity check. amd64 is in kfreebsd-amd64; same for i386 and mips
- ifneq ($(ARCH),$(findstring $(ARCH),$(OOO_OPENJDK_ARCHS)))
+ ifneq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH),$(OOO_OPENJDK_ARCHS)))
GCC_VERSION := $(GCJ_JDK_VERSION)
else
GCC_VERSION := $(SYSTEM_GCC_VERSION)
@@@ -458,6 -489,12 +471,6 @@@
endif
endif
-# Note that this does *NOT* only affect the mozilla plugin but also
-# stuff like the xmlsecurity (which uses nss). For the plugin only,
-# change the OOO_NPSOPLUGIN_ARCHS
-OOO_MOZILLA_ARCHS = $(filter-out nothing, $(OOO_ARCHS))
-$(eval $(call gen_no_archs,OOO_MOZILLA_ARCHS))
-
ifeq "$(USE_SOURCE_TARBALLS)" "n"
BUILD_DEPS += , git, rsync
endif
@@@ -465,11 -502,11 +478,11 @@@
BUILDDEB_OPTIONS = -- -Zbzip2
ifneq "$(OOO_OGLTRANS_ARCHS)" ""
+ ifneq (,$(findstring mesa-headers,$(SYSTEM_STUFF)))
BUILD_DEPS += , libgl1-mesa-dev$(OOO_NO_OGLTRANS_ARCHS), libglu1-mesa-dev$(OOO_NO_OGLTRANS_ARCHS)
+ endif
endif
ifeq "$(ENABLE_OPENGL)" "y"
- CONFIGURE_FLAGS += --with-system-mesa-headers
-else
CONFIGURE_FLAGS += --disable-opengl
endif
@@@ -477,27 -514,24 +490,25 @@@ ifneq "$(PACKAGE_SDK)" "y
CONFIGURE_FLAGS += --disable-odk
endif
-ifeq "$(ENABLE_MINIMIZER)" "y"
- CONFIGURE_FLAGS += --enable-ext-presenter-minimizer
+ifneq "$(ENABLE_MINIMIZER)" "y"
+ CONFIGURE_FLAGS += --disable-ext-presenter-minimizer
endif
-ifeq "$(ENABLE_PRESENTER_CONSOLE)" "y"
- CONFIGURE_FLAGS += --enable-ext-presenter-console
+ifneq "$(ENABLE_PRESENTER_CONSOLE)" "y"
+ CONFIGURE_FLAGS += --disable-ext-presenter-console
endif
ifeq "$(ENABLE_PDFIMPORT)" "y"
- CONFIGURE_FLAGS += --enable-ext-pdfimport
- BUILD_DEPS += , libpoppler-dev (>= 0.8.0)
+ BUILD_DEPS += , libpoppler-dev (>= 0.8.0), libpoppler-cpp-dev
- ifneq "$(SQUEEZE_BACKPORT)" "y"
BUILD_DEPS += , libpoppler-cpp-dev
- endif
+else
+ CONFIGURE_FLAGS += --disable-ext-pdfimport
endif
# fails their tests
-ifeq "$(ARCH)" "armel"
+ifeq "$(DEB_HOST_ARCH)" "armel"
ENABLE_GRAPHITE=n
SYSTEM_STUFF := $(filter-out graphite, $(SYSTEM_STUFF))
endif
-ifeq "$(ARCH)" "sparc"
+ifeq "$(DEB_HOST_ARCH)" "sparc"
ENABLE_GRAPHITE=n
SYSTEM_STUFF := $(filter-out graphite, $(SYSTEM_STUFF))
endif
@@@ -511,37 -545,22 +522,37 @@@ els
endif
-ifneq (,$(filter libtextcat, $(SYSTEM_STUFF)))
- BUILD_DEPS += , libtextcat-dev (>= 2.2-8)
+ifneq (,$(filter libexttextcat, $(SYSTEM_STUFF)))
+ BUILD_DEPS += , libexttextcat-dev (>= 3.1.1)
+ TEXTCAT_DATA_RECOMMENDS := libexttextcat-data
endif
-ifeq "$(USE_SYSTEM_TEXTCAT_DATA)" "y"
- CONFIGURE_FLAGS += --with-external-libtextcat-data=/usr/share/libtextcat/LM
- ifeq "$(SQUEEZE_BACKPORT)" "y"
- TEXTCAT_DATA_RECOMMENDS := libtextcat-data-utf8
- else
- TEXTCAT_DATA_RECOMMENDS := libtextcat-data (>= 2.2-9)
- endif
+
+ifneq (,$(filter jpeg, $(SYSTEM_STUFF)))
+ BUILD_DEPS += , libjpeg-dev
+endif
+ifneq (,$(filter libxml, $(SYSTEM_STUFF)))
+ BUILD_DEPS += , libxml2-dev
+ BUILD_DEPS += , libxslt1-dev
+ DBG_DBG_SUGGESTS+= , libxslt1-dbg
+endif
+ifneq (,$(filter expat, $(SYSTEM_STUFF)))
+ BUILD_DEPS += , libexpat1-dev
+endif
+ifneq (,$(filter odbc, $(SYSTEM_STUFF)))
+ BUILD_DEPS += , unixodbc-dev (>= 2.2.11)
+endif
+ifneq (,$(filter sane, $(SYSTEM_STUFF)))
+ BUILD_DEPS += , libsane-dev
+endif
+ifneq (,$(filter xrender-headers, $(SYSTEM_STUFF)))
+ BUILD_DEPS += , libxrender-dev
+endif
+ifneq (,$(filter libpng, $(SYSTEM_STUFF)))
+ BUILD_DEPS += , libpng12-dev
endif
-ifeq "$(USE_LIBCURL4)" "y"
+ifeq (,$(filter curl, $(SYSTEM_STUFF)))
BUILD_DEPS += , libcurl4-$(CURL_SECTYPE)-dev
-else
- BUILD_DEPS += , libcurl3-$(CURL_SECTYPE)-dev
endif
ifneq (,$(filter openssl, $(SYSTEM_STUFF)))
@@@ -553,47 -572,34 +564,46 @@@
endif
endif
+ifneq "$(ENABLE_RSVG)" "y"
+ ifeq "$(SYSTEM_LIBRSVG)" "y"
+ BUILD_DEPS += , librsvg2-dev
+ CONFIGURE_FLAGS += --enable-librsvg=auto
+ else
+ CONFIGURE_FLAGS += --enable-librsvg=internal
+ endif
+else
+ CONFIGURE_FLAGS += --enable-librsvg=no
+endif
+
+ifneq (,$(findstring db,$(SYSTEM_STUFF)))
BUILD_DEPS += , libdb-dev
DBG_DBG_SUGGESTS += , $(shell dpkg -s libdb-dev | grep Depends | awk '{ print $$2 }' | sed -e s/dev/dbg/)
+endif
ifneq "$(BUILD_DBG_PACKAGE)" "y"
# build with small symbols anyway
SMALL_SYMBOLS = y
else
- ifeq (debug,$(findstring debug,$(DEB_BUILD_OPTIONS)))
+ ifeq "$(SQUEEZE_BACKPORTS)" "y"
+ SMALL_SYMBOLS = y
+ else
+ ifneq (,$(findstring i386,$(ARCH)))
SMALL_SYMBOLS = n
USE_XZ_COMPRESS = y
- else
- ifeq "$(SQUEEZE_BACKPORTS)" "y"
- SMALL_SYMBOLS = y
else
- ifneq (,$(findstring amd64,$(ARCH)))
+ ifneq (,$(findstring i386,$(DEB_HOST_ARCH)))
SMALL_SYMBOLS = n
USE_XZ_COMPRESS = y
else
+ ifneq (,$(findstring amd64,$(DEB_HOST_ARCH)))
+ SMALL_SYMBOLS = n
+ USE_XZ_COMPRESS = y
+ else
SMALL_SYMBOLS = y
endif
endif
endif
- DBG_DBG_SUGGESTS+= , libc6.1-dbg [alpha ia64], libc0.1-dbg [kfreebsd-i386 kfreebsd-amd64], libc0.3-dbg [hurd-i386], libc6-dbg [!ia64 !alpha !kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libatk1.0-dbg, libglib2.0-0-dbg, libgnomevfs2-0-dbg, libstdc++6-$(SYSTEM_GCC_VERSION)-dbg, libx11-6-dbg, libxext6-dbg, libxaw7-dbg, libxml2-dbg, libgtk2.0-0-dbg, libxau6-dbg, libice6-dbg, libsm6-dbg, libxinerama1-dbg, libfontconfig1-dbg, libhunspell-$(shell pkg-config --modversion hunspell | cut -d. -f1,2)-0-dbg
- ifeq "$(USE_LIBCURL4)" "y"
- DBG_DBG_SUGGESTS+= , libcurl3-dbg
- else
- DBG_DBG_SUGGESTS+= , libcurl4-dbg
- endif
+ DBG_DBG_SUGGESTS+= , libc6.1-dbg [alpha ia64], libc0.1-dbg [kfreebsd-i386 kfreebsd-amd64], libc0.3-dbg [hurd-i386], libc6-dbg [!ia64 !alpha !kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libatk1.0-dbg, libglib2.0-0-dbg, libgnomevfs2-0-dbg, libstdc++6-$(SYSTEM_GCC_VERSION)-dbg, libx11-6-dbg, libxext6-dbg, libxaw7-dbg, libxml2-dbg, libgtk2.0-0-dbg, libxau6-dbg, libice6-dbg, libsm6-dbg, libxinerama1-dbg, libfontconfig1-dbg, libhunspell-$(shell pkg-config --modversion hunspell | cut -d. -f1,2)-0-dbg, libcurl4-dbg
endif
# Small symbols?
ifeq "$(SMALL_SYMBOLS)" "y"
@@@ -604,28 -610,34 +614,32 @@@ export CFLAGS CXXFLAG
else
CONFIGURE_FLAGS += --enable-symbols
endif
+ ifeq (debug,$(findstring debug,$(DEB_BUILD_OPTIONS)))
+ CONFIGURE_FLAGS += --enable-debug
+ endif
+
ifeq (noopt,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
ARCH_FLAGS += -O0
endif
-ifeq "$(USE_XZ_COMPRESS)" "y"
- # used only for -dbg yet, so disabled and done manually
- # in binary-arch
- #BUILDDEB_OPTIONS = -- -Zxz
- BUILD_DEPS += , dpkg-dev (>= 1.15.6)
-else
- BUILD_DEPS += , dpkg-dev (>= 1.15.1)
-endif
-
# Build python depends from current python version
PYMAJOR:=$(shell python -c "import sys; print sys.version_info[0]")
PYMINOR:=$(shell python -c "import sys; print sys.version_info[1]")
PYMINORPLUS1:=$(shell python -c "import sys; print sys.version_info[1]+1")
PYTHON_SITE:=debian/python-uno/$(shell python -c 'from distutils import sysconfig; print(sysconfig.get_python_lib())')
+PY3MAJOR:=$(shell python3 -c "import sys; print (sys.version_info[0])")
+PY3MINOR:=$(shell python3 -c "import sys; print (sys.version_info[1])")
+PY3MINORPLUS1:=$(shell python3 -c "import sys; print (sys.version_info[1]+1)")
+PYTHON3_SITE:=debian/python3-uno/$(shell python3 -c 'from distutils import sysconfig; print(sysconfig.get_python_lib())')
ifeq "$(BUILD_PYUNO)" "y"
BUILD_DEPS += , python (>= 2.6.6-3+squeeze4)
DBG_DBG_SUGGESTS+= , python-dbg
- BUILD_DEPS += , $(PYTHON)-dev
+ BUILD_DEPS += , $(PYTHON)-dev (>= 2.6)
+ ifeq "$(ENABLE_PYTHON3)" "y"
+ BUILD_DEPS += , $(PYTHON3)-dev
+ endif
else
BUILD_DEPS += , python
endif
@@@ -635,17 -647,23 +649,17 @@@
ifeq "$(ENABLE_JAVA)" "y"
ifeq "$(BUILD_JARS_NATIVE)" "y"
STAMP_NATIVE_JARS = $(STAMP_DIR)/native-jars
- ifeq "$(NEW_DPKG_SHLIBDEPS)" "n"
- BUILD_DEPS += , dpkg-dev (>= 1.13.19)
- endif
JAVA_GCJ_DEPENDS = libgcj-common (>= 1:4.1.1-14)
endif
endif
-ifeq "$(RUN_SMOKETEST)" "y"
- BUILD_DEPS += , epm
-endif
ifeq "$(RUN_TESTTOOL)" "y"
CONFIGURE_FLAGS += --enable-hids
endif
ifneq (,$(filter cppunit, $(SYSTEM_STUFF)))
BUILD_DEPS += , libcppunit-dev (>= 1.12)
endif
-ifeq "$(RUN_SUBSEQUENT_TESTS)" "y"
+ifeq "$(RUN_MAKE_CHECK)" "y"
BUILD_DEPS += , tcsh
ifeq "$(ENABLE_JUNIT4)" "y"
BUILD_DEPS += , junit4 $(JUNIT_MIN_VER)
@@@ -667,16 -685,16 +681,16 @@@ ifneq "$(BUILD_ONLY_EN_US)" "y
# but we can't/shouldn't do dynamic switching, so let en-US be the first
# one to that gid_Module_Root always is english and the other langpacks
# have gid_Module_Root.$iso
- #ISOS=$(shell $(OOO_BUILD_TREE)/bin/openoffice-xlate-lang -i all')
+ #ISOS=$(shell $(SOURCE_TREE)/bin/lo-xlate-lang -i all')
ISOS:=en-US af ar as ast be bg bn br bs ca cs cy da de dz el \
en-GB en-ZA eo es et eu fa fi fr ga gl gu he hi hr hu id is it ja \
ka km ko ku lt lv mk mn ml mr nb ne nl nn nr nso oc om or \
pa-IN pl pt pt-BR ro ru rw si sk sl sr ss st sv \
ta te tg th tn tr ts ug uk uz ve vi xh zh-CN zh-TW zu
- #HELPISOS:=$(shell $(OOO_BUILD_TREE)/bin/openoffice-xlate-lang -i all')
+ #HELPISOS:=$(shell $(SOURCE_TREE)/bin/lo-xlate-lang -i all')
HELPISOS:=en-US ca cs da de dz el en-GB es et eu fi fr gl hi hu it \
ja km ko nl om pl pt pt-BR ru sk sl sv zh-CN zh-TW
- #LANGPACKISOS:=$(shell $(OOO_BUILD_TREE)/bin/openoffice-xlate-lang -i all')
+ #LANGPACKISOS:=$(shell $(SOURCE_TREE)/bin/lo-xlate-lang -i all')
LANGPACKISOS:=en-US af ar as ast be bg bn br bs ca cs cy da de dz el \
en-GB en-ZA eo es et eu fa fi fr ga gl gu he hi hr hu id is it ja \
ka km ko ku lt lv mk mn ml mr nb ne nl nn nr nso oc om or \
@@@ -725,13 -743,13 +739,13 @@@ ifeq "$(ENABLE_JAVA)" "y
ifeq "$(JAVA_MAINVER)" "6"
BUILD_DEPS += , openjdk-$(JAVA_MAINVER)-jdk (>= 6b23~pre8-2) [$(filter-out ia64,$(filter-out $(OOO_GCJ_JDK_ARCHS),$(OOO_JAVA_ARCHS))])
BUILD_DEPS += , openjdk-7-jdk [ia64]
- ifeq "$(ARCH)" "ia64"
+ ifeq "$(DEB_HOST_ARCH)" "ia64"
JAVA_MAINVER=7
endif
else
BUILD_DEPS += , openjdk-$(JAVA_MAINVER)-jdk [$(filter-out $(OOO_GCJ_JDK_ARCHS),$(OOO_JAVA_ARCHS))]
endif
- JAVA_HOME=/usr/lib/jvm/java-$(JAVA_MAINVER)-openjdk-$(ARCH)
+ JAVA_HOME=/usr/lib/jvm/java-$(JAVA_MAINVER)-openjdk-$(DEB_HOST_ARCH)
endif
CONFIGURE_FLAGS += --with-java-target-version=1.5
endif
@@@ -756,14 -774,14 +770,14 @@@ endi
# ifneq (,$(GCJ_JAWT_DEPENDS))
# JAVA_RUNTIME_DEPENDS += | $(GCJ_JAWT_DEPENDS)
# endif
- ifneq (,$(filter $(ARCH), $(OOO_OPENJDK_ARCHS)))
- ifneq "$(ARCH)" "ia64"
+ ifneq (,$(filter $(DEB_HOST_ARCH), $(OOO_OPENJDK_ARCHS)))
+ ifneq "$(DEB_HOST_ARCH)" "ia64"
JAVA_RUNTIME_DEPENDS += | openjdk-6-jre | openjdk-7-jre
else
JAVA_RUNTIME_DEPENDS += | openjdk-7-jre
endif
endif
- ifneq (,$(filter $(ARCH), amd64 i386))
+ ifneq (,$(filter $(DEB_HOST_ARCH), amd64 i386))
JAVA_RUNTIME_DEPENDS += | sun-java5-jre | sun-java6-jre
endif
JAVA_RUNTIME_DEPENDS += | java5-runtime
@@@ -779,7 -797,7 +793,7 @@@ export JAVA_HOM
BUILD_DEPS += , libsaxonb-java$(OOO_NO_JAVA_ARCHS)
endif
ifeq "$(PACKAGE_SDK)" "y"
- ifeq "$(DIST)" "Debian"
+ ifeq "$(DEB_VENDOR)" "Debian"
CONFIGURE_FLAGS += --enable-build-unowinreg
ifeq "$(SQUEEZE_BACKPORT)" "y"
BUILD_DEPS += , gcc-mingw32$(OOO_NO_JAVA_ARCHS), mingw32-runtime$(OOO_NO_JAVA_ARCHS)
@@@ -822,8 -840,7 +836,8 @@@ export MINGWSTRIP = i686-w64-mingw32-st
CONFIGURE_FLAGS += --with-system-servlet-api --with-servlet-api-jar=$(shell dpkg -L `dpkg -s libcommons-logging-java | grep Suggests | cut -d"," -f1 | sed -e s/^\ // | awk '{ print $$2 }'` | grep servlet-api.*\.jar$ | head -n 1)
BUILD_DEPS += , $(shell dpkg -s libcommons-logging-java | grep Suggests | cut -d"," -f1 | sed -e s/^\ // | awk '{ print $$2 }')
endif
- CONFIGURE_FLAGS += --enable-ext-report-builder
+ else
+ CONFIGURE_FLAGS += --disable-ext-report-builder
endif
OOO_OFFICEBEAN_DEP = libreoffice$(VER)-officebean
BUILD_DEPS += , javahelper $(JAVAHELPER_MIN_VERSION)
@@@ -832,15 -849,29 +846,15 @@@ els
DEBHELPER_OPTIONS += -Nlibreoffice$(VER)-officebean -Nlibreoffice$(VER)-java-common -Nlibreoffice$(VER)-filter-mobiledev -Nlibreoffice$(VER)-gcj -Nlibreoffice$(VER)-script-provider-bsh -Nlibreoffice$(VER)-script-provider-js
endif
-ifneq "$(MOZILLA)" ""
- ifneq "$(OOO_MOZILLA_ARCHS)" ""
- ifeq "$(MOZILLA)" "xulrunner"
- BUILD_DEPS+= , libxul-dev$(OOO_NO_MOZILLA_ARCHS), libnss3-dev (>= 3.12.3)$(OOO_NO_MOZILLA_ARCHS)
- DBG_DBG_SUGGESTS+= , libnss3-1d-dbg, libnspr4-0d-dbg
- else
- ifeq "$(MOZILLA)" "libxul"
- BUILD_DEPS+= , xulrunner-dev$(OOO_NO_MOZILLA_ARCHS), libnss3-dev (>= 3.12.3)$(OOO_NO_MOZILLA_ARCHS)
- else
- ifeq "$(MOZILLA)" "iceape"
- BUILD_DEPS += , $(MOZILLA)-dev (>= 1.1.9-5)$(OOO_NO_MOZILLA_ARCHS), libnss3-dev (>= 3.12.3)$(OOO_NO_MOZILLA_ARCHS)]
- else
- BUILD_DEPS += , $(MOZILLA)-dev$(OOO_NO_MOZILLA_ARCHS)
- endif
- endif
- DBG_DBG_SUGGESTS+= , libnss3-1d-dbg, libnspr4-0d-dbg
- endif
- endif
+ifneq (,$(filter nss, $(SYSTEM_STUFF)))
+ BUILD_DEPS+= , libnss3-dev (>= 3.12.3)
+ DBG_DBG_SUGGESTS+= , libnss3-1d-dbg
endif
-ifneq (,$(findstring $(ARCH),$(OOO_MOZILLA_ARCHS)))
- CONFIGURE_FLAGS += --with-system-mozilla=$(MOZILLA)
-else
- CONFIGURE_FLAGS += --disable-mozilla --without-system-mozilla
+ifneq (,$(filter mozilla-headers, $(SYSTEM_STUFF)))
+ BUILD_DEPS+= , xulrunner-dev
+endif
+ CONFIGURE_FLAGS += --disable-build-mozilla --disable-mozilla
+ifeq (,$(findstring $(DEB_HOST_ARCH),$(OOO_NPSOPLUGIN_ARCHS)))
PACKAGE_NPSOPLUGIN=n
endif
@@@ -848,6 -879,31 +862,6 @@@ ifeq "$(USE_SYSTEM_DMAKE)" "y
BUILD_DEPS += , dmake (>= 1:4.11)
endif
-ifneq "$(OOO_MONO_ARCHS)" ""
- ifeq "$(MONO2)" "y"
- BUILD_DEPS += , mono-devel $(MONO_MINVER) [$(OOO_MONO_ARCHS)], libmono-dev $(MONO_MINVER) [$(OOO_MONO_ARCHS)], mono-utils $(MONO_MINVER) [$(OOO_MONO_ARCHS)], cli-common-dev (>= 0.5.7) [$(OOO_MONO_ARCHS)]
- else
- # mono-gmcs for gmcs itself and mkbundle2
- # mono-mcs for mcs itself and al
- BUILD_DEPS += , mono-mcs $(MONO_MINVER) [$(OOO_MONO_ARCHS)], mono-gmcs $(MONO_MINVER) [$(OOO_MONO_ARCHS)], libmono-dev $(MONO_MINVER) [$(OOO_MONO_ARCHS)], mono-utils $(MONO_MINVER) [$(OOO_MONO_ARCHS)], cli-common-dev (>= 0.5.7) [$(OOO_MONO_ARCHS)], mono-1.0-devel [$(OOO_MONO_ARCHS)], mono-2.0-devel [$(OOO_MONO_ARCHS)]
- endif
-endif
-ifeq "$(ENABLE_MONO)" "y"
- # http://pkg-mono.alioth.debian.org/cli-policy/ch-mono.html#s7.3
- MONO_SHARED_DIR = $(CURDIR)
- export MONO_SHARED_DIR
- CONFIGURE_FLAGS+= --enable-mono
- ifeq "$(MONO2)" "y"
-export MCS=/usr/bin/mono-csc
-export GMCS=/usr/bin/mono-csc
-export MKBUNDLE2=/usr/bin/mkbundle
- endif
- DBG_DBG_SUGGESTS += , mono-jit-dbg [$(OOO_MONO_ARCHS)], libmono0-dbg [$(OOO_MONO_ARCHS)], mono-dbg [$(OOO_MONO_ARCHS)]
-else
- CONFIGURE_FLAGS+= --disable-mono
- DEBHELPER_OPTIONS += -Nlibuno-cli-basetypes1.0-cil -Nlibuno-cli-uretypes1.0-cil -Nlibuno-cli-oootypes1.0-cil -Nlibuno-cli-cppuhelper1.0-cil -Nlibuno-cli-ure1.0-cil
-endif
-
ifneq (,$(filter hunspell, $(SYSTEM_STUFF)))
BUILD_DEPS += , libhunspell-dev $(HUNSPELL_MIN_VER)
endif
@@@ -917,12 -973,6 +931,12 @@@ ifeq "$(USE_EXTERNAL_CXXLIBS)" "y
ifneq (,$(filter libwpg, $(SYSTEM_STUFF)))
BUILD_DEPS += , libwpg-dev (>= 0.2.0)
endif
+ ifneq (,$(filter libvisio, $(SYSTEM_STUFF)))
+ BUILD_DEPS += , libvisio-dev
+ endif
+ ifneq (,$(filter libcmis, $(SYSTEM_STUFF)))
+ BUILD_DEPS += , libcmis-dev
+ endif
endif
CONFIGURE_FLAGS += --with-external-thes-dir=$(THES_DIR)
@@@ -930,8 -980,17 +944,8 @@@ ifneq (,$(filter icu, $(SYSTEM_STUFF))
BUILD_DEPS += , libicu-dev $(ICU_MINVER)
endif
-ifneq (,$(filter libxslt, $(SYSTEM_STUFF)))
- BUILD_DEPS += , libxslt1-dev
- DBG_DBG_SUGGESTS+= , libxslt1-dbg
-endif
-
ifneq (,$(filter xmlsec, $(SYSTEM_STUFF)))
- ifneq (,$(findstring xul,$(MOZILLA)))
- BUILD_DEPS += , libxmlsec1-dev (>= 1.2.9-1.1), libxmlsec1-nss (>= 1.2.9-1.1), libxmlsec1-openssl (>= 1.2.9-1.1)
- else
BUILD_DEPS += , libxmlsec1-dev (>= 1.2.9), libxmlsec1-nss (>= 1.2.9), libxmlsec1-openssl (>= 1.2.9)
- endif
endif
ifeq "$(BUILD_CAIROCANVAS)" "y"
@@@ -976,15 -1035,6 +990,15 @@@ ifeq "$(BUILD_GTK)" "n
DEBHELPER_OPTIONS+= -Nlibreoffice$(VER)-gtk -Nlibreoffice$(VER)-gnome
CONFIGURE_FLAGS+= --with-images="$(IMAGES)"
endif
+ifeq "$(BUILD_GTK3)" "y"
+ BUILD_DEPS += , libgtk-3-dev (>= 3.2~)
+ CONFIGURE_FLAGS+= --enable-gtk3
+ ifneq (cairo,$(findstring cairo,$(SYSTEM_STUFF)))
+ $(error GTK3 build fails without system-cairo!!)
+ endif
+else
+ DEBHELPER_OPTIONS+= -Nlibreoffice$(VER)-gtk3
+endif
ifeq "$(ENABLE_EVO2)" "n"
CONFIGURE_FLAGS += --disable-evolution2
@@@ -1128,30 -1178,52 +1142,30 @@@ ifeq "$(ENABLE_GCONF)" "y
else
CONFIGURE_FLAGS += --disable-gconf
endif
+ BUILD_DEPS += , gettext
ifeq "$(PACKAGE_TTF_OPENSYMBOL)" "y"
BUILD_DEPS_INDEP += , fontforge
endif
-ifneq "$(ISOS)" "en-US"
- CONFIGURE_FLAGS += --with-system-translate-toolkit
- BUILD_DEPS_INDEP += , translate-toolkit (>= 1.9)
-endif
-
# Use compiler cache? Include ccache in DEB_BUILD_OPTIONS for much faster rebuild times
- # A complete build uses about 200Mb of compiler cache.
+ # A complete build uses about 4.5G of compiler cache.
-ifeq (ccache,$(findstring ccache,$(DEB_BUILD_OPTIONS)))
- CONFIGURE_FLAGS += --with-gcc-speedup=ccache
+ifneq (ccache,$(findstring ccache,$(DEB_BUILD_OPTIONS)))
+ CONFIGURE_FLAGS += --disable-ccache
endif
## Build n projects in parallel?
## DEB_BUILD_OPTIONS=parallel=<n>
+## if not specified LibreOffices configure tries to find it out itself
NUM_CPUS=$(shell echo "$(DEB_BUILD_OPTIONS) " | sed -n 's/^\(.* \)\?parallel=\([0-9]\+\).*$$/\2/p')
AVAIL_CPUS := $(shell getconf _NPROCESSORS_ONLN 2>/dev/null || echo 1)
-ifeq "$(NUM_CPUS)" ""
- NUM_CPUS := 1
- ifeq "$(PARALLEL_BUILD)" "y"
- # according to Pavel Janik, build -P<number of cores> -- -P2
- # is ideal. This sets the first -P according to the number
- # of CPUs (where dual-core CPUS report 2, too)
- ifneq ($(AVAIL_CPUS),1)
- NUM_CPUS := $(shell expr $(AVAIL_CPUS))
- endif
+ifeq "$(PARALLEL_BUILD)" "y"
# http://bugs.debian.org/622644
BUILD_DEPS += , make (>= 3.82)
- endif
-else
- ifneq "$(PARALLEL_BUILD)" "y"
- # no more than 2, please. At least 6 seems to fail.
- ifneq ($(NUM_CPUS),1)
- ifneq ($(NUM_CPUS),2)
- NUM_CPUS := 2
- endif
- endif
+ ifneq "$(NUM_CPUS)" "$(AVAIL_CPUS)"
+ CONFIGURE_FLAGS += --with-num-cpus=$(NUM_CPUS)
endif
endif
-# disabled for now. needs fixed GNU make (#622644)
-# CONFIGURE_FLAGS += --with-num-cpus=$(NUM_CPUS)
- # breaks. At least with 2
-# CONFIGURE_FLAGS += --with-max-jobs=$(NUM_CPUS)
CURDIR ?= $(shell pwd)
@@@ -1176,7 -1248,8 +1190,7 @@@ ifeq "$(ENABLE_LDAP)" "y
ifeq "$(USE_OPENLDAP)" "y"
BUILD_DEPS += , libldap2-dev
LDAP_LIB := $(shell echo libldap-`grep LDAP_VENDOR_VERSION_M /usr/include/ldap_features.h | cut -d: -f2 | awk '{ print $$3 }' | xargs | sed -e "s/ /\./"`-`grep LDAP_VENDOR_VERSION_MAJOR /usr/include/ldap_features.h | cut -d: -f2 | awk '{ print $$3 }'`)
- else
- CONFIGURE_FLAGS += --without-openldap
+ CONFIGURE_FLAGS += --with-openldap
endif
else
CONFIGURE_FLAGS += --disable-ldap
@@@ -1205,38 -1278,75 +1219,38 @@@ endi
clean-debdir:
dh_testdir
rm -f debian/*.postinst debian/*.postrm debian/*.preinst debian/*.prerm debian/*.triggers
- rm -f $(STAMP_DIR)/setup
dh_clean
-# Clean compilation results, but leave solver (about 600Mb in addition to instsetoo)
-clean-objectdirs: clean-instsetoo
- dh_testdir
- find $(SOURCE_TREE) -maxdepth 2 -name $(shell . $(SOURCE_TREE)/*Env*.sh; echo $$OUTPATH$$PROEXT) -type d -exec rm -rf {} \;
-
clean:
dh_testroot
dh_testdir
# remove generated symlinks / java wrappers
rm -rf debian/usr
rm -f $(OOO_BUILD_TREE)/src/GSI*err
rm -f $(OOO_BUILD_TREE)/config.*
+ if [ -f Makefile ]; then $(MAKE) distclean; fi
+ rm -rf $(SOURCE_TREE)/pyuno-py3
+ rm -f config.status
+
ifneq "$(OOO_L10N_DIR)" ""
rm -rf $(OOO_L10N_DIR)
endif
- dh_clean
+ifeq "$(HELPISOS)" ""
+ rm -rf images*
+endif
# Files created in debian directory
- rm -f debian/*.postinst debian/*.postrm debian/*.preinst debian/*.prerm
+ $(MAKE) -f debian/rules clean-debdir
find debian -name "*.links" ! -name "libreoffice-common*.links" -exec rm {} \;
if [ -d "$(STAMP_DIR)" ]; then rm -rf "$(STAMP_DIR)"; fi
rm -f debian/shlibs.override.stdlibs
rm -f debian/*.bug-script
rm -f debian/scripts/aotcompile.py*
-ifeq "$(ENABLE_MONO)" "y"
- rm -rf $(MONO_SHARED_DIR)/.wapi
-endif
-
-ifeq "$(HELPISOS)" ""
- rm -rf images*
-endif
-
rm -f l10n.fdupes
rm -f debian/shlibs.local
rm -f debian/*.templates
@@@ -1251,17 -1361,44 +1265,17 @@@
rm -f debian/openoffice.org-dtd-officedocument1.0.xmlcatalogs
rm -f download.list
- rm -f $(OOO_BUILD_TREE)/src/libreoffice-$(OOO_BUILD_TARBAL_VERSION)*
- rm -f $(OOO_BUILD_TREE)/src/GSI*
- rm -f $(OOO_BUILD_TREE)/src/*.log
-
- for i in ext-sources-$(OOO_BUILD_TREE)/*; do \
- rm -f $(OOO_BUILD_TREE)/src/`basename $$i`; \
- done
-
- for i in `find $(OOO_BUILD_TREE)/patches/dev300 -name "*.in" ! -name "Makefile*"`; do \
- if [ -e `echo $$i | sed -e s/\.in$$//` ]; then \
- rm `echo $$i | sed -e s/\.in$$//`; \
- fi; \
- done
- rm -f $(OOO_BUILD_TREE)/bin/setup
- rm -f $(OOO_BUILD_TREE)/bin/piece/sys-setup
- rm -f $(OOO_BUILD_TREE)/download
- rm -f $(OOO_BUILD_TREE)/distro-configs/*.conf
- rm -f $(OOO_BUILD_TREE)/patches/apply.pl
- find $(OOO_BUILD_TREE) -name "Makefile" | xargs rm -f
- rm -f $(OOO_BUILD_TREE)/intltool-extract \
- $(OOO_BUILD_TREE)/intltool-merge \
- $(OOO_BUILD_TREE)/intltool-update
- rm -f $(OOO_BUILD_TREE)/scratch/place
-
- # left-over from ooo-pack-sources
- rm -rf .releases
-
$(MAKE) -f debian/rules control
# Generate control file, because we have so many different languages
# Based on script by Martin Quinson <Martin.Quinson@tuxfamily.org>
control: debian/control
-debian/control: $(wildcard debian/control*in) $(OOO_BUILD_TREE)/bin/openoffice-xlate-lang debian/rules
- chmod 755 $(OOO_BUILD_TREE)/bin/openoffice-xlate-lang
+debian/control: $(wildcard debian/control*in) $(SOURCE_TREE)/bin/lo-xlate-lang debian/rules
+ chmod 755 $(SOURCE_TREE)/bin/lo-xlate-lang
sed -e "s#libreofficeVER#libreoffice$(VER)#g" \
-e "s#libreofficeVER#libreoffice$(VER)#g" \
- -e "s#%$(DIST)=\([^%]*\)%#, \1#g#" \
+ -e "s#%$(DEB_VENDOR)=\([^%]*\)%#, \1#g#" \
-e "s#%[A-Za-z]*=[^%]*%##g#" \
-e "s#%BUILD_DEPS%#$(strip $(BUILD_DEPS))#g" \
-e "s#%BUILD_DEPS_INDEP%#$(strip $(BUILD_DEPS_INDEP))#g" \
@@@ -1280,9 -1417,9 +1294,9 @@@ ifeq "$(ENABLE_LDAP)" "y
endif
for LNUM in $(filter-out en-US,$(LANGPACKISOS)) ; do \
- [ "$$LNUM" = en-US -a "$(PKGSOURCE)" = "libreoffice$(VER)-l10n" ] && continue; \
- LNAME=`$(OOO_BUILD_TREE)/bin/openoffice-xlate-lang -l $$LNUM | perl -e 'print ucfirst(<STDIN>);'`; \
- LCODE=`$(OOO_BUILD_TREE)/bin/openoffice-xlate-lang -i $$LNUM | tr A-Z a-z`; \
+ [ "$$LNUM" = en-US -a "$(DEB_SOURCE)" = "libreoffice$(VER)-l10n" ] && continue; \
+ LNAME=`$(SOURCE_TREE)/bin/lo-xlate-lang -l $$LNUM | perl -e 'print ucfirst(<STDIN>);'`; \
+ LCODE=`$(SOURCE_TREE)/bin/lo-xlate-lang -i $$LNUM | tr A-Z a-z`; \
CCODE=`echo $$LCODE | sed 's/-.*//'`; \
case "$$LCODE" in \
bn|gu|pa-in|ml|or|te|ta) \
@@@ -1343,8 -1480,8 +1357,8 @@@
ifneq "$(HELPISOS)" ""
for LNUM in $(HELPISOS) ; do \
- LNAME=`$(OOO_BUILD_TREE)/bin/openoffice-xlate-lang -l $$LNUM | perl -e 'print ucfirst(<STDIN>);'`; \
- LCODE=`$(OOO_BUILD_TREE)/bin/openoffice-xlate-lang -i $$LNUM | tr A-Z a-z`; \
+ LNAME=`$(SOURCE_TREE)/bin/lo-xlate-lang -l $$LNUM | perl -e 'print ucfirst(<STDIN>);'`; \
+ LCODE=`$(SOURCE_TREE)/bin/lo-xlate-lang -i $$LNUM | tr A-Z a-z`; \
CCODE=`echo $$LCODE | sed 's/-.*//'`; \
sed -e "s|@LNAME@|$$LNAME|g" -e "s|@LCODE@|$$LCODE|g" \
-e "s|@CCODE@|$$CCODE|g" \
@@@ -1363,6 -1500,10 +1377,6 @@@ ifeq "$(ENABLE_JAVA)" "y
sed -e "s|libreofficeVER|libreoffice$(VER)|g" \
>> debian/control < debian/control.gcj.in
endif
-ifneq "$(OOO_MONO_ARCHS)" ""
- sed -e "s|libreofficeVER|libreoffice$(VER)|g" \
- >> debian/control < debian/control.mono.in
-endif
ifneq "$(OOO_NPSOPLUGIN_ARCHS)" ""
sed -e "s|libreofficeVER|libreoffice$(VER)|g" \
>> debian/control < debian/control.mozilla.in
@@@ -1436,6 -1577,7 +1450,6 @@@ endi
perl -pi -e "s,%OOO_NO_BASE_ARCHS%,$(OOO_NO_BASE_ARCHS),"g debian/control
perl -pi -e "s,%OOO_JAVA_ARCHS%,$(OOO_JAVA_ARCHS),g" debian/control
perl -pi -e "s,%OOO_GCJ_ARCHS%,$(OOO_GCJ_ARCHS),g" debian/control
- perl -pi -e "s,%OOO_MONO_ARCHS%,$(OOO_MONO_ARCHS),g" debian/control
perl -pi -e "s,%OOO_NPSOPLUGIN_ARCHS%,$(OOO_NPSOPLUGIN_ARCHS),g" debian/control
perl -pi -e "s,%OOO_OGLTRANS_ARCHS%,$(OOO_OGLTRANS_ARCHS),g" debian/control
perl -pi -e "s,%OOO_BINFILTER_ARCHS%,$(OOO_BINFILTER_ARCHS),g" debian/control
@@@ -1514,7 -1656,8 +1528,7 @@@ build-indep: $(STAMP_DIR)/buil
# so that the target will not be run again. Removing the file will make
# make run the target over.
-configure: $(OOO_BUILD_TREE)/config.status
-$(OOO_BUILD_TREE)/config.status: $(OOO_BUILD_TREE)/configure
+config.status:
dh_testdir
# Make sure needed scripts are executable
@@@ -1522,13 -1665,20 +1536,13 @@@
for FILE in debian/scripts/move-if-change \
debian/scripts/cleandupes \
debian/scripts/get_libebook_dep.sh \
- $(OOO_BUILD_TREE)/configure \
- $(OOO_BUILD_TREE)/bin/[a-z]* \
- $(OOO_BUILD_TREE)/bin/piece/[a-z]*; \
+ autogen.sh; \
do \
chmod 755 $$FILE ;\
done
mkdir -p $(STAMP_DIR)
-ifeq "$(USE_SOURCE_TARBALLS)" "y"
- cp -a sources/* $(OOO_BUILD_TREE)/src
-endif
- cp -a ext-sources-$(OOO_BUILD_TREE)/* $(OOO_BUILD_TREE)/src
-
ifneq ($(GCC_VERSION),)
ifneq ($(GCC_VERSION),snapshot)
# create links for gcc and g++ (and gij and gcj), ooo-build does not
@@@ -1552,15 -1702,68 +1566,15 @@@
endif
endif
# Make sure we have /proc mounted - otherwise idlc will fail later.
test -r /proc/version
- # hrmpf. Empty in ooo-build and patch does not give them to us but
- # configure need them. Create them...
- touch $(OOO_BUILD_TREE)/distro-configs/Win32.conf.in
- touch $(OOO_BUILD_TREE)/distro-configs/Solaris.conf.in
-
- cd $(OOO_BUILD_TREE) ; \
- PATH=$(BUILD_PATH) LD_LIBRARY_PATH=$(BUILD_LD_LIBRARY_PATH) ../$(OOO_BUILD_TREE)/configure $(CONFIGURE_FLAGS)
+ PATH=$(BUILD_PATH) LD_LIBRARY_PATH=$(BUILD_LD_LIBRARY_PATH) ./autogen.sh $(CONFIGURE_FLAGS)
touch $@
build: $(STAMP_DIR)/build
-$(STAMP_DIR)/build: $(OOO_BUILD_TREE)/config.status
+$(STAMP_DIR)/build: config.status
dh_testdir
ifeq "$(BUILD_KDE)" "n"
@@@ -1574,7 -1777,11 +1588,7 @@@
fi
endif
-ifeq ($(ON_BUILDD),y)
- cd $(OOO_BUILD_TREE) ; PATH=$(BUILD_PATH) LD_LIBRARY_PATH=$(BUILD_LD_LIBRARY_PATH) DEFAULT_TO_ENGLISH_FOR_PACKING=1 ARCH_FLAGS=$(ARCH_FLAGS) TMP=`mktemp -q -d` CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" $(MAKE) build
-else
- cd $(OOO_BUILD_TREE) ; PATH=$(BUILD_PATH) LD_LIBRARY_PATH=$(BUILD_LD_LIBRARY_PATH) DEFAULT_TO_ENGLISH_FOR_PACKING=1 VERBOSE=true ARCH_FLAGS=$(ARCH_FLAGS) TMP=`mktemp -q -d` CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" $(MAKE) build
-endif
+ PATH=$(BUILD_PATH) LD_LIBRARY_PATH=$(BUILD_LD_LIBRARY_PATH) DEFAULT_TO_ENGLISH_FOR_PACKING=1 ARCH_FLAGS=$(ARCH_FLAGS) TMP=`mktemp -q -d` CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" $(MAKE) build
# apparently setting this here globally doesn't work, so hack around.
# If we don't do this we get loads of harmless, but log-bloating
@@@ -1586,52 -1793,70 +1600,52 @@@
# DPKG is only set on with-EPM build what we don't do and the menu stuff
# is only built wenn DPKG is set.. Same with PKGFORMAT.
cd $(SOURCE_TREE)/sysui; \
- . $(CURDIR)/$(SOURCE_TREE)/*Env*.sh; \
+ . $(CURDIR)/$(SOURCE_TREE)/Env.Host.sh; \
PATH=$(BUILD_PATH) DPKG="dpkg" PKGFORMAT="deb" NO_PKG_MANGLE=go-away \
../solenv/bin/build.pl && ../solenv/bin/deliver.pl
-ifeq "$(PACKAGE_SDK)" "y"
- # build gengal...
- cd $(SOURCE_TREE)/svx/source/gengal; \
- . $(CURDIR)/$(SOURCE_TREE)/*Env*.sh; \
- PATH=$(BUILD_PATH) \
- dmake
+ifeq "$(BUILD_PYUNO)" "y"
+ ifeq "$(ENABLE_PYTHON3)" "y"
+ # FIXME: won't work when pyuno is migrated to gbuild as all is directly in solver
+ # 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!
+ endif
endif
ifneq (nocheck,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
- $(CURDIR)/debian/rules test
+ $(CURDIR)/debian/rules check
endif
touch $@
-test:
- # some test library needed for the tests...
- if [ ! -f $(SOURCE_TREE)/test/$(shell . $(SOURCE_TREE)/*Env*.sh; echo $$OUTPATH$$PROEXT)/lib/libtest.so ]; then \
- cd $(SOURCE_TREE)/test && \
- . $(CURDIR)/$(SOURCE_TREE)/*Env*.sh; \
- export PATH=$(BUILD_PATH); \
- ../solenv/bin/build.pl; \
- ../solenv/bin/deliver.pl; \
- fi
-ifeq "$(RUN_SMOKETEST)" "y"
- # sigh. the new smoketest needs a archive/install/en-US/OOo_*_install_*.tar.gz
- # build it.
- if [ ! -d $(SOURCE_TREE)/instsetoo_native/$(shell . $(SOURCE_TREE)/*Env*.sh; echo $$OUTPATH$$PROEXT)/OpenOffice/archive/install/en-US ]; then \
- cd $(SOURCE_TREE)/instsetoo_native/util && \
- . $(CURDIR)/$(SOURCE_TREE)/*Env*.sh; \
- export PATH=$(BUILD_PATH); \
- EPM=yes PKGFORMAT=archive WITH_LANG="en-US" dmake openoffice; \
- fi
- # smoketest
-ifeq "$(ARCH)" "armel"
+check:
+ifeq "$(RUN_MAKE_CHECK)" "y"
+ifeq "$(DEB_HOST_ARCH)" "armel"
cd $(SOURCE_TREE)/smoketestoo_native && \
patch -p1 < $(CURDIR)/debian/smoketest/patches/smoketest-disable-db-insert-delete-seek-tests.diff
endif
- cd $(SOURCE_TREE)/smoketestoo_native && \
- . $(CURDIR)/$(SOURCE_TREE)/*Env*.sh; \
+
+ cd $(SOURCE_TREE) && \
export PATH=$(BUILD_PATH); \
export TMPDIR=$(CURDIR)/debian/smoketest; \
- export JAVA_HOME=$(TEST_JAVA_HOME); \
- export SAL_USE_VCLPLUGIN="svp"; \
export HOME=$(CURDIR)/debian/smoketest; \
- ../solenv/bin/build.pl
+ export SAL_USE_VCLPLUGIN="svp"; \
+ $(MAKE) check
# doesn't get cleaned up.. (at least the dirs, the contents are gone)
cd $(CURDIR)/debian/smoketest && \
find . -noleaf -maxdepth 1 ! -name "patches" ! -name "." -exec rm -rf {} \;
-ifeq "$(ARCH)" "armel"
+
+ifeq "$(DEB_HOST_ARCH)" "armel"
cd $(SOURCE_TREE)/smoketestoo_native && \
patch -p1 -R < $(CURDIR)/debian/smoketest/patches/smoketest-disable-db-insert-delete-seek-tests.diff
endif
endif
-ifeq "$(RUN_SUBSEQUENT_TESTS)" "y"
- cd $(SOURCE_TREE) && \
- export PATH=$(BUILD_PATH); \
- . $(CURDIR)/$(SOURCE_TREE)/*Env*.sh; \
- chmod 755 solenv/bin/subsequenttests && \
- solenv/bin/subsequenttests
-endif
install: $(STAMP_DIR)/install
$(STAMP_DIR)/install: $(STAMP_DIR)/build
@@@ -1651,18 -1876,18 +1665,18 @@@
# /usr/lib/libfakeroot anymore, causiong loads of ERROR:'s from
# ld.so. Set LD_PRELOAD to the full path here manually.
cd $(SOURCE_TREE)/; \
- . $(CURDIR)/$(SOURCE_TREE)/*Env*.sh; \
+ . $(CURDIR)/$(SOURCE_TREE)/Env.Host.sh; \
PATH=$(BUILD_PATH) \
LD_LIBRARY_PATH="/usr/lib/libfakeroot:$(BUILD_LD_LIBRARY_PATH)" \
LD_PRELOAD=/usr/lib/libfakeroot/libfakeroot-$(shell update-alternatives --query fakeroot | grep Value: | cut -d"-" -f2).so \
DESTDIR=$(CURDIR)/debian/tmp \
- solenv/bin/ooinstall /$(OOBRANDDIR)
- # FIXME: Move here so that we don't rely on libreoffice-build here.
- # Would also obsolete disable-ooinstall-in-package-ooo.diff
- cd $(OOO_BUILD_TREE)/bin; \
- export OODESTDIR=$(CURDIR)/debian/tmp; \
- ./package-ooo
-
+ $(MAKE) distro-pack-install
+ export DESTDIR=$(CURDIR)/debian/tmp ;\
+ export VERSION=$(BASIS_VERSION); \
+ export OOINSTBASE=$(OOBRANDDIR); \
+ export OOO_LANGS_LIST=$(ISOS); \
+ $(CURDIR)/debian/scripts/gid2pkgdirs.sh
+
# prepare install/dir files for dh
for i in `cd $(CURDIR)/debian/tmp/pkg; ls -1 | xargs`; do \
echo "$${i}/usr/* usr" > debian/$$i.install; \
@@@ -1778,6 -2003,27 +1792,6 @@@ ifeq "$(ENABLE_JAVA)" "y
endif
endif
-ifeq "$(ENABLE_MONO)" "y"
- mkdir -p $(PKGDIR)-core/$(OOBRANDDIR)/ure/lib; \
- mv $(PKGDIR)-common/$(OOBRANDDIR)/ure/lib/cli_uno_bridge.dll* \
- $(PKGDIR)-core/$(OOBRANDDIR)/ure/lib
- mv $(PKGDIR)-common/$(OOBRANDDIR)/ure/lib/mono_loader*.uno.so \
- $(PKGDIR)-core/$(OOBRANDDIR)/ure/lib
- for i in `dh_listpackages | grep libuno-cli`; do \
- if echo "$$i" | grep -q oootypes; then p=libreoffice-common; d=$(OODIR)/program; \
- else p=ure; d=$(OOBRANDDIR)/ure/lib; fi; \
- rm -rf debian/$$i && mkdir -p -m755 debian/$$i/usr/lib/cli/uno-`echo $$i | perl -pi -e 's/.*(\d.\d).*/$$1/'`; \
- mv debian/$$p/$$d/`echo $$i | sed -e "s/libuno-//" | sed -e "s/-cil$$//" | sed -e "s/-/_/" | perl -pi -e 's/\d.\d//'`.dll \
- debian/$$i/usr/lib/cli/uno-`echo $$i | perl -pi -e 's/.*(\d.\d).*/$$1/'`; \
- mv debian/$$p/$$d/`echo $$i | sed -e "s/libuno-//" | sed -e "s/-cil$$//" | sed -e "s/-/_/" | perl -pi -e 's/\d.\d//'`.config \
- debian/$$i/usr/lib/cli/uno-`echo $$i | perl -pi -e 's/.*(\d.\d).*/$$1/'`/`echo $$i | sed -e "s/libuno-//" | sed -e "s/-cil$$//" | sed -e "s/-/_/" | perl -pi -e 's/\d.\d//'`.dll.config; \
- ln -s `echo $$i | sed -e "s/libuno-//" | sed -e "s/-cil$$//" | sed -e "s/-/_/" | perl -pi -e 's/\d.\d//'`.dll.config \
- debian/$$i/usr/lib/cli/uno-`echo $$i | perl -pi -e 's/.*(\d.\d).*/$$1/'`/`echo $$i | sed -e "s/libuno-//" | sed -e "s/-cil$$//" | sed -e "s/-/_/" | perl -pi -e 's/\d.\d//'`.config; \
- mv debian/$$p/$$d/policy.*.`echo $$i | sed -e "s/libuno-//" | sed -e "s/-cil$$//" | sed -e "s/-/_/" | perl -pi -e 's/\d.\d//'`.dll \
- debian/$$i/usr/lib/cli/uno-`echo $$i | perl -pi -e 's/.*(\d.\d).*/$$1/'`; \
- done
-endif
-
# remove eventually sneaked in .testtoolrc
rm -f $(PKGDIR)-common/$(OODIR)/program/.testtoolrc
@@@ -1816,9 -2062,9 +1830,9 @@@ endi
rm ure-link && ln -sf /$(OOUREDIR) ure-link
ifeq "$(ENABLE_EVO2)" "y"
- mkdir -p $(PKGDIR)-evolution/$(OODIR)/presets/database
- mv $(PKGDIR)-common/$(OODIR)/presets/database/evolocal.odb \
- $(PKGDIR)-evolution/$(OODIR)/presets/database
+ mkdir -p $(PKGDIR)-evolution/$(OOBRANDDIR)/presets/database
+ mv $(PKGDIR)-common/$(OOBRANDDIR)/presets/database/evolocal.odb \
+ $(PKGDIR)-evolution/$(OOBRANDDIR)/presets/database
endif
find debian/tmp ! -perm -200 | xargs -r chmod u+w
@@@ -1828,7 -2074,7 +1842,7 @@@
#
# Generate maintainer scripts
maintscripts: $(STAMP_DIR)/maintscripts
-$(STAMP_DIR)/maintscripts: $(wildcard debian/shell-lib*Env*.sh) $(wildcard debian/*.preinst.in) $(wildcard debian/*.postinst.in) $(wildcard debian/*.prerm.in) $(wildcard debian/*.postrm.in) debian/scripts/vars.$(ARCH) debian/control
+$(STAMP_DIR)/maintscripts: $(wildcard debian/shell-lib*.sh) $(wildcard debian/*.preinst.in) $(wildcard debian/*.postinst.in) $(wildcard debian/*.prerm.in) $(wildcard debian/*.postrm.in) debian/scripts/vars.$(DEB_HOST_ARCH) debian/control
dh_testdir
rm -f debian/*.{pre,post}{inst,rm}
@@@ -1840,7 -2086,8 +1854,7 @@@
if [ -e $$MAINTSCRIPT.in ]; then \
sed -n '1,/^#INCLUDE_SHELL_LIB#$$/p' < $$MAINTSCRIPT.in | sed -e '/^#INCLUDE_SHELL_LIB#$$/d' > $$MAINTSCRIPT; \
if echo $(ARCH_DEP_PACKAGES) | grep -q $$PKG; then \
- grep LIBSUFFIX debian/scripts/vars.$(ARCH) >> $$MAINTSCRIPT; \
- grep PLATFORMID debian/scripts/vars.$(ARCH) >> $$MAINTSCRIPT; \
+ grep PLATFORMID debian/scripts/vars.$(DEB_HOST_ARCH) >> $$MAINTSCRIPT; \
fi; \
echo "" >> $$MAINTSCRIPT; \
if egrep -q "(add|remove|validate|sync)_extension" $$MAINTSCRIPT.in; then \
@@@ -1863,7 -2110,7 +1877,7 @@@
# Install files generated by setup into package directories
langpacks: $(STAMP_DIR)/langpacks
-$(STAMP_DIR)/langpacks: $(STAMP_DIR)/install $(STAMP_DIR)/install-indep $(OOO_BUILD_TREE)/bin/openoffice-xlate-lang
+$(STAMP_DIR)/langpacks: $(STAMP_DIR)/install $(STAMP_DIR)/install-indep $(SOURCE_TREE)/bin/lo-xlate-lang
# remove empty uno_packages dirs somehow in the langpacks(?)
for iso in `echo $(LANGPACKISOS) | tr A-Z a-z`; do \
@@@ -1909,7 -2156,7 +1923,7 @@@
> $$TMP && \
debian/scripts/cleandupes --base=libreoffice$(VER) --prefix=debian < $$TMP && rm -f $$TMP
-ifeq "$(DIST)" "Debian"
+ifeq "$(DEB_VENDOR)" "Debian"
# install Debian presentation template
otps=`cd debian/templates; echo *.otp`; \
for iso in $(LANGPACKISOS); do \
@@@ -2059,7 -2306,7 +2073,7 @@@ ifeq "$(ENABLE_KDEAB)" "y
mv $(PKGDIR)-core/$(OODIR)/program/$$f $(PKGDIR)-kab/$(OODIR)/program || exit 1 ;\
done
mkdir -p $(PKGDIR)-kab/$(OODIR)/registered-components
- install -m644 $(SOURCE_TREE)/solver/$(shell . $(SOURCE_TREE)/*Env*.sh; echo $$UPD/$$OUTPATH$$PROEXT)/xml/kab1.component \
+ install -m644 $(SOURCE_TREE)/solver/$(shell . $(SOURCE_TREE)/Env.Host.sh; echo $$UPD/$$OUTPATH$$PROEXT)/xml/kab1.component \
$(PKGDIR)-kab/$(OODIR)/registered-components/kab1.component
endif
@@@ -2068,16 -2315,11 +2082,16 @@@
mkdir -p -m755 $(PKGDIR)-gnome/$(OODIR)/program
mv $(PKGDIR)-core/$(OODIR)/program/gnome-open-url.bin $(PKGDIR)-gnome/$(OODIR)/program || exit 1
ifeq "$(BUILD_GTK)" "y"
- for f in fps_gnome.uno.so libvclplug_gtk*.so; do \
+ for f in fps_gnome.uno.so libvclplug_gtklo.so; do \
mv $(PKGDIR)-core/$(OODIR)/program/$$f $(PKGDIR)-gnome/$(OODIR)/program || exit 1;\
done
mv $(PKGDIR)-core/$(OODIR)/program/libqstart_gtk* $(PKGDIR)-gnome/$(OODIR)/program || exit 1
endif
+ifeq "$(BUILD_GTK3)" "y"
+ for f in libvclplug_gtk3lo.so; do \
+ mv $(PKGDIR)-core/$(OODIR)/program/$$f $(PKGDIR)-gnome/$(OODIR)/program || exit 1;\
+ done
+endif
# split out gtk stuff
rm -rf $(PKGDIR)-gtk
@@@ -2105,14 -2347,14 +2119,14 @@@ ifeq "$(ENABLE_EVO2)" "y
mkdir -p -m755 $(PKGDIR)-evolution/$(OODIR)/program
mv $(PKGDIR)-core/$(OODIR)/program/libevoab*.so $(PKGDIR)-evolution/$(OODIR)/program
mkdir -p $(PKGDIR)-evolution/$(OODIR)/registered-components
- install -m644 $(SOURCE_TREE)/solver/$(shell . $(SOURCE_TREE)/*Env*.sh; echo $$UPD/$$OUTPATH$$PROEXT)/xml/evoab.component \
+ install -m644 $(SOURCE_TREE)/solver/$(shell . $(SOURCE_TREE)/Env.Host.sh; echo $$UPD/$$OUTPATH$$PROEXT)/xml/evoab.component \
$(PKGDIR)-evolution/$(OODIR)/registered-components/evoab.component
endif
ifeq "$(BUILD_BINFILTERS)" "y"
mkdir -p $(PKGDIR)-filter-binfilter/$(OODIR)/registered-components
for i in bf_migratefilter bindet; do \
- install -m644 $(SOURCE_TREE)/solver/$(shell . $(SOURCE_TREE)/*Env*.sh; echo $$UPD/$$OUTPATH$$PROEXT)/xml/$$i.component \
+ install -m644 $(SOURCE_TREE)/solver/$(shell . $(SOURCE_TREE)/Env.Host.sh; echo $$UPD/$$OUTPATH$$PROEXT)/xml/$$i.component \
$(PKGDIR)-filter-binfilter/$(OODIR)/registered-components/$$i.component; \
done
endif
@@@ -2200,8 -2442,9 +2214,8 @@@ endi
mkdir -p -m755 $(PKGDIR)-base/usr/share/applications \
$(PKGDIR)-core/usr/share/applications
-ifeq "$(USE_OOO_BUILD_DESKTOPS)" "n"
# menu files from sysui
- dirname="`cd $(SOURCE_TREE)/sysui/$(shell . $(SOURCE_TREE)/*Env*.sh; echo $$OUTPATH$$PROEXT)/misc/desktopshare >/dev/null; pwd`" ;\
+ dirname="`cd $(SOURCE_TREE)/sysui/$(shell . $(SOURCE_TREE)/Env.Host.sh; echo $$OUTPATH$$PROEXT)/misc/desktopshare >/dev/null; pwd`" ;\
for p in writer calc impress draw math base; do \
mkdir -p -m755 $(PKGDIR)-$$p/usr/share/applications ;\
sed -e 's,Exec=$${UNIXBASISROOTNAME} \(.*\) %U,Exec=libreoffice$(VER) \1 %U,' \
@@@ -2245,10 -2488,25 +2259,11 @@@
perl -pi -e 's/Application;//; s/X-Red-Hat-Base;//; s/X-SuSE-Core-Office;//; s/X-MandrivaLinux-.*;//;' $(PKGDIR)-$$i/usr/share/applications/libreoffice$(VER)-$$i.desktop; \
done
perl -pi -e 's/Application;//' $(PKGDIR)-gtk/$(OOBRANDDIR)/share/xdg/qstart.desktop
-else
- # menu files from $(OOO_BUILD_TREE)/desktop
- for p in writer calc impress draw math base; do \
- mkdir -p -m755 $(PKGDIR)-$$p/usr/share/applications ;\
- sed -e '/^TryExec=.*/d' \
- -e "s,^Exec=.*,Exec=ooffice$(VER) -$$p %U," \
- -e "s,^Icon=.*,Icon=ooo-$$p," \
- -e '/^Name=/s, , ,' \
- -e 's/@STARTUPNOTIFY@/true/' \
- -e '/^Categories/s/Office/Application;Office/' \
- $(OOO_BUILD_TREE)/desktop/$$p.desktop \
- > $(PKGDIR)-$$p/usr/share/applications/libreoffice$(VER)-$$p.desktop || exit 1 ;\
- done
-endif
# add version to .menu and .lintian-overrides
for i in base calc draw impress math writer; do \
cat debian/libreoffice$(VER)-$$i.menu.in \
| sed -e s/@VER@/$(VER)/ \
+ | sed -e s,@ICONVERSION@,$(shell echo $(OOVER) | sed -e "s/\.//g"), \
> debian/libreoffice$(VER)-$$i.menu; \
done; \
for i in base calc core draw impress math writer; do \
@@@ -2270,31 -2528,11 +2285,31 @@@ ifeq "$(BUILD_PYUNO)" "y
echo 'PYTHONPATH=$$PYTHONHOME $$PYTHONHOME/site-packages $$PYTHONHOME/lib-dynload $$PYTHONHOME/lib-tk $$ORIGIN' \
) > debian/python-uno/$(OODIR)/program/pythonloader.unorc
chmod u-w debian/python-uno/$(OODIR)/program/pythonloader.unorc
+ ifeq "$(ENABLE_PYTHON3)" "y"
+ install -d $(PYTHON3_SITE)
+ cp $(PYTHON_SITE)/uno.py \
+ $(PYTHON3_SITE)
+ cp $(PYTHON_SITE)/unohelper.py \
+ $(PYTHON3_SITE)
+ cat debian/python-uno/$(OODIR)/program/pythonloader.unorc \
+ 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/$(shell . $(SOURCE_TREE)/Env.Host.sh; echo $$OUTPATH$$PROEXT)/lib/$$i \
+ debian/python3-uno/$(OODIR)/$$i; \
+ done
+ endif
ifeq "$(ENABLE_SCRIPT_PROVIDER_PYTHON)" "y"
mkdir -p debian/python-uno/$(OOBRANDDIR)/share/extensions
mv debian/tmp/$(OOBRANDDIR)/share/extensions/script-provider-for-python \
debian/python-uno/$(OOBRANDDIR)/share/extensions
rm -f debian/python-uno/$(OOBRANDDIR)/share/extensions/script-provider-for-python/registration/LICENSE
+ ifeq "$(ENABLE_PYTHON3)" "y"
+ mkdir -p debian/python3-uno/$(OOBRANDDIR)/share/extensions
+ mv debian/tmp/$(OOBRANDDIR)/share/extensions/script-provider-for-python \
+ debian/python3-uno/$(OOBRANDDIR)/share/extensions
+ rm -f debian/python3-uno/$(OOBRANDDIR)/share/extensions/script-provider-for-python/registration/LICENSE
+ endif
endif
mkdir -p debian/python-uno/usr/share/doc/python-uno
@@@ -2305,16 -2543,23 +2320,16 @@@
done
cd debian/python-uno/usr/share/doc/python-uno && \
find . -type d -name "CVS" | xargs -r rm -rf
-endif
-
-ifeq "$(ENABLE_MONO)" "y"
- # Mono bindings
- mkdir -p -m755 debian/cli-uno-bridge/$(OOUREDIR)/lib
- mv $(PKGDIR)-core/$(OOBRANDDIR)/ure/lib/cli_uno_bridge.dll \
- debian/cli-uno-bridge/$(OOUREDIR)/lib
- mv $(PKGDIR)-core/$(OOBRANDDIR)/ure/lib/mono_loader*.uno.so \
- debian/cli-uno-bridge/$(OOUREDIR)/lib
-
- mv debian/ure/$(OOUREDIR)/lib/libcli* \
- debian/cli-uno-bridge/$(OOUREDIR)/lib
- mkdir -p debian/cli-uno-bridge/usr/lib/pkgconfig
- cat debian/tmp/usr/lib/pkgconfig/mono-$(OODIRNAME).pc \
- | sed -e s,/usr/lib/mono/openoffice,/usr/lib/cli/uno-1.0,g \
- | sed -e s,/usr/lib/cli/uno-1.0/cli_uno_bridge.dll,/$(OOUREDIR)/lib/cli_uno_bridge.dll, \
- > debian/cli-uno-bridge/usr/lib/pkgconfig/mono-$(OODIRNAME).pc
+ ifeq "$(ENABLE_PYTHON3)" "y"
+ mkdir -p debian/python3-uno/usr/share/doc/python3-uno
+ cp -r $(SOURCE_TREE)/pyuno/demo \
+ debian/python3-uno/usr/share/doc/python3-uno; \
+ for i in $(SOURCE_TREE)/pyuno/doc/*; do \
+ cp $$i debian/python3-uno/usr/share/doc/python3-uno; \
+ done
+ cd debian/python3-uno/usr/share/doc/python3-uno && \
+ find . -type d -name "CVS" | xargs -r rm -rf
+ endif
endif
# should be empty now, remove if there
@@@ -2364,7 -2609,7 +2379,7 @@@ ifeq "$(PACKAGE_SDK)" "y
# install gsicheck into -dev
mkdir -p $(PKGDIR)-dev/$(OODIR)/program
- install -m755 $(SOURCE_TREE)/solver/$(shell . $(SOURCE_TREE)/*Env*.sh; echo $$UPD/$$OUTPATH$$PROEXT)/bin/gsicheck \
+ install -m755 $(SOURCE_TREE)/solver/$(shell . $(SOURCE_TREE)/Env.Host.sh; echo $$UPD/$$OUTPATH$$PROEXT)/bin/gsicheck \
$(PKGDIR)-dev/$(OODIR)/program/gsicheck.bin
( \
echo '#! /bin/sh'; \
@@@ -2379,6 -2624,18 +2394,6 @@@
endif
-ifeq "$(INTERNAL_STDLIBS)" "y"
- # we have to do this manually; specifying --without-system-stdlibs
- # won't work because the odering of the configure arguments...
- LIBSTDCPP=`readlink `PATH=$(BUILD_PATH) g++ --print-file-name=libstdc++.so``; \
- LIBGCC=`readlink `PATH=$(BUILD_PATH) gcc --print-file-name=libgcc_s.so``; \
- LIBSTDCPP_SOVER=`echo $$LIBSTDCPP | sed -e 's/.*\.//'`; \
- LIBGCC_SOVER=`echo $$LIBGCC | sed -e 's/.*\.//'`; \
- cp $$LIBSTDCPP debian/ure/$(OOUREDIR)/lib; \
- cp $$LIBGCC debian/ure/$(OOUREDIR)/lib; \
- echo "libstdc++ $$LIBSTDCPP_SOVER" > debian/shlibs.override.stdlibs; \
- echo "libgcc_s $$LIBGCC_SOVER" >> debian/shlibs.override.stdlibs
-endif
ifeq "$(LINK_TO_STLPORT)" "y"
rm -f debian/ure/$(OOUREDIR)/lib/libstlport*
ln -s `readlink -f /usr/lib/libstlport_gcc.so` \
@@@ -2387,7 -2644,7 +2402,7 @@@ endi
ifeq "$(ENABLE_JAVA)" "y"
ifeq "$(BUILD_JARS_NATIVE)" "y"
- ifneq "$(PKGSOURCE)" "libreoffice$(VER)-l10n"
+ ifneq "$(DEB_SOURCE)" "libreoffice$(VER)-l10n"
rm -rf $(PKGDIR)-gcj/usr/lib/gcj
mkdir -p $(PKGDIR)-gcj/usr/lib/gcj/$(OODIRNAME)
cp -p debian/tmp/native-jars/gcj/* $(PKGDIR)-gcj/usr/lib/gcj/$(OODIRNAME)
@@@ -2409,7 -2666,7 +2424,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 $$UPD)/$(shell . $(SOURCE_TREE)/*Env*.sh; echo $$OUTPATH$$PROEXT)/bin && \
+ cd $(SOURCE_TREE)/solver/$(shell . $(SOURCE_TREE)/Env.Host.sh; echo $$UPD)/$(shell . $(SOURCE_TREE)/*Env*.sh; echo $$OUTPATH$$PROEXT)/bin && \
for i in juh jurt jut ridl unoloader; do \
cp $${i}_src.zip \
$(CURDIR)/$(PKGDIR)-dev/usr/share/java; \
@@@ -2425,7 -2682,7 +2440,7 @@@ endi
# remove empty resource directories
for i in draw base writer impress calc math; do \
- rm -rf $(PKGDIR)-$$i/$(OODIR)/program/resource; \
+ rm -rf $(PKGDIR)-$$i/$(OOBRANDDIR)/program/resource; \
done
ifneq "$(ENABLE_REPORTDESIGN)" "y"
@@@ -2463,7 -2720,7 +2478,7 @@@ ifeq "$(ENABLE_SDBC_POSTGRESQL)" "y
rm -rf $(PKGDIR)-sdbc-postgresql
mkdir -p $(PKGDIR)-sdbc-postgresql/$(OOBRANDDIR)/share/extensions/postgresql-sdbc-$(shell grep ^PQ_SDBC_M $(SOURCE_TREE)/connectivity/source/drivers/postgresql/makefile.mk | cut -d"=" -f2 | xargs | sed -e s/\ /\./g)
cd $(PKGDIR)-sdbc-postgresql/$(OOBRANDDIR)/share/extensions/postgresql-sdbc-$(shell grep ^PQ_SDBC_M $(SOURCE_TREE)/connectivity/source/drivers/postgresql/makefile.mk | cut -d"=" -f2 | xargs | sed -e s/\ /\./g) && \
- unzip $(CURDIR)/$(SOURCE_TREE)/connectivity/$(shell . $(SOURCE_TREE)/*Env*.sh; echo $$OUTPATH$$PROEXT)/lib/postgresql-sdbc-$(shell grep ^PQ_SDBC_M $(SOURCE_TREE)/connectivity/source/drivers/postgresql/makefile.mk | cut -d"=" -f2 | xargs | sed -e s/\ /\./g).oxt
+ unzip $(CURDIR)/$(SOURCE_TREE)/connectivity/$(shell . $(SOURCE_TREE)/Env.Host.sh; echo $$OUTPATH$$PROEXT)/lib/postgresql-sdbc-$(shell grep ^PQ_SDBC_M $(SOURCE_TREE)/connectivity/source/drivers/postgresql/makefile.mk | cut -d"=" -f2 | xargs | sed -e s/\ /\./g).oxt
endif
ifeq "$(ENABLE_MYSQLNATIVE)" "y"
@@@ -2491,14 -2748,14 +2506,14 @@@ endi
ln -s /var/lib/$(OODIRNAME)/basis$(OOVER)/program/services.rdb \
$(PKGDIR)-core/usr/lib/$(OODIRNAME)/basis$(OOVER)/program/services.rdb
-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 \
- $(PKGDIR)-dev/$(OODIR)/program/gengal
- install -m755 $(SOURCE_TREE)/svx/$(shell . $(SOURCE_TREE)/*Env*.sh; echo $$OUTPATH$$PROEXT)/bin/gengal.bin \
- $(PKGDIR)-dev/$(OODIR)/program/gengal.bin
-endif
+#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 \
+# $(PKGDIR)-dev/$(OODIR)/program/gengal
+# install -m755 $(SOURCE_TREE)/svx/$(shell . $(SOURCE_TREE)/*Env*.sh; echo $$OUTPATH$$PROEXT)/bin/gengal.bin \
+# $(PKGDIR)-dev/$(OODIR)/program/gengal.bin
+#endif
for i in $(ARCH_DEP_PACKAGES); do \
if [ -e debian/$$i.bug-script.in ]; then \
@@@ -2512,7 -2769,8 +2527,7 @@@
for PKG in $(ARCH_DEP_PACKAGES); do \
LINKS=debian/$$PKG.links ; \
if [ -e $$LINKS.in ]; then \
- sed -e "s/\@LIBSUFFIX\@/$(LIBSUFFIX)/g" \
- -e "s#\@OOBASISDIR\@#$(OOBASISDIR)#g" \
+ sed -e "s#\@OOBASISDIR\@#$(OOBASISDIR)#g" \
< $$LINKS.in > $$LINKS ; \
fi; \
done
@@@ -2541,7 -2799,7 +2556,7 @@@ endi
rm -f $(PKGDIR)-common/$(OODIR)/program/oo_product.bmp
# Extract and install icons
- cd $(SOURCE_TREE)/sysui/$(shell . $(SOURCE_TREE)/*Env*.sh; echo $$OUTPATH$$PROEXT)/bin/desktop-integration && dpkg --extract libreoffice$(OOVER)-debian-menus_*_all.deb . && cd usr/share/icons && \
+ cd $(SOURCE_TREE)/sysui/$(shell . $(SOURCE_TREE)/Env.Host.sh; echo $$OUTPATH$$PROEXT)/bin/desktop-integration && dpkg --extract libreoffice$(OOVER)-debian-menus_*_all.deb . && cd usr/share/icons && \
rm -rf gnome locolor && \
for d in `find -type d`; do \
install -d -m755 $(CURDIR)/$(PKGDIR)-common/usr/share/icons/$$d || exit 1 ;\
@@@ -2550,8 -2808,9 +2565,8 @@@
install -m644 $$f $(CURDIR)/$(PKGDIR)-common/usr/share/icons/$$f || exit 1 ;\
done && cd ../../.. && rm -rf usr etc
-ifeq "$(USE_OOO_BUILD_DESKTOPS)" "n"
# menu files from sysui
- dirname="`cd $(SOURCE_TREE)/sysui/$(shell . $(SOURCE_TREE)/*Env*.sh; echo $$OUTPATH$$PROEXT)/misc/desktopshare >/dev/null; pwd`" ;\
+ dirname="`cd $(SOURCE_TREE)/sysui/$(shell . $(SOURCE_TREE)/Env.Host.sh; echo $$OUTPATH$$PROEXT)/misc/desktopshare >/dev/null; pwd`" ;\
mkdir -p -m755 $(PKGDIR)-common/usr/share/applications ;\
sed -e 's,Exec=$${UNIXBASISROOTNAME} %U,Exec=libreoffice$(VER) %U,' \
-e 's,Icon=$${WITHOUTDOTUNIXPRODUCTNAME},Icon=libreoffice,' \
@@@ -2564,11 -2823,12 +2579,11 @@@
perl -pi -e 's/ Supported by Sun Microsystems.//' $(PKGDIR)-common//usr/share/applications/libreoffice$(VER)-startcenter.desktop
# invalid, according to lintian. make it shut up.
perl -pi -e 's/Application;//; s/X-Red-Hat-Base;//; s/X-SuSE-Core-Office;//; s/X-MandrivaLinux-.*;//;' $(PKGDIR)-common/usr/share/applications/libreoffice$(VER)-startcenter.desktop
-endif
# install .applications, .keys, .mime and openoffice.org.xml for
# shared-mime-info
mkdir -p $(PKGDIR)-common/usr/share/application-registry && \
- cat $(SOURCE_TREE)/sysui/$(shell . $(SOURCE_TREE)/*Env*.sh; echo $$OUTPATH$$PROEXT)/misc/libreoffice/openoffice.applications \
+ cat $(SOURCE_TREE)/sysui/$(shell . $(SOURCE_TREE)/Env.Host.sh; echo $$OUTPATH$$PROEXT)/misc/libreoffice/openoffice.applications \
| sed -e s/OFFICENAME/ooffice/g \
| sed -e s/\%PRODUCTNAME/LibreOffice/g \
> $(PKGDIR)-common/usr/share/application-registry/openoffice.applications
@@@ -2577,17 -2837,17 +2592,17 @@@
install -m644 $(SOURCE_TREE)/sysui/desktop/mimetypes/openoffice.mime \
$(PKGDIR)-common/usr/share/mime-info && \
rm -f $(PKGDIR)-common/usr/share/mime-info/openoffice.keys; \
- for i in $(SOURCE_TREE)/sysui/$(shell . $(SOURCE_TREE)/*Env*.sh; echo $$OUTPATH$$PROEXT)/misc/libreoffice/*.keys; do \
+ for i in $(SOURCE_TREE)/sysui/$(shell . $(SOURCE_TREE)/Env.Host.sh; echo $$OUTPATH$$PROEXT)/misc/libreoffice/*.keys; do \
cat $$i >> $(PKGDIR)-common/usr/share/mime-info/openoffice.keys; \
done
- install -m644 $(SOURCE_TREE)/sysui/$(shell . $(SOURCE_TREE)/*Env*.sh; echo $$OUTPATH$$PROEXT)/misc/libreoffice/openoffice.org.xml \
+ install -m644 $(SOURCE_TREE)/sysui/$(shell . $(SOURCE_TREE)/Env.Host.sh; echo $$OUTPATH$$PROEXT)/misc/libreoffice/openoffice.org.xml \
$(PKGDIR)-common/usr/share/mime/packages
mkdir -p $(PKGDIR)-common/usr/share/applications
# install openoffice-xlate-lang
install -d -m755 $(PKGDIR)-common/usr/share/$(OODIRNAME)/bin
- install -m755 $(OOO_BUILD_TREE)/bin/openoffice-xlate-lang \
+ install -m755 $(SOURCE_TREE)/bin/lo-xlate-lang \
$(PKGDIR)-common/usr/share/$(OODIRNAME)/bin
ifeq "$(HELPISOS)" ""
@@@ -2612,7 -2872,7 +2627,7 @@@ ifeq "$(PACKAGE_SDK)" "y
# fix links
cd $(PKGDIR)-dev-doc/usr/share/doc/libreoffice-dev/docs/java/ref && \
for i in `find . -type f | xargs`; do \
- perl -pi -e 's,file:$(CURDIR)/$(OOO_BUILD_TREE)/build/$(TAG)/odk/$(shell . $(SOURCE_TREE)/*Env*.sh; echo $$OUTPATH$$PROEXT)/bin/odkcommon/docs/common/ref/,,g' $$i; \
+ perl -pi -e 's,file:$(CURDIR)/$(OOO_BUILD_TREE)/build/$(TAG)/odk/$(shell . $(SOURCE_TREE)/Env.Host.sh; echo $$OUTPATH$$PROEXT)/bin/odkcommon/docs/common/ref/,,g' $$i; \
done
endif
endif
@@@ -2648,8 -2908,9 +2663,8 @@@ ifeq "$(ENABLE_JAVA)" "y
mv $(PKGDIR)-common/$(OODIR)/share/registry/$$i.xcd \
$(PKGDIR)-filter-mobiledev/$(OODIR)/share/registry; \
done
-ifeq "$(USE_OOO_BUILD_DESKTOPS)" "n"
# menu files from sysui
- dirname="`cd $(SOURCE_TREE)/sysui/$(shell . $(SOURCE_TREE)/*Env*.sh; echo $$OUTPATH$$PROEXT)/misc/desktopshare >/dev/null; pwd`" ;\
+ dirname="`cd $(SOURCE_TREE)/sysui/$(shell . $(SOURCE_TREE)/Env.Host.sh; echo $$OUTPATH$$PROEXT)/misc/desktopshare >/dev/null; pwd`" ;\
mkdir -p -m755 $(PKGDIR)-filter-mobiledev/usr/share/applications ;\
sed -e 's,Exec=$${UNIXBASISROOTNAME} \(.*\) %U,Exec=libreoffice$(VER) \1 %U,' \
-e 's,Icon=$${WITHOUTDOTUNIXPRODUCTNAME},Icon=libreoffice,' \
@@@ -2659,6 -2920,7 +2674,6 @@@
< $$dirname/javafilter.desktop \
> $(PKGDIR)-filter-mobiledev/usr/share/applications/libreoffice$(VER)-javafilter.desktop || exit 1
endif
-endif
# fix permissions
for i in editpic poll savepic show webcast; do \
@@@ -2737,6 -2999,15 +2752,6 @@@ endi
fi; \
done
-ifeq "$(USE_OOO_BUILD_DESKTOPS)" "y"
- # install ooo-build desktop icons
- for r in 16x16 22x22 24x24 32x32 48x48; do \
- mkdir -p $(PKGDIR)-common/usr/share/icons/hicolor/$$r/apps; \
- cp $(OOO_BUILD_TREE)/desktop/$$r/*.png \
- $(PKGDIR)-common/usr/share/icons/hicolor/$$r/apps; \
- done
-endif
-
# move psprint.conf into /etc
mkdir -p $(PKGDIR)-common/etc/$(OODIRNAME)
mv $(PKGDIR)-common/$(OODIR)/share/psprint/psprint.conf \
@@@ -2812,7 -3083,7 +2827,7 @@@ endi
mkdir -p $(OODIR)/share/dtd && \
cd $(OODIR)/share/dtd && ln -s /$(shell echo $(OODIR) | sed -e s/libreoffice/openoffice/)/share/dtd/officedocument
-ifeq "$(DIST)" "Debian"
+ifeq "$(DEB_VENDOR)" "Debian"
# install Debian presentation template
mkdir -p $(PKGDIR)-common/$(OODIR)/share/template/en-US/presnt
install -m644 debian/templates/*.otp $(PKGDIR)-common/$(OODIR)/share/template/en-US/presnt/
@@@ -2908,14 -3179,28 +2923,14 @@@ endi
for PKG in $(ARCH_INDEP_PACKAGES); do \
LINKS=debian/$$PKG.links ; \
if [ -e $$LINKS.in ]; then \
- sed -e "s/\@LIBSUFFIX\@/$(LIBSUFFIX)/g" \
- -e "s#\@OOBASISDIR\@#$(OOBASISDIR)#g" \
+ sed -e "s#\@OOBASISDIR\@#$(OOBASISDIR)#g" \
-e "s/@ICONVERSION@/$(shell echo $(OOVER) | sed -e "s/\.//g")/" \
< $$LINKS.in > $$LINKS ; \
fi; \
done
-ifeq "$(USE_SYSTEM_TEXTCAT_DATA)" "y"
- ifneq "$(SQUEEZE_BACKPORT)" "y"
- echo "usr/share/libtextcat/LM $(OOBASISDIR)/share/fingerprint" >> debian/libreoffice-common.links
- else
- # remove duplicated textcat data and replace with symlinks
- cd $(PKGDIR)-common/$(OOBASISDIR)/share && \
- for i in `fdupes -n -f -1 fingerprint/ /usr/share/libtextcat/LM`; do \
- ln -sf /usr/share/libtextcat/LM/`basename $$i` fingerprint/`basename $$i`; \
- done
- endif
-endif
-
-ifeq "$(USE_OOO_BUILD_DESKTOPS)" "n"
# menu files from sysui
- dirname="`cd $(SOURCE_TREE)/sysui/$(shell . $(SOURCE_TREE)/*Env*.sh; echo $$OUTPATH$$PROEXT)/misc/libreoffice >/dev/null; pwd`" ;\
+ dirname="`cd $(SOURCE_TREE)/sysui/$(shell . $(SOURCE_TREE)/Env.Host.sh; echo $$OUTPATH$$PROEXT)/misc/libreoffice >/dev/null; pwd`" ;\
mkdir -p -m755 $(PKGDIR)-common/usr/share/mimelnk/application ;\
sed -e 's,Comment=Extension,Comment=LibreOffice $(VER) Extension,' \
-e 's,Icon=openofficeorg[0123456789]-extension,Icon=application-vnd.openofficeorg.extension.png,' \
@@@ -2923,6 -3208,7 +2938,6 @@@
< $$dirname/extension.desktop \
> $(PKGDIR)-common/usr/share/mimelnk/application/vnd.openofficeorg.extension.desktop || exit 1
perl -pi -e "s/Icon=openofficeorg.*-extension/Icon=application-vnd.openofficeorg.extension.png/" $(PKGDIR)-common/usr/share/mimelnk/application/vnd.openofficeorg.extension.desktop
-endif
# install extension shell lib for use by extensions not from here
install -D -m644 debian/shell-lib-extensions.sh \
@@@ -2965,12 -3251,12 +2980,12 @@@
# register technical.dic
perl -pi -e 's/standard.dic;/standard.dic;technical.dic;/' $(PKGDIR)-common/$(OODIR)/share/registry/main.xcd
-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 \
- $(PKGDIR)-common/$(OODIR)/program/gengalrc
-endif
+#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 \
+# $(PKGDIR)-common/$(OODIR)/program/gengalrc
+#endif
touch $@
binary-arch: $(STAMP_DIR)/binary-arch
@@@ -3020,6 -3306,9 +3035,6 @@@ els
dh_strip -s
endif
dh_icons -s
-ifeq "$(ENABLE_MONO)" "y"
- dh_installcligac -s
-endif
dh_compress -s -X.py -X.mk -X.sxd
dh_makeshlibs -puno-libs3 -V"ure (>= $(shell grep UREPACKAGEVERSION $(SOURCE_TREE)/instsetoo_native/util/openoffice.lst | awk '{ print $$2 }'))" -- -c0 -v`echo $(BINARY_VERSION) | cut -d: -f2`
dh_makeshlibs -n -pure -V"ure (>= $(shell grep UREPACKAGEVERSION $(SOURCE_TREE)/instsetoo_native/util/openoffice.lst | awk '{ print $$2 }'))" -- -v`echo $(BINARY_VERSION) | cut -d: -f2`
@@@ -3035,7 -3324,7 +3050,7 @@@ endi
ifneq (,$(filter icu, $(SYSTEM_STUFF)))
cat debian/shlibs.override.icu >> debian/shlibs.local
endif
-ifeq "$(INTERNAL_STDLIBS)" "y"
+ifneq (,$(filter stdlibs, $(SYSTEM_STUFF)))
cat debian/shlibs.override.stdlibs >> debian/shlibs.local
endif
# we need to do it in two steps. The new dpkg-shlibdeps doesn't find
@@@ -3055,12 -3344,6 +3070,12 @@@ ifneq (,$(filter redland, $(SYSTEM_STUF
# which quickly can get outdated
perl -pi -e 's/(shlibs.*$$)/$$1, $(shell cat /var/lib/dpkg/info/$(shell dpkg -S /usr/lib/`objdump -p $(PKGDIR)-core/$(OOBASISDIR)/program/libunordf*.so | grep NEEDED | grep librdf | awk '{ print $$2 }'` | cut -d: -f1).shlibs | awk '{ print $$3,$$4,$$5 }')/' $(PKGDIR)-core.substvars
endif
+ifeq "$(ENABLE_LIBRSVG)" "y"
+ ifeq "$(SYSTEM_LIBRSVG)" "y"
+ # dlopen()'ed only for some weird reason (even when --with-librsvg=internal!)
+ perl -pi -e 's/(shlibs.*$$)/$$1, $(shell cat /var/lib/dpkg/info/librsvg*.shlibs | awk '{ print $$3,$$4,$$5 }')/' $(PKGDIR)-core.substvars
+ endif
+endif
# don't make uno-libs3 depend on ure...
perl -pi -e 's/, ure \(.*\)$$//' debian/uno-libs3.substvars
# .. and prevent ure to depend on itself..
@@@ -3075,6 -3358,10 +3090,6 @@@ endi
ifeq "$(LINK_TO_STLPORT)" "y"
perl -pi -e 's/(shlibs.*$$)/$$1, $(shell cat /var/lib/dpkg/info/libstlport4.6*.shlibs | awk '{ print $$3,$$4,$$5 }')/' debian/ure.substvars
endif
-ifeq "$(ENABLE_MONO)" "y"
- dh_makeclilibs -s
- dh_clideps -s
-endif
ifeq "$(ENABLE_JAVA)" "y"
jh_depends -s -Xlibreoffice$(VER)-gcj -Xlibreoffice$(VER)-dbg -Xure
ifeq "$(PACKAGE_BASE)" "y"
@@@ -3103,6 -3390,7 +3118,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'mozilla-nss-depends=$(MOZILLA_NSS_DEPENDS)' \
-V'lucene-depends=$(LUCENE_DEPENDS)' \
-V'Binary-Version=$(BINARY_VERSION)' \
-V'ooo-binfilter-dep=$(OOO_BINFILTER_DEP)' \
@@@ -3118,7 -3406,7 +3133,7 @@@ ifeq "$(ENABLE_JAVA)" "y
perl -pi -e "s/java-gcj-compat/java-gcj-compat (>= 1.0.77-4)/" \
debian/libreoffice$(VER)-officebean/DEBIAN/control
endif
-ifneq (,$(findstring $(ARCH),$(OOO_ARCH_DEP_EXTENSIONS_ARCHS)))
+ifneq (,$(findstring $(DEB_HOST_ARCH),$(OOO_ARCH_DEP_EXTENSIONS_ARCHS)))
ifeq "$(ENABLE_PDFIMPORT)" "y"
dh_gencontrol -plibreoffice$(VER)-pdfimport -- \
-v$(shell grep "<version" $(SOURCE_TREE)/sdext/source/pdfimport/config/description.xml | perl -pi -e 's,<version.*value=\"(.*)\" />,\1,; s/^\s+//')+LibO`echo $(BINARY_VERSION) | cut -d: -f2`
@@@ -3138,7 -3426,7 +3153,7 @@@ ifeq "$(PACKAGE_BASE)" "y
endif
ifeq "$(ENABLE_MYSQLNATIVE)" "y"
dh_gencontrol -plibreoffice$(VER)-mysql-connector -- \
- -v$(shell grep "<version" $(SOURCE_TREE)/mysqlc/$(shell . $(SOURCE_TREE)/*Env*.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 . $(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`
endif
endif
endif
@@@ -3157,11 -3445,16 +3172,11 @@@ endi
binary-indep: $(GSI_EXPORT_STAMP) $(STAMP_DIR)/binary-indep
$(STAMP_DIR)/binary-indep: $(STAMP_DIR)/install-indep debian/control $(STAMP_DIR)/maintscripts $(STAMP_DIR)/langpacks
-ifneq ($(ARCH),$(findstring $(ARCH),$(OOO_JAVA_ARCHS)))
+ifneq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH),$(OOO_JAVA_ARCHS)))
echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
echo "For uploads with binary-all packages, please use arches where Java is enabled!!!!!"
echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
endif
-ifneq ($(ARCH),$(findstring $(ARCH),$(OOO_MONO_ARCHS)))
- echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
- echo "For uploads with binary-all packages, please use arches where Mono is enabled!!!!!"
- echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
-endif
dh_testdir
dh_testroot
@@@ -3220,8 -3513,15 +3235,8 @@@ endi
dh_fixperms -i
dh_icons -i
dh_installxmlcatalogs -i
-ifeq "$(ENABLE_MONO)" "y"
- dh_installcligac -i
-endif
dh_compress -i -X.py -X.mk -X.sxd -X.xcd.sample
dh_installdeb -i
-ifeq "$(ENABLE_MONO)" "y"
- dh_makeclilibs -i
- dh_clideps -i
-endif
ifeq "$(ENABLE_JAVA)" "y"
# the help recommends lucene. this is enough. no need for a hard depend in
# -common, IMHO
@@@ -3251,6 -3551,20 +3266,6 @@@ endi
-V'ooo-binfilter-dep=$(OOO_BINFILTER_DEP)' \
-V'dbg-dbg-suggests=$(DBG_DBG_SUGGESTS)' \
-v$(BINARY_VERSION)
-ifeq "$(ENABLE_MONO)" "y"
- # although this version gets increased before every OOo release
- # we need the +LibO anyway when we build milestones..
- dh_gencontrol -plibuno-cli-basetypes1.0-cil -- \
- -v$(shell grep CLI_BASETYPES_NEW_VERSION $(SOURCE_TREE)/cli_ure/version/version.txt | cut -d"=" -f2)+LibO`echo $(BINARY_VERSION) | cut -d: -f2`
- dh_gencontrol -plibuno-cli-uretypes1.0-cil -- \
- -v$(shell grep CLI_URETYPES_NEW_VERSION $(SOURCE_TREE)/cli_ure/version/version.txt | cut -d"=" -f2)+LibO`echo $(BINARY_VERSION) | cut -d: -f2`
- dh_gencontrol -plibuno-cli-oootypes1.0-cil -- \
- -v$(shell grep CLI_OOOTYPES_NEW_VERSION $(SOURCE_TREE)/unoil/climaker/version.txt | cut -d"=" -f2)+LibO`echo $(BINARY_VERSION) | cut -d: -f2`
- dh_gencontrol -plibuno-cli-cppuhelper1.0-cil -- \
- -v$(shell grep CLI_CPPUHELPER_NEW_VERSION $(SOURCE_TREE)/cli_ure/version/version.txt | cut -d"=" -f2)+LibO`echo $(BINARY_VERSION) | cut -d: -f2`
- dh_gencontrol -plibuno-cli-ure1.0-cil -- \
- -v$(shell grep CLI_URE_NEW_VERSION $(SOURCE_TREE)/cli_ure/version/version.txt | cut -d"=" -f2)+LibO`echo $(BINARY_VERSION) | cut -d: -f2`
-endif
ifeq "$(PACKAGE_TTF_OPENSYMBOL)" "y"
dh_gencontrol -pttf-opensymbol -- \
-v$(shell echo `echo $(BINARY_VERSION) | cut -d: -f1` + 1 | bc):$(shell fontforge -lang=ff -c 'Open($$1); Print ($$fontversion); Quit(0);' debian/ttf-opensymbol/usr/share/fonts/truetype/openoffice/opens___.ttf)+LibO`echo $(BINARY_VERSION) | cut -d: -f2`
@@@ -3267,7 -3581,7 +3282,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*.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 . $(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`
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`
@@@ -3278,17 -3592,38 +3293,17 @@@
binary: binary-arch binary-indep
-# Get ooo-build
-get-ooo-build:
- if echo $(OOO_BUILD_VERSION) | egrep -q "\."; then \
- wget http://download.go-oo.org/$(MWS)/ooo-build-$(OOO_BUILD_TARBALL_VERSION).tar.gz && \
- mv ooo-build-$(OOO_BUILD_TARBALL_VERSION).tar.gz ../libreoffice_$(UPSTREAM_VERSION).orig-ooo-build-$(OOO_BUILD_TARBALL_VERSION).tar.gz && \
- tar xfvz ooo-build-$(OOO_BUILD_TARBALL_VERSION).tar.gz && \
- mv ooo-build-$(OOO_BUILD_TARBALL_VERSION) $(OOO_BUILD_TREE); \
- else \
- if test -n "$$TMP"; then \
- TMPD=`mktemp -d -p $$TMP`; \
- else \
- TMPD=`mktemp -d`; \
- fi && \
- cd $$TMPD && pwd && \
- $(CURDIR)/$(OOO_BUILD_TREE)/bin/ooo-pack-sources --force --no-lo-pieces $(CURDIR)/$(OOO_BUILD_TREE) && \
- tar xfvz ooo-build-$(OOO_BUILD_TARBALL_VERSION).tar.gz && \
- mv ooo-build-$(OOO_BUILD_TARBALL_VERSION) $(OOO_BUILD_TREE) && \
- rm ooo-build-$(OOO_BUILD_TARBALL_VERSION).tar.gz archive/ooo-build-$(OOO_BUILD_TARBALL_VERSION).tar.gz && \
- tar cfvz $(CURDIR)/../libreoffice_$(UPSTREAM_VERSION).orig-ooo-build-$(OOO_BUILD_VERSION).tar.gz $(OOO_BUILD_TREE) && \
- rm -rf $$TMPD; \
- fi
-
# Get upstream external sources
get-ext-sources:
rm -rf $(TARFIILE_LOCATION)
mkdir -p $(TARFILE_LOCATION)
- wget http://cgit.freedesktop.org/ooo-build/bootstrap/plain/fetch_tarballs.sh?id=ooo/$(GIT_TAG) -O fetch_tarballs.sh && chmod 755 fetch_tarballs.sh && \
- wget http://cgit.freedesktop.org/ooo-build/bootstrap/plain/ooo.lst?id=ooo/$(GIT_TAG) -O ooo.lst && \
- ./fetch_tarballs.sh ooo.lst; \
- rm -f fetch_tarballs.sh ooo.lst
+ $(MAKE) -f debian/rules configure
+ ./download
+ $(MAKE) -f debian/rules clean
+ rm -f ooo.lst
get-orig-source:
+ifneq "$(SOURCE_TARBALLS)" "y"
if ! which git >/dev/null 2>/dev/null; then \
echo "You need git."; \
exit 1; \
@@@ -3299,24 -3634,62 +3314,24 @@@
TMPD=`mktemp -d`; \
fi && \
cd $$TMPD && \
- mkdir -p libreoffice-$(UPSTREAM_VERSION) && \
- cd libreoffice-$(UPSTREAM_VERSION) && \
- cp -ra $(CURDIR)/$(OOO_BUILD_TREE) $(OOO_BUILD_TREE); \
- cd $(OOO_BUILD_TREE) && \
- ./configure --with-tag=$(TAG) --with-distro=$(PATCHSET) \
- --with-git --with-lang="$(BUILD_ISOS)" && \
- ./download && \
- mkdir ../ext-sources-$(OOO_BUILD_TREE) && \
- for i in biblio.tar.bz2 extras-3.tar.bz2 ????????????????????????????????-*; do \
- mv src/$$i ../ext-sources-$(OOO_BUILD_TREE); \
- done && \
- cd .. && \
- tar cfvz $(CURDIR)/../libreoffice_$(UPSTREAM_VERSION).orig-ext-sources-$(OOO_BUILD_TREE).tar.gz ext-sources-$(OOO_BUILD_TREE) && \
- rm -rf ext-sources-$(OOO_BUILD_TREE) && \
- cd $(OOO_BUILD_TREE) && \
- ./bin/ooo-pack-sources --force --no-lo-build . && \
- mv archive ../archive-$(OOO_BUILD_TREE) && \
- cd ../archive-$(OOO_BUILD_TREE) && \
- tar xfvj ooo-build-$(OOO_BUILD_TARBALL_VERSION)-libs-extern-sys.tar.bz2 && \
- for i in da_DK en_GB ru_RU; do \
- if [ "$$i" = "en_GB" ]; then j=en; else j=$$i; fi; \
- rm ooo-build-$(OOO_BUILD_TARBALL_VERSION)-libs-extern-sys/dictionaries/$$j/hyph_$${i}.dic; \
- done && \
- tar cfvj ooo-build-$(OOO_BUILD_TARBALL_VERSION)-libs-extern-sys.tar.bz2.dfsg ooo-build-$(OOO_BUILD_TARBALL_VERSION)-libs-extern-sys && \
- ln -sf ooo-build-$(OOO_BUILD_TARBALL_VERSION)-libs-extern-sys.tar.bz2.dfsg ooo-build-$(OOO_BUILD_TARBALL_VERSION)-libs-extern-sys.tar.bz2 && \
- rm -rf ooo-build-$(OOO_BUILD_TARBALL_VERSION)-libs-extern-sys && \
- cd $$TMPD/libreoffice-$(UPSTREAM_VERSION) && tar cfvz libreoffice_$(UPSTREAM_VERSION).orig-archive-$(OOO_BUILD_VERSION).tar.gz archive-$(OOO_BUILD_VERSION) && \
- rm -rf libreoffice-$(UPSTREAM_VERSION) && \
- mv libreoffice_$(UPSTREAM_VERSION).orig-archive-$(OOO_BUILD_VERSION).tar.gz $(CURDIR)/.. && \
- rm -rf $$TMPD
- if test -n "$$TMP"; then \
- TMPD=`mktemp -d -p $$TMP`; \
- else \
- TMPD=`mktemp -d`; \
- fi && \
- cd $$TMPD && \
- export TARFILE_LOCATION=`basename $(TARFILE_LOCATION)`; \
- $(CURDIR)/debian/rules get-ext-sources && \
- zip -d $$TARFILE_LOCATION/*liblayout.zip resource/rfc1345.txt && \
- rm $$TARFILE_LOCATION/*JLanguageTool && \
- tar cfvz libreoffice_$(UPSTREAM_VERSION).orig-$$TARFILE_LOCATION.tar.gz $$TARFILE_LOCATION && \
- mv libreoffice_$(UPSTREAM_VERSION).orig-$$TARFILE_LOCATION.tar.gz $(CURDIR)/.. && \
- rm -rf $$TMPD
- # get ooo-build
- if test -n "$$TMP"; then \
- TMPD=`mktemp -d -p $$TMP`; \
- else \
- TMPD=`mktemp -d`; \
- fi && \
- if [ ! -d $(OOO_BUILD_TREE) ]; then ./debian/rules get-ooo-build; fi
- tar cfvz ../libreoffice_$(UPSTREAM_VERSION).orig-$(OOO_BUILD_TREE).tar.gz $(OOO_BUILD_TREE)
-
-# Download the latest sources needed for ooo-build. Note that is
-# might download more than actually needed here....
-download: $(OOO_BUILD_TREE)/config.status
- $(OOO_BUILD_TREE)/download
+ git clone git://anongit.freedesktop.org/libreoffice/core && \
+ mv core libreoffice-$(DEB_VERSION_UPSTREAM) && \
+ tar cfvz ../libreoffice_$(DEB_VERSION_UPSTREAM).orig.tar.gz libreoffice-$(DEB_VERSION_UPSTREAM) && \
+ mkdir -p libreoffice-$(DEB_VERSION_UPSTREAM)/clone && \
+ cd libreoffice-$(DEB_VERSION_UPSTREAM)/clone && \
+ for i in binfilter dictionaries help translations; do \
+ if [ "$$i" = "help"; then j=helpcontent2; else j=$$i; fi; \
+ git clone git://anongit.freedesktop.org/libreoffice/$$i; \
+ mv $$i/$$j ..; \
+ done && cd .. && \
+ for j in binfilter dictionaries helpcontent2 translations; do \
+ tar cfvz ../libreoffice_$(DEB_VERSION_UPSTREAM).orig-$$j.tar.gz $$j; \
+ done && \
+ mkdir ext-sources && cd ext-sources && \
+ $(MAKE) -f debian/rules get-ext-sources TARFILE_LOCATION="$$TMPD/libreoffice-$(DEB_VERSION_UPSTREAM)/ext-sources" && \
+ tar cfvz ../../libreoffice_$(DEB_VERSION_UPSTREAM).orig-ext-sources.tar.gz ext-sources && \
+ cd $(CURDIR) && rm -rf $$TMPD
+endif
.PHONY: control
.PHONY: clean-debdir clean-instsetoo clean-objectdirs clean default configure
--
LibreOffice packaging repository
Reply to: