[libreoffice] 01/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 889ab8042e0dd1e61a845b877ed1a91a50ff2283
Merge: 1946143 d3834d6
Author: Rene Engelhard <rene@debian.org>
Date: Thu Sep 17 13:34:51 2015 +0200
Merge remote-tracking branch 'origin/debian-experimental-5.0' into debian-experimental-5.1
Conflicts:
changelog
control
control.in
rules
changelog | 29 ++++++++++++++++++++++++++---
control | 20 ++++++--------------
control.fonts.in | 1 +
control.in | 13 +++++--------
rules | 24 +++++++++---------------
5 files changed, 47 insertions(+), 40 deletions(-)
diff --cc changelog
index 046a74d,e6429b9..9bd77ea
--- a/changelog
+++ b/changelog
@@@ -1,28 -1,7 +1,29 @@@
+libreoffice (1:5.1.0~alpha1~git20150914-1) UNRELEASED; urgency=medium
+
+ * New upstream snapshot
+
+ * debian/patches/series, debian/patches/disable-tiledrendering-test.diff:
+ remove again, seems to work again, and we need the functionallity 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 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
+
+ -- Rene Engelhard <rene@debian.org> Fri, 04 Sep 2015 09:52:38 +0200
+
- libreoffice (1:5.0.2~rc1-1) UNRELEASED; urgency=medium
+ libreoffice (1:5.0.2~rc2~git20150916-1) UNRELEASED; urgency=medium
- * New upstream release candidate
+ * New upstream snapshot
+ - fixes crash on gestureLongPress (closes: #798591)
* debian/*.menu: remove, as per TC resolution
* debian/control.in:
diff --cc control
index cdac3ce,7d6fc3e..00b033b
--- a/control
+++ b/control
@@@ -2,9 -2,9 +2,9 @@@ Source: libreoffic
Section: editors
Priority: optional
Maintainer: Debian LibreOffice Maintainers <debian-openoffice@lists.debian.org>
- Uploaders: Rene Engelhard <rene@debian.org>
+ Uploaders: Rene Engelhard <rene@debian.org>, Chris Halls <halls@debian.org>
-Build-Depends: ant (>= 1.7.0),
- ant-optional (>= 1.7.0),
+Build-Depends: ant (>= 1.7.0) [!mips64eb],
+ ant-optional (>= 1.7.0) [!mips64eb],
autoconf,
automake,
bc,
@@@ -75,10 -72,9 +73,9 @@@
libgraphite2-dev (>= 0.9.3),
libgstreamer-plugins-base1.0-dev,
libgstreamer1.0-dev,
- libgtk-3-dev (>= 3.8~),
libgtk2.0-dev (>= 2.10),
libharfbuzz-dev (>= 0.9.18),
- libhsqldb1.8.0-java (>> 1.8.0.10),
+ libhsqldb1.8.0-java (>> 1.8.0.10) [!mips64eb],
libhunspell-dev (>= 1.1.5-2),
libhyphen-dev (>= 2.4),
libice-dev,
@@@ -188,11 -184,9 +185,9 @@@ Build-Conflicts: amd-libopencl1
nvidia-libopencl1,
qt3-dev-tools
Standards-Version: 3.9.4
- XS-Python3-Version: 3.4
- XS-Testsuite: autopkgtest
-Vcs-Git: https://alioth.debian.org/anonscm/git/pkg-openoffice/libreoffice.git -b debian-experimental-5.0
+Vcs-Git: https://alioth.debian.org/anonscm/git/pkg-openoffice/libreoffice.git -b debian-experimental-5.1
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
@@@ -709,26 -704,12 +704,26 @@@ Description: office productivity suite
.
This package contains the Gtk plugin for drawing LibreOffices widgets
with Gtk+ 3.0 and Gtk/GNOMEish print dialog when running under GNOME.
+ It also contains a (basic) GTK+ document viewer widget.
+
+Package: gir1.2-lokdocview-0.1
+Architecture: any
+Section: introspection
+Depends: libreoffice-gtk3 (= ${binary:Version}),
+ ${gir:Depends},
+ ${misc:Depends},
+ ${shlibs:Depends}
+Description: GTK3 widget wrapping LibreOffice functionality - introspection
+ LOKDocView is the GTK3 widget that wraps the libreoffice functionality and
+ exposes a simple API for applications to use this widget.
+ .
+ This package contains the Introspection data.
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
+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: gconf2,
libreoffice-core (= ${binary:Version}),
- libreoffice-gtk3,
+ ${gnome-gtk-depends},
${misc:Depends},
${shlibs:Depends}
Suggests: libreoffice-evolution
@@@ -861,8 -842,7 +856,7 @@@ Description: PDF Import component for L
Package: libreoffice-avmedia-backend-gstreamer
Section: misc
- Priority: optional
-Architecture: alpha amd64 arm64 armel armhf hppa i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc powerpcspe ppc64 ppc64el s390 s390x sparc
+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, ${misc:Depends}, ${shlibs:Depends}
Replaces: libreoffice-core (<< 1:4.2~)
Provides: libreoffice-avmedia-backend
@@@ -875,8 -855,7 +869,7 @@@ Description: GStreamer backend for Libr
Package: libreoffice-avmedia-backend-vlc
Section: misc
- Priority: optional
-Architecture: alpha amd64 arm64 armel armhf hppa i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc powerpcspe ppc64 ppc64el s390 s390x sparc
+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,
${libvlc-dep} (>= 2.0.8),
${misc:Depends},
@@@ -890,8 -869,8 +883,8 @@@ Description: VLC backend for LibreOffic
to play audio/video.
Package: libreoffice-sdbc-firebird
- Depends: libreoffice-core, ${shlibs:Depends}
+ Depends: libreoffice-core, ${misc:Depends}, ${shlibs:Depends}
-Architecture: alpha amd64 arm64 armel armhf i386 ia64 kfreebsd-amd64 kfreebsd-i386 mipsel ppc64el
+Architecture: alpha amd64 arm64 armel armhf i386 ia64 kfreebsd-amd64 kfreebsd-i386 mipsel mips64eb mips64el ppc64el
Section: database
Enhances: libreoffice-base-drivers
Description: Firebird SDBC driver for LibreOffice
@@@ -905,9 -884,10 +898,10 @@@ Package: libreoffice-sdbc-hsqld
Depends: libreoffice-core,
${java-common-depends},
${java:Depends},
+ ${misc:Depends},
${shlibs:Depends}
Replaces: libreoffice-base (<< 1:4.2~)
-Architecture: alpha amd64 arm64 armel armhf arm64 i386 mips mipsel powerpc powerpcspe ppc64 ppc64el s390x hppa ia64 s390 sparc kfreebsd-amd64 kfreebsd-i386
+Architecture: alpha amd64 arm64 armel armhf arm64 i386 mips mipsel mips64el powerpc powerpcspe ppc64 ppc64el s390x hppa ia64 s390 sparc kfreebsd-amd64 kfreebsd-i386
Section: database
Enhances: libreoffice-base-drivers
Description: HSQLDB SDBC driver for LibreOffice
@@@ -918,8 -898,8 +912,8 @@@
LibreOffice without any wrapper layer such as ODBC or JDBC.
Package: libreoffice-base-drivers
- Depends: libreoffice-core, ${shlibs:Depends}
+ Depends: libreoffice-core, ${misc:Depends}, ${shlibs:Depends}
-Architecture: alpha amd64 arm64 armel armhf arm64 i386 mips mipsel powerpc powerpcspe ppc64 ppc64el s390x hppa ia64 s390 sparc kfreebsd-amd64 kfreebsd-i386
+Architecture: alpha amd64 arm64 armel armhf arm64 i386 mips mipsel mips64el powerpc powerpcspe ppc64 ppc64el s390x hppa ia64 s390 sparc kfreebsd-amd64 kfreebsd-i386
Section: database
Suggests: libjtds-java,
libreoffice-mysql-connector | libmyodbc | libmysql-java,
diff --cc control.in
index 3871467,34db63c..85e0626
--- a/control.in
+++ b/control.in
@@@ -26,8 -26,7 +26,7 @@@ Build-Conflicts: ant (= 1.8.0-1) [%OOO_
amd-libopencl1,
nvidia-libopencl1
Standards-Version: 3.9.4
- XS-Python3-Version: @PYTHON_VERSION_CONTROL@
-Vcs-Git: https://alioth.debian.org/anonscm/git/pkg-openoffice/libreoffice.git -b debian-experimental-5.0
+Vcs-Git: https://alioth.debian.org/anonscm/git/pkg-openoffice/libreoffice.git -b debian-experimental-5.1
Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-openoffice/libreoffice.git
Bugs: @BUGS@
Homepage: http://www.libreoffice.org
diff --cc rules
index 4107d75,cb68c58..a6db05b
--- a/rules
+++ b/rules
@@@ -372,15 -374,12 +372,15 @@@ endi
ENABLE_SDBC_POSTGRESQL=y
BUILD_GTK=y
#ifeq "$(DEB_DISTRIBUTION)" "experimental"
- BUILD_GTK3=y
+ BUILD_GTK3=n
#endif
+ifeq "$(BUILD_GTK3)" "y"
+ENABLE_INTROSPECTION=y
+endif
ENABLE_EVO2=y
-ENABLE_GVFS=n
ENABLE_GCONF=y
ENABLE_GIO=y
+ENABLE_DCONF=y
ENABLE_RANDR=y
SYSTEM_STUFF += npapi-headers
PACKAGE_BASE=y
@@@ -1285,15 -1287,11 +1279,17 @@@ ifeq "$(BUILD_GTK3)" "y
ifneq (cairo,$(findstring cairo,$(SYSTEM_STUFF)))
$(error GTK3 build fails without system-cairo!!)
endif
+ GNOME_GTK_DEPENDS += libreoffice-gtk3
+ 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
- DEBHELPER_OPTIONS+= -Nlibreoffice-gtk3
+ CONFIGURE_FLAGS+= --disable-gtk3
+ DEBHELPER_OPTIONS+= -Nlibreoffice-gtk3 -Ngir1.2-lokdocview-0.1
+ GNOME_GTK_DEPENDS += libreoffice-gtk
endif
ifeq "$(ENABLE_EVO2)" "n"
@@@ -3200,11 -3202,9 +3192,12 @@@ endi
else
dh_strip -s
endif
+ dh_fixperms -s
dh_icons -s
dh_compress -s -X.py -X.mk -X.sxd
+ifeq "$(ENABLE_INTROSPECTION)" "y"
+ dh_girepository -s $(PKGDIR)-gtk3/$(OODIR)/program
+endif
dh_makeshlibs -puno-libs3 -V"uno-libs3 (>= $(shell grep UREPACKAGEVERSION $(SOURCE_TREE)/instsetoo_native/util/openoffice.lst | awk '{ print $$2 }' | cut -d. -f1-3)~), ure" -- -c0 -d -V -v`echo $(BINARY_VERSION) | cut -d: -f2`
dh_makeshlibs -n -pure -V"ure (>= $(shell grep UREPACKAGEVERSION $(SOURCE_TREE)/instsetoo_native/util/openoffice.lst | awk '{ print $$2 }' | cut -d. -f1-3)~)" -- -d -V -v`echo $(BINARY_VERSION) | cut -d: -f2`
# ugly hack, but why does that happen? It's not in .symbols...
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
Reply to: