Commit 87b89b5be79a31f39d711bffb456babc3035fc97

Authored by Silvan Calarco
1 parent 92c0984f57
Exists in master

Recent minor fixes

Showing 3 changed files with 45 additions and 33 deletions Side-by-side Diff

... ... @@ -42,11 +42,11 @@
42 42 { echo -n "$@ "; \
43 43 [ "$(MULTILANGUAGE)" != "" ] && for l in $(MULTILANGUAGE); do echo -n "kde-l10n-$$l "; done; \
44 44 [ ! "$(LANGUAGE)" = "" ] && [ ! "$(LANGUAGE)" = "en" ] && echo -n "kde-l10n-$(LANGUAGE) "; } || :
45   -koffice:
  45 +calligra-core:
46 46 @[ `echo " $$INSTALLED " | grep -c " $@ "` -eq 0 ] && \
47 47 { echo -n "$@ "; \
48   -# [ "$(MULTILANGUAGE)" != "" ] && for l in $(MULTILANGUAGE); do echo -n "koffice-i18n-$$l "; done; \
49   - [ ! "$(LANGUAGE)" = "" ] && [ ! "$(LANGUAGE)" = "en" ] && echo -n "koffice-i18n-$(LANGUAGE) "; } || :
  48 +# [ "$(MULTILANGUAGE)" != "" ] && for l in $(MULTILANGUAGE); do echo -n "calligra-l10n-$$l "; done; \
  49 + [ ! "$(LANGUAGE)" = "" ] && [ ! "$(LANGUAGE)" = "en" ] && echo -n "calligra-l10n-$(LANGUAGE) "; } || :
50 50 #k3b:
51 51 # @[ `echo " $$INSTALLED " | grep -c " $@ "` -eq 0 ] && \
52 52 # { echo -n "$@ "; \
... ... @@ -121,27 +121,29 @@
121 121 #libscanpci.so = xorg-server
122 122  
123 123 ifeq ($(ARCH),x86_64)
124   -libOpenCL.so.1[64bit] = ocl-icd
  124 +libOpenCL.so.1[][64bit] = ocl-icd
125 125 libGL.so.1[][64bit] = libGL-Mesa-dri
126 126 libGLU.so.1[][64bit] = libGL-Mesa-dri
127 127 libgtkpeer.so[][64bit] = libgcj4
128 128 libjvm.so[][64bit] = libgcj4
129   -libjawt.so[][64bit] = java-openjdk-runtime
  129 +libjawt.so[][64bit] = java-openjdk7-runtime
130 130 libawt.so[][64bit] = libgcj4
131   -libjava.so[][64bit] = java-openjdk-runtime
132   -libjava_crw_demo.so[][64bit] = java-openjdk-runtime
133   -libjli.so[][64bit] = java-openjdk-runtime
134   -libjli.so[SUNWprivate_1.1][64bit] = java-openjdk-runtime
135   -libmawt.so[][64bit] = java-openjdk-runtime
136   -libnet.so[][64bit] = java-openjdk-runtime
137   -libverify.so[][64bit] = java-openjdk-runtime
138   -libjava.so[SUNWprivate_1.1][64bit] = java-openjdk-runtime
139   -libjava_crw_demo.so[SUNWprivate_1.1][64bit] = java-openjdk-runtime
140   -libjvm.so[SUNWprivate_1.1][64bit] = java-openjdk-runtime
141   -libjawt.so[SUNWprivate_1.1][64bit] = java-openjdk-runtime
142   -libmawt.so[SUNWprivate_1.1][64bit] = java-openjdk-runtime
143   -libnet.so[SUNWprivate_1.1][64bit] = java-openjdk-runtime
144   -libverify.so[SUNWprivate_1.1][64bit] = java-openjdk-runtime
  131 +libjava.so[][64bit] = java-openjdk7-runtime
  132 +libjava_crw_demo.so[][64bit] = java-openjdk7-runtime
  133 +libjli.so[][64bit] = java-openjdk7-runtime
  134 +libjli.so[SUNWprivate_1.1][64bit] = java-openjdk7-runtime
  135 +libmawt.so[][64bit] = java-openjdk7-runtime
  136 +libnet.so[][64bit] = java-openjdk7-runtime
  137 +libnio.so[][64bit] = java-openjdk7-runtime
  138 +libverify.so[][64bit] = java-openjdk7-runtime
  139 +libjava.so[SUNWprivate_1.1][64bit] = java-openjdk7-runtime
  140 +libjava_crw_demo.so[SUNWprivate_1.1][64bit] = java-openjdk7-runtime
  141 +libjvm.so[SUNWprivate_1.1][64bit] = java-openjdk7-runtime
  142 +libjawt.so[SUNWprivate_1.1][64bit] = java-openjdk7-runtime
  143 +libmawt.so[SUNWprivate_1.1][64bit] = java-openjdk7-runtime
  144 +libnet.so[SUNWprivate_1.1][64bit] = java-openjdk7-runtime
  145 +libnio.so[SUNWprivate_1.1][64bit] = java-openjdk7-runtime
  146 +libverify.so[SUNWprivate_1.1][64bit] = java-openjdk7-runtime
