openmamba/makedist-openmamba
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Recent minor fixes

Browse Source
This commit is contained in:
Silvan Calarco 2015-10-09 13:23:14 +02:00
parent 92c0984f57
commit 87b89b5be7
3 changed files with 45 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile
View File

@ -42,11 +42,11 @@ kdelibs:
{ echo -n "$@ "; \ { echo -n "$@ "; \
[ "$(MULTILANGUAGE)" != "" ] && for l in $(MULTILANGUAGE); do echo -n "kde-l10n-$$l "; done; \ [ "$(MULTILANGUAGE)" != "" ] && for l in $(MULTILANGUAGE); do echo -n "kde-l10n-$$l "; done; \
[ ! "$(LANGUAGE)" = "" ] && [ ! "$(LANGUAGE)" = "en" ] && echo -n "kde-l10n-$(LANGUAGE) "; } || : [ ! "$(LANGUAGE)" = "" ] && [ ! "$(LANGUAGE)" = "en" ] && echo -n "kde-l10n-$(LANGUAGE) "; } || :
koffice: calligra-core:
@[ `echo " $$INSTALLED " | grep -c " $@ "` -eq 0 ] && \ @[ `echo " $$INSTALLED " | grep -c " $@ "` -eq 0 ] && \
{ echo -n "$@ "; \ { echo -n "$@ "; \
# [ "$(MULTILANGUAGE)" != "" ] && for l in $(MULTILANGUAGE); do echo -n "koffice-i18n-$$l "; done; \ # [ "$(MULTILANGUAGE)" != "" ] && for l in $(MULTILANGUAGE); do echo -n "calligra-l10n-$$l "; done; \
[ ! "$(LANGUAGE)" = "" ] && [ ! "$(LANGUAGE)" = "en" ] && echo -n "koffice-i18n-$(LANGUAGE) "; } || : [ ! "$(LANGUAGE)" = "" ] && [ ! "$(LANGUAGE)" = "en" ] && echo -n "calligra-l10n-$(LANGUAGE) "; } || :
#k3b: #k3b:
# @[ `echo " $$INSTALLED " | grep -c " $@ "` -eq 0 ] && \ # @[ `echo " $$INSTALLED " | grep -c " $@ "` -eq 0 ] && \
# { echo -n "$@ "; \ # { echo -n "$@ "; \

71
Makefile.defs
View File

