[Libreoffice-commits] core.git: bin/distro-install-desktop-integration

2020-11-20 Thread Chris Mayo (via logerrit) 
 bin/distro-install-desktop-integration |1 -
 1 file changed, 1 deletion(-)

New commits:
commit 07f0e515c055847689121249c29c6baaa35d35e4
Author: Chris Mayo 
AuthorDate: Mon Nov 16 19:23:11 2020 +
Commit: Adolfo Jayme Barrientos 
CommitDate: Fri Nov 20 14:52:38 2020 +0100

Remove unused installation variable GNOME_MIME_THEME

Not used since:
cf9994a4de40 ("do not conflict with GNOME MIME icons (fdo#36551)", 
2011-05-06)

Change-Id: Ie172bc0814a7de661c16891a2a87caba6c10f632
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105959
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/bin/distro-install-desktop-integration 
b/bin/distro-install-desktop-integration
index e9ddd3370ee2..7e1428ffba69 100755
--- a/bin/distro-install-desktop-integration
+++ b/bin/distro-install-desktop-integration
@@ -112,7 +112,6 @@ sed -i \
 export PRODUCTVERSION=
 export KDEMAINDIR=$PREFIXDIR
 export PREFIXDIR=${PREFIXDIR}
-export GNOME_MIME_THEME=hicolor
 export APPDATA_SOURCE_DIR="${SRCDIR?}"/sysui/desktop/appstream-appdata
 bash ./create_tree.sh
 )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: bin/distro-install-desktop-integration sysui/CustomTarget_deb.mk sysui/CustomTarget_share.mk sysui/desktop

2020-11-14 Thread Chris Mayo (via logerrit) 
 bin/distro-install-desktop-integration 
|5 
 sysui/CustomTarget_deb.mk  
|1 
 sysui/CustomTarget_share.mk
|   36 ---
 sysui/desktop/freedesktop/freedesktop-menus.spec   
|3 
 sysui/desktop/mimetypes/drawing-template.keys  
|   10 -
 sysui/desktop/mimetypes/drawing.keys   
|   10 -
 sysui/desktop/mimetypes/extension.keys 
|   10 -
 sysui/desktop/mimetypes/formula.keys   
|   10 -
 sysui/desktop/mimetypes/master-document.keys   
|   10 -
 sysui/desktop/mimetypes/ms-excel-sheet-12.keys 
|   10 -
 sysui/desktop/mimetypes/ms-excel-sheet-binary-12.keys  
|   10 -
 sysui/desktop/mimetypes/ms-excel-sheet.keys
|   10 -
 sysui/desktop/mimetypes/ms-excel-template-12.keys  
|   10 -
 sysui/desktop/mimetypes/ms-powerpoint-presentation-12.keys 
|   10 -
 sysui/desktop/mimetypes/ms-powerpoint-presentation.keys
|   10 -
 sysui/desktop/mimetypes/ms-powerpoint-template-12.keys 
|   10 -
 sysui/desktop/mimetypes/ms-word-document-12.keys   
|   10 -
 sysui/desktop/mimetypes/ms-word-document.keys  
|   10 -
 sysui/desktop/mimetypes/ms-word-document2.keys 
|   10 -
 sysui/desktop/mimetypes/ms-word-template-12.keys   
|   10 -
 sysui/desktop/mimetypes/oasis-database.keys
|   10 -
 sysui/desktop/mimetypes/oasis-drawing-flat-xml.keys
|   10 -
 sysui/desktop/mimetypes/oasis-drawing-template.keys
|   10 -
 sysui/desktop/mimetypes/oasis-drawing.keys 
|   10 -
 sysui/desktop/mimetypes/oasis-formula.keys 
|   10 -
 sysui/desktop/mimetypes/oasis-master-document-template.keys
|9 
 sysui/desktop/mimetypes/oasis-master-document.keys 
|   10 -
 sysui/desktop/mimetypes/oasis-presentation-flat-xml.keys   
|   10 -
 sysui/desktop/mimetypes/oasis-presentation-template.keys   
|   10 -
 sysui/desktop/mimetypes/oasis-presentation.keys
|   10 -
 sysui/desktop/mimetypes/oasis-spreadsheet-flat-xml.keys
|   10 -
 sysui/desktop/mimetypes/oasis-spreadsheet-template.keys
|   10 -
 sysui/desktop/mimetypes/oasis-spreadsheet.keys 
|   10 -
 sysui/desktop/mimetypes/oasis-text-flat-xml.keys   
|   10 -
 sysui/desktop/mimetypes/oasis-text-template.keys   
|9 
 sysui/desktop/mimetypes/oasis-text.keys
|   10 -
 sysui/desktop/mimetypes/oasis-web-template.keys
|   10 -
 sysui/desktop/mimetypes/openoffice.applications
|9 
 sysui/desktop/mimetypes/openoffice.mime
|   95 --
 
sysui/desktop/mimetypes/openxmlformats-officedocument-presentationml-presentation.keys
 |   10 -
 