145 147 libphonon.so.4[][64bit] = libphonon
146 148 liblapack.so.3[][64bit] = liblapack
147 149 libatlas.so.3[][64bit] = libatlas
... ... @@ -169,20 +171,22 @@
169 171 libjvm.so = libgcj4
170 172 libjawt.so = libgcj4
171 173 libawt.so = libgcj4
172   -libjava.so = java-openjdk-runtime
173   -libjava_crw_demo.so = java-openjdk-runtime
174   -libjli.so = java-openjdk-runtime
175   -libjli.so[SUNWprivate_1.1] = java-openjdk-runtime
176   -libmawt.so = java-openjdk-runtime
177   -libnet.so = java-openjdk-runtime
178   -libverify.so = java-openjdk-runtime
179   -libjava.so[SUNWprivate_1.1] = java-openjdk-runtime
180   -libjava_crw_demo.so[SUNWprivate_1.1] = java-openjdk-runtime
181   -libjvm.so[SUNWprivate_1.1] = java-openjdk-runtime
182   -libjawt.so[SUNWprivate_1.1] = java-openjdk-runtime
183   -libmawt.so[SUNWprivate_1.1] = java-openjdk-runtime
184   -libnet.so[SUNWprivate_1.1] = java-openjdk-runtime
185   -libverify.so[SUNWprivate_1.1] = java-openjdk-runtime
  174 +libjava.so = java-openjdk7-runtime
  175 +libjava_crw_demo.so = java-openjdk7-runtime
  176 +libjli.so = java-openjdk7-runtime
  177 +libjli.so[SUNWprivate_1.1] = java-openjdk7-runtime
  178 +libmawt.so = java-openjdk7-runtime
  179 +libnet.so = java-openjdk7-runtime
  180 +libnio.so = java-openjdk7-runtime
  181 +libverify.so = java-openjdk7-runtime
  182 +libjava.so[SUNWprivate_1.1] = java-openjdk7-runtime
  183 +libjava_crw_demo.so[SUNWprivate_1.1] = java-openjdk7-runtime
  184 +libjvm.so[SUNWprivate_1.1] = java-openjdk7-runtime
  185 +libjawt.so[SUNWprivate_1.1] = java-openjdk7-runtime
  186 +libmawt.so[SUNWprivate_1.1] = java-openjdk7-runtime
  187 +libnet.so[SUNWprivate_1.1] = java-openjdk7-runtime
  188 +libnio.so[SUNWprivate_1.1] = java-openjdk7-runtime
  189 +libverify.so[SUNWprivate_1.1] = java-openjdk7-runtime
186 190 libphonon.so.4 = libphonon
187 191 liblapack.so.3 = liblapack
188 192 libatlas.so.3 = libatlas
... ... @@ -286,6 +290,13 @@
286 290  
287 291 # libreoffice
288 292 libreofficei18n = libreoffice-i18n-$(LANGUAGE)
  293 +
  294 +# calligra
  295 +ifeq ($(LANGUAGE),en)
  296 +calligral10n = calligra-l10n-en_GB
  297 +else
  298 +calligral10n = calligra-l10n-$(LANGUAGE)
  299 +endif
289 300  
290 301 # vpn
291 302 networkmanagervpnplugin = NetworkManager-openvpn
platforms/livedvd-root/settings.inc
1 1 PRODUCT_NAME=livedvd
2 2 MEDIA=squash_xz
  3 +MOUNTDIR_TMPFS_SIZE=12G
3 4 MULTILANGUAGE="en it es fr de"
4 5  
5 6 if [ "$ARCH" = "i586" ]; then