@ -121,27 +121,29 @@ alsaplayer_output = alsaplayer-output-alsa
#libscanpci.so = xorg-server #libscanpci.so = xorg-server
ifeq ($(ARCH),x86_64) ifeq ($(ARCH),x86_64)
libOpenCL.so.1[64bit] = ocl-icd libOpenCL.so.1[][64bit] = ocl-icd
libGL.so.1[][64bit] = libGL-Mesa-dri libGL.so.1[][64bit] = libGL-Mesa-dri
libGLU.so.1[][64bit] = libGL-Mesa-dri libGLU.so.1[][64bit] = libGL-Mesa-dri
libgtkpeer.so[][64bit] = libgcj4 libgtkpeer.so[][64bit] = libgcj4
libjvm.so[][64bit] = libgcj4 libjvm.so[][64bit] = libgcj4
libjawt.so[][64bit] = java-openjdk-runtime libjawt.so[][64bit] = java-openjdk7-runtime
libawt.so[][64bit] = libgcj4 libawt.so[][64bit] = libgcj4
libjava.so[][64bit] = java-openjdk-runtime libjava.so[][64bit] = java-openjdk7-runtime
libjava_crw_demo.so[][64bit] = java-openjdk-runtime libjava_crw_demo.so[][64bit] = java-openjdk7-runtime
libjli.so[][64bit] = java-openjdk-runtime libjli.so[][64bit] = java-openjdk7-runtime
libjli.so[SUNWprivate_1.1][64bit] = java-openjdk-runtime libjli.so[SUNWprivate_1.1][64bit] = java-openjdk7-runtime
libmawt.so[][64bit] = java-openjdk-runtime libmawt.so[][64bit] = java-openjdk7-runtime
libnet.so[][64bit] = java-openjdk-runtime libnet.so[][64bit] = java-openjdk7-runtime
libverify.so[][64bit] = java-openjdk-runtime libnio.so[][64bit] = java-openjdk7-runtime
libjava.so[SUNWprivate_1.1][64bit] = java-openjdk-runtime libverify.so[][64bit] = java-openjdk7-runtime
libjava_crw_demo.so[SUNWprivate_1.1][64bit] = java-openjdk-runtime libjava.so[SUNWprivate_1.1][64bit] = java-openjdk7-runtime
libjvm.so[SUNWprivate_1.1][64bit] = java-openjdk-runtime libjava_crw_demo.so[SUNWprivate_1.1][64bit] = java-openjdk7-runtime
libjawt.so[SUNWprivate_1.1][64bit] = java-openjdk-runtime libjvm.so[SUNWprivate_1.1][64bit] = java-openjdk7-runtime
libmawt.so[SUNWprivate_1.1][64bit] = java-openjdk-runtime libjawt.so[SUNWprivate_1.1][64bit] = java-openjdk7-runtime
libnet.so[SUNWprivate_1.1][64bit] = java-openjdk-runtime libmawt.so[SUNWprivate_1.1][64bit] = java-openjdk7-runtime
libverify.so[SUNWprivate_1.1][64bit] = java-openjdk-runtime libnet.so[SUNWprivate_1.1][64bit] = java-openjdk7-runtime
libnio.so[SUNWprivate_1.1][64bit] = java-openjdk7-runtime
libverify.so[SUNWprivate_1.1][64bit] = java-openjdk7-runtime
libphonon.so.4[][64bit] = libphonon libphonon.so.4[][64bit] = libphonon
liblapack.so.3[][64bit] = liblapack liblapack.so.3[][64bit] = liblapack
libatlas.so.3[][64bit] = libatlas libatlas.so.3[][64bit] = libatlas
@ -169,20 +171,22 @@ libgtkpeer.so = libgcj4
libjvm.so = libgcj4 libjvm.so = libgcj4
libjawt.so = libgcj4 libjawt.so = libgcj4
libawt.so = libgcj4 libawt.so = libgcj4
libjava.so = java-openjdk-runtime libjava.so = java-openjdk7-runtime
libjava_crw_demo.so = java-openjdk-runtime libjava_crw_demo.so = java-openjdk7-runtime
libjli.so = java-openjdk-runtime libjli.so = java-openjdk7-runtime
libjli.so[SUNWprivate_1.1] = java-openjdk-runtime libjli.so[SUNWprivate_1.1] = java-openjdk7-runtime
libmawt.so = java-openjdk-runtime libmawt.so = java-openjdk7-runtime
libnet.so = java-openjdk-runtime libnet.so = java-openjdk7-runtime
libverify.so = java-openjdk-runtime libnio.so = java-openjdk7-runtime
libjava.so[SUNWprivate_1.1] = java-openjdk-runtime libverify.so = java-openjdk7-runtime
libjava_crw_demo.so[SUNWprivate_1.1] = java-openjdk-runtime libjava.so[SUNWprivate_1.1] = java-openjdk7-runtime
libjvm.so[SUNWprivate_1.1] = java-openjdk-runtime libjava_crw_demo.so[SUNWprivate_1.1] = java-openjdk7-runtime
libjawt.so[SUNWprivate_1.1] = java-openjdk-runtime libjvm.so[SUNWprivate_1.1] = java-openjdk7-runtime
libmawt.so[SUNWprivate_1.1] = java-openjdk-runtime libjawt.so[SUNWprivate_1.1] = java-openjdk7-runtime
libnet.so[SUNWprivate_1.1] = java-openjdk-runtime libmawt.so[SUNWprivate_1.1] = java-openjdk7-runtime
libverify.so[SUNWprivate_1.1] = java-openjdk-runtime libnet.so[SUNWprivate_1.1] = java-openjdk7-runtime
libnio.so[SUNWprivate_1.1] = java-openjdk7-runtime
libverify.so[SUNWprivate_1.1] = java-openjdk7-runtime
libphonon.so.4 = libphonon libphonon.so.4 = libphonon
liblapack.so.3 = liblapack liblapack.so.3 = liblapack
libatlas.so.3 = libatlas libatlas.so.3 = libatlas
@ -287,6 +291,13 @@ ffmpegpresets := ffmpeg-presets
# libreoffice # libreoffice
libreofficei18n = libreoffice-i18n-$(LANGUAGE) libreofficei18n = libreoffice-i18n-$(LANGUAGE)
# calligra
ifeq ($(LANGUAGE),en)
calligral10n = calligra-l10n-en_GB
else
calligral10n = calligra-l10n-$(LANGUAGE)
endif
# vpn # vpn
networkmanagervpnplugin = NetworkManager-openvpn networkmanagervpnplugin = NetworkManager-openvpn
knetworkmanagervpnplugin = plasma-applet-networkmanagement-openvpn knetworkmanagervpnplugin = plasma-applet-networkmanagement-openvpn

1
platforms/livedvd-root/settings.inc
View File

@ -1,5 +1,6 @@
PRODUCT_NAME=livedvd PRODUCT_NAME=livedvd
MEDIA=squash_xz MEDIA=squash_xz
MOUNTDIR_TMPFS_SIZE=12G
MULTILANGUAGE="en it es fr de" MULTILANGUAGE="en it es fr de"
if [ "$ARCH" = "i586" ]; then if [ "$ARCH" = "i586" ]; then