sysui/desktop/mimetypes/openxmlformats-officedocument-presentationml-template.keys
 |   10 -
 sysui/desktop/mimetypes/openxmlformats-officedocument-spreadsheetml-sheet.keys 
|   10 -
 
sysui/desktop/mimetypes/openxmlformats-officedocument-spreadsheetml-template.keys
  |   10 -
 
sysui/desktop/mimetypes/openxmlformats-officedocument-wordprocessingml-document.keys
   |   10 -
 
sysui/desktop/mimetypes/openxmlformats-officedocument-wordprocessingml-template.keys
   |   10 -
 sysui/desktop/mimetypes/presentation-template.keys 
|   10 -
 sysui/desktop/mimetypes/presentation.keys  
|   10 -
 sysui/desktop/mimetypes/spreadsheet-template.keys  
|   10 -
 sysui/desktop/mimetypes/spreadsheet.keys   
|   10 -
 sysui/desktop/mimetypes/text-template.keys 
|9 
 sysui/desktop/mimetypes/text.keys

[Libreoffice-commits] core.git: bin/distro-install-desktop-integration

2019-01-28 Thread Libreoffice Gerrit user 
 bin/distro-install-desktop-integration |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 5238ff887849b0d94c6da00a07b57984a86b6ee6
Author: Andrea Gelmini 
AuthorDate: Sat Jan 26 16:11:57 2019 +
Commit: Julien Nabet 
CommitDate: Mon Jan 28 09:17:03 2019 +0100

Fix typo

Change-Id: I372918497b91bd2da0432df7b27795cbf29dc6b8
Reviewed-on: https://gerrit.libreoffice.org/66982
Reviewed-by: Julien Nabet 
Tested-by: Julien Nabet 

diff --git a/bin/distro-install-desktop-integration 
b/bin/distro-install-desktop-integration
index c8988b922f3e..1da104e47621 100755
--- a/bin/distro-install-desktop-integration
+++ b/bin/distro-install-desktop-integration
@@ -103,7 +103,7 @@ sed -i \
 -e "s/\($INSTALLDIRNAME\)$PRODUCTVERSION/\1/" \
 -e "s/\($PRODUCTNAME\) $PRODUCTVERSION/\1/" \
 *
