November 2010 - openSUSE Commits - openSUSE Mailing Lists

commit libreoffice-libs-gui for openSUSE:Factory
by root＠hilbert.suse.de 22 Nov '10

22 Nov '10

Hello community, here is the log from the commit of package libreoffice-libs-gui for openSUSE:Factory checked in at Mon Nov 22 14:39:21 CET 2010. -------- --- libreoffice-libs-gui/libreoffice-libs-gui.changes 2010-10-14 20:18:30.000000000 +0200 +++ libreoffice-libs-gui/libreoffice-libs-gui.changes 2010-11-16 17:28:10.000000000 +0100 @@ -1,0 +2,12 @@ +Mon Nov 15 16:16:32 CET 2010 - pmladek(a)suse.cz + +- disabled KDE3 stuff on openSUSE >= 11.2 (bnc#605472, bnc#621472) +- added gcc-c++ and libxml2-devel into BuildRequires; were required + by kdelibs3-devel before + +------------------------------------------------------------------- +Fri Nov 12 12:24:42 CET 2010 - pmladek(a)suse.cz + +- updated to libreoffice-3.2.99.3 (3.3-beta3) + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- libreoffice-l10n-3.2.99.2.tar.bz2 libreoffice-libs-gui-3.2.99.2.tar.bz2 New: ---- libreoffice-l10n-3.2.99.3.tar.bz2 libreoffice-libs-gui-3.2.99.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libreoffice-libs-gui.spec ++++++ --- /var/tmp/diff_new_pack.7gQtqW/_old 2010-11-22 14:38:32.000000000 +0100 +++ /var/tmp/diff_new_pack.7gQtqW/_new 2010-11-22 14:38:32.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package libreoffice-libs-gui (Version 3.2.99.2) +# spec file for package libreoffice-libs-gui (Version 3.2.99.3) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -20,11 +20,11 @@ %define distro SUSE Name: libreoffice-libs-gui -Version: 3.2.99.2 +Version: 3.2.99.3 Release: 1 %define piece libs-gui -%define ooo_build_version 3.2.99.2 -%define ooo_piece_version 3.2.99.2 +%define ooo_build_version 3.2.99.3 +%define ooo_piece_version 3.2.99.3 %define ooo_sourcedirname libreoffice-build-%ooo_piece_version %define ooo_prefix %_libdir %define ooo_home libreoffice @@ -32,11 +32,11 @@ BuildRequires: libreoffice-artwork-devel = %version BuildRequires: libreoffice-bootstrap = %version BuildRequires: libreoffice-libs-extern-devel = %version -BuildRequires: ImageMagick ant ant-apache-regexp bison boost-devel ccache cups-devel curl-devel flac-devel flex gnome-vfs2-devel gperf gtk2-devel icu java-devel libexif mono-devel neon-devel pam-devel perl-Archive-Zip perl-Compress-Zlib python-devel recode unixODBC-devel unzip xml-commons-apis zip +BuildRequires: ImageMagick ant ant-apache-regexp bison boost-devel ccache cups-devel curl-devel flac-devel flex gcc-c++ gnome-vfs2-devel gperf gtk2-devel icu java-devel libexif libxml2-devel mono-devel neon-devel pam-devel perl-Archive-Zip perl-Compress-Zlib python-devel recode unixODBC-devel unzip xml-commons-apis zip ############################ # basic stuff %if 0%{?suse_version} -BuildRequires: db-devel kdelibs3-devel krb5 openldap2-devel xorg-x11 +BuildRequires: db-devel krb5 openldap2-devel xorg-x11 %endif %if 0%{?meego_version} BuildRequires: db4-devel krb5-devel openldap-devel @@ -47,6 +47,11 @@ BuildRequires: libjpeg-devel libxslt-devel openssl-devel pkgconfig(gl) pkgconfig(glu) pkgconfig(xau) pkgconfig(xaw7) %endif ############################ +# KDE3 stuff +%if 0%{?suse_version} && 0%{?suse_version} <= 1110 +BuildRequires: kdelibs3-devel +%endif +############################ # cppunit stuff %if 0%{?suse_version} >= 01100 BuildRequires: libcppunit-devel ++++++ libreoffice-l10n-3.2.99.2.tar.bz2 -> libreoffice-l10n-3.2.99.3.tar.bz2 ++++++ libreoffice-libs-gui/libreoffice-l10n-3.2.99.2.tar.bz2 libreoffice-libs-gui/libreoffice-l10n-3.2.99.3.tar.bz2 differ: char 11, line 1 ++++++ libreoffice-libs-gui-3.2.99.2.tar.bz2 -> libreoffice-libs-gui-3.2.99.3.tar.bz2 ++++++ libreoffice-libs-gui/libreoffice-libs-gui-3.2.99.2.tar.bz2 libreoffice-libs-gui/libreoffice-libs-gui-3.2.99.3.tar.bz2 differ: char 11, line 1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libreoffice-testing for openSUSE:Factory
by root＠hilbert.suse.de 22 Nov '10

22 Nov '10

Hello community, here is the log from the commit of package libreoffice-testing for openSUSE:Factory checked in at Mon Nov 22 14:38:18 CET 2010. -------- --- libreoffice-testing/libreoffice-testing.changes 2010-10-14 20:18:33.000000000 +0200 +++ libreoffice-testing/libreoffice-testing.changes 2010-11-12 14:41:47.000000000 +0100 @@ -1,0 +2,5 @@ +Fri Nov 12 12:24:42 CET 2010 - pmladek(a)suse.cz + +- updated to libreoffice-3.2.99.3 (3.3-beta3) + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- libreoffice-testing-3.2.99.2.tar.bz2 New: ---- libreoffice-testing-3.2.99.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libreoffice-testing.spec ++++++ --- /var/tmp/diff_new_pack.Ecpgk1/_old 2010-11-22 14:37:31.000000000 +0100 +++ /var/tmp/diff_new_pack.Ecpgk1/_new 2010-11-22 14:37:31.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package libreoffice-testing (Version 3.2.99.2) +# spec file for package libreoffice-testing (Version 3.2.99.3) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,11 +19,11 @@ Name: libreoffice-testing -Version: 3.2.99.2 +Version: 3.2.99.3 Release: 1 %define piece testing -%define ooo_build_version 3.2.99.2 -%define ooo_piece_version 3.2.99.2 +%define ooo_build_version 3.2.99.3 +%define ooo_piece_version 3.2.99.3 %define ooo_sourcedirname libreoffice-build-%ooo_piece_version %define ooo_prefix %_libdir %define ooo_home libreoffice ++++++ libreoffice-testing-3.2.99.2.tar.bz2 -> libreoffice-testing-3.2.99.3.tar.bz2 ++++++ libreoffice-testing/libreoffice-testing-3.2.99.2.tar.bz2 libreoffice-testing/libreoffice-testing-3.2.99.3.tar.bz2 differ: char 11, line 1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libreoffice-libs-extern for openSUSE:Factory
by root＠hilbert.suse.de 22 Nov '10

22 Nov '10

Hello community, here is the log from the commit of package libreoffice-libs-extern for openSUSE:Factory checked in at Mon Nov 22 14:37:18 CET 2010. -------- --- libreoffice-libs-extern/libreoffice-libs-extern.changes 2010-10-14 20:18:27.000000000 +0200 +++ libreoffice-libs-extern/libreoffice-libs-extern.changes 2010-11-16 17:27:58.000000000 +0100 @@ -1,0 +2,12 @@ +Mon Nov 15 16:16:32 CET 2010 - pmladek(a)suse.cz + +- disabled KDE3 stuff on openSUSE >= 11.2 (bnc#605472, bnc#621472) +- added gcc-c++ and libxml2-devel into BuildRequires; were required + by kdelibs3-devel before + +------------------------------------------------------------------- +Fri Nov 12 12:24:42 CET 2010 - pmladek(a)suse.cz + +- updated to libreoffice-3.2.99.3 (3.3-beta3) + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- libreoffice-libs-extern-3.2.99.2.tar.bz2 libreoffice-libs-extern-sys-3.2.99.2.tar.bz2 New: ---- libreoffice-libs-extern-3.2.99.3.tar.bz2 libreoffice-libs-extern-sys-3.2.99.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libreoffice-libs-extern.spec ++++++ --- /var/tmp/diff_new_pack.XVcfGS/_old 2010-11-22 14:29:38.000000000 +0100 +++ /var/tmp/diff_new_pack.XVcfGS/_new 2010-11-22 14:29:38.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package libreoffice-libs-extern (Version 3.2.99.2) +# spec file for package libreoffice-libs-extern (Version 3.2.99.3) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -21,19 +21,19 @@ Name: libreoffice-libs-extern # allow to use xulrunner191 on SLED11-SP1 (bnc#540726) %define use_xulrunner191 no -Version: 3.2.99.2 +Version: 3.2.99.3 Release: 1 %define piece libs-extern -%define ooo_build_version 3.2.99.2 -%define ooo_piece_version 3.2.99.2 +%define ooo_build_version 3.2.99.3 +%define ooo_piece_version 3.2.99.3 %define ooo_sourcedirname libreoffice-build-%ooo_piece_version %define ooo_prefix %_libdir %define ooo_home libreoffice #!BuildIgnore: libreoffice # urg, ure dep is now required for cppunit ... -BuildRequires: ImageMagick ant ant-apache-regexp bison boost-devel ccache cups-devel curl-devel flac-devel flex gnome-vfs2-devel gperf gtk2-devel icu java-devel mono-devel neon-devel pam-devel perl-Archive-Zip perl-Compress-Zlib python-devel recode unixODBC-devel unzip xml-commons-apis zip +BuildRequires: ImageMagick ant ant-apache-regexp bison boost-devel ccache cups-devel curl-devel flac-devel flex gcc-c++ gnome-vfs2-devel gperf gtk2-devel icu java-devel libxml2-devel mono-devel neon-devel pam-devel perl-Archive-Zip perl-Compress-Zlib python-devel recode unixODBC-devel unzip xml-commons-apis zip %if 0%{?suse_version} -BuildRequires: db-devel kdelibs3-devel krb5 libexif openldap2-devel xorg-x11 +BuildRequires: db-devel krb5 libexif openldap2-devel xorg-x11 %endif %if 0%{?meego_version} BuildRequires: db4-devel krb5-devel libexif-devel openldap-devel @@ -43,7 +43,11 @@ %endif BuildRequires: libreoffice-bootstrap = %version BuildRequires: libreoffice-ure-devel = %version - +############################ +# KDE3 stuff +%if 0%{?suse_version} && 0%{?suse_version} <= 1110 +BuildRequires: kdelibs3-devel +%endif ############################ # mysql stuff %if 0%{?suse_version} && 0%{?suse_version} <= 01210 ++++++ libreoffice-libs-extern-3.2.99.2.tar.bz2 -> libreoffice-libs-extern-3.2.99.3.tar.bz2 ++++++ ++++ 54266 lines of diff (skipped) ++++++ libreoffice-libs-extern-sys-3.2.99.2.tar.bz2 -> libreoffice-libs-extern-sys-3.2.99.3.tar.bz2 ++++++ libreoffice-libs-extern/libreoffice-libs-extern-sys-3.2.99.2.tar.bz2 libreoffice-libs-extern/libreoffice-libs-extern-sys-3.2.99.3.tar.bz2 differ: char 11, line 1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libreoffice-artwork for openSUSE:Factory
by root＠hilbert.suse.de 22 Nov '10

22 Nov '10

Hello community, here is the log from the commit of package libreoffice-artwork for openSUSE:Factory checked in at Mon Nov 22 14:29:25 CET 2010. -------- --- libreoffice-artwork/libreoffice-artwork.changes 2010-10-14 20:17:46.000000000 +0200 +++ libreoffice-artwork/libreoffice-artwork.changes 2010-11-15 17:37:19.000000000 +0100 @@ -1,0 +2,10 @@ +Mon Nov 15 16:16:32 CET 2010 - pmladek(a)suse.cz + +- disabled KDE3 stuff on openSUSE >= 11.2 (bnc#605472, bnc#621472) + +------------------------------------------------------------------- +Fri Nov 12 12:24:42 CET 2010 - pmladek(a)suse.cz + +- updated to libreoffice-3.2.99.3 (3.3-beta3) + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- libreoffice-artwork-3.2.99.2.tar.bz2 New: ---- libreoffice-artwork-3.2.99.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libreoffice-artwork.spec ++++++ --- /var/tmp/diff_new_pack.lKkh8h/_old 2010-11-22 14:28:32.000000000 +0100 +++ /var/tmp/diff_new_pack.lKkh8h/_new 2010-11-22 14:28:32.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package libreoffice-artwork (Version 3.2.99.2) +# spec file for package libreoffice-artwork (Version 3.2.99.3) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,11 +19,11 @@ Name: libreoffice-artwork -Version: 3.2.99.2 +Version: 3.2.99.3 Release: 1 %define piece artwork -%define ooo_build_version 3.2.99.2 -%define ooo_piece_version 3.2.99.2 +%define ooo_build_version 3.2.99.3 +%define ooo_piece_version 3.2.99.3 %define ooo_sourcedirname libreoffice-build-%ooo_piece_version %define ooo_prefix %_libdir %define ooo_home libreoffice @@ -31,7 +31,7 @@ BuildRequires: libreoffice-bootstrap = %version BuildRequires: ImageMagick ant ant-apache-regexp bison boost-devel ccache cups-devel curl-devel flac-devel flex gnome-vfs2-devel gperf gtk2-devel icu java-devel mono-devel neon-devel pam-devel perl-Archive-Zip perl-Compress-Zlib python-devel recode unixODBC-devel unzip xml-commons-apis zip %if 0%{?suse_version} -BuildRequires: db-devel kdelibs3-devel krb5 libexif openldap2-devel xorg-x11 +BuildRequires: db-devel krb5 libexif openldap2-devel xorg-x11 %endif %if 0%{?meego_version} BuildRequires: db4-devel krb5-devel libexif-devel openldap-devel @@ -39,6 +39,11 @@ BuildRequires: xorg-x11-proto-xproto BuildRequires: xorg-x11-utils %endif +############################ +# KDE3 stuff +%if 0%{?suse_version} && 0%{?suse_version} <= 1110 +BuildRequires: kdelibs3-devel +%endif License: Artistic ; BSD3c ; GPLv2+ ; LPPL .. ; LGPLv2.1+ ; LGPLv3 ; MPL .. ; MIT Group: Productivity/Office/Suite AutoReqProv: on ++++++ libreoffice-artwork-3.2.99.2.tar.bz2 -> libreoffice-artwork-3.2.99.3.tar.bz2 ++++++ libreoffice-artwork/libreoffice-artwork-3.2.99.2.tar.bz2 libreoffice-artwork/libreoffice-artwork-3.2.99.3.tar.bz2 differ: char 11, line 1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libreoffice-ure for openSUSE:Factory
by root＠hilbert.suse.de 22 Nov '10

22 Nov '10

Hello community, here is the log from the commit of package libreoffice-ure for openSUSE:Factory checked in at Mon Nov 22 14:28:15 CET 2010. -------- --- libreoffice-ure/libreoffice-ure.changes 2010-10-14 20:18:36.000000000 +0200 +++ libreoffice-ure/libreoffice-ure.changes 2010-11-18 19:44:50.000000000 +0100 @@ -1,0 +2,17 @@ +Thu Nov 18 14:19:15 CET 2010 - pmladek(a)suse.cz + +- temporary disabled mono stuff in Factory; could not be built (bnc#653662) + +------------------------------------------------------------------- +Mon Nov 15 16:16:32 CET 2010 - pmladek(a)suse.cz + +- disabled KDE3 stuff on openSUSE >= 11.2 (bnc#605472, bnc#621472) +- added gcc-c++ and libxml2-devel into BuildRequires; were required + by kdelibs3-devel before + +------------------------------------------------------------------- +Fri Nov 12 12:24:42 CET 2010 - pmladek(a)suse.cz + +- updated to libreoffice-3.2.99.3 (3.3-beta3) + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- libreoffice-sdk-3.2.99.2.tar.bz2 libreoffice-ure-3.2.99.2.tar.bz2 New: ---- libreoffice-sdk-3.2.99.3.tar.bz2 libreoffice-ure-3.2.99.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libreoffice-ure.spec ++++++ --- /var/tmp/diff_new_pack.l6gxwE/_old 2010-11-22 14:24:28.000000000 +0100 +++ /var/tmp/diff_new_pack.l6gxwE/_new 2010-11-22 14:24:28.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package libreoffice-ure (Version 3.2.99.2) +# spec file for package libreoffice-ure (Version 3.2.99.3) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,20 +19,20 @@ Name: libreoffice-ure -Version: 3.2.99.2 +Version: 3.2.99.3 Release: 1 %define piece ure -%define ooo_build_version 3.2.99.2 -%define ooo_piece_version 3.2.99.2 +%define ooo_build_version 3.2.99.3 +%define ooo_piece_version 3.2.99.3 %define ooo_sourcedirname libreoffice-build-%ooo_build_version %define ooo_prefix %_libdir %define ooo_home libreoffice %define ooo_basis_dir basis3.3 #!BuildIgnore: libreoffice BuildRequires: libreoffice-bootstrap = %version -BuildRequires: ImageMagick ant ant-apache-regexp bison boost-devel ccache cups-devel curl-devel flac-devel flex gnome-vfs2-devel gperf gtk2-devel icu java-devel mono-devel neon-devel pam-devel perl-Archive-Zip perl-Compress-Zlib python-devel recode unixODBC-devel unzip xml-commons-apis zip +BuildRequires: ImageMagick ant ant-apache-regexp bison boost-devel ccache cups-devel curl-devel flac-devel flex gcc-c++ gnome-vfs2-devel gperf gtk2-devel icu java-devel libxml2-devel mono-devel neon-devel pam-devel perl-Archive-Zip perl-Compress-Zlib python-devel recode unixODBC-devel unzip xml-commons-apis zip %if 0%{?suse_version} -BuildRequires: db-devel kdelibs3-devel krb5 libexif openldap2-devel xorg-x11 +BuildRequires: db-devel krb5 libexif openldap2-devel xorg-x11 %endif %if 0%{?meego_version} BuildRequires: db4-devel krb5-devel libexif-devel openldap-devel @@ -41,6 +41,11 @@ BuildRequires: xorg-x11-utils %endif ############################ +# KDE3 stuff +%if 0%{?suse_version} && 0%{?suse_version} <= 1110 +BuildRequires: kdelibs3-devel +%endif +############################ # cppunit stuff %if 0%{?suse_version} >= 01100 BuildRequires: libcppunit-devel @@ -77,6 +82,8 @@ +%if 0%{?suse_version} <= 01130 + %package -n libreoffice-mono License: LGPLv3 Summary: Mono UNO Bridge for OpenOffice.org @@ -95,8 +102,7 @@ Currently the use of Mono for add-ins & scripting inside OO.o itself is not supported. - - +%endif %package -n libreoffice-pyuno License: LGPLv3 @@ -124,7 +130,9 @@ %package devel Requires: %name = %version +%if 0%{?suse_version} <= 01130 Requires: libreoffice-mono = %version +%endif Requires: libreoffice-pyuno = %version Requires: libreoffice-bootstrap = %version # compat stuff @@ -304,8 +312,11 @@ %ooo_prefix/%ooo_home/ure/bin/create-libstlport-compat-links %endif +%if 0%{?suse_version} <= 01130 + %files -f files-mono.txt -n libreoffice-mono %defattr(-,root,root) +%endif %files -f files-pyuno.txt -n libreoffice-pyuno %defattr(-,root,root) ++++++ libreoffice-sdk-3.2.99.2.tar.bz2 -> libreoffice-sdk-3.2.99.3.tar.bz2 ++++++ ++++ 11519 lines of diff (skipped) ++++++ libreoffice-ure-3.2.99.2.tar.bz2 -> libreoffice-ure-3.2.99.3.tar.bz2 ++++++ ++++ 46975 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libreoffice-bootstrap for openSUSE:Factory
by root＠hilbert.suse.de 22 Nov '10

22 Nov '10

Hello community, here is the log from the commit of package libreoffice-bootstrap for openSUSE:Factory checked in at Mon Nov 22 14:24:05 CET 2010. -------- --- libreoffice-bootstrap/libreoffice-bootstrap.changes 2010-10-14 20:21:45.000000000 +0200 +++ libreoffice-bootstrap/libreoffice-bootstrap.changes 2010-11-20 17:34:04.000000000 +0100 @@ -1,0 +2,92 @@ +Fri Nov 19 21:04:00 CET 2010 - pmladek(a)suse.cz + +- did not remove prebuilt localized registry files in postprocess (bnc#651964) + +------------------------------------------------------------------- +Thu Nov 18 14:19:15 CET 2010 - pmladek(a)suse.cz + +- temporary disabled mono stuff in Factory; could not be built (bnc#653662) + +------------------------------------------------------------------- +Mon Nov 15 16:16:32 CET 2010 - pmladek(a)suse.cz + +- disabled KDE3 stuff on openSUSE >= 11.2 (bnc#605472, bnc#621472) +- added gcc-c++ and libxml2-devel into BuildRequires; were required + by kdelibs3-devel before + +------------------------------------------------------------------- +Fri Nov 12 12:24:42 CET 2010 - pmladek(a)suse.cz + +- updated to libreoffice-3.2.99.3 (3.3-beta3): + * ooo integration: + * Merge commit 'ooo/OOO330_m13' + * common: + * impress ruler behaviour + * add Title Page dialog (i#7065) + * save 1MB on wizards per language + * images optimized for smaller size + * do not insert a new cell beyond the end + * handle multiple selection for printing (i#115266) + * remove VBAForm property and associated geometry hack (fdo#30856) + * base: + * key columns in all tables (i#114026) + * reports executed for data display (i#114627) + * calc: + * non-functional select + * defined names in Calc functions (i#79854) + * use Ctrl-Shift-D to launch selection list + * regression for range array input, e.g. {=A1:A5} + * crash on importing docs with database functions + * crash on importing named ranges on higher sheets + * remove the "insert new sheet" tab in read-only mode + * incorrect display of references from the formula input wizard + * new tab page 'Compatibility' in the Options dialog (fdo#30559) + * components: + * default to evolution + * crash in scanner dialog (rh#648475) + * extras: + * added LibreOffice and Tango palettes + * filters: + * crash on unsupported .tiffs (i#93300) + * vertical text alignment and placeholder style (bnc#645116) + * impress: + * broken zoom behaviour + * crash in OGL transitions + * support for PPT newsflash slide transition + * libs-core: + * register EVO address book + * more quickstarter fixes (i#108846) + * missing media-type for ODF thumbnails + * add credits hyperlink into about dialog + * freeze when adding an extension (i#114933) + * -quickstart option, and help fix (i#108846) + * GNOME filepicker filter selection (i#112411) + * use "Enter Password" in all dialogs (fdo#31075) + * add display properties to control shapes (i#112597) + * disable user migration when SAL_DISABLE_USERMIGRATION is set + * libs-gui: + * disable KDE's crash handler + * refresh of OLE object previews + * adding font aliases (i#114706) + * comparison of key events for IM + * show Java error just once by default + * underlining problem with Graphite fonts (i#114765) + * saving tempfiles when locking is not supported. + * better selection of localized font names (i#114703) + * MetricFields SetUnit conversions (fdo#30899, bnc#610921) + * make Presenter Screen default to the projector (i#112421) + * Qt event loop integration (when Glib is used) for KDE4 vclplug + * writer: + * title pages (i#i66619) + * more RTF import/export fixes + * tables in page styles (i#114366) + * round-trip of DOC unhandled fields + * double-click behavior on enhanced fields + * leaky pStream after RTF import (fdo#31362) + * crash when choosing starmath from start screen + * OLE Links round-trip fixed for links as pictures + * setup XML namespaces also for footers and headers (bnc#581954) +- updated setup_native_packinfo to version 3.2.99.3 +- used --without-download option to avoid build dependency on wget + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- libreoffice-bootstrap-3.2.99.2.tar.bz2 libreoffice-build-3.2.99.1f-boost.a4.diff libreoffice-build-3.2.99.1f-bootstrap.diff libreoffice-build-3.2.99.2-scp2-user-config-ooo3.diff libreoffice-build-3.2.99.2.tar.gz setup_native_packinfo-ooo320-m17.tar.bz2 New: ---- libreoffice-bootstrap-3.2.99.3.tar.bz2 libreoffice-build-3.2.99.3-disable-download.diff libreoffice-build-3.2.99.3-l10n.diff libreoffice-build-3.2.99.3.tar.gz setup_native_packinfo-3.2.99.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libreoffice-bootstrap.spec ++++++ --- /var/tmp/diff_new_pack.ru8xKo/_old 2010-11-22 14:19:10.000000000 +0100 +++ /var/tmp/diff_new_pack.ru8xKo/_new 2010-11-22 14:19:10.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package libreoffice-bootstrap (Version 3.2.99.2) +# spec file for package libreoffice-bootstrap (Version 3.2.99.3) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -21,11 +21,11 @@ Name: libreoffice-bootstrap # allow to use xulrunner191 on SLED11-SP1 (bnc#540726) %define use_xulrunner191 no -BuildRequires: ImageMagick ant ant-apache-regexp bison boost-devel ccache cups-devel curl-devel flac-devel flex gnome-vfs2-devel gperf gtk2-devel icu java-devel libexif mono-devel neon-devel pam-devel patch perl-Archive-Zip perl-Compress-Zlib postgresql-devel python-devel recode unixODBC-devel unzip xml-commons-apis zip +BuildRequires: ImageMagick ant ant-apache-regexp bison boost-devel ccache cups-devel curl-devel flac-devel flex gcc-c++ gnome-vfs2-devel gperf gtk2-devel icu java-devel libexif libxml2-devel mono-devel neon-devel pam-devel patch perl-Archive-Zip perl-Compress-Zlib postgresql-devel python-devel recode unixODBC-devel unzip xml-commons-apis zip ############################ # basic stuff %if 0%{?suse_version} -BuildRequires: db-devel kdelibs3-devel krb5 openldap2-devel python-xml xorg-x11 +BuildRequires: db-devel krb5 openldap2-devel python-xml xorg-x11 %endif %if 0%{?meego_version} BuildRequires: db4-devel krb5-devel openldap-devel @@ -36,6 +36,11 @@ BuildRequires: db4-devel krb5-devel openldap-devel %endif ############################ +# KDE3 stuff +%if 0%{?suse_version} && 0%{?suse_version} <= 1110 +BuildRequires: kdelibs3-devel +%endif +############################ # cppunit stuff %if 0%{?suse_version} >= 01100 BuildRequires: libcppunit-devel @@ -177,8 +182,8 @@ # we would like to support also a non-conflicting OOo2 package %define ooo_bin_suffix no # -%define ooo_build_version 3.2.99.2 -%define ooo_piece_version 3.2.99.2 +%define ooo_build_version 3.2.99.3 +%define ooo_piece_version 3.2.99.3 %define ooo_build_dir build %define ooo_sourcedirname libreoffice-%ooo_piece_version %define ooo_prefix %_libdir @@ -186,7 +191,7 @@ %define ooo_basis_dir basis3.3 License: Artistic ; BSD3c ; GPLv2+ ; LPPL .. ; LGPLv2.1+ ; LGPLv3 ; MPL .. ; MIT Group: Productivity/Office/Suite -Version: 3.2.99.2 +Version: 3.2.99.3 Release: 1 AutoReqProv: on # we use the tool "free" to detect the available memory and reduce the parallelism is needed @@ -200,7 +205,7 @@ Source0: libreoffice-build-%ooo_build_version.tar.gz Source1: libreoffice-bootstrap-%ooo_piece_version.tar.bz2 # hacked soures from setup_native -Source30: setup_native_packinfo-ooo320-m17.tar.bz2 +Source30: setup_native_packinfo-3.2.99.3.tar.bz2 # Hmm, rpmlint complains about devel files in non-devel package # We would like to keep the -bootstrap package name # So we need to disable these rpmlint checks @@ -211,9 +216,8 @@ # patches against libreoffice-build # Patch0: libreoffice-build-3.3.0.1-enable-foo.diff # example Patch0: libreoffice-build-3.2.99.2-extensions-hack.diff -Patch1: libreoffice-build-3.2.99.1f-boost.a4.diff -Patch2: libreoffice-build-3.2.99.1f-bootstrap.diff -Patch3: libreoffice-build-3.2.99.2-scp2-user-config-ooo3.diff +Patch1: libreoffice-build-3.2.99.3-disable-download.diff +Patch2: libreoffice-build-3.2.99.3-l10n.diff # allow to use xulrunner191 on SLED11-SP1 (bnc#540726) Patch500: ooo-build-3.1.99.2-xulrunner-1.9.1.diff # FIXME: fix the python UNO components registration on SLED10 @@ -246,17 +250,13 @@ # # apply patches against libreoffice-build # %patch0 # example -# +%patch0 +%patch1 +%patch2 install -m 644 %{S:1} %{S:30} src/ %if 0%{?suse_version} == 01010 install -m 644 %{S:150} src/ %endif -# apply patches against libreoffice-build -# %patch0 # example -%patch0 -%patch1 -%patch2 -%patch3 %if %use_xulrunner191 == yes # allow to use xulrunner191 on SLED11-SP1 (bnc#540726) %patch500 @@ -341,6 +341,7 @@ %endif --with-source-version=%ooo_piece_version \ --without-git \ + --without-download \ --with-lang=%ooo_langs \ --with-poor-help-localizations=%ooo_poor_help_localizations \ --with-mono-gac-root=%{_prefix}/lib \ @@ -369,8 +370,13 @@ %if 0%{?meego_version} --with-system-icu \ --disable-kde4 \ +%endif +%if 0%{?meego_version} || %suse_version > 1110 --disable-kde \ %endif +%if 0%{?suse_version} > 01130 + --disable-mono \ +%endif %if %suse_version <= 1110 --without-junit \ %endif ++++++ libreoffice-bootstrap-3.2.99.2.tar.bz2 -> libreoffice-bootstrap-3.2.99.3.tar.bz2 ++++++ ++++ 44866 lines of diff (skipped) ++++++ libreoffice-build-3.2.99.3-disable-download.diff ++++++ --- configure.in +++ configure.in @@ -429,6 +429,13 @@ tarball or so.], ,with_split=yes) +AC_ARG_WITH(download, +[ + --without-download Do not check for wget or curl. It is useful to + reduce package build requires. All files must be + in the package sources out of box.], +,) + AC_ARG_WITH(srcdir, [ --with-srcdir Define the directory where to download the source @@ -619,10 +626,17 @@ PIECE=$with_piece AC_SUBST(PIECE) -# FIXME: We currently do not support starting build with already unpackaged -# sources, so the following warning is always printed -warn_use_download=" ./download +AC_MSG_CHECKING( for explicitely disabled download ) +if test "z$with_download" = "zno"; then + ENABLE_DOWNLOAD=no + AC_MSG_RESULT([yes]) +else + ENABLE_DOWNLOAD=yes + warn_use_download=" ./download " + AC_MSG_RESULT([no]) +fi + AC_MSG_CHECKING( for directory where to download sources ) if test "z$with_srcdir" = "z"; then SRCDIR=$BASEDIR/src @@ -1111,9 +1124,11 @@ AC_MSG_RESULT([$GNUTAR]) AC_SUBST(GNUTAR) -AC_PATH_PROGS(GET_CMD, [wget curl]) -if test -z "$GET_CMD" ; then - AC_MSG_ERROR([Neither "wget" nor "curl" found, but needed for download]) +if test "z$ENABLE_DOWNLOAD" = "zyes" ; then + AC_PATH_PROGS(GET_CMD, [wget curl]) + if test -z "$GET_CMD" ; then + AC_MSG_ERROR([Neither "wget" nor "curl" found, but needed for download]) + fi fi AC_MSG_CHECKING([for favourite drink]) ++++++ libreoffice-build-3.2.99.3-l10n.diff ++++++ --- bin/piece/post-inst-postprocess +++ bin/piece/post-inst-postprocess @@ -61,5 +61,5 @@ remove_file "files-$piece.txt" "$OO_INSTDIR/basis-link" remove_file "files-$piece.txt" "$OO_INSTDIR/basis$VERSION/ure-link" -# no need for solver bits at this late stage -rm -Rf "$DESTDIR/$OO_INSTDIR/solver" +# we need just the prebuilt l10n stuff in solver at this stage +find "$DESTDIR/$OO_INSTDIR/solver" -mindepth 1 -maxdepth 1 -path "$DESTDIR/$OO_INSTDIR/solver/noarch" -prune -o -exec rm -rf {} \; ++++++ libreoffice-build-3.2.99.2.tar.gz -> libreoffice-build-3.2.99.3.tar.gz ++++++ libreoffice-bootstrap/libreoffice-build-3.2.99.2.tar.gz libreoffice-bootstrap/libreoffice-build-3.2.99.3.tar.gz differ: char 5, line 1 ++++++ setup_native_packinfo-ooo320-m17.tar.bz2 -> setup_native_packinfo-3.2.99.3.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setup_native/source/packinfo/linuxcopyrightfile new/setup_native/source/packinfo/linuxcopyrightfile --- old/setup_native/source/packinfo/linuxcopyrightfile 2010-04-30 19:32:01.000000000 +0200 +++ new/setup_native/source/packinfo/linuxcopyrightfile 1970-01-01 01:00:00.000000000 +0100 @@ -1,2 +0,0 @@ -Copyright 2000, 2010 Oracle and/or its affiliates. All rights reserved. -Use is subject to license terms. Files old/setup_native/source/packinfo/openoffice.pcp and new/setup_native/source/packinfo/openoffice.pcp differ Files old/setup_native/source/packinfo/openofficelanguagepack.pcp and new/setup_native/source/packinfo/openofficelanguagepack.pcp differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setup_native/source/packinfo/package.txt new/setup_native/source/packinfo/package.txt --- old/setup_native/source/packinfo/package.txt 1970-01-01 01:00:00.000000000 +0100 +++ new/setup_native/source/packinfo/package.txt 2010-11-02 12:43:32.000000000 +0100 @@ -0,0 +1 @@ +DO NOT DELETE THIS FILE \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setup_native/source/packinfo/package_names.txt new/setup_native/source/packinfo/package_names.txt --- old/setup_native/source/packinfo/package_names.txt 2010-04-30 19:32:01.000000000 +0200 +++ new/setup_native/source/packinfo/package_names.txt 2010-11-02 12:43:32.000000000 +0100 @@ -1,46 +1,46 @@ -%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING Language module for OpenOffice.org %OOOBASEVERSION, language %LANGUAGESTRING -%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-base Base language module for OpenOffice.org %OOOBASEVERSION, language %LANGUAGESTRING -%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-binfilter Legacy filters (e.g. StarOffice 5.2) for OpenOffice.org %OOOBASEVERSION, language %LANGUAGESTRING -%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-calc Calc language module for OpenOffice.org %OOOBASEVERSION, language %LANGUAGESTRING -%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-draw Draw language module for OpenOffice.org %OOOBASEVERSION, language %LANGUAGESTRING -%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-fonts Language fonts module for OpenOffice.org %OOOBASEVERSION, language %LANGUAGESTRING -%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-help Language help module for OpenOffice.org %OOOBASEVERSION, language %LANGUAGESTRING -%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-impress Impress language module for OpenOffice.org %OOOBASEVERSION, language %LANGUAGESTRING -%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-math Math language module for OpenOffice.org %OOOBASEVERSION, language %LANGUAGESTRING -%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-onlineupd Online update language module for OpenOffice.org %OOOBASEVERSION, language %LANGUAGESTRING -%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-res Language resource module for OpenOffice.org %OOOBASEVERSION, language %LANGUAGESTRING -%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-writer Writer language module for OpenOffice.org %OOOBASEVERSION, language %LANGUAGESTRING -%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-activex ActiveX control for OpenOffice.org %OOOBASEVERSION -%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-base Base module for OpenOffice.org %OOOBASEVERSION -%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-binfilter Legacy filters (e.g. StarOffice 5.2) for OpenOffice.org %OOOBASEVERSION -%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-calc Calc module for OpenOffice.org %OOOBASEVERSION -%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01 Core module for OpenOffice.org %OOOBASEVERSION -%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02 Office core module for OpenOffice.org %OOOBASEVERSION -%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03 Office core module for OpenOffice.org %OOOBASEVERSION -%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04 Office core module for OpenOffice.org %OOOBASEVERSION -%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05 Office core module for OpenOffice.org %OOOBASEVERSION -%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06 Office core module for OpenOffice.org %OOOBASEVERSION -%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07 Office core module for OpenOffice.org %OOOBASEVERSION +%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING Language module for LibreOffice %OOOBASEVERSION, language %LANGUAGESTRING +%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-base Base language module for LibreOffice %OOOBASEVERSION, language %LANGUAGESTRING +%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-binfilter Legacy filters (e.g. StarOffice 5.2) for LibreOffice %OOOBASEVERSION, language %LANGUAGESTRING +%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-calc Calc language module for LibreOffice %OOOBASEVERSION, language %LANGUAGESTRING +%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-draw Draw language module for LibreOffice %OOOBASEVERSION, language %LANGUAGESTRING +%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-fonts Language fonts module for LibreOffice %OOOBASEVERSION, language %LANGUAGESTRING +%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-help Language help module for LibreOffice %OOOBASEVERSION, language %LANGUAGESTRING +%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-impress Impress language module for LibreOffice %OOOBASEVERSION, language %LANGUAGESTRING +%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-math Math language module for LibreOffice %OOOBASEVERSION, language %LANGUAGESTRING +%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-onlineupd Online update language module for LibreOffice %OOOBASEVERSION, language %LANGUAGESTRING +%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-res Language resource module for LibreOffice %OOOBASEVERSION, language %LANGUAGESTRING +%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-writer Writer language module for LibreOffice %OOOBASEVERSION, language %LANGUAGESTRING +%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-activex ActiveX control for LibreOffice %OOOBASEVERSION +%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-base Base module for LibreOffice %OOOBASEVERSION +%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-binfilter Legacy filters (e.g. StarOffice 5.2) for LibreOffice %OOOBASEVERSION +%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-calc Calc module for LibreOffice %OOOBASEVERSION +%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01 Core module for LibreOffice %OOOBASEVERSION +%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02 Office core module for LibreOffice %OOOBASEVERSION +%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03 Office core module for LibreOffice %OOOBASEVERSION +%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04 Office core module for LibreOffice %OOOBASEVERSION +%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05 Office core module for LibreOffice %OOOBASEVERSION +%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06 Office core module for LibreOffice %OOOBASEVERSION +%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07 Office core module for LibreOffice %OOOBASEVERSION %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-dict-gl Gl dictionary for %PRODUCTNAME %PRODUCTVERSION %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-dict-vi Vietnamese dictionary for %PRODUCTNAME %PRODUCTVERSION -%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-draw Draw module for OpenOffice.org %OOOBASEVERSION -%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-emailmerge Email mailmerge module for OpenOffice.org %OOOBASEVERSION -%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-gnome-integratn Gnome integration module for OpenOffice.org %OOOBASEVERSION -%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-graphicfilter Graphic filter module for OpenOffice.org %OOOBASEVERSION -%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-headless Headless display module for OpenOffice.org %OOOBASEVERSION -%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-images Images module for OpenOffice.org %OOOBASEVERSION -%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-impress Impress module for OpenOffice.org %OOOBASEVERSION -%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-javafilter Java filter module for OpenOffice.org %OOOBASEVERSION -%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-kde-integration KDE integration module for OpenOffice.org %OOOBASEVERSION -%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-math Math module for OpenOffice.org %OOOBASEVERSION -%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-onlineupdate Online update modul for OpenOffice.org %OOOBASEVERSION -%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-ooofonts Mailcap module for OpenOffice.org %OOOBASEVERSION -%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-ooolinguistic Linguistic module for OpenOffice.org %OOOBASEVERSION -%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-pyuno Pyuno module for OpenOffice.org %OOOBASEVERSION -%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-spellcheck English spellchecker module for OpenOffice.org %OOOBASEVERSION -%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-testtool Testtool module for OpenOffice.org %OOOBASEVERSION -%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-writer Writer module for OpenOffice.org %OOOBASEVERSION -%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-xsltfilter XSLT filter samples module for OpenOffice.org %OOOBASEVERSION +%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-draw Draw module for LibreOffice %OOOBASEVERSION +%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-emailmerge Email mailmerge module for LibreOffice %OOOBASEVERSION +%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-gnome-integratn Gnome integration module for LibreOffice %OOOBASEVERSION +%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-graphicfilter Graphic filter module for LibreOffice %OOOBASEVERSION +%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-headless Headless display module for LibreOffice %OOOBASEVERSION +%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-images Images module for LibreOffice %OOOBASEVERSION +%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-impress Impress module for LibreOffice %OOOBASEVERSION +%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-javafilter Java filter module for LibreOffice %OOOBASEVERSION +%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-kde-integration KDE integration module for LibreOffice %OOOBASEVERSION +%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-math Math module for LibreOffice %OOOBASEVERSION +%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-onlineupdate Online update modul for LibreOffice %OOOBASEVERSION +%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-ooofonts Mailcap module for LibreOffice %OOOBASEVERSION +%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-ooolinguistic Linguistic module for LibreOffice %OOOBASEVERSION +%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-pyuno Pyuno module for LibreOffice %OOOBASEVERSION +%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-spellcheck English spellchecker module for LibreOffice %OOOBASEVERSION +%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-testtool Testtool module for LibreOffice %OOOBASEVERSION +%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-writer Writer module for LibreOffice %OOOBASEVERSION +%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-xsltfilter XSLT filter samples module for LibreOffice %OOOBASEVERSION %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-af Af dictionary for %PRODUCTNAME %PRODUCTVERSION %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-cs Cs dictionary for %PRODUCTNAME %PRODUCTVERSION %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-da Da dictionary for %PRODUCTNAME %PRODUCTVERSION @@ -50,6 +50,7 @@ %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-et Et dictionary for %PRODUCTNAME %PRODUCTVERSION %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-fr Fr dictionary for %PRODUCTNAME %PRODUCTVERSION %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-hu Hu dictionary for %PRODUCTNAME %PRODUCTVERSION +%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-hr Hr dictionary for %PRODUCTNAME %PRODUCTVERSION %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-it It dictionary for %PRODUCTNAME %PRODUCTVERSION %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-lt Lt dictionary for %PRODUCTNAME %PRODUCTVERSION %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-ne Ne dictionary for %PRODUCTNAME %PRODUCTVERSION diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setup_native/source/packinfo/package_names_ext.txt new/setup_native/source/packinfo/package_names_ext.txt --- old/setup_native/source/packinfo/package_names_ext.txt 2010-04-30 19:32:01.000000000 +0200 +++ new/setup_native/source/packinfo/package_names_ext.txt 2010-11-02 12:43:32.000000000 +0100 @@ -1,4 +1,4 @@ -%SOLSUREPACKAGEPREFIX-ure UNO Runtime Environment +%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure UNO Runtime Environment SUNWcar Core Architecture, (Root) SUNWcsd Core Solaris Devices SUNWcsl Core Solaris, (Shared Libs) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setup_native/source/packinfo/packinfo_brand.txt new/setup_native/source/packinfo/packinfo_brand.txt --- old/setup_native/source/packinfo/packinfo_brand.txt 2010-04-30 19:32:01.000000000 +0200 +++ new/setup_native/source/packinfo/packinfo_brand.txt 2010-11-02 12:43:32.000000000 +0100 @@ -1,7 +1,7 @@ #************************************************************************* # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# +# # Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite @@ -30,8 +30,8 @@ # script = "shellscripts_brand.txt" solarispackagename = "%WITHOUTDOTUNIXPACKAGENAME%BRANDPACKAGEVERSION" packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION" -requires = "%UREPACKAGEPREFIX-ure,%BASISPACKAGEPREFIX%OOOBASEVERSION-core01,%BASISPACKAGEPREFIX%OOOBASEVERSION-core02,%BASISPACKAGEPREFIX%OOOBASEVERSION-core03,%BASISPACKAGEPREFIX%OOOBASEVERSION-core04,%BASISPACKAGEPREFIX%OOOBASEVERSION-core05,%BASISPACKAGEPREFIX%OOOBASEVERSION-core06,%BASISPACKAGEPREFIX%OOOBASEVERSION-core07,%BASISPACKAGEPREFIX%OOOBASEVERSION-images" -solarisrequires = "%SOLSUREPACKAGEPREFIX-ure (Name="UNO Runtime Environment"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-images (Name="Images module for %PRODUCTNAME %PRODUCTVERSION")" +requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure,%BASISPACKAGEPREFIX%OOOBASEVERSION-core01,%BASISPACKAGEPREFIX%OOOBASEVERSION-core02,%BASISPACKAGEPREFIX%OOOBASEVERSION-core03,%BASISPACKAGEPREFIX%OOOBASEVERSION-core04,%BASISPACKAGEPREFIX%OOOBASEVERSION-core05,%BASISPACKAGEPREFIX%OOOBASEVERSION-core06,%BASISPACKAGEPREFIX%OOOBASEVERSION-core07,%BASISPACKAGEPREFIX%OOOBASEVERSION-images" +solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure (Name="UNO Runtime Environment"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-images (Name="Images module for %PRODUCTNAME %PRODUCTVERSION")" copyright = "1999-2009 by %PRODUCTNAME" solariscopyright = "solariscopyrightfile" vendor = "%PRODUCTNAME" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setup_native/source/packinfo/packinfo_extensions.txt new/setup_native/source/packinfo/packinfo_extensions.txt --- old/setup_native/source/packinfo/packinfo_extensions.txt 2010-05-07 20:17:04.000000000 +0200 +++ new/setup_native/source/packinfo/packinfo_extensions.txt 2010-11-02 12:43:32.000000000 +0100 @@ -18,7 +18,6 @@ Start module = "gid_Module_Optional_Extensions_MINIMIZER" -script = "shellscripts_extensions.txt" solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-extension-presentation-minimizer" solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION")" packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-extension-presentation-minimizer" @@ -34,7 +33,6 @@ Start module = "gid_Module_Optional_Extensions_REPORTDESIGN" -script = "shellscripts_extensions.txt" solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-extension-report-builder" solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION")" packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-extension-report-builder" @@ -50,7 +48,6 @@ Start module = "gid_Module_Optional_Extensions_MEDIAWIKI" -script = "shellscripts_extensions.txt" solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-extension-mediawiki-publisher" solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION")" packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-extension-mediawiki-publisher" @@ -66,7 +63,6 @@ Start module = "gid_Module_Optional_Extensions_PRESENTER_SCREEN" -script = "shellscripts_extensions.txt" solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-extension-presenter-screen" solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION")" packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-extension-presenter-screen" @@ -82,7 +78,6 @@ Start module = "gid_Module_Optional_Extensions_PDFIMPORT" -script = "shellscripts_extensions.txt" solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-extension-pdf-import" solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION")" packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-extension-pdf-import" @@ -114,7 +109,6 @@ Start module = "gid_Module_Optional_Extensions_NumberText" -script = "shellscripts_extensions.txt" solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-extension-numbertext" solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION")" packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-extension-numbertext" @@ -130,7 +124,6 @@ Start module = "gid_Module_Optional_Extensions_HunArt" -script = "shellscripts_extensions.txt" solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-extension-hunart" solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION")" packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-extension-hunart" @@ -145,8 +138,22 @@ End Start +module = "gid_Module_Optional_Extensions_Typo" +solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-extension-typo" +solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION")" +packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-extension-typo" +requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01,%BASISPACKAGEPREFIX%OOOBASEVERSION-core02,%BASISPACKAGEPREFIX%OOOBASEVERSION-core03,%BASISPACKAGEPREFIX%OOOBASEVERSION-core04,%BASISPACKAGEPREFIX%OOOBASEVERSION-core05,%BASISPACKAGEPREFIX%OOOBASEVERSION-core06,%BASISPACKAGEPREFIX%OOOBASEVERSION-core07" +linuxpatchrequires = "" +copyright = "2010 by FSF.hu" +solariscopyright = "solariscopyrightfile" +vendor = "OpenOffice.org" +description = "Typography Toolbar extension for %PRODUCTNAME %PRODUCTVERSION" +destpath = "/opt" +packageversion = "%PACKAGEVERSION" +End + +Start module = "gid_Module_Optional_Extensions_CT2N" -script = "shellscripts_extensions.txt" solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-extension-ct2n" solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION")" packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-extension-ct2n" @@ -162,7 +169,6 @@ Start module = "gid_Module_Optional_Extensions_Watch_Window" -script = "shellscripts_extensions.txt" solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-extension-watch-window" solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION")" packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-extension-watch-window" @@ -177,8 +183,52 @@ End Start +module = "gid_Module_Optional_Extensions_Diagram" +solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-extension-diagram" +solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION")" +packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-extension-diagram" +requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01,%BASISPACKAGEPREFIX%OOOBASEVERSION-core02,%BASISPACKAGEPREFIX%OOOBASEVERSION-core03,%BASISPACKAGEPREFIX%OOOBASEVERSION-core04,%BASISPACKAGEPREFIX%OOOBASEVERSION-core05,%BASISPACKAGEPREFIX%OOOBASEVERSION-core06,%BASISPACKAGEPREFIX%OOOBASEVERSION-core07" +linuxpatchrequires = "" +copyright = "2010 by OxygenOffice Professional" +solariscopyright = "solariscopyrightfile" +vendor = "OpenOffice.org" +description = "Diagram extension for %PRODUCTNAME %PRODUCTVERSION" +destpath = "/opt" +packageversion = "%PACKAGEVERSION" +End + +Start +module = "gid_Module_Optional_Extensions_Validator" +solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-extension-validator" +solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION")" +packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-extension-validator" +requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01,%BASISPACKAGEPREFIX%OOOBASEVERSION-core02,%BASISPACKAGEPREFIX%OOOBASEVERSION-core03,%BASISPACKAGEPREFIX%OOOBASEVERSION-core04,%BASISPACKAGEPREFIX%OOOBASEVERSION-core05,%BASISPACKAGEPREFIX%OOOBASEVERSION-core06,%BASISPACKAGEPREFIX%OOOBASEVERSION-core07" +linuxpatchrequires = "" +copyright = "2010 by OxygenOffice Professional" +solariscopyright = "solariscopyrightfile" +vendor = "OpenOffice.org" +description = "Validator extension for %PRODUCTNAME %PRODUCTVERSION" +destpath = "/opt" +packageversion = "%PACKAGEVERSION" +End + +Start +module = "gid_Module_Optional_Extensions_Barcode" +solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-extension-barcode" +solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION")" +packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-extension-barcode" +requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01,%BASISPACKAGEPREFIX%OOOBASEVERSION-core02,%BASISPACKAGEPREFIX%OOOBASEVERSION-core03,%BASISPACKAGEPREFIX%OOOBASEVERSION-core04,%BASISPACKAGEPREFIX%OOOBASEVERSION-core05,%BASISPACKAGEPREFIX%OOOBASEVERSION-core06,%BASISPACKAGEPREFIX%OOOBASEVERSION-core07" +linuxpatchrequires = "" +copyright = "2010 by EuroOffice Extension Creator" +solariscopyright = "solariscopyrightfile" +vendor = "OpenOffice.org" +description = "Barcode extension for %PRODUCTNAME %PRODUCTVERSION" +destpath = "/opt" +packageversion = "%PACKAGEVERSION" +End + +Start module = "gid_Module_Optional_Extensions_Google_Docs" -script = "shellscripts_extensions.txt" solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-extension-google-docs" solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION")" packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-extension-google-docs" @@ -194,7 +244,6 @@ Start module = "gid_Module_Optional_Extensions_NLPSolver" -script = "shellscripts_extensions.txt" solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-extension-nlpsolver" solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION")" packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-extension-nlpsolver" @@ -210,7 +259,6 @@ Start module = "gid_Module_Optional_Extensions_LanguageTool" -script = "shellscripts_extensions.txt" solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-extension-languagetool" solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION")" packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-extension-languagetool" @@ -225,8 +273,22 @@ End Start +module = "gid_Module_Optional_Extensions_MySQLConnector" +solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-extension-mysql-connector" +solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION")" +packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-extension-mysql-connector" +requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01,%BASISPACKAGEPREFIX%OOOBASEVERSION-core02,%BASISPACKAGEPREFIX%OOOBASEVERSION-core03,%BASISPACKAGEPREFIX%OOOBASEVERSION-core04,%BASISPACKAGEPREFIX%OOOBASEVERSION-core05,%BASISPACKAGEPREFIX%OOOBASEVERSION-core06,%BASISPACKAGEPREFIX%OOOBASEVERSION-core07" +linuxpatchrequires = "" +copyright = "2008 by Sun Mcrosystems, Inc." +solariscopyright = "solariscopyrightfile" +vendor = "OpenOffice.org" +description = "MySQL Connector extension for %PRODUCTNAME %PRODUCTVERSION" +destpath = "/opt" +packageversion = "%PACKAGEVERSION" +End + +Start module = "gid_Module_Optional_Extensions_OOoBlogger" -script = "shellscripts_extensions.txt" solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-extension-oooblogger" solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION")" packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-extension-oooblogger" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setup_native/source/packinfo/packinfo_office.txt new/setup_native/source/packinfo/packinfo_office.txt --- old/setup_native/source/packinfo/packinfo_office.txt 2010-04-30 19:32:01.000000000 +0200 +++ new/setup_native/source/packinfo/packinfo_office.txt 2010-11-02 12:43:32.000000000 +0100 @@ -26,8 +26,8 @@ findrequires = "find-requires-gnome.sh" copyright = "1999-2009 by OpenOffice.org" solariscopyright = "solariscopyrightfile" -vendor = "OpenOffice.org" -description = "Gnome integration module for OpenOffice.org %OOOBASEVERSION" +vendor = "The Document Foundation" +description = "Gnome integration module for LibreOffice %OOOBASEVERSION" destpath = "/opt" packageversion = "%OOOPACKAGEVERSION" End @@ -41,8 +41,8 @@ requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01" copyright = "1999-2009 by OpenOffice.org" solariscopyright = "solariscopyrightfile" -vendor = "OpenOffice.org" -description = "KDE integration module for OpenOffice.org %OOOBASEVERSION" +vendor = "The Document Foundation" +description = "KDE integration module for LibreOffice %OOOBASEVERSION" destpath = "/opt" packageversion = "%OOOPACKAGEVERSION" End @@ -52,13 +52,13 @@ # script = "shellscripts_core01.txt" solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01" packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01" -requires = "%UREPACKAGEPREFIX-ure" -solarisrequires = "SUNWcar, SUNWkvm, SUNWcsr, SUNWcsu, SUNWcsd, SUNWcsl, SUNWxwrtl, SUNWxwplt, SUNWlibC, %SOLSUREPACKAGEPREFIX-ure" +requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure" +solarisrequires = "SUNWcar, SUNWkvm, SUNWcsr, SUNWcsu, SUNWcsd, SUNWcsl, SUNWxwrtl, SUNWxwplt, SUNWlibC, %SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure" freebsdrequires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core02,%BASISPACKAGEPREFIX%OOOBASEVERSION-core03,%BASISPACKAGEPREFIX%OOOBASEVERSION-core04,%BASISPACKAGEPREFIX%OOOBASEVERSION-core05,%BASISPACKAGEPREFIX%OOOBASEVERSION-core06,%BASISPACKAGEPREFIX%OOOBASEVERSION-core07" copyright = "1999-2009 by OpenOffice.org" solariscopyright = "solariscopyrightfile" -vendor = "OpenOffice.org" -description = "Core module for OpenOffice.org %OOOBASEVERSION" +vendor = "The Document Foundation" +description = "Core module for LibreOffice %OOOBASEVERSION" destpath = "/opt" packageversion = "%OOOPACKAGEVERSION" End @@ -73,8 +73,8 @@ requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01" copyright = "1999-2009 by OpenOffice.org" solariscopyright = "solariscopyrightfile" -vendor = "OpenOffice.org" -description = "Writer module for OpenOffice.org %OOOBASEVERSION" +vendor = "The Document Foundation" +description = "Writer module for LibreOffice %OOOBASEVERSION" destpath = "/opt" packageversion = "%OOOPACKAGEVERSION" End @@ -89,8 +89,8 @@ requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01" copyright = "1999-2009 by OpenOffice.org" solariscopyright = "solariscopyrightfile" -vendor = "OpenOffice.org" -description = "Calc module for OpenOffice.org %OOOBASEVERSION" +vendor = "The Document Foundation" +description = "Calc module for LibreOffice %OOOBASEVERSION" destpath = "/opt" packageversion = "%OOOPACKAGEVERSION" End @@ -105,8 +105,8 @@ requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01" copyright = "1999-2009 by OpenOffice.org" solariscopyright = "solariscopyrightfile" -vendor = "OpenOffice.org" -description = "Draw module for OpenOffice.org %OOOBASEVERSION" +vendor = "The Document Foundation" +description = "Draw module for LibreOffice %OOOBASEVERSION" destpath = "/opt" packageversion = "%OOOPACKAGEVERSION" End @@ -121,8 +121,8 @@ requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01" copyright = "1999-2009 by OpenOffice.org" solariscopyright = "solariscopyrightfile" -vendor = "OpenOffice.org" -description = "Impress module for OpenOffice.org %OOOBASEVERSION" +vendor = "The Document Foundation" +description = "Impress module for LibreOffice %OOOBASEVERSION" destpath = "/opt" packageversion = "%OOOPACKAGEVERSION" End @@ -479,9 +479,9 @@ module = "gid_Module_Root_Extension_Oooimprovement" script = "shellscripts_extensions.txt" solarispackagename = "%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-oooimprovement" -solarisrequires = "%SOLSUREPACKAGEPREFIX-ure, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07, %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION" +solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07, %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION" packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-oooimprovement" -requires = "%UREPACKAGEPREFIX-ure,%BASISPACKAGEPREFIX%OOOBASEVERSION-core01,%BASISPACKAGEPREFIX%OOOBASEVERSION-core02,%BASISPACKAGEPREFIX%OOOBASEVERSION-core03,%BASISPACKAGEPREFIX%OOOBASEVERSION-core04,%BASISPACKAGEPREFIX%OOOBASEVERSION-core05,%BASISPACKAGEPREFIX%OOOBASEVERSION-core06,%BASISPACKAGEPREFIX%OOOBASEVERSION-core07,%UNIXPACKAGENAME%BRANDPACKAGEVERSION" +requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure,%BASISPACKAGEPREFIX%OOOBASEVERSION-core01,%BASISPACKAGEPREFIX%OOOBASEVERSION-core02,%BASISPACKAGEPREFIX%OOOBASEVERSION-core03,%BASISPACKAGEPREFIX%OOOBASEVERSION-core04,%BASISPACKAGEPREFIX%OOOBASEVERSION-core05,%BASISPACKAGEPREFIX%OOOBASEVERSION-core06,%BASISPACKAGEPREFIX%OOOBASEVERSION-core07,%UNIXPACKAGENAME%BRANDPACKAGEVERSION" linuxpatchrequires = "" copyright = "1999-2010 by Oracle" solariscopyright = "solariscopyrightfile" @@ -495,9 +495,9 @@ module = "gid_Module_Root_Extension_Dictionary_Af" script = "shellscripts_extensions.txt" solarispackagename = "%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-af" -solarisrequires = "%SOLSUREPACKAGEPREFIX-ure, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07, %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION" +solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07, %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION" packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-af" -requires = "%UREPACKAGEPREFIX-ure,%BASISPACKAGEPREFIX%OOOBASEVERSION-core01,%BASISPACKAGEPREFIX%OOOBASEVERSION-core02,%BASISPACKAGEPREFIX%OOOBASEVERSION-core03,%BASISPACKAGEPREFIX%OOOBASEVERSION-core04,%BASISPACKAGEPREFIX%OOOBASEVERSION-core05,%BASISPACKAGEPREFIX%OOOBASEVERSION-core06,%BASISPACKAGEPREFIX%OOOBASEVERSION-core07,%UNIXPACKAGENAME%BRANDPACKAGEVERSION" +requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure,%BASISPACKAGEPREFIX%OOOBASEVERSION-core01,%BASISPACKAGEPREFIX%OOOBASEVERSION-core02,%BASISPACKAGEPREFIX%OOOBASEVERSION-core03,%BASISPACKAGEPREFIX%OOOBASEVERSION-core04,%BASISPACKAGEPREFIX%OOOBASEVERSION-core05,%BASISPACKAGEPREFIX%OOOBASEVERSION-core06,%BASISPACKAGEPREFIX%OOOBASEVERSION-core07,%UNIXPACKAGENAME%BRANDPACKAGEVERSION" linuxpatchrequires = "" copyright = "1999-2010 by Oracle" solariscopyright = "solariscopyrightfile" @@ -511,9 +511,9 @@ module = "gid_Module_Root_Extension_Dictionary_Ca" script = "shellscripts_extensions.txt" solarispackagename = "%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-ca" -solarisrequires = "%SOLSUREPACKAGEPREFIX-ure, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07, %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION" +solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07, %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION" packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-ca" -requires = "%UREPACKAGEPREFIX-ure,%BASISPACKAGEPREFIX%OOOBASEVERSION-core01,%BASISPACKAGEPREFIX%OOOBASEVERSION-core02,%BASISPACKAGEPREFIX%OOOBASEVERSION-core03,%BASISPACKAGEPREFIX%OOOBASEVERSION-core04,%BASISPACKAGEPREFIX%OOOBASEVERSION-core05,%BASISPACKAGEPREFIX%OOOBASEVERSION-core06,%BASISPACKAGEPREFIX%OOOBASEVERSION-core07,%UNIXPACKAGENAME%BRANDPACKAGEVERSION" +requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure,%BASISPACKAGEPREFIX%OOOBASEVERSION-core01,%BASISPACKAGEPREFIX%OOOBASEVERSION-core02,%BASISPACKAGEPREFIX%OOOBASEVERSION-core03,%BASISPACKAGEPREFIX%OOOBASEVERSION-core04,%BASISPACKAGEPREFIX%OOOBASEVERSION-core05,%BASISPACKAGEPREFIX%OOOBASEVERSION-core06,%BASISPACKAGEPREFIX%OOOBASEVERSION-core07,%UNIXPACKAGENAME%BRANDPACKAGEVERSION" linuxpatchrequires = "" copyright = "1999-2010 by Oracle" solariscopyright = "solariscopyrightfile" @@ -527,9 +527,9 @@ module = "gid_Module_Root_Extension_Dictionary_Cs" script = "shellscripts_extensions.txt" solarispackagename = "%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-cs" -solarisrequires = "%SOLSUREPACKAGEPREFIX-ure, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07, %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION" +solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07, %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION" packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-cs" -requires = "%UREPACKAGEPREFIX-ure,%BASISPACKAGEPREFIX%OOOBASEVERSION-core01,%BASISPACKAGEPREFIX%OOOBASEVERSION-core02,%BASISPACKAGEPREFIX%OOOBASEVERSION-core03,%BASISPACKAGEPREFIX%OOOBASEVERSION-core04,%BASISPACKAGEPREFIX%OOOBASEVERSION-core05,%BASISPACKAGEPREFIX%OOOBASEVERSION-core06,%BASISPACKAGEPREFIX%OOOBASEVERSION-core07,%UNIXPACKAGENAME%BRANDPACKAGEVERSION" +requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure,%BASISPACKAGEPREFIX%OOOBASEVERSION-core01,%BASISPACKAGEPREFIX%OOOBASEVERSION-core02,%BASISPACKAGEPREFIX%OOOBASEVERSION-core03,%BASISPACKAGEPREFIX%OOOBASEVERSION-core04,%BASISPACKAGEPREFIX%OOOBASEVERSION-core05,%BASISPACKAGEPREFIX%OOOBASEVERSION-core06,%BASISPACKAGEPREFIX%OOOBASEVERSION-core07,%UNIXPACKAGENAME%BRANDPACKAGEVERSION" linuxpatchrequires = "" copyright = "1999-2010 by Oracle" solariscopyright = "solariscopyrightfile" @@ -543,9 +543,9 @@ module = "gid_Module_Root_Extension_Dictionary_Da" script = "shellscripts_extensions.txt" solarispackagename = "%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-da" -solarisrequires = "%SOLSUREPACKAGEPREFIX-ure, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07, %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION" +solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07, %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION" packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-da" -requires = "%UREPACKAGEPREFIX-ure,%BASISPACKAGEPREFIX%OOOBASEVERSION-core01,%BASISPACKAGEPREFIX%OOOBASEVERSION-core02,%BASISPACKAGEPREFIX%OOOBASEVERSION-core03,%BASISPACKAGEPREFIX%OOOBASEVERSION-core04,%BASISPACKAGEPREFIX%OOOBASEVERSION-core05,%BASISPACKAGEPREFIX%OOOBASEVERSION-core06,%BASISPACKAGEPREFIX%OOOBASEVERSION-core07,%UNIXPACKAGENAME%BRANDPACKAGEVERSION" +requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure,%BASISPACKAGEPREFIX%OOOBASEVERSION-core01,%BASISPACKAGEPREFIX%OOOBASEVERSION-core02,%BASISPACKAGEPREFIX%OOOBASEVERSION-core03,%BASISPACKAGEPREFIX%OOOBASEVERSION-core04,%BASISPACKAGEPREFIX%OOOBASEVERSION-core05,%BASISPACKAGEPREFIX%OOOBASEVERSION-core06,%BASISPACKAGEPREFIX%OOOBASEVERSION-core07,%UNIXPACKAGENAME%BRANDPACKAGEVERSION" linuxpatchrequires = "" copyright = "1999-2010 by Oracle" solariscopyright = "solariscopyrightfile" @@ -559,9 +559,9 @@ module = "gid_Module_Root_Extension_Dictionary_De_AT" script = "shellscripts_extensions.txt" solarispackagename = "%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-de-AT" -solarisrequires = "%SOLSUREPACKAGEPREFIX-ure, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07, %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION" +solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07, %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION" packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-de-AT" -requires = "%UREPACKAGEPREFIX-ure,%BASISPACKAGEPREFIX%OOOBASEVERSION-core01,%BASISPACKAGEPREFIX%OOOBASEVERSION-core02,%BASISPACKAGEPREFIX%OOOBASEVERSION-core03,%BASISPACKAGEPREFIX%OOOBASEVERSION-core04,%BASISPACKAGEPREFIX%OOOBASEVERSION-core05,%BASISPACKAGEPREFIX%OOOBASEVERSION-core06,%BASISPACKAGEPREFIX%OOOBASEVERSION-core07,%UNIXPACKAGENAME%BRANDPACKAGEVERSION" +requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure,%BASISPACKAGEPREFIX%OOOBASEVERSION-core01,%BASISPACKAGEPREFIX%OOOBASEVERSION-core02,%BASISPACKAGEPREFIX%OOOBASEVERSION-core03,%BASISPACKAGEPREFIX%OOOBASEVERSION-core04,%BASISPACKAGEPREFIX%OOOBASEVERSION-core05,%BASISPACKAGEPREFIX%OOOBASEVERSION-core06,%BASISPACKAGEPREFIX%OOOBASEVERSION-core07,%UNIXPACKAGENAME%BRANDPACKAGEVERSION" linuxpatchrequires = "" copyright = "1999-2010 by Oracle" solariscopyright = "solariscopyrightfile" @@ -575,9 +575,9 @@ module = "gid_Module_Root_Extension_Dictionary_De_CH" script = "shellscripts_extensions.txt" solarispackagename = "%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-de-CH" -solarisrequires = "%SOLSUREPACKAGEPREFIX-ure, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07, %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION" +solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07, %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION" packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-de-CH" -requires = "%UREPACKAGEPREFIX-ure,%BASISPACKAGEPREFIX%OOOBASEVERSION-core01,%BASISPACKAGEPREFIX%OOOBASEVERSION-core02,%BASISPACKAGEPREFIX%OOOBASEVERSION-core03,%BASISPACKAGEPREFIX%OOOBASEVERSION-core04,%BASISPACKAGEPREFIX%OOOBASEVERSION-core05,%BASISPACKAGEPREFIX%OOOBASEVERSION-core06,%BASISPACKAGEPREFIX%OOOBASEVERSION-core07,%UNIXPACKAGENAME%BRANDPACKAGEVERSION" +requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure,%BASISPACKAGEPREFIX%OOOBASEVERSION-core01,%BASISPACKAGEPREFIX%OOOBASEVERSION-core02,%BASISPACKAGEPREFIX%OOOBASEVERSION-core03,%BASISPACKAGEPREFIX%OOOBASEVERSION-core04,%BASISPACKAGEPREFIX%OOOBASEVERSION-core05,%BASISPACKAGEPREFIX%OOOBASEVERSION-core06,%BASISPACKAGEPREFIX%OOOBASEVERSION-core07,%UNIXPACKAGENAME%BRANDPACKAGEVERSION" linuxpatchrequires = "" copyright = "1999-2010 by Oracle" solariscopyright = "solariscopyrightfile" @@ -591,9 +591,9 @@ module = "gid_Module_Root_Extension_Dictionary_De_DE" script = "shellscripts_extensions.txt" solarispackagename = "%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-de-DE" -solarisrequires = "%SOLSUREPACKAGEPREFIX-ure, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07, %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION" +solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07, %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION" packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-de-DE" -requires = "%UREPACKAGEPREFIX-ure,%BASISPACKAGEPREFIX%OOOBASEVERSION-core01,%BASISPACKAGEPREFIX%OOOBASEVERSION-core02,%BASISPACKAGEPREFIX%OOOBASEVERSION-core03,%BASISPACKAGEPREFIX%OOOBASEVERSION-core04,%BASISPACKAGEPREFIX%OOOBASEVERSION-core05,%BASISPACKAGEPREFIX%OOOBASEVERSION-core06,%BASISPACKAGEPREFIX%OOOBASEVERSION-core07,%UNIXPACKAGENAME%BRANDPACKAGEVERSION" +requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure,%BASISPACKAGEPREFIX%OOOBASEVERSION-core01,%BASISPACKAGEPREFIX%OOOBASEVERSION-core02,%BASISPACKAGEPREFIX%OOOBASEVERSION-core03,%BASISPACKAGEPREFIX%OOOBASEVERSION-core04,%BASISPACKAGEPREFIX%OOOBASEVERSION-core05,%BASISPACKAGEPREFIX%OOOBASEVERSION-core06,%BASISPACKAGEPREFIX%OOOBASEVERSION-core07,%UNIXPACKAGENAME%BRANDPACKAGEVERSION" linuxpatchrequires = "" copyright = "1999-2010 by Oracle" solariscopyright = "solariscopyrightfile" @@ -607,9 +607,9 @@ module = "gid_Module_Root_Extension_Dictionary_En" script = "shellscripts_extensions.txt" solarispackagename = "%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-en" -solarisrequires = "%SOLSUREPACKAGEPREFIX-ure, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07, %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION" +solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07, %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION" packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-en" -requires = "%UREPACKAGEPREFIX-ure,%BASISPACKAGEPREFIX%OOOBASEVERSION-core01,%BASISPACKAGEPREFIX%OOOBASEVERSION-core02,%BASISPACKAGEPREFIX%OOOBASEVERSION-core03,%BASISPACKAGEPREFIX%OOOBASEVERSION-core04,%BASISPACKAGEPREFIX%OOOBASEVERSION-core05,%BASISPACKAGEPREFIX%OOOBASEVERSION-core06,%BASISPACKAGEPREFIX%OOOBASEVERSION-core07,%UNIXPACKAGENAME%BRANDPACKAGEVERSION" +requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure,%BASISPACKAGEPREFIX%OOOBASEVERSION-core01,%BASISPACKAGEPREFIX%OOOBASEVERSION-core02,%BASISPACKAGEPREFIX%OOOBASEVERSION-core03,%BASISPACKAGEPREFIX%OOOBASEVERSION-core04,%BASISPACKAGEPREFIX%OOOBASEVERSION-core05,%BASISPACKAGEPREFIX%OOOBASEVERSION-core06,%BASISPACKAGEPREFIX%OOOBASEVERSION-core07,%UNIXPACKAGENAME%BRANDPACKAGEVERSION" linuxpatchrequires = "" copyright = "1999-2010 by Oracle" solariscopyright = "solariscopyrightfile" @@ -623,9 +623,9 @@ module = "gid_Module_Root_Extension_Dictionary_Es" script = "shellscripts_extensions.txt" solarispackagename = "%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-es" -solarisrequires = "%SOLSUREPACKAGEPREFIX-ure, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07, %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION" +solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07, %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION" packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-es" -requires = "%UREPACKAGEPREFIX-ure,%BASISPACKAGEPREFIX%OOOBASEVERSION-core01,%BASISPACKAGEPREFIX%OOOBASEVERSION-core02,%BASISPACKAGEPREFIX%OOOBASEVERSION-core03,%BASISPACKAGEPREFIX%OOOBASEVERSION-core04,%BASISPACKAGEPREFIX%OOOBASEVERSION-core05,%BASISPACKAGEPREFIX%OOOBASEVERSION-core06,%BASISPACKAGEPREFIX%OOOBASEVERSION-core07,%UNIXPACKAGENAME%BRANDPACKAGEVERSION" +requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure,%BASISPACKAGEPREFIX%OOOBASEVERSION-core01,%BASISPACKAGEPREFIX%OOOBASEVERSION-core02,%BASISPACKAGEPREFIX%OOOBASEVERSION-core03,%BASISPACKAGEPREFIX%OOOBASEVERSION-core04,%BASISPACKAGEPREFIX%OOOBASEVERSION-core05,%BASISPACKAGEPREFIX%OOOBASEVERSION-core06,%BASISPACKAGEPREFIX%OOOBASEVERSION-core07,%UNIXPACKAGENAME%BRANDPACKAGEVERSION" linuxpatchrequires = "" copyright = "1999-2010 by Oracle" solariscopyright = "solariscopyrightfile" @@ -639,9 +639,9 @@ module = "gid_Module_Root_Extension_Dictionary_Et" script = "shellscripts_extensions.txt" solarispackagename = "%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-et" -solarisrequires = "%SOLSUREPACKAGEPREFIX-ure, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07, %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION" +solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07, %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION" packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-et" -requires = "%UREPACKAGEPREFIX-ure,%BASISPACKAGEPREFIX%OOOBASEVERSION-core01,%BASISPACKAGEPREFIX%OOOBASEVERSION-core02,%BASISPACKAGEPREFIX%OOOBASEVERSION-core03,%BASISPACKAGEPREFIX%OOOBASEVERSION-core04,%BASISPACKAGEPREFIX%OOOBASEVERSION-core05,%BASISPACKAGEPREFIX%OOOBASEVERSION-core06,%BASISPACKAGEPREFIX%OOOBASEVERSION-core07,%UNIXPACKAGENAME%BRANDPACKAGEVERSION" +requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure,%BASISPACKAGEPREFIX%OOOBASEVERSION-core01,%BASISPACKAGEPREFIX%OOOBASEVERSION-core02,%BASISPACKAGEPREFIX%OOOBASEVERSION-core03,%BASISPACKAGEPREFIX%OOOBASEVERSION-core04,%BASISPACKAGEPREFIX%OOOBASEVERSION-core05,%BASISPACKAGEPREFIX%OOOBASEVERSION-core06,%BASISPACKAGEPREFIX%OOOBASEVERSION-core07,%UNIXPACKAGENAME%BRANDPACKAGEVERSION" linuxpatchrequires = "" copyright = "1999-2010 by Oracle" solariscopyright = "solariscopyrightfile" @@ -655,9 +655,9 @@ module = "gid_Module_Root_Extension_Dictionary_Fr" script = "shellscripts_extensions.txt" solarispackagename = "%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-fr" -solarisrequires = "%SOLSUREPACKAGEPREFIX-ure, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07, %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION" +solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07, %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION" packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-fr" -requires = "%UREPACKAGEPREFIX-ure,%BASISPACKAGEPREFIX%OOOBASEVERSION-core01,%BASISPACKAGEPREFIX%OOOBASEVERSION-core02,%BASISPACKAGEPREFIX%OOOBASEVERSION-core03,%BASISPACKAGEPREFIX%OOOBASEVERSION-core04,%BASISPACKAGEPREFIX%OOOBASEVERSION-core05,%BASISPACKAGEPREFIX%OOOBASEVERSION-core06,%BASISPACKAGEPREFIX%OOOBASEVERSION-core07,%UNIXPACKAGENAME%BRANDPACKAGEVERSION" +requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure,%BASISPACKAGEPREFIX%OOOBASEVERSION-core01,%BASISPACKAGEPREFIX%OOOBASEVERSION-core02,%BASISPACKAGEPREFIX%OOOBASEVERSION-core03,%BASISPACKAGEPREFIX%OOOBASEVERSION-core04,%BASISPACKAGEPREFIX%OOOBASEVERSION-core05,%BASISPACKAGEPREFIX%OOOBASEVERSION-core06,%BASISPACKAGEPREFIX%OOOBASEVERSION-core07,%UNIXPACKAGENAME%BRANDPACKAGEVERSION" linuxpatchrequires = "" copyright = "1999-2010 by Oracle" solariscopyright = "solariscopyrightfile" @@ -671,9 +671,9 @@ module = "gid_Module_Root_Extension_Dictionary_Gl" script = "shellscripts_extensions.txt" solarispackagename = "%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-gl" -solarisrequires = "%SOLSUREPACKAGEPREFIX-ure, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07, %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION" +solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07, %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION" packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-dict-gl" -requires = "%UREPACKAGEPREFIX-ure,%BASISPACKAGEPREFIX%OOOBASEVERSION-core01,%BASISPACKAGEPREFIX%OOOBASEVERSION-core02,%BASISPACKAGEPREFIX%OOOBASEVERSION-core03,%BASISPACKAGEPREFIX%OOOBASEVERSION-core04,%BASISPACKAGEPREFIX%OOOBASEVERSION-core05,%BASISPACKAGEPREFIX%OOOBASEVERSION-core06,%BASISPACKAGEPREFIX%OOOBASEVERSION-core07,%UNIXPACKAGENAME%BRANDPACKAGEVERSION" +requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure,%BASISPACKAGEPREFIX%OOOBASEVERSION-core01,%BASISPACKAGEPREFIX%OOOBASEVERSION-core02,%BASISPACKAGEPREFIX%OOOBASEVERSION-core03,%BASISPACKAGEPREFIX%OOOBASEVERSION-core04,%BASISPACKAGEPREFIX%OOOBASEVERSION-core05,%BASISPACKAGEPREFIX%OOOBASEVERSION-core06,%BASISPACKAGEPREFIX%OOOBASEVERSION-core07,%UNIXPACKAGENAME%BRANDPACKAGEVERSION" linuxpatchrequires = "" copyright = "1999-2010 by Oracle" solariscopyright = "solariscopyrightfile" @@ -687,9 +687,9 @@ module = "gid_Module_Root_Extension_Dictionary_He" script = "shellscripts_extensions.txt" solarispackagename = "%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-he" -solarisrequires = "%SOLSUREPACKAGEPREFIX-ure, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07, %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION" +solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07, %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION" packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-he" -requires = "%UREPACKAGEPREFIX-ure,%BASISPACKAGEPREFIX%OOOBASEVERSION-core01,%BASISPACKAGEPREFIX%OOOBASEVERSION-core02,%BASISPACKAGEPREFIX%OOOBASEVERSION-core03,%BASISPACKAGEPREFIX%OOOBASEVERSION-core04,%BASISPACKAGEPREFIX%OOOBASEVERSION-core05,%BASISPACKAGEPREFIX%OOOBASEVERSION-core06,%BASISPACKAGEPREFIX%OOOBASEVERSION-core07,%UNIXPACKAGENAME%BRANDPACKAGEVERSION" +requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure,%BASISPACKAGEPREFIX%OOOBASEVERSION-core01,%BASISPACKAGEPREFIX%OOOBASEVERSION-core02,%BASISPACKAGEPREFIX%OOOBASEVERSION-core03,%BASISPACKAGEPREFIX%OOOBASEVERSION-core04,%BASISPACKAGEPREFIX%OOOBASEVERSION-core05,%BASISPACKAGEPREFIX%OOOBASEVERSION-core06,%BASISPACKAGEPREFIX%OOOBASEVERSION-core07,%UNIXPACKAGENAME%BRANDPACKAGEVERSION" linuxpatchrequires = "" copyright = "1999-2010 by Oracle" solariscopyright = "solariscopyrightfile" @@ -703,9 +703,9 @@ module = "gid_Module_Root_Extension_Dictionary_Hu" script = "shellscripts_extensions.txt" solarispackagename = "%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-hu" -solarisrequires = "%SOLSUREPACKAGEPREFIX-ure, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07, %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION" +solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07, %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION" packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-hu" -requires = "%UREPACKAGEPREFIX-ure,%BASISPACKAGEPREFIX%OOOBASEVERSION-core01,%BASISPACKAGEPREFIX%OOOBASEVERSION-core02,%BASISPACKAGEPREFIX%OOOBASEVERSION-core03,%BASISPACKAGEPREFIX%OOOBASEVERSION-core04,%BASISPACKAGEPREFIX%OOOBASEVERSION-core05,%BASISPACKAGEPREFIX%OOOBASEVERSION-core06,%BASISPACKAGEPREFIX%OOOBASEVERSION-core07,%UNIXPACKAGENAME%BRANDPACKAGEVERSION" +requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure,%BASISPACKAGEPREFIX%OOOBASEVERSION-core01,%BASISPACKAGEPREFIX%OOOBASEVERSION-core02,%BASISPACKAGEPREFIX%OOOBASEVERSION-core03,%BASISPACKAGEPREFIX%OOOBASEVERSION-core04,%BASISPACKAGEPREFIX%OOOBASEVERSION-core05,%BASISPACKAGEPREFIX%OOOBASEVERSION-core06,%BASISPACKAGEPREFIX%OOOBASEVERSION-core07,%UNIXPACKAGENAME%BRANDPACKAGEVERSION" linuxpatchrequires = "" copyright = "1999-2010 by Oracle" solariscopyright = "solariscopyrightfile" @@ -716,12 +716,28 @@ End Start +module = "gid_Module_Root_Extension_Dictionary_Hr" +script = "shellscripts_extensions.txt" +solarispackagename = "%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-hr" +solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07, %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION" +packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-hr" +requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure,%BASISPACKAGEPREFIX%OOOBASEVERSION-core01,%BASISPACKAGEPREFIX%OOOBASEVERSION-core02,%BASISPACKAGEPREFIX%OOOBASEVERSION-core03,%BASISPACKAGEPREFIX%OOOBASEVERSION-core04,%BASISPACKAGEPREFIX%OOOBASEVERSION-core05,%BASISPACKAGEPREFIX%OOOBASEVERSION-core06,%BASISPACKAGEPREFIX%OOOBASEVERSION-core07,%UNIXPACKAGENAME%BRANDPACKAGEVERSION" +linuxpatchrequires = "" +copyright = "" +solariscopyright = "solariscopyrightfile" +vendor = "The Document Foundation" +description = "Hr dictionary for %PRODUCTNAME %PRODUCTVERSION" +destpath = "/opt" +packageversion = "%PACKAGEVERSION" +End + +Start module = "gid_Module_Root_Extension_Dictionary_It" script = "shellscripts_extensions.txt" solarispackagename = "%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-it" -solarisrequires = "%SOLSUREPACKAGEPREFIX-ure, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07, %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION" +solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07, %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION" packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-it" -requires = "%UREPACKAGEPREFIX-ure,%BASISPACKAGEPREFIX%OOOBASEVERSION-core01,%BASISPACKAGEPREFIX%OOOBASEVERSION-core02,%BASISPACKAGEPREFIX%OOOBASEVERSION-core03,%BASISPACKAGEPREFIX%OOOBASEVERSION-core04,%BASISPACKAGEPREFIX%OOOBASEVERSION-core05,%BASISPACKAGEPREFIX%OOOBASEVERSION-core06,%BASISPACKAGEPREFIX%OOOBASEVERSION-core07,%UNIXPACKAGENAME%BRANDPACKAGEVERSION" +requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure,%BASISPACKAGEPREFIX%OOOBASEVERSION-core01,%BASISPACKAGEPREFIX%OOOBASEVERSION-core02,%BASISPACKAGEPREFIX%OOOBASEVERSION-core03,%BASISPACKAGEPREFIX%OOOBASEVERSION-core04,%BASISPACKAGEPREFIX%OOOBASEVERSION-core05,%BASISPACKAGEPREFIX%OOOBASEVERSION-core06,%BASISPACKAGEPREFIX%OOOBASEVERSION-core07,%UNIXPACKAGENAME%BRANDPACKAGEVERSION" linuxpatchrequires = "" copyright = "1999-2010 by Oracle" solariscopyright = "solariscopyrightfile" @@ -735,9 +751,9 @@ module = "gid_Module_Root_Extension_Dictionary_Ku_Tr" script = "shellscripts_extensions.txt" solarispackagename = "%PACKAGEPREFIX%WITHOUTDOTUNIXPRODUCTNAME%BRANDPACKAGEVERSION-dict-ku-TR" -solarisrequires = "%SOLSUREPACKAGEPREFIX-ure, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07, %PACKAGEPREFIX%WITHOUTDOTUNIXPRODUCTNAME%BRANDPACKAGEVERSION" +solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07, %PACKAGEPREFIX%WITHOUTDOTUNIXPRODUCTNAME%BRANDPACKAGEVERSION" packagename = "%UNIXPRODUCTNAME%BRANDPACKAGEVERSION-dict-ku-TR" -requires = "%UREPACKAGEPREFIX-ure,%BASISPACKAGEPREFIX%OOOBASEVERSION-core01,%BASISPACKAGEPREFIX%OOOBASEVERSION-core02,%BASISPACKAGEPREFIX%OOOBASEVERSION-core03,%BASISPACKAGEPREFIX%OOOBASEVERSION-core04,%BASISPACKAGEPREFIX%OOOBASEVERSION-core05,%BASISPACKAGEPREFIX%OOOBASEVERSION-core06,%BASISPACKAGEPREFIX%OOOBASEVERSION-core07,%UNIXPRODUCTNAME%BRANDPACKAGEVERSION" +requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure,%BASISPACKAGEPREFIX%OOOBASEVERSION-core01,%BASISPACKAGEPREFIX%OOOBASEVERSION-core02,%BASISPACKAGEPREFIX%OOOBASEVERSION-core03,%BASISPACKAGEPREFIX%OOOBASEVERSION-core04,%BASISPACKAGEPREFIX%OOOBASEVERSION-core05,%BASISPACKAGEPREFIX%OOOBASEVERSION-core06,%BASISPACKAGEPREFIX%OOOBASEVERSION-core07,%UNIXPRODUCTNAME%BRANDPACKAGEVERSION" linuxpatchrequires = "" copyright = "1999-2009 by Sun Microsystems" solariscopyright = "solariscopyrightfile" @@ -751,9 +767,9 @@ module = "gid_Module_Root_Extension_Dictionary_Lt" script = "shellscripts_extensions.txt" solarispackagename = "%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-lt" -solarisrequires = "%SOLSUREPACKAGEPREFIX-ure, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07, %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION" +solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07, %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION" packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-lt" -requires = "%UREPACKAGEPREFIX-ure,%BASISPACKAGEPREFIX%OOOBASEVERSION-core01,%BASISPACKAGEPREFIX%OOOBASEVERSION-core02,%BASISPACKAGEPREFIX%OOOBASEVERSION-core03,%BASISPACKAGEPREFIX%OOOBASEVERSION-core04,%BASISPACKAGEPREFIX%OOOBASEVERSION-core05,%BASISPACKAGEPREFIX%OOOBASEVERSION-core06,%BASISPACKAGEPREFIX%OOOBASEVERSION-core07,%UNIXPACKAGENAME%BRANDPACKAGEVERSION" +requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure,%BASISPACKAGEPREFIX%OOOBASEVERSION-core01,%BASISPACKAGEPREFIX%OOOBASEVERSION-core02,%BASISPACKAGEPREFIX%OOOBASEVERSION-core03,%BASISPACKAGEPREFIX%OOOBASEVERSION-core04,%BASISPACKAGEPREFIX%OOOBASEVERSION-core05,%BASISPACKAGEPREFIX%OOOBASEVERSION-core06,%BASISPACKAGEPREFIX%OOOBASEVERSION-core07,%UNIXPACKAGENAME%BRANDPACKAGEVERSION" linuxpatchrequires = "" copyright = "1999-2010 by Oracle" solariscopyright = "solariscopyrightfile" @@ -767,9 +783,9 @@ module = "gid_Module_Root_Extension_Dictionary_Ne" script = "shellscripts_extensions.txt" solarispackagename = "%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-ne" -solarisrequires = "%SOLSUREPACKAGEPREFIX-ure, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07, %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION" +solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07, %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION" packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-ne" -requires = "%UREPACKAGEPREFIX-ure,%BASISPACKAGEPREFIX%OOOBASEVERSION-core01,%BASISPACKAGEPREFIX%OOOBASEVERSION-core02,%BASISPACKAGEPREFIX%OOOBASEVERSION-core03,%BASISPACKAGEPREFIX%OOOBASEVERSION-core04,%BASISPACKAGEPREFIX%OOOBASEVERSION-core05,%BASISPACKAGEPREFIX%OOOBASEVERSION-core06,%BASISPACKAGEPREFIX%OOOBASEVERSION-core07,%UNIXPACKAGENAME%BRANDPACKAGEVERSION" +requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure,%BASISPACKAGEPREFIX%OOOBASEVERSION-core01,%BASISPACKAGEPREFIX%OOOBASEVERSION-core02,%BASISPACKAGEPREFIX%OOOBASEVERSION-core03,%BASISPACKAGEPREFIX%OOOBASEVERSION-core04,%BASISPACKAGEPREFIX%OOOBASEVERSION-core05,%BASISPACKAGEPREFIX%OOOBASEVERSION-core06,%BASISPACKAGEPREFIX%OOOBASEVERSION-core07,%UNIXPACKAGENAME%BRANDPACKAGEVERSION" linuxpatchrequires = "" copyright = "1999-2010 by Oracle" solariscopyright = "solariscopyrightfile" @@ -783,9 +799,9 @@ module = "gid_Module_Root_Extension_Dictionary_Nl" script = "shellscripts_extensions.txt" solarispackagename = "%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-nl" -solarisrequires = "%SOLSUREPACKAGEPREFIX-ure, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07, %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION" +solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07, %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION" packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-nl" -requires = "%UREPACKAGEPREFIX-ure,%BASISPACKAGEPREFIX%OOOBASEVERSION-core01,%BASISPACKAGEPREFIX%OOOBASEVERSION-core02,%BASISPACKAGEPREFIX%OOOBASEVERSION-core03,%BASISPACKAGEPREFIX%OOOBASEVERSION-core04,%BASISPACKAGEPREFIX%OOOBASEVERSION-core05,%BASISPACKAGEPREFIX%OOOBASEVERSION-core06,%BASISPACKAGEPREFIX%OOOBASEVERSION-core07,%UNIXPACKAGENAME%BRANDPACKAGEVERSION" +requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure,%BASISPACKAGEPREFIX%OOOBASEVERSION-core01,%BASISPACKAGEPREFIX%OOOBASEVERSION-core02,%BASISPACKAGEPREFIX%OOOBASEVERSION-core03,%BASISPACKAGEPREFIX%OOOBASEVERSION-core04,%BASISPACKAGEPREFIX%OOOBASEVERSION-core05,%BASISPACKAGEPREFIX%OOOBASEVERSION-core06,%BASISPACKAGEPREFIX%OOOBASEVERSION-core07,%UNIXPACKAGENAME%BRANDPACKAGEVERSION" linuxpatchrequires = "" copyright = "1999-2010 by Oracle" solariscopyright = "solariscopyrightfile" @@ -799,9 +815,9 @@ module = "gid_Module_Root_Extension_Dictionary_No" script = "shellscripts_extensions.txt" solarispackagename = "%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-no" -solarisrequires = "%SOLSUREPACKAGEPREFIX-ure, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07, %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION" +solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07, %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION" packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-no" -requires = "%UREPACKAGEPREFIX-ure,%BASISPACKAGEPREFIX%OOOBASEVERSION-core01,%BASISPACKAGEPREFIX%OOOBASEVERSION-core02,%BASISPACKAGEPREFIX%OOOBASEVERSION-core03,%BASISPACKAGEPREFIX%OOOBASEVERSION-core04,%BASISPACKAGEPREFIX%OOOBASEVERSION-core05,%BASISPACKAGEPREFIX%OOOBASEVERSION-core06,%BASISPACKAGEPREFIX%OOOBASEVERSION-core07,%UNIXPACKAGENAME%BRANDPACKAGEVERSION" +requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure,%BASISPACKAGEPREFIX%OOOBASEVERSION-core01,%BASISPACKAGEPREFIX%OOOBASEVERSION-core02,%BASISPACKAGEPREFIX%OOOBASEVERSION-core03,%BASISPACKAGEPREFIX%OOOBASEVERSION-core04,%BASISPACKAGEPREFIX%OOOBASEVERSION-core05,%BASISPACKAGEPREFIX%OOOBASEVERSION-core06,%BASISPACKAGEPREFIX%OOOBASEVERSION-core07,%UNIXPACKAGENAME%BRANDPACKAGEVERSION" linuxpatchrequires = "" copyright = "1999-2010 by Oracle" solariscopyright = "solariscopyrightfile" @@ -815,9 +831,9 @@ module = "gid_Module_Root_Extension_Dictionary_Pl" script = "shellscripts_extensions.txt" solarispackagename = "%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-pl" -solarisrequires = "%SOLSUREPACKAGEPREFIX-ure, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07, %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION" +solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07, %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION" packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-pl" -requires = "%UREPACKAGEPREFIX-ure,%BASISPACKAGEPREFIX%OOOBASEVERSION-core01,%BASISPACKAGEPREFIX%OOOBASEVERSION-core02,%BASISPACKAGEPREFIX%OOOBASEVERSION-core03,%BASISPACKAGEPREFIX%OOOBASEVERSION-core04,%BASISPACKAGEPREFIX%OOOBASEVERSION-core05,%BASISPACKAGEPREFIX%OOOBASEVERSION-core06,%BASISPACKAGEPREFIX%OOOBASEVERSION-core07,%UNIXPACKAGENAME%BRANDPACKAGEVERSION" +requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure,%BASISPACKAGEPREFIX%OOOBASEVERSION-core01,%BASISPACKAGEPREFIX%OOOBASEVERSION-core02,%BASISPACKAGEPREFIX%OOOBASEVERSION-core03,%BASISPACKAGEPREFIX%OOOBASEVERSION-core04,%BASISPACKAGEPREFIX%OOOBASEVERSION-core05,%BASISPACKAGEPREFIX%OOOBASEVERSION-core06,%BASISPACKAGEPREFIX%OOOBASEVERSION-core07,%UNIXPACKAGENAME%BRANDPACKAGEVERSION" linuxpatchrequires = "" copyright = "1999-2010 by Oracle" solariscopyright = "solariscopyrightfile" @@ -831,9 +847,9 @@ module = "gid_Module_Root_Extension_Dictionary_Pt" script = "shellscripts_extensions.txt" solarispackagename = "%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-pt" -solarisrequires = "%SOLSUREPACKAGEPREFIX-ure, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07, %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION" +solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07, %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION" packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-pt" -requires = "%UREPACKAGEPREFIX-ure,%BASISPACKAGEPREFIX%OOOBASEVERSION-core01,%BASISPACKAGEPREFIX%OOOBASEVERSION-core02,%BASISPACKAGEPREFIX%OOOBASEVERSION-core03,%BASISPACKAGEPREFIX%OOOBASEVERSION-core04,%BASISPACKAGEPREFIX%OOOBASEVERSION-core05,%BASISPACKAGEPREFIX%OOOBASEVERSION-core06,%BASISPACKAGEPREFIX%OOOBASEVERSION-core07,%UNIXPACKAGENAME%BRANDPACKAGEVERSION" +requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure,%BASISPACKAGEPREFIX%OOOBASEVERSION-core01,%BASISPACKAGEPREFIX%OOOBASEVERSION-core02,%BASISPACKAGEPREFIX%OOOBASEVERSION-core03,%BASISPACKAGEPREFIX%OOOBASEVERSION-core04,%BASISPACKAGEPREFIX%OOOBASEVERSION-core05,%BASISPACKAGEPREFIX%OOOBASEVERSION-core06,%BASISPACKAGEPREFIX%OOOBASEVERSION-core07,%UNIXPACKAGENAME%BRANDPACKAGEVERSION" linuxpatchrequires = "" copyright = "1999-2010 by Oracle" solariscopyright = "solariscopyrightfile" @@ -847,9 +863,9 @@ module = "gid_Module_Root_Extension_Dictionary_Ro" script = "shellscripts_extensions.txt" solarispackagename = "%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-ro" -solarisrequires = "%SOLSUREPACKAGEPREFIX-ure, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07, %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION" +solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07, %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION" packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-ro" -requires = "%UREPACKAGEPREFIX-ure,%BASISPACKAGEPREFIX%OOOBASEVERSION-core01,%BASISPACKAGEPREFIX%OOOBASEVERSION-core02,%BASISPACKAGEPREFIX%OOOBASEVERSION-core03,%BASISPACKAGEPREFIX%OOOBASEVERSION-core04,%BASISPACKAGEPREFIX%OOOBASEVERSION-core05,%BASISPACKAGEPREFIX%OOOBASEVERSION-core06,%BASISPACKAGEPREFIX%OOOBASEVERSION-core07,%UNIXPACKAGENAME%BRANDPACKAGEVERSION" +requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure,%BASISPACKAGEPREFIX%OOOBASEVERSION-core01,%BASISPACKAGEPREFIX%OOOBASEVERSION-core02,%BASISPACKAGEPREFIX%OOOBASEVERSION-core03,%BASISPACKAGEPREFIX%OOOBASEVERSION-core04,%BASISPACKAGEPREFIX%OOOBASEVERSION-core05,%BASISPACKAGEPREFIX%OOOBASEVERSION-core06,%BASISPACKAGEPREFIX%OOOBASEVERSION-core07,%UNIXPACKAGENAME%BRANDPACKAGEVERSION" linuxpatchrequires = "" copyright = "1999-2010 by Oracle" solariscopyright = "solariscopyrightfile" @@ -863,9 +879,9 @@ module = "gid_Module_Root_Extension_Dictionary_Ru" script = "shellscripts_extensions.txt" solarispackagename = "%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-ru" -solarisrequires = "%SOLSUREPACKAGEPREFIX-ure, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07, %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION" +solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07, %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION" packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-ru" -requires = "%UREPACKAGEPREFIX-ure,%BASISPACKAGEPREFIX%OOOBASEVERSION-core01,%BASISPACKAGEPREFIX%OOOBASEVERSION-core02,%BASISPACKAGEPREFIX%OOOBASEVERSION-core03,%BASISPACKAGEPREFIX%OOOBASEVERSION-core04,%BASISPACKAGEPREFIX%OOOBASEVERSION-core05,%BASISPACKAGEPREFIX%OOOBASEVERSION-core06,%BASISPACKAGEPREFIX%OOOBASEVERSION-core07,%UNIXPACKAGENAME%BRANDPACKAGEVERSION" +requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure,%BASISPACKAGEPREFIX%OOOBASEVERSION-core01,%BASISPACKAGEPREFIX%OOOBASEVERSION-core02,%BASISPACKAGEPREFIX%OOOBASEVERSION-core03,%BASISPACKAGEPREFIX%OOOBASEVERSION-core04,%BASISPACKAGEPREFIX%OOOBASEVERSION-core05,%BASISPACKAGEPREFIX%OOOBASEVERSION-core06,%BASISPACKAGEPREFIX%OOOBASEVERSION-core07,%UNIXPACKAGENAME%BRANDPACKAGEVERSION" linuxpatchrequires = "" copyright = "1999-2010 by Oracle" solariscopyright = "solariscopyrightfile" @@ -879,9 +895,9 @@ module = "gid_Module_Root_Extension_Dictionary_Sk" script = "shellscripts_extensions.txt" solarispackagename = "%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-sk" -solarisrequires = "%SOLSUREPACKAGEPREFIX-ure, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07, %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION" +solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07, %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION" packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-sk" -requires = "%UREPACKAGEPREFIX-ure,%BASISPACKAGEPREFIX%OOOBASEVERSION-core01,%BASISPACKAGEPREFIX%OOOBASEVERSION-core02,%BASISPACKAGEPREFIX%OOOBASEVERSION-core03,%BASISPACKAGEPREFIX%OOOBASEVERSION-core04,%BASISPACKAGEPREFIX%OOOBASEVERSION-core05,%BASISPACKAGEPREFIX%OOOBASEVERSION-core06,%BASISPACKAGEPREFIX%OOOBASEVERSION-core07,%UNIXPACKAGENAME%BRANDPACKAGEVERSION" +requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure,%BASISPACKAGEPREFIX%OOOBASEVERSION-core01,%BASISPACKAGEPREFIX%OOOBASEVERSION-core02,%BASISPACKAGEPREFIX%OOOBASEVERSION-core03,%BASISPACKAGEPREFIX%OOOBASEVERSION-core04,%BASISPACKAGEPREFIX%OOOBASEVERSION-core05,%BASISPACKAGEPREFIX%OOOBASEVERSION-core06,%BASISPACKAGEPREFIX%OOOBASEVERSION-core07,%UNIXPACKAGENAME%BRANDPACKAGEVERSION" linuxpatchrequires = "" copyright = "1999-2010 by Oracle" solariscopyright = "solariscopyrightfile" @@ -895,9 +911,9 @@ module = "gid_Module_Root_Extension_Dictionary_Sl" script = "shellscripts_extensions.txt" solarispackagename = "%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-sl" -solarisrequires = "%SOLSUREPACKAGEPREFIX-ure, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07, %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION" +solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07, %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION" packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-sl" -requires = "%UREPACKAGEPREFIX-ure,%BASISPACKAGEPREFIX%OOOBASEVERSION-core01,%BASISPACKAGEPREFIX%OOOBASEVERSION-core02,%BASISPACKAGEPREFIX%OOOBASEVERSION-core03,%BASISPACKAGEPREFIX%OOOBASEVERSION-core04,%BASISPACKAGEPREFIX%OOOBASEVERSION-core05,%BASISPACKAGEPREFIX%OOOBASEVERSION-core06,%BASISPACKAGEPREFIX%OOOBASEVERSION-core07,%UNIXPACKAGENAME%BRANDPACKAGEVERSION" +requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure,%BASISPACKAGEPREFIX%OOOBASEVERSION-core01,%BASISPACKAGEPREFIX%OOOBASEVERSION-core02,%BASISPACKAGEPREFIX%OOOBASEVERSION-core03,%BASISPACKAGEPREFIX%OOOBASEVERSION-core04,%BASISPACKAGEPREFIX%OOOBASEVERSION-core05,%BASISPACKAGEPREFIX%OOOBASEVERSION-core06,%BASISPACKAGEPREFIX%OOOBASEVERSION-core07,%UNIXPACKAGENAME%BRANDPACKAGEVERSION" linuxpatchrequires = "" copyright = "1999-2010 by Oracle" solariscopyright = "solariscopyrightfile" @@ -911,9 +927,9 @@ module = "gid_Module_Root_Extension_Dictionary_Sr" script = "shellscripts_extensions.txt" solarispackagename = "%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-sr" -solarisrequires = "%SOLSUREPACKAGEPREFIX-ure, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07, %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION" +solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07, %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION" packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-sr" -requires = "%UREPACKAGEPREFIX-ure,%BASISPACKAGEPREFIX%OOOBASEVERSION-core01,%BASISPACKAGEPREFIX%OOOBASEVERSION-core02,%BASISPACKAGEPREFIX%OOOBASEVERSION-core03,%BASISPACKAGEPREFIX%OOOBASEVERSION-core04,%BASISPACKAGEPREFIX%OOOBASEVERSION-core05,%BASISPACKAGEPREFIX%OOOBASEVERSION-core06,%BASISPACKAGEPREFIX%OOOBASEVERSION-core07,%UNIXPACKAGENAME%BRANDPACKAGEVERSION" +requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure,%BASISPACKAGEPREFIX%OOOBASEVERSION-core01,%BASISPACKAGEPREFIX%OOOBASEVERSION-core02,%BASISPACKAGEPREFIX%OOOBASEVERSION-core03,%BASISPACKAGEPREFIX%OOOBASEVERSION-core04,%BASISPACKAGEPREFIX%OOOBASEVERSION-core05,%BASISPACKAGEPREFIX%OOOBASEVERSION-core06,%BASISPACKAGEPREFIX%OOOBASEVERSION-core07,%UNIXPACKAGENAME%BRANDPACKAGEVERSION" linuxpatchrequires = "" copyright = "1999-2010 by Oracle" solariscopyright = "solariscopyrightfile" @@ -927,9 +943,9 @@ module = "gid_Module_Root_Extension_Dictionary_Sv" script = "shellscripts_extensions.txt" solarispackagename = "%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-sv" -solarisrequires = "%SOLSUREPACKAGEPREFIX-ure, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07, %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION" +solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07, %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION" packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-sv" -requires = "%UREPACKAGEPREFIX-ure,%BASISPACKAGEPREFIX%OOOBASEVERSION-core01,%BASISPACKAGEPREFIX%OOOBASEVERSION-core02,%BASISPACKAGEPREFIX%OOOBASEVERSION-core03,%BASISPACKAGEPREFIX%OOOBASEVERSION-core04,%BASISPACKAGEPREFIX%OOOBASEVERSION-core05,%BASISPACKAGEPREFIX%OOOBASEVERSION-core06,%BASISPACKAGEPREFIX%OOOBASEVERSION-core07,%UNIXPACKAGENAME%BRANDPACKAGEVERSION" +requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure,%BASISPACKAGEPREFIX%OOOBASEVERSION-core01,%BASISPACKAGEPREFIX%OOOBASEVERSION-core02,%BASISPACKAGEPREFIX%OOOBASEVERSION-core03,%BASISPACKAGEPREFIX%OOOBASEVERSION-core04,%BASISPACKAGEPREFIX%OOOBASEVERSION-core05,%BASISPACKAGEPREFIX%OOOBASEVERSION-core06,%BASISPACKAGEPREFIX%OOOBASEVERSION-core07,%UNIXPACKAGENAME%BRANDPACKAGEVERSION" linuxpatchrequires = "" copyright = "1999-2010 by Oracle" solariscopyright = "solariscopyrightfile" @@ -943,9 +959,9 @@ module = "gid_Module_Root_Extension_Dictionary_Sw" script = "shellscripts_extensions.txt" solarispackagename = "%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-sw" -solarisrequires = "%SOLSUREPACKAGEPREFIX-ure, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07, %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION" +solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07, %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION" packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-sw" -requires = "%UREPACKAGEPREFIX-ure,%BASISPACKAGEPREFIX%OOOBASEVERSION-core01,%BASISPACKAGEPREFIX%OOOBASEVERSION-core02,%BASISPACKAGEPREFIX%OOOBASEVERSION-core03,%BASISPACKAGEPREFIX%OOOBASEVERSION-core04,%BASISPACKAGEPREFIX%OOOBASEVERSION-core05,%BASISPACKAGEPREFIX%OOOBASEVERSION-core06,%BASISPACKAGEPREFIX%OOOBASEVERSION-core07,%UNIXPACKAGENAME%BRANDPACKAGEVERSION" +requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure,%BASISPACKAGEPREFIX%OOOBASEVERSION-core01,%BASISPACKAGEPREFIX%OOOBASEVERSION-core02,%BASISPACKAGEPREFIX%OOOBASEVERSION-core03,%BASISPACKAGEPREFIX%OOOBASEVERSION-core04,%BASISPACKAGEPREFIX%OOOBASEVERSION-core05,%BASISPACKAGEPREFIX%OOOBASEVERSION-core06,%BASISPACKAGEPREFIX%OOOBASEVERSION-core07,%UNIXPACKAGENAME%BRANDPACKAGEVERSION" linuxpatchrequires = "" copyright = "1999-2010 by Oracle" solariscopyright = "solariscopyrightfile" @@ -959,9 +975,9 @@ module = "gid_Module_Root_Extension_Dictionary_Th" script = "shellscripts_extensions.txt" solarispackagename = "%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-th" -solarisrequires = "%SOLSUREPACKAGEPREFIX-ure, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07, %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION" +solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07, %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION" packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-th" -requires = "%UREPACKAGEPREFIX-ure,%BASISPACKAGEPREFIX%OOOBASEVERSION-core01,%BASISPACKAGEPREFIX%OOOBASEVERSION-core02,%BASISPACKAGEPREFIX%OOOBASEVERSION-core03,%BASISPACKAGEPREFIX%OOOBASEVERSION-core04,%BASISPACKAGEPREFIX%OOOBASEVERSION-core05,%BASISPACKAGEPREFIX%OOOBASEVERSION-core06,%BASISPACKAGEPREFIX%OOOBASEVERSION-core07,%UNIXPACKAGENAME%BRANDPACKAGEVERSION" +requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure,%BASISPACKAGEPREFIX%OOOBASEVERSION-core01,%BASISPACKAGEPREFIX%OOOBASEVERSION-core02,%BASISPACKAGEPREFIX%OOOBASEVERSION-core03,%BASISPACKAGEPREFIX%OOOBASEVERSION-core04,%BASISPACKAGEPREFIX%OOOBASEVERSION-core05,%BASISPACKAGEPREFIX%OOOBASEVERSION-core06,%BASISPACKAGEPREFIX%OOOBASEVERSION-core07,%UNIXPACKAGENAME%BRANDPACKAGEVERSION" linuxpatchrequires = "" copyright = "1999-2010 by Oracle" solariscopyright = "solariscopyrightfile" @@ -975,9 +991,9 @@ module = "gid_Module_Root_Extension_Dictionary_Vi" script = "shellscripts_extensions.txt" solarispackagename = "%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-vi" -solarisrequires = "%SOLSUREPACKAGEPREFIX-ure, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07, %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION" +solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07, %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION" packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-dict-vi" -requires = "%UREPACKAGEPREFIX-ure,%BASISPACKAGEPREFIX%OOOBASEVERSION-core01,%BASISPACKAGEPREFIX%OOOBASEVERSION-core02,%BASISPACKAGEPREFIX%OOOBASEVERSION-core03,%BASISPACKAGEPREFIX%OOOBASEVERSION-core04,%BASISPACKAGEPREFIX%OOOBASEVERSION-core05,%BASISPACKAGEPREFIX%OOOBASEVERSION-core06,%BASISPACKAGEPREFIX%OOOBASEVERSION-core07,%UNIXPACKAGENAME%BRANDPACKAGEVERSION" +requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure,%BASISPACKAGEPREFIX%OOOBASEVERSION-core01,%BASISPACKAGEPREFIX%OOOBASEVERSION-core02,%BASISPACKAGEPREFIX%OOOBASEVERSION-core03,%BASISPACKAGEPREFIX%OOOBASEVERSION-core04,%BASISPACKAGEPREFIX%OOOBASEVERSION-core05,%BASISPACKAGEPREFIX%OOOBASEVERSION-core06,%BASISPACKAGEPREFIX%OOOBASEVERSION-core07,%UNIXPACKAGENAME%BRANDPACKAGEVERSION" linuxpatchrequires = "" copyright = "1999-2010 by Oracle" solariscopyright = "solariscopyrightfile" @@ -991,9 +1007,9 @@ module = "gid_Module_Root_Extension_Dictionary_Zu" script = "shellscripts_extensions.txt" solarispackagename = "%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-zu" -solarisrequires = "%SOLSUREPACKAGEPREFIX-ure, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07, %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION" +solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07, %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION" packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-zu" -requires = "%UREPACKAGEPREFIX-ure,%BASISPACKAGEPREFIX%OOOBASEVERSION-core01,%BASISPACKAGEPREFIX%OOOBASEVERSION-core02,%BASISPACKAGEPREFIX%OOOBASEVERSION-core03,%BASISPACKAGEPREFIX%OOOBASEVERSION-core04,%BASISPACKAGEPREFIX%OOOBASEVERSION-core05,%BASISPACKAGEPREFIX%OOOBASEVERSION-core06,%BASISPACKAGEPREFIX%OOOBASEVERSION-core07,%UNIXPACKAGENAME%BRANDPACKAGEVERSION" +requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure,%BASISPACKAGEPREFIX%OOOBASEVERSION-core01,%BASISPACKAGEPREFIX%OOOBASEVERSION-core02,%BASISPACKAGEPREFIX%OOOBASEVERSION-core03,%BASISPACKAGEPREFIX%OOOBASEVERSION-core04,%BASISPACKAGEPREFIX%OOOBASEVERSION-core05,%BASISPACKAGEPREFIX%OOOBASEVERSION-core06,%BASISPACKAGEPREFIX%OOOBASEVERSION-core07,%UNIXPACKAGENAME%BRANDPACKAGEVERSION" linuxpatchrequires = "" copyright = "1999-2010 by Oracle" solariscopyright = "solariscopyrightfile" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setup_native/source/packinfo/packinfo_office_lang.txt new/setup_native/source/packinfo/packinfo_office_lang.txt --- old/setup_native/source/packinfo/packinfo_office_lang.txt 2010-05-07 20:17:04.000000000 +0200 +++ new/setup_native/source/packinfo/packinfo_office_lang.txt 2010-11-02 12:43:32.000000000 +0100 @@ -25,8 +25,8 @@ requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01" copyright = "1999-2009 by OpenOffice.org" solariscopyright = "solariscopyrightfile" -vendor = "OpenOffice.org" -description = "Language module for OpenOffice.org %OOOBASEVERSION, language %LANGUAGESTRING" +vendor = "The Document Foundation" +description = "Language module for LibreOffice %OOOBASEVERSION, language %LANGUAGESTRING" destpath = "/opt" packageversion = "%OOOPACKAGEVERSION" pkg_list_entry = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01" @@ -41,8 +41,8 @@ requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING" copyright = "1999-2009 by OpenOffice.org" solariscopyright = "solariscopyrightfile" -vendor = "OpenOffice.org" -description = "Language fonts module for OpenOffice.org %OOOBASEVERSION, language %LANGUAGESTRING" +vendor = "The Document Foundation" +description = "Language fonts module for LibreOffice %OOOBASEVERSION, language %LANGUAGESTRING" destpath = "/opt" packageversion = "%OOOPACKAGEVERSION" pkg_list_entry = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01" @@ -57,8 +57,8 @@ requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING" copyright = "1999-2009 by OpenOffice.org" solariscopyright = "solariscopyrightfile" -vendor = "OpenOffice.org" -description = "Language resource module for OpenOffice.org %OOOBASEVERSION, language %LANGUAGESTRING" +vendor = "The Document Foundation" +description = "Language resource module for LibreOffice %OOOBASEVERSION, language %LANGUAGESTRING" destpath = "/opt" packageversion = "%OOOPACKAGEVERSION" pkg_list_entry = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01" @@ -73,8 +73,8 @@ requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING" copyright = "1999-2009 by OpenOffice.org" solariscopyright = "solariscopyrightfile" -vendor = "OpenOffice.org" -description = "Language help module for OpenOffice.org %OOOBASEVERSION, language %LANGUAGESTRING" +vendor = "The Document Foundation" +description = "Language help module for LibreOffice %OOOBASEVERSION, language %LANGUAGESTRING" destpath = "/opt" packageversion = "%OOOPACKAGEVERSION" pkg_list_entry = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01" @@ -89,8 +89,8 @@ requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING" copyright = "1999-2009 by OpenOffice.org" solariscopyright = "solariscopyrightfile" -vendor = "OpenOffice.org" -description = "Writer language module for OpenOffice.org %OOOBASEVERSION, language %LANGUAGESTRING" +vendor = "The Document Foundation" +description = "Writer language module for LibreOffice %OOOBASEVERSION, language %LANGUAGESTRING" destpath = "/opt" packageversion = "%OOOPACKAGEVERSION" pkg_list_entry = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-writer" @@ -105,8 +105,8 @@ requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING" copyright = "1999-2009 by OpenOffice.org" solariscopyright = "solariscopyrightfile" -vendor = "OpenOffice.org" -description = "Calc language module for OpenOffice.org %OOOBASEVERSION, language %LANGUAGESTRING" +vendor = "The Document Foundation" +description = "Calc language module for LibreOffice %OOOBASEVERSION, language %LANGUAGESTRING" destpath = "/opt" packageversion = "%OOOPACKAGEVERSION" pkg_list_entry = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-calc" @@ -121,8 +121,8 @@ requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING" copyright = "1999-2009 by OpenOffice.org" solariscopyright = "solariscopyrightfile" -vendor = "OpenOffice.org" -description = "Impress language module for OpenOffice.org %OOOBASEVERSION, language %LANGUAGESTRING" +vendor = "The Document Foundation" +description = "Impress language module for LibreOffice %OOOBASEVERSION, language %LANGUAGESTRING" destpath = "/opt" packageversion = "%OOOPACKAGEVERSION" pkg_list_entry = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-impress" @@ -137,8 +137,8 @@ requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING" copyright = "1999-2009 by OpenOffice.org" solariscopyright = "solariscopyrightfile" -vendor = "OpenOffice.org" -description = "Draw language module for OpenOffice.org %OOOBASEVERSION, language %LANGUAGESTRING" +vendor = "The Document Foundation" +description = "Draw language module for LibreOffice %OOOBASEVERSION, language %LANGUAGESTRING" destpath = "/opt" packageversion = "%OOOPACKAGEVERSION" pkg_list_entry = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-draw" @@ -153,8 +153,8 @@ requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING" copyright = "1999-2009 by OpenOffice.org" solariscopyright = "solariscopyrightfile" -vendor = "OpenOffice.org" -description = "Math language module for OpenOffice.org %OOOBASEVERSION, language %LANGUAGESTRING" +vendor = "The Document Foundation" +description = "Math language module for LibreOffice %OOOBASEVERSION, language %LANGUAGESTRING" destpath = "/opt" packageversion = "%OOOPACKAGEVERSION" pkg_list_entry = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-math" @@ -169,8 +169,8 @@ requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING" copyright = "1999-2009 by OpenOffice.org" solariscopyright = "solariscopyrightfile" -vendor = "OpenOffice.org" -description = "Base language module for OpenOffice.org %OOOBASEVERSION, language %LANGUAGESTRING" +vendor = "The Document Foundation" +description = "Base language module for LibreOffice %OOOBASEVERSION, language %LANGUAGESTRING" destpath = "/opt" packageversion = "%OOOPACKAGEVERSION" pkg_list_entry = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-base" @@ -185,8 +185,8 @@ requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING" copyright = "1999-2009 by OpenOffice.org" solariscopyright = "solariscopyrightfile" -vendor = "OpenOffice.org" -description = "Legacy filters (e.g. StarOffice 5.2) for OpenOffice.org %OOOBASEVERSION, language %LANGUAGESTRING" +vendor = "The Document Foundation" +description = "Legacy filters (e.g. StarOffice 5.2) for LibreOffice %OOOBASEVERSION, language %LANGUAGESTRING" destpath = "/opt" packageversion = "%OOOPACKAGEVERSION" pkg_list_entry = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-binfilter" @@ -201,8 +201,8 @@ requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING" copyright = "1999-2009 by OpenOffice.org" solariscopyright = "solariscopyrightfile" -vendor = "OpenOffice.org" -description = "Online update language module for OpenOffice.org %OOOBASEVERSION, language %LANGUAGESTRING" +vendor = "The Document Foundation" +description = "Online update language module for LibreOffice %OOOBASEVERSION, language %LANGUAGESTRING" destpath = "/opt" packageversion = "%OOOPACKAGEVERSION" pkg_list_entry = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-onlineupdate" @@ -310,5 +310,4 @@ packageversion = "%OOOPACKAGEVERSION" End -# END OF Language depended package definitions for OxygenOffice Professional - +# END OF Language depended package definitions diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setup_native/source/packinfo/packinfo_sdkoo.txt new/setup_native/source/packinfo/packinfo_sdkoo.txt --- old/setup_native/source/packinfo/packinfo_sdkoo.txt 2010-05-07 20:16:53.000000000 +0200 +++ new/setup_native/source/packinfo/packinfo_sdkoo.txt 2010-11-03 22:02:34.000000000 +0100 @@ -1,7 +1,7 @@ #************************************************************************* # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# +# # Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite @@ -32,10 +32,10 @@ packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-sdk" freebsdrequires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01" requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01" -copyright = "1999-2009 by OpenOffice.org" +copyright = "1999-2009 by OpenOffice.org Community" solariscopyright = "solariscopyrightfile" -vendor = "OpenOffice.org" -description = "Software Development Kit for OpenOffice.org %OOOBASEVERSION" +vendor = "The Document Foundation" +description = "Software Development Kit for LibreOffice %OOOBASEVERSION" destpath = "/opt" packageversion = "%OOOPACKAGEVERSION" End diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setup_native/source/packinfo/packinfo_sdkoo.txt.orig new/setup_native/source/packinfo/packinfo_sdkoo.txt.orig --- old/setup_native/source/packinfo/packinfo_sdkoo.txt.orig 2010-04-30 19:32:01.000000000 +0200 +++ new/setup_native/source/packinfo/packinfo_sdkoo.txt.orig 1970-01-01 01:00:00.000000000 +0100 @@ -1,41 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -Start -module = "gid_Module_Root" -solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-sdk" -solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01, SUNWbtool (Name="CCS tools bundled with SunOS"), SUNWxcu4 (Name="XCU4 Utilities")" -packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-sdk" -freebsdrequires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01" -requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01" -copyright = "1999-2009 by OpenOffice.org" -solariscopyright = "solariscopyrightfile" -vendor = "OpenOffice.org" -description = "Software Development Kit for OpenOffice.org %OOOBASEVERSION" -destpath = "/opt" -packageversion = "%OOOPACKAGEVERSION" -End diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setup_native/source/packinfo/packinfo_ure.txt new/setup_native/source/packinfo/packinfo_ure.txt --- old/setup_native/source/packinfo/packinfo_ure.txt 2010-04-30 19:32:01.000000000 +0200 +++ new/setup_native/source/packinfo/packinfo_ure.txt 2010-11-02 12:43:33.000000000 +0100 @@ -1,7 +1,7 @@ #************************************************************************* # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# +# # Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite @@ -27,12 +27,12 @@ Start module = "gid_Module_Root" -solarispackagename = "%SOLSUREPACKAGEPREFIX-ure" +solarispackagename = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure" solarisrequires = "SUNWzlibr" -packagename = "%UREPACKAGEPREFIX-ure" -copyright = "2005-2009 by OpenOffice.org" +packagename = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure" +copyright = "1999-2009 by OpenOffice.org" solariscopyright = "solariscopyrightfile" -vendor = "OpenOffice.org" +vendor = "The Document Foundation" description = "UNO Runtime Environment" destpath = "/opt" packageversion = "%UREPACKAGEVERSION" @@ -40,12 +40,12 @@ Start module = "gid_Module_Root_Ure_Hidden" -solarispackagename = "%SOLSUREPACKAGEPREFIX-ure" +solarispackagename = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure" solarisrequires = "SUNWzlibr" -packagename = "%UREPACKAGEPREFIX-ure" -copyright = "2005-2009 by OpenOffice.org" +packagename = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure" +copyright = "2005-1999-2009 by OpenOffice.org" solariscopyright = "solariscopyrightfile" -vendor = "OpenOffice.org" +vendor = "The Document Foundation" description = "UNO Runtime Environment" destpath = "/opt" packageversion = "%UREPACKAGEVERSION" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setup_native/source/packinfo/private1copyrightfile new/setup_native/source/packinfo/private1copyrightfile --- old/setup_native/source/packinfo/private1copyrightfile 2010-04-30 19:32:01.000000000 +0200 +++ new/setup_native/source/packinfo/private1copyrightfile 1970-01-01 01:00:00.000000000 +0100 @@ -1,2 +0,0 @@ -Copyright 2000, 2010 Oracle and/or its affiliates. All rights reserved. -Use is subject to license terms. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setup_native/source/packinfo/shellscripts_brand.txt new/setup_native/source/packinfo/shellscripts_brand.txt --- old/setup_native/source/packinfo/shellscripts_brand.txt 2010-04-30 19:32:01.000000000 +0200 +++ new/setup_native/source/packinfo/shellscripts_brand.txt 2010-11-02 12:43:33.000000000 +0100 @@ -13,7 +13,7 @@ PRODUCTINSTALLLOCATION="$$BASEDIR" ;; Linux) - BASISPACKAGE=openoffice.org-core01 + BASISPACKAGE=libreoffice-core01 BASISDIR=`rpm -q --queryformat "%{INSTALLPREFIX}" $$BASISPACKAGE` PRODUCTINSTALLLOCATION="$$RPM_INSTALL_PREFIX" ;; @@ -23,11 +23,11 @@ esac # creating link to basis layer -if [ -d $$BASISDIR/openoffice.org/basisBASISDIRECTORYVERSION ] +if [ -d $$BASISDIR/libreoffice/basisBASISDIRECTORYVERSION ] then - ln -s $$BASISDIR/openoffice.org/basisBASISDIRECTORYVERSION $$PRODUCTINSTALLLOCATION/PRODUCTDIRECTORYNAME/basis-link >/dev/null 2>&1 + ln -s $$BASISDIR/libreoffice/basisBASISDIRECTORYVERSION $$PRODUCTINSTALLLOCATION/PRODUCTDIRECTORYNAME/basis-link >/dev/null 2>&1 else - ln -s ../openoffice.org/basisBASISDIRECTORYVERSION $$PRODUCTINSTALLLOCATION/PRODUCTDIRECTORYNAME/basis-link >/dev/null 2>&1 + ln -s ../libreoffice/basisBASISDIRECTORYVERSION $$PRODUCTINSTALLLOCATION/PRODUCTDIRECTORYNAME/basis-link >/dev/null 2>&1 fi exit 0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setup_native/source/packinfo/shellscripts_core01.txt new/setup_native/source/packinfo/shellscripts_core01.txt --- old/setup_native/source/packinfo/shellscripts_core01.txt 2010-04-30 19:32:01.000000000 +0200 +++ new/setup_native/source/packinfo/shellscripts_core01.txt 2010-11-02 12:43:33.000000000 +0100 @@ -8,12 +8,12 @@ platform=`uname -s` case $$platform in SunOS) - UREPACKAGE=SOLSUREPACKAGEPREFIX-ure + UREPACKAGE=SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure UREDIR=`pkginfo -r $$UREPACKAGE` PRODUCTINSTALLLOCATION="$$BASEDIR" ;; Linux) - UREPACKAGE=UREPACKAGEPREFIX-ure + UREPACKAGE=UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure UREDIR=`rpm -q --queryformat "%{INSTALLPREFIX}" $$UREPACKAGE` PRODUCTINSTALLLOCATION="$$RPM_INSTALL_PREFIX" ;; @@ -23,11 +23,11 @@ esac # creating link to ure -if [ -d $$UREDIR/openoffice.org/ure ] +if [ -d $$UREDIR/libreoffice/ure ] then - ln -s $$UREDIR/openoffice.org/ure $$PRODUCTINSTALLLOCATION/openoffice.org/basisBASISDIRECTORYVERSION/ure-link >/dev/null 2>&1 + ln -s $$UREDIR/libreoffice/ure $$PRODUCTINSTALLLOCATION/libreoffice/basisBASISDIRECTORYVERSION/ure-link >/dev/null 2>&1 else - ln -s ../ure $$PRODUCTINSTALLLOCATION/openoffice.org/basisBASISDIRECTORYVERSION/ure-link >/dev/null 2>&1 + ln -s ../ure $$PRODUCTINSTALLLOCATION/libreoffice/basisBASISDIRECTORYVERSION/ure-link >/dev/null 2>&1 fi exit 0 @@ -59,11 +59,10 @@ ;; esac -if [ -h $$PRODUCTINSTALLLOCATION/openoffice.org/basisBASISDIRECTORYVERSION/ure-link -a $$LASTUNINSTALL -eq 1 ] +if [ -h $$PRODUCTINSTALLLOCATION/libreoffice/basisBASISDIRECTORYVERSION/ure-link -a $$LASTUNINSTALL -eq 1 ] then - rm -f $$PRODUCTINSTALLLOCATION/openoffice.org/basisBASISDIRECTORYVERSION/ure-link 2>/dev/null - rmdir $$PRODUCTINSTALLLOCATION/openoffice.org/basisBASISDIRECTORYVERSION 2>/dev/null - rmdir $$PRODUCTINSTALLLOCATION/openoffice.org 2>/dev/null + rm -f $$PRODUCTINSTALLLOCATION/libreoffice/basisBASISDIRECTORYVERSION/ure-link 2>/dev/null + rmdir $$PRODUCTINSTALLLOCATION/libreoffice/basisBASISDIRECTORYVERSION 2>/dev/null fi exit 0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setup_native/source/packinfo/shellscripts_extensions.txt new/setup_native/source/packinfo/shellscripts_extensions.txt --- old/setup_native/source/packinfo/shellscripts_extensions.txt 2010-04-30 19:32:01.000000000 +0200 +++ new/setup_native/source/packinfo/shellscripts_extensions.txt 2010-11-02 12:43:33.000000000 +0100 @@ -27,7 +27,7 @@ # DISKLESS_SRVC=`echo $$BASEDIR | /usr/bin/grep export/Solaris_[1-9][0-9]/usr_$${ARCH}.all` if [ "$$DISKLESS_SRVC" ]; then - UNOPKG=/export/Solaris_11/usr_`uname -p`.all/opt/staroffice9/program/unopkg + UNOPKG=/export/Solaris_11/usr_`uname -p`.allPRODUCTDIRECTORYNAME/program/unopkg POSTRUN=$$PKG_INSTALL_ROOT/usr_`uname -p`.all/usr/lib/postrun CLIENT_BASEDIR=$$PKG_INSTALL_ROOT/usr_$${ARCH}.all else @@ -38,18 +38,20 @@ if [ -x $$POSTRUN ]; then ( echo "test -x \"$$CLIENT_BASEDIR/PRODUCTDIRECTORYNAME/program/unopkg\" || exit 0" echo "umask 022" - echo "\"$$CLIENT_BASEDIR/PRODUCTDIRECTORYNAME/program/unopkg\" add --shared --suppress-license --bundled \"$$CLIENT_BASEDIR/PRODUCTDIRECTORYNAME/share/extension/install/${OXTFILENAME}\" \"-env:UserInstallation=file:////$$INSTDIR\" '-env:UNO_JAVA_JFW_INSTALL_DATA=\$$OOO_BASE_DIR/share/config/javasettingsunopkginstall.xml' '-env:JFW_PLUGIN_DO_NOT_CHECK_ACCESSIBILITY=1'" + echo "\"$$CLIENT_BASEDIR/PRODUCTDIRECTORYNAME/program/unopkg\" sync \"-env:BUNDLED_EXTENSIONS_USER=file:////$$CLIENT_BASEDIR/PRODUCTDIRECTORYNAME/share/prereg/bundled\" \"-env:UserInstallation=file:////$$INSTDIR\" '-env:UNO_JAVA_JFW_INSTALL_DATA=\$$OOO_BASE_DIR/share/config/javasettingsunopkginstall.xml' '-env:JFW_PLUGIN_DO_NOT_CHECK_ACCESSIBILITY=1'" + echo "find \"$$CLIENT_BASEDIR/PRODUCTDIRECTORYNAME/share/prereg/bundled\" -type f -exec chmod 644 {} \\;" ) | $$POSTRUN -b -c UNOPKG if [ "$$?" != "0" ]; then - echo "\nERROR: Installation of UNO extension ${OXTFILENAME}" + echo "\nERROR: Installation of UNO extensions" echo " through $$POSTRUN failed." exit 1 fi else # No postrun available, try running unopkg directly - "$$UNOPKG" add --shared --suppress-license --bundled "$$BASEDIR/PRODUCTDIRECTORYNAME/share/extension/install/${OXTFILENAME}" "-env:UserInstallation=file:////$$INSTDIR" '-env:UNO_JAVA_JFW_INSTALL_DATA=$$OOO_BASE_DIR/share/config/javasettingsunopkginstall.xml' '-env:JFW_PLUGIN_DO_NOT_CHECK_ACCESSIBILITY=1' + "$$UNOPKG" sync "-env:BUNDLED_EXTENSIONS_USER=file:////////$$BASEDIR/PRODUCTDIRECTORYNAME/share/prereg/bundled" "-env:UserInstallation=file:////////$$INSTDIR" '-env:UNO_JAVA_JFW_INSTALL_DATA=$$OOO_BASE_DIR/share/config/javasettingsunopkginstall.xml' '-env:JFW_PLUGIN_DO_NOT_CHECK_ACCESSIBILITY=1' + find "$$BASEDIR/PRODUCTDIRECTORYNAME/share/prereg/bundled" -type f -exec chmod 644 {} \; if [ "$$?" != "0" ]; then - echo "\nERROR: Installation of UNO extension ${OXTFILENAME} failed." + echo "\nERROR: Installation of UNO extensions failed." test "$$BASEDIR" = "$$CLIENT_BASEDIR" || echo "ERROR: alternate root install requires SUNWpostrun package to be installed" echo 'ERROR: Make sure the runtime requirements (operating system, patch level, architecture) are met.' exit 1 @@ -63,7 +65,8 @@ exit 0 END -%preremove << END +%postremove << END + if [ -n "$$TMPDIR" ]; then UNOPKGTMP="$$TMPDIR" elif [ -n "$$TMP" ]; then @@ -89,15 +92,17 @@ ( echo "test -x \"$$CLIENT_BASEDIR/PRODUCTDIRECTORYNAME/program/unopkg\" || exit 0" echo "cd \"$$CLIENT_BASEDIR/PRODUCTDIRECTORYNAME/program\"" echo "umask 022" - echo "\"$$CLIENT_BASEDIR/PRODUCTDIRECTORYNAME/program/unopkg\" remove --shared --bundled \"${OXTFILENAME}\" \"-env:UserInstallation=file:////$$INSTDIR\" '-env:UNO_JAVA_JFW_INSTALL_DATA=\$$OOO_BASE_DIR/share/config/javasettingsunopkginstall.xml' '-env:JFW_PLUGIN_DO_NOT_CHECK_ACCESSIBILITY=1'" + echo "\"$$CLIENT_BASEDIR/PRODUCTDIRECTORYNAME/program/unopkg\" sync \"-env:BUNDLED_EXTENSIONS_USER=file:////$$CLIENT_BASEDIR/PRODUCTDIRECTORYNAME/share/prereg/bundled\" \"-env:UserInstallation=file:////$$INSTDIR\" '-env:UNO_JAVA_JFW_INSTALL_DATA=\$$OOO_BASE_DIR/share/config/javasettingsunopkginstall.xml' '-env:JFW_PLUGIN_DO_NOT_CHECK_ACCESSIBILITY=1'" + echo "find \"$$CLIENT_BASEDIR/PRODUCTDIRECTORYNAME/share/prereg/bundled\" -type f -exec chmod 644 {} \\;" echo "rm -rf \"$$INSTDIR\"" ) | $$PKG_INSTALL_ROOT/usr/lib/postrun -c UNOPKG else # No postrun available, try running unopkg directly test -x $$BASEDIR/PRODUCTDIRECTORYNAME/program/unopkg || exit 0 - "$$BASEDIR/PRODUCTDIRECTORYNAME/program/unopkg" remove --shared --bundled "${OXTFILENAME}" "-env:UserInstallation=file:////$$INSTDIR" '-env:UNO_JAVA_JFW_INSTALL_DATA=$$OOO_BASE_DIR/share/config/javasettingsunopkginstall.xml' '-env:JFW_PLUGIN_DO_NOT_CHECK_ACCESSIBILITY=1' + "$$BASEDIR/PRODUCTDIRECTORYNAME/program/unopkg" sync "-env:BUNDLED_EXTENSIONS_USER=file:////////$$BASEDIR/PRODUCTDIRECTORYNAME/share/prereg/bundled" "-env:UserInstallation=file:////////$$INSTDIR" '-env:UNO_JAVA_JFW_INSTALL_DATA=$$OOO_BASE_DIR/share/config/javasettingsunopkginstall.xml' '-env:JFW_PLUGIN_DO_NOT_CHECK_ACCESSIBILITY=1' + echo "find \"$$BASEDIR/PRODUCTDIRECTORYNAME/share/prereg/bundled\" -type f -exec chmod 644 {} \\;" if [ "$$?" != "0" ]; then - echo "\nERROR: Removal of UNO extension ${OXTFILENAME} failed." + echo "\nERROR: Removal of UNO extension failed." test "$$BASEDIR" = "$$CLIENT_BASEDIR" || echo "ERROR: alternate root uninstall requires SUNWpostrun package to be installed" echo 'ERROR: Make sure the runtime requirements (operating system, patch level, architecture) are met.' exit 1 @@ -115,44 +120,6 @@ %format rpm -# As remove does not need the oxt file, this could potentially -# be done in the postinstall script as well. -%preinstall << END -# if this is an update, remove the old package instance first -test "$$1" = "2" || exit 0 - -#Find the temp dir -if [ -n "$$TMPDIR" ]; then - UNOPKGTMP="$$TMPDIR" -elif [ -n "$$TMP" ]; then - UNOPKGTMP="$$TMP" -elif [ -d "/tmp" ]; then - UNOPKGTMP="/tmp" -else - echo "No tmp directory found!" - exit 1 -fi - -#Create the command which creates a temporary directory -if [ -x "/bin/mktemp" ] -then - INSTDIR=`/bin/mktemp -d "$${UNOPKGTMP}/userinstall.XXXXXX"` -else - INSTDIR="$${UNOPKGTMP}/userinstall.$$$$" - mkdir "$$INSTDIR" -fi - -if [ -x "$$RPM_INSTALL_PREFIX/PRODUCTDIRECTORYNAME/program/unopkg" ]; then - "$$RPM_INSTALL_PREFIX/PRODUCTDIRECTORYNAME/program/unopkg" remove --shared --bundled "${OXTFILENAME}" "-env:UserInstallation=file:////$$INSTDIR" '-env:UNO_JAVA_JFW_INSTALL_DATA=$$OOO_BASE_DIR/share/config/javasettingsunopkginstall.xml' '-env:JFW_PLUGIN_DO_NOT_CHECK_ACCESSIBILITY=1' -fi - -if [ -n "$$INSTDIR" ]; then - rm -rf "$$INSTDIR" -fi - -exit 0 -END - %postinstall << END #Find the temp dir if [ -n "$$TMPDIR" ]; then @@ -176,7 +143,8 @@ fi if [ -x "$$RPM_INSTALL_PREFIX/PRODUCTDIRECTORYNAME/program/unopkg" ]; then - "$$RPM_INSTALL_PREFIX/PRODUCTDIRECTORYNAME/program/unopkg" add --shared --suppress-license --shared "$$RPM_INSTALL_PREFIX/PRODUCTDIRECTORYNAME/share/extension/install/${OXTFILENAME}" "-env:UserInstallation=file://////$$INSTDIR" '-env:UNO_JAVA_JFW_INSTALL_DATA=$$OOO_BASE_DIR/share/config/javasettingsunopkginstall.xml' '-env:JFW_PLUGIN_DO_NOT_CHECK_ACCESSIBILITY=1' + "$$RPM_INSTALL_PREFIX/PRODUCTDIRECTORYNAME/program/unopkg" sync "-env:BUNDLED_EXTENSIONS_USER=file:////$$RPM_INSTALL_PREFIX/PRODUCTDIRECTORYNAME/share/prereg/bundled" "-env:UserInstallation=file:////$$INSTDIR" '-env:UNO_JAVA_JFW_INSTALL_DATA=$$OOO_BASE_DIR/share/config/javasettingsunopkginstall.xml' '-env:JFW_PLUGIN_DO_NOT_CHECK_ACCESSIBILITY=1' + find "$$RPM_INSTALL_PREFIX/PRODUCTDIRECTORYNAME/share/prereg/bundled" -type f -exec chmod 644 {} \; fi if [ -n "$$INSTDIR" ]; then @@ -185,13 +153,9 @@ exit 0 - END -%preremove << END -# if this is an update, just do nothing -test "$$1" = "0" || exit 0 - +%postremove << END #Find the temp dir if [ -n "$$TMPDIR" ]; then UNOPKGTMP="$$TMPDIR" @@ -214,7 +178,8 @@ fi if [ -x "$$RPM_INSTALL_PREFIX/PRODUCTDIRECTORYNAME/program/unopkg" ]; then - "$$RPM_INSTALL_PREFIX/PRODUCTDIRECTORYNAME/program/unopkg" remove --shared --bundled "${OXTFILENAME}" "-env:UserInstallation=file:////$$INSTDIR" '-env:UNO_JAVA_JFW_INSTALL_DATA=$$OOO_BASE_DIR/share/config/javasettingsunopkginstall.xml' '-env:JFW_PLUGIN_DO_NOT_CHECK_ACCESSIBILITY=1' + "$$RPM_INSTALL_PREFIX/PRODUCTDIRECTORYNAME/program/unopkg" sync "-env:BUNDLED_EXTENSIONS_USER=file:////$$RPM_INSTALL_PREFIX/PRODUCTDIRECTORYNAME/share/prereg/bundled" "-env:UserInstallation=file:////$$INSTDIR" '-env:UNO_JAVA_JFW_INSTALL_DATA=$$OOO_BASE_DIR/share/config/javasettingsunopkginstall.xml' '-env:JFW_PLUGIN_DO_NOT_CHECK_ACCESSIBILITY=1' + find "$$RPM_INSTALL_PREFIX/PRODUCTDIRECTORYNAME/share/prereg/bundled" -type f -exec chmod 644 {} \; fi if [ -n "$$INSTDIR" ]; then @@ -226,53 +191,6 @@ %format deb -# As remove does not need the oxt file, this could potentially -# be done in the postinstall script as well. -%preinstall << END -# if this is an update, remove the old package instance first -if [ "$$1" != "upgrade" ] -then - exit 0 -fi - -#Find the temp dir -if [ -n "$$TMPDIR" ] -then - UNOPKGTMP="$$TMPDIR" -elif [ -n "$$TMP" ] -then - UNOPKGTMP="$$TMP" -elif [ -d "/tmp" ] -then - UNOPKGTMP="/tmp" -else - echo "No tmp directory found!" - exit 1 -fi - - -#Create the command which creates a temporary directory -if [ -x "/bin/mktemp" ] -then - INSTDIR=`/bin/mktemp -d "$${UNOPKGTMP}/userinstall.XXXXXX"` -else - INSTDIR="$${UNOPKGTMP}/userinstall.$$$$" - mkdir "$$INSTDIR" -fi - -if [ -x "PRODUCTDIRECTORYNAME/program/unopkg" ] -then - "PRODUCTDIRECTORYNAME/program/unopkg" remove --shared --bundled "${OXTFILENAME}" "-env:UserInstallation=file:////$$INSTDIR" '-env:UNO_JAVA_JFW_INSTALL_DATA=$$OOO_BASE_DIR/share/config/javasettingsunopkginstall.xml' '-env:JFW_PLUGIN_DO_NOT_CHECK_ACCESSIBILITY=1' -fi - -if [ -n "$$INSTDIR" ] -then - rm -rf "$$INSTDIR" -fi - -exit 0 -END - %postinstall << END #Find the temp dir if [ -n "$$TMPDIR" ] @@ -299,7 +217,8 @@ fi if [ -x "PRODUCTDIRECTORYNAME/program/unopkg" ]; then - "PRODUCTDIRECTORYNAME/program/unopkg" add --shared --suppress-license --bundled "PRODUCTDIRECTORYNAME/share/extension/install/${OXTFILENAME}" "-env:UserInstallation=file://////$$INSTDIR" '-env:UNO_JAVA_JFW_INSTALL_DATA=$$OOO_BASE_DIR/share/config/javasettingsunopkginstall.xml' '-env:JFW_PLUGIN_DO_NOT_CHECK_ACCESSIBILITY=1' + "PRODUCTDIRECTORYNAME/program/unopkg" sync "-env:BUNDLED_EXTENSIONS_USER=file://////PRODUCTDIRECTORYNAME/share/prereg/bundled" "-env:UserInstallation=file://////$$INSTDIR" '-env:UNO_JAVA_JFW_INSTALL_DATA=$$OOO_BASE_DIR/share/config/javasettingsunopkginstall.xml' '-env:JFW_PLUGIN_DO_NOT_CHECK_ACCESSIBILITY=1' + find "PRODUCTDIRECTORYNAME/share/prereg/bundled" -type f -exec chmod 644 {} \; fi if [ -n "$$INSTDIR" ] @@ -309,18 +228,10 @@ exit 0 - END -%preremove << END -# if this is an update, just do nothing - -if [ "$$1" = "upgrade" ] -then - exit 0 -fi - -#Find the temp dir +%postremove << END +# Find the temp dir if [ -n "$$TMPDIR" ] then UNOPKGTMP="$$TMPDIR" @@ -346,7 +257,8 @@ if [ -x "PRODUCTDIRECTORYNAME/program/unopkg" ] then - "PRODUCTDIRECTORYNAME/program/unopkg" remove --shared --bundled "${OXTFILENAME}" "-env:UserInstallation=file:////$$INSTDIR" '-env:UNO_JAVA_JFW_INSTALL_DATA=$$OOO_BASE_DIR/share/config/javasettingsunopkginstall.xml' '-env:JFW_PLUGIN_DO_NOT_CHECK_ACCESSIBILITY=1' + "PRODUCTDIRECTORYNAME/program/unopkg" sync "-env:BUNDLED_EXTENSIONS_USER=file://////PRODUCTDIRECTORYNAME/share/prereg/bundled" "-env:UserInstallation=file://////$$INSTDIR" '-env:UNO_JAVA_JFW_INSTALL_DATA=$$OOO_BASE_DIR/share/config/javasettingsunopkginstall.xml' '-env:JFW_PLUGIN_DO_NOT_CHECK_ACCESSIBILITY=1' + find "PRODUCTDIRECTORYNAME/share/prereg/bundled" -type f -exec chmod 644 {} \; fi if [ -n "$$INSTDIR" ] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setup_native/source/packinfo/solariscopyrightfile new/setup_native/source/packinfo/solariscopyrightfile --- old/setup_native/source/packinfo/solariscopyrightfile 2010-04-30 19:32:01.000000000 +0200 +++ new/setup_native/source/packinfo/solariscopyrightfile 1970-01-01 01:00:00.000000000 +0100 @@ -1,2 +0,0 @@ -Copyright 2000, 2010 Oracle and/or its affiliates. All rights reserved. -Use is subject to license terms. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setup_native/source/packinfo/spellchecker_selection.txt new/setup_native/source/packinfo/spellchecker_selection.txt --- old/setup_native/source/packinfo/spellchecker_selection.txt 2010-04-30 19:32:01.000000000 +0200 +++ new/setup_native/source/packinfo/spellchecker_selection.txt 2010-11-02 12:43:33.000000000 +0100 @@ -22,6 +22,7 @@ gl = "gl,en-US,pt,es" he = "he,en-US" hu = "hu,de-DE,en-US" +hr = "hr,de-DE,en-US" it = "it,de-DE,en-US,fr" ja = "EMPTY,en-US" ko = "EMPTY,en-US" @@ -44,6 +45,7 @@ sh = "sr,en-US" sw = "sw,en-US" th = "th,en-US" +uk = "ru,en-US" vi = "vi,en-US,fr" zh-TW = "EMPTY,en-US" zh-CN = "EMPTY,en-US" Files old/setup_native/source/packinfo/ure.pcp and new/setup_native/source/packinfo/ure.pcp differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setup_native/source/packinfo/userland.txt new/setup_native/source/packinfo/userland.txt --- old/setup_native/source/packinfo/userland.txt 2010-04-30 19:32:01.000000000 +0200 +++ new/setup_native/source/packinfo/userland.txt 2010-11-02 12:43:32.000000000 +0100 @@ -25,4 +25,4 @@ # #************************************************************************* -USERLANDPACKAGENAME=openoffice.org-userland-1.0-0.noarch.rpm +USERLANDPACKAGENAME=libreoffice-userland-1.0-0.noarch.rpm ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit perl-URI for openSUSE:Factory
by root＠hilbert.suse.de 22 Nov '10

22 Nov '10

Hello community, here is the log from the commit of package perl-URI for openSUSE:Factory checked in at Mon Nov 22 14:08:16 CET 2010. -------- --- perl-URI/perl-URI.changes 2010-09-04 21:31:21.000000000 +0200 +++ perl-URI/perl-URI.changes 2010-11-22 13:39:59.000000000 +0100 @@ -1,0 +2,6 @@ +Mon Nov 22 12:53:06 CET 2010 - anicka(a)suse.cz + +- update to 1.56 + * Don't depend on DNS for the heuristics test + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- URI-1.55.tar.bz2 New: ---- URI-1.56.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-URI.spec ++++++ --- /var/tmp/diff_new_pack.f0TDkX/_old 2010-11-22 14:06:21.000000000 +0100 +++ /var/tmp/diff_new_pack.f0TDkX/_new 2010-11-22 14:06:21.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package perl-URI (Version 1.55) +# spec file for package perl-URI (Version 1.56) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -22,7 +22,7 @@ Name: perl-URI %define cpan_name URI Summary: Uniform Resource Identifiers (absolute and relative) -Version: 1.55 +Version: 1.56 Release: 1 License: GPL+ or Artistic Group: Development/Libraries/Perl ++++++ URI-1.55.tar.bz2 -> URI-1.56.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/URI-1.55/Changes new/URI-1.56/Changes --- old/URI-1.55/Changes 2010-09-01 23:34:41.000000000 +0200 +++ new/URI-1.56/Changes 2010-10-06 22:33:29.000000000 +0200 @@ -1,3 +1,11 @@ +2010-10-06 Gisle Aas <gisle(a)ActiveState.com> + + Release 1.56 + + Don't depend on DNS for the heuristics test + + + 2010-09-01 Gisle Aas <gisle(a)ActiveState.com> Release 1.55 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/URI-1.55/META.yml new/URI-1.56/META.yml --- old/URI-1.55/META.yml 2010-09-01 23:35:31.000000000 +0200 +++ new/URI-1.56/META.yml 2010-10-06 22:34:14.000000000 +0200 @@ -1,6 +1,6 @@ --- #YAML:1.0 name: URI -version: 1.55 +version: 1.56 abstract: Uniform Resource Identifiers (absolute and relative) author: - Gisle Aas <gisle(a)activestate.com> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/URI-1.55/URI.pm new/URI-1.56/URI.pm --- old/URI-1.55/URI.pm 2010-09-01 23:32:24.000000000 +0200 +++ new/URI-1.56/URI.pm 2010-10-06 22:32:18.000000000 +0200 @@ -2,7 +2,7 @@ use strict; use vars qw($VERSION); -$VERSION = "1.55"; +$VERSION = "1.56"; use vars qw($ABS_REMOTE_LEADING_DOTS $ABS_ALLOW_RELATIVE_SCHEME $DEFAULT_QUERY_FORM_DELIMITER); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/URI-1.55/t/heuristic.t new/URI-1.56/t/heuristic.t --- old/URI-1.55/t/heuristic.t 2010-03-31 09:02:38.000000000 +0200 +++ new/URI-1.56/t/heuristic.t 2010-10-06 22:29:14.000000000 +0200 @@ -1,8 +1,15 @@ #!perl -w -if (-f "OFFLINE") { - print "1..0"; - exit; +BEGIN { + # mock up a gethostbyname that always works :-) + *CORE::GLOBAL::gethostbyname = sub { + my $name = shift; + #print "# gethostbyname [$name]\n"; + die if wantarray; + return 1 if $name =~ /^www\.perl\.(com|org|ca|su)\.$/; + return 1 if $name eq "www.perl.co.uk\."; + return 0; + }; } print "1..20\n"; @@ -41,90 +48,72 @@ } print "ok 5\n"; -if (gethostbyname("www.perl.com") && gethostbyname("www.perl.co.uk") && !gethostbyname("www.perl.bv")) { - # DNS works, let's run tests 6..12 - - { - local $ENV{LC_ALL} = ""; - local $ENV{LANG} = ""; - local $ENV{HTTP_ACCEPT_LANGUAGE} = ""; - - $ENV{LC_ALL} = "en_GB.UTF-8"; - undef $URI::Heuristic::MY_COUNTRY; - print "not " unless uf_urlstr("perl/camel.gif") =~ m,^http://www\.perl\.(org|co)\.uk/camel\.gif$,; - print "ok 6\n"; - - use Net::Domain; - $ENV{LC_ALL} = "C"; - { no warnings; *Net::Domain::hostfqdn = sub { return 'vasya.su' } } - undef $URI::Heuristic::MY_COUNTRY; - print "not " unless uf_urlstr("perl/camel.gif") =~ m,^http://www\.perl\.su/camel\.gif$,; - print "ok 7\n"; - - $ENV{LC_ALL} = "C"; - { no warnings; *Net::Domain::hostfqdn = sub { return '' } } - undef $URI::Heuristic::MY_COUNTRY; - print "not " unless uf_urlstr("perl/camel.gif") =~ m,^http://www\.perl\.(com|org)/camel\.gif$,; - print "ok 8\n"; - - $ENV{HTTP_ACCEPT_LANGUAGE} = "en-ca"; - undef $URI::Heuristic::MY_COUNTRY; - print "not " unless uf_urlstr("perl/camel.gif") eq "http://www.perl.ca/camel.gif"; - print "ok 9\n"; - } - - $URI::Heuristic::MY_COUNTRY = "bv"; - print "not " unless uf_urlstr("perl/camel.gif") =~ m,^http://www\.perl\.(com|org)/camel\.gif$,; - print "ok 10\n"; - - # Backwards compatibility; uk != United Kingdom in ISO 3166 - $URI::Heuristic::MY_COUNTRY = "uk"; - print "not " unless uf_urlstr("perl/camel.gif") =~ m,^http://www\.perl\.(org|co)\.uk/camel\.gif$,; - print "ok 11\n"; +{ + local $ENV{LC_ALL} = ""; + local $ENV{LANG} = ""; + local $ENV{HTTP_ACCEPT_LANGUAGE} = ""; - $URI::Heuristic::MY_COUNTRY = "gb"; + $ENV{LC_ALL} = "en_GB.UTF-8"; + undef $URI::Heuristic::MY_COUNTRY; print "not " unless uf_urlstr("perl/camel.gif") =~ m,^http://www\.perl\.(org|co)\.uk/camel\.gif$,; - print "ok 12\n"; + print "ok 6\n"; - $ENV{URL_GUESS_PATTERN} = "www.ACME.org www.ACME.com"; - print "not " unless uf_urlstr("perl") eq "http://www.perl.org"; - print "ok 13\n"; + use Net::Domain; + $ENV{LC_ALL} = "C"; + { no warnings; *Net::Domain::hostfqdn = sub { return 'vasya.su' } } + undef $URI::Heuristic::MY_COUNTRY; + print "not " unless uf_urlstr("perl/camel.gif") =~ m,^http://www\.perl\.su/camel\.gif$,; + print "ok 7\n"; + + $ENV{LC_ALL} = "C"; + { no warnings; *Net::Domain::hostfqdn = sub { return '' } } + undef $URI::Heuristic::MY_COUNTRY; + print "not " unless uf_urlstr("perl/camel.gif") =~ m,^http://www\.perl\.(com|org)/camel\.gif$,; + print "ok 8\n"; -} else { - # don't make the innocent worry - print "Skipping test 6-12 because DNS does not work\n"; - for (6..13) { print "ok $_\n"; } - -} + $ENV{HTTP_ACCEPT_LANGUAGE} = "en-ca"; + undef $URI::Heuristic::MY_COUNTRY; + print "not " unless uf_urlstr("perl/camel.gif") eq "http://www.perl.ca/camel.gif"; + print "ok 9\n"; +} + +$URI::Heuristic::MY_COUNTRY = "bv"; +print "not " unless uf_urlstr("perl/camel.gif") =~ m,^http://www\.perl\.(com|org)/camel\.gif$,; +print "ok 10\n"; + +# Backwards compatibility; uk != United Kingdom in ISO 3166 +$URI::Heuristic::MY_COUNTRY = "uk"; +print "not " unless uf_urlstr("perl/camel.gif") =~ m,^http://www\.perl\.(org|co)\.uk/camel\.gif$,; +print "ok 11\n"; + +$URI::Heuristic::MY_COUNTRY = "gb"; +print "not " unless uf_urlstr("perl/camel.gif") =~ m,^http://www\.perl\.(org|co)\.uk/camel\.gif$,; +print "ok 12\n"; + +$ENV{URL_GUESS_PATTERN} = "www.ACME.org www.ACME.com"; +print "not " unless uf_urlstr("perl") eq "http://www.perl.org"; +print "ok 13\n"; { -local $ENV{URL_GUESS_PATTERN} = ""; -print "not " unless uf_urlstr("perl") eq "http://perl"; -print "ok 14\n"; + local $ENV{URL_GUESS_PATTERN} = ""; + print "not " unless uf_urlstr("perl") eq "http://perl"; + print "ok 14\n"; -print "not " unless uf_urlstr("http:80") eq "http:80"; -print "ok 15\n"; + print "not " unless uf_urlstr("http:80") eq "http:80"; + print "ok 15\n"; -print "not " unless uf_urlstr("mailto:gisle\@aas.no") eq "mailto:gisle\@aas.no"; -print "ok 16\n"; + print "not " unless uf_urlstr("mailto:gisle\@aas.no") eq "mailto:gisle\@aas.no"; + print "ok 16\n"; -print "not " unless uf_urlstr("gisle\(a)aas.no") eq "mailto:gisle\@aas.no"; -print "ok 17\n"; + print "not " unless uf_urlstr("gisle\(a)aas.no") eq "mailto:gisle\@aas.no"; + print "ok 17\n"; -print "not " unless uf_urlstr("Gisle.Aas\(a)aas.perl.org") eq "mailto:Gisle.Aas\@aas.perl.org"; -print "ok 18\n"; + print "not " unless uf_urlstr("Gisle.Aas\(a)aas.perl.org") eq "mailto:Gisle.Aas\@aas.perl.org"; + print "ok 18\n"; -print "not " unless uf_url("gopher.sn.no")->scheme eq "gopher"; -print "ok 19\n"; + print "not " unless uf_url("gopher.sn.no")->scheme eq "gopher"; + print "ok 19\n"; -print "not " unless uf_urlstr("123.3.3.3:8080/foo") eq "http://123.3.3.3:8080/foo"; -print "ok 20\n"; + print "not " unless uf_urlstr("123.3.3.3:8080/foo") eq "http://123.3.3.3:8080/foo"; + print "ok 20\n"; } - -# -#print "not " unless uf_urlstr("some-site") eq "http://www.some-site.com"; -#print "ok 15\n"; -# -#print "not " unless uf_urlstr("some-site.com") eq "http://some-site.com"; -#print "ok 16\n"; -# ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit rsyslog for openSUSE:Factory
by root＠hilbert.suse.de 22 Nov '10

22 Nov '10

Hello community, here is the log from the commit of package rsyslog for openSUSE:Factory checked in at Mon Nov 22 12:59:49 CET 2010. -------- --- rsyslog/rsyslog.changes 2010-11-16 09:31:03.000000000 +0100 +++ /mounts/work_src_done/STABLE/rsyslog/rsyslog.changes 2010-11-20 17:15:55.000000000 +0100 @@ -1,0 +2,5 @@ +Sat Nov 20 16:15:46 UTC 2010 - coolo(a)novell.com + +- build with libnet-devel on 11.4 + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rsyslog.spec ++++++ --- /var/tmp/diff_new_pack.3vdYjm/_old 2010-11-22 12:59:38.000000000 +0100 +++ /var/tmp/diff_new_pack.3vdYjm/_new 2010-11-22 12:59:38.000000000 +0100 @@ -21,7 +21,7 @@ Name: rsyslog Summary: The enhanced syslogd for Linux and Unix Version: 5.6.0 -Release: 1 +Release: 2 %define upstream_version 5.6.0 # add %define build_with_relp 1 to enable relp on < 11.3, e.g. # via <topadd>%define build_with_relp 1</topadd> in _link file. @@ -47,7 +47,11 @@ BuildRequires: librelp-devel %endif # UDP spoof support +%if 0%{?suse_version} > 1130 +BuildRequires: libnet-devel +%else BuildRequires: libnet +%endif BuildRoot: %{_tmppath}/%{name}-%{version}-build #Source0: http://download.rsyslog.com/rsyslog/%{name}-%{upstream_version}.tar.gz Source0: %{name}-%{upstream_version}.tar.bz2 @@ -65,12 +69,6 @@ protected syslog relay chains while at the same time being very easy to setup for the novice user. -Authors: --------- - Rainer Gerhards <rgerhards(a)adiscon.com>, Adiscon GmbH - Michael Meckelein <mmeckelein(a)hq.adiscon.com>, Adiscon GmbH - - %package doc License: GPLv3+ Group: System/Daemons @@ -83,12 +81,6 @@ This package provides additional documentation for rsyslog. -Authors: --------- - Rainer Gerhards <rgerhards(a)adiscon.com>, Adiscon GmbH - Michael Meckelein <mmeckelein(a)hq.adiscon.com>, Adiscon GmbH - - %package diag-tools License: GPLv3+ Group: System/Daemons @@ -102,12 +94,6 @@ This package provides additional diagnostic tools (small helpers, usually not needed). -Authors: --------- - Rainer Gerhards <rgerhards(a)adiscon.com>, Adiscon GmbH - Michael Meckelein <mmeckelein(a)hq.adiscon.com>, Adiscon GmbH - - %package module-gssapi License: GPLv3+ Group: System/Daemons @@ -121,12 +107,6 @@ This module provides the support to receive syslog messages from the network protected via Kerberos 5 encryption and authentication. -Authors: --------- - Rainer Gerhards <rgerhards(a)adiscon.com>, Adiscon GmbH - Michael Meckelein <mmeckelein(a)hq.adiscon.com>, Adiscon GmbH - - %package module-mysql License: GPLv3+ Group: System/Daemons @@ -140,12 +120,6 @@ This package provides a module with the support for logging into MySQL databases. -Authors: --------- - Rainer Gerhards <rgerhards(a)adiscon.com>, Adiscon GmbH - Michael Meckelein <mmeckelein(a)hq.adiscon.com>, Adiscon GmbH - - %package module-pgsql License: GPLv3+ Group: System/Daemons @@ -158,12 +132,6 @@ This module provides the support for logging into PostgreSQL databases. -Authors: --------- - Rainer Gerhards <rgerhards(a)adiscon.com>, Adiscon GmbH - Michael Meckelein <mmeckelein(a)hq.adiscon.com>, Adiscon GmbH - - %package module-snmp License: GPLv3+ Group: System/Daemons @@ -177,12 +145,6 @@ This module provides the ability to send syslog messages as an SNMPv1 & v2c traps. -Authors: --------- - Rainer Gerhards <rgerhards(a)adiscon.com>, Adiscon GmbH - Michael Meckelein <mmeckelein(a)hq.adiscon.com>, Adiscon GmbH - - %package module-gtls License: GPLv3+ Group: System/Daemons @@ -196,12 +158,6 @@ This module provides the ability for TLS encrypted TCP logging (based on current syslog-transport-tls internet drafts). -Authors: --------- - Rainer Gerhards <rgerhards(a)adiscon.com>, Adiscon GmbH - Michael Meckelein <mmeckelein(a)hq.adiscon.com>, Adiscon GmbH - - %if %{?with_relp} %package module-relp @@ -216,11 +172,6 @@ This module provides Reliable Event Logging Protocol support. -Authors: --------- - Rainer Gerhards <rgerhards(a)adiscon.com>, Adiscon GmbH - Michael Meckelein <mmeckelein(a)hq.adiscon.com>, Adiscon GmbH - %endif %package module-udpspoof @@ -235,12 +186,6 @@ This module provides a UDP forwarder that allows changing the sender address. -Authors: --------- - Rainer Gerhards <rgerhards(a)adiscon.com>, Adiscon GmbH - Michael Meckelein <mmeckelein(a)hq.adiscon.com>, Adiscon GmbH - - %prep %setup -q -n %{name}-%{upstream_version} dos2unix doc/*.html ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit strongswan for openSUSE:Factory
by root＠hilbert.suse.de 22 Nov '10

22 Nov '10

Hello community, here is the log from the commit of package strongswan for openSUSE:Factory checked in at Mon Nov 22 12:59:33 CET 2010. -------- --- strongswan/strongswan.changes 2010-11-16 13:10:30.000000000 +0100 +++ /mounts/work_src_done/STABLE/strongswan/strongswan.changes 2010-11-22 10:12:07.000000000 +0100 @@ -1,0 +2,8 @@ +Mon Nov 22 09:05:30 UTC 2010 - mt(a)suse.de + +- Cleaned up spec file; use with_mysql,sqlite,gcrypt,nm flags +- Disabled tests sub-package with load-tester and test-vectors + plugins by default using a with_tests flag (causes load error + in "ipsec pki" when enabled but the package is not installed). + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ strongswan.spec ++++++ --- /var/tmp/diff_new_pack.C3WeDz/_old 2010-11-22 12:58:58.000000000 +0100 +++ /var/tmp/diff_new_pack.C3WeDz/_new 2010-11-22 12:58:58.000000000 +0100 @@ -22,8 +22,13 @@ %define upstream_version 4.5.0 %define strongswan_docdir %{_docdir}/%{name} %define strongswan_plugins %{_libexecdir}/ipsec/plugins +%define with_mysql 1 +%define with_sqlite 0%{suse_version} >= 1110 +%define with_gcrypt 0%{suse_version} >= 1110 +%define with_nm 0%{suse_version} >= 1110 +%define with_tests 0 Version: 4.5.0 -Release: 1 +Release: 2 License: GPLv2+ Group: Productivity/Networking/Security Summary: OpenSource IPsec-based VPN Solution @@ -42,15 +47,20 @@ BuildRequires: bison flex gmp-devel gperf pkg-config BuildRequires: libcap-devel BuildRequires: libopenssl-devel -BuildRequires: libgcrypt-devel BuildRequires: openldap2-devel BuildRequires: curl-devel pam-devel -%if 0%{suse_version} >= 1110 -BuildRequires: libuuid-devel -BuildRequires: NetworkManager-devel +%if %with_mysql +BuildRequires: libmysqlclient-devel +%endif +%if %with_sqlite BuildRequires: sqlite3-devel %endif -BuildRequires: libmysqlclient-devel +%if %with_gcrypt +BuildRequires: libgcrypt-devel +%endif +%if %with_nm +BuildRequires: NetworkManager-devel +%endif %description StrongSwan is an OpenSource IPsec-based VPN Solution for Linux @@ -117,44 +127,6 @@ This package provides the strongswan library and plugins. -%package mysql -License: GPLv2+ -Summary: OpenSource IPsec-based VPN Solution -Group: Productivity/Networking/Security -Requires: strongswan-libs0 = %{version} - -%description mysql -StrongSwan is an OpenSource IPsec-based VPN Solution for Linux - -This package provides the strongswan mysql plugin. - -%if 0%{suse_version} >= 1110 - -%package sqlite -License: GPLv2+ -Summary: OpenSource IPsec-based VPN Solution -Group: Productivity/Networking/Security -Requires: strongswan-libs0 = %{version} - -%description sqlite -StrongSwan is an OpenSource IPsec-based VPN Solution for Linux - -This package provides the strongswan sqlite plugin. - -%endif - -%package tests -License: GPLv2+ -Summary: OpenSource IPsec-based VPN Solution -Group: Productivity/Networking/Security -Requires: strongswan-libs0 = %{version} - -%description tests -StrongSwan is an OpenSource IPsec-based VPN Solution for Linux - -This package provides the strongswan crypto test-vectors plugin -and the load testing plugin for IKEv2 daemon. - %package ikev1 License: GPLv2+ Summary: OpenSource IPsec-based VPN Solution @@ -193,8 +165,6 @@ PreReq: grep %insserv_prereq %fillup_prereq Requires: strongswan-libs0 = %{version} Requires: strongswan-daemon = %{version} -#Recommends: strongswan-ikev1 = %{version} -#Recommends: strongswan-ikev2 = %{version} Provides: strongswan-daemon-starter = %{version} Provides: strongswan = %{version} ipsec VPN Obsoletes: strongswan < %{version} @@ -207,7 +177,37 @@ to maintain both, IKEv1 and IKEv2 daemons, using /etc/ipsec.conf and /etc/ipsec.sectes files. -%if 0%{suse_version} >= 1110 +%if %with_mysql + +%package mysql +License: GPLv2+ +Summary: OpenSource IPsec-based VPN Solution +Group: Productivity/Networking/Security +Requires: strongswan-libs0 = %{version} + +%description mysql +StrongSwan is an OpenSource IPsec-based VPN Solution for Linux + +This package provides the strongswan mysql plugin. + +%endif + +%if %with_sqlite + +%package sqlite +License: GPLv2+ +Summary: OpenSource IPsec-based VPN Solution +Group: Productivity/Networking/Security +Requires: strongswan-libs0 = %{version} + +%description sqlite +StrongSwan is an OpenSource IPsec-based VPN Solution for Linux + +This package provides the strongswan sqlite plugin. + +%endif + +%if %with_nm %package nm License: GPLv2+ @@ -226,6 +226,22 @@ %endif +%if %with_tests + +%package tests +License: GPLv2+ +Summary: OpenSource IPsec-based VPN Solution +Group: Productivity/Networking/Security +Requires: strongswan-libs0 = %{version} + +%description tests +StrongSwan is an OpenSource IPsec-based VPN Solution for Linux + +This package provides the strongswan crypto test-vectors plugin +and the load testing plugin for IKEv2 daemon. + +%endif + %prep %setup -q -n %{name}-%{upstream_version} %patch1 -p0 @@ -269,16 +285,24 @@ --enable-sql \ --enable-attr-sql \ --enable-addrblock \ -%if 0%{suse_version} >= 1110 +%if %with_mysql + --enable-mysql \ +%endif +%if %with_sqlite + --enable-sqlite \ +%endif +%if %with_gcrypt --enable-gcrypt \ +%endif +%if %with_nm --enable-nm \ - --enable-sqlite \ %endif - --enable-ldap \ - --enable-curl \ - --enable-mysql \ +%if %with_tests --enable-load-tester \ - --enable-test-vectors + --enable-test-vectors \ +%endif + --enable-ldap \ + --enable-curl make %{?_smp_mflags:%_smp_mflags} %install @@ -383,16 +407,6 @@ %defattr(-,root,root) %dir %{_libexecdir}/ipsec %{_libexecdir}/ipsec/charon -#%dir %{strongswan_plugins} - -%if 0%{suse_version} >= 1110 - -%files nm -%defattr(-,root,root) -%dir %{_libexecdir}/ipsec -%dir %{strongswan_plugins} -%{strongswan_plugins}/libstrongswan-nm.so -%endif %files doc %defattr(-,root,root) @@ -465,7 +479,7 @@ %{strongswan_plugins}/libstrongswan-eap-sim.so %{strongswan_plugins}/libstrongswan-farp.so %{strongswan_plugins}/libstrongswan-fips-prf.so -%if 0%{suse_version} >= 1110 +%if %with_gcrypt %{strongswan_plugins}/libstrongswan-gcrypt.so %endif %{strongswan_plugins}/libstrongswan-gmp.so @@ -492,12 +506,24 @@ %{strongswan_plugins}/libstrongswan-xcbc.so %dir %ghost %{_localstatedir}/run/strongswan +%if %with_nm + +%files nm +%defattr(-,root,root) +%dir %{_libexecdir}/ipsec +%dir %{strongswan_plugins} +%{strongswan_plugins}/libstrongswan-nm.so +%endif + +%if %with_mysql + %files mysql %defattr(-,root,root) %dir %{strongswan_plugins} %{strongswan_plugins}/libstrongswan-mysql.so +%endif -%if 0%{suse_version} >= 1110 +%if %with_sqlite %files sqlite %defattr(-,root,root) @@ -505,10 +531,13 @@ %{strongswan_plugins}/libstrongswan-sqlite.so %endif +%if %with_tests + %files tests %defattr(-,root,root) %dir %{strongswan_plugins} %{strongswan_plugins}/libstrongswan-load-tester.so %{strongswan_plugins}/libstrongswan-test-vectors.so +%endif %changelog ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit xorg-x11-driver-input for openSUSE:Factory
by root＠hilbert.suse.de 22 Nov '10

22 Nov '10

Hello community, here is the log from the commit of package xorg-x11-driver-input for openSUSE:Factory checked in at Mon Nov 22 12:59:12 CET 2010. -------- --- xorg-x11-driver-input/xorg-x11-driver-input.changes 2010-11-08 16:03:54.000000000 +0100 +++ /mounts/work_src_done/STABLE/xorg-x11-driver-input/xorg-x11-driver-input.changes 2010-11-22 02:03:55.000000000 +0100 @@ -1,0 +2,14 @@ +Mon Nov 22 00:54:24 UTC 2010 - sndirsch(a)novell.com + +- xf86-input-evdev 2.5.99.901 (2.6 RC1) + * This release has some improved tablet handling, notably for + tablets that send coordinates while still being out-of-proximity. + Proximity support itself has been added to evdev as well, + devices that support it will get DevicePresence events (note that + proximity is not exposed as an axis for XI2, there are some + design questions that need to be clarified first). + The button mapping code was changed to support styli. Note that + this rearranges the mappings for buttons past the first 3, so far + we haven't seen any side-effects. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- xf86-input-evdev-2.5.0.tar.bz2 New: ---- xf86-input-evdev-2.5.99.901.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorg-x11-driver-input.spec ++++++ --- /var/tmp/diff_new_pack.bg68Cl/_old 2010-11-22 12:56:27.000000000 +0100 +++ /var/tmp/diff_new_pack.bg68Cl/_new 2010-11-22 12:56:27.000000000 +0100 @@ -23,7 +23,7 @@ BuildRequires: Mesa-devel pkgconfig udev xorg-x11-proto-devel xorg-x11-server-sdk Url: http://xorg.freedesktop.org/ Version: 7.5 -Release: 17 +Release: 18 License: MIT License (or similar) BuildRoot: %{_tmppath}/%{name}-%{version}-build Group: System/X11/Servers/XF86_4 @@ -48,7 +48,7 @@ Source26: xf86-input-vmmouse-12.6.10.tar.bz2 Source27: xf86-input-void-1.3.1.tar.bz2 Source29: xf86-input-synaptics-1.3.0.tar.bz2 -Source30: xf86-input-evdev-2.5.0.tar.bz2 +Source30: xf86-input-evdev-2.5.99.901.tar.bz2 Source33: xf86-input-wacom-0.10.8.tar.bz2 Source42: 11-mouse.conf Source45: 65-xorg-wacom.rules ++++++ xf86-input-evdev-2.5.0.tar.bz2 -> xf86-input-evdev-2.5.99.901.tar.bz2 ++++++ ++++ 13847 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-input-evdev-2.5.0/ChangeLog new/xf86-input-evdev-2.5.99.901/ChangeLog --- old/xf86-input-evdev-2.5.0/ChangeLog 2010-08-23 02:35:09.000000000 +0200 +++ new/xf86-input-evdev-2.5.99.901/ChangeLog 2010-11-22 00:58:43.000000000 +0100 @@ -1,3 +1,314 @@ +commit 31ba99e9edd28ff81437e0167c5322b9f619c52a +Author: Peter Hutterer <peter.hutterer(a)who-t.net> +Date: Fri Nov 19 14:27:09 2010 +1000 + + evdev 2.5.99.901 + + Signed-off-by: Peter Hutterer <peter.hutterer(a)who-t.net> + +commit a4aefca2ed52e675e6151a0fb0742a9e19565a41 +Author: Peter Hutterer <peter.hutterer(a)who-t.net> +Date: Mon Oct 25 11:05:18 2010 +1000 + + Reshuffle to avoid the need for XI86_CONFIGURED. + + Signed-off-by: Peter Hutterer <peter.hutterer(a)who-t.net> + Reviewed-by: Benjamin Tissoires <tissoire(a)cena.fr> + +commit 20d7a0a4aab64232712186811ae55c40d2b7d161 +Author: Peter Hutterer <peter.hutterer(a)who-t.net> +Date: Mon Oct 25 10:38:21 2010 +1000 + + Input API 12 requires a valuator mode for each axis. + + Signed-off-by: Peter Hutterer <peter.hutterer(a)who-t.net> + Reviewed-by: Benjamin Tissoires <tissoire(a)cena.fr> + +commit 5e26ba8641809addc63e783e1cefac0f8524b020 +Author: Nikolai Kondrashov <spbnick(a)gmail.com> +Date: Wed Oct 20 23:31:30 2010 +0400 + + Extend button mapping to full ranges + + Extend button code to number mapping to cover full BTN_MOUSE and BTN_MISC + ranges, including undefined codes. + + This extends mapping introduced with 0367e387 to the following: + + 1 BTN_LEFT BTN_0 BTN_TOUCH + 2 BTN_MIDDLE BTN_1 BTN_STYLUS + 3 BTN_RIGHT BTN_2 BTN_STYLUS2 + + 8 BTN_SIDE BTN_3 + 9 BTN_EXTRA BTN_4 + 10 BTN_FORWARD BTN_5 + 11 BTN_BACK BTN_6 + 12 BTN_TASK BTN_7 + 13 0x118 BTN_8 + 14 0x119 BTN_9 + 15 0x11A 0x10A + 16 0x11B 0x10B + 17 0x11C 0x10C + 18 0x11D 0x10D + 19 0x11E 0x10E + 20 0x11F 0x10F + + This should fix https://bugs.freedesktop.org/show_bug.cgi?id=30336 + + Signed-off-by: Nikolai Kondrashov <spbnick(a)gmail.com> + Signed-off-by: Peter Hutterer <peter.hutterer(a)who-t.net> + +commit 71dd18f72889ef6998a1bd699630da583dcb775a +Author: Peter Hutterer <peter.hutterer(a)who-t.net> +Date: Tue Oct 19 10:22:55 2010 +1000 + + Rename CountBits to EvdevCountBits. + + Avoid name collision with the server. + + Signed-off-by: Peter Hutterer <peter.hutterer(a)who-t.net> + Reviewed-by: Benjamin Tissoires <tissoire(a)cena.fr> + Reviewed-by: Chase Douglas <chase.douglas(a)canonical.com> + +commit c3e49f2b95d3e40f97d6bffdaf8a6c036093fa91 +Author: Peter Hutterer <peter.hutterer(a)who-t.net> +Date: Wed Oct 20 10:33:39 2010 +1000 + + Use an array for the proximity bits. + + Instead of two lists that need to be kept in sync, just store the bits in an + array and run through them. + + Signed-off-by: Peter Hutterer <peter.hutterer(a)who-t.net> + Reviewed-by: Benjamin Tissoires <tissoire(a)cena.fr> + Reviewed-by: Daniel Stone <daniel(a)fooishbar.org> + +commit b06d3ffdcdb14978201af5b24a7292ee73b65318 +Author: Peter Hutterer <peter.hutterer(a)who-t.net> +Date: Wed Oct 20 10:20:26 2010 +1000 + + Rename abs/rel/prox to abs_queued/rel_queued/prox_queued. + + Mainly to avoid confusing between pEvdev->prox and pEvdev->proximity and to + better express what these fields are actually holding. + + Signed-off-by: Peter Hutterer <peter.hutterer(a)who-t.net> + Reviewed-by: Benjamin Tissoires <tissoire(a)cena.fr> + Reviewed-by: Daniel Stone <daniel(a)fooishbar.org> + +commit 3646371eefae63678876f45daa0eea2ac522f2e2 +Author: Benjamin Tissoires <tissoire(a)cena.fr> +Date: Sat Oct 16 20:20:31 2010 +0200 + + Add the names of the valuators for the multitouch properties + + Thoses definitions have been included in the kernel and in the X server. + However, the evdev driver has not been updated accordingly. + + Without these definitions, the multitouch axes are not correctly labelled. + + Signed-off-by: Benjamin Tissoires <tissoire(a)cena.fr> + Signed-off-by: Peter Hutterer <peter.hutterer(a)who-t.net> + +commit b48f4c41c0d3386bba3e9d8fa3da91f18aae190b +Author: Peter Hutterer <peter.hutterer(a)who-t.net> +Date: Mon Oct 11 09:33:28 2010 +1000 + + Add proximity support. + + When one of the tools comes into proximity, queue up a proximity event and + send it accordingly. + + Includes special handling for tablets that do not send axes with tools + (#29645) + + Some tablets send axis values, then EV_SYN, and in the next event the + BTN_TOOL_PEN/BTN_TOUCH, etc. For these tablets, the cursor doesn't move as + coordinates while not in proximity are ignored. + + Buffer coordinates received while out-of-proximity and if we get a proximity + event without other coordinates, re-use the last ones received. + + X.Org Bug 29645 <http://bugs.freedesktop.org/show_bug.cgi?id=29645> + + Signed-off-by: Peter Hutterer <peter.hutterer(a)who-t.net> + Reviewed-by: Chris Bagwell <chris(a)cnpbagwell.com> + Reviewed-by: Benjamin Tissoires <tissoire(a)cena.fr> + +commit 185ad42078a3bcb423b83e41ebeddbb7541fe26c +Author: Peter Hutterer <peter.hutterer(a)who-t.net> +Date: Wed Sep 8 10:47:34 2010 +1000 + + Rename evdev->tool to evdev->proximity. + + evdev doesn't care about the actual tool used, only that it is used as an + indicator for proximity. Rename the field accordingly to make the code more + obvious to read. + + Signed-off-by: Peter Hutterer <peter.hutterer(a)who-t.net> + Reviewed-by: Chris Bagwell <chris(a)cnpbagwell.com> + +commit 7282e3ac6c3b23cce927271fb9ca34b2acd36fd3 +Author: Peter Hutterer <peter.hutterer(a)who-t.net> +Date: Wed Sep 8 11:30:14 2010 +1000 + + When posting buttons, post absolute valuators if we have them. + + Signed-off-by: Peter Hutterer <peter.hutterer(a)who-t.net> + Reviewed-by: Benjamin Tissoires <tissoire(a)cena.fr> + +commit c504852aa27239a57445ca1de013b5bfefa68276 +Author: Peter Hutterer <peter.hutterer(a)who-t.net> +Date: Wed Sep 8 11:29:11 2010 +1000 + + Fix valuator offset when posting absolute motion events. + + If first_v was not zero, the values passed to xf86PostMotionEventP were + wrong. + + Signed-off-by: Peter Hutterer <peter.hutterer(a)who-t.net> + Reviewed-by: Benjamin Tissoires <tissoire(a)cena.fr> + +commit 4bbf9c9125db51394870c86413fe18a0c8ec7068 +Author: Peter Hutterer <peter.hutterer(a)who-t.net> +Date: Wed Sep 8 11:28:27 2010 +1000 + + Don't pass pointers around to first_v and num_v. + + We only use them as values, no need for the addresses. + + Signed-off-by: Peter Hutterer <peter.hutterer(a)who-t.net> + Reviewed-by: Benjamin Tissoires <tissoire(a)cena.fr> + +commit 684426a9d2b4850ae80c824d4afe1e95875eee21 +Author: Peter Hutterer <peter.hutterer(a)who-t.net> +Date: Wed Sep 8 10:59:12 2010 +1000 + + De-duplicate event queue access. + + Factor out access to the next queue element in a static function to be + reused for button and key presses. + + Signed-off-by: Peter Hutterer <peter.hutterer(a)who-t.net> + Reviewed-by: Benjamin Tissoires <tissoire(a)cena.fr> + +commit 9664e5a48723e7085fc3ece2aa13f8696f631a3d +Author: Peter Hutterer <peter.hutterer(a)who-t.net> +Date: Wed Oct 6 10:58:17 2010 +1000 + + Remove refcnt initialization from InputDriverRec. + + Removed from the server with + commit 6130170e7e9b64c611ee942ec3455dd1a185193d + Author: Adam Jackson <ajax(a)redhat.com> + Date: Sat Sep 18 06:41:35 2010 -0400 + + xfree86: Remove unused refcounting from input drivers + + And given that it was unused, we don't need to ifdef it. + + Signed-off-by: Peter Hutterer <peter.hutterer(a)who-t.net> + +commit 0367e3871f02993b4ce04873d6e40df16fb0a202 +Author: Nikolai Kondrashov <spbnick(a)gmail.com> +Date: Thu Sep 2 18:09:13 2010 +0400 + + Clean up button code to number mapping + + Now BTN_MOUSE, BTN_MISC and BTN_DIGI button ranges are all mapped to the + same lower numbers including first three, corresponding to the LMR mouse + buttons. Like this: + + 1 BTN_LEFT BTN_0 BTN_TOUCH + 2 BTN_MIDDLE BTN_1 BTN_STYLUS + 3 BTN_RIGHT BTN_2 BTN_STYLUS2 + + 8 BTN_SIDE BTN_3 + 9 BTN_EXTRA BTN_4 + 10 BTN_FORWARD BTN_5 + 11 BTN_BACK BTN_6 + 12 BTN_TASK BTN_7 + 13 BTN_8 + 14 BTN_9 + + This streamlines the button mapping under the assumption that these ranges + don't generally appear in a single device simultaneously. If they do appear, + they will simply report overlapping button numbers. + + Signed-off-by: Nikolai Kondrashov <spbnick(a)gmail.com> + Signed-off-by: Peter Hutterer <peter.hutterer(a)who-t.net> + +commit 617a09e298768d0a1d33cb6b367410455489e8b8 +Author: Nikolai Kondrashov <spbnick(a)gmail.com> +Date: Tue Sep 7 10:38:20 2010 +1000 + + Add BTN_TOUCH/STYLUS/STYLUS2 support. + + These three buttons are mapped into buttons 1/2/3, respectively. + Overlapping range with BTN_LEFT/MIDDLE/RIGHT, assuming that these + ranges don't generally appear in a single device simultaneously. + + Signed-off-by: Nikolai Kondrashov <spbnick(a)gmail.com> + Signed-off-by: Peter Hutterer <peter.hutterer(a)who-t.net> + +commit b83515485b739451b6cde29c7e6f5c900175eaf9 +Author: Tim Yamin <plasm(a)roo.me.uk> +Date: Tue Sep 7 10:31:02 2010 +1000 + + SwapAxes should rescale raw values when enabled + + Current implementation assumes that X & Y axes have the same min and max + values. If they don't, you'll end up with funny behaviour if SwapAxes is + turned on. + + Signed-off-by: Tim Yamin <plasm(a)roo.me.uk> + Signed-off-by: Peter Hutterer <peter.hutterer(a)who-t.net> + +commit 009d442aa347cea15d07ceaec955a2f69f247364 +Merge: 10493de 4964c61 +Author: Peter Hutterer <peter.hutterer(a)who-t.net> +Date: Wed Sep 1 13:04:29 2010 +1000 + + Merge branch 'input-api' of git://people.freedesktop.org/~whot/xf86-input-evdev + +commit 10493de96e905b831e14bd510f2af1b8da3d2be6 +Author: Nikolai Kondrashov <spbnick(a)gmail.com> +Date: Tue Aug 31 11:31:07 2010 +0400 + + Improve dumb tablet detection + + Improve dumb tablet detection by checking if BTN_STYLUS or BTN_STYLUS2 + (first or second pen barrel button) is present when BTN_TOOL_PEN is not + found. + + This enables detection of tablets without explicit tool proximity reporting. + These include at least four UC-Logic tablet models: WP4030U, WP5540U, + WP8060U and PF1209, on which many Genius and Trust models are based. + + Signed-off-by: Nikolai Kondrashov <spbnick(a)gmail.com> + Reviewed-by: Peter Hutterer <peter.hutterer(a)who-t.net> + Signed-off-by: Peter Hutterer <peter.hutterer(a)who-t.net> + +commit 829facd516d90f92187b78ccf6d921a1b1671990 +Author: Peter Hutterer <peter.hutterer(a)who-t.net> +Date: Tue Aug 31 14:09:46 2010 +1000 + + Bump to 2.5.99. + + Signed-off-by: Peter Hutterer <peter.hutterer(a)who-t.net> + +commit fbafe59420f128b6264feeb115bbcbc1c933f611 +Author: Nikolai Kondrashov <spbnick(a)gmail.com> +Date: Wed Aug 25 00:39:45 2010 +0400 + + Fix comments about BTN_TOOL_PEN. + + Fix incorrect usage of BTN_DIGI instead of BTN_TOOL_PEN in comments. + Fix forgotten pEvdev->digi reference. + + Signed-off-by: Nikolai Kondrashov <spbnick(a)gmail.com> + Signed-off-by: Peter Hutterer <peter.hutterer(a)who-t.net> + commit 990540fa1905b11403d5c25345c428c5bc9ed126 Author: Peter Hutterer <peter.hutterer(a)who-t.net> Date: Mon Aug 23 10:34:36 2010 +1000 @@ -71,6 +382,69 @@ Signed-off-by: Peter Hutterer <peter.hutterer(a)who-t.net> +commit 4964c61f4b248e9eb16e8eadb5f5d0b6410b6b84 +Author: Peter Hutterer <peter.hutterer(a)who-t.net> +Date: Thu Jul 22 11:32:08 2010 +1000 + + Return BadMatch for already configured devices. + + PreInit can now return different error codes. Return BadAlloc for alloc + failures and BadMatch if the device was already configured or the cache + comparison/probe failed. + + Signed-off-by: Peter Hutterer <peter.hutterer(a)who-t.net> + +commit 92e8dc49611398c8a9659b244645530cd26736fe +Author: Peter Hutterer <peter.hutterer(a)who-t.net> +Date: Thu Jul 22 10:57:02 2010 +1000 + + Use the new input API (changed PreInit function prototype). + + Signed-off-by: Peter Hutterer <peter.hutterer(a)who-t.net> + +commit e0e4b7d89b20ab9997a2eeb17dc7381ecafa31e3 +Author: Peter Hutterer <peter.hutterer(a)who-t.net> +Date: Thu Jul 22 10:51:54 2010 +1000 + + Move private init down. + + No real change, preparation for new input API. + + Signed-off-by: Peter Hutterer <peter.hutterer(a)who-t.net> + +commit d2c11d36a05e18936e39f7aa592c15b254aff1de +Author: Peter Hutterer <peter.hutterer(a)who-t.net> +Date: Thu Jul 22 10:51:12 2010 +1000 + + Use pInfo->options instead of dev->commonOptions. + + No real change, preparation for new input API. + + Signed-off-by: Peter Hutterer <peter.hutterer(a)who-t.net> + +commit 2f636402d882c775497e88c1f74477c4f6e9521d +Author: Peter Hutterer <peter.hutterer(a)who-t.net> +Date: Thu Jul 22 10:40:01 2010 +1000 + + Add ifdefs for pre ABI 12 support. + + The server doesn't provide these defines anymore, define them here for + future use. To be purged whenever we drop support for the current server. + + Signed-off-by: Peter Hutterer <peter.hutterer(a)who-t.net> + +commit 3d3565c069558b9d1e8e0e86332415731b88b11d +Author: Peter Hutterer <peter.hutterer(a)who-t.net> +Date: Thu Jul 22 10:38:58 2010 +1000 + + Remove usage of XI86_POINTER_CAPABLE and XI86_KEYBOARD_CAPABLE. + + XI86_KEYBOARD_CAPABLE was write-only, both in the driver and the server. + XI86_POINTER_CAPABLE was write-only in the server and can be emulated with + has_abs_axes and has_rel_axes. + + Signed-off-by: Peter Hutterer <peter.hutterer(a)who-t.net> + commit 421585fda6ce67c209d43952109dda056ee40941 Author: Alex Warg <alexander.warg(a)os.inf.tu-dresden.de> Date: Wed Jun 30 10:33:46 2010 +1000 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-input-evdev-2.5.0/configure.ac new/xf86-input-evdev-2.5.99.901/configure.ac --- old/xf86-input-evdev-2.5.0/configure.ac 2010-08-23 02:34:29.000000000 +0200 +++ new/xf86-input-evdev-2.5.99.901/configure.ac 2010-11-22 00:17:05.000000000 +0100 @@ -23,7 +23,7 @@ # Initialize Autoconf AC_PREREQ([2.60]) AC_INIT([xf86-input-evdev], - [2.5.0], + [2.5.99.901], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [xf86-input-evdev]) AC_CONFIG_SRCDIR([Makefile.am]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-input-evdev-2.5.0/src/evdev.c new/xf86-input-evdev-2.5.99.901/src/evdev.c --- old/xf86-input-evdev-2.5.0/src/evdev.c 2010-08-16 02:45:25.000000000 +0200 +++ new/xf86-input-evdev-2.5.99.901/src/evdev.c 2010-11-18 04:10:57.000000000 +0100 @@ -61,6 +61,11 @@ #endif +#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 12 +/* removed from server, purge when dropping support for server 1.10 */ +#define XI86_SEND_DRAG_EVENTS 0x08 +#endif + #ifndef MAXDEVICES #include <inputstr.h> /* for MAX_DEVICES */ #define MAXDEVICES MAX_DEVICES @@ -82,13 +87,25 @@ #define MODEFLAG 8 #define COMPOSEFLAG 16 -static const char *evdevDefaults[] = { +static char *evdevDefaults[] = { "XkbRules", "evdev", "XkbModel", "evdev", "XkbLayout", "us", NULL }; +/* Any of those triggers a proximity event */ +static int proximity_bits[] = { + BTN_TOOL_PEN, + BTN_TOOL_RUBBER, + BTN_TOOL_BRUSH, + BTN_TOOL_PENCIL, + BTN_TOOL_AIRBRUSH, + BTN_TOOL_FINGER, + BTN_TOOL_MOUSE, + BTN_TOOL_LENS, +}; + static int EvdevOn(DeviceIntPtr); static int EvdevCacheCompare(InputInfoPtr pInfo, BOOL compare); static void EvdevKbdCtrl(DeviceIntPtr device, KeybdCtrl *ctrl); @@ -147,7 +164,7 @@ return Success; } -static size_t CountBits(unsigned long *array, size_t nlongs) +static size_t EvdevCountBits(unsigned long *array, size_t nlongs) { unsigned int i; size_t count = 0; @@ -262,12 +279,26 @@ static int wheel_left_button = 6; static int wheel_right_button = 7; +static EventQueuePtr +EvdevNextInQueue(InputInfoPtr pInfo) +{ + EvdevPtr pEvdev = pInfo->private; + + if (pEvdev->num_queue >= EVDEV_MAXQUEUE) + { + xf86Msg(X_NONE, "%s: dropping event due to full queue!\n", pInfo->name); + return NULL; + } + + pEvdev->num_queue++; + return &pEvdev->queue[pEvdev->num_queue - 1]; +} + void EvdevQueueKbdEvent(InputInfoPtr pInfo, struct input_event *ev, int value) { int code = ev->code + MIN_KEYCODE; EventQueuePtr pQueue; - EvdevPtr pEvdev = pInfo->private; /* Filter all repeated events from device. We'll do softrepeat in the server, but only since 1.6 */ @@ -283,36 +314,37 @@ ) return; - if (pEvdev->num_queue >= EVDEV_MAXQUEUE) + if ((pQueue = EvdevNextInQueue(pInfo))) { - xf86Msg(X_NONE, "%s: dropping event due to full queue!\n", pInfo->name); - return; + pQueue->type = EV_QUEUE_KEY; + pQueue->key = code; + pQueue->val = value; } - - pQueue = &pEvdev->queue[pEvdev->num_queue]; - pQueue->type = EV_QUEUE_KEY; - pQueue->key = code; - pQueue->val = value; - pEvdev->num_queue++; } void EvdevQueueButtonEvent(InputInfoPtr pInfo, int button, int value) { EventQueuePtr pQueue; - EvdevPtr pEvdev = pInfo->private; - if (pEvdev->num_queue >= EVDEV_MAXQUEUE) + if ((pQueue = EvdevNextInQueue(pInfo))) { - xf86Msg(X_NONE, "%s: dropping event due to full queue!\n", pInfo->name); - return; + pQueue->type = EV_QUEUE_BTN; + pQueue->key = button; + pQueue->val = value; } +} - pQueue = &pEvdev->queue[pEvdev->num_queue]; - pQueue->type = EV_QUEUE_BTN; - pQueue->key = button; - pQueue->val = value; - pEvdev->num_queue++; +void +EvdevQueueProximityEvent(InputInfoPtr pInfo, int value) +{ + EventQueuePtr pQueue; + if ((pQueue = EvdevNextInQueue(pInfo))) + { + pQueue->type = EV_QUEUE_PROXIMITY; + pQueue->key = 0; + pQueue->val = value; + } } /** @@ -352,24 +384,24 @@ *num_v = *first_v = 0; /* convert to relative motion for touchpads */ - if (pEvdev->abs && (pEvdev->flags & EVDEV_RELATIVE_MODE)) { - if (pEvdev->tool) { /* meaning, touch is active */ + if (pEvdev->abs_queued && (pEvdev->flags & EVDEV_RELATIVE_MODE)) { + if (pEvdev->proximity) { if (pEvdev->old_vals[0] != -1) pEvdev->delta[REL_X] = pEvdev->vals[0] - pEvdev->old_vals[0]; if (pEvdev->old_vals[1] != -1) pEvdev->delta[REL_Y] = pEvdev->vals[1] - pEvdev->old_vals[1]; - if (pEvdev->abs & ABS_X_VALUE) + if (pEvdev->abs_queued & ABS_X_VALUE) pEvdev->old_vals[0] = pEvdev->vals[0]; - if (pEvdev->abs & ABS_Y_VALUE) + if (pEvdev->abs_queued & ABS_Y_VALUE) pEvdev->old_vals[1] = pEvdev->vals[1]; } else { pEvdev->old_vals[0] = pEvdev->old_vals[1] = -1; } - pEvdev->abs = 0; - pEvdev->rel = 1; + pEvdev->abs_queued = 0; + pEvdev->rel_queued = 1; } - if (pEvdev->rel) { + if (pEvdev->rel_queued) { int first = REL_CNT, last = 0; int i; @@ -400,21 +432,29 @@ *first_v = first; } /* - * Some devices only generate valid abs coords when BTN_DIGI is + * Some devices only generate valid abs coords when BTN_TOOL_PEN is * pressed. On wacom tablets, this means that the pen is in - * proximity of the tablet. After the pen is removed, BTN_DIGI is + * proximity of the tablet. After the pen is removed, BTN_TOOL_PEN is * released, and a (0, 0) absolute event is generated. Checking - * pEvdev->digi here, lets us ignore that event. pEvdev is + * pEvdev->proximity here lets us ignore that event. pEvdev is * initialized to 1 so devices that doesn't use this scheme still * just works. */ - else if (pEvdev->abs && pEvdev->tool) { + else if (pEvdev->abs_queued && pEvdev->proximity) { memcpy(v, pEvdev->vals, sizeof(int) * pEvdev->num_vals); if (pEvdev->swap_axes) { int tmp = v[0]; - v[0] = v[1]; - v[1] = tmp; + v[0] = xf86ScaleAxis(v[1], + pEvdev->absinfo[ABS_X].maximum, + pEvdev->absinfo[ABS_X].minimum, + pEvdev->absinfo[ABS_Y].maximum, + pEvdev->absinfo[ABS_Y].minimum); + v[1] = xf86ScaleAxis(tmp, + pEvdev->absinfo[ABS_Y].maximum, + pEvdev->absinfo[ABS_Y].minimum, + pEvdev->absinfo[ABS_X].maximum, + pEvdev->absinfo[ABS_X].minimum); } if (pEvdev->flags & EVDEV_CALIBRATED) @@ -441,6 +481,70 @@ } } +static void +EvdevProcessProximityEvent(InputInfoPtr pInfo, struct input_event *ev) +{ + EvdevPtr pEvdev = pInfo->private; + + pEvdev->prox_queued = 1; + + EvdevQueueProximityEvent(pInfo, ev->value); +} + +/** + * Proximity handling is rather weird because of tablet-specific issues. + * Some tablets, notably Wacoms, send a 0/0 coordinate in the same EV_SYN as + * the out-of-proximity notify. We need to ignore those, hence we only + * actually post valuator events when we're in proximity. + * + * Other tablets send the x/y coordinates, then EV_SYN, then the proximity + * event. For those, we need to remember x/y to post it when the proximity + * comes. + * + * If we're not in proximity and we get valuator events, remember that, they + * won't be posted though. If we move into proximity without valuators, use + * the last ones we got and let the rest of the code post them. + */ +static int +EvdevProcessProximityState(InputInfoPtr pInfo) +{ + EvdevPtr pEvdev = pInfo->private; + int prox_state = 0; + int i; + + /* no proximity change in the queue */ + if (!pEvdev->prox_queued) + { + if (pEvdev->abs_queued && !pEvdev->proximity) + pEvdev->abs_prox = pEvdev->abs_queued; + return 0; + } + + for (i = 0; i < pEvdev->num_queue; i++) + { + if (pEvdev->queue[i].type == EV_QUEUE_PROXIMITY) + { + prox_state = pEvdev->queue[i].val; + break; + } + } + + if ((prox_state && !pEvdev->proximity) || + (!prox_state && pEvdev->proximity)) + { + /* We're about to go into/out of proximity but have no abs events + * within the EV_SYN. Use the last coordinates we have. */ + if (!pEvdev->abs_queued && pEvdev->abs_prox) + { + pEvdev->abs_queued = pEvdev->abs_prox; + pEvdev->abs_prox = 0; + } + } + + pEvdev->proximity = prox_state; + return 1; +} + /** * Take a button input event and process it accordingly. */ @@ -510,7 +614,7 @@ if (EvdevWheelEmuFilterMotion(pInfo, ev)) return; - pEvdev->rel = 1; + pEvdev->rel_queued = 1; pEvdev->delta[ev->code] += value; break; } @@ -540,11 +644,11 @@ pEvdev->vals[pEvdev->axis_map[ev->code]] = value; if (ev->code == ABS_X) - pEvdev->abs |= ABS_X_VALUE; + pEvdev->abs_queued |= ABS_X_VALUE; else if (ev->code == ABS_Y) - pEvdev->abs |= ABS_Y_VALUE; + pEvdev->abs_queued |= ABS_Y_VALUE; else - pEvdev->abs |= ABS_VALUE; + pEvdev->abs_queued |= ABS_VALUE; } /** @@ -553,7 +657,7 @@ static void EvdevProcessKeyEvent(InputInfoPtr pInfo, struct input_event *ev) { - int value; + int value, i; EvdevPtr pEvdev = pInfo->private; /* Get the signed value, earlier kernels had this as unsigned */ @@ -564,18 +668,16 @@ if (value == 2) return; - switch (ev->code) { - case BTN_TOOL_PEN: - case BTN_TOOL_RUBBER: - case BTN_TOOL_BRUSH: - case BTN_TOOL_PENCIL: - case BTN_TOOL_AIRBRUSH: - case BTN_TOOL_FINGER: - case BTN_TOOL_MOUSE: - case BTN_TOOL_LENS: - pEvdev->tool = value ? ev->code : 0; - break; + for (i = 0; i < ArrayLength(proximity_bits); i++) + { + if (ev->code == proximity_bits[i]) + { + EvdevProcessProximityEvent(pInfo, ev); + return; + } + } + switch (ev->code) { case BTN_TOUCH: if (!(pEvdev->flags & (EVDEV_TOUCHSCREEN | EVDEV_TABLET))) break; @@ -594,13 +696,13 @@ * Post the relative motion events. */ void -EvdevPostRelativeMotionEvents(InputInfoPtr pInfo, int *num_v, int *first_v, +EvdevPostRelativeMotionEvents(InputInfoPtr pInfo, int num_v, int first_v, int v[MAX_VALUATORS]) { EvdevPtr pEvdev = pInfo->private; - if (pEvdev->rel) { - xf86PostMotionEventP(pInfo->dev, FALSE, *first_v, *num_v, v + *first_v); + if (pEvdev->rel_queued) { + xf86PostMotionEventP(pInfo->dev, FALSE, first_v, num_v, v + first_v); } } @@ -608,29 +710,50 @@ * Post the absolute motion events. */ void -EvdevPostAbsoluteMotionEvents(InputInfoPtr pInfo, int *num_v, int *first_v, +EvdevPostAbsoluteMotionEvents(InputInfoPtr pInfo, int num_v, int first_v, int v[MAX_VALUATORS]) { EvdevPtr pEvdev = pInfo->private; /* - * Some devices only generate valid abs coords when BTN_DIGI is + * Some devices only generate valid abs coords when BTN_TOOL_PEN is * pressed. On wacom tablets, this means that the pen is in - * proximity of the tablet. After the pen is removed, BTN_DIGI is + * proximity of the tablet. After the pen is removed, BTN_TOOL_PEN is * released, and a (0, 0) absolute event is generated. Checking - * pEvdev->tool here, lets us ignore that event. pEvdev->tool is + * pEvdev->proximity here lets us ignore that event. pEvdev->proximity is * initialized to 1 so devices that don't use this scheme still * just work. */ - if (pEvdev->abs && pEvdev->tool) { - xf86PostMotionEventP(pInfo->dev, TRUE, *first_v, *num_v, v); + if (pEvdev->abs_queued && pEvdev->proximity) { + xf86PostMotionEventP(pInfo->dev, TRUE, first_v, num_v, v + first_v); + } +} + +static void +EvdevPostProximityEvents(InputInfoPtr pInfo, int which, int num_v, int first_v, + int v[MAX_VALUATORS]) +{ + int i; + EvdevPtr pEvdev = pInfo->private; + + for (i = 0; pEvdev->prox_queued && i < pEvdev->num_queue; i++) { + switch (pEvdev->queue[i].type) { + case EV_QUEUE_KEY: + case EV_QUEUE_BTN: + break; + case EV_QUEUE_PROXIMITY: + if (pEvdev->queue[i].val == which) + xf86PostProximityEventP(pInfo->dev, which, first_v, num_v, + v + first_v); + break; + } } } /** * Post the queued key/button events. */ -static void EvdevPostQueuedEvents(InputInfoPtr pInfo, int *num_v, int *first_v, +static void EvdevPostQueuedEvents(InputInfoPtr pInfo, int num_v, int first_v, int v[MAX_VALUATORS]) { int i; @@ -643,11 +766,18 @@ pEvdev->queue[i].val); break; case EV_QUEUE_BTN: - /* FIXME: Add xf86PostButtonEventP to the X server so that we may - * pass the valuators on ButtonPress/Release events, too. Currently - * only MotionNotify events contain the pointer position. */ - xf86PostButtonEvent(pInfo->dev, 0, pEvdev->queue[i].key, - pEvdev->queue[i].val, 0, 0); +#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 11 + if (pEvdev->abs_queued && pEvdev->proximity) { + xf86PostButtonEventP(pInfo->dev, 1, pEvdev->queue[i].key, + pEvdev->queue[i].val, first_v, num_v, + v + first_v); + + } else +#endif + xf86PostButtonEvent(pInfo->dev, 0, pEvdev->queue[i].key, + pEvdev->queue[i].val, 0, 0); + break; + case EV_QUEUE_PROXIMITY: break; } } @@ -664,17 +794,23 @@ int v[MAX_VALUATORS] = {}; EvdevPtr pEvdev = pInfo->private; + EvdevProcessProximityState(pInfo); + EvdevProcessValuators(pInfo, v, &num_v, &first_v); - EvdevPostRelativeMotionEvents(pInfo, &num_v, &first_v, v); - EvdevPostAbsoluteMotionEvents(pInfo, &num_v, &first_v, v); - EvdevPostQueuedEvents(pInfo, &num_v, &first_v, v); + EvdevPostProximityEvents(pInfo, TRUE, num_v, first_v, v); + EvdevPostRelativeMotionEvents(pInfo, num_v, first_v, v); + EvdevPostAbsoluteMotionEvents(pInfo, num_v, first_v, v); + EvdevPostQueuedEvents(pInfo, num_v, first_v, v); + EvdevPostProximityEvents(pInfo, FALSE, num_v, first_v, v); memset(pEvdev->delta, 0, sizeof(pEvdev->delta)); memset(pEvdev->queue, 0, sizeof(pEvdev->queue)); pEvdev->num_queue = 0; - pEvdev->abs = 0; - pEvdev->rel = 0; + pEvdev->abs_queued = 0; + pEvdev->rel_queued = 0; + pEvdev->prox_queued = 0; + } /** @@ -1126,8 +1262,6 @@ #endif - pInfo->flags |= XI86_KEYBOARD_CAPABLE; - return Success; } @@ -1145,7 +1279,7 @@ if (!TestBit(EV_ABS, pEvdev->bitmask)) return !Success; - num_axes = CountBits(pEvdev->abs_bitmask, NLONGS(ABS_MAX)); + num_axes = EvdevCountBits(pEvdev->abs_bitmask, NLONGS(ABS_MAX)); if (num_axes < 1) return !Success; @@ -1198,32 +1332,29 @@ #endif pEvdev->absinfo[axis].minimum, pEvdev->absinfo[axis].maximum, - resolution, 0, resolution); + resolution, 0, resolution +#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 12 + , Absolute +#endif + ); xf86InitValuatorDefaults(device, axnum); pEvdev->old_vals[axnum] = -1; } free(atoms); + for (i = 0; i < ArrayLength(proximity_bits); i++) + { + if (TestBit(proximity_bits[i], pEvdev->key_bitmask)) + { + InitProximityClassDeviceStruct(device); + break; + } + } + if (!InitPtrFeedbackClassDeviceStruct(device, EvdevPtrCtrlProc)) return !Success; - if ((TestBit(ABS_X, pEvdev->abs_bitmask) && - TestBit(ABS_Y, pEvdev->abs_bitmask)) || - (TestBit(ABS_RX, pEvdev->abs_bitmask) && - TestBit(ABS_RY, pEvdev->abs_bitmask)) || - (TestBit(ABS_HAT0X, pEvdev->abs_bitmask) && - TestBit(ABS_HAT0Y, pEvdev->abs_bitmask)) || - (TestBit(ABS_HAT1X, pEvdev->abs_bitmask) && - TestBit(ABS_HAT1Y, pEvdev->abs_bitmask)) || - (TestBit(ABS_HAT2X, pEvdev->abs_bitmask) && - TestBit(ABS_HAT2Y, pEvdev->abs_bitmask)) || - (TestBit(ABS_HAT3X, pEvdev->abs_bitmask) && - TestBit(ABS_HAT3Y, pEvdev->abs_bitmask)) || - (TestBit(ABS_TILT_X, pEvdev->abs_bitmask) && - TestBit(ABS_TILT_Y, pEvdev->abs_bitmask))) - pInfo->flags |= XI86_POINTER_CAPABLE; - if (pEvdev->flags & EVDEV_TOUCHPAD) pEvdev->flags |= EVDEV_RELATIVE_MODE; else @@ -1259,7 +1390,7 @@ if (!TestBit(EV_REL, pEvdev->bitmask)) return !Success; - num_axes = CountBits(pEvdev->rel_bitmask, NLONGS(REL_MAX)); + num_axes = EvdevCountBits(pEvdev->rel_bitmask, NLONGS(REL_MAX)); if (num_axes < 1) return !Success; @@ -1321,14 +1452,16 @@ #if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7 atoms[axnum], #endif - -1, -1, 1, 0, 1); + -1, -1, 1, 0, 1 +#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 12 + , Relative +#endif + ); xf86InitValuatorDefaults(device, axnum); } free(atoms); - pInfo->flags |= XI86_POINTER_CAPABLE; - return Success; } @@ -1782,6 +1915,7 @@ int has_lmr; /* left middle right */ int ignore_abs = 0, ignore_rel = 0; EvdevPtr pEvdev = pInfo->private; + int rc = 1; /* Trinary state for ignoring axes: - unset: do the normal thing. @@ -1888,7 +2022,9 @@ if ((TestBit(ABS_X, pEvdev->abs_bitmask) && TestBit(ABS_Y, pEvdev->abs_bitmask))) { xf86Msg(X_PROBED, "%s: Found x and y absolute axes\n", pInfo->name); - if (TestBit(BTN_TOOL_PEN, pEvdev->key_bitmask)) + if (TestBit(BTN_TOOL_PEN, pEvdev->key_bitmask) || + TestBit(BTN_STYLUS, pEvdev->key_bitmask) || + TestBit(BTN_STYLUS2, pEvdev->key_bitmask)) { xf86Msg(X_PROBED, "%s: Found absolute tablet.\n", pInfo->name); pEvdev->flags |= EVDEV_TABLET; @@ -1946,8 +2082,7 @@ } if (has_rel_axes || has_abs_axes || num_buttons) { - pInfo->flags |= XI86_POINTER_CAPABLE | XI86_SEND_DRAG_EVENTS | - XI86_CONFIGURED; + pInfo->flags |= XI86_SEND_DRAG_EVENTS; if (pEvdev->flags & EVDEV_TOUCHPAD) { xf86Msg(X_INFO, "%s: Configuring as touchpad\n", pInfo->name); pInfo->type_name = XI_TOUCHPAD; @@ -1961,30 +2096,29 @@ xf86Msg(X_INFO, "%s: Configuring as mouse\n", pInfo->name); pInfo->type_name = XI_MOUSE; } + + rc = 0; } if (has_keys) { xf86Msg(X_INFO, "%s: Configuring as keyboard\n", pInfo->name); - pInfo->flags |= XI86_KEYBOARD_CAPABLE | XI86_CONFIGURED; pInfo->type_name = XI_KEYBOARD; + rc = 0; } - if (has_scroll && (pInfo->flags & XI86_CONFIGURED) && - (pInfo->flags & XI86_POINTER_CAPABLE) == 0) + if (has_scroll && + (has_rel_axes || has_abs_axes || num_buttons || has_keys)) { xf86Msg(X_INFO, "%s: Adding scrollwheel support\n", pInfo->name); - pInfo->flags |= XI86_POINTER_CAPABLE; pEvdev->flags |= EVDEV_BUTTON_EVENTS; pEvdev->flags |= EVDEV_RELATIVE_EVENTS; } - if ((pInfo->flags & XI86_CONFIGURED) == 0) { + if (rc) xf86Msg(X_WARNING, "%s: Don't know how to use device\n", pInfo->name); - return 1; - } - return 0; + return rc; } static void @@ -2050,11 +2184,13 @@ return TRUE; } +#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 12 +static int NewEvdevPreInit(InputDriverPtr, InputInfoPtr, int); + static InputInfoPtr EvdevPreInit(InputDriverPtr drv, IDevPtr dev, int flags) { InputInfoPtr pInfo; - EvdevPtr pEvdev; if (!(pInfo = xf86AllocateInput(drv, 0))) return NULL; @@ -2063,13 +2199,9 @@ pInfo->fd = -1; pInfo->name = dev->identifier; pInfo->flags = 0; - pInfo->type_name = "UNKNOWN"; - pInfo->device_control = EvdevProc; - pInfo->read_input = EvdevReadInput; pInfo->history_size = 0; pInfo->control_proc = NULL; pInfo->close_proc = NULL; - pInfo->switch_mode = EvdevSwitchMode; pInfo->conversion_proc = NULL; pInfo->reverse_conversion_proc = NULL; pInfo->dev = NULL; @@ -2078,27 +2210,52 @@ pInfo->conf_idev = dev; pInfo->private = NULL; + xf86CollectInputOptions(pInfo, (const char**)evdevDefaults, NULL); + xf86ProcessCommonOptions(pInfo, pInfo->options); + + if (NewEvdevPreInit(drv, pInfo, flags) == Success) + { + pInfo->flags |= XI86_CONFIGURED; + return pInfo; + } + + + xf86DeleteInput(pInfo, 0); + return NULL; +} + +static int +NewEvdevPreInit(InputDriverPtr drv, InputInfoPtr pInfo, int flags) +#else +static int +EvdevPreInit(InputDriverPtr drv, InputInfoPtr pInfo, int flags) +#endif +{ + EvdevPtr pEvdev; + int rc = BadAlloc; + if (!(pEvdev = calloc(sizeof(EvdevRec), 1))) goto error; pInfo->private = pEvdev; - - xf86CollectInputOptions(pInfo, evdevDefaults, NULL); - xf86ProcessCommonOptions(pInfo, pInfo->options); + pInfo->type_name = "UNKNOWN"; + pInfo->device_control = EvdevProc; + pInfo->read_input = EvdevReadInput; + pInfo->switch_mode = EvdevSwitchMode; if (!EvdevOpenDevice(pInfo)) goto error; /* - * We initialize pEvdev->tool to 1 so that device that doesn't use + * We initialize pEvdev->proximity to 1 so that device that doesn't use * proximity will still report events. */ - pEvdev->tool = 1; + pEvdev->proximity = 1; /* Grabbing the event device stops in-kernel event forwarding. In other words, it disables rfkill and the "Macintosh mouse button emulation". Note that this needs a server that sets the console to RAW mode. */ - pEvdev->grabDevice = xf86CheckBoolOption(dev->commonOptions, "GrabDevice", 0); + pEvdev->grabDevice = xf86CheckBoolOption(pInfo->options, "GrabDevice", 0); /* If grabDevice is set, ungrab immediately since we only want to grab * between DEVICE_ON and DEVICE_OFF. If we never get DEVICE_ON, don't @@ -2107,6 +2264,7 @@ { xf86Msg(X_WARNING, "%s: Device may already be configured.\n", pInfo->name); + rc = BadMatch; goto error; } @@ -2114,6 +2272,7 @@ if (EvdevCacheCompare(pInfo, FALSE) || EvdevProbe(pInfo)) { + rc = BadMatch; goto error; } @@ -2126,13 +2285,12 @@ EvdevDragLockPreInit(pInfo); } - return pInfo; + return Success; error: if (pInfo->fd >= 0) close(pInfo->fd); - xf86DeleteInput(pInfo, 0); - return NULL; + return rc; } _X_EXPORT InputDriverRec EVDEV = { @@ -2142,7 +2300,9 @@ EvdevPreInit, NULL, NULL, - 0 +#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 12 + evdevDefaults +#endif }; static void @@ -2188,70 +2348,33 @@ unsigned int EvdevUtilButtonEventToButtonNumber(EvdevPtr pEvdev, int code) { - unsigned int button = 0; - - switch(code) { - case BTN_LEFT: - button = 1; - break; - - case BTN_RIGHT: - button = 3; - break; - - case BTN_MIDDLE: - button = 2; - break; - - /* Treat BTN_[0-2] as LMR buttons on devices that do not advertise - BTN_LEFT, BTN_MIDDLE, BTN_RIGHT. - Otherwise, treat BTN_[0+n] as button 5+n. - XXX: This causes duplicate mappings for BTN_0 + n and BTN_SIDE + n - */ - case BTN_0: - button = (TestBit(BTN_LEFT, pEvdev->key_bitmask)) ? 8 : 1; - break; - case BTN_1: - button = (TestBit(BTN_MIDDLE, pEvdev->key_bitmask)) ? 9 : 2; - break; - case BTN_2: - button = (TestBit(BTN_RIGHT, pEvdev->key_bitmask)) ? 10 : 3; - break; - - /* FIXME: BTN_3.. and BTN_SIDE.. have the same button mapping */ - case BTN_3: - case BTN_4: - case BTN_5: - case BTN_6: - case BTN_7: - case BTN_8: - case BTN_9: - button = (code - BTN_0 + 5); - break; - - case BTN_SIDE: - case BTN_EXTRA: - case BTN_FORWARD: - case BTN_BACK: - case BTN_TASK: - button = (code - BTN_LEFT + 5); - break; + switch (code) + { + /* Mouse buttons */ + case BTN_LEFT: + return 1; + case BTN_MIDDLE: + return 2; + case BTN_RIGHT: + return 3; + case BTN_SIDE ... BTN_JOYSTICK - 1: + return 8 + code - BTN_SIDE; + + /* Generic buttons */ + case BTN_0 ... BTN_2: + return 1 + code - BTN_0; + case BTN_3 ... BTN_MOUSE - 1: + return 8 + code - BTN_3; + + /* Tablet stylus buttons */ + case BTN_TOUCH ... BTN_STYLUS2: + return 1 + code - BTN_TOUCH; - default: - if ((code > BTN_TASK) && (code < KEY_OK)) { - if (code < BTN_JOYSTICK) { - if (code < BTN_MOUSE) - button = (code - BTN_0 + 5); - else - button = (code - BTN_LEFT + 5); - } - } + /* The rest */ + default: + /* Ignore */ + return 0; } - - if (button > EVDEV_MAXBUTTONS) - return 0; - - return button; } #ifdef HAVE_PROPERTIES @@ -2293,6 +2416,35 @@ AXIS_LABEL_PROP_ABS_MISC, /* undefined */ AXIS_LABEL_PROP_ABS_MISC, /* undefined */ AXIS_LABEL_PROP_ABS_VOLUME /* 0x20 */ + AXIS_LABEL_PROP_ABS_MISC, /* undefined */ + AXIS_LABEL_PROP_ABS_MISC, /* undefined */ + AXIS_LABEL_PROP_ABS_MISC, /* undefined */ + AXIS_LABEL_PROP_ABS_MISC, /* undefined */ + AXIS_LABEL_PROP_ABS_MISC, /* undefined */ + AXIS_LABEL_PROP_ABS_MISC, /* undefined */ + AXIS_LABEL_PROP_ABS_MISC, /* undefined */ + AXIS_LABEL_PROP_ABS_MISC, /* undefined */ + AXIS_LABEL_PROP_ABS_MISC, /* undefined */ + AXIS_LABEL_PROP_ABS_MISC, /* undefined */ + AXIS_LABEL_PROP_ABS_MISC, /* undefined */ + AXIS_LABEL_PROP_ABS_MISC, /* undefined */ + AXIS_LABEL_PROP_ABS_MISC, /* undefined */ + AXIS_LABEL_PROP_ABS_MISC, /* undefined */ + AXIS_LABEL_PROP_ABS_MISC, /* undefined */ + AXIS_LABEL_PROP_ABS_MISC, /* undefined */ +#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 10 + AXIS_LABEL_PROP_ABS_MT_TOUCH_MAJOR, /* 0x30 */ + AXIS_LABEL_PROP_ABS_MT_TOUCH_MINOR, /* 0x31 */ + AXIS_LABEL_PROP_ABS_MT_WIDTH_MAJOR, /* 0x32 */ + AXIS_LABEL_PROP_ABS_MT_WIDTH_MINOR, /* 0x33 */ + AXIS_LABEL_PROP_ABS_MT_ORIENTATION, /* 0x34 */ + AXIS_LABEL_PROP_ABS_MT_POSITION_X, /* 0x35 */ + AXIS_LABEL_PROP_ABS_MT_POSITION_Y, /* 0x36 */ + AXIS_LABEL_PROP_ABS_MT_TOOL_TYPE, /* 0x37 */ + AXIS_LABEL_PROP_ABS_MT_BLOB_ID, /* 0x38 */ + AXIS_LABEL_PROP_ABS_MT_TRACKING_ID, /* 0x39 */ + AXIS_LABEL_PROP_ABS_MT_PRESSURE, /* 0x3a */ +#endif }; static char* rel_labels[] = { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-input-evdev-2.5.0/src/evdev.h new/xf86-input-evdev-2.5.99.901/src/evdev.h --- old/xf86-input-evdev-2.5.0/src/evdev.h 2010-08-06 04:26:24.000000000 +0200 +++ new/xf86-input-evdev-2.5.99.901/src/evdev.h 2010-10-28 05:05:18.000000000 +0200 @@ -109,6 +109,7 @@ enum { EV_QUEUE_KEY, /* xf86PostKeyboardEvent() */ EV_QUEUE_BTN, /* xf86PostButtonEvent() */ + EV_QUEUE_PROXIMITY, /* xf86PostProximityEvent() */ } type; int key; /* May be either a key code or button number. */ int val; /* State of the key/button; pressed or released. */ @@ -124,14 +125,15 @@ int old_vals[MAX_VALUATORS]; /* Translate absolute inputs to relative */ int flags; - int tool; + int proximity; int num_buttons; /* number of buttons */ BOOL swap_axes; BOOL invert_x; BOOL invert_y; int delta[REL_CNT]; - unsigned int abs, rel; + unsigned int abs_queued, rel_queued, prox_queued; + unsigned int abs_prox; /* valuators posted while out of prox? */ /* XKB stuff has to be per-device rather than per-driver */ #if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 5 @@ -198,11 +200,12 @@ /* Event posting functions */ void EvdevQueueKbdEvent(InputInfoPtr pInfo, struct input_event *ev, int value); void EvdevQueueButtonEvent(InputInfoPtr pInfo, int button, int value); +void EvdevQueueProximityEvent(InputInfoPtr pInfo, int value); void EvdevPostButtonEvent(InputInfoPtr pInfo, int button, int value); void EvdevQueueButtonClicks(InputInfoPtr pInfo, int button, int count); -void EvdevPostRelativeMotionEvents(InputInfoPtr pInfo, int *num_v, int *first_v, +void EvdevPostRelativeMotionEvents(InputInfoPtr pInfo, int num_v, int first_v, int v[MAX_VALUATORS]); -void EvdevPostAbsoluteMotionEvents(InputInfoPtr pInfo, int *num_v, int *first_v, +void EvdevPostAbsoluteMotionEvents(InputInfoPtr pInfo, int num_v, int first_v, int v[MAX_VALUATORS]); unsigned int EvdevUtilButtonEventToButtonNumber(EvdevPtr pEvdev, int code); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0