[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - bin/distro-install-file-lists

[Tomáš Chvátal]

 bin/distro-install-file-lists |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 80ab5c501d4891e94cd882b8d19bc629a2be88ab
Author: Tomáš Chvátal <tchvatal at suse.com>
Date:   Mon Dec 28 17:18:39 2015 +0100

    Fix distro-filelists after removal of kde3
    
    Change-Id: Ie11281285de012dfd61f4b3b04b4144cd90d382a
    Reviewed-on: https://gerrit.libreoffice.org/20989
    Reviewed-by: Michael Stahl <mstahl at redhat.com>
    Tested-by: Michael Stahl <mstahl at redhat.com>
    Reviewed-on: https://gerrit.libreoffice.org/21196
    Tested-by: Jenkins <ci at libreoffice.org>

diff --git a/bin/distro-install-file-lists b/bin/distro-install-file-lists
index 988e8f0..a01afd7 100755
--- a/bin/distro-install-file-lists
+++ b/bin/distro-install-file-lists
@@ -227,7 +227,7 @@ if test "z$OOO_VENDOR" != "zDebian" ; then
     add_used_directories tde_list.txt common_list.txt
 
     # create kde4 subpackage
-    mv_file_between_flists kde4_list.txt kde_list.txt    $INSTALLDIR/program/kde4be1lo.so
+    test -f $DESTDIR/gid_Module_Optional_Kde && cp $DESTDIR/gid_Module_Optional_Kde kde4_list.txt || :
     mv_file_between_flists kde4_list.txt common_list.txt $INSTALLDIR/program/libvclplug_kde4l..so
     mv_file_between_flists kde4_list.txt common_list.txt $INSTALLDIR/program/fps_kde4lo.so
     add_used_directories kde4_list.txt common_list.txt