[libreoffice] 02/02: Merge remote-tracking branch 'origin/debian-experimental-5.0' into debian-experimental-5.1
This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch debian-experimental-5.1
in repository libreoffice.
commit 541f54dd7714418c94d0ac3e1cae1e3a81e5a977
Merge: d94aa63 d302499
Author: Rene Engelhard <rene@debian.org>
Date: Fri Sep 4 14:52:06 2015 +0200
Merge remote-tracking branch 'origin/debian-experimental-5.0' into debian-experimental-5.1
Conflicts:
changelog
control
control.in
patches/series
rules
changelog | 12 ++++++++++++
control | 2 --
control.in | 3 +--
liblibreofficeFIXME.shlibs | 1 -
libreoffice-base.menu | 4 ----
libreoffice-calc.menu | 5 -----
libreoffice-draw.menu | 5 -----
libreoffice-impress.menu | 5 -----
libreoffice-math.menu | 5 -----
libreoffice-writer.menu | 5 -----
rules | 5 -----
11 files changed, 13 insertions(+), 39 deletions(-)
diff --cc changelog
index a582f1f,5da12b0..c4aa320
--- a/changelog
+++ b/changelog
@@@ -1,16 -1,15 +1,28 @@@
+libreoffice (1:5.1.0~alpha1~git20150904-1) UNRELEASED; urgency=medium
+
+ * New upstream snapshot
+
+ * debian/rules, debian/vars.mips64*:
+ - add mips64{el,eb} architecture stuff which is now added upstream
+ * debian/uno-libs3.symbols: update
+ * debian/control.lokit.in: suggest libgtk-3-dev instead of libgtk2.0-dev
+ * debian/rules:
+ - remove upstream gone kdeab and gnome-vfs options
+
+ -- Rene Engelhard <rene@debian.org> Fri, 04 Sep 2015 09:52:38 +0200
+
+ libreoffice (1:5.0.2~rc1~git20150904-1) UNRELEASED; urgency=medium
+
+ * New upstream snapshot
+
+ * debian/*.menu: remove, as per TC resolution
+ * debian/control.in: remove imagemagick from B-D-I:
+ * debian/rules:
+ - stop calling dh_installmenus and stop using convert to convert the icons
+ to xpm
+
+ -- Rene Engelhard <rene@debian.org> Fri, 04 Sep 2015 09:37:34 +0200
+
libreoffice (1:5.0.1-1) unstable; urgency=medium
* LibreOffice 5.0.1 final (identical to rc2)
diff --cc control
index e700f30,26db361..c7cd903
--- a/control
+++ b/control
@@@ -148,23 -147,22 +148,22 @@@ Build-Depends: ant (>= 1.7.0) [!mips64e
Build-Depends-Indep: doxygen (>= 1.8.4),
fdupes,
fontforge,
- imagemagick,
- libbase-java [!hppa !ia64 !kfreebsd-amd64 !kfreebsd-i386 !s390 !sparc],
+ libbase-java [!hppa !ia64 !kfreebsd-amd64 !kfreebsd-i386 !mips64eb !s390 !sparc],
libbsh-java,
- libcommons-codec-java,
- libcommons-httpclient-java,
- libcommons-lang-java,
- libcommons-logging-java,
- libflute-java (>= 1.1.6) [!hppa !ia64 !kfreebsd-amd64 !kfreebsd-i386 !s390 !sparc],
- libfonts-java (>= 1.1.6) [!hppa !ia64 !kfreebsd-amd64 !kfreebsd-i386 !s390 !sparc],
- libformula-java (>= 1.1.7) [!hppa !ia64 !kfreebsd-amd64 !kfreebsd-i386 !s390 !sparc],
- liblayout-java (>= 0.2.10) [!hppa !ia64 !kfreebsd-amd64 !kfreebsd-i386 !s390 !sparc],
- libloader-java (>= 1.1.6) [!hppa !ia64 !kfreebsd-amd64 !kfreebsd-i386 !s390 !sparc],
- libpentaho-reporting-flow-engine-java (>= 0.9.4) [!hppa !ia64 !kfreebsd-amd64 !kfreebsd-i386 !s390 !sparc],
- librepository-java (>= 1.1.6) [!hppa !ia64 !kfreebsd-amd64 !kfreebsd-i386 !s390 !sparc],
- libsac-java [!hppa !ia64 !kfreebsd-amd64 !kfreebsd-i386 !s390 !sparc],
- libserializer-java (>= 1.1.6) [!hppa !ia64 !kfreebsd-amd64 !kfreebsd-i386 !s390 !sparc],
- libxml-java (>= 1.1.6) [!hppa !ia64 !kfreebsd-amd64 !kfreebsd-i386 !s390 !sparc]
+ libcommons-codec-java [!mips64eb],
+ libcommons-httpclient-java [!mips64eb],
+ libcommons-lang-java [!mips64eb],
+ libcommons-logging-java [!mips64eb],
+ libflute-java (>= 1.1.6) [!hppa !ia64 !kfreebsd-amd64 !kfreebsd-i386 !mips64eb !s390 !sparc],
+ libfonts-java (>= 1.1.6) [!hppa !ia64 !kfreebsd-amd64 !kfreebsd-i386 !mips64eb !s390 !sparc],
+ libformula-java (>= 1.1.7) [!hppa !ia64 !kfreebsd-amd64 !kfreebsd-i386 !mips64eb !s390 !sparc],
+ liblayout-java (>= 0.2.10) [!hppa !ia64 !kfreebsd-amd64 !kfreebsd-i386 !mips64eb !s390 !sparc],
+ libloader-java (>= 1.1.6) [!hppa !ia64 !kfreebsd-amd64 !kfreebsd-i386 !mips64eb !s390 !sparc],
+ libpentaho-reporting-flow-engine-java (>= 0.9.4) [!hppa !ia64 !kfreebsd-amd64 !kfreebsd-i386 !mips64eb !s390 !sparc],
+ librepository-java (>= 1.1.6) [!hppa !ia64 !kfreebsd-amd64 !kfreebsd-i386 !mips64eb !s390 !sparc],
+ libsac-java [!hppa !ia64 !kfreebsd-amd64 !kfreebsd-i386 !mips64eb !s390 !sparc],
+ libserializer-java (>= 1.1.6) [!hppa !ia64 !kfreebsd-amd64 !kfreebsd-i386 !mips64eb !s390 !sparc],
+ libxml-java (>= 1.1.6) [!hppa !ia64 !kfreebsd-amd64 !kfreebsd-i386 !mips64eb !s390 !sparc]
Build-Conflicts: amd-libopencl1,
ant (= 1.8.0-1) [hppa ia64 s390 sparc kfreebsd-amd64 kfreebsd-i386],
ant (= 1.8.0-2) [hppa ia64 s390 sparc kfreebsd-amd64 kfreebsd-i386],
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
Reply to: