[SCM] LibreOffice packaging repository branch, debian-experimental-4.1, updated. libreoffice_4.0.3_rc1-3-105-g6f917e2

["Rene Engelhard" <rene@debian.org>]

The following commit has been merged in the debian-experimental-4.1 branch:
commit 6f917e29eb2f7ce6af6e51272ec425bc7f684c07
Author: Rene Engelhard <rene@debian.org>
Date:   Tue May 7 09:02:42 2013 +0200

    fix -kde packaging

diff --git a/patches/make-package-modules-not-suck.diff b/patches/make-package-modules-not-suck.diff
index 4a4a203..b790edf 100644
--- a/patches/make-package-modules-not-suck.diff
+++ b/patches/make-package-modules-not-suck.diff
@@ -94,10 +94,10 @@ index f066710..08a1c1c 100644
      Styles = ();
      Files = (auto_Kde_Lib_ALL
 +#ifdef ENABLE_KDE
-+    gid_File_Lib_Vclplug_Kde,
++    gid_File_Lib_Vclplug_Kde
 +#endif
 +#ifdef ENABLE_KDE4
-+    gid_File_Lib_Vclplug_Kde4,
++    gid_File_Lib_Vclplug_Kde4
 +#endif
      );
  End
@@ -200,6 +200,21 @@ index 63a29f8..d5bbf6c 100644
  $(eval $(call gb_InstallModule_add_templates,scp2/draw,\
      scp2/source/templates/module_langpack_draw \
  ))
+--- a/scp2/InstallModule_kde.mk	2013-05-04 18:30:06.777713287 +0200
++++ b/scp2/InstallModule_kde.mk	2013-05-07 01:20:44.616196512 +0200
+@@ -11,6 +11,12 @@
+ 
+ $(eval $(call gb_InstallModule_use_auto_install_libs,scp2/kde,kde))
+ 
++$(eval $(call gb_InstallModule_define_if_set,scp2/kde,\
++        ENABLE_KAB \
++        ENABLE_KDE \
++        ENABLE_KDE4 \
++))
++
+ $(eval $(call gb_InstallModule_add_localized_scpfiles,scp2/kde,\
+     scp2/source/kde/module_kde \
+ ))
 diff --git a/solenv/gbuild/Helper.mk b/solenv/gbuild/Helper.mk
 index ded46b9..447c331 100644
 --- a/solenv/gbuild/Helper.mk
diff --git a/rules b/rules
index 4cd3155..58fc3ab 100755
--- a/rules
+++ b/rules
@@ -1973,6 +1973,14 @@ 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/kde-open-url \
+		$(PKGDIR)-kde/$(OODIR)/program
+else
+	rm -f $(PKGDIR)-common/$(OODIR)/kde-open-url
+endif
+
 ifeq "$(PACKAGE_SDK)" "y"
 	# move SDK documentation into own package
 	rm -rf $(PKGDIR)-dev-doc

-- 
LibreOffice packaging repository