Changeset 91847 in vbox for trunk/src

Timestamp:

Oct 19, 2021 6:06:42 PM (3 years ago)

Author:

vboxsync

Message:

Reverting r147647.

Location:

trunk/src/VBox/Installer

Files:

• common/virtualbox.desktop.in (modified) (1 diff)
• common/virtualboxvm.desktop.in (deleted)
• freebsd/Makefile.kmk (modified) (2 diffs)
• freebsd/pkg_plist (modified) (1 diff)
• linux/Makefile.kmk (modified) (4 diffs)
• linux/debian/rules (modified) (5 diffs)
• linux/deffiles (modified) (1 diff)
• linux/install.sh (modified) (1 diff)
• linux/rpm/VirtualBox.tmpl.spec (modified) (1 diff)
• linux/uninstall.sh (modified) (1 diff)
• solaris/Makefile.kmk (modified) (2 diffs)

trunk/src/VBox/Installer/common/virtualbox.desktop.in

@@ -3 +3 @@
 Version=1.0
 Name=@VBOX_PRODUCT@
-GenericName=Virtualization Software
-GenericName[de]=Virtualisierung Software
+GenericName=Virtual Machine
+GenericName[de]=Virtuelle Maschine
 GenericName[ru]=Виртуальная машина
 Type=Application

trunk/src/VBox/Installer/freebsd/Makefile.kmk

@@ -60 +60 @@
         $(PATH_ROOT)/src/VBox/Frontends/VirtualBox/images/$(if $(VBOX_OSE),OSE,NonOSE)/VirtualBox_32px.png=>VBox.png \
         $(if $(VBOX_OSE),,$(VBOX_BRAND_LICENSE_TXT)=>LICENSE) \
-        $(if $(VBOX_WITH_QTGUI),$(freebsd-misc_0_OUTDIR)/virtualbox.desktop,) \
-        $(if $(VBOX_WITH_QTGUI),$(freebsd-misc_0_OUTDIR)/virtualboxvm.desktop,)
+        $(if $(VBOX_WITH_QTGUI),$(freebsd-misc_0_OUTDIR)/virtualbox.desktop,)
 freebsd-misc_CLEAN = $(freebsd-misc_0_OUTDIR)/virtualbox.desktop
-freebsd-misc_CLEAN = $(freebsd-misc_0_OUTDIR)/virtualboxvm.desktop
 
 $$(PATH_freebsd-misc)/virtualbox.desktop: $(PATH_SUB_CURRENT)/virtualbox.desktop $(VBOX_VERSION_STAMP) | $$(dir $$@)
-        $(call MSG_GENERATE,,$@,$<)
-$$(PATH_freebsd-misc)/virtualboxvm.desktop: $(PATH_SUB_CURRENT)/virtualboxvm.desktop $(VBOX_VERSION_STAMP) | $$(dir $$@)
         $(call MSG_GENERATE,,$@,$<)
 ifdef VBOX_PATH_PACKAGE_DOCS
@@ -157 +153 @@
         $(foreach f,$(VBOX_APPROVED_GUI_LANGUAGES),nls/VirtualBox_$(f).qm nls/qt_$(f).qm)
  VBOX_FBSD_DESKTOP_FILE = \
-        virtualbox.desktop \
-        virtualboxvm.desktop
+        virtualbox.desktop
  VBOX_FBSD_ICON_FILE = \
         VBox.png

trunk/src/VBox/Installer/freebsd/pkg_plist

@@ -89 +89 @@
 lib/virtualbox/nls/VirtualBox_cs.qm
 share/applications/virtualbox.desktop
-share/applications/virtualboxvm.desktop
 share/pixmaps/VBox.png
+

trunk/src/VBox/Installer/linux/Makefile.kmk

@@ -105 +105 @@
         $(if $(VBOX_OSE),,$(VBOX_BRAND_LICENSE_TXT)=>LICENSE) \
         $(linux-misc_0_OUTDIR)/generated.sh=>scripts/generated.sh \
