summaryrefslogtreecommitdiffstats
path: root/debian/patches/install-fixes.diff
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2024-04-27 16:52:12 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-04-27 16:52:12 +0000
commit974c21ad33bfa1d93d5ae795556d35ca7eb36e68 (patch)
tree1a0d7c0258aadfcd993c4bffa454bcf117b382cf /debian/patches/install-fixes.diff
parentAdding upstream version 1:7.0.4. (diff)
downloadlibreoffice-974c21ad33bfa1d93d5ae795556d35ca7eb36e68.tar.xz
libreoffice-974c21ad33bfa1d93d5ae795556d35ca7eb36e68.zip
Adding debian version 1:7.0.4-4+deb11u8.debian/1%7.0.4-4+deb11u8
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'debian/patches/install-fixes.diff')
-rw-r--r--debian/patches/install-fixes.diff166
1 files changed, 166 insertions, 0 deletions
diff --git a/debian/patches/install-fixes.diff b/debian/patches/install-fixes.diff
new file mode 100644
index 000000000..891bb321c
--- /dev/null
+++ b/debian/patches/install-fixes.diff
@@ -0,0 +1,166 @@
+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
+@@ -8,6 +8,8 @@
+ exit 1
+ fi
+
++export OOO_VENDOR=Debian
++
+ BUILDDIR=`pwd`
+ FILELISTSDIR="$BUILDDIR/file-lists"
+
+@@ -351,152 +351,6 @@ if test "z$OOO_VENDOR" != "zDebian" ; then
+ remove_duplicity_from_flists common_list.txt lang_bg_list.txt $INSTALLDIR/presets/config/styles.sod
+ # 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 <list_file> <directory_name>
+- 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_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_Pyuno pkg/python-uno
+- create_package_directory gid_Module_Optional_Gnome pkg/libreoffice-gnome
+-
+- 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
+- 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
+-
+- # some help files are in _Langpack_{Writer,Impress,...}_<lang>
+- # 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 <directory_name> <name> [...]
+- 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\|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