Commit f3f33b7f2dd36a951c813337c34a485cd99a337a

Authored by Silvan Calarco
1 parent 3dc2099713
Exists in master

Migrate Makefiles from OpenOffice to libreoffice

Showing 6 changed files with 10 additions and 20 deletions Side-by-side Diff

... ... @@ -57,16 +57,10 @@
57 57 { echo -n "$@ "; \
58 58 [ ! "$(LANGUAGE)" = "" ] && echo -n "aspell-$(LANGUAGE) "; } || \
59 59 :
60   -OpenOffice:
  60 +libreoffice:
61 61 @[ `echo " $$INSTALLED " | grep -c " $@ "` -eq 0 ] && \
62 62 { echo -n "$@ "; \
63 63 [ ! "$(LANGUAGE)" = "" ] && [ ! "$(LANGUAGE)" = "en" ] && \
64   - echo -n "OpenOffice-i18n-$(LANGUAGE) "; } || \
65   - echo -n "OpenOffice-i18n-en "
66   -#OpenOffice-help:
67   -# @[ `echo " $$INSTALLED " | grep -c " $@ "` -eq 0 ] && \
68   -# { echo -n "$@ "; \
69   -# [ ! "$(LANGUAGE)" = "" ] && [ ! "$(LANGUAGE)" = "en" ] && \
70   -# echo -n "OpenOffice-help-$(LANGUAGE) "; } || \
71   -# echo -n "OpenOffice-help-en "
  64 + echo -n "libreoffice-i18n-$(LANGUAGE) "; } || \
  65 + echo -n "libreoffice-i18n-en "
... ... @@ -107,8 +107,8 @@
107 107  
108 108 libgs.so.9 = ghostscript
109 109  
110   -# openoffice
111   -openofficei18n = OpenOffice-i18n-$(LANGUAGE)
  110 +# libreoffice
  111 +libreofficei18n = libreoffice-i18n-$(LANGUAGE)
112 112  
113 113 # vpn
114 114 networkmanagervpnplugin = NetworkManager-vpnc NetworkManager-pptp
platforms/livecd-gnome-root/Makefile
... ... @@ -14,7 +14,7 @@
14 14 desktop-base-gnome
15 15  
16 16 #kitchensync4 kontact4 kmail4 akregator4 kdeplasma-addons amarok
17   -$(MAKEDIST_TARGET)-livecd-OpenOffice: libicu OpenOffice-Calc OpenOffice-Writer OpenOffice-Impress
  17 +$(MAKEDIST_TARGET)-livecd-libreoffice: libreoffice-calc libreoffice-writer libreoffice-impress
18 18  
19 19 $(MAKEDIST_TARGET)-livecd-gnome-root: \
20 20 postplug-xorg postplug-sound \
... ... @@ -35,6 +35,4 @@
35 35 $(MAKEDIST_TARGET)-livecd-root-en:
36 36 $(MAKEDIST_TARGET)-livecd-root-es:
37 37 $(MAKEDIST_TARGET)-livecd-root-it:
38   -
39   -#OpenOffice-i18n-it
platforms/livecd-light-root/Makefile
... ... @@ -9,7 +9,7 @@
9 9 xorg-drv-input-mouse xorg-drv-input-void \
10 10 xorg-drv-input-tslib xcursor-transparent-theme rpm smart chromium desktop-base-openmamba
11 11  
12   -$(MAKEDIST_TARGET)-livecd-light-OpenOffice: libicu OpenOffice-Calc OpenOffice-Writer OpenOffice-Impress
  12 +$(MAKEDIST_TARGET)-livecd-light-libreoffice: libreoffice-calc libreoffice-writer libreoffice-impress
13 13  
14 14 $(MAKEDIST_TARGET)-livecd-light-root: \
15 15 postplug-xorg postplug-sound \
platforms/livecd-root/Makefile
... ... @@ -7,7 +7,7 @@
7 7 kopete4 kdebluetooth4 smb4k juk4 lisa4 kwalletmanager4 \
8 8 kaffeine libqt4-sqlite kate
9 9 #kitchensync4 kontact4 kmail4 akregator4 kdeplasma-addons amarok
10   -$(MAKEDIST_TARGET)-livecd-OpenOffice: libicu OpenOffice-Calc OpenOffice-Writer OpenOffice-Impress
  10 +$(MAKEDIST_TARGET)-livecd-libreoffice: libreoffice-Calc libreoffice-writer libreofice-impress
11 11  
12 12 $(MAKEDIST_TARGET)-livecd-root: \
13 13 postplug-xorg postplug-sound \
... ... @@ -38,6 +38,5 @@
38 38 $(MAKEDIST_TARGET)-livecd-root-it: \
39 39 kde-l10n-it
40 40 # firefox-i18n-it
41   -#OpenOffice-i18n-it
42 41 # FIXME: add kdepim
platforms/livedvd-root/Makefile
... ... @@ -8,7 +8,7 @@
8 8 kaffeine libqt4-sqlite kate
9 9 # knemo
10 10 #kitchensync4
11   -$(MAKEDIST_TARGET)-livedvd-OpenOffice: libicu OpenOffice-Calc OpenOffice-Writer OpenOffice-Impress
  11 +$(MAKEDIST_TARGET)-livedvd-libreoffice: libreoffice-calc libreoffice-writer libreoffice-impress
12 12  
13 13 $(MAKEDIST_TARGET)-livedvd-root: \
14 14 postplug-xorg postplug-sound \
... ... @@ -38,8 +38,7 @@
38 38 # firefox-i18n-es-ES
39 39 $(MAKEDIST_TARGET)-livedvd-root-it: \
40 40 kde-l10n-it
41   -# firefox-i18n-it
42   -#OpenOffice-i18n-it
  41 +# firefox-i18n-it
43 42 # FIXME: add kdepim
44 43 syslog-ng:
45 44 @echo