[libreoffice] 01/01: Merge remote-tracking branch 'origin/master' 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 0345cd5a2c609545e724bc9388ca1896f1abbee4
Merge: 612a28c 90d688f
Author: Rene Engelhard <rene@debian.org>
Date: Mon Oct 19 01:01:44 2015 +0200
Merge remote-tracking branch 'origin/master' into debian-experimental-5.1
Conflicts:
changelog
control
control.in
rules
changelog | 11 ++++++++++-
control | 2 +-
control.in | 2 +-
fonts-opensmbol.maintscript | 1 +
libreoffice-avmedia-backend-gstreamer.maintscript | 1 +
libreoffice-avmedia-backend-vlc.maintscript | 1 +
libreoffice-base-core.maintscript | 1 +
libreoffice-base-drivers.maintscript | 1 +
libreoffice-base.maintscript | 1 +
libreoffice-calc.maintscript | 1 +
libreoffice-dbg.maintscript | 1 +
libreoffice-dev.maintscript | 1 +
libreoffice-draw.maintscript | 1 +
libreoffice-evolution.maintscript | 1 +
libreoffice-gnome.maintscript | 1 +
libreoffice-gtk.maintscript | 1 +
libreoffice-help-ca.maintscript | 1 +
libreoffice-help-cs.maintscript | 1 +
libreoffice-help-da.maintscript | 1 +
libreoffice-help-de.maintscript | 1 +
libreoffice-help-dz.maintscript | 1 +
libreoffice-help-el.maintscript | 1 +
libreoffice-help-en-gb.maintscript | 1 +
libreoffice-help-en-us.maintscript | 1 +
libreoffice-help-es.maintscript | 1 +
libreoffice-help-et.maintscript | 1 +
libreoffice-help-eu.maintscript | 1 +
libreoffice-help-fi.maintscript | 1 +
libreoffice-help-fr.maintscript | 1 +
libreoffice-help-gl.maintscript | 1 +
libreoffice-help-hi.maintscript | 1 +
libreoffice-help-hu.maintscript | 1 +
libreoffice-help-it.maintscript | 1 +
libreoffice-help-ja.maintscript | 1 +
libreoffice-help-km.maintscript | 1 +
libreoffice-help-ko.maintscript | 1 +
libreoffice-help-nl.maintscript | 1 +
libreoffice-help-om.maintscript | 1 +
libreoffice-help-pl.maintscript | 1 +
libreoffice-help-pt-br.maintscript | 1 +
libreoffice-help-pt.maintscript | 1 +
libreoffice-help-ru.maintscript | 1 +
libreoffice-help-sk.maintscript | 1 +
libreoffice-help-sl.maintscript | 1 +
libreoffice-help-sv.maintscript | 1 +
libreoffice-help-tr.maintscript | 1 +
libreoffice-help-vi.maintscript | 1 +
libreoffice-help-zh-cn.maintscript | 1 +
libreoffice-help-zh-tw.maintscript | 1 +
libreoffice-impress.maintscript | 1 +
libreoffice-java-common.maintscript | 1 +
libreoffice-kde.maintscript | 1 +
libreoffice-l10n-af.maintscript | 1 +
libreoffice-l10n-ar.maintscript | 1 +
libreoffice-l10n-as.maintscript | 1 +
libreoffice-l10n-ast.maintscript | 1 +
libreoffice-l10n-be.maintscript | 1 +
libreoffice-l10n-bg.maintscript | 1 +
libreoffice-l10n-bn.maintscript | 1 +
libreoffice-l10n-br.maintscript | 1 +
libreoffice-l10n-bs.maintscript | 1 +
libreoffice-l10n-ca.maintscript | 1 +
libreoffice-l10n-cs.maintscript | 1 +
libreoffice-l10n-cy.maintscript | 1 +
libreoffice-l10n-da.maintscript | 1 +
libreoffice-l10n-de.maintscript | 1 +
libreoffice-l10n-dz.maintscript | 1 +
libreoffice-l10n-el.maintscript | 1 +
libreoffice-l10n-en-gb.maintscript | 1 +
libreoffice-l10n-en-za.maintscript | 1 +
libreoffice-l10n-eo.maintscript | 1 +
libreoffice-l10n-es.maintscript | 1 +
libreoffice-l10n-et.maintscript | 1 +
libreoffice-l10n-eu.maintscript | 1 +
libreoffice-l10n-fa.maintscript | 1 +
libreoffice-l10n-fi.maintscript | 1 +
libreoffice-l10n-fr.maintscript | 1 +
libreoffice-l10n-ga.maintscript | 1 +
libreoffice-l10n-gd.maintscript | 1 +
libreoffice-l10n-gl.maintscript | 1 +
libreoffice-l10n-gu.maintscript | 1 +
libreoffice-l10n-he.maintscript | 1 +
libreoffice-l10n-hi.maintscript | 1 +
libreoffice-l10n-hr.maintscript | 1 +
libreoffice-l10n-hu.maintscript | 1 +
libreoffice-l10n-id.maintscript | 1 +
libreoffice-l10n-in.maintscript | 1 +
libreoffice-l10n-is.maintscript | 1 +
libreoffice-l10n-it.maintscript | 1 +
libreoffice-l10n-ja.maintscript | 1 +
libreoffice-l10n-ka.maintscript | 1 +
libreoffice-l10n-kk.maintscript | 1 +
libreoffice-l10n-km.maintscript | 1 +
libreoffice-l10n-kmr.maintscript | 1 +
libreoffice-l10n-ko.maintscript | 1 +
libreoffice-l10n-lt.maintscript | 1 +
libreoffice-l10n-lv.maintscript | 1 +
libreoffice-l10n-mk.maintscript | 1 +
libreoffice-l10n-ml.maintscript | 1 +
libreoffice-l10n-mn.maintscript | 1 +
libreoffice-l10n-mr.maintscript | 1 +
libreoffice-l10n-nb.maintscript | 1 +
libreoffice-l10n-ne.maintscript | 1 +
libreoffice-l10n-nl.maintscript | 1 +
libreoffice-l10n-nn.maintscript | 1 +
libreoffice-l10n-nr.maintscript | 1 +
libreoffice-l10n-nso.maintscript | 1 +
libreoffice-l10n-oc.maintscript | 1 +
libreoffice-l10n-om.maintscript | 1 +
libreoffice-l10n-or.maintscript | 1 +
libreoffice-l10n-pa-in.maintscript | 1 +
libreoffice-l10n-pl.maintscript | 1 +
libreoffice-l10n-pt-br.maintscript | 1 +
libreoffice-l10n-pt.maintscript | 1 +
libreoffice-l10n-ro.maintscript | 1 +
libreoffice-l10n-ru.maintscript | 1 +
libreoffice-l10n-rw.maintscript | 1 +
libreoffice-l10n-si.maintscript | 1 +
libreoffice-l10n-sk.maintscript | 1 +
libreoffice-l10n-sl.maintscript | 1 +
libreoffice-l10n-sr.maintscript | 1 +
libreoffice-l10n-ss.maintscript | 1 +
libreoffice-l10n-st.maintscript | 1 +
libreoffice-l10n-sv.maintscript | 1 +
libreoffice-l10n-ta.maintscript | 1 +
libreoffice-l10n-te.maintscript | 1 +
libreoffice-l10n-tg.maintscript | 1 +
libreoffice-l10n-th.maintscript | 1 +
libreoffice-l10n-tn.maintscript | 1 +
libreoffice-l10n-tr.maintscript | 1 +
libreoffice-l10n-ts.maintscript | 1 +
libreoffice-l10n-ug.maintscript | 1 +
libreoffice-l10n-uk.maintscript | 1 +
libreoffice-l10n-uz.maintscript | 1 +
libreoffice-l10n-ve.maintscript | 1 +
libreoffice-l10n-vi.maintscript | 1 +
libreoffice-l10n-xh.maintscript | 1 +
libreoffice-l10n-za.maintscript | 1 +
libreoffice-l10n-zh-cn.maintscript | 1 +
libreoffice-l10n-zh-tw.maintscript | 1 +
libreoffice-l10n-zu.maintscript | 1 +
libreoffice-math.maintscript | 1 +
libreoffice-officebean.maintscript | 1 +
libreoffice-ogltrans.maintscript | 1 +
libreoffice-pdfimport.maintscript | 1 +
libreoffice-report-builder-bin.maintscript | 1 +
libreoffice-report-builder.maintscript | 1 +
libreoffice-script-provider-bsh.maintscript | 1 +
libreoffice-script-provider-js.maintscript | 1 +
libreoffice-script-provider-python.maintscript | 1 +
libreoffice-sdbc-firebird.maintscript | 1 +
libreoffice-sdbc-hsqldb.maintscript | 1 +
libreoffice-sdbc-postgresql.maintscript | 1 +
libreoffice-style-breeze.maintscript | 1 +
libreoffice-style-galaxy.maintscript | 1 +
libreoffice-style-hicontrast.maintscript | 1 +
libreoffice-style-oxygen.maintscript | 1 +
libreoffice-style-sifr.maintscript | 1 +
libreoffice-style-tango.maintscript | 1 +
libreoffice-subsequentcheckbase.maintscript | 1 +
libreoffice-writer.maintscript | 1 +
libreoffice.maintscript | 1 +
rules | 6 +++---
163 files changed, 174 insertions(+), 6 deletions(-)
diff --cc changelog
index 0f279e2,04c44d3..a7bf61f
--- a/changelog
+++ b/changelog
@@@ -1,39 -1,12 +1,48 @@@
- libreoffice (1:5.1.0~alpha1-1) experimental; urgency=medium
++libreoffice (1:5.1.0~alpha1-1) UNRELEASED; urgency=medium
+
+ * New upstream alpha release
+ - uses HttpURLConnection etc. of the JDK instead of commons httpclient
+ in the Wiki Publisher (closes: #800992)
+
+ * debian/patches/series, debian/patches/disable-tiledrendering-test.diff:
+ remove again, we need the functionality for liblibreofficekitgtk.so
+
+ * 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
+ - suggest gir-1.2-lokdocview-0.1
+ * debian/control*in, debian/rules:
+ - remove upstream gone kdeab and gnome-vfs, gconf options
+ * debian/control*.in, debian/rules:
+ - package the LOKDocView introspection stuff into gir1.2-lokdocview-0.1
+ - move liblibreofficekitgtk.so into -gtk3 as it's for Gtk3 now
+ * debian/rules:
+ - gtk3 is on per default now (closes: #799399). Keep -gnome depending on
+ -gtk as gtk3 crashes e.g. on "Save as..."
+ - disable the tests for now
+ - also disable the wiki publisher on gcj builds; uses Java 6+ stuff; make
+ -wiki-publisher depend on >= Java 6
+ * debian/rules: prepare for .ddebs: disable manual -dbg build if building
+ ddebs; use dh_strip --ddeb-migration to create .ddebs
+ * debian/libreoffice-core.bug-script.in: dpkg -l -gtk -gtk3 and -kde to list
+ installed VCLplugs
+
+ * merge from Ubuntu:
+ - add am and gug locales
+
+ -- Rene Engelhard <rene@debian.org> Mon, 19 Oct 2015 00:25:59 +0200
+
+ libreoffice (1:5.0.3~rc1-2) unstable; urgency=medium
+
+ * debian/*.maintscript: add loads of dir_to_symlink calls to packages
+ moving dir->symlink due to dh_installdocs --link-doc (closes: #801753)
+ * debian/control.in:
+ - make -gnome only recommend -gtk. it doesn't need -gtks libs
+
+ -- Rene Engelhard <rene@debian.org> Mon, 19 Oct 2015 00:01:06 +0200
+
libreoffice (1:5.0.3~rc1-1) unstable; urgency=medium
* New upstream release candidate
diff --cc control
index 78f2528,392537a..01cc407
--- a/control
+++ b/control
@@@ -684,14 -691,16 +684,14 @@@ Description: office productivity suite
.
This package contains the Gtk plugin for drawing LibreOffices widgets
with Gtk+ and a Gtk/GNOMEish File Picker and print dialog when running
- under GNOME. It also contains a QuickStarter for the "notification area"
- and a (basic) GTK+ document viewer widget.
+ under GNOME. It also contains a QuickStarter for the "notification area".
Package: libreoffice-gnome
-Architecture: alpha amd64 arm64 armel armhf hppa i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc powerpcspe ppc64 ppc64el s390 s390x sparc
-Depends: gconf2,
- libreoffice-core (= ${binary:Version}),
+Architecture: alpha amd64 arm64 armel armhf hppa i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel mips64eb mips64el powerpc powerpcspe ppc64 ppc64el s390 s390x sparc
+Depends: libreoffice-core (= ${binary:Version}),
- ${gnome-gtk-depends},
${misc:Depends},
${shlibs:Depends}
+ Recommends: ${gnome-gtk-recommends}
Suggests: libreoffice-evolution
Section: gnome
Enhances: libreoffice
diff --cc control.in
index 9847f99,12fd330..fc5748e
--- a/control.in
+++ b/control.in
@@@ -528,10 -530,11 +528,10 @@@ Description: office productivity suite
Package: libreoffice-gnome
Architecture: %OOO_ARCHS%
-Depends: gconf2,
- libreoffice-core (= ${binary:Version}),
+Depends: libreoffice-core (= ${binary:Version}),
- ${gnome-gtk-depends},
${misc:Depends},
${shlibs:Depends}
+ Recommends: ${gnome-gtk-recommends},
Suggests: libreoffice-evolution
Section: gnome
Enhances: libreoffice
diff --cc rules
index df8771a,8602353..69bda71
--- a/rules
+++ b/rules
@@@ -1311,18 -1296,10 +1311,18 @@@ ifeq "$(BUILD_GTK3)" "y
ifneq (cairo,$(findstring cairo,$(SYSTEM_STUFF)))
$(error GTK3 build fails without system-cairo!!)
endif
- GNOME_GTK_RECOMMENDS += libreoffice-gtk3
+ # still crashes. Also at "Save as..." ....
- #GNOME_GTK_DEPENDS += libreoffice-gtk3
- GNOME_GTK_DEPENDS += libreoffice-gtk
++ #GNOME_GTK_RECOMMENDS += libreoffice-gtk3
++ GNOME_GTK_RECOMMENDS += libreoffice-gtk
+ ifeq "$(ENABLE_INTROSPECTION)" "y"
+ BUILD_DEPS += , gobject-introspection (>= 1.32.0), libgirepository1.0-dev (>= 1.32)
+ else
+ CONFIGURE_FLAGS += --enable-introspection=no
+ DEBHELPER_OPTIONS+= -Ngir1.2-lokdocview-0.1
+ endif
else
- GNOME_GTK_RECOMMENDS += libreoffice-gtk
+ CONFIGURE_FLAGS+= --disable-gtk3
+ GNOME_GTK_DEPENDS += libreoffice-gtk
endif
ifeq "$(ENABLE_EVO2)" "n"
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
Reply to: