[SCM] LibreOffice packaging repository branch, debian-experimental-4.1, updated. libreoffice_4.1.0_rc2-1-4-g36224a4
The following commit has been merged in the debian-experimental-4.1 branch:
commit 36224a417c9afc7dccd4eb213ae27dd67c760e58
Merge: 960efc09c70f9ad380f2c195ad5db0a930c9cfd3 0d206336800b0faa7cffec7266304b0b59fbe6c0
Author: Rene Engelhard <rene@debian.org>
Date: Mon Jul 8 21:07:48 2013 +0200
Merge remote-tracking branch 'origin/master' into debian-experimental-4.1
Conflicts:
changelog
rules
scripts/gid2pkgdirs.sh
diff --combined changelog
index 2c27926,8409b6c..79b4d2f
--- a/changelog
+++ b/changelog
@@@ -1,110 -1,51 +1,117 @@@
-libreoffice (1:4.0.4-3) UNRELEASED; urgency=low
+libreoffice (1:4.1.0~rc2-2) UNRELEASED; urgency=low
+
+ * build with proper DEB_BUILD_OPTIONS so we actually get l10n
+ (closes: #715353)
+ * debian/rules:
+ - also filter out binutils so that the mips(el)-only build-dep doesn't
+ end up in -subsequentbases depends for everything
+ * debian/rules, debian/control.in:
+ - revert python3-uno -> python3.3-uno move now that python 3.3 is default
+ and prefer python3-uno (>= 4.0~) in dependencies again
+
- -- Rene Engelhard <rene@debian.org> Wed, 19 Jun 2013 20:57:09 +0200
+ -- Rene Engelhard <rene@debian.org> Tue, 02 Jul 2013 22:12:36 +020
-libreoffice (1:4.0.4-2) unstable; urgency=low
+libreoffice (1:4.1.0~rc2-1) experimental; urgency=low
- * brown paper bag release
+ * new upstream release candidate
- * debian/patches/gcj-safe-jni-h-include.diff: fix -I placement...
+ * debian/patches/hack-interlck_sparc.diff: hack around sparc build failure,
+ #undef __sparcv8plus, __sparcv9 and __sparc_v9__ for interlck_sparc.o as
+ we otherwise miss osl_InterlockedCountSetV9...
* debian/rules:
- - fix JAVA_MAINVER setting to actually set 6 for mips(el) and not
- for ia64.
- - also build-depend on libc6 (>= 2.17-6) on mips(el)
+ - revert gcc 4.6 hack; armel built fine with g++-4.8, including checks,
+ so let's try with it everywhere.
- -- Rene Engelhard <rene@debian.org> Wed, 19 Jun 2013 20:57:09 +0200
+ -- Rene Engelhard <rene@debian.org> Tue, 02 Jul 2013 22:12:36 +0200
-libreoffice (1:4.0.4-1) unstable; urgency=low
+libreoffice (1:4.1.0~rc1-1) experimental; urgency=low
- * new upstream release
+ * new upstream release candidate
- * debian/patches/fdo-65882-fix-sw-unoapi-on-exit.diff: as name says;
- backported from libreoffice-4-1 branch
+ * debian/patches/gcj-safe-jni-h-include.diff: fix -I placement...
+ * debian/control.sdk.in:
+ - also replace libreoffice-common (<< 4.1.0~beta1) (closes: #710767)
* debian/rules:
- enable kk (kazakh) l10n (closes: #700835)
- - enable graphite2 on all archs now that it's fixed on armel/sparc
- - use OpenJDK 7 on everything - except on mips* (stay with 6) and
- kfreebsd-* (stay with gcj)
- - enable binutils (>= 2.23) build-dep on mips(el) now that it's in
- unstable
+ - fix JAVA_MAINVER setting to actually set 6 for mips(el) and not
+ for ia64.
+ - also build-depend on libc6 (>= 2.17-6) on mips(el)
* debian/control:
- - regenerate; uses libservlet3.0-java instead of libservlet2.5-java now
- fix -dbg suggests: s/python/$(PYTHON)/. to suggest python3.3-dbg
- temporarily force gcc-4.6(!) (instead of build-conflicting
against gcc (>< 4:4.7~) on all archs except *i386/*amd64 until
all bridges are ported to the new gcc 4.7+ behaviour
- remove last buildd special-casing: build --enable-verbose everyhwere,
also on the buildds
+ * debian/patches/make-pyuno-work-for-system-wide-module-install.diff,
+ debian/patches/didable-sw-python.diff, debian/rules:
+ remove patch(es), add the lines to uno.oy during install ("stolen" from
+ Fedora)
+ Otherwise the python-based unit tests fail miserably (sw_python).
+
+ -- Rene Engelhard <rene@debian.org> Sun, 23 Jun 2013 18:07:00 +0200
+
+libreoffice (1:4.1.0~beta2-2) experimental; urgency=low
+
+ * debian/rules:
+ - revert back to using gcj on kfreebsd-*, OpenJDK7 doesn't work (hangs) or
+ still isn't available... (kfreebsd-i386)
+ - fix librpt* move, install path differs between binary-only and full
+ builds, sigh.
+
+ -- Rene Engelhard <rene@debian.org> Mon, 10 Jun 2013 15:31:07 +0200
+
+libreoffice (1:4.1.0~beta2-1) experimental; urgency=low
+
+ * debian/patches/show-the-startcenter.diff: as name says, remove
+ NoDisplay=true from startcenter.desktop
+
+ * new upstream beta release
+ - make distro-pack-install installs .desktop again (closes: #710591)
+
+ * rebuild against libharfbuzz0a/libharfbuzz-icu0 (closes: #710847)
+
+ * debian/control.sdk.in:
+ - update Replaces: for gengal move to -dev (closes: #710767)
+ * debian/rules:
+ - enable graphite2 on all archs now that it's fixed on armel/sparc
+
+ -- Rene Engelhard <rene@debian.org> Wed, 05 Jun 2013 18:52:33 +0200
+
+libreoffice (1:4.1.0~beta1-2) experimental; urgency=low
+
+ * debian/patches/javadoc-optional.diff: make javadoc optional and disable
+ it on gjdoc builds, they miss files we expect.
+
+ * debian/rules:
+ - use OpenJDK 7 on everything including kfreebsd-* - except on
+ mips(el). Stay with 6 there.
+ * debian/control:
+ - regenerate; uses libservlet3.0-java instead of libservlet2.5-java now
+
+ -- Rene Engelhard <rene@debian.org> Tue, 28 May 2013 20:43:19 +0200
+
+libreoffice (1:4.1.0~beta1-1) experimental; urgency=low
+
+ * new upstream beta release
+
+ * debian/rules, control.sdk.in:
+ - dmake finally gone
+ * debian/rules:
+ - add new conditionals: libmwaw, libodfgen, harfbuzz, mariadb
+ (use MySQL instead of MariaDB, though as long as we need mysqlcppconn
+ anyway)
+ - build with explicit --enable-python=system
+ - enable the tightended binutils build-dep, we're in experimental anyway
+ and need orcus and mdds from experimental, too
+ - enable system-clucene again
+ - temporarily disable cleandupes for -l10n-* as it's broken right nwo
+ * debian/uno-libs3.symbols: update
- -- Rene Engelhard <rene@debian.org> Mon, 17 Jun 2013 19:31:11 +0200
+ -- Rene Engelhard <rene@debian.org> Thu, 23 May 2013 10:15:45 +0200
libreoffice (1:4.0.3-3) unstable; urgency=low
diff --combined control
index 93ca776,ab7a666..d0361e0
--- a/control
+++ b/control
@@@ -13,10 -13,13 +13,10 @@@ Build-Depends: ant (>= 1.7.0)
bzip2,
cpp-4.7,
debhelper (>= 7.2.3~),
dpkg-dev (>= 1.16.1),
fastjar,
flex | flex-old,
- g++-4.6 [!i386 !amd64 !kfreebsd-i386 !kfreebsd-amd64],
g++-mingw-w64-i686 [i386 amd64],
- gcc-4.6 [!i386 !amd64 !kfreebsd-i386 !kfreebsd-amd64],
gcj-jdk [hppa kfreebsd-i386 kfreebsd-amd64],
gcj-native-helper [hppa kfreebsd-amd64 kfreebsd-i386],
gdb,
@@@ -33,7 -36,6 +33,7 @@@
libc6 (>= 2.17-6) [mips mipsel],
libcairo2-dev,
libcdr-dev,
+ libclucene-dev (>= 2.3.3.4-2),
libcmis-dev (>= 0.3.1),
libcppunit-dev (>= 1.12),
libcups2-dev,
@@@ -53,7 -55,6 +53,7 @@@
libgstreamer1.0-dev,
libgtk-3-dev (>= 3.2~),
libgtk2.0-dev (>= 2.10),
+ libharfbuzz-dev (>= 0.9.18),
libhsqldb1.8.0-java (>> 1.8.0.10),
libhunspell-dev (>= 1.1.5-2),
libhyphen-dev (>= 2.4),
@@@ -64,17 -65,15 +64,17 @@@
liblcms2-dev,
libldap2-dev,
liblpsolve55-dev (>= 5.5.0.13-5+b1),
- libmdds-dev (>= 0.6.0),
+ libmdds-dev (>= 0.8.0),
libmspub-dev,
+ libmwaw-dev,
libmysqlclient-dev,
libmysqlcppconn-dev (>= 1.1.0~r791),
libmythes-dev (>= 2:1.2),
libneon27-gnutls-dev,
libnss3-dev (>= 3.12.3),
+ libodfgen-dev,
liborbit2-dev,
- liborcus-dev,
+ liborcus-dev (>= 0.5.0),
libpng12-dev,
libpoppler-cpp-dev,
libpoppler-dev (>= 0.8.0),
@@@ -112,7 -111,7 +112,7 @@@
python (>= 2.6.6-3+squeeze4),
python-dev (>= 2.6),
python3,
- python3.3-dev (>= 3.3),
+ python3-dev (>= 3.3),
unixodbc-dev (>= 2.2.11),
unzip,
x11proto-render-dev,
@@@ -157,7 -156,6 +157,7 @@@ Build-Conflicts: ant (= 1.8.0-1) [hppa
libc6-dev (= 2.6.1-3) [i386 amd64],
libc6-dev (= 2.6.1-4) [i386 amd64],
libcairo2 (= 1.4.8-1),
+ libmariadbclient-dev,
libxul-dev (= 1.8.0.13~pre070720-0etch1),
nvidia-glx-dev,
nvidia-glx-legacy-dev,
@@@ -168,7 -166,7 +168,7 @@@ XS-Python3-Version: 3.
XS-Testsuite: autopkgtest
Vcs-Git: https://alioth.debian.org/anonscm/git/pkg-openoffice/libreoffice.git
Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-openoffice/libreoffice.git
- Bugs:
+ Bugs: mailto:debian-openoffice@lists.debian.org
Homepage: http://www.libreoffice.org
Package: libreoffice
@@@ -179,6 -177,7 +179,6 @@@ Depends: fonts-sil-gentium-basic
libreoffice-calc,
libreoffice-core (= ${binary:Version}),
libreoffice-draw,
- libreoffice-filter-mobiledev,
libreoffice-impress,
libreoffice-math,
libreoffice-report-builder-bin [!hppa !kfreebsd-amd64 !kfreebsd-i386],
@@@ -219,6 -218,7 +219,6 @@@ Description: office productivity suite
* libreoffice-draw: Drawing
* libreoffice-base: Database
* libreoffice-math: Equation editor
- * libreoffice-filter-mobiledev: Mobile Devices filters
.
You can extend the functionality of LibreOffice by installing these
packages:
@@@ -410,10 -410,7 +410,10 @@@ Suggests: libreoffice-style-crystal
libreoffice-style-oxygen,
libreoffice-style-tango
Recommends: xfonts-mathml, ${pyuno-depends}, ${textcat-data-recommends}
-Conflicts: broffice, libreoffice-l10n-3.5, libreoffice-l10n-3.6
+Conflicts: broffice,
+ libreoffice-filter-mobiledev,
+ libreoffice-l10n-3.5,
+ libreoffice-l10n-3.6
Provides: libreoffice-l10n-en-us
Breaks: libreoffice-core (<< 1:${oover}~),
libreoffice-core (>= 1:${next-oover}~),
@@@ -723,11 -720,10 +723,10 @@@ Description: Python-UNO bridge (suppor
or the built in StarBasic scripting language.
.
This package is for compatibility with applications/libraries not ported
- to python 3 yet. Prefer python3.3-uno over this.
+ to python 3 yet. Prefer python3-uno over this.
Homepage: http://udk.openoffice.org/python/python-bridge.html
- Package: python3.3-uno
- #Provides: ${python3:Provides}
+ Package: python3-uno
Section: python
Architecture: amd64 armel armhf hppa i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc
Enhances: libreoffice
@@@ -735,9 -731,9 +734,9 @@@ Depends: libreoffice-core (= ${binary:V
${misc:Depends},
${python3:Depends},
${shlibs:Depends}
- Conflicts: python-uno, python3-uno (<< 1:4.0.2~rc2)
- Replaces: python3-uno (<< 1:4.0.2~rc2)
- Provides: python3-uno
+ Conflicts: python-uno, python3-uno (<< 1:4.0.2~rc2), python3.3-uno
+ Replaces: python3-uno (<< 1:4.0.2~rc2), python3.3-uno
+ Provides: ${python3:Provides}
Description: Python-UNO bridge
The Python-UNO bridge allows use of the standard LibreOffice API
with the Python scripting language. It additionally allows
@@@ -762,6 -758,23 +761,6 @@@ Description: office productivity suite
This package contains the LibreOffice Office Bean for embedding
LibreOffice in custom Java applications.
-Package: libreoffice-filter-mobiledev
-Section: misc
-Architecture: all
-Depends: ${java-common-depends},
- ${java-runtime-depends},
- ${java:Depends},
- ${misc:Depends}
-Breaks: libreoffice-core (<< 1:3.5~)
-Description: office productivity suite -- mobile devices filters
- LibreOffice is a full-featured office productivity suite that provides
- a near drop-in replacement for Microsoft(R) Office.
- .
- This package contains the filters for Mobile Devices:
- * AportisDoc (Palm)
- * PocketWord
- * PocketExcel
-
Package: openoffice.org-dtd-officedocument1.0
Section: text
Priority: extra
@@@ -4078,7 -4091,7 +4077,7 @@@ Depends: uno-libs3 (= ${ure:Version}),
Suggests: java5-runtime
Conflicts: cli-uno-bridge (<< 1:3.0.0~dev300m22)
Replaces: libreoffice-java-common (<< 1:3.0.0~dev300m12)
-Breaks: openoffice.org-core (<< 1:3.3~)
+Breaks: libreoffice-core (<< 1:4.1.0~alpha), openoffice.org-core (<< 1:3.3~)
Description: LibreOffice UNO runtime environment
The Uno Runtime Environment (URE) is the well-known UNO component model
of LibreOffice, packaged up as an individual product.
@@@ -4204,26 -4217,27 +4203,26 @@@ Conflicts: libreoffice-common (<< 1:3.5
ure (<< 1.5.1+OOo3.1.1-15)
Provides: libreoffice-reportdesigner
Enhances: libreoffice-base
-Description: LibreOffice extension for building database reports
+Description: LibreOffice component for building database reports
LibreOffice is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
.
- This package contains the report builder extension:
+ This package contains the report builder:
"Create with the Sun Report Builder stylish, smart-looking database reports.
The flexible report editor can define group and page headers as well as
group and page footers and even calculation fields are available to
accomplish complex database reports."
-Homepage: http://extensions.services.openoffice.org/project/reportdesign
Package: libreoffice-report-builder-bin
Section: misc
Architecture: amd64 armel armhf i386 ia64 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc
Depends: libreoffice-base, libreoffice-core, ${misc:Depends}, ${shlibs:Depends}
-Description: LibreOffice extension for building database reports -- libraries
+Description: LibreOffice component for building database reports -- libraries
LibreOffice is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
.
This package contains some architecture-dependent support libraries
- (librpt*.so) for the report builder extension.
+ (librpt*.so) for the report builder component.
Package: libreoffice-presentation-minimizer
Section: misc
@@@ -4326,10 -4340,9 +4325,10 @@@ Depends: libreoffice-core (= ${binary:V
${idlc-cpp-depends},
${misc:Depends},
${shlibs:Depends}
-Recommends: dmake, g++, ${java-common-depends}, ${java-runtime-depends}
-Suggests: c-shell, libmythes-dev, libreoffice-dev-doc
-Replaces: libreoffice-core (<< 1:4.0.0~rc2)
+Recommends: g++, ${java-common-depends}, ${java-runtime-depends}
+Suggests: libmythes-dev, libreoffice-dev-doc
+Replaces: libreoffice-common (<< 1:4.1.0~beta1),
+ libreoffice-core (<< 1:4.1.0~beta1)
Description: office productivity suite -- SDK
LibreOffice is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
@@@ -4401,12 -4414,12 +4400,12 @@@ Conflicts: libreoffice-common (<< 1:3.5
libreoffice-core (<< 1:3.5~),
ure (<< 1.5.1+OOo3.1.1-15)
Homepage: http://extensions.services.openoffice.org/en/project/mysql_connector
-Description: MySQL Connector extension for LibreOffice
+Description: MariaDB/MySQL Connector extension for LibreOffice
LibreOffice is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
.
- The MySQL Connector extension allows one to use the MySQL database from
- LibreOffice without any wrapper layer such as ODBC or JDBC.
+ The MariaDB/MySQL Connector extension allows one to use the MariaDB or MySQL
+ database from LibreOffice without any wrapper layer such as ODBC or JDBC.
Package: libreoffice-evolution
Architecture: amd64 armel armhf hppa i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc
@@@ -4436,18 -4449,20 +4435,17 @@@ Depends: ant (>= 1.7.0)
autoconf,
automake,
bc,
- binutils (>= 2.23),
bison,
bsh (>= 2.0b4),
bzip2,
cpp-4.7,
debhelper (>= 7.2.3~),
- dmake (>= 1:4.11),
doxygen,
dpkg-dev (>= 1.16.1),
fastjar,
flex | flex-old,
fontforge,
- g++-4.6,
g++-mingw-w64-i686,
- gcc-4.6,
gcj-jdk,
gcj-native-helper,
gdb,
@@@ -4463,7 -4478,6 +4461,7 @@@
libboost1.53-dev,
libcairo2-dev,
libcdr-dev,
+ libclucene-dev (>= 2.3.3.4-2),
libcmis-dev (>= 0.3.1),
libcommons-codec-java,
libcommons-httpclient-java,
@@@ -4490,7 -4504,6 +4488,7 @@@
libgstreamer1.0-dev,
libgtk-3-dev (>= 3.2~),
libgtk2.0-dev (>= 2.10),
+ libharfbuzz-dev (>= 0.9.18),
libhsqldb1.8.0-java (>> 1.8.0.10),
libhunspell-dev (>= 1.1.5-2),
libhyphen-dev (>= 2.4),
@@@ -4503,17 -4516,15 +4501,17 @@@
libldap2-dev,
libloader-java (>= 1.1.6),
liblpsolve55-dev (>= 5.5.0.13-5+b1),
- libmdds-dev (>= 0.6.0),
+ libmdds-dev (>= 0.8.0),
libmspub-dev,
+ libmwaw-dev,
libmysqlclient-dev,
libmysqlcppconn-dev (>= 1.1.0~r791),
libmythes-dev (>= 2:1.2),
libneon27-gnutls-dev,
libnss3-dev (>= 3.12.3),
+ libodfgen-dev,
liborbit2-dev,
- liborcus-dev,
+ liborcus-dev (>= 0.5.0),
libpentaho-reporting-flow-engine-java (>= 0.9.4),
libpng12-dev,
libpoppler-cpp-dev,
@@@ -4557,7 -4568,7 +4555,7 @@@
python (>= 2.6.6-3+squeeze4),
python-dev (>= 2.6),
python3,
- python3.3-dev (>= 3.3),
+ python3-dev (>= 3.3),
unixodbc-dev (>= 2.2.11),
unzip,
x11proto-render-dev,
diff --combined control.in
index df62b0b,4e571c6..2c347fe
--- a/control.in
+++ b/control.in
@@@ -3,7 -3,7 +3,7 @@@ Section: editor
Priority: optional
Maintainer: Debian LibreOffice Maintainers <debian-openoffice@lists.debian.org>
Uploaders: Rene Engelhard <rene@debian.org>
-Build-Depends: %BUILD_DEPS%
+Build-Depends: %BUILD_DEPS%,
Build-Depends-Indep: fdupes, imagemagick, xml-core, %BUILD_DEPS_INDEP%
Build-Conflicts: ant (= 1.8.0-1) [%OOO_GCJ_JDK_ARCHS%],
ant (= 1.8.0-2) [%OOO_GCJ_JDK_ARCHS%],
@@@ -35,16 -35,17 +35,16 @@@ Homepage: http://www.libreoffice.or
Package: libreoffice
Architecture: %OOO_ARCHS%
Section: metapackages
-Depends: libreoffice-base%OOO_NO_BASE_ARCHS%,
+Depends: fonts-sil-gentium-basic,
+ libreoffice-base%OOO_NO_BASE_ARCHS%,
libreoffice-calc,
libreoffice-core (= ${binary:Version}),
libreoffice-draw,
- libreoffice-filter-mobiledev,
libreoffice-impress,
libreoffice-math,
libreoffice-report-builder-bin%OOO_NO_REPORTDESIGN_ARCHS%,
libreoffice-writer,
${dejavu-depends},
- fonts-sil-gentium-basic,
${java-common-depends},
${misc:Depends},
${pyuno-depends}
@@@ -80,6 -81,7 +80,6 @@@ Description: office productivity suite
* libreoffice-draw: Drawing
* libreoffice-base: Database
* libreoffice-math: Equation editor
- * libreoffice-filter-mobiledev: Mobile Devices filters
.
You can extend the functionality of LibreOffice by installing these
packages:
@@@ -181,26 -183,26 +181,26 @@@ Breaks: cli-uno-bridge (<< 1:3.0.0~dev3
hunspell-vi (<< 1:3.1.0-3),
libcairo2 (= 1.4.8-1),
libicu38 (= 3.8~d01-1),
- libreoffice-common (<< 1:3.6.1~rc1),
- libreoffice-evolution (<< 1:3.4.1~),
- libreoffice-kab (<< 1:3.4.1~),
- libreoffice-sdbc-postgresql (<< 0.8.1~),
- libreoffice-style-andromeda (<< 1:3.3.0-1),
- libreoffice-style-crystal (<< 1:3.3.0-1),
- libreoffice-style-galaxy (<< 1:3.3.0-1),
- libreoffice-style-hicontrast (<< 1:3.3.0-1),
- libreoffice-style-oxygen (<< 1:3.3.0-1),
- libreoffice-style-tango (<< 1:3.3.0-1),
libreoffice-base (<< ${binary:Version}),
libreoffice-calc (<< ${binary:Version}),
+ libreoffice-common (<< 1:3.6.1~rc1),
libreoffice-dev (<< ${binary:Version}),
libreoffice-draw (<< ${binary:Version}),
libreoffice-evolution (<< ${binary:Version}),
+ libreoffice-evolution (<< 1:3.4.1~),
libreoffice-gnome (<< ${binary:Version}),
libreoffice-gtk (<< ${binary:Version}),
libreoffice-impress (<< ${binary:Version}),
+ libreoffice-kab (<< 1:3.4.1~),
libreoffice-kde (<< ${binary:Version}),
libreoffice-officebean (<< ${binary:Version}),
+ libreoffice-sdbc-postgresql (<< 0.8.1~),
+ libreoffice-style-andromeda (<< 1:3.3.0-1),
+ libreoffice-style-crystal (<< 1:3.3.0-1),
+ libreoffice-style-galaxy (<< 1:3.3.0-1),
+ libreoffice-style-hicontrast (<< 1:3.3.0-1),
+ libreoffice-style-oxygen (<< 1:3.3.0-1),
+ libreoffice-style-tango (<< 1:3.3.0-1),
libreoffice-writer (<< ${binary:Version}),
mozilla-libreoffice (<< 1:3.5.0~beta~),
mozilla-plugin-vlc (<< 1.0),
@@@ -263,16 -265,15 +263,16 @@@ Description: office productivity suite
Package: libreoffice-common
Architecture: all
Pre-Depends: dpkg (>= 1.15.7.2~)
-Depends: libreoffice-style-default | libreoffice-style,
- ure,
- ${misc:Depends}
+Depends: libreoffice-style-default | libreoffice-style, ure, ${misc:Depends}
Suggests: libreoffice-style-crystal,
libreoffice-style-hicontrast,
libreoffice-style-oxygen,
libreoffice-style-tango
Recommends: xfonts-mathml, ${pyuno-depends}, ${textcat-data-recommends}
-Conflicts: broffice, libreoffice-l10n-3.5, libreoffice-l10n-3.6
+Conflicts: broffice,
+ libreoffice-filter-mobiledev,
+ libreoffice-l10n-3.5,
+ libreoffice-l10n-3.6
Provides: libreoffice-l10n-en-us
Breaks: libreoffice-core (<< 1:${oover}~),
libreoffice-core (>= 1:${next-oover}~),
@@@ -582,11 -583,10 +582,10 @@@ Description: Python-UNO bridge (suppor
or the built in StarBasic scripting language.
.
This package is for compatibility with applications/libraries not ported
- to python 3 yet. Prefer python3.3-uno over this.
+ to python 3 yet. Prefer python3-uno over this.
Homepage: http://udk.openoffice.org/python/python-bridge.html
- Package: python3.3-uno
- #Provides: ${python3:Provides}
+ Package: python3-uno
Section: python
Architecture: %OOO_ARCHS%
Enhances: libreoffice
@@@ -594,9 -594,9 +593,9 @@@ Depends: libreoffice-core (= ${binary:V
${misc:Depends},
${python3:Depends},
${shlibs:Depends}
- Conflicts: python-uno, python3-uno (<< 1:4.0.2~rc2)
- Replaces: python3-uno (<< 1:4.0.2~rc2)
- Provides: python3-uno
+ Conflicts: python-uno, python3-uno (<< 1:4.0.2~rc2), python3.3-uno
+ Replaces: python3-uno (<< 1:4.0.2~rc2), python3.3-uno
+ Provides: ${python3:Provides}
Description: Python-UNO bridge
The Python-UNO bridge allows use of the standard LibreOffice API
with the Python scripting language. It additionally allows
@@@ -621,6 -621,23 +620,6 @@@ Description: office productivity suite
This package contains the LibreOffice Office Bean for embedding
LibreOffice in custom Java applications.
-Package: libreoffice-filter-mobiledev
-Section: misc
-Architecture: all
-Depends: ${java-common-depends},
- ${java-runtime-depends},
- ${java:Depends},
- ${misc:Depends}
-Breaks: libreoffice-core (<< 1:3.5~)
-Description: office productivity suite -- mobile devices filters
- LibreOffice is a full-featured office productivity suite that provides
- a near drop-in replacement for Microsoft(R) Office.
- .
- This package contains the filters for Mobile Devices:
- * AportisDoc (Palm)
- * PocketWord
- * PocketExcel
-
Package: openoffice.org-dtd-officedocument1.0
Section: text
Priority: extra
diff --combined rules
index f815b87,7894d46..208a37c
--- a/rules
+++ b/rules
@@@ -22,8 -22,8 +22,8 @@@ CURDIR ?= $(realpath $(dir $(firstword
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:=4.0
-OOVER:=4.0
+HELP_L10N_VIRTUAL_VERSION:=4.1
+OOVER:=4.1
NEXT_OOVER:=$(shell echo "$(OOVER) + 0.1" | bc)
ARCH_INDEP_PACKAGES := $(shell dh_listpackages -i)
@@@ -62,15 -62,15 +62,15 @@@ SOURCE_TREE=
STAMP_DIR=debian/stampdir
TARFILE_LOCATION=$(CURDIR)/src
export TARFILE_LOCATION
-USE_SOURCE_TARBALLS=y
+USE_SOURCE_TARBALLS=n
USE_GIT_TARBALLS=n
ifeq "$(USE_GIT_TARBALLS)" "y"
GIT_BASEURL:=git://anongit.freedesktop.org/libreoffice
-lo_sources_ver=4.0.4.2
+lo_sources_ver=$(shell grep AC_INIT $(SOURCE_TREE)/configure.ac | grep documentfoundation | cut -d, -f2 | sed -e 's,\[,,' -e 's,\],,')
# NOT in proper libreoffice-3-6 branch
# use ./g checkout -b tag-libreoffice-3.6.2.1 libreoffice-3.6.2.1
GIT_TAG=libreoffice-$(lo_sources_ver)
-GIT_BRANCH=libreoffice-4-0-4
+GIT_BRANCH=libreoffice-4-1-0
endif
ifeq "$(USE_SOURCE_TARBALLS)" "y"
lo_sources_ver=$(shell cat $(CURDIR)/sources.ver | cut -d= -f2)
@@@ -113,8 -113,6 +113,8 @@@ BUILD_DEPS=
zip,\
zlib1g-dev\
+
+CHECKTARGET:=check
# These are components which can be built from internal copies, or used from the
# distribution. See configure --help for valid values (--with-system-<value>).
SYSTEM_STUFF = dicts
@@@ -130,8 -128,7 +130,7 @@@ endi
# uses pythonX.Y directly (and the dh_pycentral-created dependencies allow
# also the non-working default python then) - see e.g. #587402. Also
# note we are NOT working with python < 2.6 anymore!
- # Also note that you need to adapt all package names...
- PYTHON_VERSION=3.3
+ PYTHON_VERSION=current
ifeq "$(PYTHON_VERSION)" "current"
PYTHON=python3
export PYTHON=python3
@@@ -193,8 -190,6 +192,8 @@@ SYSTEM_STUFF += libwpd libwpg libwp
SYSTEM_STUFF += libvisio
SYSTEM_STUFF += libcdr
SYSTEM_STUFF += libmspub
+SYSTEM_STUFF += libmwaw
+SYSTEM_STUFF += libodfgen
#SYSTEM_STUFF += xmlsec
BUILD_CAIROCANVAS=y
SYSTEM_STUFF += cairo
@@@ -282,6 -277,7 +281,6 @@@ ifeq "$(ENABLE_JUNIT4)" "y
endif
USE_LIBCURL4=y
CURL_SECTYPE=gnutls
-USE_SYSTEM_DMAKE=y
USE_LIBSUITESPARSE=y
SUITESPARSE_MIN_VERSION= (>= 1:3.4.0)
PARALLEL_BUILD=y
@@@ -323,7 -319,6 +322,7 @@@ endi
PACKAGE_BASE=y
ENABLE_GRAPHITE=y
SYSTEM_STUFF += graphite
+SYSTEM_STUFF += harfbuzz
ALLOC=system
SYSTEM_STUFF += libexttextcat
SYSTEM_STUFF += cppunit
@@@ -333,10 -328,8 +332,10 @@@
DEFAULT_IMAGE=galaxy
IMAGES:=$(DEFAULT_IMAGE) crystal hicontrast tango oxygen
ENABLE_MYSQLNATIVE=y
-# cannot be disabled, unless you have a internal MySQL/PostgreSQL somewhere :-)
-SYSTEM_STUFF += mysql mysql-cppconn
+USE_MARIADB=n
+# set this also to y for system-mysql..
+SYSTEM_STUFF += mariadb
+SYSTEM_STUFF += mysql-cppconn
MYSQLCPPCONN_MINVER= (>= 1.1.0~r791)
SYSTEM_STUFF += postgresql
DICT_DIR=/usr/share/hunspell
@@@ -354,7 -347,7 +353,7 @@@ SYSTEM_STUFF += mesa-header
SYSTEM_STUFF += poppler
SYSTEM_STUFF += libpng
SYSTEM_STUFF += nss
-#SYSTEM_STUFF += clucene
+SYSTEM_STUFF += clucene
ENABLE_HELP=y
SYSTEM_STUFF += lcms2
SYSTEM_STUFF += openldap
@@@ -374,7 -367,6 +373,7 @@@ ifeq "$(USE_UCPP)" "y
SYSTEM_STUFF += ucpp
endif
ENABLE_MERGELIBS=n
+PACKAGE_LIBLIBREOFFICE=n
# Default flags to pass to configure
CONFIGURE_FLAGS= \
@@@ -389,8 -381,7 +388,8 @@@
--without-fonts \
--without-myspell-dicts \
--disable-dependency-tracking \
- --enable-hardlink-deliver
+ --enable-hardlink-deliver \
+ --with-branding=$(CURDIR)/debian/branding
ifeq "$(shell echo $(DEB_VERSION_UPSTREAM) | grep -E '(alpha|beta)'; echo $$?)" "1"
CONFIGURE_FLAGS += --enable-release-build
@@@ -430,10 -421,6 +429,10 @@@ IGNORE_MAKE_CHECK_FAILURES:
IGNORE_MAKE_CHECK_FAILURES:=
endif
endif
+# sw_python would fail anyways as it doesn't work with python2..
+ifeq "$(WHEEZY_BACKPORT)" "y"
+IGNORE_MAKE_CHECK_FAILURES=-
+endif
OOO_64BIT_ARCHS = $(filter amd64 ia64 kfreebsd-amd64 ppc64 s390x, $(OOO_ARCHS))
@@@ -481,11 -468,13 +480,11 @@@ ifeq (,$(findstring $(DEB_HOST_ARCH),$(
ENABLE_MINIMIZER=n
ENABLE_MYSQLNATIVE=n
DEBHELPER_OPTIONS += -Nlibreoffice-mysql-connector
- DEBHELPER_OPTIONS += -Nlibreoffice-report-builder-bin -Nlibreoffice-report-builder
DEBHELPER_OPTIONS += -Nlibreoffice-presentation-minimizer
endif
ifeq (,$(findstring $(DEB_HOST_ARCH),$(OOO_EXTENSIONS_ARCHS)))
ENABLE_MEDIAWIKI=n
ENABLE_REPORTDESIGN=n
- DEBHELPER_OPTIONS += -Nlibreoffice-report-builder-bin -Nlibreoffice-report-builder
DEBHELPER_OPTIONS += -Nlibreoffice-wiki-publisher -Nlibreoffice-script-provider-python
CONFIGURE_FLAGS += --disable-extension-integration --disable-extensions
else
@@@ -537,10 -526,15 +536,10 @@@ endi
#############
# Distro-specific overrides
# Debian WHeezy
ifeq "$(shell dpkg-parsechangelog | grep Distribution | awk '{ print $$2 }')" "wheezy-backports"
BUGS=mailto:debian-backports@lists.debian.org
- SYSTEM_STUFF := $(filter-out libcmis libcdr clucene libmspub mdds liblangtag orcus, $(SYSTEM_STUFF))
+ SYSTEM_STUFF := $(filter-out libcmis libcdr clucene libmspub libmwaw libodfgen mdds liblangtag orcus harfbuzz, $(SYSTEM_STUFF))
WHEEZY_BACKPORT=y
endif
ifeq "$(shell dpkg-parsechangelog | grep Distribution | awk '{ print $$2 }')" "UNRELEASED"
@@@ -551,14 -545,14 +550,14 @@@ CONFIGURE_FLAGS += $(foreach i, $(SYSTE
CC_PREFIX:=$(shell gcc -dumpmachine)-
- BUILD_DEPS += , gcc-4.6 [!i386 !amd64 !kfreebsd-i386 !kfreebsd-amd64] ,g++-4.6 [!i386 !amd64 !kfreebsd-i386 !kfreebsd-amd64]
-ifeq (,$(findstring i386,$(DEB_HOST_ARCH)))
- ifeq (,$(findstring amd64,$(DEB_HOST_ARCH)))
- ifneq "$(SYSTEM_GCC_VERSION)" "4.6"
- GCC_VERSION := 4.6
- endif
- endif
-endif
+# BUILD_DEPS += , gcc-4.6 [!i386 !amd64 !kfreebsd-i386 !kfreebsd-amd64] ,g++-4.6 [!i386 !amd64 !kfreebsd-i386 !kfreebsd-amd64]
+#ifeq (,$(findstring i386,$(DEB_HOST_ARCH)))
+# ifeq (,$(findstring amd64,$(DEB_HOST_ARCH)))
+# ifneq "$(SYSTEM_GCC_VERSION)" "4.6"
+# GCC_VERSION := 4.6
+# endif
+# endif
+#endif
ifneq "$(GCC_VERSION)" ""
ifneq "$(SYSTEM_GCC_VERSION)" "$(GCC_VERSION)"
BUILD_DEPS += , gcc-$(GCC_VERSION), g++-$(GCC_VERSION)
@@@ -603,9 -597,6 +602,9 @@@ els
CONFIGURE_FLAGS += --disable-graphite
endif
+ifneq (,$(filter harfbuzz, $(SYSTEM_STUFF)))
+ BUILD_DEPS += , libharfbuzz-dev (>= 0.9.18)
+endif
ifneq (,$(filter libexttextcat, $(SYSTEM_STUFF)))
BUILD_DEPS += , libexttextcat-dev (>= 3.1.1)
@@@ -678,7 -669,7 +677,7 @@@ ifneq "$(WHEEZY_BACKPORT)" "y
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/python3.3-uno/$(shell $(PYTHON) -c 'from distutils import sysconfig; print(sysconfig.get_python_lib())')
+ PYTHON_SITE:=debian/python3-uno/$(shell $(PYTHON) -c 'from distutils import sysconfig; print(sysconfig.get_python_lib())')
ifeq "$(ENABLE_PYTHON2)" "y"
PY2MAJOR:=$(shell $(PYTHON2) -c "import sys; print sys.version_info[0]")
PY2MINOR:=$(shell $(PYTHON2) -c "import sys; print sys.version_info[1]")
@@@ -689,8 -680,8 +688,8 @@@ els
PYMAJOR:=$(shell $(PYTHON2) -c "import sys; print (sys.version_info[0])")
PYMINOR:=$(shell $(PYTHON2) -c "import sys; print (sys.version_info[1])")
PYMINORPLUS1:=$(shell $(PYTHON2) -c "import sys; print (sys.version_info[1]+1)")
- # YES, really! python3.3-uno. see "OMG!" below :-)
- PYTHON_SITE:=debian/python3.3-uno/$(shell $(PYTHON2) -c 'from distutils import sysconfig; print(sysconfig.get_python_lib())')
+ # YES, really! python3-uno. see "OMG!" below :-)
+ PYTHON_SITE:=debian/python3-uno/$(shell $(PYTHON2) -c 'from distutils import sysconfig; print(sysconfig.get_python_lib())')
PYTHON:=$(PYTHON2)
endif
@@@ -812,8 -803,6 +811,8 @@@ ifeq "$(ENABLE_JAVA)" "y
ifeq "$(JDK)" "gcj-jdk"
JAVA_HOME=/usr/lib/jvm/java-gcj
BUILD_DEPS += , gcj-jdk$(OOO_NO_JAVA_ARCHS)
+ DEBHELPER_OPTIONS += -Nlibreoffice-dev-doc
+ PACKAGE_SDK_DOCS = n
endif
ifeq "$(JDK)" "openjdk"
ifeq "$(JAVA_MAINVER)" "6"
@@@ -902,13 -891,13 +901,13 @@@ export JAVA_HOM
CONFIGURE_FLAGS += --with-servlet-api-jar=$(shell dpkg -L `dpkg -s libcommons-logging-java | grep Suggests | cut -d"," -f5 | sed -e s/^\ // | awk '{ print $$1 }'` | grep servlet-api.*\.jar$ | head -n 1)
endif
else
- CONFIGURE_FLAGS += --disable-ext-report-builder
+ CONFIGURE_FLAGS += --disable-report-builder
endif
OOO_OFFICEBEAN_DEP = libreoffice-officebean
BUILD_DEPS += , javahelper $(JAVAHELPER_MIN_VERSION)
else
CONFIGURE_FLAGS += --without-java
- DEBHELPER_OPTIONS += -Nlibreoffice-officebean -Nlibreoffice-java-common -Nlibreoffice-filter-mobiledev -Nlibreoffice-gcj -Nlibreoffice-script-provider-bsh -Nlibreoffice-script-provider-js
+ DEBHELPER_OPTIONS += -Nlibreoffice-officebean -Nlibreoffice-java-common -Nlibreoffice-gcj -Nlibreoffice-script-provider-bsh -Nlibreoffice-script-provider-js
endif
ifneq (,$(filter nss, $(SYSTEM_STUFF)))
@@@ -923,6 -912,9 +922,6 @@@ ifeq (,$(findstring $(DEB_HOST_ARCH),$(
CONFIGURE_FLAGS += --disable-nsplugin
endif
-ifeq "$(USE_SYSTEM_DMAKE)" "y"
- BUILD_DEPS += , dmake (>= 1:4.11)
-endif
ifeq "$(USE_UCPP)" "y"
ifneq (,$(filter ucpp, $(SYSTEM_STUFF)))
IDLC_CPP_DEPENDS := ucpp
@@@ -979,11 -971,11 +978,11 @@@ ifneq (,$(filter boost, $(SYSTEM_STUFF)
endif
ifneq (,$(filter mdds, $(SYSTEM_STUFF)))
- BUILD_DEPS += , libmdds-dev (>= 0.6.0)
+ BUILD_DEPS += , libmdds-dev (>= 0.8.0)
endif
ifneq (,$(filter orcus, $(SYSTEM_STUFF)))
- BUILD_DEPS += , liborcus-dev
+ BUILD_DEPS += , liborcus-dev (>= 0.5.0)
endif
ifneq (,$(filter vigra, $(SYSTEM_STUFF)))
@@@ -1016,12 -1008,6 +1015,12 @@@ ifeq "$(USE_EXTERNAL_CXXLIBS)" "y
ifneq (,$(filter libmspub, $(SYSTEM_STUFF)))
BUILD_DEPS += , libmspub-dev
endif
+ ifneq (,$(filter libmwaw, $(SYSTEM_STUFF)))
+ BUILD_DEPS += , libmwaw-dev
+ endif
+ ifneq (,$(filter libodfgen, $(SYSTEM_STUFF)))
+ BUILD_DEPS += , libodfgen-dev
+ endif
ifneq (,$(filter libcmis, $(SYSTEM_STUFF)))
BUILD_DEPS += , libcmis-dev (>= 0.3.1)
endif
@@@ -1085,17 -1071,13 +1084,17 @@@ els
endif
ifeq "$(ENABLE_MYSQLNATIVE)" "y"
- CONFIGURE_FLAGS += --enable-ext-mysql-connector
- ifneq (,$(filter mysql, $(SYSTEM_STUFF)))
+ CONFIGURE_FLAGS += --enable-ext-mariadb-connector
+ ifneq "$(USE_MARIADB)" "y"
ifneq (,$(filter mysql-cppconn, $(SYSTEM_STUFF)))
- BUILD_DEPS += , libmysqlclient-dev
- else
- BUILD_DEPS += , libmysqlclient-dev (>= 5.5~)
+ BUILD_DEPS += , libmysqlclient-dev
endif
+ MARIADBCONFIG=/usr/bin/mysql_config
+ else
+ ifneq (,$(filter mariadb, $(SYSTEM_STUFF)))
+ BUILD_DEPS += , libmariadbclient-dev (>= 1.1.0~)
+ endif
+ MARIADBCONFIG=/usr/bin/mariadb_config
endif
ifneq (,$(filter mysql-cppconn, $(SYSTEM_STUFF)))
BUILD_DEPS += , libmysqlcppconn-dev $(MYSQLCPPCONN_MINVER)
@@@ -1144,7 -1126,7 +1143,7 @@@ els
endif
ifneq "$(ENABLE_PYTHON)" "y"
- DEBHELPER_OPTIONS+= -Npython-uno -Npython3.3-uno -Nlibreoffice-script-provider-python
+ DEBHELPER_OPTIONS+= -Npython-uno -Npython3-uno -Nlibreoffice-script-provider-python
ifeq "$(BUILD_ISOS)" "en-US"
CONFIGURE_FLAGS += --disable-python
else
@@@ -1152,12 -1134,11 +1151,12 @@@
endif
else
ifeq "$(WHEEZY_BACKPORT)" "y"
- DEBHELPER_OPTIONS+= -Npython3.3-uno
+ DEBHELPER_OPTIONS+= -Npython3-uno
PYUNO_DEPENDS = python-uno
else
- PYUNO_DEPENDS = python3.3-uno | python3-uno (>= 4.0~) | python-uno
+ PYUNO_DEPENDS = python3-uno (>= 4.0~) | python3.3-uno | python-uno
endif
+ CONFIGURE_FLAGS += --enable-python=system
endif
ifeq "$(ENABLE_JAVA)" "y"
@@@ -1256,14 -1237,14 +1255,14 @@@ ifneq (,$(filter redland, $(SYSTEM_STUF
endif
ifeq "$(ENABLE_GIO)" "y"
- CONFIGURE_FLAGS += --enable-gio --disable-gnome-vfs
BUILD_DEPS += , libglib2.0-dev (>= 2.15.0)
+else
+ CONFIGURE_FLAGS += --disable-gio
endif
ifeq "$(ENABLE_GVFS)" "y"
BUILD_DEPS += , libgnomevfs2-dev
-else
- CONFIGURE_FLAGS += --disable-gnome-vfs
+ CONFIGURE_FLAGS += --enable-gnome-vfs
endif
ifeq "$(ENABLE_GCONF)" "y"
@@@ -1377,7 -1358,7 +1376,7 @@@ clean
$(MAKE) distclean; \
rm -f config.status; \
fi
- find $(SOURCE_TREE)/solenv/gdb -name "*.pyc" -exec rm {} \;
+ find $(SOURCE_TREE) -name "*.pyc" -exec rm {} \;
rm -rf */*.pro.obsolete
rm -rf $(SOURCE_TREE)/file-lists
@@@ -1546,9 -1527,6 +1545,9 @@@ endi
ifeq "$(PACKAGE_LIBRELOGO)" "y"
cat debian/control.librelogo.in >> debian/control
endif
+ifeq "$(PACKAGE_LIBLIBREOFFICE)" "y"
+ cat debian/control.liblibreoffice.in >> debian/control
+endif
perl -pi -e "s,%OOO_ARCHS%,$(OOO_ARCHS),g" debian/control
perl -pi -e "s,%OOO_BASE_ARCHS%,$(OOO_BASE_ARCHS),g" debian/control
@@@ -1566,8 -1544,9 +1565,9 @@@ ifeq "$(BUILD_TEST_PACKAGE)" "y
# we want the build deps as dep on subsequentcheckbase, but strip the arch
# specifics as we are arch-all
# for now we filter out the arch-specific libc* and ia64, which is ugly,
- # but better than manual bookkeeping
- perl -pi -e "s#%BUILD_DEPS_ARCH_ALL%#$(strip $(shell echo '$(BUILD_DEPS), $(BUILD_DEPS_INDEP)'|sed -e 's/,/,\n /g'|grep -v libc0.1| grep -v libc6| grep -v ia64|sed -e 's/\[[^]]*\]//g'))#g" debian/control
+ # but better than manual bookkeeping. Also filter out the mips(el)-only
+ # binutils build-dep...
+ perl -pi -e "s#%BUILD_DEPS_ARCH_ALL%#$(strip $(shell echo '$(BUILD_DEPS), $(BUILD_DEPS_INDEP)'|sed -e 's/,/,\n /g'|grep -v libc0.1| grep -v libc6| grep -v ia64|grep -v binutils|sed -e 's/\[[^]]*\]//g'))#g" debian/control
endif
ifeq "$(BUILD_KDE)" "y"
perl -pi -e 's/%LO-DESKTOP-INTEGRATION%/libreoffice-gnome | libreoffice-kde/' debian/control
@@@ -1597,10 -1576,6 +1597,10 @@@ ifeq "$(WHEEZY_BACKPORT)" "y
endif
endif
+ifneq "$(USE_MARIADB)" "y"
+ perl -pi -e "s/(Build-Conflicts: .*)/\1,libmariadbclient-dev,/" debian/control
+endif
+
ifeq (4.4,$(SYSTEM_GCC_VERSION))
perl -pi -e 's/flex \|/flex (>= 2.5.25-7) |/' debian/control
endif
@@@ -1708,20 -1683,12 +1708,20 @@@ $(STAMP_DIR)/build-arch
# somehow...
PATH=$(BUILD_PATH) LD_LIBRARY_PATH=$(BUILD_LD_LIBRARY_PATH) \
PYTHON=$(PYTHON) PYTHON_CFLAGS="$(shell pkg-config --cflags python-$(PYMAJOR).$(PYMINOR))" PYTHON_LIBS="$(shell pkg-config --libs python-$(PYMAJOR).$(PYMINOR))" \
+ MARIADBCONFIG=$(MARIADBCONFIG) \
./autogen.sh $(CONFIGURE_FLAGS) \
- --without-help --without-doxygen --disable-ext-wiki-publisher \
- --disable-ext-report-builder --disable-scripting-javascript \
+ --without-doxygen --disable-ext-wiki-publisher \
+ --disable-report-builder --disable-scripting-javascript \
--disable-scripting-beanshell
- PATH=$(BUILD_PATH) LD_LIBRARY_PATH=$(BUILD_LD_LIBRARY_PATH) DEFAULT_TO_ENGLISH_FOR_PACKING=1 ARCH_FLAGS=$(ARCH_FLAGS) TMP=`mktemp -q -d` $(MAKE) build
+ifneq "$(WHEEZY_BACKPORT)" "y"
+ # setting PYTHON_FOR_BUILD above does NOT work and otherwise it
+ # might pick up /usr/bin/python (python 2!) due to wheezy-backports-python.diff
+ # which will not work.
+ perl -pi -e 's/export PYTHON_FOR_BUILD=.*/export PYTHON_FOR_BUILD=$(PYTHON)/' config_host.mk
+endif
+
+ PATH=$(BUILD_PATH) LD_LIBRARY_PATH=$(BUILD_LD_LIBRARY_PATH) ARCH_FLAGS=$(ARCH_FLAGS) TMP=`mktemp -q -d` $(MAKE) build-nocheck
ifneq "$(WHEEZY_BACKPORT)" "y"
ifeq "$(ENABLE_PYTHON)" "y"
@@@ -1742,7 -1709,7 +1742,7 @@@ ifneq "$(BUILD_ISOS)" "en-US
$(MAKE) sdext.clean
$(MAKE) mysqlc.clean
make cmd cmd="cd sdext; export WITH_LANG='$(LANGPACKISOS)'; export WITH_LANG_LIST='$(LANGPACKISOS)'; $(MAKE)"
- make cmd cmd="cd mysqlc; export WITH_LANG='$(LANGPACKISOS)'; export WITH_LANG_LIST='$(LANGPACKISOS)'; ../solenv/bin/build.pl && ../solenv/bin/deliver.pl"
+ make cmd cmd="cd mysqlc; export WITH_LANG='$(LANGPACKISOS)'; export WITH_LANG_LIST='$(LANGPACKISOS)'; $(MAKE)"
endif
touch $@
@@@ -1760,19 -1727,9 +1760,19 @@@ $(STAMP_DIR)/build-indep
$(MAKE) reportbuilder.clean
rm -f config.status autogen.lastrun
- PATH=$(BUILD_PATH) LD_LIBRARY_PATH=$(BUILD_LD_LIBRARY_PATH) ./autogen.sh $(CONFIGURE_FLAGS) $(CONFIGURE_FLAGS_LANG)
+ PATH=$(BUILD_PATH) LD_LIBRARY_PATH=$(BUILD_LD_LIBRARY_PATH) \
+ PYTHON=$(PYTHON) PYTHON_CFLAGS="$(shell pkg-config --cflags python-$(PYMAJOR).$(PYMINOR))" PYTHON_LIBS="$(shell pkg-config --libs python-$(PYMAJOR).$(PYMINOR))" \
+ MARIADBCONFIG=$(MARIADBCONFIG) \
+ ./autogen.sh $(CONFIGURE_FLAGS) --with-help $(CONFIGURE_FLAGS_LANG)
- PATH=$(BUILD_PATH) LD_LIBRARY_PATH=$(BUILD_LD_LIBRARY_PATH) DEFAULT_TO_ENGLISH_FOR_PACKING=1 ARCH_FLAGS=$(ARCH_FLAGS) TMP=`mktemp -q -d` $(MAKE) build
+ifneq "$(WHEEZY_BACKPORT)" "y"
+ # setting PYTHON_FOR_BUILD above does NOT work and otherwise it
+ # might pick up /usr/bin/python (python 2!) due to wheezy-backports-python.diff
+ # which will not work.
+ perl -pi -e 's/export PYTHON_FOR_BUILD=.*/export PYTHON_FOR_BUILD=$(PYTHON)/' config_host.mk
+endif
+
+ PATH=$(BUILD_PATH) LD_LIBRARY_PATH=$(BUILD_LD_LIBRARY_PATH) ARCH_FLAGS=$(ARCH_FLAGS) TMP=`mktemp -q -d` $(MAKE) build-nocheck
touch $@
@@@ -1793,7 -1750,7 +1793,7 @@@ endi
export HOME=$$t; \
export SAL_USE_VCLPLUGIN="svp"; \
if [ -x /usr/bin/gdb ]; then ulimit -c unlimited; fi && \
- $(MAKE) -k check || $(MAKE) check && \
+ $(MAKE) -k $(CHECKTARGET) || $(MAKE) $(CHECKTARGET) && \
rm -rf $$t
ifneq (,$(findstring $(DEB_HOST_ARCH),$(OOO_NO_BASE_ARCHS)))
@@@ -1837,7 -1794,9 +1837,7 @@@ ifeq "$(BUILD_DBG_PACKAGE)" "y
endif
# FIXME
- if echo $(DEB_HOST_ARCH) | grep -q kfreebsd; then \
- cd $(CURDIR)/debian/tmp/pkg && rm -rf \*; \
- fi
+ cd $(CURDIR)/debian/tmp/pkg && rm -rf \*
# prepare install/dir files for dh
for i in `cd $(CURDIR)/debian/tmp/pkg; ls -1 | xargs`; do \
@@@ -1989,14 -1948,6 +1989,14 @@@ ifeq "$(BUILD_GTK)" "y
$(PKGDIR)-gnome/$(OODIR)/share/xdg
endif
+ifeq "$(BUILD_KDE)" "y"
+ mkdir -p $(PKGDIR)-kde/$(OODIR)/program
+ mv $(PKGDIR)-common/$(OODIR)/program/kde-open-url \
+ $(PKGDIR)-kde/$(OODIR)/program
+else
+ rm -f $(PKGDIR)-common/$(OODIR)/kde-open-url
+endif
+
ifeq "$(PACKAGE_SDK)" "y"
# move SDK documentation into own package
rm -rf $(PKGDIR)-dev-doc
@@@ -2023,14 -1974,6 +2023,14 @@@ ifeq "$(ENABLE_EVO2)" "y
$(PKGDIR)-evolution/$(OODIR)/presets/database
endif
+ifeq "$(PACKAGE_SDK)" "y"
+ mkdir -p $(PKGDIR)-dev/$(OODIR)/share/glade
+ mv $(PKGDIR)-common/$(OODIR)/share/glade/libreoffice-catalog.xml \
+ $(PKGDIR)-dev/$(OODIR)/share/glade
+else
+ rm -rf $(PKGDIR)-common/$(OODIR)/share/glade
+endif
+
find debian/tmp ! -perm -200 | xargs -r chmod u+w
touch $@
@@@ -2107,14 -2050,13 +2107,14 @@@ $(STAMP_DIR)/langpacks: $(STAMP_DIR)/bu
$(PKGDIR)-$$pkg/$(OODIR)/share/wordbook/$$iso/technical.dic; \
done
- # replace duplicate files in the langpacks with symlinks
- TMP=`mktemp -q`; \
- fdupes --quiet --recurse --sameline --size \
- debian/libreoffice-common/$(OODIR) \
- $(foreach d,$(shell echo $(filter-out en-US ca-XV,$(LANGPACKISOS)) | tr A-Z a-z),debian/libreoffice-l10n-$(d)/$(OODIR)) \
- > $$TMP && \
- debian/scripts/cleandupes --base=libreoffice --prefix=debian < $$TMP && rm -f $$TMP
+ # FIXME!
+# # replace duplicate files in the langpacks with symlinks
+# TMP=`mktemp -q`; \
+# fdupes --quiet --recurse --sameline --size \
+# debian/libreoffice-common/$(OODIR) \
+# $(foreach d,$(shell echo $(filter-out en-US ca-XV,$(LANGPACKISOS)) | tr A-Z a-z),debian/libreoffice-l10n-$(d)/$(OODIR)) \
+# > $$TMP && \
+# debian/scripts/cleandupes --base=libreoffice --prefix=debian < $$TMP && rm -f $$TMP
ifeq "$(DEB_VENDOR)" "Debian"
# install Debian presentation template
@@@ -2211,9 -2153,9 +2211,9 @@@ endi
mv $$i debian/uno-libs3/$(OOUREDIR)/lib; \
ln -sf /$(OOUREDIR)/lib/`basename $$i` debian/uno-libs3/usr/lib/`basename $$i`; \
done
- # we also need libxmlreader.so and libreg.so.3 (libuno_cppuhelpergcc3.so.3 needs it)
- # and libstore.so.3 (libreg.so.3 needs it)
- for i in libxmlreader.so libreg.so.3 libstore.so.3; do \
+ # we also need libxmlreader.so and libreg.so (libuno_cppuhelpergcc3.so.3 needs it)
+ # and libstore.so (libreg.so.3 needs it)
+ for i in libxmlreader.so libreg.so libstore.so; do \
mv debian/ure/$(OOUREDIR)/lib/$$i \
debian/uno-libs3/$(OOUREDIR)/lib; \
done
@@@ -2259,15 -2201,15 +2259,15 @@@ ifeq "$(BUILD_GTK)" "y
mkdir -p -m755 $(PKGDIR)-gtk/$(OODIR)/share
mv $(PKGDIR)-gnome/$(OODIR)/share/xdg $(PKGDIR)-gtk/$(OODIR)/share
ifeq "$(ENABLE_GIO)" "y"
- mv $(PKGDIR)-gtk/$(OODIR)/program/ucpgio1.uno.so \
+ mv $(PKGDIR)-gtk/$(OODIR)/program/libucpgio1lo.so \
$(PKGDIR)-gnome/$(OODIR)/program/
endif
ifeq "$(ENABLE_GVFS)" "y"
- mv $(PKGDIR)-gtk/$(OODIR)/program/ucpgvfs1.uno.so \
+ mv $(PKGDIR)-gtk/$(OODIR)/program/libucpgvfs1lo.so \
$(PKGDIR)-gnome/$(OODIR)/program/
endif
ifeq "$(ENABLE_GCONF)" "y"
- mv $(PKGDIR)-gtk/$(OODIR)/program/gconfbe* \
+ mv $(PKGDIR)-gtk/$(OODIR)/program/libgconfbe1lo.so \
$(PKGDIR)-gnome/$(OODIR)/program
endif
endif
@@@ -2321,6 -2263,11 +2321,6 @@@ endi
mkdir -p -m755 $(PKGDIR)-base/usr/share/applications \
$(PKGDIR)-core/usr/share/applications
- for f in `find debian -name 'xdg/*.desktop' ! -name "*soffice.od*"`; do \
- if ! grep -q X-KDE-Protocols $$f; then \
- echo 'X-KDE-Protocols=file,http,smb,ftp,webdav' >> $$f; \
- fi; \
- done
sed -i -e 's/Office;/Office;Graphics;/' $(PKGDIR)-draw/$(OODIR)/share/xdg/draw.desktop
# invalid, according to lintian. make it shut up.
for i in writer calc impress draw math base; do \
@@@ -2331,22 -2278,15 +2331,22 @@@
ifeq "$(ENABLE_PYTHON)" "y"
# PyUNO packaging
install -d $(PYTHON_SITE)
- mv debian/python3-uno/$(OODIR)/program/uno.py $(PYTHON_SITE)
+ # prepend stuff so that it works when the module is not in LOs
+ # directories but in $(PYTHON_SITE). Can't be a patch (anymore)
+ # as otherwise the python-based unittests fail miserably.
+ echo "import sys, os" > $(PYTHON_SITE)/uno.py
+ echo "sys.path.append('$(OODIR)/program')" >> $(PYTHON_SITE)/uno.py
+ echo "os.putenv('URE_BOOTSTRAP', 'vnd.sun.star.pathname:$(OODIR)/program/fundamentalrc')" >> $(PYTHON_SITE)/uno.py
- cat debian/python3.3-uno/$(OODIR)/program/uno.py >> $(PYTHON_SITE)/uno.py
- rm -f debian/python3.3-uno/$(OODIR)/program/uno.py
- mv debian/python3.3-uno/$(OODIR)/program/unohelper.py $(PYTHON_SITE)
- touch debian/python3.3-uno/$(OODIR)/program/pythonloader.unorc
- chmod u+w debian/python3.3-uno/$(OODIR)/program/pythonloader.unorc
++ cat debian/python3-uno/$(OODIR)/program/uno.py >> $(PYTHON_SITE)/uno.py
++ rm -f debian/python3-uno/$(OODIR)/program/uno.py
+ mv debian/python3-uno/$(OODIR)/program/unohelper.py $(PYTHON_SITE)
+ touch debian/python3-uno/$(OODIR)/program/pythonloader.unorc
+ chmod u+w debian/python3-uno/$(OODIR)/program/pythonloader.unorc
( echo '[Bootstrap]'; \
echo 'PYTHONHOME=file:///usr/lib/python$(PYMAJOR).$(PYMINOR)' ;\
echo 'PYTHONPATH=$$PYTHONHOME $$PYTHONHOME/site-packages $$PYTHONHOME/lib-dynload $$PYTHONHOME/lib-tk $$ORIGIN' \
- ) > debian/python3.3-uno/$(OODIR)/program/pythonloader.unorc
- chmod u-w debian/python3.3-uno/$(OODIR)/program/pythonloader.unorc
+ ) > debian/python3-uno/$(OODIR)/program/pythonloader.unorc
+ chmod u-w debian/python3-uno/$(OODIR)/program/pythonloader.unorc
ifneq "$(WHEEZY_BACKPORT)" "y"
ifeq "$(ENABLE_PYTHON2)" "y"
install -d $(PYTHON2_SITE)
@@@ -2357,7 -2297,7 +2357,7 @@@
mkdir -p debian/python-uno/$(OODIR)/program
mkdir -p debian/python-uno/$(OODIR)/share/registry
mkdir -p debian/python-uno/$(OODIR)/share/Scripts
- cat debian/python3.3-uno/$(OODIR)/program/pythonloader.unorc \
+ cat debian/python3-uno/$(OODIR)/program/pythonloader.unorc \
| sed -e "s/$(PYMAJOR).$(PYMINOR)/$(PY2MAJOR).$(PY2MINOR)/" \
> debian/python-uno/$(OODIR)/program/pythonloader.unorc
for i in py2uno.so libpy2uno.so; do \
@@@ -2365,14 -2305,14 +2365,14 @@@
debian/python-uno/$(OODIR)/program/$$i; \
ln -s $$i debian/python-uno/$(OODIR)/program/`echo $$i | sed -e s/2//`; \
done
- install -m644 $(SOURCE_TREE)/workdir/$(shell . $(SOURCE_TREE)/bin/get_config_variables OUTPATH PROEXT; echo $$OUTPATH$$PROEXT)/LinkTarget/Library/python2loader.uno.so \
- debian/python-uno/$(OODIR)/program/python2loader.uno.so
- ln -s python2loader.uno.so debian/python-uno/$(OODIR)/program/pythonloader.uno.so
+ install -m644 $(SOURCE_TREE)/workdir/$(shell . $(SOURCE_TREE)/bin/get_config_variables OUTPATH PROEXT; echo $$OUTPATH$$PROEXT)/LinkTarget/Library/libpython2loaderlo.so \
+ debian/python-uno/$(OODIR)/program/libpython2loaderlo.so
+ ln -s libpython2loaderlo.so debian/python-uno/$(OODIR)/program/libpythonloaderlo.so
- cp debian/python3.3-uno/$(OODIR)/program/pythonloader.py \
+ cp debian/python3-uno/$(OODIR)/program/pythonloader.py \
debian/python-uno/$(OODIR)/program
- cp debian/python3.3-uno/$(OODIR)/share/registry/pyuno.xcd \
+ cp debian/python3-uno/$(OODIR)/share/registry/pyuno.xcd \
debian/python-uno/$(OODIR)/share/registry
- cp -r debian/python3.3-uno/$(OODIR)/share/Scripts/python \
+ cp -r debian/python3-uno/$(OODIR)/share/Scripts/python \
debian/python-uno/$(OODIR)/share/Scripts
endif
endif
@@@ -2380,13 -2320,13 +2380,13 @@@
rm -f debian/libreoffice-script-provider-python/$(OODIR)/share/extensions/script-provider-for-python/registration/LICENSE
endif
- mkdir -p debian/python3.3-uno/usr/share/doc/python3.3-uno
+ mkdir -p debian/python3-uno/usr/share/doc/python3-uno
cp -r $(SOURCE_TREE)/pyuno/demo \
- debian/python3.3-uno/usr/share/doc/python3.3-uno; \
+ debian/python3-uno/usr/share/doc/python3-uno; \
for i in $(SOURCE_TREE)/pyuno/doc/*; do \
- cp $$i debian/python3.3-uno/usr/share/doc/python3.3-uno; \
+ cp $$i debian/python3-uno/usr/share/doc/python3-uno; \
done
- cd debian/python3.3-uno/usr/share/doc/python3.3-uno && \
+ cd debian/python3-uno/usr/share/doc/python3-uno && \
find . -type d -name "CVS" | xargs -r rm -rf
ifneq "$(WHEEZY_BACKPORT)" "y"
ifeq "$(ENABLE_PYTHON2)" "y"
@@@ -2405,7 -2345,7 +2405,7 @@@ endi
ifeq "$(WHEEZY_BACKPORT)" "y"
# OMG!!
rm -rf debian/python-uno
- mv debian/python3.3-uno debian/python-uno
+ mv debian/python3-uno debian/python-uno
endif
# should be empty now, remove if there
@@@ -2430,6 -2370,10 +2430,6 @@@ ifeq "$(PACKAGE_SDK)" "y
endif
endif
chmod 644 $(PKGDIR)-dev/$(OOSDKDIR)/configure.pl
- for i in csh csh.in; do \
- perl -pi -e 's,/usr/bin/csh,/bin/csh,'\
- $(PKGDIR)-dev/$(OOSDKDIR)/setsdkenv_unix.$$i; \
- done
chmod 755 $(PKGDIR)-dev/$(OOSDKDIR)/setsdkenv_unix
# create wrapper scripts
cd $(PKGDIR)-dev/$(OOSDKDIR)/bin && \
@@@ -2464,6 -2408,18 +2464,6 @@@ ifeq "$(ENABLE_JAVA)" "y
endif
endif
-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)/bin/get_config_variables OUTPATH PROEXT; echo $$OUTPATH$$PROEXT)/pck && \
- for i in juh jurt jut ridl unoloader; do \
- cp $${i}_src.zip \
- $(CURDIR)/$(PKGDIR)-dev/usr/share/java; \
- done
- endif
-endif
-
ifeq "$(ENABLE_JAVA)" "y"
# hrmpf, again something like that, we really need to find the root cause for that
ln -s libjava_uno.so \
@@@ -2479,17 -2435,13 +2479,17 @@@ ifneq "$(ENABLE_REPORTDESIGN)" "y
# unneeded. a no-Java arch, so the report-builder can't work anyway.
# (and we need to remove it here anyway as it otherwise would end up
# in -base)
- rm -f $(PKGDIR)-base/$(OODIR)/program/librpt*
+ rm -rf $(PKGDIR)-report-builder
else
ifeq "$(PACKAGE_BASE)" "y"
# move rpt stuff into -report-builder-bin
rm -rf $(PKGDIR)-report-builder-bin
mkdir -p $(PKGDIR)-report-builder-bin/$(OODIR)/program
- mv $(PKGDIR)-base/$(OODIR)/program/librpt* \
+ # FIXME: it seems that --enable/--disable-reportbuiler affects the install
+ # location. sigh.
+ if [ -e $(PKGDIR)-core/$(OODIR)/program/librptlo.so ]; then \
+ i=core; else i=report-builder; fi; \
+ mv $(PKGDIR)-$$i/$(OODIR)/program/librpt* \
$(PKGDIR)-report-builder-bin/$(OODIR)/program
endif
endif
@@@ -2510,20 -2462,20 +2510,20 @@@ ifeq "$(ENABLE_MEDIAWIKI)" "y
rm -f $(PKGDIR)-wiki-publisher/$(OODIR)/share/extensions/wiki-publisher/registration/LICENSE
endif
-#ifeq "$(PACKAGE_SDK)" "y"
-# # install gengal stuff into -dev
-# mkdir -p $(PKGDIR)-dev/$(OODIR)/program
-# install -m755 $(SOURCE_TREE)/svx/$(shell . $(SOURCE_TREE)/bin/get_config_variables OUTPATH PROEXT; echo $$OUTPATH$$PROEXT)/bin/gengal \
-# $(PKGDIR)-dev/$(OODIR)/program/gengal
-# install -m755 $(SOURCE_TREE)/svx/$(shell . $(SOURCE_TREE)/bin/get_config_variables OUTPATH PROEXT; echo $$OUTPATH$$PROEXT)/bin/gengal.bin \
-# $(PKGDIR)-dev/$(OODIR)/program/gengal.bin
-#endif
ifeq "$(PACKAGE_SDK)" "y"
+ # move gengal stuff into -dev
+ mkdir -p $(PKGDIR)-dev/$(OODIR)/program
+ mv $(PKGDIR)-core/$(OODIR)/program/gengal.bin \
+ $(PKGDIR)-dev/$(OODIR)/program
+ mv $(PKGDIR)-common/$(OODIR)/program/gengal \
+ $(PKGDIR)-dev/$(OODIR)/program
# move ui-previewer into -dev
mkdir -p $(PKGDIR)-dev/$(OODIR)/program
mv $(PKGDIR)-core/$(OODIR)/program/ui-previewer \
$(PKGDIR)-dev/$(OODIR)/program
else
+ rm -f $(PKGDIR)-core/$(OODIR)/program/gengal.bin
+ rm -f $(PKGDIR)-common/$(OODIR)/program/gengal
rm -f $(PKGDIR)-core/$(OODIR)/program/ui-previewer
endif
@@@ -2614,6 -2566,21 +2614,6 @@@ ifeq "$(ENABLE_JAVA)" "y
*) ln -s `echo $$i | sed -e 's,$(CURDIR)/$(PKGDIR)-java-common,,'` `basename $$i` ;; esac; \
done
- # move into extra package
- rm -rf $(PKGDIR)-filter-mobiledev
- mkdir -p $(PKGDIR)-filter-mobiledev/$(shell echo $(OODIR) | sed -e s/lib/share/)/program/classes
- mkdir -p $(PKGDIR)-filter-mobiledev/$(OODIR)/program/classes
- for i in aportisdoc pexcel pocketword; do \
- mv $(PKGDIR)-java-common/$(shell echo $(OODIR) | sed -e s/lib/share/)/program/classes/$$i.jar \
- $(PKGDIR)-filter-mobiledev/$(shell echo $(OODIR) | sed -e s/lib/share/)/program/classes; \
- ln -s /$(shell echo $(OODIR) | sed -e s/lib/share/)/program/classes/$$i.jar \
- $(PKGDIR)-filter-mobiledev/$(OODIR)/program/classes; \
- done
- for i in pocketexcel palm pocketword; do \
- mkdir -p $(PKGDIR)-filter-mobiledev/$(OODIR)/share/registry && \
- mv $(PKGDIR)-common/$(OODIR)/share/registry/$$i.xcd \
- $(PKGDIR)-filter-mobiledev/$(OODIR)/share/registry; \
- done
ifeq "$(BUILD_TEST_PACKAGE)" "y"
rm -rf $(PKGDIR)-subsequentcheckbase
mkdir -p $(PKGDIR)-subsequentcheckbase/$(OODIR)/program/classes/
@@@ -2799,6 -2766,15 +2799,6 @@@ ifeq "$(ENABLE_JAVA)" "y
endif
endif
-ifeq "$(ENABLE_REPORTDESIGN)" "y"
- ifeq "$(ENABLE_JAVA)" "y"
- for i in THIRDPARTYREADMELICENSE.html readme_en-US.html readme_en-US.txt \
- registration/LICENSE; do \
- rm -f $(PKGDIR)-report-builder/$(OODIR)/share/extensions/report-builder/$$i; \
- done
- endif
-endif
-
ifeq "$(ENABLE_MEDIAWIKI)" "y"
rm -f $(PKGDIR)-wiki-publisher/$(OODIR)/share/extensions/wiki-publisher/license/THIRDPARTYLICENSEREADME.html
endif
@@@ -2925,14 -2901,14 +2925,14 @@@ endi
ifeq "$(WHEEZY_BACKPORT)" "y"
dh_python2 -ppython-uno --no-guessing-versions --no-guessing-deps
else
- dh_python3 -ppython3.3-uno --no-guessing-deps
+ dh_python3 -ppython3-uno --no-guessing-deps
# adds a python3 (>= 3.2.3-3~)
ifeq "$(PYTHON_VERSION)" "current"
sed -i -e 's/python$(PYMAJOR) (>= .*)/python$(PYMAJOR) (>= 3.3~)/g' \
- debian/python3.3-uno.substvars
+ debian/python3-uno.substvars
else
sed -i -e 's/python$(PYMAJOR) (>= .*)/python$(PYMAJOR).$(PYMINOR)/g' \
- debian/python3.3-uno.substvars
+ debian/python3-uno.substvars
endif
ifeq "$(ENABLE_PYTHON2)" "y"
dh_python2 -ppython-uno --no-guessing-versions --no-guessing-deps
@@@ -3074,7 -3050,7 +3074,7 @@@ endi
ifeq "$(PACKAGE_BASE)" "y"
ifeq "$(ENABLE_MYSQLNATIVE)" "y"
dh_gencontrol -plibreoffice-mysql-connector -- \
- -v$(shell grep "<version" $(SOURCE_TREE)/mysqlc/$(shell . $(SOURCE_TREE)/bin/get_config_variables OUTPATH PROEXT; 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/source/description.xml | perl -pi -e 's,<version value=\"(.*)\" />,\1,; s/^\s+//; s/\s+$$//')+LibO`echo $(BINARY_VERSION) | cut -d: -f2`
endif
endif
endif
@@@ -3099,12 -3075,6 +3099,12 @@@ ifneq ($(DEB_HOST_ARCH),$(findstring $(
echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
endif
dh_testdir
+ifneq ($(PACKAGE_SDK_DOCS),y)
+ echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
+ echo "For uploads with binary-all packages, please use arches where the SDK docs are enabled!!!!"
+ echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
+endif
+ dh_testdir
dh_testroot
for pkg in $(ARCH_INDEP_PACKAGES) ; do \
@@@ -3113,31 -3083,34 +3113,31 @@@
done
ifeq "$(PACKAGE_SDK)" "y"
- . $(SOURCE_TREE)/solenv/inc/udkversion.mk && \
for i in common cpp java; do \
- cat debian/udk-$$i-ref.in \
- | sed -e "s/@UDK_MAJOR@/$$UDK_MAJOR/" \
- -e "s/@UDK_MINOR@/$$UDK_MINOR/" \
- -e "s/@UDK_MICRO@/$$UDK_MICRO/" \
- > debian/libreoffice-dev-doc.doc-base.udk-$$i-ref; \
+ cat debian/lo-$$i-ref.in \
+ | sed -e "s/@lo_sources_ver@/$(lo_sources_ver)/" \
+ > debian/libreoffice-dev-doc.doc-base.lo-$$i-ref; \
done
# remove Autodoc_DiagnosticMessages.txt
find $(PKGDIR)-dev-doc/usr/share/doc/libreoffice-dev \
-name "Autodoc_DiagnosticMessages.txt" -exec rm {} \;
UDK_CPP_FILES=`find $(CURDIR)/debian/libreoffice-dev-doc/usr/share/doc/libreoffice-dev/docs/cpp/ref | sed -e 's,$(CURDIR)/debian/libreoffice-dev-doc,,g' | xargs`; \
- echo "Files: $$UDK_CPP_FILES" >> debian/libreoffice-dev-doc.doc-base.udk-cpp-ref
+ echo "Files: $$UDK_CPP_FILES" >> debian/libreoffice-dev-doc.doc-base.lo-cpp-ref
ifeq "$(ENABLE_JAVA)" "y"
UDK_JAVA_FILES=`find $(CURDIR)/debian/libreoffice-dev-doc/usr/share/doc/libreoffice-dev/docs/java/ref | sed -e 's,$(CURDIR)/debian/libreoffice-dev-doc,,g' | xargs`; \
- echo "Files: $$UDK_JAVA_FILES" >> debian/libreoffice-dev-doc.doc-base.udk-java-ref
+ echo "Files: $$UDK_JAVA_FILES" >> debian/libreoffice-dev-doc.doc-base.lo-java-ref
endif
# xargs strips the many files here so we need to post-process it.
UDK_COMMON_FILES=`find $(CURDIR)/debian/libreoffice-dev-doc/usr/share/doc/libreoffice-dev/docs/common/ref | sed -e 's,$(CURDIR)/debian/libreoffice-dev-doc,,g' | xargs`; \
TMP=`mktemp -q`; \
- cp debian/libreoffice-dev-doc.doc-base.udk-common-ref $$TMP; \
+ cp debian/libreoffice-dev-doc.doc-base.lo-common-ref $$TMP; \
echo "Files: $$UDK_COMMON_FILES" >> $$TMP; \
- cat $$TMP | perl -e 'while(<>) { if (/^Files/) {$$f=1;} if ($$f eq "1") { chomp(); } print $$_; }' > debian/libreoffice-dev-doc.doc-base.udk-common-ref; \
+ cat $$TMP | perl -e 'while(<>) { if (/^Files/) {$$f=1;} if ($$f eq "1") { chomp(); } print $$_; }' > debian/libreoffice-dev-doc.doc-base.lo-common-ref; \
rm -f $$TMP
# no idea why this happens; afais this can't come from above
# since it doesn't affect the files at the end of the lines...
# But fix it..
- perl -pi -e 's,html/,html /,g' debian/libreoffice-dev-doc.doc-base.udk-common-ref
+ perl -pi -e 's,html/,html /,g' debian/libreoffice-dev-doc.doc-base.lo-common-ref
endif
dh_installdocs -i -A
for p in $(ARCH_INDEP_PACKAGES); do \
@@@ -3165,7 -3138,6 +3165,7 @@@ endi
# dh_link -X does not work for .links stuff. And adding it there and
# fixing it up later because it's relative doesn't make that much sense.
# So do it here.
+ mkdir -p $(PKGDIR)-common/usr/share/applications
cd $(PKGDIR)-common/usr/share/applications && \
ln -sf /$(OODIR)/share/xdg/startcenter.desktop libreoffice-startcenter.desktop
dh_fixperms -i
@@@ -3180,6 -3152,7 +3180,6 @@@ ifeq "$(ENABLE_JAVA)" "y
done
endif
dh_gencontrol -i $(DEBHELPER_OPTIONS) \
- -Nlibreoffice-report-builder \
-Nlibreoffice-wiki-publisher \
-Nfonts-opensymbol \
-Nopenoffice.org-dtd-officedocument1.0 -- \
@@@ -3209,7 -3182,8 +3209,7 @@@ ifeq "$(ENABLE_REPORTDESIGN)" "y
dh_gencontrol -plibreoffice-report-builder -- \
-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/util/description.xml | perl -pi -e 's,<version value=\"(.*)\"/>,\1,; s/^\s+//')+LibO`echo $(BINARY_VERSION) | cut -d: -f2`
+ -V'java-runtime-depends=$(JAVA_RUNTIME_DEPENDS)'
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`
diff --combined scripts/gid2pkgdirs.sh
index f4dcf0c,c3b8657..c5e5827
--- a/scripts/gid2pkgdirs.sh
+++ b/scripts/gid2pkgdirs.sh
@@@ -83,6 -83,7 +83,6 @@@ mv ./usr/share/mime*
create_package_directory gid_Module_Root_Files_Images pkg/libreoffice-common
create_package_directory gid_Module_Oo_Linguistic pkg/libreoffice-common
create_package_directory gid_Module_Optional_Xsltfiltersamples pkg/libreoffice-common
-create_package_directory gid_Module_Optional_Javafilter pkg/libreoffice-common
create_package_directory gid_Module_Optional_Grfflt pkg/libreoffice-draw
create_package_directory gid_Module_Prg_Calc_Bin pkg/libreoffice-calc
create_package_directory gid_Module_Prg_Math_Bin pkg/libreoffice-math
@@@ -96,9 -97,9 +96,9 @@@ create_package_directory gid_Module_Bra
create_package_directory gid_Module_Brand_Prg_Wrt pkg/libreoffice-writer
create_package_directory gid_Module_Brand_Prg_Impress pkg/libreoffice-impress
create_package_directory gid_Module_Brand_Prg_Base pkg/libreoffice-base
- create_package_directory gid_Module_Pyuno pkg/python3.3-uno
-create_package_directory gid_Module_Optional_Pyuno pkg/python3-uno
++create_package_directory gid_Module_Pyuno pkg/python3-uno
create_package_directory gid_Module_Optional_Pyuno_LibreLogo pkg/libreoffice-librelogo
-create_package_directory gid_Module_Optional_Extensions_Script_Provider_For_Python pkg/libreoffice-script-provider-python
+create_package_directory gid_Module_Script_Provider_For_Python pkg/libreoffice-script-provider-python
create_package_directory gid_Module_Optional_Gnome pkg/libreoffice-gnome
create_package_directory gid_Module_Optional_Kde pkg/libreoffice-kde
create_package_directory gid_Module_Root_Files_2 pkg/libreoffice-common
@@@ -116,7 -117,7 +116,7 @@@ create_package_directory gid_Module_Opt
create_package_directory gid_Module_Optional_Extensions_MySQLConnector pkg/libreoffice-mysql-connector
create_package_directory gid_Module_Pdfimport pkg/libreoffice-pdfimport
create_package_directory gid_Module_Optional_Extensions_PRESENTER_SCREEN pkg/libreoffice-presenter-console
-create_package_directory gid_Module_Optional_Extensions_REPORTDESIGN pkg/libreoffice-report-builder
+create_package_directory gid_Module_Reportbuilder pkg/libreoffice-report-builder
create_package_directory gid_Module_Optional_PostgresqlSdbc pkg/libreoffice-sdbc-postgresql
move_wrappers pkg/libreoffice-common soffice unopkg
move_wrappers pkg/libreoffice-common libreoffice loffice lofromtemplate
--
LibreOffice packaging repository
Reply to: