[Libreoffice-commits] .: bin/distro-install-file-lists

2012-12-19 Thread Libreoffice Gerrit user
 bin/distro-install-file-lists |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit f9f89ee1dc05d5cac1e155f84028ffda65620d55
Author: Tomas Chvatal 
Date:   Wed Dec 19 22:00:45 2012 +0100

Add librelogo to lists

Change-Id: Iee20612a194b563d89c02a286993cd16fd196bbe

diff --git a/bin/distro-install-file-lists b/bin/distro-install-file-lists
index 442e404..a902107 100755
--- a/bin/distro-install-file-lists
+++ b/bin/distro-install-file-lists
@@ -136,6 +136,7 @@ if test "z$OOO_VENDOR" != "zDebian" ; then
 merge_flists gid_Module_Optional_Pymailmerge   
$FILELISTSDIR/pyuno_list.txt
 merge_flists gid_Module_Optional_Pyuno 
$FILELISTSDIR/pyuno_list.txt
 merge_flists 
gid_Module_Optional_Extensions_Script_Provider_For_Python 
$FILELISTSDIR/pyuno_list.txt
+merge_flists gid_Module_Optional_Pyuno_LibreLogo   
$FILELISTSDIR/pyuno_list.txt
 merge_flists gid_Module_Optional_Xsltfiltersamples 
$FILELISTSDIR/common_list.txt
 else
 merge_flists gid_Module_Optional_Grfflt
$FILELISTSDIR/common_list.txt
@@ -143,6 +144,7 @@ if test "z$OOO_VENDOR" != "zDebian" ; then
 merge_flists gid_Module_Optional_Javafilter
$FILELISTSDIR/filters_list.txt
 merge_flists gid_Module_Optional_Pymailmerge   
$FILELISTSDIR/mailmerge_list.txt
 merge_flists gid_Module_Optional_Pyuno 
$FILELISTSDIR/pyuno_list.txt
+merge_flists gid_Module_Optional_Pyuno_LibreLogo   
$FILELISTSDIR/pyuno_list.txt
 merge_flists 
gid_Module_Optional_Extensions_Script_Provider_For_Python 
$FILELISTSDIR/pyuno_list.txt
 merge_flists gid_Module_Optional_Xsltfiltersamples 
$FILELISTSDIR/filters_list.txt
 fi
@@ -152,6 +154,7 @@ if test "z$OOO_VENDOR" != "zDebian" ; then
 merge_flists gid_Module_Optional_Javafilter
$FILELISTSDIR/common_list.txt
 merge_flists gid_Module_Optional_Pymailmerge   
$FILELISTSDIR/common_list.txt
 merge_flists gid_Module_Optional_Pyuno 
$FILELISTSDIR/common_list.txt
+merge_flists gid_Module_Optional_Pyuno_LibreLogo   
$FILELISTSDIR/common_list.txt
 merge_flists gid_Module_Optional_Extensions_Script_Provider_For_Python 
$FILELISTSDIR/common_list.txt
 merge_flists gid_Module_Optional_Xsltfiltersamples 
$FILELISTSDIR/common_list.txt
 fi
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] .: bin/distro-install-file-lists bin/repo-list

2012-12-18 Thread Libreoffice Gerrit user
 bin/distro-install-file-lists |3 +++
 bin/repo-list |1 +
 2 files changed, 4 insertions(+)

New commits:
commit c2537d7d1c291ba643953849cc230cd99fa9d608
Author: Tomas Chvatal 
Date:   Wed Dec 19 07:53:22 2012 +0100

Add py script provider to pyuno

Change-Id: Ib2791daa0e2c219aee089c4417289316bd0759c9

diff --git a/bin/distro-install-file-lists b/bin/distro-install-file-lists
index 9a9375d..442e404 100755
--- a/bin/distro-install-file-lists
+++ b/bin/distro-install-file-lists
@@ -135,6 +135,7 @@ if test "z$OOO_VENDOR" != "zDebian" ; then
 merge_flists gid_Module_Optional_Javafilter
$FILELISTSDIR/common_list.txt
 merge_flists gid_Module_Optional_Pymailmerge   
