From 0fd58279d79a932fa62c361f7b02673fd0570863 Mon Sep 17 00:00:00 2001 From: Silvan Calarco Date: Thu, 20 Oct 2011 19:07:41 +0200 Subject: [PATCH] Migrate Makefiles from OpenOffice to libreoffice --- Makefile | 12 +++--------- Makefile.defs | 4 ++-- platforms/livecd-gnome-root/Makefile | 4 +--- platforms/livecd-light-root/Makefile | 2 +- platforms/livecd-root/Makefile | 3 +-- platforms/livedvd-root/Makefile | 5 ++--- platforms/testcd-root/Makefile | 3 +-- 7 files changed, 11 insertions(+), 22 deletions(-) diff --git a/Makefile b/Makefile index 40cfd08..0b1f3e4 100644 --- a/Makefile +++ b/Makefile @@ -57,15 +57,9 @@ aspell: { echo -n "$@ "; \ [ ! "$(LANGUAGE)" = "" ] && echo -n "aspell-$(LANGUAGE) "; } || \ : -OpenOffice: +libreoffice: @[ `echo " $$INSTALLED " | grep -c " $@ "` -eq 0 ] && \ { echo -n "$@ "; \ [ ! "$(LANGUAGE)" = "" ] && [ ! "$(LANGUAGE)" = "en" ] && \ - echo -n "OpenOffice-i18n-$(LANGUAGE) "; } || \ - echo -n "OpenOffice-i18n-en " -#OpenOffice-help: -# @[ `echo " $$INSTALLED " | grep -c " $@ "` -eq 0 ] && \ -# { echo -n "$@ "; \ -# [ ! "$(LANGUAGE)" = "" ] && [ ! "$(LANGUAGE)" = "en" ] && \ -# echo -n "OpenOffice-help-$(LANGUAGE) "; } || \ -# echo -n "OpenOffice-help-en " + echo -n "libreoffice-i18n-$(LANGUAGE) "; } || \ + echo -n "libreoffice-i18n-en " diff --git a/Makefile.defs b/Makefile.defs index 2e60970..16c19e6 100644 --- a/Makefile.defs +++ b/Makefile.defs @@ -107,8 +107,8 @@ perl[Automake__XFile] = automake libgs.so.9 = ghostscript -# openoffice -openofficei18n = OpenOffice-i18n-$(LANGUAGE) +# libreoffice +libreofficei18n = libreoffice-i18n-$(LANGUAGE) # vpn networkmanagervpnplugin = NetworkManager-vpnc NetworkManager-pptp diff --git a/platforms/livecd-gnome-root/Makefile b/platforms/livecd-gnome-root/Makefile index b013e48..8e7ea71 100644 --- a/platforms/livecd-gnome-root/Makefile +++ b/platforms/livecd-gnome-root/Makefile @@ -14,7 +14,7 @@ $(MAKEDIST_TARGET)-livecd-gnome: \ desktop-base-gnome #kitchensync4 kontact4 kmail4 akregator4 kdeplasma-addons amarok -$(MAKEDIST_TARGET)-livecd-OpenOffice: libicu OpenOffice-Calc OpenOffice-Writer OpenOffice-Impress +$(MAKEDIST_TARGET)-livecd-libreoffice: libreoffice-calc libreoffice-writer libreoffice-impress $(MAKEDIST_TARGET)-livecd-gnome-root: \ postplug-xorg postplug-sound \ @@ -35,5 +35,3 @@ $(MAKEDIST_TARGET)-livecd-gnome-root: \ $(MAKEDIST_TARGET)-livecd-root-en: $(MAKEDIST_TARGET)-livecd-root-es: $(MAKEDIST_TARGET)-livecd-root-it: - -#OpenOffice-i18n-it diff --git a/platforms/livecd-light-root/Makefile b/platforms/livecd-light-root/Makefile index f735d43..bb1a4c6 100644 --- a/platforms/livecd-light-root/Makefile +++ b/platforms/livecd-light-root/Makefile @@ -9,7 +9,7 @@ $(MAKEDIST_TARGET)-livecd-light: openssh-server usbutils wireless_tools parted i xorg-drv-input-mouse xorg-drv-input-void \ xorg-drv-input-tslib xcursor-transparent-theme rpm smart chromium desktop-base-openmamba -$(MAKEDIST_TARGET)-livecd-light-OpenOffice: libicu OpenOffice-Calc OpenOffice-Writer OpenOffice-Impress +$(MAKEDIST_TARGET)-livecd-light-libreoffice: libreoffice-calc libreoffice-writer libreoffice-impress $(MAKEDIST_TARGET)-livecd-light-root: \ postplug-xorg postplug-sound \ diff --git a/platforms/livecd-root/Makefile b/platforms/livecd-root/Makefile index 7ad3960..e4b670e 100644 --- a/platforms/livecd-root/Makefile +++ b/platforms/livecd-root/Makefile @@ -7,7 +7,7 @@ $(MAKEDIST_TARGET)-livecd-kde4: kppp4 krfb4 ksirk ark4 kcalc4 kdf4 kfloppy4 kgpg kopete4 kdebluetooth4 smb4k juk4 lisa4 kwalletmanager4 \ kaffeine libqt4-sqlite kate #kitchensync4 kontact4 kmail4 akregator4 kdeplasma-addons amarok -$(MAKEDIST_TARGET)-livecd-OpenOffice: libicu OpenOffice-Calc OpenOffice-Writer OpenOffice-Impress +$(MAKEDIST_TARGET)-livecd-libreoffice: libreoffice-Calc libreoffice-writer libreofice-impress $(MAKEDIST_TARGET)-livecd-root: \ postplug-xorg postplug-sound \ @@ -38,5 +38,4 @@ $(MAKEDIST_TARGET)-livecd-root-es: \ $(MAKEDIST_TARGET)-livecd-root-it: \ kde-l10n-it # firefox-i18n-it -#OpenOffice-i18n-it # FIXME: add kdepim diff --git a/platforms/livedvd-root/Makefile b/platforms/livedvd-root/Makefile index 28ead13..12f9a9a 100644 --- a/platforms/livedvd-root/Makefile +++ b/platforms/livedvd-root/Makefile @@ -8,7 +8,7 @@ $(MAKEDIST_TARGET)-livedvd-kde4: kppp4 krfb4 ksirk ark4 kcalc4 kdf4 kfloppy4 kgp kaffeine libqt4-sqlite kate # knemo #kitchensync4 -$(MAKEDIST_TARGET)-livedvd-OpenOffice: libicu OpenOffice-Calc OpenOffice-Writer OpenOffice-Impress +$(MAKEDIST_TARGET)-livedvd-libreoffice: libreoffice-calc libreoffice-writer libreoffice-impress $(MAKEDIST_TARGET)-livedvd-root: \ postplug-xorg postplug-sound \ @@ -38,8 +38,7 @@ $(MAKEDIST_TARGET)-livedvd-root-es: \ # firefox-i18n-es-ES $(MAKEDIST_TARGET)-livedvd-root-it: \ kde-l10n-it -# firefox-i18n-it -#OpenOffice-i18n-it +# firefox-i18n-it # FIXME: add kdepim syslog-ng: @echo diff --git a/platforms/testcd-root/Makefile b/platforms/testcd-root/Makefile index 8b27cb9..8fff076 100644 --- a/platforms/testcd-root/Makefile +++ b/platforms/testcd-root/Makefile @@ -8,7 +8,7 @@ $(MAKEDIST_TARGET)-testcd-kde4: kppp4 krfb4 ksirk ark4 kcalc4 kdf4 kfloppy4 kgpg kaffeine libqt4-sqlite kate # knemo kdeplasma-addons #kitchensync4 -$(MAKEDIST_TARGET)-testcd-OpenOffice: libicu OpenOffice-Calc OpenOffice-Writer OpenOffice-Impress +$(MAKEDIST_TARGET)-testcd-libreoffice: libreoffice-calc libreoffice-writer libreoffice-impress $(MAKEDIST_TARGET)-testcd-root: \ postplug-xorg postplug-sound \ @@ -39,5 +39,4 @@ $(MAKEDIST_TARGET)-testcd-root-es: \ $(MAKEDIST_TARGET)-testcd-root-it: \ kde-l10n-it # firefox-i18n-it -#OpenOffice-i18n-it # FIXME: add kdepim