-# call in subshell to do not malfrom PRODUCTVERSION, ...
+# call in subshell to do not malform PRODUCTVERSION, ...
 (
 export OFFICE_PREFIX=$LIBDIR
 export PREFIX=$INSTALLDIRNAME
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: bin/distro-install-desktop-integration config_host.mk.in configure.ac sysui/desktop

2018-06-13 Thread orbea 
 bin/distro-install-desktop-integration |   27 +--
 config_host.mk.in  |1 +
 configure.ac   |3 +++
 sysui/desktop/share/create_tree.sh |6 +++---
 4 files changed, 20 insertions(+), 17 deletions(-)

New commits:
commit 60ab748dcde78a33c1930b758018bf9b3b2650b4
Author: orbea 
Date:   Fri Jun 1 12:31:34 2018 -0700

Respect --bindir..

Change-Id: I2ed73a296b813de722156c69ac64cf9d6cff199d
Reviewed-on: https://gerrit.libreoffice.org/55197
Tested-by: Jenkins 
Reviewed-by: Rene Engelhard 

diff --git a/bin/distro-install-desktop-integration 
b/bin/distro-install-desktop-integration
index 3b6e5022c0b8..c8988b922f3e 100755
--- a/bin/distro-install-desktop-integration
+++ b/bin/distro-install-desktop-integration
@@ -7,34 +7,33 @@ fi
 
 PRODUCTVERSION_NODOT=`echo $PRODUCTVERSION | sed -e "s/\.//"`
 
-mkdir -p $DESTDIR$PREFIXDIR/bin
-
+mkdir -p "$DESTDIR$BINDIR"
 
 create_wrapper()
 {
-echo "Install $PREFIXDIR/bin/$1"
+echo "Install $BINDIR/$1"
 
-if test -L "$DESTDIR$PREFIXDIR/bin/$1" ; then
-# do not overwrite $PREFIXDIR/bin/libreoffice symlink created by 
create_tree.sh
+if test -L "$DESTDIR$BINDIR/$1" ; then
+# do not overwrite $BINDIR/libreoffice symlink created by 
create_tree.sh
 # the symlink is necessary by java UNO components to find
 # the UNO installation using $PATH; this function used to be provided
-# by $PREFIXDIR/bin/soffice symlink, see
+# by $BINDIR/soffice symlink, see
 # 
http://udk.openoffice.org/common/man/spec/transparentofficecomponents.html
 # Note: if you want to support parallel installation of more OOo 
versions
 #   you cannot include this link directly into the package
 #   For example, the Novell package mark this symlink as %ghost
 #  and update it in %post and %postun
-echo " skip already existing symlink $PREFIXDIR/bin/$1"
+echo " skip already existing symlink $BINDIR/$1"
 else
-mkdir -p $DESTDIR$PREFIXDIR/bin
-cat <$DESTDIR$PREFIXDIR/bin/$1
+mkdir -p "$DESTDIR$BINDIR"
+cat <"$DESTDIR$BINDIR/$1"
 #!/bin/sh
 $INSTALLDIR/program/$2 $3 "\$@"
 EOT
-chmod 755 $DESTDIR$PREFIXDIR/bin/$1
+chmod 755 "$DESTDIR$BINDIR/$1"
 fi
 # put into file list
-test -f "$DESTDIR/$4" && echo "$PREFIXDIR/bin/$1" >>$DESTDIR/$4
+test -f "$DESTDIR/$4" && echo "$BINDIR/$1" >>$DESTDIR/$4
 }
 
 create_man_link()
@@ -165,15 +164,15 @@ add_wrapper unopkg unopkg  """unopkg" 
 ""
 # there are two more desktop files for optional filters
 test -f $DESTDIR/gid_Module_Optional_Xsltfiltersamples && echo 
"$PREFIXDIR/share/applications/libreoffice-xsltfilter.desktop" 
>>"$DESTDIR/gid_Module_Optional_Xsltfiltersamples"
 
-# $PREFIXDIR/bin/ooffice symlink is necessary by java UNO components to find
+# $BINDIR/ooffice symlink is necessary by java UNO components to find
 # the UNO installation using $PATH, see
 # http://udk.openoffice.org/common/man/spec/transparentofficecomponents.html
 # Note: if you want to support parallel installation of more OOo versions
 #   you cannot include this link directly into the package
 #   For example, the Novell package mark this symlink as %ghost
 #  and update it in %post and %postun
-ln -sf $INSTALLDIR/program/soffice $DESTDIR$PREFIXDIR/bin/soffice
-test -f $DESTDIR/gid_Module_Root_Brand && echo "$PREFIXDIR/bin/soffice" 
>>$DESTDIR/gid_Module_Root_Brand
+ln -sf "$INSTALLDIR/program/soffice" "$DESTDIR$BINDIR/soffice"
+test -f $DESTDIR/gid_Module_Root_Brand && echo "$BINDIR/soffice" 
>>$DESTDIR/gid_Module_Root_Brand
 
 # create bash completion
 mkdir -p $DESTDIR/usr/share/bash-completion/completions
diff --git a/config_host.mk.in b/config_host.mk.in
index 0e3ba4864755..c104f07cb1eb 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -35,6 +35,7 @@ export AVAHI_CFLAGS=$(gb_SPACE)@AVAHI_CFLAGS@
 export AVAHI_LIBS=$(gb_SPACE)@AVAHI_LIBS@
 export LIBATOMIC_OPS_CFLAGS=$(gb_SPACE)@LIBATOMIC_OPS_CFLAGS@
 export LIBATOMIC_OPS_LIBS=$(gb_SPACE)@LIBATOMIC_OPS_LIBS@
+export BINDIR=@BINDIR@
 export BOOST_CPPFLAGS=@BOOST_CPPFLAGS@
 export BOOST_CXXFLAGS=@BOOST_CXXFLAGS@
 export BOOST_LOCALE_LIB=@BOOST_LOCALE_LIB@
diff --git a/configure.ac b/configure.ac
index 0f236c885723..c0ff933ca4dd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -12216,6 +12216,9 @@ AC_SUBST(MANDIR)
 DOCDIR=[$(eval echo $(eval echo $docdir))]
 AC_SUBST(DOCDIR)
 
+BINDIR=[$(eval echo $(eval echo $bindir))]
+AC_SUBST(BINDIR)
+
 INSTALLDIR="$LIBDIR/$INSTALLDIRNAME"
 AC_SUBST(INSTALLDIR)
 
diff --git a/sysui/desktop/share/create_tree.sh 
b/sysui/desktop/share/create_tree.sh
index 3f24b5fd7bf4..6812d97d9de0 100755
--- a/sysui/desktop/share/create_tree.sh
+++ b/sysui/desktop/share/create_tree.sh
@@ -52,19 +52,19 @@ if [ "${GNOMEDIR}" ]; then
   chmod 0644

[Libreoffice-commits] core.git: bin/distro-install-desktop-integration sysui/CustomTarget_share.mk sysui/desktop

2017-08-15 Thread Rene Engelhard 
 bin/distro-install-desktop-integration   |1 -
 sysui/CustomTarget_share.mk  |   13 +
 sysui/desktop/freedesktop/freedesktop-menus.spec |1 -
 sysui/desktop/share/brand.pl |2 +-
 sysui/desktop/share/create_tree.sh   |5 -
 5 files changed, 2 insertions(+), 20 deletions(-)

New commits:
commit b72766bc4d9be138063bedda00a7b98573505784
Author: Rene Engelhard 
Date:   Tue Aug 15 00:05:53 2017 +0200

deb#872001: stop shipping mimelnk desktop files

they are KDE3 only and we don't support either KDE3 nor TDE anymore
anyways

Change-Id: I80198c2b63298c0bb3220f3641b6e45107797426
Reviewed-on: https://gerrit.libreoffice.org/41159
Reviewed-by: Rene Engelhard 
Tested-by: Rene Engelhard 

diff --git a/bin/distro-install-desktop-integration 
b/bin/distro-install-desktop-integration
index 1d2484b324d0..3b6e5022c0b8 100755
--- a/bin/distro-install-desktop-integration
+++ b/bin/distro-install-desktop-integration
@@ -141,7 +141,6 @@ cd -
 # desktop files will be added by the corresponding add_wrapper command
 if test -f $DESTDIR/gid_Module_Root_Brand ; then
 for dir in $PREFIXDIR/share/application-registry \
-   $PREFIXDIR/share/mimelnk/application \
$PREFIXDIR/share/mime/packages \
$PREFIXDIR/share/mime-info \
$PREFIXDIR/share/icons ; do
diff --git a/sysui/CustomTarget_share.mk b/sysui/CustomTarget_share.mk
index aeb94c0bc0ea..0b259ddadec5 100644
--- a/sysui/CustomTarget_share.mk
+++ b/sysui/CustomTarget_share.mk
@@ -127,7 +127,6 @@ $(eval $(call gb_CustomTarget_register_targets,sysui/share,\
$(product)/openoffice.keys \
$(product)/openoffice.sh \
$(product)/create_tree.sh \
-   $(product)/mimelnklist \
$(product)/launcherlist) \
 ))
 
@@ -147,16 +146,6 @@ $(share_WORKDIR)/%/openoffice.keys:  \
--ext "keys" --key "description" $(share_WORKDIR)/documents.ulf
cat $(MIMEKEYS) > $@
 
-$(share_WORKDIR)/%/mimelnklist: $(MIMEDESKTOPS) $(share_SRCDIR)/share/brand.pl 
\
-   $(share_TRANSLATE) $(share_WORKDIR)/documents.ulf
-   mkdir -p $(dir $@)
-   $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),PRL,1)
-   $(PERL) $(share_SRCDIR)/share/brand.pl -p $* -u $(UNIXFILENAME.$*) \
-   --iconprefix $(UNIXFILENAME.$*)- $^ $(share_WORKDIR)/$*
-   $(PERL) $(share_TRANSLATE) -p $* -d $(share_WORKDIR)/$* \
-   --ext "desktop" --key "Comment" $(share_WORKDIR)/documents.ulf
-   echo "$(MIMEDESKTOPS)" > $@
-
 $(share_WORKDIR)/%/openoffice.mime: $(share_SRCDIR)/mimetypes/openoffice.mime
mkdir -p $(dir $@)
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),CAT,1)
@@ -167,7 +156,7 @@ $(share_WORKDIR)/%/openoffice.sh: 
$(share_SRCDIR)/share/openoffice.sh
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),CAT,1)
cat $< | tr -d "\015" | sed -e "s/%PREFIX/$(UNIXFILENAME.$*)/g" > $@
 
-$(share_WORKDIR)/%/create_tree.sh: $(share_SRCDIR)/share/create_tree.sh 
$(share_WORKDIR)/%/mimelnklist \
+$(share_WORKDIR)/%/create_tree.sh: $(share_SRCDIR)/share/create_tree.sh \
$(share_WORKDIR)/%/openoffice.org.xml 
$(share_WORKDIR)/%/openoffice.applications $(share_WORKDIR)/%/openoffice.mime \
$(share_WORKDIR)/%/openoffice.keys $(share_WORKDIR)/%/launcherlist $(if 
$(INTROSPECTION_SCANNER),$(call gb_Library_get_target,libreofficekitgtk))
mkdir -p $(dir $@)
diff --git a/sysui/desktop/freedesktop/freedesktop-menus.spec 
b/sysui/desktop/freedesktop/freedesktop-menus.spec
index 4a0f7e792560..c3e154f28e4e 100755
--- a/sysui/desktop/freedesktop/freedesktop-menus.spec
+++ b/sysui/desktop/freedesktop/freedesktop-menus.spec
@@ -66,7 +66,6 @@ cd $RPM_BUILD_ROOT
 rm -rf usr/share/application-registry
 rm -rf usr/share/applications.flag
 rm -rf usr/share/mime-info
-rm -rf usr/share/mimelnk
 rm -rf usr/share/applnk-redhat
 #find usr/share/icons -name '*.png' -exec chmod g+w {} \;
 
diff --git a/sysui/desktop/share/brand.pl b/sysui/desktop/share/brand.pl
index ae2911be9ed0..2be723b30514 100644
--- a/sysui/desktop/share/brand.pl
+++ b/sysui/desktop/share/brand.pl
@@ -22,7 +22,7 @@ eval 'exec perl -wS $0 ${1+"$@"}'
 
 #
 # This tool is used to re-write and substitute variables
-# into Unix .desktop, mimelnk, .keys files etc.
+# into Unix .desktop, .keys files etc.
 #
 
 $destdir = pop @ARGV;
diff --git a/sysui/desktop/share/create_tree.sh 
b/sysui/desktop/share/create_tree.sh
index 19a5ce38f924..3f24b5fd7bf4 100755
--- a/sysui/desktop/share/create_tree.sh
+++ b/sysui/desktop/share/create_tree.sh
@@ -29,11 +29,6 @@ if [ "${KDEMAINDIR}" ]; then
   done
   unset targetdir destfile
 
-  mkdir -p "${DESTDIR}/${KDEMAINDIR}/share/mimelnk/application"
-  for i in `cat mimelnklist`; do
-cp "${i}"

[Libreoffice-commits] core.git: bin/distro-install-desktop-integration bin/generate-bash-completion bin/generate-bash-completion.py

2017-06-27 Thread Arkadiy Illarionov 
 bin/distro-install-desktop-integration |4 
 bin/generate-bash-completion   |  240 -
 bin/generate-bash-completion.py|  162 ++
 3 files changed, 164 insertions(+), 242 deletions(-)

New commits:
commit 344a5dbc5c35255994a9e31df83cf964e6709246
Author: Arkadiy Illarionov 
Date:   Wed Jun 21 23:15:21 2017 +0300

Ported bin/generate-bash-completion from Perl to Python

Change-Id: Ie1b5cd0a1f64198f8e6362a02484055c5ae6b26e
Reviewed-on: https://gerrit.libreoffice.org/39077
Reviewed-by: Samuel Mehrbrodt 
Tested-by: Samuel Mehrbrodt 

diff --git a/bin/distro-install-desktop-integration 
b/bin/distro-install-desktop-integration
index b335dd4d814b..1d2484b324d0 100755
--- a/bin/distro-install-desktop-integration
+++ b/bin/distro-install-desktop-integration
@@ -178,10 +178,10 @@ test -f $DESTDIR/gid_Module_Root_Brand && echo 
"$PREFIXDIR/bin/soffice" >>$DESTD
 
 # create bash completion
 mkdir -p $DESTDIR/usr/share/bash-completion/completions
-"${SRCDIR?}"/bin/generate-bash-completion bin/bash-completion.in 
$DESTDIR/usr/share/bash-completion/completions/$INSTALLDIRNAME.sh
+"${SRCDIR?}"/bin/generate-bash-completion.py bin/bash-completion.in 
$DESTDIR/usr/share/bash-completion/completions/$INSTALLDIRNAME.sh
 test -f $DESTDIR/gid_Module_Root_Brand && echo 
"/usr/share/bash-completion/completions/$INSTALLDIRNAME.sh" 
>>$DESTDIR/gid_Module_Root_Brand
 if test "$WITH_COMPAT_OOWRAPPERS" = "TRUE" ; then
-"${SRCDIR?}"/bin/generate-bash-completion --compat-oowrappers 
bin/bash-completion.in $DESTDIR/usr/share/bash-completion/completions/ooffice.sh
+"${SRCDIR?}"/bin/generate-bash-completion.py --compat-oowrappers 
bin/bash-completion.in $DESTDIR/usr/share/bash-completion/completions/ooffice.sh
 test -f $DESTDIR/gid_Module_Root_Brand && echo 
"/usr/share/bash-completion/completions/ooffice.sh" 
>>$DESTDIR/gid_Module_Root_Brand
 fi
 
diff --git a/bin/generate-bash-completion b/bin/generate-bash-completion
deleted file mode 100755
index 41ad2004b5ac..
--- a/bin/generate-bash-completion
+++ /dev/null
@@ -1,240 +0,0 @@
-#!/usr/bin/env perl
-# script to generate LibreOffice bash_completion file for the main applications
-# written by Rene Engelhard , Public Domain
-# updated for libreoffice-build by Petr Mladek , Public Domain
-# yes, this script probably is not real good code :) but still easier
-# to maintain than adding those entries statically many times in
-# a file...
-
-use strict;
-
-my @DRAWDOCS=("sxd", "std", "dxf", "emf", "eps", "met", "pct", "sgf", "sgv", 
"sda",
-  "sdd", "vor", "svm", "wmf", "bmp", "gif", "jpg", "jpeg", "jfif", 
"fif",
-  "jpe", "pcd", "pcx", "pgm", "png", "ppm", "psd", "ras", "tga", "tif",
-  "tiff", "xbm", "xpm", "odg", "otg", "fodg", "odc", "odi", "sds",
-  "wpg", "svg", "vdx", "vsd", "vsdm", "vsdx");
-
-my @IMPRESSDOCS=("sxi", "sti", "ppt", "pps", "pot", "sxd", "sda", "sdd", "sdp",
- "vor", "cgm", "odp", "otp", "fodp", "ppsm", "ppsx", "pptm", 
"pptx",
- "potm", "potx");
-
-my @TEMPLATES=("stw", "dot", "vor", "stc", "xlt", "sti", "pot", "std", "stw",
- "dotm", "dotx", "potm", "potx", "xltm", "xltx");
-
-my @MATHDOCS=("sxm", "smf", "mml", "odf");
-
-my @MASTERDOCS=("sxg", "odm", "sgl");
-
-my @WRITERDOCS=("doc", "dot", "rtf", "sxw", "stw", "sdw", "vor", "txt", "htm?",
-"xml", "wp", "wpd", "wps", "odt", "ott", "fodt", "docm", "docx",
-"dotm", "dotx");
-
-my @WEBDOCS=("htm", "html", "stw", "txt", "vor", "oth");
-
-my @BASEDOCS=("odb");
-
-my @CALCDOCS=("sxc", "stc", "dif", "dbf", "xls", "xlw", "xlt", "rtf", "sdc", 
"vor",
-  "slk", "txt", "htm", "html", "wk1", "wks", "123", "xml", "ods", 
"ots",
-  "fods", "csv", "xlsb", "xlsm", "xlsx", "xltm", "xltx");
-
-my @EXTENSIONS=("oxt");
-
-# default names of lowrappers
-# use "" if you want to disable any wrapper
-my %APPS = (
-   office  => "libreoffice",
-office_short=> "loffice",
-   master  => "",
-   base=> "lobase",
-   calc=> "localc",
-   draw=> "lodraw",
-   impress => "loimpress",
-   math=> "lomath",
-   template=> "lofromtemplate",
-   unopkg  => "unopkg",
-   web => "loweb",
-   writer  => "lowriter",
-);
-
-my $office_shell_function = "_loexp_";
-
-sub usage()
-{
-print "Script to Generate bash completion for LO wrappers\n\n";
-
-print "Usage: $0 --help\n";
-print "   $0 [--binsuffix=suffix]\n";
-print "\t\t[--compat-oowrappers]\n";
-print "\t\t[--office=wrapper_name]\n";
-print "\t\t[--office-short=wrapper_name]\n";
-print "\t\t[--master=wrapper_name]\n";
-print "\t\t[--base=wrapper_name]\n";
-print

[Libreoffice-commits] core.git: bin/distro-install-desktop-integration

2016-01-05 Thread rezso 
 bin/distro-install-desktop-integration |   10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 2ec813b4bb8340dea7e4f04cf571a2b2d88a7626
Author: rezso 
Date:   Sat Dec 26 10:51:22 2015 +0100

don't use bash completion compatibility dir

Change-Id: I575f6fc9c1605bb7ec07842928f85c2eeadc72f8
Reviewed-on: https://gerrit.libreoffice.org/20954
Reviewed-by: rezso 
Reviewed-by: Miklos Vajna 
Tested-by: Miklos Vajna 

diff --git a/bin/distro-install-desktop-integration 
b/bin/distro-install-desktop-integration
index ed31d5b..e9332aa 100755
--- a/bin/distro-install-desktop-integration
+++ b/bin/distro-install-desktop-integration
@@ -178,12 +178,12 @@ ln -sf $INSTALLDIR/program/soffice 
$DESTDIR$PREFIXDIR/bin/soffice
 test -f $DESTDIR/gid_Module_Root_Brand && echo "$PREFIXDIR/bin/soffice" 
>>$DESTDIR/gid_Module_Root_Brand
 
 # create bash completion
-mkdir -p $DESTDIR/etc/bash_completion.d
-./bin/generate-bash-completion bin/bash-completion.in 
$DESTDIR/etc/bash_completion.d/$INSTALLDIRNAME.sh
-test -f $DESTDIR/gid_Module_Root_Brand && echo 
"/etc/bash_completion.d/$INSTALLDIRNAME.sh" >>$DESTDIR/gid_Module_Root_Brand
+mkdir -p $DESTDIR/usr/share/bash-completion/completions
+./bin/generate-bash-completion bin/bash-completion.in 
$DESTDIR/usr/share/bash-completion/completions/$INSTALLDIRNAME.sh
+test -f $DESTDIR/gid_Module_Root_Brand && echo 
"/usr/share/bash-completion/completions/$INSTALLDIRNAME.sh" 
>>$DESTDIR/gid_Module_Root_Brand
 if test "$WITH_COMPAT_OOWRAPPERS" = "TRUE" ; then
-./bin/generate-bash-completion --compat-oowrappers bin/bash-completion.in 
$DESTDIR/etc/bash_completion.d/ooffice.sh
-test -f $DESTDIR/gid_Module_Root_Brand && echo 
"/etc/bash_completion.d/ooffice.sh" >>$DESTDIR/gid_Module_Root_Brand
+./bin/generate-bash-completion --compat-oowrappers bin/bash-completion.in 
$DESTDIR/usr/share/bash-completion/completions/ooffice.sh
+test -f $DESTDIR/gid_Module_Root_Brand && echo 
"/usr/share/bash-completion/completions/ooffice.sh" 
>>$DESTDIR/gid_Module_Root_Brand
 fi
 
 echo "Install $OOINSTDIR/basis$VERSION/program/java-set-classpath";
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: bin/distro-install-desktop-integration

2015-10-27 Thread Richard PALO 
 bin/distro-install-desktop-integration |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit b147a77f2e179f474051a4e50fa7ea300cdec8ee
Author: Richard PALO 
Date:   Tue Sep 15 14:44:31 2015 +0200

Use portable ordering for mktemp
Add omitted APPDATA_SOURCE_DIR for *.appdata.xml files
Avoid gnu rmdir by using portable invocation

Change-Id: I15a507f3d181f27c86b5332d58a9d76b31eb2fd1
Reviewed-on: https://gerrit.libreoffice.org/18588
Tested-by: Jenkins 
Reviewed-by: Michael Stahl 

diff --git a/bin/distro-install-desktop-integration 
b/bin/distro-install-desktop-integration
index 4cf652d..ed31d5b 100755
--- a/bin/distro-install-desktop-integration
+++ b/bin/distro-install-desktop-integration
@@ -94,7 +94,7 @@ add_wrapper()
 }
 
 # install desktop integration from plain packages
-sysui_temp=`mktemp -t -d distro-pack-desktop-integration-XX`
+sysui_temp=`mktemp -d -t distro-pack-desktop-integration-XX`
 cp -a workdir/CustomTarget/sysui/share/libreoffice/* "$sysui_temp"
 cp -a sysui/desktop/share/create_tree.sh "$sysui_temp"
 builddir=`pwd`
@@ -116,6 +116,7 @@ sed -i \
 export PREFIXDIR=${PREFIXDIR}
 export GNOMEDIR=$PREFIXDIR
 export GNOME_MIME_THEME=hicolor
+export APPDATA_SOURCE_DIR=$builddir/sysui/desktop/appstream-appdata
 bash ./create_tree.sh
 )
 cd -
@@ -124,7 +125,7 @@ rm -rf $sysui_temp
 # we do not want some stuff from the plain packages
 if test -d $DESTDIR/opt ; then
 rm -f $DESTDIR/opt/$INSTALLDIRNAME
-rmdir --ignore-fail-on-non-empty $DESTDIR/opt
+rmdir $DESTDIR/opt 2>/dev/null || true
 fi
 
 # we want non-versioned desktop files
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: bin/distro-install-desktop-integration sysui/desktop

2014-06-11 Thread Baptiste Daroussin 
 bin/distro-install-desktop-integration |1 +
 sysui/desktop/share/create_tree.sh |   20 ++--
 2 files changed, 11 insertions(+), 10 deletions(-)

New commits:
commit d2cc121e0798a007a6e0409b09c16ce747ab959f
Author: Baptiste Daroussin b...@freebsd.org
Date:   Wed Jun 11 11:04:07 2014 +0200

Do not hard code /usr

Not all operation system install packages into /usr, make sure
create-tree.sh do respect the PREFIX variable

Change-Id: Iff358c9e22fb8969afaef2bb96e1f91eb7e91123
Reviewed-on: https://gerrit.libreoffice.org/9730
Tested-by: Michael Stahl mst...@redhat.com
Reviewed-by: Michael Stahl mst...@redhat.com

diff --git a/bin/distro-install-desktop-integration 
b/bin/distro-install-desktop-integration
index 40ad98c..4cf652d 100755
--- a/bin/distro-install-desktop-integration
+++ b/bin/distro-install-desktop-integration
@@ -113,6 +113,7 @@ sed -i \
 export ICON_SOURCE_DIR=$builddir/sysui/desktop/icons
 export PRODUCTVERSION=
 export KDEMAINDIR=$PREFIXDIR
+export PREFIXDIR=${PREFIXDIR}
 export GNOMEDIR=$PREFIXDIR
 export GNOME_MIME_THEME=hicolor
 bash ./create_tree.sh
diff --git a/sysui/desktop/share/create_tree.sh 
b/sysui/desktop/share/create_tree.sh
index 2221a46..c6be0bb 100755
--- a/sysui/desktop/share/create_tree.sh
+++ b/sysui/desktop/share/create_tree.sh
@@ -57,33 +57,33 @@ if [ ${GNOMEDIR} ]; then
   chmod 0644 ${DESTDIR}/${GNOMEDIR}/share/application-registry/${PREFIX}.*
 fi
 
-mkdir -p ${DESTDIR}/usr/bin
+mkdir -p ${DESTDIR}/${PREFIXDIR}/bin
 
 test -n ${OFFICE_PREFIX}  office_prefix=${OFFICE_PREFIX} || 
office_prefix=/opt
 office_root=${office_prefix}/${PREFIX}
 
 #this symlink is needed to have the API boostrap functions running right
-ln -sf ${office_root}/program/soffice ${DESTDIR}/usr/bin/${PREFIX}
+ln -sf ${office_root}/program/soffice ${DESTDIR}/${PREFIXDIR}/bin/${PREFIX}
 
 if test ${PREFIX} != libreoffice${PRODUCTVERSION} -a ${PREFIX} != 
libreofficedev${PRODUCTVERSION}  ; then
 # compat symlinks
 mkdir -p ${DESTDIR}${office_prefix}
 ln -sf libreoffice${PRODUCTVERSION} ${DESTDIR}${office_root}
-ln -sf /usr/bin/${PREFIX} ${DESTDIR}/usr/bin/libreoffice${PRODUCTVERSION}
+ln -sf /${PREFIXDIR}/bin/${PREFIX} 
${DESTDIR}/${PREFIXDIR}/bin/libreoffice${PRODUCTVERSION}
 fi
 
 test ${PREFIX} = libreofficedev${PRODUCTVERSION}  
mime_def_file=libreofficedev${PRODUCTVERSION}.xml || 
mime_def_file=libreoffice${PRODUCTVERSION}.xml
-mkdir -p ${DESTDIR}/usr/share/mime/packages
-cp openoffice.org.xml ${DESTDIR}/usr/share/mime/packages/$mime_def_file
-chmod 0644 ${DESTDIR}/usr/share/mime/packages/$mime_def_file
+mkdir -p ${DESTDIR}/${PREFIXDIR}/share/mime/packages
+cp openoffice.org.xml 
${DESTDIR}/${PREFIXDIR}/share/mime/packages/$mime_def_file
+chmod 0644 ${DESTDIR}/${PREFIXDIR}/share/mime/packages/$mime_def_file
 
-mkdir -p ${DESTDIR}/usr/share/applications
+mkdir -p ${DESTDIR}/${PREFIXDIR}/share/applications
 for i in `cat launcherlist`; do
-  ln -sf ${office_root}/share/xdg/${i} 
${DESTDIR}/usr/share/applications/${PREFIX}-${i}
+  ln -sf ${office_root}/share/xdg/${i} 
${DESTDIR}/${PREFIXDIR}/share/applications/${PREFIX}-${i}
 done
 
-mkdir -p ${DESTDIR}/usr/share/appdata
+mkdir -p ${DESTDIR}/${PREFIXDIR}/share/appdata
 for i in base calc draw impress writer; do
-cp ${APPDATA_SOURCE_DIR}/libreoffice-${i}.appdata.xml 
${DESTDIR}/usr/share/appdata/${PREFIX}-${i}.appdata.xml
+cp ${APPDATA_SOURCE_DIR}/libreoffice-${i}.appdata.xml 
${DESTDIR}/${PREFIXDIR}/share/appdata/${PREFIX}-${i}.appdata.xml
 done
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: bin/distro-install-desktop-integration

2014-06-10 Thread Baptiste Daroussin 
 bin/distro-install-desktop-integration |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 098b0bf8630f233fe7d3eba49c85a98929ce9929
Author: Baptiste Daroussin b...@freebsd.org
Date:   Tue Jun 10 18:58:19 2014 +0200

Do not hard code bash path

Change-Id: I24ee2599ffe8029c3d3888de49cff8bfd0a368e0
Reviewed-on: https://gerrit.libreoffice.org/9723
Tested-by: Michael Stahl mst...@redhat.com
Reviewed-by: Michael Stahl mst...@redhat.com

diff --git a/bin/distro-install-desktop-integration 
b/bin/distro-install-desktop-integration
index 18107e0..40ad98c 100755
--- a/bin/distro-install-desktop-integration
+++ b/bin/distro-install-desktop-integration
@@ -115,7 +115,7 @@ sed -i \
 export KDEMAINDIR=$PREFIXDIR
 export GNOMEDIR=$PREFIXDIR
 export GNOME_MIME_THEME=hicolor
-/bin/bash ./create_tree.sh
+bash ./create_tree.sh
 )
 cd -
 rm -rf $sysui_temp
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: bin/distro-install-desktop-integration

2013-05-31 Thread Tomáš Chvátal 
 bin/distro-install-desktop-integration |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 9652e297b811a52897599cb5426668caf2f6d444
Author: Tomáš Chvátal tomas.chva...@gmail.com
Date:   Fri May 31 15:56:11 2013 +0200

One more step to have desktop files built again with distro-pack-install

Change-Id: Ief2f645be521b74be74c6df030687c91c37cf0cd

diff --git a/bin/distro-install-desktop-integration 
b/bin/distro-install-desktop-integration
index e925924..a064846 100755
--- a/bin/distro-install-desktop-integration
+++ b/bin/distro-install-desktop-integration
@@ -95,7 +95,7 @@ add_wrapper()
 
 # install desktop integration from plain packages
 sysui_temp=`mktemp -t -d distro-pack-desktop-integration-XX`
-cp -a sysui/unxlng*/misc/libreoffice/* $sysui_temp
+cp -a workdir/unxlng*/CustomTarget/sysui/share/libreoffice/* $sysui_temp
 cp -a sysui/desktop/share/create_tree.sh $sysui_temp
 builddir=`pwd`
 cd $sysui_temp
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits