The following commit has been merged in the debian-experimental-4.1 branch:
commit c39600b164ba7f0948ce8f7048d1001a3d96ce1c
Merge: 031a177b2396a69e40b28a7e07ca1fe3f400a930
ba9207ceefcb72d6e78e7da700d832ee04da028b
Author: Rene Engelhard <r...@debian.org>
Date: Sat Jun 15 13:32:37 2013 +0200
Merge remote-tracking branch 'origin/debian-experimental-4.0' into
debian-experimental-4.1
Conflicts:
changelog
diff --combined changelog
index f300161,c3d7dc8..c56704e
--- a/changelog
+++ b/changelog
@@@ -1,75 -1,21 +1,80 @@@
-libreoffice (1:4.0.4~rc2-1) UNRELEASED; urgency=low
+libreoffice (1:4.1.0~rc1~git20130710-1) UNRELEASED; urgency=low
- * new upstream release candidate
+ * new upstream snapshot
+ * 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
* 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-caing: build --enable-verbose everyhwere,
+ also on the buildds
- -- Rene Engelhard <r...@debian.org> Tue, 11 Jun 2013 19:23:50 +0200
+ -- Rene Engelhard <r...@debian.org> Thu, 13 Jun 2013 21:19:31 +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 <r...@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 <r...@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 <r...@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 <r...@debian.org> Thu, 23 May 2013 10:15:45 +0200
+
libreoffice (1:4.0.3-3) unstable; urgency=low
* debian/patches/uno-executables-link-to-xmlreader.diff: fix
diff --combined control
index d84d00d,445d2d2..f90f664
--- a/control
+++ b/control
@@@ -8,15 -8,17 +8,17 @@@ Build-Depends: ant (>= 1.7.0)
autoconf,
automake,
bc,
+ binutils (>= 2.23) [mips mipsel],
bison,
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 !kfreebas-amd64],
gcj-jdk [hppa kfreebsd-i386 kfreebsd-amd64],
gcj-native-helper [hppa kfreebsd-amd64 kfreebsd-i386],
gdb,
@@@ -32,7 -34,6 +34,7 @@@
libc0.1 (>= 2.10.2-7) [kfreebsd-i386 kfreebsd-amd64],
libcairo2-dev,
libcdr-dev,
+ libclucene-dev (>= 2.3.3.4-2),
libcmis-dev (>= 0.3.1),
libcppunit-dev (>= 1.12),
libcups2-dev,
@@@ -52,7 -53,6 +54,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),
@@@ -63,17 -63,15 +65,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),
@@@ -105,8 -103,8 +107,8 @@@
libxtst-dev,
lp-solve (>= 5.5.0.13-5+b1),
make (>= 3.81-8.2),
- openjdk-6-jdk (>= 6b23~pre8-2) [amd64 armel armhf i386 mips
mipsel powerpc powerpcspe ppc64 s390 s390x sparc],
- openjdk-7-jdk [ia64],
+ openjdk-6-jdk (>= 6b23~pre8-2) [mips mipsel],
+ openjdk-7-jdk [amd64 armel armhf i386 ia64 powerpc powerpcspe
ppc64 s390 s390x sparc],
pkg-config,
python (>= 2.6.6-3+squeeze4),
python-dev (>= 2.6),
@@@ -149,7 -147,6 +151,6 @@@ Build-Conflicts: ant (= 1.8.0-1) [hppa
g++-4.6 (= 4.6.1-10),
g++-4.6 (= 4.6.1-11),
g++-4.7 (<< 4.7.1-3),
- gcc (>= 4:4.7~) [!i386 !amd64 !kfreebsd-i386
!kfreebsd-amd64],
gcj-4.2 (= 4.2.2-6),
gjdoc (= 0.7.8-2),
graphicsmagick-imagemagick-compat (<< 1.3.9~),
@@@ -158,7 -155,6 +159,7 @@@
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,
@@@ -180,6 -176,7 +181,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],
@@@ -220,6 -217,7 +221,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:
@@@ -411,10 -409,7 +412,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,
+ vlibreoffice-l10n-3.5,
+ vlibreoffice-l10n-3.6
Provides: libreoffice-l10n-en-us
Breaks: libreoffice-core (<< 1:${oover}~),
libreoffice-core (>= 1:${next-oover}~),
@@@ -763,6 -758,23 +764,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
@@@ -4079,7 -4091,7 +4080,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.
@@@ -4205,26 -4217,27 +4206,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
@@@ -4327,9 -4340,9 +4328,9 @@@ 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-core (<< 1:4.1.0~beta1), libreoffice-common (<<
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 +4402,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 +4437,20 @@@ 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 +4466,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 +4493,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 +4506,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,
diff --combined control.in
index 7b5df65,c19afaf..b57702e
--- 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 <r...@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%],
@@@ -13,7 -13,6 +13,6 @@@
g++-4.6 (= 4.6.1-10),
g++-4.6 (= 4.6.1-11),
g++-4.7 (<< 4.7.1-3),
- gcc (>= 4:4.7~) [!i386 !amd64 !kfreebsd-i386
!kfreebsd-amd64],
gcj-4.2 (= 4.2.2-6),
gjdoc (= 0.7.8-2),
graphicsmagick-imagemagick-compat (<< 1.3.9~),
@@@ -37,16 -36,17 +36,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}
@@@ -82,6 -82,7 +81,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:
@@@ -183,26 -184,26 +182,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),
@@@ -265,16 -266,15 +264,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,
+ vlibreoffice-l10n-3.5,
+ vlibreoffice-l10n-3.6
Provides: libreoffice-l10n-en-us
Breaks: libreoffice-core (<< 1:${oover}~),
libreoffice-core (>= 1:${next-oover}~),
@@@ -623,6 -623,23 +622,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 29398f1,b6dbc99..3302c8b
--- 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)
@@@ -37,9 -37,6 +37,6 @@@ export gb_SHELL:=$(SHELL
SYSTEM_GCC_VERSION = $(shell gcc --version | sed -n
'/^gcc/s/.*\(.\..\)\..$$/\1/p')
- # Debian buildds run as user `buildd', other are using /CurrentlyBuilding
- ON_BUILDD := $(shell if [ "`whoami`" = buildd -o -f /CurrentlyBuilding ] ||
echo $(CURDIR) | grep -q \/build\/buildd; then echo y; else echo n; fi)
-
PKGDIR:=debian/libreoffice
OODIRNAME=libreoffice
OODIR:=usr/lib/$(OODIRNAME)
@@@ -65,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
endif
ifeq "$(USE_SOURCE_TARBALLS)" "y"
lo_sources_ver=$(shell cat $(CURDIR)/sources.ver | cut -d= -f2)
@@@ -153,7 -150,7 +150,7 @@@ BUILD_ONLY_EN_US=
ENABLE_JAVA=y
ifeq "$(ENABLE_JAVA)" "y"
JDK=openjdk
- JAVA_MAINVER=6
+ JAVA_MAINVER=7
ifneq (,$(filter hppa kfreebsd%, $(DEB_HOST_ARCH)))
JDK=gcj-jdk
endif
@@@ -173,7 -170,7 +170,7 @@@ els
BOOST_VERSION=1.53
endif
ifeq "$(BOOST_VERSION)" "default"
- ifeq "$(SYSTEM_GCC_VERSION)" "4.8"
+ ifeq "$(shell dpkg --compare-versions $(SYSTEM_GCC_VERSION) ge 4.8 && echo
true)" "true"
BOOST_MINVER= (>= 1.53)
else
BOOST_MINVER= (>= 1.38)
@@@ -194,8 -191,6 +191,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
@@@ -203,7 -198,7 +200,7 @@@ CAIRO_FONTS_PATCH=
BUILD_KDE=y
# not ported to KDE 4
ENABLE_KDEAB=n
- ifeq "$(SYSTEM_GCC_VERSION)" "4.7"
+ ifeq "$(shell dpkg --compare-versions $(SYSTEM_GCC_VERSION) ge 4.7 && echo
true)" "true"
# < 4.8 fails with gcc 4.7, see #667911
QT_MINVER= (>= 4:4.8)
else
@@@ -283,6 -278,7 +280,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
@@@ -324,7 -320,6 +321,7 @@@ endi
PACKAGE_BASE=y
ENABLE_GRAPHITE=y
SYSTEM_STUFF += graphite
+SYSTEM_STUFF += harfbuzz
ALLOC=system
SYSTEM_STUFF += libexttextcat
SYSTEM_STUFF += cppunit
@@@ -336,10 -331,8 +333,10 @@@ SYSTEM_LIBRSVG=
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
@@@ -357,7 -350,7 +354,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
@@@ -377,7 -370,6 +374,7 @@@ ifeq "$(USE_UCPP)" "y
SYSTEM_STUFF += ucpp
endif
ENABLE_MERGELIBS=n
+PACKAGE_LIBLIBREOFFICE=n
# Default flags to pass to configure
CONFIGURE_FLAGS= \
@@@ -392,16 -384,13 +389,14 @@@
--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
endif
- ifneq ($(ON_BUILDD),y)
CONFIGURE_FLAGS += --enable-verbose
- endif
CONFIGURE_FLAGS += --with-alloc=$(ALLOC)
@@@ -435,10 -424,6 +430,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))
@@@ -486,11 -471,13 +481,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
@@@ -535,19 -522,24 +530,19 @@@ $(eval $(call gen_no_archs,OOO_NSPLUGIN
# see uno-executables-link-to-xmlreader.diff. That workaround is not needed
# with said binutils. Thanks Aurelien Jarno for the hint.
-#ifneq "$(WHEEZY_BACKPORT)" "y"
-# ifneq (,$(findstring mips, $(OOO_ARCHS)))
-#BUILD_DEPS += , binutils (>= 2.23) [mips mipsel]
-# endif
-#endif
+ifneq "$(WHEEZY_BACKPORT)" "y"
+ ifneq (,$(findstring mips, $(OOO_ARCHS)))
+BUILD_DEPS += , binutils (>= 2.23) [mips mipsel]
+ endif
+endif
#############
# Distro-specific overrides
# Debian WHeezy
ifeq "$(shell dpkg-parsechangelog | grep Distribution | awk '{ print $$2 }')"
"wheezy-backports"
BUGS=mailto:debian-backpo...@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"
@@@ -558,6 -550,14 +553,14 @@@ CONFIGURE_FLAGS += $(foreach i, $(SYSTE
CC_PREFIX:=$(shell gcc -dumpmachine)-
+ BUILD_DEPS += , gcc-4.6 [!i386 !amd64 !kfreebsd-i386 !kfreebas-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)
@@@ -602,9 -602,6 +605,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)
@@@ -811,21 -808,19 +814,21 @@@ 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"
- BUILD_DEPS += , openjdk-$(JAVA_MAINVER)-jdk (>= 6b23~pre8-2)
[$(filter-out ia64,$(filter-out $(OOO_GCJ_JDK_ARCHS),$(OOO_JAVA_ARCHS))])
- # except on ia64, which doesn't build with 6...
- ifneq (,$(findstring ia64,$(OOO_JAVA_ARCHS)))
- BUILD_DEPS += , openjdk-7-jdk [ia64]
- ifeq "$(DEB_HOST_ARCH)" "ia64"
- JAVA_MAINVER=7
- endif
- endif
+ BUILD_DEPS += , openjdk-$(JAVA_MAINVER)-jdk (>= 6b23~pre8-2)
[$(filter-out ia64 $((OOO_GCJ_JDK_ARCHS),$(filter-out
$(OOO_GCJ_JDK_ARCHS),$(OOO_JAVA_ARCHS))])
else
- BUILD_DEPS += , openjdk-$(JAVA_MAINVER)-jdk [$(filter-out
$(OOO_GCJ_JDK_ARCHS),$(OOO_JAVA_ARCHS))]
+ BUILD_DEPS += , openjdk-$(JAVA_MAINVER)-jdk [$(filter-out mips mipsel
$(OOO_GCJ_JDK_ARCHS),$(OOO_JAVA_ARCHS))]
+ # no 7 on mips(el)
+ ifneq (,$(findstring mips,$(OOO_JAVA_ARCHS)))
+ BUILD_DEPS += , openjdk-6-jdk (>= 6b23~pre8-2) [mips mipsel]
+ ifneq (,$(findstring mips,$(DEB_HOST_ARCH)))
+ JAVA_MAINVER=6
+ endif
+ endif
endif
JAVA_HOME=/usr/lib/jvm/java-$(JAVA_MAINVER)-openjdk-$(DEB_HOST_ARCH)
endif
@@@ -901,13 -896,13 +904,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)))
@@@ -922,6 -917,9 +925,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
@@@ -978,11 -976,11 +981,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)))
@@@ -1015,12 -1013,6 +1018,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
@@@ -1084,17 -1076,13 +1087,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)
@@@ -1156,7 -1144,6 +1159,7 @@@ els
else
PYUNO_DEPENDS = python3.3-uno | python3-uno (>= 4.0~) | python-uno
endif
+ CONFIGURE_FLAGS += --enable-python=system
endif
ifeq "$(ENABLE_JAVA)" "y"
@@@ -1255,14 -1242,14 +1258,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"
@@@ -1376,7 -1363,7 +1379,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
@@@ -1545,9 -1532,6 +1548,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
@@@ -1596,10 -1580,6 +1599,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
@@@ -1707,20 -1687,12 +1710,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"
@@@ -1741,7 -1713,7 +1744,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 $@
@@@ -1759,19 -1731,9 +1762,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 $@
@@@ -1836,7 -1798,9 +1839,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 \
@@@ -1988,14 -1952,6 +1991,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
@@@ -2022,14 -1978,6 +2025,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 $@
@@@ -2106,14 -2054,13 +2109,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
@@@ -2210,9 -2157,9 +2213,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
@@@ -2258,15 -2205,15 +2261,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
@@@ -2320,6 -2267,11 +2323,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 \
@@@ -2357,9 -2309,9 +2360,9 @@@ ifeq "$(ENABLE_PYTHON)" "y
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 \
debian/python-uno/$(OODIR)/program
cp debian/python3.3-uno/$(OODIR)/share/registry/pyuno.xcd \
@@@ -2422,6 -2374,10 +2425,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 && \
@@@ -2456,6 -2412,18 +2459,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 \
@@@ -2471,17 -2439,13 +2474,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
@@@ -2502,20 -2466,20 +2505,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
@@@ -2606,6 -2570,21 +2609,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/
@@@ -2791,6 -2770,15 +2794,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
@@@ -3066,7 -3054,7 +3069,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
@@@ -3091,12 -3079,6 +3094,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 \
@@@ -3105,31 -3087,34 +3108,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 \
@@@ -3157,7 -3142,6 +3160,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
@@@ -3172,6 -3156,7 +3175,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 -- \
@@@ -3201,7 -3186,8 +3204,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`
--
LibreOffice packaging repository
--
To UNSUBSCRIBE, email to debian-openoffice-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1unojo-0003jq...@vasks.debian.org