$FILELISTSDIR/pyuno_list.txt
 merge_flists gid_Module_Optional_Pyuno 
$FILELISTSDIR/pyuno_list.txt
+merge_flists 
gid_Module_Optional_Extensions_Script_Provider_For_Python 
$FILELISTSDIR/pyuno_list.txt
 merge_flists gid_Module_Optional_Xsltfiltersamples 
$FILELISTSDIR/common_list.txt
 else
 merge_flists gid_Module_Optional_Grfflt
$FILELISTSDIR/common_list.txt
@@ -142,6 +143,7 @@ if test "z$OOO_VENDOR" != "zDebian" ; then
 merge_flists gid_Module_Optional_Javafilter
$FILELISTSDIR/filters_list.txt
 merge_flists gid_Module_Optional_Pymailmerge   
$FILELISTSDIR/mailmerge_list.txt
 merge_flists gid_Module_Optional_Pyuno 
$FILELISTSDIR/pyuno_list.txt
+merge_flists 
gid_Module_Optional_Extensions_Script_Provider_For_Python 
$FILELISTSDIR/pyuno_list.txt
 merge_flists gid_Module_Optional_Xsltfiltersamples 
$FILELISTSDIR/filters_list.txt
 fi
 else
@@ -150,6 +152,7 @@ if test "z$OOO_VENDOR" != "zDebian" ; then
 merge_flists gid_Module_Optional_Javafilter
$FILELISTSDIR/common_list.txt
 merge_flists gid_Module_Optional_Pymailmerge   
$FILELISTSDIR/common_list.txt
 merge_flists gid_Module_Optional_Pyuno 
$FILELISTSDIR/common_list.txt
+merge_flists gid_Module_Optional_Extensions_Script_Provider_For_Python 
$FILELISTSDIR/common_list.txt
 merge_flists gid_Module_Optional_Xsltfiltersamples 
$FILELISTSDIR/common_list.txt
 fi
 
diff --git a/bin/repo-list b/bin/repo-list
new file mode 100644
index 000..8b13789
--- /dev/null
+++ b/bin/repo-list
@@ -0,0 +1 @@
+
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] .: bin/distro-install-file-lists

2012-11-12 Thread Libreoffice Gerrit user
 bin/distro-install-file-lists |6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

New commits:
commit 1cbfcdd9675e63a3ed385b4532d200b785099875
Author: Petr Mladek 
Date:   Mon Nov 12 10:41:13 2012 +0100

distro-install: correcly pack KDE and TDE addressbook (bnc#779697)

Change-Id: Ieb37b226dcccb36d1c0e55e95d99e90ff26d8a26

diff --git a/bin/distro-install-file-lists b/bin/distro-install-file-lists
index eca4d35..ce31590 100755
--- a/bin/distro-install-file-lists
+++ b/bin/distro-install-file-lists
@@ -215,7 +215,8 @@ if test "z$OOO_VENDOR" != "zDebian" ; then
 mv_file_between_flists tde_list.txt common_list.txt 
$INSTALLDIR/program/tdefilepicker
 mv_file_between_flists tde_list.txt common_list.txt 
$INSTALLDIR/program/fps_tde.uno.so
 mv_file_between_flists tde_list.txt common_list.txt 
$INSTALLDIR/program/libvclplug_tdel..so
-mv_file_between_flists tde_list.txt common_list.txt 
$INSTALLDIR/program/libtdeabdrv1.so
+mv_file_between_flists tde_list.txt common_list.txt 
$INSTALLDIR/program/libtdeab1l..so
+mv_file_between_flists tde_list.txt common_list.txt 
$INSTALLDIR/program/libtdeabdrv1l..so
 add_used_directories tde_list.txt common_list.txt
 
 # kde subpackage
@@ -223,7 +224,8 @@ if test "z$OOO_VENDOR" != "zDebian" ; then
 mv_file_between_flists kde_list.txt common_list.txt 
$INSTALLDIR/program/kdefilepicker
 mv_file_between_flists kde_list.txt common_list.txt 
$INSTALLDIR/program/fps_kde.uno.so
 mv_file_between_flists kde_list.txt common_list.txt 
$INSTALLDIR/program/libvclplug_kdel..so
-mv_file_between_flists kde_list.txt common_list.txt 
$INSTALLDIR/program/libkabdrv1.so
+mv_file_between_flists kde_list.txt common_list.txt 
$INSTALLDIR/program/libkab1l..so
+mv_file_between_flists kde_list.txt common_list.txt 
$INSTALLDIR/program/libkabdrv1l..so
 add_used_directories kde_list.txt common_list.txt
 
 # create kde4 subpackage
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] .: bin/distro-install-file-lists

