[libreoffice] 01/01: git update; gconf is also gone now...
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 77a3127c8d8d93cc2c09aa57c633c7e6535eba6e
Author: Rene Engelhard <rene@debian.org>
Date: Fri Oct 16 20:03:13 2015 +0200
git update; gconf is also gone now...
---
changelog | 4 ++--
control | 7 ++-----
control.in | 4 ++--
patches/split-evoab.diff | 2 +-
rules | 10 ----------
5 files changed, 7 insertions(+), 20 deletions(-)
diff --git a/changelog b/changelog
index ba771be..e9877f3 100644
--- a/changelog
+++ b/changelog
@@ -1,4 +1,4 @@
-libreoffice (1:5.1.0~alpha1~git20151012-1) UNRELEASED; urgency=medium
+libreoffice (1:5.1.0~alpha1~git20151016-1) UNRELEASED; urgency=medium
* New upstream snapshot
- uses HttpURLConnection etc. of the JDK instead of commons httpclient
@@ -14,7 +14,7 @@ libreoffice (1:5.1.0~alpha1~git20151012-1) UNRELEASED; urgency=medium
- 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
+ - 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
diff --git a/control b/control
index 6c5c53b..6f33a43 100644
--- a/control
+++ b/control
@@ -62,7 +62,6 @@ Build-Depends: ant (>= 1.7.0) [!mips64eb],
libfreehand-dev (>= 0.1),
libfreetype6-dev (>= 2.2.0),
libgcj-common (>= 1:4.4.1) [hppa ia64 s390 sparc],
- libgconf2-dev,
libgirepository1.0-dev (>= 1.32),
libgl1-mesa-dev,
libglew-dev,
@@ -248,8 +247,7 @@ Description: office productivity suite (metapackage)
* hyphen-*: Hyphenation patterns for LibreOffice
* libreoffice-gtk: Gtk UI Plugin, GNOME File Picker support,
QuickStarter for GNOMEs notification are
- * libreoffice-gnome: GIO, GConf backend
- * libreoffice-kde: KDE UI Plugin and KDE File Picker support
+ * libreoffice-gnome: GIO backend
* unixodbc: ODBC database support
* cups-bsd: Allows LibreOffice to detect your CUPS printer queues
automatically
@@ -704,7 +702,7 @@ Description: office productivity suite -- GNOME integration
LibreOffice is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
.
- This package contains the GIO support and a GConf backend.
+ This package contains the GIO support.
.
You can extend the functionality of this by installing these packages:
.
@@ -4471,7 +4469,6 @@ Depends: ant (>= 1.7.0),
libfontconfig1-dev,
libfreehand-dev (>= 0.1),
libfreetype6-dev (>= 2.2.0),
- libgconf2-dev,
libgirepository1.0-dev (>= 1.32),
libgl1-mesa-dev,
libglew-dev,
diff --git a/control.in b/control.in
index 3e9f180..ced7023 100644
--- a/control.in
+++ b/control.in
@@ -91,7 +91,7 @@ Description: office productivity suite (metapackage)
* hyphen-*: Hyphenation patterns for LibreOffice
* libreoffice-gtk: Gtk UI Plugin, GNOME File Picker support,
QuickStarter for GNOMEs notification are
- * libreoffice-gnome: GIO, GConf backend
+ * libreoffice-gnome: GIO backend
* unixodbc: ODBC database support
* cups-bsd: Allows LibreOffice to detect your CUPS printer queues
automatically
@@ -542,7 +542,7 @@ Description: office productivity suite -- GNOME integration
LibreOffice is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
.
- This package contains the GIO support and a GConf backend.
+ This package contains the GIO support.
.
You can extend the functionality of this by installing these packages:
.
diff --git a/patches/split-evoab.diff b/patches/split-evoab.diff
index 609bd00..7a85501 100644
--- a/patches/split-evoab.diff
+++ b/patches/split-evoab.diff
@@ -53,8 +53,8 @@ index 686f6c1..d633c90 100644
@@ -14,6 +14,7 @@ $(eval $(call gb_InstallModule_use_auto_install_libs,scp2/gnome,gnome))
$(eval $(call gb_InstallModule_define_if_set,scp2/gnome,\
ENABLE_GIO \
- ENABLE_LOCKDOWN \
+ ENABLE_EVOAB2 \
ENABLE_GTK \
))
+ $(eval $(call gb_InstallModule_add_scpfiles,scp2/gnome,\
diff --git a/rules b/rules
index b384a11..df8771a 100755
--- a/rules
+++ b/rules
@@ -534,7 +534,6 @@ CONFIGURE_FLAGS= \
--with-vendor='$(OOO_VENDOR)' \
--prefix=/usr --mandir=/usr/share/man \
--docdir=/usr/share/doc/libreoffice \
- --enable-lockdown \
--libdir=/usr/lib \
--host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \
--disable-online-update \
@@ -1495,11 +1494,6 @@ else
CONFIGURE_FLAGS += --disable-gio
endif
-ifeq "$(ENABLE_GCONF)" "y"
- BUILD_DEPS += , libgconf2-dev
-else
- CONFIGURE_FLAGS += --disable-gconf
-endif
BUILD_DEPS += , gettext
ifeq "$(ENABLE_DCONF)" "y"
@@ -2587,10 +2581,6 @@ ifeq "$(BUILD_GTK)" "y"
mv $(PKGDIR)-gtk/$(OODIR)/program/libucpgio1lo.so \
$(PKGDIR)-gnome/$(OODIR)/program/
endif
- ifeq "$(ENABLE_GCONF)" "y"
- mv $(PKGDIR)-gtk/$(OODIR)/program/libgconfbe1lo.so \
- $(PKGDIR)-gnome/$(OODIR)/program
- endif
endif
ifeq "$(ENABLE_EVO2)" "y"
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
Reply to: