Changeset 34682 in vbox

Timestamp:

Dec 3, 2010 10:11:32 AM (14 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

68484

Message:

deb/rpm: create the ExtensionPacks directory; fix the convenionce lower-case symlinks

Location:

trunk

Files:

• debian/rules (modified) (2 diffs)
• src/VBox/Installer/linux/debian/rules (modified) (2 diffs)
• src/VBox/Installer/linux/rpm/VirtualBox.tmpl.spec (modified) (2 diffs)

trunk/debian/rules

@@ -185 +185 @@
         done
         rmdir $(archdir)/icons
+        install -d -g 0 -o 0 $(prefix)/usr/lib/$(package)/ExtensionPacks
         mv $(archdir)/virtualbox.xml debian/$(verpkg).sharedmimeinfo
         install -d -g 0 -o 0 $(prefix)/usr/share/lintian/overrides
@@ -257 +258 @@
         dh_link \
             $(if $(NOQT),,usr/bin/VBox          usr/bin/VirtualBox) \
-            $(if $(NOQT),,VirtualBox            usr/bin/virtualbox) \
+            $(if $(NOQT),,usr/bin/VBox          usr/bin/virtualbox) \
             usr/bin/VBox                        usr/bin/VBoxManage \
-            VBoxManage                          usr/bin/vboxmanage \
+            usr/bin/VBox                        usr/bin/vboxmanage \
             $(if $(HEADLESS),,usr/bin/VBox      usr/bin/VBoxSDL) \
-            $(if $(HEADLESS),,VBoxSDL           usr/bin/vboxsdl) \
+            $(if $(HEADLESS),,usr/bin/VBox      usr/bin/vboxsdl) \
             $(if $(ose),,usr/bin/VBox           usr/bin/VBoxVRDP) \
             usr/bin/VBox                        usr/bin/VBoxHeadless \
-            VBoxHeadless                        usr/bin/vboxheadless \
+            usr/bin/VBox                        usr/bin/vboxheadless \
             $(if $(NOWEBSVC),,usr/bin/VBox      usr/bin/vboxwebsrv) \
             usr/share/virtualbox/src/vboxhost   usr/src/vboxhost-$(ver)

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

@@ -212 +212 @@
         done
         rmdir $(archdir)/icons
+        install -d -g 0 -o 0 $(prefix)/usr/lib/$(package)/ExtensionPacks
         mv $(archdir)/virtualbox.xml debian/$(verpkg).sharedmimeinfo
         install -d -g 0 -o 0 $(prefix)/usr/share/lintian/overrides
@@ -284 +285 @@
         dh_link \
             $(if $(NOQT),,usr/bin/VBox          usr/bin/VirtualBox) \
-            $(if $(NOQT),,VirtualBox            usr/bin/virtualbox) \
+            $(if $(NOQT),,usr/bin/VBox          usr/bin/virtualbox) \
             usr/bin/VBox                        usr/bin/VBoxManage \
-            VBoxManage                          usr/bin/vboxmanage \
+            usr/bin/VBox                        usr/bin/vboxmanage \
             $(if $(HEADLESS),,usr/bin/VBox      usr/bin/VBoxSDL) \
-            $(if $(HEADLESS),,VBoxSDL           usr/bin/vboxsdl) \
+            $(if $(HEADLESS),,usr/bin/VBox      usr/bin/vboxsdl) \
             $(if $(ose),,usr/bin/VBox           usr/bin/VBoxVRDP) \
             usr/bin/VBox                        usr/bin/VBoxHeadless \
-            VBoxHeadless                        usr/bin/vboxheadless \
+            usr/bin/VBox                        usr/bin/vboxheadless \
             $(if $(NOWEBSVC),,usr/bin/VBox      usr/bin/vboxwebsrv) \
             usr/share/virtualbox/src/vboxhost   usr/src/vboxhost-$(ver)

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

@@ -70 +70 @@
 install -m 755 -d $RPM_BUILD_ROOT%{_defaultdocdir}/virtualbox
 install -m 755 -d $RPM_BUILD_ROOT/usr/lib/virtualbox
+install -m 755 -d $RPM_BUILD_ROOT/usr/lib/virtualbox/ExtensionPacks
 install -m 755 -d $RPM_BUILD_ROOT/usr/share/virtualbox
 install -m 755 -d $RPM_BUILD_ROOT/usr/share/mime/packages
@@ -142 +143 @@
 %endif
 ln -s VBox $RPM_BUILD_ROOT/usr/bin/VirtualBox
+ln -s VBox $RPM_BUILD_ROOT/usr/bin/virtualbox
 ln -s VBox $RPM_BUILD_ROOT/usr/bin/VBoxManage
+ln -s VBox $RPM_BUILD_ROOT/usr/bin/vboxmanage
 ln -s VBox $RPM_BUILD_ROOT/usr/bin/VBoxSDL
+ln -s VBox $RPM_BUILD_ROOT/usr/bin/vboxsdl
 ln -s VBox $RPM_BUILD_ROOT/usr/bin/VBoxVRDP
 ln -s VBox $RPM_BUILD_ROOT/usr/bin/VBoxHeadless
+ln -s VBox $RPM_BUILD_ROOT/usr/bin/vboxheadless
 ln -s VBox $RPM_BUILD_ROOT/usr/bin/vboxwebsrv
-ln -s VirtualBox $RPM_BUILD_ROOT/usr/bin/virtualbox
-ln -s VBoxManage $RPM_BUILD_ROOT/usr/bin/vboxmanage
-ln -s VBoxSDL $RPM_BUILD_ROOT/usr/bin/vboxsdl
-ln -s VBoxHeadless $RPM_BUILD_ROOT/usr/bin/vboxheadless
 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