-        $(if $(VBOX_WITH_QTGUI),$(linux-misc_0_OUTDIR)/virtualbox.desktop,) \
-        $(if $(VBOX_WITH_QTGUI),$(linux-misc_0_OUTDIR)/virtualboxvm.desktop,)
+        $(if $(VBOX_WITH_QTGUI),$(linux-misc_0_OUTDIR)/virtualbox.desktop,)
 ifeq ($(KBUILD_TYPE),asan)
 linux-misc_SOURCES += $(foreach lib,$(VBOX_GCC_SANITIZER_SO_FILES) \
@@ -113 +112 @@
 linux-misc_CLEAN = \
         $(linux-misc_0_OUTDIR)/generated.sh \
-        $(linux-misc_0_OUTDIR)/virtualbox.desktop \
-        $(linux-misc_0_OUTDIR)/virtualboxvm.desktop
+        $(linux-misc_0_OUTDIR)/virtualbox.desktop
 
 $$(linux-misc_0_OUTDIR)/generated.sh: $(VBOX_VERSION_STAMP) $(VBOX_LNX_INST_DEP_ON_MAKEFILE) | $$(dir $$@)
@@ -125 +123 @@
 
 $$(linux-misc_0_OUTDIR)/virtualbox.desktop: $(VBOX_PATH_INST_COMMON_SRC)/virtualbox.desktop.in $(VBOX_VERSION_STAMP) | $$(dir $$@)
-        $(call MSG_GENERATE,,$@,$<)
-        $(QUIET)$(SED) -e "s+@VBOX_DOC_PATH@+$(VBOX_LNX_APP_DOCS)+" \
-                -e "s+@VBOX_PRODUCT@+$(VBOX_PRODUCT)+" \
-                --output $@ $<
-$$(linux-misc_0_OUTDIR)/virtualboxvm.desktop: $(VBOX_PATH_INST_COMMON_SRC)/virtualboxvm.desktop.in $(VBOX_VERSION_STAMP) | $$(dir $$@)
         $(call MSG_GENERATE,,$@,$<)
         $(QUIET)$(SED) -e "s+@VBOX_DOC_PATH@+$(VBOX_LNX_APP_DOCS)+" \
@@ -261 +254 @@
  VBOX_LNX_NO_STRIP += \
         virtualbox.desktop \
-        virtualboxvm.desktop \
         virtualbox.xml \
         $(VBOX_LICENSE_FILES) \

trunk/src/VBox/Installer/linux/debian/rules

@@ -181 +181 @@
         for d in $(wildcard /lib/modules/*); do \
             if [ -L $$d/build ]; then \
-                make -C $(builddir)/bin/src/vboxdrv KERN_VER=$$(basename $$d) clean && \
-                make -C $(builddir)/bin/src/vboxdrv KBUILD_VERBOSE= KERN_VER=$$(basename $$d) all; \
-                make -C $(builddir)/bin/src/vboxnetflt KERN_VER=$$(basename $$d) clean && \
-                (cp $(builddir)/bin/src/vboxdrv/Module.symvers $(builddir)/bin/src/vboxnetflt || true) && \
-                make -C $(builddir)/bin/src/vboxnetflt KBUILD_VERBOSE= KERN_VER=$$(basename $$d) KBUILD_EXTRA_SYMBOLS=$(builddir)/bin/src/vboxnetflt/Module.symvers all; \
-                make -C $(builddir)/bin/src/vboxnetadp KERN_VER=$$(basename $$d) clean && \
-                (cp $(builddir)/bin/src/vboxdrv/Module.symvers $(builddir)/bin/src/vboxnetadp || true) && \
-                make -C $(builddir)/bin/src/vboxnetadp KBUILD_VERBOSE= KERN_VER=$$(basename $$d) KBUILD_EXTRA_SYMBOLS=$(builddir)/bin/src/vboxnetadp/Module.symvers all; \
-                [ -d $(builddir)/bin/src/vboxpci ] && make -C $(builddir)/bin/src/vboxpci KERN_VER=$$(basename $$d) clean && \
-                (cp $(builddir)/bin/src/vboxdrv/Module.symvers $(builddir)/bin/src/vboxpci || true) && \
-                make -C $(builddir)/bin/src/vboxpci KBUILD_VERBOSE= KERN_VER=$$(basename $$d) KBUILD_EXTRA_SYMBOLS=$(builddir)/bin/src/vboxpci/Module.symvers all; \
-                true; \
+                make -C $(builddir)/bin/src/vboxdrv KERN_VER=$$(basename $$d) clean && \
+                make -C $(builddir)/bin/src/vboxdrv KBUILD_VERBOSE= KERN_VER=$$(basename $$d) all; \
+                make -C $(builddir)/bin/src/vboxnetflt KERN_VER=$$(basename $$d) clean && \
+                (cp $(builddir)/bin/src/vboxdrv/Module.symvers $(builddir)/bin/src/vboxnetflt || true) && \
+                make -C $(builddir)/bin/src/vboxnetflt KBUILD_VERBOSE= KERN_VER=$$(basename $$d) KBUILD_EXTRA_SYMBOLS=$(builddir)/bin/src/vboxnetflt/Module.symvers all; \
+                make -C $(builddir)/bin/src/vboxnetadp KERN_VER=$$(basename $$d) clean && \
+                (cp $(builddir)/bin/src/vboxdrv/Module.symvers $(builddir)/bin/src/vboxnetadp || true) && \
+                make -C $(builddir)/bin/src/vboxnetadp KBUILD_VERBOSE= KERN_VER=$$(basename $$d) KBUILD_EXTRA_SYMBOLS=$(builddir)/bin/src/vboxnetadp/Module.symvers all; \
+                [ -d $(builddir)/bin/src/vboxpci ] && make -C $(builddir)/bin/src/vboxpci KERN_VER=$$(basename $$d) clean && \
+                (cp $(builddir)/bin/src/vboxdrv/Module.symvers $(builddir)/bin/src/vboxpci || true) && \
+                make -C $(builddir)/bin/src/vboxpci KBUILD_VERBOSE= KERN_VER=$$(basename $$d) KBUILD_EXTRA_SYMBOLS=$(builddir)/bin/src/vboxpci/Module.symvers all; \
+                true; \
             fi; \
         done
@@ -233 +233 @@
         $(if $(NOQT),,mv $(archdir)/virtualbox.desktop \
            $(prefix)/usr/share/applications/virtualbox.desktop)
-        $(if $(NOQT),,mv $(archdir)/virtualboxvm.desktop \
-           $(prefix)/usr/share/applications/virtualboxvm.desktop)
         install -d -g 0 -o 0 $(prefix)/usr/share/pixmaps
         $(if $(NOQT),,install -d -g 0 -o 0 $(prefix)/usr/share/icons/hicolor)
@@ -242 +240 @@
         $(if $(NOQT),,cd $(archdir)/icons; for i in *; do \
             for j in $$i/virtualbox.*; do \
-                if [ -f $$j ]; then \
-                    if [ ! -d $(prefix)/usr/share/icons/hicolor/$$i/apps ]; then \
-                        install -d -g 0 -o 0 $(prefix)/usr/share/icons/hicolor/$$i/apps; \
-                    fi; \
-                    mv $$j $(prefix)/usr/share/icons/hicolor/$$i/apps; \
-                fi; \
+                if [ -f $$j ]; then \
+                    if [ ! -d $(prefix)/usr/share/icons/hicolor/$$i/apps ]; then \
+                        install -d -g 0 -o 0 $(prefix)/usr/share/icons/hicolor/$$i/apps; \
+                    fi; \
+                    mv $$j $(prefix)/usr/share/icons/hicolor/$$i/apps; \
+                fi; \
             done; \
             install -d -g 0 -o 0 $(prefix)/usr/share/icons/hicolor/$$i/mimetypes; \
@@ -272 +270 @@
         $(if $(NOMODS),,for d in $(moddir)/*; do \
             if [ -f $$d/vboxdrv.ko -a -f $$d/vboxnetflt.ko -a -f $$d/vboxnetadp.ko ]; then \
-                install -D -g 0 -o 0 -m 0644 \
+                install -D -g 0 -o 0 -m 0644 \
                     $$d/vboxdrv.ko $(prefix)/lib/modules/$$(basename $$d)/misc/vboxdrv.ko; \
-                install -D -g 0 -o 0 -m 0644 \
+                install -D -g 0 -o 0 -m 0644 \
                     $$d/vboxnetflt.ko $(prefix)/lib/modules/$$(basename $$d)/misc/vboxnetflt.ko; \
-                install -D -g 0 -o 0 -m 0644 \
+                install -D -g 0 -o 0 -m 0644 \
                     $$d/vboxnetadp.ko $(prefix)/lib/modules/$$(basename $$d)/misc/vboxnetadp.ko; \
-                if [ -f $$d/vboxpci.ko ]; then \
-                    install -D -g 0 -o 0 -m 0644 \
-                        $$d/vboxpci.ko $(prefix)/lib/modules/$$(basename $$d)/misc/vboxpci.ko; \
-                fi \
+                if [ -f $$d/vboxpci.ko ]; then \
+                    install -D -g 0 -o 0 -m 0644 \
+                        $$d/vboxpci.ko $(prefix)/lib/modules/$$(basename $$d)/misc/vboxpci.ko; \
+                fi \
             fi \
             done)
@@ -291 +289 @@
         if [ -f $(prefix)/usr/lib/$(package)/libQt5CoreVBox.so.5 ]; then \
             $(vboxroot)/tools/linux.$(chrarch)/bin/chrpath \
-                --keepgoing --replace /usr/lib/$(package) \
-                $(prefix)/usr/lib/$(package)/*.so.5 \
-                $(prefix)/usr/lib/$(package)/plugins/platforms/*.so; \
-                $(prefix)/usr/lib/$(package)/plugins/platformthemes/*.so; \
-                $(prefix)/usr/lib/$(package)/plugins/sqldrivers/*.so; \
-                $(prefix)/usr/lib/$(package)/plugins/styles/*.so; \
-                $(prefix)/usr/lib/$(package)/plugins/xcbglintegrations/*.so; \
+                --keepgoing --replace /usr/lib/$(package) \
+                $(prefix)/usr/lib/$(package)/*.so.5 \
+                $(prefix)/usr/lib/$(package)/plugins/platforms/*.so; \
+                $(prefix)/usr/lib/$(package)/plugins/platformthemes/*.so; \
+                $(prefix)/usr/lib/$(package)/plugins/sqldrivers/*.so; \
+                $(prefix)/usr/lib/$(package)/plugins/styles/*.so; \
+                $(prefix)/usr/lib/$(package)/plugins/xcbglintegrations/*.so; \
             echo "[Paths]" > $(prefix)/usr/lib/$(package)/qt.conf; \
             echo "Plugins = /usr/lib/$(package)/plugins" >> $(prefix)/usr/lib/$(package)/qt.conf; \

trunk/src/VBox/Installer/linux/deffiles

@@ -103 +103 @@
     VBox.png \
     virtualbox.desktop \
-    virtualboxvm.desktop \
     src/ \
     src/include/ \

trunk/src/VBox/Installer/linux/install.sh

@@ -339 +339 @@
     ln -sf $INSTALLATION_DIR/icons/128x128/virtualbox.png /usr/share/pixmaps/virtualbox.png
     ln -sf $INSTALLATION_DIR/virtualbox.desktop /usr/share/applications/virtualbox.desktop
-    ln -sf $INSTALLATION_DIR/virtualboxvm.desktop /usr/share/applications/virtualboxvm.desktop
     ln -sf $INSTALLATION_DIR/virtualbox.xml /usr/share/mime/packages/virtualbox.xml
     ln -sf $INSTALLATION_DIR/rdesktop-vrdp /usr/bin/rdesktop-vrdp

trunk/src/VBox/Installer/linux/rpm/VirtualBox.tmpl.spec

@@ -197 +197 @@
 ln -s /usr/share/virtualbox/src/vboxhost $RPM_BUILD_ROOT/usr/src/vboxhost-%VER%
 mv virtualbox.desktop $RPM_BUILD_ROOT/usr/share/applications/virtualbox.desktop
-mv virtualboxvm.desktop $RPM_BUILD_ROOT/usr/share/applications/virtualboxvm.desktop
 mv VBox.png $RPM_BUILD_ROOT/usr/share/pixmaps/VBox.png
 %{!?is_ose: mv LICENSE $RPM_BUILD_ROOT%{VBOXDOCDIR}}

trunk/src/VBox/Installer/linux/uninstall.sh

@@ -89 +89 @@
   /usr/share/pixmaps/virtualbox.png \
   /usr/share/applications/virtualbox.desktop \
-  /usr/share/applications/virtualboxvm.desktop \
   /usr/share/mime/packages/virtualbox.xml \
   /usr/bin/rdesktop-vrdp \

trunk/src/VBox/Installer/solaris/Makefile.kmk

@@ -545 +545 @@
                 \
                 $(VBOX_PATH_INST_COMMON_SRC)/virtualbox.desktop.in \
-            $(VBOX_PATH_INST_COMMON_SRC)/virtualboxvm.desktop.in \
                 $(VBOX_PATH_INST_COMMON_SRC)/virtualbox.xml \
                 $(VBOX_PATH_SOL_INST_SRC)/virtualbox.applications.in \
@@ -646 +645 @@
                 --output $(VBOX_PATH_SI_SCRATCH_PKG)/usr/share/applications/virtualbox.desktop \
                 $(VBOX_PATH_INST_COMMON_SRC)/virtualbox.desktop.in
-        $(SED) -e "s+@VBOX_PRODUCT@+$(VBOX_PRODUCT)+" \
-                -e "s+@VBOX_DOC_PATH@+/opt/VirtualBox+" \
-                --output $(VBOX_PATH_SI_SCRATCH_PKG)/usr/share/applications/virtualboxvm.desktop \
-                $(VBOX_PATH_INST_COMMON_SRC)/virtualboxvm.desktop.in
         $(CHMOD) 0644 $(VBOX_PATH_SI_SCRATCH_PKG)/usr/share/applications/virtualbox.desktop
-        $(CHMOD) 0644 $(VBOX_PATH_SI_SCRATCH_PKG)/usr/share/applications/virtualboxvm.desktop
 
 # Desktop stuff in /usr/share/mime/packages/ (S10 cannot deal with icon information in virtualbox.xml).