[libreoffice] 06/06: adjust kde integration for upstream cb37698884c6f7af97c5fa9a0404a5893aa73c9d

[Rene Engelhard]

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

rene pushed a commit to tag libreoffice_5.0.2_rc2-0ubuntu2
in repository libreoffice.

commit 9ff92b904f6ee56625a20f0716c8fd21ad1b4e04
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date:   Tue Feb 9 11:21:10 2016 +0100

    adjust kde integration for upstream cb37698884c6f7af97c5fa9a0404a5893aa73c9d
---
 changelog | 6 ++++++
 rules     | 8 --------
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/changelog b/changelog
index c2e3734..e900afe 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,9 @@
+libreoffice (1:5.0.5~rc2-0ubuntu2) wily; urgency=medium
+
+  * adjust kde integration for upstream cb37698884c6f7af97c5fa9a0404a5893aa73c9d
+
+ -- Bjoern Michaelsen <bjoern.michaelsen at canonical.com>  Tue, 09 Feb 2016 11:21:12 +0100
+
 libreoffice (1:5.0.5~rc2-0ubuntu1) wily; urgency=medium
 
   * new upstream rc
diff --git a/rules b/rules
index 91c7f2b..eda0371 100755
--- a/rules
+++ b/rules
@@ -2064,14 +2064,6 @@ ifeq "$(BUILD_GTK)" "y"
 		$(PKGDIR)-gnome/$(OODIR)/share/xdg
 endif
 
-ifeq "$(BUILD_KDE)" "y"
-	mkdir -p $(PKGDIR)-kde/$(OODIR)/program
-	mv $(PKGDIR)-common/$(OODIR)/program/kde4-open-url \
-		$(PKGDIR)-kde/$(OODIR)/program
-else
-	rm -f $(PKGDIR)-common/$(OODIR)/kde4-open-url
-endif
-
 ifeq "$(PACKAGE_SDK)" "y"
 	# move SDK documentation into own package
 	rm -rf $(PKGDIR)-dev-doc

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