[libreoffice] 01/02: remove upstream gone kdeab and gnome-vfs options
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 d94aa6322bee438fb8fdc165bc9b5881be0ad7e9
Author: Rene Engelhard <rene@debian.org>
Date: Fri Sep 4 09:53:24 2015 +0200
remove upstream gone kdeab and gnome-vfs options
---
changelog | 6 ++++--
control.in | 2 +-
control.kab.in | 15 ---------------
rules | 32 +-------------------------------
4 files changed, 6 insertions(+), 49 deletions(-)
diff --git a/changelog b/changelog
index e1561b5..a582f1f 100644
--- a/changelog
+++ b/changelog
@@ -1,4 +1,4 @@
-libreoffice (1:5.1.0~alpha1~git20150828-1) UNRELEASED; urgency=medium
+libreoffice (1:5.1.0~alpha1~git20150904-1) UNRELEASED; urgency=medium
* New upstream snapshot
@@ -6,8 +6,10 @@ libreoffice (1:5.1.0~alpha1~git20150828-1) UNRELEASED; urgency=medium
- 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> Mon, 01 Jun 2015 20:29:43 +0200
+ -- Rene Engelhard <rene@debian.org> Fri, 04 Sep 2015 09:52:38 +0200
libreoffice (1:5.0.1-1) unstable; urgency=medium
diff --git a/control.in b/control.in
index 034d99c..00834e8 100644
--- a/control.in
+++ b/control.in
@@ -93,7 +93,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: GNOME VFS, GConf backend
+ * libreoffice-gnome: GIO, GConf backend
* unixodbc: ODBC database support
* cups-bsd: Allows LibreOffice to detect your CUPS printer queues
automatically
diff --git a/control.kab.in b/control.kab.in
deleted file mode 100644
index 2834893..0000000
--- a/control.kab.in
+++ /dev/null
@@ -1,15 +0,0 @@
-Package: libreoffice-kab
-Architecture: %OOO_BASE_ARCHS%
-Depends: libreoffice-common (>= 1:3.4.0~),
- libreoffice-core (= ${binary:Version}),
- ${misc:Depends},
- ${shlibs:Depends}
-Recommends: kaddressbook
-Conflicts: ure (<< 1.5.1+OOo3.1.1-15)
-Description: office productivity suite -- KDE adressbook support
- LibreOffice is a full-featured office productivity suite that provides
- a near drop-in replacement for Microsoft(R) Office.
- .
- This package allows LibreOffice to access the KDE Addressbook.
- You need to install kaddressbook separately.
-
diff --git a/rules b/rules
index 2f57e32..163e08c 100755
--- a/rules
+++ b/rules
@@ -194,8 +194,6 @@ BUILD_CAIROCANVAS=y
SYSTEM_STUFF += cairo
CAIRO_FONTS_PATCH=y
BUILD_KDE=y
-# not ported to KDE 4
-ENABLE_KDEAB=n
# < 4.8 fails with gcc 4.7, see #667911
QT_MINVER= (>= 4:4.8)
KDELIBS_MINVER= (>= 4:4.3.4)
@@ -377,7 +375,6 @@ BUILD_GTK=y
BUILD_GTK3=y
#endif
ENABLE_EVO2=y
-ENABLE_GVFS=n
ENABLE_GCONF=y
ENABLE_GIO=y
ENABLE_DCONF=y
@@ -613,7 +610,6 @@ ifneq (,$(findstring $(DEB_HOST_ARCH),$(OOO_NO_BASE_ARCHS)))
ENABLE_SDBC_POSTGRESQL=n
ENABLE_MYSQLNATIVE=n
ENABLE_EVO2=n
- ENABLE_KDEAB=n
ENABLE_REPORTDESIGN=n
DEBHELPER_OPTIONS += -Nlibreoffice-base libreoffice-base-core -Nlibreoffice-base-drivers
DEBHELPER_OPTIONS += -Nlibreoffice-evolution -Nlibreoffice-kab
@@ -1231,10 +1227,8 @@ else
endif
ifeq "$(BUILD_KDE)" "n"
- CONFIGURE_FLAGS+= --disable-kde
- CONFIGURE_FLAGS-= --disable-kde4
+ CONFIGURE_FLAGS += --disable-kde4
else
- CONFIGURE_FLAGS += --disable-kde
CONFIGURE_FLAGS += --enable-kde4
ifneq "$(JESSIE_BACKPORT)" "y"
KDE_ICONSET_DEP=libreoffice-style-breeze
@@ -1244,12 +1238,6 @@ endif
BUILD_DEPS += , kdelibs5-dev $(KDELIBS_MINVER)
BUILD_DEPS += , libqt4-dev $(QT_MINVER)
DBG_DBG_SUGGESTS+= , kdelibs5-dbg, libqt4-dbg
- ifeq "$(ENABLE_KDEAB)" "y"
- ADDITIONAL_SECTIONS += KDE4Experimental
- BUILD_DEPS += , kdepimlibs5-dev$(OOO_NO_BASE_ARCHS)
- else
- CONFIGURE_FLAGS+= --disable-kdeab
- endif
endif
ifeq "$(ENABLE_MYSQLNATIVE)" "y"
@@ -1467,11 +1455,6 @@ else
CONFIGURE_FLAGS += --disable-gio
endif
-ifeq "$(ENABLE_GVFS)" "y"
- BUILD_DEPS += , libgnomevfs2-dev
- CONFIGURE_FLAGS += --enable-gnome-vfs
-endif
-
ifeq "$(ENABLE_GCONF)" "y"
BUILD_DEPS += , libgconf2-dev
else
@@ -1760,9 +1743,6 @@ endif
ifeq "$(ENABLE_EVO2)" "y"
cat debian/control.evolution.in >> debian/control
endif
-ifeq "$(ENABLE_KDEAB)" "y"
- cat debian/control.kab.in >> debian/control
-endif
ifeq "$(BUILD_TEST_PACKAGE)" "y"
ifneq "$(OOO_JAVA_ARCHS)" ""
cat debian/control.subsequentcheckbase.in >> debian/control
@@ -1808,12 +1788,6 @@ ifeq (pt-BR,$(findstring pt-BR,$(LANGPACKISOS)))
endif
perl -pi -e 's/Package: libreoffice-help-en-us/Package: libreoffice-help-en-us\nReplaces: libreoffice-common (<< 1:3.0.0~dev300m28)/' debian/control
-ifeq "$(ENABLE_GIO)" "y"
- perl -pi -e 's/VFS/GIO/' debian/control
- # fix up "GNOME GIO"
- perl -pi -e 's/GNOME GIO/GIO/' debian/control
-endif
-
ifneq "$(USE_MARIADB)" "y"
perl -pi -e "s/(Build-Conflicts: .*)/\1,libmariadbclient-dev,/" debian/control
endif
@@ -2578,10 +2552,6 @@ ifeq "$(BUILD_GTK)" "y"
mv $(PKGDIR)-gtk/$(OODIR)/program/libucpgio1lo.so \
$(PKGDIR)-gnome/$(OODIR)/program/
endif
- ifeq "$(ENABLE_GVFS)" "y"
- mv $(PKGDIR)-gtk/$(OODIR)/program/libucpgvfs1lo.so \
- $(PKGDIR)-gnome/$(OODIR)/program/
- endif
ifeq "$(ENABLE_GCONF)" "y"
mv $(PKGDIR)-gtk/$(OODIR)/program/libgconfbe1lo.so \
$(PKGDIR)-gnome/$(OODIR)/program
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
Reply to: