diff --git a/bin/distro-install-file-lists b/bin/distro-install-file-lists index eaabf9c..c1b1ec6 100755 --- libreoffice-3.5.0/bin/distro-install-file-lists +++ libreoffice-3.5.0/bin/distro-install-file-lists @@ -2,6 +2,8 @@ . ./*[Ee]nv.[Hh]ost.sh +export OOO_VENDOR=Debian + BUILDDIR=`pwd` FILELISTSDIR="$BUILDDIR/file-lists" @@ -365,163 +365,6 @@ # the British fixes can be removed after the issue #54113 is fixed remove_duplicity_from_flists common_list.txt lang_en-GB_list.txt $INSTALLDIR/presets/config/standard.sog -else - - echo "Creating package directories..." - - test -d pkg && rm -r pkg || : - - # Create package tree (needed by Debian's dpkg) - # create_package_directory - create_package_directory() - { - listfile=$1 - directory="$2" - perl -nl \ - -e " if(/^%dir (.*)/) - {system('mkdir', '-p', '-m', '755', \"$directory\".\$1);} - else - {rename('./'.\$_, \"$directory\".\$_);} - " \ - $listfile - } - - create_package_directory gid_Module_Root_Ure_Hidden pkg/ure - - create_package_directory gid_Module_Root pkg/libreoffice-common - create_package_directory gid_Module_Root_Brand pkg/libreoffice-common - create_package_directory gid_Module_Root_Files_Images pkg/libreoffice-common - create_package_directory gid_Module_Oo_Linguistic pkg/libreoffice-common - create_package_directory gid_Module_Optional_Xsltfiltersamples pkg/libreoffice-common - create_package_directory gid_Module_Optional_Javafilter pkg/libreoffice-common - if [ -f gid_Module_Optional_Binfilter ]; then - create_package_directory gid_Module_Optional_Binfilter pkg/libreoffice-filter-binfilter - fi - create_package_directory gid_Module_Optional_Grfflt pkg/libreoffice-draw - create_package_directory gid_Module_Prg_Calc_Bin pkg/libreoffice-calc - create_package_directory gid_Module_Prg_Math_Bin pkg/libreoffice-math - create_package_directory gid_Module_Prg_Draw_Bin pkg/libreoffice-draw - create_package_directory gid_Module_Prg_Wrt_Bin pkg/libreoffice-writer - create_package_directory gid_Module_Prg_Impress_Bin pkg/libreoffice-impress - create_package_directory gid_Module_Prg_Base_Bin pkg/libreoffice-base - create_package_directory gid_Module_Brand_Prg_Calc pkg/libreoffice-calc - create_package_directory gid_Module_Brand_Prg_Math pkg/libreoffice-math - create_package_directory gid_Module_Brand_Prg_Draw pkg/libreoffice-draw - create_package_directory gid_Module_Brand_Prg_Wrt pkg/libreoffice-writer - create_package_directory gid_Module_Brand_Prg_Impress pkg/libreoffice-impress - create_package_directory gid_Module_Brand_Prg_Base pkg/libreoffice-base - create_package_directory gid_Module_Optional_Pyuno pkg/python-uno - create_package_directory gid_Module_Optional_Gnome pkg/libreoffice-gnome - create_package_directory gid_Module_Optional_Kde pkg/libreoffice-kde - - create_package_directory gid_Module_Root_Files_2 pkg/libreoffice-common - create_package_directory gid_Module_Root_Files_3 pkg/libreoffice-common - create_package_directory gid_Module_Root_Files_4 pkg/libreoffice-common - create_package_directory gid_Module_Root_Files_5 pkg/libreoffice-common - create_package_directory gid_Module_Root_Files_6 pkg/libreoffice-common - create_package_directory gid_Module_Root_Files_7 pkg/libreoffice-common - create_package_directory gid_Module_Optional_Testtool pkg/libreoffice-qa-tools - if [ -e gid_Module_Optional_Pymailmerge ]; then - create_package_directory gid_Module_Optional_Pymailmerge pkg/libreoffice-emailmerge - else # post m26 - mkdir -p pkg/libreoffice-emailmerge/$INSTALLDIR/program - mv pkg/libreoffice-common/$INSTALLDIR/program/mailmerge.py \ - pkg/libreoffice-emailmerge/$INSTALLDIR/program/mailmerge.py - fi - create_package_directory gid_Module_Optional_OGLTrans pkg/libreoffice-ogltrans - - create_package_directory gid_Module_Root_SDK pkg/libreoffice-dev - - for l in `echo $WITH_LANG_LIST`; do - for p in Impress Draw Math Calc Base Writer; do - create_package_directory gid_Module_Langpack_${p}_`echo $l | sed -e s/-/_/g` pkg/libreoffice-l10n-$l - done - create_package_directory gid_Module_Langpack_Basis_`echo $l | sed -e s/-/_/g` pkg/libreoffice-l10n-$l - create_package_directory gid_Module_Langpack_Brand_`echo $l | sed -e s/-/_/g` pkg/libreoffice-l10n-$l - create_package_directory gid_Module_Langpack_Resource_`echo $l | sed -e s/-/_/g` pkg/libreoffice-l10n-$l - create_package_directory gid_Module_Helppack_Help_`echo $l | sed -e s/-/_/g` pkg/libreoffice-help-$l - if [ -f gid_Module_Optional_Binfilter ]; then - if [ "$l" = "en-US" ]; then - create_package_directory gid_Module_Langpack_Binfilter_en_US pkg/libreoffice-filter-binfilter - else - create_package_directory gid_Module_Langpack_Binfilter_`echo $l | sed -e s/-/_/g` pkg/libreoffice-l10n-$l - fi - fi - # some help files are in _Langpack_{Writer,Impress,...}_ - # move them from -l10n to -help - if [ "$l" = "en-US" ]; then d=en; else d=$l; fi - mv pkg/libreoffice-l10n-$l/$INSTALLDIR/help/$d/* \ - pkg/libreoffice-help-$l/$INSTALLDIR/help/$d && \ - rmdir pkg/libreoffice-l10n-$l/$INSTALLDIR/help/$d - done - - # move_wrappers [...] - move_wrappers() - { - directory=$1 - shift - mkdir -m755 -p "$directory"/usr/bin - while test -n "$1"; do - mv usr/*bin/"$1$BINSUFFIX" "$directory"/usr/bin - shift - done - } - move_wrappers pkg/libreoffice-common soffice unopkg - if test "$COMPAT_OOWRAPPERS" = "YES" ; then - move_wrappers pkg/libreoffice-common ooffice oofromtemplate - move_wrappers pkg/libreoffice-base oobase - move_wrappers pkg/libreoffice-writer oowriter ooweb - move_wrappers pkg/libreoffice-calc oocalc - move_wrappers pkg/libreoffice-impress ooimpress - move_wrappers pkg/libreoffice-math oomath - move_wrappers pkg/libreoffice-draw oodraw - fi - move_wrappers pkg/libreoffice-common libreoffice lofromtemplate - move_wrappers pkg/libreoffice-base lobase - move_wrappers pkg/libreoffice-writer lowriter loweb - move_wrappers pkg/libreoffice-calc localc - move_wrappers pkg/libreoffice-impress loimpress - move_wrappers pkg/libreoffice-math lomath - move_wrappers pkg/libreoffice-draw lodraw - - # Move all libraries, binaries, *.rdb from -common to -core - for d in $INSTALLDIR/program $INSTALLDIR/program; do \ - if [ ! -d $DESTDIR/pkg/libreoffice-core/$d ]; then \ - mkdir -p $DESTDIR/pkg/libreoffice-core/$d; \ - fi && - ( cd pkg/libreoffice-common/$d - find -maxdepth 1 \ - -regex '\./\(.*\.so.*\|.*\.bin\|pagein\|nsplugin\|kdefilepicker\|msfontextract\|.*\.rdb\|javaldx\|uri-encode\)' \ - -exec mv {} $DESTDIR/pkg/libreoffice-core/$d \; - ); \ - done - - # install additional ooo-build scripts & misc stuff - mkdir -p pkg/libreoffice-common/usr/share/man/man1 - if test "$COMPAT_OOWRAPPERS" = "YES" ; then - mv usr/share/man/man1/openoffice$BINSUFFIX.1 \ - pkg/libreoffice-common/usr/share/man/man1 - fi - mv usr/share/man/man1/libreoffice$BINSUFFIX.1 \ - pkg/libreoffice-common/usr/share/man/man1 - mkdir -p pkg/libreoffice-common/etc/bash_completion.d - if test "$COMPAT_OOWRAPPERS" = "YES" ; then - mv etc/bash_completion.d/ooffice$BINSUFFIX.sh \ - pkg/libreoffice-common/etc/bash_completion.d - fi - mv etc/bash_completion.d/libreoffice$BINSUFFIX.sh \ - pkg/libreoffice-common/etc/bash_completion.d - mv .$INSTALLDIR/program/java-set-classpath \ - pkg/libreoffice-common/$INSTALLDIR/program - if echo $WITH_LANG_LIST | grep -q en-US; then - for i in forms/resume.ott officorr/project-proposal.ott; do \ - mkdir -p pkg/libreoffice-common/$INSTALLDIR/share/template/en-US/`dirname $i`; \ - mv .$INSTALLDIR/share/template/en-US/$i \ - pkg/libreoffice-common/$INSTALLDIR/share/template/en-US/$i; \ - done; \ - fi - # Warn for any remaining files - find . -path './pkg' -prune -o -not -name 'gid_Module_*' -not -type d -exec echo "File not packaged: {}" \; fi # mark the config files diff --git a/solenv/gbuild/extensions/post_AuxTargets.mk b/solenv/gbuild/extensions/post_AuxTargets.mk index 7622047..9978cda 100644 --- libreoffice-3.5.0/solenv/gbuild/extensions/post_AuxTargets.mk +++ libreoffice-3.5.0/solenv/gbuild/extensions/post_AuxTargets.mk @@ -83,7 +83,7 @@ desktop/scripts/soffice.sh ooo.lst post_download post_download.log \ set_soenv set_soenv.last set_soenv.stamp src.downloaded warn -install: build +install: echo "Installing in $(INSTALLDIR)..." && \ ooinstall "$(INSTALLDIR)" && \ echo "" && \