2012-11-06 Thread Libreoffice Gerrit user
 bin/distro-install-file-lists |   12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

New commits:
commit 29decbdb14d5411d96bd0220f67d12ac94744b7c
Author: Petr Mladek 
Date:   Tue Nov 6 15:54:14 2012 +0100

SUSE builds use the vendow SUSE now :-)

Change-Id: I32ecaaea616a1c0ffa62f72a1f3fb3a14d5144c6

diff --git a/bin/distro-install-file-lists b/bin/distro-install-file-lists
index 8bae442..e1f9b6e 100755
--- a/bin/distro-install-file-lists
+++ b/bin/distro-install-file-lists
@@ -122,7 +122,7 @@ if test "z$OOO_VENDOR" != "zDebian" ; then
 merge_flists gid_Module_Optional_OGLTrans $FILELISTSDIR/common_list.txt
 fi
 
-if test "$SPLIT_APP_MODULES" = "YES" -a "$OOO_VENDOR" = "Novell, Inc." ; 
then
+if test "$SPLIT_APP_MODULES" = "YES" -a "$OOO_VENDOR" = "SUSE" ; then
 # move the prebuilt icons into a hacky temporary package
 # we want to repack them into a noarch package as soon as possible
 # without the build dependency on the huge devel package
@@ -164,7 +164,7 @@ if test "z$OOO_VENDOR" != "zDebian" ; then
 # lang packs
 for lang in `echo $WITH_LANG_LIST | sed -e s/-/_/g`; do
 lang_lists=
