Changeset 6332

Timestamp:

01/10/08 16:54:54 (9 months ago)

Author:

vboxsync

Message:

sync deb

Files:

• trunk/debian (modified) (1 prop)
• trunk/debian/LocalConfig.kmk (modified) (1 diff)
• trunk/debian/VBox.sh (modified) (1 diff)
• trunk/debian/preinst.in (moved) (moved from trunk/debian/preinst) (2 diffs)
• trunk/debian/rules (modified) (3 diffs)
• trunk/debian/templates (modified) (1 diff)
• trunk/debian/vboxdrv.init.in (moved) (moved from trunk/debian/vboxdrv.init.tmpl)
• trunk/debian/vboxnet.init.in (moved) (moved from trunk/debian/vboxnet.init.tmpl)

trunk/debian/LocalConfig.kmk

@@ -17 +17 @@
-
-# shut up wine complaining about unknown locale
-LC_ALL=C DISPLAY= wine 2>/dev/null
+wine
-
-# don't build testcases to save time, they are not needed for the package

trunk/debian/VBox.sh

@@ -102 +102 @@
-    exec "/usr/lib/virtualbox-ose/VBoxVRDP" "$@"
-  ;;
+  VBoxHeadless)
+    exec "/usr/lib/virtualbox-ose/VBoxHeadless" "$@"
+  ;;
-  *)
-    echo "Unknown application - $APP"

trunk/debian/preinst.in

@@ -15 +15 @@
-db_version 2.0
-db_capb backup
+
+# check for upgrade, disable this check for now
+if false; then
+  ver_new=%VER%
+  ver_old=`echo $2 | cut -f1 -d"-"`
+  if [ -n "$ver_old" -a "$ver_new" == "$ver_old" ]; then
+    db_get virtualbox-ose/update_version_change
+    db_input critical virtualbox-ose/update_version_change || true
+    db_go || true
+    db_get virtualbox-ose/update_version_change || true
+    if [ "$RET" = false ]; then
+      db_stop
+      exit 1
+    fi
+  fi
+fi
-
-# check for old vboxdrv modules
@@ -37 +53 @@
-  fi
-fi
+
+#DEBHELPER#
+

trunk/debian/rules

@@ -171 +171 @@
-        mv $(archdir)/VBoxAddIF.sh $(prefix)/usr/bin/VBoxTAP
-        for i in VBoxManage VBoxSVC tstVMM $(if $(HEADLESS),,VBoxSDL) \
-
+
+
-            mv $(archdir)/$$i $(prefix)/usr/lib/$(package); done
-        mv $(archdir)/VBoxTunctl $(prefix)/usr/bin
@@ -195 +196 @@
-            $(if $(HEADLESS),,usr/bin/VBox usr/bin/VBoxSDL) \
-            $(if $(ose),,usr/bin/VBox usr/bin/VBoxVRDP) \
+            usr/bin/VBox    usr/bin/VBoxHeadless \
-            usr/bin/VBoxTAP usr/bin/VBoxAddIF \
-            usr/bin/VBoxTAP usr/bin/VBoxDeleteIF
@@ -201 +203 @@
-        $(if $(NOMODS),,dh_installmodules)
-        sed -e 's|%NOLSB%|$(if $(filter _Debian_sarge ucs1.3,$(debrel)),yes,)|g;' \
-tmpl
+in
-        sed -e 's|%NOLSB%|$(if $(filter _Debian_sarge,$(debrel)),yes,)|g;' \
-tmpl
+in
-        dh_installinit --name=vboxdrv
-        dh_installinit --name=vboxnet
+        cat debian/preinst.in | sed -e 's|%VER%|$(ver)|g' > debian/preinst
-        if [ "$(debrel)" = "_Ubuntu_dapper" -o "$(debrel)" = "_Debian_sarge" ]; then \
-            cat debian/postrm.dapper > debian/postrm; fi

trunk/debian/templates

@@ -45 +45 @@
- as root
-
+Template: virtualbox-ose/update_version_change
+Type: boolean
+Default: false
+Description: Proceed with VirtualBox upgrade?
+ You are about to update VirtualBox to a new upstream version. Make sure to discard or
+ merge all snapshots and saved states before you proceed because VM states are version
+ specific.