This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch debian-experimental-5.2
in repository libreoffice.
commit b96846c6291c861f20ebe7af331cf7c00645a213
Merge: 60e0a71 da1cae7
Author: Rene Engelhard <r...@debian.org>
Date: Tue Apr 5 00:49:10 2016 +0200
Merge remote-tracking branch 'origin/debian-experimental-5.1' into
debian-experimental-5.2
Conflicts:
changelog
control
rules
changelog | 30 +++++++++++++++---
control | 62 ++++++++++++++++++-------------------
control.in | 4 +--
rules | 20 +++++++-----
tests/control | 3 ++
tests/control.in | 3 ++
tests/sdk-examples | 27 ++++++++++++++++
ure.bug-script => ure.bug-script.in | 0
8 files changed, 103 insertions(+), 46 deletions(-)
diff --cc changelog
index 357afa8,bcae8fe..802f291
--- a/changelog
+++ b/changelog
@@@ -1,17 -1,9 +1,23 @@@
+libreoffice (1:5.2.0~alpha1~git20160329-1) UNRELEASED; urgency=medium
+
+ * New upstream snapshot
+ - fixes SVG t(ext s)pan import (closes: #665094)
+
+ * debian/rules, debian/control.gtk3.in, debian/*.links: move
+ liblibreofficekitgtk.so into an own package, as we have
+ libreofficekit-{dev,data} anyway. Make liblibreofficekitgtk depend on
+ libreofficekit-data
+ * debian/rules, debian/control.in, debian/libreoffice-gtk.*: rename -gtk
+ to -gtk2
+
+ -- Rene Engelhard <r...@debian.org> Thu, 26 Nov 2015 10:37:57 +0100
+
+ libreoffice (1:5.1.3~rc1~git20160404-1) UNRELEASED; urgency=medium
+
+ * New upstream snapshot
+
+ -- Rene Engelhard <r...@debian.org> Sat, 02 Apr 2016 12:48:35 +0200
+
libreoffice (1:5.1.2~rc2-1) UNRELEASED; urgency=medium
* New upstream release candidate
diff --cc control
index 6377ac9,ebaa99d..322ba3c
--- a/control
+++ b/control
@@@ -186,9 -187,9 +186,9 @@@ Build-Conflicts: amd-libopencl1
nvidia-libopencl1,
qt3-dev-tools
Standards-Version: 3.9.4
-Vcs-Git: https://alioth.debian.org/anonscm/git/pkg-openoffice/libreoffice.git
+Vcs-Git: https://alioth.debian.org/anonscm/git/pkg-openoffice/libreoffice.git
-b debian-experimental-5.2
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
@@@ -990,24 -988,24 +990,24 @@@ Description: office productivity suite
install extra dictionaries/hyphenation patterns/thesauri independently of
the language packs.
--Package: libreoffice-l10n-am
++Package: libreoffice-l10n-
Section: localization
Architecture: all
Pre-Depends: ${misc:Pre-Depends}
Depends: libreoffice-common, locales | locales-all, ${misc:Depends}
--Recommends: libreoffice-core (>> ${base-version}) |
language-support-translations-am
++Recommends: libreoffice-core (>> ${base-version}) |
language-support-translations-
Provides: libreoffice-l10n-${help-l10n-virtual-version}
--Suggests: hunspell-dictionary-am | myspell-dictionary-am,
-- hyphen-am,
-- libreoffice-grammarcheck-am,
-- libreoffice-help-am,
-- mythes-am
--Description: office productivity suite -- Amharic language package
++Suggests: hunspell-dictionary- | myspell-dictionary-,
++ hyphen-,
++ libreoffice-grammarcheck-,
++ libreoffice-help-,
++ mythes-
++Description: office productivity suite -- language package
LibreOffice is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
.
This package contains the localization of LibreOffice in
-- Amharic.
++ .
It contains the user interface, the templates and the autotext features.
(please note that not all this is available for all possible languages).
You can switch user interface language using the locales system.
@@@ -1867,24 -1865,24 +1867,24 @@@ Description: office productivity suite
install extra dictionaries/hyphenation patterns/thesauri independently of
the language packs.
--Package: libreoffice-l10n-gug
++Package: libreoffice-l10n-
Section: localization
Architecture: all
Pre-Depends: ${misc:Pre-Depends}
Depends: libreoffice-common, locales | locales-all, ${misc:Depends}
--Recommends: libreoffice-core (>> ${base-version}) |
language-support-translations-gug
++Recommends: libreoffice-core (>> ${base-version}) |
language-support-translations-
Provides: libreoffice-l10n-${help-l10n-virtual-version}
--Suggests: hunspell-dictionary-gug | myspell-dictionary-gug,
-- hyphen-gug,
-- libreoffice-grammarcheck-gug,
-- libreoffice-help-gug,
-- mythes-gug
--Description: office productivity suite -- Guarani language package
++Suggests: hunspell-dictionary- | myspell-dictionary-,
++ hyphen-,
++ libreoffice-grammarcheck-,
++ libreoffice-help-,
++ mythes-
++Description: office productivity suite -- language package
LibreOffice is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
.
This package contains the localization of LibreOffice in
-- Guarani.
++ .
It contains the user interface, the templates and the autotext features.
(please note that not all this is available for all possible languages).
You can switch user interface language using the locales system.
@@@ -2261,24 -2259,24 +2261,24 @@@ Description: office productivity suite
install extra dictionaries/hyphenation patterns/thesauri independently of
the language packs.
--Package: libreoffice-l10n-kmr
++Package: libreoffice-l10n-
Section: localization
Architecture: all
Pre-Depends: ${misc:Pre-Depends}
Depends: libreoffice-common, locales | locales-all, ${misc:Depends}
--Recommends: libreoffice-core (>> ${base-version}) |
language-support-translations-kmr
++Recommends: libreoffice-core (>> ${base-version}) |
language-support-translations-
Provides: libreoffice-l10n-${help-l10n-virtual-version}
--Suggests: hunspell-dictionary-kmr | myspell-dictionary-kmr,
-- hyphen-kmr,
-- libreoffice-grammarcheck-kmr,
-- libreoffice-help-kmr,
-- mythes-kmr
--Description: office productivity suite -- Kurmanji language package
++Suggests: hunspell-dictionary- | myspell-dictionary-,
++ hyphen-,
++ libreoffice-grammarcheck-,
++ libreoffice-help-,
++ mythes-
++Description: office productivity suite -- language package
LibreOffice is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
.
This package contains the localization of LibreOffice in
-- Kurmanji.
++ .
It contains the user interface, the templates and the autotext features.
(please note that not all this is available for all possible languages).
You can switch user interface language using the locales system.
diff --cc rules
index 94223c5,5578e35..36d2621
--- a/rules
+++ b/rules
@@@ -1336,8 -1341,11 +1331,11 @@@ ifeq "$(BUILD_GTK3)" "y
endif
else
CONFIGURE_FLAGS+= --disable-gtk3
- GNOME_GTK_DEPENDS += libreoffice-gtk
+ GNOME_GTK_DEPENDS += libreoffice-gtk2
endif
+ ifeq "$(ENABLE_SYSTRAY)" "n"
+ CONFIGURE_FLAGS += --disable-systray
+ endif
ifeq "$(ENABLE_EVO2)" "n"
CONFIGURE_FLAGS += --disable-evolution2
@@@ -2566,16 -2580,18 +2566,18 @@@ endi
ifeq "$(BUILD_GTK3)" "y"
rm -rf $(PKGDIR)-gtk3
mkdir -p -m755 $(PKGDIR)-gtk3/$(OODIR)/program
+ mkdir -p -m755 debian/liblibreofficekitgtk/$(OODIR)/program
mv $(PKGDIR)-gnome/$(OODIR)/program/libvclplug_gtk3lo.so
$(PKGDIR)-gtk3/$(OODIR)/program/
- mv $(PKGDIR)-core/$(OODIR)/program/liblibreofficekitgtk.so
$(PKGDIR)-gtk3/$(OODIR)/program/
+ mv $(PKGDIR)-core/$(OODIR)/program/liblibreofficekitgtk.so
debian/liblibreofficekitgtk/$(OODIR)/program/
endif
- mv $(PKGDIR)-gnome/$(OODIR)/program/* $(PKGDIR)-gtk/$(OODIR)/program/
- mv $(PKGDIR)-gtk/$(OODIR)/program/gnome-open-url
$(PKGDIR)-gnome/$(OODIR)/program
+ mv $(PKGDIR)-gnome/$(OODIR)/program/* $(PKGDIR)-gtk2/$(OODIR)/program/
ifeq "$(BUILD_GTK)" "y"
- mkdir -p -m755 $(PKGDIR)-gtk/$(OODIR)/share
+ mkdir -p -m755 $(PKGDIR)-gtk2/$(OODIR)/share
+ ifeq "$(ENABLE_SYSTRAY)" "y"
- mv $(PKGDIR)-gnome/$(OODIR)/share/xdg $(PKGDIR)-gtk/$(OODIR)/share
+ mv $(PKGDIR)-gnome/$(OODIR)/share/xdg $(PKGDIR)-gtk2/$(OODIR)/share
+ endif
ifeq "$(ENABLE_GIO)" "y"
- mv $(PKGDIR)-gtk/$(OODIR)/program/libucpgio1lo.so \
+ mv $(PKGDIR)-gtk2/$(OODIR)/program/libucpgio1lo.so \
$(PKGDIR)-gnome/$(OODIR)/program/
endif
ifeq "$(ENABLE_PACKAGEKIT)" "y"
@@@ -2627,7 -2643,9 +2629,9 @@@ endi
for i in writer calc impress draw math base; do \
perl -pi -e 's/Application;//; s/X-Red-Hat-Base;//;
s/X-SuSE-Core-Office;//; s/X-MandrivaLinux-.*;//;'
$(PKGDIR)-$$i/$(OODIR)/share/xdg/$$i.desktop; \
done
+ ifeq "$(ENABLE_SYSTRAY)" "y"
- perl -pi -e 's/Application;//'
$(PKGDIR)-gtk/$(OODIR)/share/xdg/qstart.desktop
+ perl -pi -e 's/Application;//'
$(PKGDIR)-gtk2/$(OODIR)/share/xdg/qstart.desktop
+ endif
ifeq "$(ENABLE_PYTHON)" "y"
# PyUNO packaging
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-openoffice/libreoffice.git