-if test "$OOO_VENDOR" = "Mandriva" -o \( "$OOO_VENDOR" = "Novell, 
Inc." -a "$SPLIT_APP_MODULES" = "YES" \) ; then
+if test "$OOO_VENDOR" = "Mandriva" -o \( "$OOO_VENDOR" = "SUSE" -a 
"$SPLIT_APP_MODULES" = "YES" \) ; then
 test -f gid_Module_Langpack_Basis_$lang && 
lang_lists="$lang_lists gid_Module_Langpack_Basis_$lang" || :
 test -f gid_Module_Langpack_Brand_$lang && 
lang_lists="$lang_lists gid_Module_Langpack_Brand_$lang" || :
 test -f gid_Module_Langpack_Resource_$lang  && 
lang_lists="$lang_lists gid_Module_Langpack_Resource_$lang" || :
@@ -197,7 +197,7 @@ if test "z$OOO_VENDOR" != "zDebian" ; then
 fi
 # some help files are in _Langpack_{Writer,Impress,...}_
 # move them from -l10n to -help
-if test "$OOO_VENDOR" = "Mandriva" -o \( "$OOO_VENDOR" = "Novell, 
Inc." -a "$SPLIT_APP_MODULES" = "YES" \) ; then
+if test "$OOO_VENDOR" = "Mandriva" -o \( "$OOO_VENDOR" = "SUSE" -a 
"$SPLIT_APP_MODULES" = "YES" \) ; then
 for lang in `echo $WITH_LANG_LIST | sed -e s/-/_/g`; do
 test -f $FILELISTSDIR/help_${lang}_list.txt || continue;
 mv_file_between_flists $FILELISTSDIR/help_${lang}_list.txt 
$FILELISTSDIR/lang_${lang}_list.txt $INSTALLDIR/help/.*
@@ -206,7 +206,7 @@ if test "z$OOO_VENDOR" != "zDebian" ; then
 fi
 done
 
-if test -f $FILELISTSDIR/lang_en_US_list.txt -a "$OOO_VENDOR" = "Novell, 
Inc." -a "$SPLIT_APP_MODULES" != "YES" ; then
+if test -f $FILELISTSDIR/lang_en_US_list.txt -a "$OOO_VENDOR" = "SUSE" -a 
"$SPLIT_APP_MODULES" != "YES" ; then
 cat $FILELISTSDIR/lang_en_US_list.txt >>$FILELISTSDIR/common_list.txt
 rm $FILELISTSDIR/lang_en_US_list.txt
 fi
@@ -272,7 +272,7 @@ if test "z$OOO_VENDOR" != "zDebian" ; then
 add_used_directories $flist common_list.txt
 fi
 
-if test "z$OOO_VENDOR" = "zNovell, Inc." ; then
+if test "z$OOO_VENDOR" = "zSUSE" ; then
 # officebean subpackage
 test -f 
$DESTDIR/gid_Module_Optional_Extensions_Script_Provider_For_Beanshell && cp 
$DESTDIR/gid_Module_Optional_Extensions_Script_Provider_For_Beanshell 
officebean_list.txt || :
 mv_file_between_flists officebean_list.txt common_list.txt 
$INSTALLDIR/program/classes/officebean.jar
@@ -541,7 +541,7 @@ fi
 
 # mark the config files
 RPM_CONFIG_FILE_TAGS=
-if test "$OOO_VENDOR" = "Novell, Inc." -o "$OOO_VENDOR" = "RedHat"; then
+if test "$OOO_VENDOR" = "SUSE" -o "$OOO_VENDOR" = "RedHat"; then
 RPM_CONFIG_FILE_TAGS="%config"
 elif test "$OOO_VENDOR" = "PLD" ; then
 RPM_CONFIG_FILE_TAGS="%config(noreplace) %verify(not md5 size mtime)"
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] .: bin/distro-install-file-lists

2012-05-02 Thread Petr Mladek
 bin/distro-install-file-lists |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 78a7968cad096dd5a763bbfbe8b85360dd882cd9
Author: Petr Mladek 
Date:   Tue Sep 6 10:33:08 2011 +0200

really put SDK documentation into the doc subpackage

diff --git a/bin/distro-install-file-lists b/bin/distro-install-file-lists
index 014769c..c36b67c 100755
--- a/bin/distro-install-file-lists
+++ b/bin/distro-install-file-lists
@@ -274,10 +274,10 @@ if test "z$OOO_VENDOR" != "zDebian" ; then
 
 if test -f sdk_list.txt ; then
 # in this case we move all entries including directories
-mv_file_between_flists sdk_doc_list.txt sdk_list.txt "%dir 
$DOCDIRBASE/sdk/docs.*"
-mv_file_between_flists sdk_doc_list.txt sdk_list.txt 
"$DOCDIRBASE/sdk/docs.*"
-mv_file_between_flists sdk_doc_list.txt sdk_list.txt 
"$DOCDIRBASE/sdk/examples"
-mv_file_between_flists sdk_doc_list.txt sdk_list.txt 
"$DOCDIRBASE/sdk/index.html"
+mv_file_between_flists sdk_doc_list.txt sdk_list.txt "%dir 
$DOCDIR/sdk/docs.*"
+mv_file_between_flists sdk_doc_list.txt sdk_list.txt 
"$DOCDIR/sdk/docs.*"
+mv_file_between_flists sdk_doc_list.txt sdk_list.txt 
"$DOCDIR/sdk/examples"
+mv_file_between_flists sdk_doc_list.txt sdk_list.txt 
"$DOCDIR/sdk/index.html"
 mv_file_between_flists sdk_doc_list.txt sdk_list.txt "%dir 
$INSTALLDIR/sdk/examples.*"
 mv_file_between_flists sdk_doc_list.txt sdk_list.txt 
"$INSTALLDIR/sdk/docs"
 mv_file_between_flists sdk_doc_list.txt sdk_list.txt 
"$INSTALLDIR/sdk/examples.*"
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits