[libreoffice] 02/02: install KDE stuff into -kde4/-kde5

[Rene Engelhard]

This is an automated email from the git hooks/post-receive script.

rene pushed a commit to branch debian-experimental-6.0
in repository libreoffice.

commit 223e40b4dbb1584c95ac5522891a0c277fde8063
Author: Rene Engelhard <rene at debian.org>
Date:   Mon Nov 6 21:12:44 2017 +0100

    install KDE stuff into -kde4/-kde5
---
 control.kde4.in |  4 ++--
 rules           | 29 ++++++++++-------------------
 2 files changed, 12 insertions(+), 21 deletions(-)

diff --git a/control.kde4.in b/control.kde4.in
index 5ce97d4..aab14d1 100644
--- a/control.kde4.in
+++ b/control.kde4.in
@@ -1,4 +1,4 @@
-Package: libreoffice-kde
+Package: libreoffice-kde4
 Architecture: %OOO_ARCHS%
 Depends: libreoffice-core (= ${binary:Version}),
          ${misc:Depends},
@@ -8,7 +8,7 @@ Suggests: kmail, konqueror
 Section: kde
 Enhances: libreoffice
 Replaces: libreoffice-core (= 1:4.3.0~beta1-1)
-Description: office productivity suite -- KDE integration
+Description: office productivity suite -- KDE 4 integration
  LibreOffice is a full-featured office productivity suite that provides
  a near drop-in replacement for Microsoft(R) Office.
  .
diff --git a/rules b/rules
index 838013d..d385782 100755
--- a/rules
+++ b/rules
@@ -1812,12 +1812,7 @@ ifeq "$(BUILD_GTK3)" "y"
 	cat debian/control.gtk3.in >> debian/control
 endif
 ifeq "$(BUILD_KDE)" "y"
-  ifeq "$(BUILD_KDE4)" "y"
-	cat debian/control.kde4.in >> debian/control
-  endif
-  ifeq "$(BUILD_KDE5)" "y"
-	cat debian/control.kde5.in >> debian/control
-  endif
+	cat debian/control.kde$(KDE_MAJOR).in >> debian/control
 endif
 ifeq "$(ENABLE_QT5)" "y"
 	cat debian/control.qt5.in >> debian/control
@@ -1853,7 +1848,7 @@ endif
 	perl -pi -e "s#%BUILD_DEPS%#$(strip $(BUILD_DEPS))#g" debian/control
 	perl -pi -e "s#%JUNIT_MIN_VER%#$(JUNIT_MIN_VER)#g" debian/control
 ifeq "$(BUILD_KDE)" "y"
-	perl -pi -e 's/%LO-DESKTOP-INTEGRATION%/libreoffice-gnome | libreoffice-kde/' debian/control
+	perl -pi -e 's/%LO-DESKTOP-INTEGRATION%/libreoffice-gnome | libreoffice-kde$(KDE_MAJOR)/' debian/control
 else
 	perl -pi -e 's/%LO-DESKTOP-INTEGRATION%/libreoffice-gnome/' debian/control
 endif
@@ -2205,8 +2200,9 @@ endif
 	for i in calc impress draw base writer; do \
 		echo "../usr/share/appdata/libreoffice-$$i.appdata.xml /usr/share/metainfo/" >> $(PKGDIR)-$$i.install; \
 	done
+
 ifeq "$(BUILD_KDE)" "y"
-	echo "../usr/share/appdata/org.libreoffice.kde.metainfo.xml /usr/share/metainfo/" >> $(PKGDIR)-kde.install
+	echo "../usr/share/appdata/org.libreoffice.kde.metainfo.xml /usr/share/metainfo/" >> $(PKGDIR)-kde$(KDE_MAJOR).install
 endif
 
 ifeq "$(PACKAGE_LOKIT)" "y"
@@ -2625,38 +2621,33 @@ endif
 			debian/uno-libs3/$(OODIR)/program; \
 	done
 
-ifeq "$(ENABLE_QT5)" "y"
-	mkdir -p $(PKGDIR)-qt5/$(OODIR)/program
-	mv $(PKGDIR)-kde/$(OODIR)/program/libvclplug_qt5lo.so \
-		$(PKGDIR)-qt5/$(OODIR)/program
-endif
 
 ifeq "$(BUILD_KDE)" "y"
 	# install files for KDEs "create new" ...
-	mkdir -p $(PKGDIR)-kde/usr/share/templates/.source
+	mkdir -p $(PKGDIR)-kde$(KDE_MAJOR)/usr/share/templates/.source
 	for i in $(SOURCE_TREE)/extras/source/shellnew/*; do \
-		cp $$i $(PKGDIR)-kde/usr/share/templates/.source/`basename $$i`; \
+		cp $$i $(PKGDIR)-kde$(KDE_MAJOR)/usr/share/templates/.source/`basename $$i`; \
 	done
 	cat debian/templates/soffice-template.desktop.in \
 		| sed -e "s/@APP@/Writer/" \
 		| sed -e "s/@EXT@/odt/" \
 		| sed -e "s/@TYPE@/text/" \
-		> $(PKGDIR)-kde/usr/share/templates/soffice.odt.desktop
+		> $(PKGDIR)-kde$(KDE_MAJOR)/usr/share/templates/soffice.odt.desktop
 	cat debian/templates/soffice-template.desktop.in \
 		| sed -e "s/@APP@/Calc/" \
 		| sed -e "s/@EXT@/ods/" \
 		| sed -e "s/@TYPE@/spreadsheet/" \
-		> $(PKGDIR)-kde/usr/share/templates/soffice.ods.desktop
+		> $(PKGDIR)-kde$(KDE_MAJOR)/usr/share/templates/soffice.ods.desktop
 	cat debian/templates/soffice-template.desktop.in \
 		| sed -e "s/@APP@/Impress/" \
 		| sed -e "s/@EXT@/odp/" \
 		| sed -e "s/@TYPE@/presentation/" \
-		> $(PKGDIR)-kde/usr/share/templates/soffice.odp.desktop
+		> $(PKGDIR)-kde$(KDE_MAJOR)/usr/share/templates/soffice.odp.desktop
 	cat debian/templates/soffice-template.desktop.in \
 		| sed -e "s/@APP@/Draw/" \
 		| sed -e "s/@EXT@/odg/" \
 		| sed -e "s/@TYPE@/drawing/" \
-		> $(PKGDIR)-kde/usr/share/templates/soffice.odg.desktop
+		> $(PKGDIR)-kde$(KDE_MAJOR)/usr/share/templates/soffice.odg.desktop
 endif
 
 	# split out gtk stuff

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git