[Pkg-virtualbox-commits] r248 - tags tags/1.5.6-dfsg-4/debian tags/1.5.6-dfsg-4/debian/patches trunk/debian trunk/debian/patches trunk/debian/virtualbox-ose-source.files
meskes at alioth.debian.org
meskes at alioth.debian.org
Fri Apr 4 08:25:43 UTC 2008
Author: meskes
Date: 2008-04-04 08:25:42 +0000 (Fri, 04 Apr 2008)
New Revision: 248
Added:
tags/1.5.6-dfsg-4/
Modified:
tags/1.5.6-dfsg-4/debian/changelog
tags/1.5.6-dfsg-4/debian/patches/08-init-fail.dpatch
tags/1.5.6-dfsg-4/debian/patches/10-initscript.dpatch
tags/1.5.6-dfsg-4/debian/virtualbox-ose-guest-utils.init
trunk/debian/changelog
trunk/debian/patches/08-init-fail.dpatch
trunk/debian/patches/10-initscript.dpatch
trunk/debian/virtualbox-ose-source.files/rules
Log:
It seems I forgot to commit after releasing 1.5.6-dfsg-4, sorry.
Fixed default ARCH setting in Makefile for module.
Copied: tags/1.5.6-dfsg-4 (from rev 247, trunk)
Modified: tags/1.5.6-dfsg-4/debian/changelog
===================================================================
--- trunk/debian/changelog 2008-04-04 07:03:00 UTC (rev 247)
+++ tags/1.5.6-dfsg-4/debian/changelog 2008-04-04 08:25:42 UTC (rev 248)
@@ -1,14 +1,8 @@
-virtualbox-ose (1.5.6-dfsg-5) unstable; urgency=low
-
- * Don't fail in guest-utils init script if the vboxadd module cannot
- get loaded (Closes: #474195)
-
- -- Hilko Bengen <bengen at debian.org> Fri, 04 Apr 2008 09:02:12 +0200
-
virtualbox-ose (1.5.6-dfsg-4) unstable; urgency=low
[ Michael Meskes ]
* Set default architecture in debian/rules for module source package.
+ * Fixed and rearranged patches against init script.
[ Patrick Winnertz ]
* Improve init.d script patch to write done also on the first startup.
Modified: tags/1.5.6-dfsg-4/debian/patches/08-init-fail.dpatch
===================================================================
--- trunk/debian/patches/08-init-fail.dpatch 2008-04-04 07:03:00 UTC (rev 247)
+++ tags/1.5.6-dfsg-4/debian/patches/08-init-fail.dpatch 2008-04-04 08:25:42 UTC (rev 248)
@@ -16,11 +16,3 @@
echo " ...fail!"
}
-@@ -258,6 +259,7 @@
- chgrp vboxusers "$TAPDEV"
- chmod 0660 "$TAPDEV"
- fi
-+ succ_msg
- return 0
- }
-
Modified: tags/1.5.6-dfsg-4/debian/patches/10-initscript.dpatch
===================================================================
--- trunk/debian/patches/10-initscript.dpatch 2008-04-04 07:03:00 UTC (rev 247)
+++ tags/1.5.6-dfsg-4/debian/patches/10-initscript.dpatch 2008-04-04 08:25:42 UTC (rev 248)
@@ -51,7 +51,7 @@
# Read the configuration file entries line by line and create the
# interfaces
while read line
-@@ -195,6 +186,21 @@
+@@ -195,6 +186,20 @@
if ((! expr match "$2" "#" > /dev/null) &&
(test -z "$4" || expr match "$4" "#" > /dev/null))
then
@@ -67,12 +67,19 @@
+ fail_msg
+ return 1
+ fi
-+ succ_msg
+ module_available=1
+ fi
case $user in
+*)
group=`echo $2 | cut -c2-`
+@@ -258,6 +259,7 @@
+ chgrp vboxusers "$TAPDEV"
+ chmod 0660 "$TAPDEV"
+ fi
++ succ_msg
+ return 0
+ }
+
@@ -382,10 +387,17 @@
case "$1" in
Modified: tags/1.5.6-dfsg-4/debian/virtualbox-ose-guest-utils.init
===================================================================
--- trunk/debian/virtualbox-ose-guest-utils.init 2008-04-04 07:03:00 UTC (rev 247)
+++ tags/1.5.6-dfsg-4/debian/virtualbox-ose-guest-utils.init 2008-04-04 08:25:42 UTC (rev 248)
@@ -35,7 +35,7 @@
# vboxadd not installed, or has a problem
log_failure_msg 'cannot modprobe vboxadd kernel module';
log_end_msg 1
- exit 0
+ exit 1
fi
start-stop-daemon --start --quiet --exec /usr/sbin/vboxadd-timesync -- --daemonize
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2008-04-04 07:03:00 UTC (rev 247)
+++ trunk/debian/changelog 2008-04-04 08:25:42 UTC (rev 248)
@@ -1,14 +1,19 @@
virtualbox-ose (1.5.6-dfsg-5) unstable; urgency=low
+ [ Hilko Bengen ]
* Don't fail in guest-utils init script if the vboxadd module cannot
get loaded (Closes: #474195)
- -- Hilko Bengen <bengen at debian.org> Fri, 04 Apr 2008 09:02:12 +0200
+ [ Michael Meskes ]
+ * Fixed default ARCH setting in module Makefile, closes: #474196
+ -- Michael Meskes <meskes at debian.org> Fri, 04 Apr 2008 10:16:48 +0200
+
virtualbox-ose (1.5.6-dfsg-4) unstable; urgency=low
[ Michael Meskes ]
* Set default architecture in debian/rules for module source package.
+ * Fixed and rearranged patches against init script.
[ Patrick Winnertz ]
* Improve init.d script patch to write done also on the first startup.
Modified: trunk/debian/patches/08-init-fail.dpatch
===================================================================
--- trunk/debian/patches/08-init-fail.dpatch 2008-04-04 07:03:00 UTC (rev 247)
+++ trunk/debian/patches/08-init-fail.dpatch 2008-04-04 08:25:42 UTC (rev 248)
@@ -16,11 +16,3 @@
echo " ...fail!"
}
-@@ -258,6 +259,7 @@
- chgrp vboxusers "$TAPDEV"
- chmod 0660 "$TAPDEV"
- fi
-+ succ_msg
- return 0
- }
-
Modified: trunk/debian/patches/10-initscript.dpatch
===================================================================
--- trunk/debian/patches/10-initscript.dpatch 2008-04-04 07:03:00 UTC (rev 247)
+++ trunk/debian/patches/10-initscript.dpatch 2008-04-04 08:25:42 UTC (rev 248)
@@ -51,7 +51,7 @@
# Read the configuration file entries line by line and create the
# interfaces
while read line
-@@ -195,6 +186,21 @@
+@@ -195,6 +186,20 @@
if ((! expr match "$2" "#" > /dev/null) &&
(test -z "$4" || expr match "$4" "#" > /dev/null))
then
@@ -67,12 +67,19 @@
+ fail_msg
+ return 1
+ fi
-+ succ_msg
+ module_available=1
+ fi
case $user in
+*)
group=`echo $2 | cut -c2-`
+@@ -258,6 +259,7 @@
+ chgrp vboxusers "$TAPDEV"
+ chmod 0660 "$TAPDEV"
+ fi
++ succ_msg
+ return 0
+ }
+
@@ -382,10 +387,17 @@
case "$1" in
Modified: trunk/debian/virtualbox-ose-source.files/rules
===================================================================
--- trunk/debian/virtualbox-ose-source.files/rules 2008-04-04 07:03:00 UTC (rev 247)
+++ trunk/debian/virtualbox-ose-source.files/rules 2008-04-04 08:25:42 UTC (rev 248)
@@ -37,6 +37,9 @@
# Set ARCH so we can cross compile Debian kernel
ARCH := `uname -m`
+ifneq ($(shell echo $(ARCH) | grep 86), )
+ ARCH := i386
+endif
ifneq ($(shell echo $(KVERS) | grep 86), )
ARCH := i386
endif
More information about the Pkg-virtualbox-commits
mailing list