[ooo-build] KDE4 split bug

[Miklos Vajna]

On Wed, Mar 24, 2010 at 01:50:46PM +0100, Rene Engelhard <rene at debian.org> wrote:
> > You should create similar snippet for kde4_list.txt.
> 
> > Can't open gid_Module_Optional_Kde: No such file or directory.
> 
> Though that doesn't exist for kde4 apparently :-)

Given that we have the following line:

mv_file_between_flists kde_list.txt common_list.txt $OOINSTBASE/basis$VERSION/program/libvclplug_kde[0-9]*l..so

The kde4-specific libvclplug_kde4li.so file is already split to the -kde
package. (I have kde3 disabled, but I *guess* that this means that both
kde3 and kde4-specific files are already split to the same -kde package
because of this, ATM.)

So what about the attached patch?

That moves the file in question (which is KDE4-specific) to the -kde
subpackage.

Thanks.
-------------- next part --------------
From bd6620d2f61b0caa106c755e83ccf0a14f4781cc Mon Sep 17 00:00:00 2001
From: Miklos Vajna <vmiklos at frugalware.org>
Date: Wed, 24 Mar 2010 14:06:59 +0100
Subject: [PATCH] Move fps_kde4.uno.so to the kde subpackage

* bin/package-ooo: Move fps_kde4.uno.so, not just fps_kde.uno.so
---
 bin/package-ooo |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/bin/package-ooo b/bin/package-ooo
index 50ceaf1..07691db 100755
--- a/bin/package-ooo
+++ b/bin/package-ooo
@@ -619,7 +619,7 @@ if test "z$VENDORNAME" != "zDebian" ; then
 	rm -f kde_list.txt
 	test -f $OODESTDIR/gid_Module_Optional_Kde && cp $OODESTDIR/gid_Module_Optional_Kde kde_list.txt || :
 	mv_file_between_flists kde_list.txt common_list.txt $OOINSTBASE/program/kdefilepicker
-	mv_file_between_flists kde_list.txt common_list.txt $OOINSTBASE/basis$VERSION/program/fps_kde.uno.so
+	mv_file_between_flists kde_list.txt common_list.txt $OOINSTBASE/basis$VERSION/program/fps_kde[0-9]*.uno.so
 	mv_file_between_flists kde_list.txt common_list.txt $OOINSTBASE/basis$VERSION/program/libvclplug_kde[0-9]*l..so
 	mv_file_between_flists kde_list.txt common_list.txt $OOINSTBASE/basis$VERSION/program/libkabdrv1.so
 	add_used_directories kde_list.txt common_list.txt
-- 
1.7.0.2

-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 197 bytes
Desc: not available
URL: <http://lists.freedesktop.org/archives/ooo-build/attachments/20100324/3c8ef4c2/attachment.pgp>