[SCM] LibreOffice packaging repository branch, debian-experimental-4.2, updated. libreoffice_4.1.0_rc2-2-13-g3d5abd5
The following commit has been merged in the debian-experimental-4.2 branch:
commit 39154eb7dc8de8c150d021b560cec6845acce187
Merge: bc8880d93aa8feb8637fe59fb0b29e07f4c139b9 b1a9c9c1b33c4335466ecceec77314e0193ffeeb
Author: Rene Engelhard <rene@debian.org>
Date: Mon Jul 15 19:35:37 2013 +0200
Merge remote-tracking branch 'origin/debian-experimental-4.1' into debian-experimental-4.2
Conflicts:
changelog
diff --combined changelog
index ffa3019,b56a2f2..7895b22
--- a/changelog
+++ b/changelog
@@@ -1,17 -1,4 +1,17 @@@
+libreoffice (1:4.2.0~alpha0~git20130708-1) UNRELEASED; urgency=low
+
+ * new upstream snapshot
+
+ * debian/rules:
+ - autodoc got replaced by doxygen. bump doxygen build-dep to needed
+ (>= 1.8.4-1) and disable packaging the SDK docs on wheezy-backports.
+ Run dh_doxygen
+ - build-depend on fonts-liberation when running the tests - the
+ sc_macros_tests VBA tests need Arial etc.-similar fonts
+
+ -- Rene Engelhard <rene@debian.org> Sun, 02 Jun 2013 20:49:18 +0200
+
- libreoffice (1:4.1.0~rc2-2) UNRELEASED; urgency=low
+ libreoffice (1:4.1.0~rc2-2) experimental; urgency=low
* build with proper DEB_BUILD_OPTIONS so we actually get l10n
(closes: #715353)
@@@ -23,7 -10,7 +23,7 @@@
- 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> Tue, 02 Jul 2013 22:12:36 +020
+ -- Rene Engelhard <rene@debian.org> Tue, 08 Jul 2013 22:02:06 +0200
libreoffice (1:4.1.0~rc2-1) experimental; urgency=low
diff --combined control
index 1634e4b,96ca62b..2545817
--- a/control
+++ b/control
@@@ -16,7 -16,6 +16,7 @@@ Build-Depends: ant (>= 1.7.0)
dpkg-dev (>= 1.16.1),
fastjar,
flex | flex-old,
+ fonts-liberation,
g++-mingw-w64-i686 [i386 amd64],
gcj-jdk [hppa kfreebsd-i386 kfreebsd-amd64],
gcj-native-helper [hppa kfreebsd-amd64 kfreebsd-i386],
@@@ -65,7 -64,7 +65,7 @@@
liblcms2-dev,
libldap2-dev,
liblpsolve55-dev (>= 5.5.0.13-5+b1),
- libmdds-dev (>= 0.8.0),
+ libmdds-dev (>= 0.9.0),
libmspub-dev,
libmwaw-dev,
libmysqlclient-dev,
@@@ -107,7 -106,6 +107,7 @@@
libxtst-dev,
lp-solve (>= 5.5.0.13-5+b1),
make (>= 3.81-8.2),
+ ocl-icd-opencl-dev,
openjdk-6-jdk (>= 6b23~pre8-2) [mips mipsel],
openjdk-7-jdk [amd64 armel armhf i386 ia64 powerpc powerpcspe ppc64 s390 s390x sparc],
pkg-config,
@@@ -123,7 -121,7 +123,7 @@@
zip,
zlib1g-dev
Build-Depends-Indep: bsh (>= 2.0b4),
- doxygen,
+ doxygen (>= 1.8.4),
fdupes,
fontforge,
imagemagick,
@@@ -144,8 -142,7 +144,8 @@@
libservlet3.0-java,
libxml-java (>= 1.1.6) [!hppa !kfreebsd-amd64 !kfreebsd-i386],
xml-core
-Build-Conflicts: ant (= 1.8.0-1) [hppa kfreebsd-i386 kfreebsd-amd64],
+Build-Conflicts: amd-libopencl1,
+ ant (= 1.8.0-1) [hppa kfreebsd-i386 kfreebsd-amd64],
ant (= 1.8.0-2) [hppa kfreebsd-i386 kfreebsd-amd64],
ant (= 1.8.0-3) [hppa kfreebsd-i386 kfreebsd-amd64],
flex (= 2.5.34-1) [amd64],
@@@ -164,15 -161,14 +164,15 @@@
libxul-dev (= 1.8.0.13~pre070720-0etch1),
nvidia-glx-dev,
nvidia-glx-legacy-dev,
+ nvidia-libopencl1,
qt3-dev-tools
Standards-Version: 3.9.4
XS-Python-Version: current
-XS-Python3-Version: 3.3
+XS-Python3-Version: 3.2
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: mailto:debian-openoffice@lists.debian.org
+ Bugs:
Homepage: http://www.libreoffice.org
Package: libreoffice
@@@ -4443,12 -4439,11 +4443,12 @@@ Depends: ant (>= 1.7.0)
bzip2,
cpp-4.7,
debhelper (>= 7.2.3~),
- doxygen,
+ doxygen (>= 1.8.4),
dpkg-dev (>= 1.16.1),
fastjar,
flex | flex-old,
fontforge,
+ fonts-liberation,
g++-mingw-w64-i686,
gcj-jdk,
gcj-native-helper,
@@@ -4505,7 -4500,7 +4505,7 @@@
libldap2-dev,
libloader-java (>= 1.1.6),
liblpsolve55-dev (>= 5.5.0.13-5+b1),
- libmdds-dev (>= 0.8.0),
+ libmdds-dev (>= 0.9.0),
libmspub-dev,
libmwaw-dev,
libmysqlclient-dev,
@@@ -4554,7 -4549,6 +4554,7 @@@
libxtst-dev,
lp-solve (>= 5.5.0.13-5+b1),
make (>= 3.81-8.2),
+ ocl-icd-opencl-dev,
openjdk-6-jdk (>= 6b23~pre8-2),
pkg-config,
python (>= 2.6.6-3+squeeze4),
--
LibreOffice packaging repository
Reply to: