diff -u virtualbox-ose-3.0.8-dfsg/debian/changelog virtualbox-ose-3.0.8-dfsg/debian/changelog --- virtualbox-ose-3.0.8-dfsg/debian/changelog +++ virtualbox-ose-3.0.8-dfsg/debian/changelog @@ -1,3 +1,34 @@ +virtualbox-ose (3.0.8-dfsg-1ubuntu1) karmic; urgency=low + + * Merge from debian unstable (LP: #444812), remaining changes: + - Enable DKMS support on virtualbox host and guest modules (LP: #267097) + - Drop virtualbox-ose{-guest,}-modules-* package templates + - Recommend *-source instead of *-modules packages + - Replace error messages related to missing/mismatched + kernel module accordingly + - Autoload kernel module + - LOAD_VBOXDRV_MODULE=1 in virtualbox-ose.default + - Disable update action + - patches/u01-disable-update-action.dpatch + - Virtualbox should go in Accessories, not in System tools (LP: #288590) + - virtualbox-ose-qt.files/virtualbox-ose.desktop + - Add apport hook + - virtualbox-ose.files/source_virtualbox-ose.py + - virtualbox-ose.install + - Add launchpad integration + - control + - lpi-bug.xpm + - patches/u02-lp-integration.dpatch + * Try to remove existing dkms modules before adding the new modules + (LP: #434503) + - debian/virtualbox-ose-source.postinst + - debian/virtualbox-ose-guest-source.postinst + * Don't fail if dkms modules have already been removed + - debian/virtualbox-ose-source.prerm + - debian/virtualbox-ose-guest-source.prerm + + -- Felix Geyer Tue, 13 Oct 2009 23:06:00 +0200 + virtualbox-ose (3.0.8-dfsg-1) unstable; urgency=high [ Felix Geyer ] @@ -25,6 +56,36 @@ -- Michael Meskes Tue, 13 Oct 2009 13:46:44 +0200 +virtualbox-ose (3.0.6-dfsg-1ubuntu1) karmic; urgency=low + + * Merge from debian unstable (LP: #429697), remaining changes: + - Enable DKMS support on virtualbox host and guest modules (LP: #267097) + - Drop virtualbox-ose{-guest,}-modules-* package templates + - Recommend *-source instead of *-modules packages + - Replace error messages related to missing/mismatched + kernel module accordingly + - Autoload kernel module + - LOAD_VBOXDRV_MODULE=1 in virtualbox-ose.default + - Disable update action + - patches/u01-disable-update-action.dpatch + - Virtualbox should go in Accessories, not in System tools (LP: #288590) + - virtualbox-ose-qt.files/virtualbox-ose.desktop + - Add apport hook + - virtualbox-ose.files/source_virtualbox-ose.py + - virtualbox-ose.install + - Add launchpad integration + - control + - lpi-bug.xpm + - patches/u02-lp-integration.dpatch + - virtualbox, virtualbox-* (names of the upstream proprietary packages) + conflict with virtualbox-ose (LP: #379878) + * Make debug package depend on normal or guest utils package + * Drop patches/22-pulseaudio-stubs.dpatch (applied upstream) + * Rename Ubuntu specific patches to uXX-*.dpatch + * Fix lintian warnings in maintainer scripts + + -- Felix Geyer Mon, 14 Sep 2009 18:25:07 +0200 + virtualbox-ose (3.0.6-dfsg-1) unstable; urgency=low [ Felix Geyer ] @@ -45,6 +106,35 @@ -- Michael Meskes Mon, 17 Aug 2009 13:31:47 +0200 +virtualbox-ose (3.0.4-dfsg-1ubuntu1) karmic; urgency=low + + * Merge from debian unstable (LP: #416314), remaining changes: + - Enable DKMS support on virtualbox host and guest modules (LP: #267097) + - Drop virtualbox-ose{-guest,}-modules-* package templates + - Recommend *-source instead of *-modules packages + - Replace error messages related to missing/mismatched + kernel module accordingly + - Autoload kernel module + - LOAD_VBOXDRV_MODULE=1 in virtualbox-ose.default + - Disable update action + - patches/13-disable-update-action.dpatch + - Virtualbox should go in Accessories, not in System tools (LP: #288590) + - virtualbox-ose-qt.files/virtualbox-ose.desktop + - Add apport hook + - virtualbox-ose.files/source_virtualbox-ose.py + - virtualbox-ose.install + - Add launchpad integration + - debian/control + - debian/lpi-bug.xpm + - debian/patches/21-lp-integration.dpatch + - virtualbox, virtualbox-* (names of the upstream proprietary packages) + conflict with virtualbox-ose (LP: #379878) + * Fix FTBFS with PulseAudio 0.9.16 + - debian/patches/00list + - debian/patches/22-pulseaudio-stubs.dpatch + + -- Felix Geyer Thu, 13 Aug 2009 12:39:26 +0200 + virtualbox-ose (3.0.4-dfsg-1) unstable; urgency=low [ Felix Geyer ] @@ -58,6 +148,16 @@ -- Michael Meskes Mon, 10 Aug 2009 13:27:41 +0200 +virtualbox-ose (3.0.2-dfsg-1ubuntu1) karmic; urgency=low + + * Merge from debian unstable (LP: #394188) + * Install virtual network management tool + * Improve apport hook + * Add launchpad integration + * Conflict with virtualbox-3.0 + + -- Felix Geyer Mon, 13 Jul 2009 21:56:50 +0200 + virtualbox-ose (3.0.2-dfsg-1) unstable; urgency=low * New Upstream Version, closes: #536338, #536371, #536578 @@ -95,6 +195,20 @@ -- Michael Meskes Sun, 28 Jun 2009 14:56:19 +0200 +virtualbox-ose (2.2.4-dfsg-1ubuntu1) karmic; urgency=low + + * Merge from debian unstable, fixes the following bugs: + - Virtualbox OSE mouse integration doesn't work (LP: #379057) + - vboxwebsrv/vboxwebserv name confusion (LP: #383134) + - virtualbox-ose help buttons don't work (LP: #383823) + * Automatically load vboxvfs kernel module and mount all shared folders + from /etc/fstab (LP: #385494) + * Stop providing/replacing virtualbox, virtualbox-* and virtualbox-source, + so that virtualbox-ose and virtualbox-ose-source can conflict with + virtualbox, virtualbox-2.0, virtualbox-2.1 and virtualbox-2.2 (LP: #379878) + + -- Felix Geyer Sun, 14 Jun 2009 12:40:03 +0200 + virtualbox-ose (2.2.4-dfsg-1) unstable; urgency=low * New Upstream Version, closes: #531468 @@ -120,6 +234,110 @@ -- Michael Meskes Fri, 29 May 2009 13:12:07 +0200 +virtualbox-ose (2.2.2-dfsg-2ubuntu3) karmic; urgency=low + + * Rollback my last change in the last upload: do not conflict + with packages we're providing ourselves (LP: #379878). + - debian/control + + -- Daniel Hahler Mon, 25 May 2009 01:02:11 +0200 + +virtualbox-ose (2.2.2-dfsg-2ubuntu2) karmic; urgency=low + + [ Felix Geyer ] + * Install virtualbox-ose-source udev rules + - debian/rules + * Add missing vboxuser udev rule and fix permissions for + vboxadd (Closes: #530302) + - debian/virtualbox-ose-guest-source.udev + * Auto-detect mouse driver by installing HAL device information + (Closes: #530299) + - debian/virtualbox-ose-guest-x11.install + + [ Daniel Hahler ] + * Remove usage/references to /etc/vbox/vbox.cfg (as handled + upstream) (LP: #280973). + This prevents "Could not find VirtualBox installation. + Please reinstall." error, after having installed the + upstream debian package. + - debian/virtualbox-ose.files/VBox.sh: do not source + vbox.cfg anymore. + - Delete debian/virtualbox-ose.files/vbox.cfg + - debian/virtualbox-ose.preinst: remove vbox.cfg on + upgrades. + * Move debian/virtualbox-ose.udev => virtualbox-ose-source.udev, + to complement virtualbox-ose-guest-source.udev. + * virtualbox-ose-source: conflict with virtualbox.org packages + (LP: #379878). + - debian/control + + -- Daniel Hahler Sun, 24 May 2009 02:22:17 +0200 + +virtualbox-ose (2.2.2-dfsg-2ubuntu1) karmic; urgency=low + + * Merge from debian unstable (LP: #358215), remaining changes: + - Disable update action + - patches/13-disable-update-action.dpatch + - Disable Help Contents menu item + - patches/17-disable-help-contents.dpatch + - Enable DKMS support on virtualbox host and guest modules (LP: #267097) + - Drop: + - virtualbox-ose-source.files/rules + - virtualbox-ose-source.files/postinst.modules.in + - virtualbox-ose-source.files/control.modules.in + - virtualbox-ose-source.files/Makefile + - virtualbox-ose-guest-source.files/rules + - virtualbox-ose-guest-source.files/postinst.modules.in + - virtualbox-ose-guest-source.files/control.modules.in + - virtualbox-ose-source.links + - Rename / Add version to .in files: + - virtualbox-ose-source.dirs -> virtualbox-ose-source.dirs.in + - virtualbox-ose-guest-utils.udev -> virtualbox-ose-guest-source.udev + - virtualbox-ose-guest-source.install -> + virtualbox-ose-guest-source.install.in + - virtualbox-ose-guest-source.dirs -> + virtualbox-ose-guest-source.dirs.in + - virtualbox-ose-guest-source.links -> + virtualbox-ose-guest-source.links.in + - New: + - virtualbox-ose-source.files/dkms.conf.in + - virtualbox-ose-source.postinst + - virtualbox-ose-source.prerm + - virtualbox-ose-guest-source.prerm + - virtualbox-ose-guest-source.postinst + - virtualbox-ose-guest-source.files/dkms.conf.in + - debian/rules: + - Add support to update all ".in" files in install target + - Add support to remove all sed produced ".in" files in clean target + - Drop extra rules that were modifying the "debian" directory in -source + - Make sure to include postinst/prerm scripts for arch indep packages. + - debian/control: + - Recommends on the source package instead of modules packages + - Depends on the source packages for dkms and libc6-dev + - Replace error messages related to missing/mismatched + kernel module accordingly: + - patches/04-vboxdrv-references.dpatch + - patches/13-module-mismatch.dpatch + - virtualbox-ose.files/VBox.sh + - Autoload kernel module + - LOAD_VBOXDRV_MODULE=1 in virtualbox-ose.default + - Virtualbox should go in Accessories, not in System tools (LP: #288590) + - virtualbox-ose-qt.files/virtualbox-ose.desktop + - Change Vcs-Svn and Vcs-Browser to XS-Original-Vcs-* + - debian/control + - Add apport hook + - virtualbox-ose.files/source_virtualbox-ose.py + - virtualbox-ose.install + - Remove old vboxdrv init script + - virtualbox-ose.preinst + * Add virtualbox-2.0, virtualbox-2.1, virtualbox-2.2 to + Conflicts, Provides, Replaces (names of the upstream proprietary packages) + - debian/control + * Install apport hook to the correct location: /usr/share/apport/package-hooks + - debian/virtualbox-ose.install + + -- Felix Geyer Sat, 16 May 2009 15:42:23 +0200 + virtualbox-ose (2.2.2-dfsg-2) unstable; urgency=low * Made initscript call find only in case of an error, closes: #526395 @@ -168,6 +386,64 @@ -- Michael Meskes Fri, 10 Apr 2009 11:16:49 +0200 +virtualbox-ose (2.1.4-dfsg-1ubuntu5) karmic; urgency=low + + * Merge proper fix for LP: #369550 from Debian. + - debian/patches/00list + - debian/patches/09-initscript.dpatch + - Drop debian/patches/08- + + -- Daniel Hahler Tue, 05 May 2009 23:54:28 +0200 + +virtualbox-ose (2.1.4-dfsg-1ubuntu4) karmic; urgency=low + + * Do not use find in virtulbox-ose init script, which saves about + ~10s during boot/init (LP: #369550). + Thanks to Marius Gedminas for the suggestion and bug report. + - debian/patches/09-initscript.dpatch: + + -- Daniel Hahler Thu, 30 Apr 2009 23:06:48 +0200 + +virtualbox-ose (2.1.4-dfsg-1ubuntu3) jaunty; urgency=low + + * Use source_virtualbox-ose.py to provide an apport hook for all + packages. (LP: #340149) + - debian/virtualbox-ose.install + - virtualbox-ose.files/virtualbox-ose.py + + -- Daniel Hahler Sun, 29 Mar 2009 21:06:29 +0200 + +virtualbox-ose (2.1.4-dfsg-1ubuntu2) jaunty; urgency=low + + * Add apport hook to provide output of "dpkg -l | grep virtualbox" + (LP: #340149) + - debian/virtualbox-ose.install + - virtualbox-ose.files/virtualbox-ose.py + * Provides: xserver-xorg-video-5, xserver-xorg-input-4 (LP: #313510) + - debian/control + * Install vbox{video,mouse}_drv_16.so (instead of *_15.*) + - debian/rules + + -- Daniel Hahler Fri, 20 Mar 2009 01:19:13 +0100 + +virtualbox-ose (2.1.4-dfsg-1ubuntu1) jaunty; urgency=low + + * Merge from debian unstable (LP: #328161), remaining changes: + - See 2.1.0-dfsg-1ubuntu1 + * Drop 15-fix-byteorder-hack-jaunty.dpatch, applied upstream. + * Drop Conflicts, Replaces, Provides: virtualbox-2.0. No real + reason. + - debian/control + * Add debian/patches/17-disable-help-contents.dpatch, + Disable Help>Contents... menu item (LP: #323988) + * Refreshed 13-disable-update-action.dpatch + * debian/rules: add CXXFLAGS+=-fpermissive to fix FTBFS + (see LP: #328161) + * Drop Ubuntu specific patches/16-fix-ftbfs-morePadding.dpatch. + Not required anymore and caused build failure in tests now. + + -- Daniel Hahler Sun, 01 Mar 2009 23:51:51 +0100 + virtualbox-ose (2.1.4-dfsg-1) unstable; urgency=high * New upstream version. @@ -205,6 +481,12 @@ -- Michael Meskes Thu, 22 Jan 2009 11:47:53 +0100 +virtualbox-ose (2.1.0-dfsg-2ubuntu1) jaunty; urgency=low + + * Merge from Debian experimental. Closes LP: #253933 + + -- Daniel Hahler Thu, 22 Jan 2009 21:41:50 +0100 + virtualbox-ose (2.1.0-dfsg-2) experimental; urgency=low * Added versioned build dependency for kbuild. Closes: #510736 @@ -214,6 +496,71 @@ -- Michael Meskes Sun, 04 Jan 2009 16:58:38 +0100 +virtualbox-ose (2.1.0-dfsg-1ubuntu2) jaunty; urgency=low + + * Remove vboxnetflt dkms module in virtualbox-ose-source.prerm + * Make script used for DKMS "interlinking" executable, so DKMS + executes it (LP: #314650) + - debian/rules + + -- Daniel Hahler Wed, 07 Jan 2009 20:27:10 +0100 + +virtualbox-ose (2.1.0-dfsg-1ubuntu1) jaunty; urgency=low + + * Merge from Debian experimental (LP: #304859). Remaining Ubuntu changes: + - DKMS support + - For the complete list of added, moved and dropped files see the + log of 2.0.2-dfsg-0ubuntu1 + - virtualbox-ose-guest-utils.udev => virtualbox-ose-guest-source.udev + - debian/rules + - Refer to virtualbox-ose-source instead of -modules: + - virtualbox-ose.files/VBox.sh + - patches/04-vboxdrv-references.dpatch + - patches/13-module-mismatch.dpatch + - debian/control: + - Recommend virtualbox-ose-source instead of -modules + - The -source packages depends are changed for DKMS + - Autoload kernel module + - LOAD_VBOXDRV_MODULE=1 in virtualbox-ose.default + - Keep adjusted debian/virtualbox-ose.preinst.in to remove old vboxdrv + conffile + - debian/virtualbox-ose-source.postinst: call "virtualbox-ose restart", + depending on LOAD_VBOXDRV_MODULE + - virtualbox-ose-guest-utils: Install vboxvideo_drv_15.so instead + of vboxvideo_drv_14.so (LP: #292856) + - debian/rules + - Enable 64 bit guest support when building on AMD64 (LP: #271651) + - debian/rules (VBOX_WITH_64_BITS_GUESTS) + - Virtualbox should go in Accessories, not in System tools (LP: #288590) + - virtualbox-ose.files/virtualbox-ose.desktop + - debian/patches/13-disable-update-action.dpatch + - Change Vcs-Svn and Vcs-Browser to XS-Original-Vcs-* + - debian/control + - virtualbox-ose Conflicts, Replaces, Provides: virtualbox-2.0 + - debian/control + - debian/control: + - Bump provides of guest-utils to xserver-xorg-input-2.1 + - Bump provides of guest-utils to xserver-xorg-video-2.9 + - patches/15-fix-byteorder-hack-jaunty.dpatch to + fix FTBFS on Jaunty (patch from Nathan, LP: #278466) + * virtualbox-ose-guest-source.links.in: fix install of r0drv to vboxvfs + (there have been two lines for vboxadd only) (LP: #310647) + * Add vboxnetflt to DKMS system + - add virtualbox-ose-source.files/do_Module.symvers which is used + in PRE_BUILD/POST_BUILD (dkms.conf) + * Add patches/16-fix-ftbfs-morePadding.dpatch to fix FTBFS on i386 + during tests (Thanks Nathan Summers) + * Fix grammar in virtualbox-ose.README.Debian.xml + * mv virtualbox-ose.preinst{.in,} and fix + Lintian error "maintainer-script-uses-dpkg-status-directly" + - debian/rules + * Closes the following bugs in Launchpad: + - VirtualBox virtual machines are frozen after suspend-resume + (LP: #292794) + - Clean LocalConfig.kmk in clean target (LP: #286854) + + -- Daniel Hahler Wed, 07 Jan 2009 06:39:04 +0100 + virtualbox-ose (2.1.0-dfsg-1) experimental; urgency=low * New upstream version @@ -233,6 +580,177 @@ -- Michael Meskes Thu, 20 Nov 2008 14:09:54 +0100 +virtualbox-ose (2.0.4-dfsg-0ubuntu3) jaunty; urgency=low + + [ Nathan Summers ] + * Add alloc/heapsimple.c to fix build on amd64. (LP: #278466) + - virtualbox-ose-guest-source.install.in + * Add link to alloc/ so that dkms can find it. + - virtualbox-ose-guest-source.links.in + + [ Daniel Hahler ] + * debian/rules: expand bash-style shell expansion in "clean" + target, so the generated files get removed actually. + * Add debian/patches/15-fix-byteorder-hack-jaunty.dpatch to + fix FTBFS on Jaunty (patch from Nathan, LP: #278466) + + -- Daniel Hahler Sat, 06 Dec 2008 02:39:14 +0100 + +virtualbox-ose (2.0.4-dfsg-0ubuntu2) jaunty; urgency=low + + * Upload as non-native package. (Discussion at LP: #288957) + * Do not recommend non-existant package virtualbox-ose-guest-modules, + recommend virtualbox-ose-guest-source instead (for DKMS) + (LP: #293237) + - debian/control + * virtualbox-ose-guest-utils: Install vboxvideo_drv_15.so instead + of vboxvideo_drv_14.so. Thanks for the patch, packet. + (LP: #292856) + - debian/rules + * Remove vboxdrv init script and set LOAD_VBOXDRV_MODULE=1 instead, + to trigger kernel module loading in virtualbox-ose init script + (LP: #293109) + - debian/virtualbox-ose.preinst.in modified + - debian/virtualbox-ose.vboxdrv.init.in removed + - debian/virtualbox-ose.default + - debian/patches/09-initscript.dpatch: + - Re-add parts from Debian to handle LOAD_VBOXDRV_MODULE + - Make "restart" and "force-reload" call "stop"/"start", + not stop_networt/start_network only + - Add info about kernel module to "status" + - debian/rules + - debian/virtualbox-ose-source.postinst: call "virtualbox-ose restart", + depending on LOAD_VBOXDRV_MODULE + * Refer to virtualbox-ose-source in error messages + - debian/patches/04-vboxdrv-references.dpatch updated + * Fix indent for reference to virtualbox-ose-source in + - debian/virtualbox-ose.files/VBox.sh + * virtualbox-ose Conflicts, Replaces, Provides: virtualbox-2.0 + - debian/control + + -- Daniel Hahler Tue, 04 Nov 2008 18:29:14 +0100 + +virtualbox-ose (2.0.4-dfsg-0ubuntu1) intrepid; urgency=low + + [ Jonathan Ernst ] + * Virtualbox should go in Accessories, not in System tools (LP: #288590) + + [ Daniel Hahler ] + * New upstream version (LP: #288957) + - Updated debian/patches/09-initscript.dpatch (one hunk rejected/obsolete) + * Drop debconf question about losing snapshots because of upgrading: it is + no longer relevant and the default (cancel upgrade) caused a lot of + trouble (LP: #288178, #221736) + - debian/virtualbox-ose.preinst.in, debian/virtualbox-ose.templates, + debian/rules + * Improve patch for disabling the "check for updates" dialog (LP: #272212) + - debian/patches/13-disable-update-action.dpatch + * Disable registration request at Sun (LP: #285684, #271603) + - debian/patches/14-disable-registration-request.dpatch + + -- Daniel Hahler Sun, 26 Oct 2008 02:23:42 +0100 + +virtualbox-ose (2.0.2-dfsg-0ubuntu3) intrepid; urgency=low + + * debian/patches/13-disable-update-action.dpatch: + Disable update action menu entry (LP: #272212) + + -- Daniel Hahler Fri, 19 Sep 2008 23:33:32 +0200 + +virtualbox-ose (2.0.2-dfsg-0ubuntu2) intrepid; urgency=low + + * debian/virtualbox-ose.install: + - Install VBoxHeadless (LP: #271753) + * debian/virtualbox-ose.links: + - Include symlink for VBoxHeadless + * debian/virtualbox-ose.files/VBox.sh: + - Remove check for vboxusers, not necessary w/ + hardening. + * debian/virtualbox-ose.udev: + - Don't set vboxdrv to vboxusers, not necessary + w/ hardening. + * debian/virtualbox-ose.vboxdrv.init: + - Remove permissions check for vboxdrv. + * debian/rules: + - Enable 64 bit guest support when building on + AMD64 (LP: #271651) + - Set VBoxHeadless suid. + * debian/control: + - Add depends for linux-headers to make sure + that the modules can compile initially (LP: #271534) + + -- Mario Limonciello Thu, 18 Sep 2008 12:49:02 -0500 + +virtualbox-ose (2.0.2-dfsg-0ubuntu1) intrepid; urgency=low + + * New upstream version (LP: #268795) + - Introduces support for Intrepid Guests + - Introduces support for kernel 2.6.27 + * Update patches for new upstream version: + - 02-config-kmk + - 09-initscript + * Drop patches no longer necessary (or absorbed upstream): + - 05-vboxadd-udev + - 01-no-64bit-guest + * New patches: + - 01-64bit, for making sure we query the target arch properly. + * debian/control: + - Build depend on libqt4-dev for new upstream version. + - Build depend on python2.5-dev for new upstream version. + - Drop libqt3-mt-dev from build depends + - Bump provides of guest-utils to xserver-xorg-input-2.1 + - Bump provides of guest-utils to xserver-xorg-video-2.9 + - Enable 64 bit guest utils support. + * debian/rules: + - Disable QT3 support as we are using the QT4 frontend by + default. + - Set VirtualBox binaries to suid root per new hardening + requirements in this release. + - Add amd64 to a valid arch in the X11 additions check. + * debian/virtualbox-ose.install: + - Update location that xpidl is installed from. + * debian/virtualbox-ose.vboxdrv.init: + - Start at runlevels 2,3,4,5 rather than just 3,5 + * Enable DKMS support on virtualbox host and guest modules. (LP: #267097) + - Rebuilding is no longer necessary for new kernels (LP: #268367) + - Drop: + + virtualbox-ose-source.files/rules + + virtualbox-ose-source.files/postinst.modules.in + + virtualbox-ose-source.files/control.modules.in + + virtualbox-ose-guest-source.files/rules + + virtualbox-ose-guest-source.files/postinst.modules.in + + virtualbox-ose-guest-source.files/control.modules.in + + virtualbox-ose-source.links + - Rename / Add version to .in files: + + virtualbox-ose-guest-source.files/udev -> + virtualbox-ose-guest-source.udev + + virtualbox-ose-guest-source.install -> + virtualbox-ose-guest-source.install.in + + virtualbox-ose-source.dirs -> virtualbox-ose-source.dirs.in + + virtualbox-ose-guest-source.dirs -> virtualbox-ose-guest-source.dirs.in + + virtualbox-ose-guest-source.links -> + virtualbox-ose-guest-source.links.in + - New: + + virtualbox-ose-source.files/dkms.conf.in + + virtualbox-ose-source.postinst + + virtualbox-ose-source.prerm + + virtualbox-ose-guest-source.prerm + + virtualbox-ose-guest-source.postinst + + virtualbox-ose-guest-source.files/dkms.conf.in + + virtualbox-ose-guest-source.files/Makefile + - debian/rules: + + Add support to update all ".in" files in install target + + Add support to remove all sed produced ".in" files in clean target + + Drop extra rules that were modifying the "debian" directory in -source. + + Make sure to include postinst/prerm scripts for arch indep packages. + - debian/control: + + Recommends on the source package instead of modules packages + + Depends on the source packages for dkms and libc6-dev + - debian/virtualbox-ose.vboxdrv.init: + + Search for module in proper location + + -- Mario Limonciello Wed, 10 Sep 2008 13:50:20 -0500 + virtualbox-ose (1.6.6-dfsg-3) unstable; urgency=high * Added upstream patch to support kernel 2.6.27, closes: #502068 @@ -368,6 +886,52 @@ -- Michael Meskes Tue, 17 Jun 2008 14:52:36 +0200 +virtualbox-ose (1.6.2-dfsg-1ubuntu2) intrepid; urgency=low + + * Fix dpatch 01-no-64bit-guest to change upstream's uname -m into + dpkg-architecture -qDEB_HOST_GNU_CPU instead of dpkg --print-architecture; + fixes build on lpia. + * Build virtualbox-ose, virtualbox-ose-dbg, and virtualbox-ose-guest-utils + for lpia. + * Set VBOX_WITH_X11_ADDITIONS in rules when the DEB_HOST_ARCH is i386 or + lpia instead of using dpkg --print-architecture. + * Use the -s flag to dh_ commands instead of 3 debhelper calls and a shell + test; as a bonus, this provides additional detached symbols in -dbg. + * Install files into virtualbox-ose-guest-utils unconditionally and ignore + errors -- even if these exist, the package is disabled on amd64. + * Cleanup upstreamversion computation and compute it only once. + * Change Vcs-Svn and Vcs-Browser to XS-Original-Vcs-*. + + -- Loic Minier Tue, 24 Jun 2008 19:20:10 +0200 + +virtualbox-ose (1.6.2-dfsg-1ubuntu1) intrepid; urgency=low + + * Merge from Debian unstable (LP: #236221). Remaining Ubuntu changes: + - debian/virtualbox-ose.vboxdrv.init: init script to load vboxdrv kernel + module + - debian/rules: install vboxdrv init script + - debian/control: + - DebianMaintainerField + - debian/patches/09-initscript.dpatch: + - do not source /etc/default/virtualbox-ose + - do not load vboxdrv in here, gets done in separate vboxdrv init script + - debian/virtualbox-ose.default: + - Dropped, not used in Ubuntu (see 10-initscript.dpatch) + - debian/virtualbox-ose.preinst: + - Remove /etc/default/virtualbox-ose + - debian/virtualbox-ose-guest-utils.init: + Use log_action_cont_msg instead of log_warning_msg to not cause display + issues in usplash (without "quiet"), when not running in VirtualBox. + (Forwarded to Debian at bug #475297) + - debian/patches/04-vboxdrv-references.dpatch: + Do not mention "modprobe vboxdrv", because it's already done when + installing the module package. + - debian/virtualbox-ose.files/VBox.sh: + Improve error message for missing vboxdrv module and what package to + install. Use "uname -r" in the virtualbox wrapper script for this. + + -- Daniel Hahler Tue, 17 Jun 2008 01:10:51 +0200 + virtualbox-ose (1.6.2-dfsg-1) unstable; urgency=low [ Michael Meskes ] @@ -426,6 +990,34 @@ -- Michael Meskes Sun, 11 May 2008 22:48:50 +0200 +virtualbox-ose (1.5.6-dfsg-6ubuntu1) hardy; urgency=low + + * Merge from Debian unstable. Remaining Ubuntu changes: + - debian/virtualbox-ose.vboxdrv.init: init script to load vboxdrv kernel + module + - debian/rules: install vboxdrv init script + - debian/control: + - DebianMaintainerField + - Breaks on virtualbox-ose-modules (can be dropped after Hardy) + - debian/patches/10-initscript.dpatch: + - do not source /etc/default/virtualbox-ose + - do not load vboxdrv in here, gets done in separate vboxdrv init script + - debian/virtualbox-ose.default: + - Dropped, not used in Ubuntu (see 10-initscript.dpatch) + - debian/virtualbox-ose.preinst: + - Remove /etc/default/virtualbox-ose + * debian/virtualbox-ose-guest-utils.init: + Use log_action_cont_msg instead of log_warning_msg to not cause display + issues in usplash (without "quiet"), when not running in VirtualBox. + * debian/patches/05-vboxdrv-references.dpatch, + debian/virtualbox-ose.files/VBox.sh: + Improve error message for missing vboxdrv module and what package to + install. Use "uname -r" in the virtualbox wrapper script for this. + Do not mention "modprobe vboxdrv", because it's already done when + installing the module package. + + -- Daniel Hahler Wed, 09 Apr 2008 03:01:59 +0200 + virtualbox-ose (1.5.6-dfsg-6) unstable; urgency=low * Added two patches from upstream SVN to make virtualbox-ose build with @@ -447,6 +1039,34 @@ -- Michael Meskes Fri, 04 Apr 2008 10:16:48 +0200 +virtualbox-ose (1.5.6-dfsg-4ubuntu2) hardy; urgency=low + + * Move the removal of /etc/default/virtualbox-ose from postinst to preinst, + where it belongs + + -- Daniel Hahler Fri, 04 Apr 2008 03:17:43 +0200 + +virtualbox-ose (1.5.6-dfsg-4ubuntu1) hardy; urgency=low + + * Merge from Debian unstable. Remaining Ubuntu changes: + - debian/virtualbox-ose-guest-utils.init: "exit 0" in case the module + cannot be loaded + - debian/virtualbox-ose.vboxdrv.init: init script to load vboxdrv kernel + module + - debian/rules: install vboxdrv init script + - debian/control: + - DebianMaintainerField + - Breaks on virtualbox-ose-modules (can be dropped after Hardy) + * debian/patches/10-initscript.dpatch: + - do not source /etc/default/virtualbox-ose + - do not load vboxdrv in here, gets done in separate vboxdrv init script + * debian/virtualbox-ose.default: + - Dropped, not used in Ubuntu (see 10-initscript.dpatch) + * debian/virtualbox-ose.postinst: + - Remove /etc/default/virtualbox-ose + + -- Daniel Hahler Fri, 04 Apr 2008 01:44:25 +0200 + virtualbox-ose (1.5.6-dfsg-4) unstable; urgency=low [ Michael Meskes ] @@ -479,6 +1099,47 @@ -- Michael Meskes Tue, 18 Mar 2008 15:13:39 +0100 +virtualbox-ose (1.5.6-dfsg-2ubuntu2) hardy; urgency=low + + * debian/control: change Depends of modules to Recommends (LP: #188579) + - virtualbox-ose-guest-utils only recommends virtualbox-ose-guest-modules + - virtualbox-ose only recommends virtualbox-ose-modules + * debian/virtualbox-ose-guest-utils.init: + Exit with status 0 in case "vboxadd" cannot get loaded in "start" + * debian/virtualbox-ose.vboxdrv.init: + Fix test for existing kernel module. Forwarded upstream as #1357. + + -- Daniel Hahler Thu, 20 Mar 2008 20:36:30 +0100 + +virtualbox-ose (1.5.6-dfsg-2ubuntu1) hardy; urgency=low + + * Merge from Debian unstable (LP: #202727). Remaining Ubuntu changes: + - Move virtualbox-ose-modules from recommends + to depends for virtualbox-ose. We can drop this change when Synaptic + installs recommended packages by default. + - Fix deprecated values in desktop file (LP: #196714) + - Change Maintainer to Ubuntu MOTU Developers. + * debian/virtualbox-ose.vboxdrv.init, debian/rules: + Move init script from virtualbox-ose-modules to here (LP: #200380). + This also makes sure that the udev rule to handle permissions of + /dev/vboxdrv is installed, when this init script to modprobe the + module is run (LP: #147076). + debian/control: Add Breaks for virtualbox-ose-modules* meta packages + (<< 17) + * debian/control: virtualbox-ose-guest-utils depends on + virtualbox-ose-guest-modules, instead of "recommends". The "vboxadd" + module is required by the guest-utils init script (LP: #189444). + This is also in line with the Depends for virtualbox-ose on the vboxdrv module. + * debian/control: Drop "suggest uml-utilities" for virtualbox-ose again + (LP: #154305) + * Fixes the following bugs in Ubuntu: + - Clearer message about losing snapshots during upgrade (LP: #187082) + - virtualbox-ose conditionally modprobes vboxdrv + (from virtualbox-ose-modules) in its init script, so that the + modules do not need any init scripts anymore (LP: #200380) + + -- Daniel Hahler Sun, 16 Mar 2008 23:53:00 +0100 + virtualbox-ose (1.5.6-dfsg-2) unstable; urgency=low [ Daniel Baumann ] @@ -553,6 +1214,36 @@ -- Michael Meskes Sun, 17 Feb 2008 19:08:04 +0100 +virtualbox-ose (1.5.4-dfsg-4ubuntu3) hardy; urgency=low + + * Ignore delgroup failures in postrm as it's called a second time by + debconf; see also Debian #462885 for the same fix but related to a + seemingly different cause. + + -- Loic Minier Mon, 03 Mar 2008 16:34:05 +0100 + +virtualbox-ose (1.5.4-dfsg-4ubuntu2) hardy; urgency=low + + [ Saïvann Carignan ] + * Fix deprecated values in desktop file (LP: #196714) + + [ Daniel Hahler ] + * debian/control: Suggest bridge-utils and uml-utilities (LP: #154305) + + -- Daniel Hahler Fri, 29 Feb 2008 02:26:49 +0100 + +virtualbox-ose (1.5.4-dfsg-4ubuntu1) hardy; urgency=low + + * Sync with Debian (LP: #156210). Remaining changes are: + - Move virtualbox-ose-modules from recommends + to depends for virtualbox-ose. We can drop this change when Synaptic + installs recommended packages by default. + - Change Maintainer to Ubuntu MOTU Developers. + + * The new 1.5.4 release closes LP: #179807, #185628. + + -- Emilio Pozuelo Monfort Sat, 26 Jan 2008 16:11:06 +0100 + virtualbox-ose (1.5.4-dfsg-4) unstable; urgency=low [ Daniel Baumann ] @@ -927,0 +1619 @@ + reverted: --- virtualbox-ose-3.0.8-dfsg/debian/virtualbox-ose-source.links +++ virtualbox-ose-3.0.8-dfsg.orig/debian/virtualbox-ose-source.links @@ -1,22 +0,0 @@ -/usr/share/modass/packages/default.sh /usr/share/modass/overrides/virtualbox-ose-source -/usr/src/modules/virtualbox-ose/r0drv /usr/src/modules/virtualbox-ose/vboxdrv/r0drv -/usr/src/modules/virtualbox-ose/r0drv /usr/src/modules/virtualbox-ose/vboxnetflt/r0drv -/usr/src/modules/virtualbox-ose/r0drv /usr/src/modules/virtualbox-ose/vboxnetadp/r0drv -/usr/src/modules/virtualbox-ose/include /usr/src/modules/virtualbox-ose/vboxdrv/include -/usr/src/modules/virtualbox-ose/include /usr/src/modules/virtualbox-ose/vboxnetflt/include -/usr/src/modules/virtualbox-ose/include /usr/src/modules/virtualbox-ose/vboxnetadp/include -/usr/src/modules/virtualbox-ose/alloc /usr/src/modules/virtualbox-ose/vboxdrv/alloc -/usr/src/modules/virtualbox-ose/alloc /usr/src/modules/virtualbox-ose/vboxnetflt/alloc -/usr/src/modules/virtualbox-ose/alloc /usr/src/modules/virtualbox-ose/vboxnetadp/alloc -/usr/src/modules/virtualbox-ose/common /usr/src/modules/virtualbox-ose/vboxdrv/common -/usr/src/modules/virtualbox-ose/common /usr/src/modules/virtualbox-ose/vboxnetflt/common -/usr/src/modules/virtualbox-ose/common /usr/src/modules/virtualbox-ose/vboxnetadp/common -/usr/src/modules/virtualbox-ose/generic /usr/src/modules/virtualbox-ose/vboxdrv/generic -/usr/src/modules/virtualbox-ose/generic /usr/src/modules/virtualbox-ose/vboxnetflt/generic -/usr/src/modules/virtualbox-ose/generic /usr/src/modules/virtualbox-ose/vboxnetadp/generic -/usr/src/modules/virtualbox-ose/math /usr/src/modules/virtualbox-ose/vboxdrv/math -/usr/src/modules/virtualbox-ose/math /usr/src/modules/virtualbox-ose/vboxnetflt/math -/usr/src/modules/virtualbox-ose/math /usr/src/modules/virtualbox-ose/vboxnetadp/math -/usr/src/modules/virtualbox-ose/VBox /usr/src/modules/virtualbox-ose/vboxdrv/VBox -/usr/src/modules/virtualbox-ose/VBox /usr/src/modules/virtualbox-ose/vboxnetflt/VBox -/usr/src/modules/virtualbox-ose/VBox /usr/src/modules/virtualbox-ose/vboxnetadp/VBox reverted: --- virtualbox-ose-3.0.8-dfsg/debian/virtualbox-ose.udev +++ virtualbox-ose-3.0.8-dfsg.orig/debian/virtualbox-ose.udev @@ -1 +0,0 @@ -KERNEL=="vboxdrv", NAME="vboxdrv", OWNER="root", GROUP="root", MODE="0600" diff -u virtualbox-ose-3.0.8-dfsg/debian/rules virtualbox-ose-3.0.8-dfsg/debian/rules --- virtualbox-ose-3.0.8-dfsg/debian/rules +++ virtualbox-ose-3.0.8-dfsg/debian/rules @@ -71,6 +71,13 @@ rm -rf out rm -f build-stamp rm -f debian/virtualbox-ose.README.Debian debian/README.Debian.html + rm -f debian/$(gsource).files/dkms.conf + rm -f debian/$(psource).install + rm -f debian/$(gsource).install + rm -f debian/$(psource).dirs + rm -f debian/$(gsource).dirs + rm -f debian/$(gsource).links + find . -name "*.pyc" -exec rm -f {} \; dh_clean @@ -103,7 +110,23 @@ dh_testdir dh_testroot dh_clean -k + + sed -e 's/CVERSION/$(upstreamversion)/g' < debian/$(gsource).dirs.in > debian/$(gsource).dirs + sed -e 's/CVERSION/$(upstreamversion)/g' < debian/$(psource).dirs.in > debian/$(psource).dirs + sed -e 's/CVERSION/$(upstreamversion)/g' < debian/$(gsource).links.in > debian/$(gsource).links + dh_installdirs + + # Create DKMS control files + sed -e 's/CVERSION/$(upstreamversion)/g' < debian/$(psource).files/dkms.conf.vboxdrv.in > debian/$(psource)/usr/src/vboxdrv-$(upstreamversion)/dkms.conf + sed -e 's/CVERSION/$(upstreamversion)/g' < debian/$(psource).files/dkms.conf.vboxnetflt.in > debian/$(psource)/usr/src/vboxnetflt-$(upstreamversion)/dkms.conf + sed -e 's/CVERSION/$(upstreamversion)/g' < debian/$(psource).files/dkms.conf.vboxnetadp.in > debian/$(psource)/usr/src/vboxnetadp-$(upstreamversion)/dkms.conf + sed -e 's/CVERSION/$(upstreamversion)/g' < debian/$(gsource).files/dkms.conf.in > debian/$(gsource).files/dkms.conf + + #Build install files for the dkms'ified sources + sed -e 's/CVERSION/$(upstreamversion)/g' < debian/$(psource).install.in > debian/$(psource).install + sed -e 's/CVERSION/$(upstreamversion)/g' < debian/$(gsource).install.in > debian/$(gsource).install + export VBOX_INSTALL_PATH=/usr/lib/virtualbox && \ cd out/bin/sdk/installer && \ python ./vboxapisetup.py install --root $(CURDIR)/debian/virtualbox-ose @@ -131,7 +154,6 @@ -chmod 644 debian/$(sname)/usr/lib/virtualbox/sdk/bindings/xpcom/python/xpcom/server/*.py -chmod 644 debian/$(sname)/usr/lib/virtualbox/sdk/bindings/xpcom/python/xpcom/client/*.py -chmod 755 debian/$(uxname)/usr/share/virtualbox/x11config.pl - -chmod 755 debian/$(uxname)/usr/share/virtualbox/x11config15.pl -install -m 755 src/VBox/Additions/x11/Installer/VBoxRandR.sh debian/$(uxname)/usr/bin/VBoxRandR -chrpath -d debian/$(uxname)/usr/bin/VBoxClient -chrpath -d debian/$(uxname)/usr/lib/xorg/modules/drivers/vboxvideo_drv.so @@ -165,19 +187,15 @@ dh_installchangelogs -i dh_installdocs -i dh_install -i - # These files have incorrect permissions, fixing it. - chmod 755 debian/$(psource)/usr/src/modules/$(sname)/debian/rules - chmod 755 debian/$(gsource)/usr/src/modules/$(gname)/debian/rules dh_link -i - # Create .tar.bz2 for virtualbox*source - cd debian/$(psource)/usr/src && \ - tar -cjf $(sname).tar.bz2 modules && \ - rm -rf modules - cd debian/$(gsource)/usr/src && \ - tar -cjf $(gname).tar.bz2 modules && \ - rm -rf modules dh_compress -i dh_fixperms -i + # Need to be executable for DKMS: + chmod +x debian/$(psource)/usr/src/vboxdrv-$(upstreamversion)/do_Module.symvers + chmod +x debian/$(psource)/usr/src/vboxnetflt-$(upstreamversion)/do_Module.symvers + chmod +x debian/$(psource)/usr/src/vboxnetadp-$(upstreamversion)/do_Module.symvers + dh_installudev -i + dh_installdeb -i dh_gencontrol -i dh_md5sums -i dh_builddeb -i diff -u virtualbox-ose-3.0.8-dfsg/debian/virtualbox-ose-guest-x11.install virtualbox-ose-3.0.8-dfsg/debian/virtualbox-ose-guest-x11.install --- virtualbox-ose-3.0.8-dfsg/debian/virtualbox-ose-guest-x11.install +++ virtualbox-ose-3.0.8-dfsg/debian/virtualbox-ose-guest-x11.install @@ -2,7 +2,6 @@ out/bin/additions/VBoxClient /usr/bin src/VBox/Additions/x11/Installer/x11config.pl /usr/share/virtualbox -src/VBox/Additions/x11/Installer/x11config15.pl /usr/share/virtualbox src/VBox/Additions/x11/Installer/98vboxadd-xclient /etc/X11/Xsession.d out/bin/additions/vboxmouse_drv.so /usr/lib/xorg/modules/input out/bin/additions/vboxvideo_drv.so /usr/lib/xorg/modules/drivers diff -u virtualbox-ose-3.0.8-dfsg/debian/virtualbox-ose.install virtualbox-ose-3.0.8-dfsg/debian/virtualbox-ose.install --- virtualbox-ose-3.0.8-dfsg/debian/virtualbox-ose.install +++ virtualbox-ose-3.0.8-dfsg/debian/virtualbox-ose.install @@ -1,4 +1,5 @@ debian/virtualbox-ose.files/*.sh /usr/share/virtualbox +debian/virtualbox-ose.files/source_virtualbox-ose.py /usr/share/apport/package-hooks debian/lintian/virtualbox-ose /usr/share/lintian/overrides diff -u virtualbox-ose-3.0.8-dfsg/debian/virtualbox-ose.init virtualbox-ose-3.0.8-dfsg/debian/virtualbox-ose.init --- virtualbox-ose-3.0.8-dfsg/debian/virtualbox-ose.init +++ virtualbox-ose-3.0.8-dfsg/debian/virtualbox-ose.init @@ -34,7 +34,12 @@ [ -r /etc/default/virtualbox-ose ] && . /etc/default/virtualbox-ose # set list of all active users if asked to do so -[ "$SHUTDOWN_USERS" = all ] && SHUTDOWN_USERS=$(echo /tmp/.vbox-*-ipc|cut -d'-' -f2) +if [ "$SHUTDOWN_USERS" = "all" ]; then + SHUTDOWN_USERS="" + for i in /tmp/.vbox-*-ipc; do + SHUTDOWN_USERS="$SHUTDOWN_USERS $(echo $i|cut -d'-' -f2)" + done +fi if [ "$LOAD_VBOXDRV_MODULE" != 1 ]; then log_success_msg "virtualbox-ose disabled; edit /etc/default/virtualbox-ose" @@ -197,8 +202,9 @@ for i in $SHUTDOWN_USERS; do if [ -d /tmp/.vbox-$i-ipc ]; then export VBOX_IPC_SOCKETID="$i" - VMS=`VBoxManage --nologo list runningvms | sed -e 's/^".*".*{\(.*\)}/\1/' 2>/dev/null` - if [ -n "$VMS" ]; then + VMS=`VBoxManage --nologo list runningvms 2>/dev/null` + if [ $? -eq 0 -a -n "$VMS" ]; then + VMS=`echo "$VMS" | sed -e 's/^".*".*{\(.*\)}/\1/'` echo "The following VMs are currently running:" for v in $VMS; do echo " $v" reverted: --- virtualbox-ose-3.0.8-dfsg/debian/virtualbox-ose-guest-source.install +++ virtualbox-ose-3.0.8-dfsg.orig/debian/virtualbox-ose-guest-source.install @@ -1,25 +0,0 @@ -out/bin/additions/src/vboxadd/*.* /usr/src/modules/virtualbox-ose-guest/vboxadd -out/bin/additions/src/vboxadd/alloc /usr/src/modules/virtualbox-ose-guest/vboxadd -out/bin/additions/src/vboxadd/build_in_tmp /usr/src/modules/virtualbox-ose-guest/vboxadd -out/bin/additions/src/vboxadd/Makefile /usr/src/modules/virtualbox-ose-guest/vboxadd - -out/bin/additions/src/vboxvfs/*.* /usr/src/modules/virtualbox-ose-guest/vboxvfs -out/bin/additions/src/vboxvfs/build_in_tmp /usr/src/modules/virtualbox-ose-guest/vboxvfs -out/bin/additions/src/vboxvfs/Makefile /usr/src/modules/virtualbox-ose-guest/vboxvfs - -out/bin/additions/src/vboxadd/include/iprt/* /usr/src/modules/virtualbox-ose-guest/include/iprt -out/bin/additions/src/vboxadd/include/VBox/* /usr/src/modules/virtualbox-ose-guest/include/VBox -out/bin/additions/src/vboxadd/include/internal/* /usr/src/modules/virtualbox-ose-guest/include/internal - -out/bin/additions/src/vboxvfs/include/iprt/* /usr/src/modules/virtualbox-ose-guest/include/iprt -out/bin/additions/src/vboxvfs/include/VBox/* /usr/src/modules/virtualbox-ose-guest/include/VBox -out/bin/additions/src/vboxvfs/include/internal/* /usr/src/modules/virtualbox-ose-guest/include/internal - -out/bin/additions/src/vboxadd/r0drv /usr/src/modules/virtualbox-ose-guest/ - -out/bin/additions/src/vboxvideo_drm /usr/src/modules/virtualbox-ose-guest/ - -debian/control debian/changelog debian/copyright debian/compat /usr/src/modules/virtualbox-ose-guest/debian -debian/virtualbox-ose-guest-source.files/Makefile /usr/src/modules/virtualbox-ose-guest -debian/virtualbox-ose-guest-source.files/control.modules.in /usr/src/modules/virtualbox-ose-guest/debian -debian/virtualbox-ose-guest-source.files/rules /usr/src/modules/virtualbox-ose-guest/debian reverted: --- virtualbox-ose-3.0.8-dfsg/debian/virtualbox-ose-source.install +++ virtualbox-ose-3.0.8-dfsg.orig/debian/virtualbox-ose-source.install @@ -1,40 +0,0 @@ -out/bin/src/vboxdrv/*.* /usr/src/modules/virtualbox-ose/vboxdrv -out/bin/src/vboxdrv/build_in_tmp /usr/src/modules/virtualbox-ose/vboxdrv -out/bin/src/vboxdrv/linux /usr/src/modules/virtualbox-ose/vboxdrv -out/bin/src/vboxdrv/Makefile /usr/src/modules/virtualbox-ose/vboxdrv - -out/bin/src/vboxnetflt/*.* /usr/src/modules/virtualbox-ose/vboxnetflt -out/bin/src/vboxnetflt/build_in_tmp /usr/src/modules/virtualbox-ose/vboxnetflt -out/bin/src/vboxnetflt/linux /usr/src/modules/virtualbox-ose/vboxnetflt -out/bin/src/vboxnetflt/Makefile /usr/src/modules/virtualbox-ose/vboxnetflt - -out/bin/src/vboxnetadp/*.* /usr/src/modules/virtualbox-ose/vboxnetadp -out/bin/src/vboxnetadp/build_in_tmp /usr/src/modules/virtualbox-ose/vboxnetadp -out/bin/src/vboxnetadp/linux /usr/src/modules/virtualbox-ose/vboxnetadp -out/bin/src/vboxnetadp/Makefile /usr/src/modules/virtualbox-ose/vboxnetadp - -out/bin/src/vboxdrv/SUPDrvIDC.h /usr/src/modules/virtualbox-ose/include/ -out/bin/src/vboxdrv/version-generated.h /usr/src/modules/virtualbox-ose/include/ -out/bin/src/vboxdrv/include/iprt/* /usr/src/modules/virtualbox-ose/include/iprt -out/bin/src/vboxdrv/include/VBox/* /usr/src/modules/virtualbox-ose/include/VBox -out/bin/src/vboxdrv/include/internal/* /usr/src/modules/virtualbox-ose/include/internal - -out/bin/src/vboxnetflt/include/iprt/* /usr/src/modules/virtualbox-ose/include/iprt -out/bin/src/vboxnetflt/include/VBox/* /usr/src/modules/virtualbox-ose/include/VBox -out/bin/src/vboxnetflt/include/internal/* /usr/src/modules/virtualbox-ose/include/internal - -out/bin/src/vboxdrv/r0drv /usr/src/modules/virtualbox-ose -out/bin/src/vboxdrv/alloc /usr/src/modules/virtualbox-ose -out/bin/src/vboxnetflt/common /usr/src/modules/virtualbox-ose -out/bin/src/vboxdrv/common/misc /usr/src/modules/virtualbox-ose/common -out/bin/src/vboxnetflt/generic /usr/src/modules/virtualbox-ose -out/bin/src/vboxdrv/math /usr/src/modules/virtualbox-ose -out/bin/src/vboxdrv/VBox /usr/src/modules/virtualbox-ose - -out/bin/src/vboxnetflt/SUPR0IdcClientInternal.h /usr/src/modules/virtualbox-ose/ - -debian/control debian/changelog debian/copyright debian/compat /usr/src/modules/virtualbox-ose/debian -debian/virtualbox-ose-source.files/Makefile /usr/src/modules/virtualbox-ose -debian/virtualbox-ose-source.files/control.modules.in /usr/src/modules/virtualbox-ose/debian -debian/virtualbox-ose-source.files/postinst.modules.in /usr/src/modules/virtualbox-ose/debian -debian/virtualbox-ose-source.files/rules /usr/src/modules/virtualbox-ose/debian reverted: --- virtualbox-ose-3.0.8-dfsg/debian/virtualbox-ose-guest-source.dirs +++ virtualbox-ose-3.0.8-dfsg.orig/debian/virtualbox-ose-guest-source.dirs @@ -1,5 +0,0 @@ -usr/src/modules/virtualbox-ose-guest/debian -usr/src/modules/virtualbox-ose-guest/include/iprt -usr/src/modules/virtualbox-ose-guest/include/VBox -usr/src/modules/virtualbox-ose-guest/include/internal -usr/src/modules/virtualbox-ose-guest/r0drv/linux diff -u virtualbox-ose-3.0.8-dfsg/debian/control virtualbox-ose-3.0.8-dfsg/debian/control --- virtualbox-ose-3.0.8-dfsg/debian/control +++ virtualbox-ose-3.0.8-dfsg/debian/control @@ -1,7 +1,8 @@ Source: virtualbox-ose Section: misc Priority: extra -Maintainer: Debian Virtualbox Team +Maintainer: Ubuntu MOTU Developers +XSBC-Original-Maintainer: Debian Virtualbox Team Uploaders: Michael Meskes , Patrick Winnertz , Hilko Bengen , @@ -59,7 +60,8 @@ Architecture: amd64 i386 lpia Depends: ${shlibs:Depends}, ${misc:Depends}, - virtualbox-ose (= ${binary:Version}) + virtualbox-ose (= ${binary:Version}), + launchpad-integration Replaces: virtualbox-ose (<< 2.2.0-dfsg-1) Description: x86 virtualization solution - Qt based user interface VirtualBox is a free x86 virtualization solution allowing a wide range @@ -75,11 +77,11 @@ ${misc:Depends}, ${python:Depends}, adduser -Recommends: virtualbox-ose-modules, +Recommends: virtualbox-ose-source (= ${binary:Version}), virtualbox-ose-qt (= ${binary:Version}), libgl1, libhal1 -Suggests: virtualbox-ose-source (= ${binary:Version}), virtualbox-guest-additions, +Suggests: virtualbox-guest-additions, libasound2, libpulse0 Conflicts: virtualbox, virtualbox-2.0, virtualbox-2.1, virtualbox-2.2, virtualbox-3.0 XB-Python-Version: ${python:Versions} @@ -110,11 +112,11 @@ Section: kernel Architecture: all Depends: ${misc:Depends}, - debhelper (>= 5), - dpatch, - bzip2, - kbuild -Recommends: module-assistant + dkms, + libc6-dev, + linux-headers-generic | linux-headers +Recommends: virtualbox-ose +Conflicts: virtualbox, virtualbox-2.0, virtualbox-2.1, virtualbox-2.2, virtualbox-3.0 Description: x86 virtualization solution - kernel module source VirtualBox is a free x86 virtualization solution allowing a wide range of x86 operating systems such as Windows, DOS, BSD or Linux to run on a @@ -128,11 +130,10 @@ Section: kernel Architecture: all Depends: ${misc:Depends}, - debhelper (>= 5), - dpatch, - bzip2, - kbuild -Recommends: module-assistant + dkms, + libc6-dev, + linux-headers-generic | linux-headers +Recommends: virtualbox-ose-guest-utils Description: x86 virtualization solution - guest addition module source VirtualBox is a free x86 virtualization solution allowing a wide range of x86 operating systems such as Windows, DOS, BSD or Linux to run on a @@ -166,9 +167,8 @@ Architecture: i386 amd64 lpia Depends: ${shlibs:Depends}, ${misc:Depends} -Recommends: virtualbox-ose-guest-modules, +Recommends: virtualbox-ose-guest-source (= ${binary:Version}), virtualbox-ose-guest-x11 (= ${binary:Version}) -Suggests: virtualbox-ose-guest-source (= ${binary:Version}) Description: x86 virtualization solution - non-X11 guest utilities VirtualBox is a free x86 virtualization solution allowing a wide range of x86 operating systems such as Windows, DOS, BSD or Linux to run on a diff -u virtualbox-ose-3.0.8-dfsg/debian/virtualbox-ose.default virtualbox-ose-3.0.8-dfsg/debian/virtualbox-ose.default --- virtualbox-ose-3.0.8-dfsg/debian/virtualbox-ose.default +++ virtualbox-ose-3.0.8-dfsg/debian/virtualbox-ose.default @@ -8,7 +8,7 @@ # Set this to 1 if you would like the virtualbox-ose modules to be loaded by # the init script. -LOAD_VBOXDRV_MODULE=0 +LOAD_VBOXDRV_MODULE=1 # SHUTDOWN_USERS="foo bar" # check for running VMs of user 'foo' and user 'bar' reverted: --- virtualbox-ose-3.0.8-dfsg/debian/virtualbox-ose-guest-utils.udev +++ virtualbox-ose-3.0.8-dfsg.orig/debian/virtualbox-ose-guest-utils.udev @@ -1,2 +0,0 @@ -KERNEL=="vboxadd", NAME="vboxadd", OWNER="root", MODE="0660" -KERNEL=="vboxuser", NAME="vboxuser", OWNER="root", MODE="0666" reverted: --- virtualbox-ose-3.0.8-dfsg/debian/virtualbox-ose-source.dirs +++ virtualbox-ose-3.0.8-dfsg.orig/debian/virtualbox-ose-source.dirs @@ -1 +0,0 @@ -usr/src/modules/virtualbox-ose/debian reverted: --- virtualbox-ose-3.0.8-dfsg/debian/virtualbox-ose-guest-source.links +++ virtualbox-ose-3.0.8-dfsg.orig/debian/virtualbox-ose-guest-source.links @@ -1,5 +0,0 @@ -/usr/share/modass/packages/default.sh /usr/share/modass/overrides/virtualbox-ose-guest-source -/usr/src/modules/virtualbox-ose-guest/r0drv /usr/src/modules/virtualbox-ose-guest/vboxadd/r0drv -/usr/src/modules/virtualbox-ose-guest/r0drv /usr/src/modules/virtualbox-ose-guest/vboxvfs/r0drv -/usr/src/modules/virtualbox-ose-guest/include /usr/src/modules/virtualbox-ose-guest/vboxadd/include -/usr/src/modules/virtualbox-ose-guest/include /usr/src/modules/virtualbox-ose-guest/vboxvfs/include diff -u virtualbox-ose-3.0.8-dfsg/debian/virtualbox-ose.preinst virtualbox-ose-3.0.8-dfsg/debian/virtualbox-ose.preinst --- virtualbox-ose-3.0.8-dfsg/debian/virtualbox-ose.preinst +++ virtualbox-ose-3.0.8-dfsg/debian/virtualbox-ose.preinst @@ -24,12 +24,16 @@ case "$1" in install|upgrade) + # Remove /etc/init.d/vboxdrv + if dpkg --compare-versions "$2" le "2.0.4-dfsg-0ubuntu2"; then + rm_conffile virtualbox-ose /etc/init.d/vboxdrv + fi rm_conffile virtualbox-ose /etc/network/if-post-down.d/virtualbox-ose rm_conffile virtualbox-ose /etc/network/if-pre-up.d/virtualbox-ose rm_conffile virtualbox-ose /etc/vbox/interfaces # Remove /etc/vbox/vbox.cfg - if dpkg --compare-versions "$2" lt "2.2.2-dfsg-3"; then + if dpkg --compare-versions "$2" le "2.2.2-dfsg-2ubuntu2"; then rm_conffile virtualbox-ose /etc/vbox/vbox.cfg fi diff -u virtualbox-ose-3.0.8-dfsg/debian/virtualbox-ose-qt.files/virtualbox-ose.desktop virtualbox-ose-3.0.8-dfsg/debian/virtualbox-ose-qt.files/virtualbox-ose.desktop --- virtualbox-ose-3.0.8-dfsg/debian/virtualbox-ose-qt.files/virtualbox-ose.desktop +++ virtualbox-ose-3.0.8-dfsg/debian/virtualbox-ose-qt.files/virtualbox-ose.desktop @@ -9 +9 @@ -Categories=Emulator;System; +Categories=Emulator;Utility; diff -u virtualbox-ose-3.0.8-dfsg/debian/virtualbox-ose.files/VBox.sh virtualbox-ose-3.0.8-dfsg/debian/virtualbox-ose.files/VBox.sh --- virtualbox-ose-3.0.8-dfsg/debian/virtualbox-ose.files/VBox.sh +++ virtualbox-ose-3.0.8-dfsg/debian/virtualbox-ose.files/VBox.sh @@ -44,8 +44,8 @@ if [ ! -c /dev/vboxdrv ]; then cat << EOF WARNING: The character device /dev/vboxdrv does not exist. - Please install the virtualbox-ose-modules package for your kernel and - load the module named vboxdrv into your system. + Please install the virtualbox-ose-source package and the appropriate + headers, most likely linux-headers-$(uname -r | cut -d- -f3). You will not be able to start VMs until this problem is fixed. EOF diff -u virtualbox-ose-3.0.8-dfsg/debian/patches/13-module-mismatch.dpatch virtualbox-ose-3.0.8-dfsg/debian/patches/13-module-mismatch.dpatch --- virtualbox-ose-3.0.8-dfsg/debian/patches/13-module-mismatch.dpatch +++ virtualbox-ose-3.0.8-dfsg/debian/patches/13-module-mismatch.dpatch @@ -1,7 +1,7 @@ #!/bin/sh /usr/share/dpatch/dpatch-run ## 13-module-mismatch.dpatch by Daniel Baumann ## -## DP: Adjusts failure message with Debian specific solution. +## DP: Adjusts failure message with Ubuntu specific solution. @DPATCH@ diff -urNad virtualbox-ose-3.0.8-dfsg~/src/VBox/VMM/VM.cpp virtualbox-ose-3.0.8-dfsg/src/VBox/VMM/VM.cpp @@ -16,8 +16,8 @@ - "running instances of VirtualBox and reinstalling the software."); + pszError = N_("The version of the VirtualBox kernel modules and the version of " + "VirtualBox application are not matching. You can correct this by " -+ "either installing the correct virtualbox-ose-modules package " -+ "(if available) through apt-get or by building it manually with: " ++ "installing the virtualbox-ose-source package " ++ "through apt-get or by building it manually with: " + "module-assistant auto-install virtualbox-ose"); break; default: diff -u virtualbox-ose-3.0.8-dfsg/debian/patches/00list virtualbox-ose-3.0.8-dfsg/debian/patches/00list --- virtualbox-ose-3.0.8-dfsg/debian/patches/00list +++ virtualbox-ose-3.0.8-dfsg/debian/patches/00list @@ -13,0 +14,2 @@ +u01-disable-update-action.dpatch +u02-lp-integration.dpatch diff -u virtualbox-ose-3.0.8-dfsg/debian/patches/04-vboxdrv-references.dpatch virtualbox-ose-3.0.8-dfsg/debian/patches/04-vboxdrv-references.dpatch --- virtualbox-ose-3.0.8-dfsg/debian/patches/04-vboxdrv-references.dpatch +++ virtualbox-ose-3.0.8-dfsg/debian/patches/04-vboxdrv-references.dpatch @@ -2,13 +2,13 @@ ## 04-vboxdrv-references.dpatch by Daniel Hahler ## ## DP: Change error messages for vboxdrv failure, according to -## DP: virtualbox-ose-modules. +## DP: virtualbox-ose-source (DKMS). @DPATCH@ diff -urNad virtualbox-ose-3.0.8-dfsg~/src/VBox/Frontends/VirtualBox/src/main.cpp virtualbox-ose-3.0.8-dfsg/src/VBox/Frontends/VirtualBox/src/main.cpp --- virtualbox-ose-3.0.8-dfsg~/src/VBox/Frontends/VirtualBox/src/main.cpp 2009-10-07 11:27:13.000000000 +0200 +++ virtualbox-ose-3.0.8-dfsg/src/VBox/Frontends/VirtualBox/src/main.cpp 2009-10-07 13:42:18.215472116 +0200 -@@ -71,13 +71,8 @@ +@@ -71,13 +71,7 @@ ); QString g_QStrHintLinuxNoDriver = QApplication::tr( @@ -19,8 +19,7 @@ - "as root. Users of Ubuntu, Fedora or Mandriva should install the DKMS " - "package first. This package keeps track of Linux kernel changes and " - "recompiles the vboxdrv kernel module if necessary." -+ "Please install the virtualbox-ose-modules package for your " -+ "kernel and execute 'modprobe vboxdrv' as root." ++ "Please install the virtualbox-ose-source package." ); QString g_QStrHintOtherWrongDriverVersion = QApplication::tr( @@ -35,8 +34,8 @@ - "was either not loaded or /dev/vboxdrv is not set up properly. " - "Re-setup the kernel module by executing " - "'/etc/init.d/vboxdrv setup' as root"); -+ pszError = N_("Please install the virtualbox-ose-modules package for your " -+ "kernel and execute 'modprobe vboxdrv' as root"); ++ pszError = N_("VirtualBox kernel driver not loaded. " ++ "Please install the virtualbox-ose-source package."); #else pszError = N_("VirtualBox kernel driver not loaded"); #endif @@ -48,8 +47,8 @@ - "was either not loaded or /dev/vboxdrv was not created for some " - "reason. Re-setup the kernel module by executing " - "'/etc/init.d/vboxdrv setup' as root"); -+ pszError = N_("Please install the virtualbox-ose-modules package for your " -+ "kernel and execute 'modprobe vboxdrv' as root"); ++ pszError = N_("VirtualBox kernel driver not installed. " ++ "Please install the virtualbox-ose-source package."); #else pszError = N_("VirtualBox kernel driver not installed"); #endif reverted: --- virtualbox-ose-3.0.8-dfsg/debian/virtualbox-ose-source.files/control.modules.in +++ virtualbox-ose-3.0.8-dfsg.orig/debian/virtualbox-ose-source.files/control.modules.in @@ -1,25 +0,0 @@ -Source: virtualbox-ose -Section: misc -Priority: optional -Maintainer: Debian Virtualbox Team -Uploaders: Philipp Hug , Marvin Stark , Michael Meskes , Patrick Winnertz , Hilko Bengen -Build-Depends: debhelper (>= 5), dpatch, kbuild -Standards-Version: 3.8.0 -Homepage: http://www.virtualbox.org/ -Vcs-Svn: svn://svn.debian.org/svn/pkg-virtualbox/trunk -Vcs-Browser: http://svn.debian.org/wsvn/pkg-virtualbox/trunk - -Package: virtualbox-ose-modules-_KVERS_ -Architecture: amd64 i386 -Depends: linux-modules-_KVERS_ | linux-image-_KVERS_ -Recommends: virtualbox-ose -Provides: virtualbox-ose-modules -Description: VirtualBox modules for Linux (kernel _KVERS_) - This package contains the set of loadable kernel modules for VirtualBox. - . - This package contains the compiled kernel modules for _KVERS_ - . - If you have compiled your own kernel, you will most likely need to build - your own virtualbox-ose-modules. The virtualbox-ose-source package has been - provided for use with the Debian's module-assistant or kernel-package - utilities to produce a version of virtualbox-ose-modules for your kernel. reverted: --- virtualbox-ose-3.0.8-dfsg/debian/virtualbox-ose-source.files/rules +++ virtualbox-ose-3.0.8-dfsg.orig/debian/virtualbox-ose-source.files/rules @@ -1,77 +0,0 @@ -#!/usr/bin/make -f - -include /usr/share/dpatch/dpatch.make - -# some default definitions, important! -# -# Name of the source package -psource:=virtualbox-ose-source -gsource:=virtualbox-ose-guest-source - -# The short upstream name, used for the module source directory -sname:=virtualbox-ose -uname:=virtualbox-ose-guest-utils - -### KERNEL SETUP -### Setup the stuff needed for making kernel module packages -### taken from /usr/share/kernel-package/sample.module.rules - -# prefix of the target package name -PACKAGE := virtualbox-ose-modules -# modifieable for experiments or debugging m-a -MA_DIR ?= /usr/share/modass -# load generic variable handling --include $(MA_DIR)/include/generic.make -# load default rules, including kdist, kdist_image, ... --include $(MA_DIR)/include/common-rules.make - -# module assistant calculates all needed things for us and sets -# following variables: -# KSRC (kernel source directory), KVERS (kernel version string), KDREV -# (revision of the Debian kernel-image package), CC (the correct -# compiler), VERSION (the final package version string), PKGNAME (full -# package name with KVERS included), DEB_DESTDIR (path to store DEBs) - -# The kdist_configure target is called by make-kpkg modules_config and -# by kdist* rules by dependency. It should configure the module so it is -# ready for compilation (mostly useful for calling configure). -# prep-deb-files from module-assistant creates the neccessary debian/ files -kdist_configure: prep-deb-files - -# the kdist_clean target is called by make-kpkg modules_clean and from -# kdist* rules. It is responsible for cleaning up any changes that have -# been made by the other kdist_commands (except for the .deb files created) -kdist_clean: clean - $(MAKE) $(MFLAGS) -f debian/rules clean -# -### end KERNEL SETUP - -MAKE:=kmk - -clean: - $(MAKE) -C vboxdrv clean - $(MAKE) -C vboxnetflt clean - $(MAKE) -C vboxnetadp clean - dh_clean - -binary-modules: prep-deb-files - dh_testroot - dh_clean -k - # Build the module - $(MAKE) -C $(KSRC) M=$(CURDIR) - # Install the module - dh_install vboxdrv/vboxdrv.ko /lib/modules/$(KVERS)/misc/ - dh_install vboxnetflt/vboxnetflt.ko /lib/modules/$(KVERS)/misc/ - dh_install vboxnetadp/vboxnetadp.ko /lib/modules/$(KVERS)/misc/ - dh_installdocs - dh_installchangelogs - dh_compress - dh_fixperms - dh_installmodules - dh_installdeb - dh_gencontrol -- -v$(VERSION) - dh_md5sums - dh_builddeb --destdir=$(DEB_DESTDIR) - dh_clean -k - -.PHONY: build clean binary-arch binary-indep binary install binary-modules kdist kdist_configure kdist_image kdist_clean reverted: --- virtualbox-ose-3.0.8-dfsg/debian/virtualbox-ose-source.files/Makefile +++ virtualbox-ose-3.0.8-dfsg.orig/debian/virtualbox-ose-source.files/Makefile @@ -1,3 +0,0 @@ -.NOTPARALLEL: - -obj-m = vboxdrv/ vboxnetflt/ vboxnetadp/ reverted: --- virtualbox-ose-3.0.8-dfsg/debian/virtualbox-ose-source.files/postinst.modules.in +++ virtualbox-ose-3.0.8-dfsg.orig/debian/virtualbox-ose-source.files/postinst.modules.in @@ -1,27 +0,0 @@ -#!/bin/sh - -set -e - -#DEBHELPER# - -case "${1}" in - configure) - # only restart if VirtualBox isn't running - if test -x /etc/init.d/virtualbox-ose && ! pidof VBoxSVC > /dev/null; then - if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then - invoke-rc.d virtualbox-ose restart || true - else - /etc/init.d/virtualbox-ose restart || true - fi - fi - ;; - - abort-upgrade|abort-deconfigure|abort-remove) - - ;; - - *) - echo "${0} called with unknown argument \`${1}'" 1>&2 - exit 1 - ;; -esac reverted: --- virtualbox-ose-3.0.8-dfsg/debian/virtualbox-ose-guest-source.files/control.modules.in +++ virtualbox-ose-3.0.8-dfsg.orig/debian/virtualbox-ose-guest-source.files/control.modules.in @@ -1,25 +0,0 @@ -Source: virtualbox-ose -Section: misc -Priority: optional -Maintainer: Debian Virtualbox Team -Uploaders: Philipp Hug , Marvin Stark , Michael Meskes , Patrick Winnertz , Hilko Bengen -Build-Depends: debhelper (>= 5), dpatch, kbuild -Standards-Version: 3.8.0 -Homepage: http://www.virtualbox.org/ -Vcs-Svn: svn://svn.debian.org/svn/pkg-virtualbox/trunk -Vcs-Browser: http://svn.debian.org/wsvn/pkg-virtualbox/trunk - -Package: virtualbox-ose-guest-modules-_KVERS_ -Architecture: i386 amd64 -Depends: linux-modules-_KVERS_ | linux-image-_KVERS_ -Recommends: virtualbox-ose-guest-utils -Provides: virtualbox-ose-guest-modules -Description: VirtualBox guest addition modules for Linux (kernel _KVERS_) - This package contains the set of loadable kernel modules for VirtualBox Guest Additions. - . - This package contains the compiled kernel modules for _KVERS_ - . - If you have compiled your own kernel, you will most likely need to build - your own virtualbox-ose-guest-modules. The virtualbox-ose-guest-source package has been - provided for use with the Debian's module-assistant or kernel-package - utilities to produce a version of virtualbox-ose-guest-modules for your kernel. reverted: --- virtualbox-ose-3.0.8-dfsg/debian/virtualbox-ose-guest-source.files/rules +++ virtualbox-ose-3.0.8-dfsg.orig/debian/virtualbox-ose-guest-source.files/rules @@ -1,70 +0,0 @@ -#!/usr/bin/make -f - -include /usr/share/dpatch/dpatch.make - -# The short upstream name, used for the module source directory -uname:=virtualbox-ose-guest-utils - -### KERNEL SETUP -### Setup the stuff needed for making kernel module packages -### taken from /usr/share/kernel-package/sample.module.rules - -# prefix of the target package name -PACKAGE := virtualbox-ose-guest-modules -# modifieable for experiments or debugging m-a -MA_DIR ?= /usr/share/modass -# load generic variable handling --include $(MA_DIR)/include/generic.make -# load default rules, including kdist, kdist_image, ... --include $(MA_DIR)/include/common-rules.make - -# module assistant calculates all needed things for us and sets -# following variables: -# KSRC (kernel source directory), KVERS (kernel version string), KDREV -# (revision of the Debian kernel-image package), CC (the correct -# compiler), VERSION (the final package version string), PKGNAME (full -# package name with KVERS included), DEB_DESTDIR (path to store DEBs) - -# The kdist_configure target is called by make-kpkg modules_config and -# by kdist* rules by dependency. It should configure the module so it is -# ready for compilation (mostly useful for calling configure). -# prep-deb-files from module-assistant creates the neccessary debian/ files -kdist_configure: prep-deb-files - -# the kdist_clean target is called by make-kpkg modules_clean and from -# kdist* rules. It is responsible for cleaning up any changes that have -# been made by the other kdist_commands (except for the .deb files created) -kdist_clean: clean - $(MAKE) $(MFLAGS) -f debian/rules clean -# -### end KERNEL SETUP - -MAKE:=kmk - -clean: - $(MAKE) -C vboxadd clean - $(MAKE) -C vboxvfs clean - $(MAKE) -C vboxvideo_drm clean - dh_clean - -binary-modules: prep-deb-files - dh_testroot - dh_clean -k - # Build the modules - $(MAKE) -C $(KSRC) M=$(CURDIR) - # Install the modules - dh_install vboxadd/vboxadd.ko /lib/modules/$(KVERS)/misc/ - dh_install vboxvfs/vboxvfs.ko /lib/modules/$(KVERS)/misc/ - dh_install vboxvideo_drm/vboxvideo.ko /lib/modules/$(KVERS)/misc/ - dh_installdocs - dh_installchangelogs - dh_compress - dh_fixperms - dh_installmodules - dh_installdeb - dh_gencontrol -- -v$(VERSION) - dh_md5sums - dh_builddeb --destdir=$(DEB_DESTDIR) - dh_clean -k - -.PHONY: build clean binary-arch binary-indep binary install binary-modules kdist kdist_configure kdist_image kdist_clean only in patch2: unchanged: --- virtualbox-ose-3.0.8-dfsg.orig/debian/virtualbox-ose-guest-source.udev +++ virtualbox-ose-3.0.8-dfsg/debian/virtualbox-ose-guest-source.udev @@ -0,0 +1,2 @@ +KERNEL=="vboxadd", NAME="vboxadd", OWNER="root", MODE="0660" +KERNEL=="vboxuser", NAME="vboxuser", OWNER="root", MODE="0666" only in patch2: unchanged: --- virtualbox-ose-3.0.8-dfsg.orig/debian/virtualbox-ose-guest-source.dirs.in +++ virtualbox-ose-3.0.8-dfsg/debian/virtualbox-ose-guest-source.dirs.in @@ -0,0 +1,4 @@ +usr/src/virtualbox-ose-guest-CVERSION/include/iprt +usr/src/virtualbox-ose-guest-CVERSION/include/VBox +usr/src/virtualbox-ose-guest-CVERSION/include/internal +usr/src/virtualbox-ose-guest-CVERSION/r0drv/linux only in patch2: unchanged: --- virtualbox-ose-3.0.8-dfsg.orig/debian/virtualbox-ose-source.udev +++ virtualbox-ose-3.0.8-dfsg/debian/virtualbox-ose-source.udev @@ -0,0 +1 @@ +KERNEL=="vboxdrv", NAME="vboxdrv", OWNER="root", GROUP="root", MODE="0600" only in patch2: unchanged: --- virtualbox-ose-3.0.8-dfsg.orig/debian/virtualbox-ose-guest-source.links.in +++ virtualbox-ose-3.0.8-dfsg/debian/virtualbox-ose-guest-source.links.in @@ -0,0 +1,4 @@ +/usr/src/virtualbox-ose-guest-CVERSION/r0drv /usr/src/virtualbox-ose-guest-CVERSION/vboxadd/r0drv +/usr/src/virtualbox-ose-guest-CVERSION/r0drv /usr/src/virtualbox-ose-guest-CVERSION/vboxvfs/r0drv +/usr/src/virtualbox-ose-guest-CVERSION/include /usr/src/virtualbox-ose-guest-CVERSION/vboxadd/include +/usr/src/virtualbox-ose-guest-CVERSION/include /usr/src/virtualbox-ose-guest-CVERSION/vboxvfs/include only in patch2: unchanged: --- virtualbox-ose-3.0.8-dfsg.orig/debian/virtualbox-ose-guest-source.postinst +++ virtualbox-ose-3.0.8-dfsg/debian/virtualbox-ose-guest-source.postinst @@ -0,0 +1,23 @@ +#!/bin/sh +# Copyright (C) 2008 Mario Limonciello + +set -e + +#DEBHELPER# + +CVERSION=`dpkg-query -W -f='${Version}' virtualbox-ose-guest-source | awk -F "-" '{print $1}' | cut -d\: -f2` + +case "$1" in + configure) + #Silently remove existing modules + dkms remove -m virtualbox-ose-guest -v $CVERSION --all > /dev/null 2>&1 || true + #Create DKMS modules + echo "Adding Module to DKMS build system" + dkms add -m virtualbox-ose-guest -v $CVERSION > /dev/null + echo "Doing initial module build" + dkms build -m virtualbox-ose-guest -v $CVERSION > /dev/null + echo "Installing initial module" + dkms install -m virtualbox-ose-guest -v $CVERSION --force > /dev/null + echo "Done." + ;; +esac only in patch2: unchanged: --- virtualbox-ose-3.0.8-dfsg.orig/debian/virtualbox-ose-source.dirs.in +++ virtualbox-ose-3.0.8-dfsg/debian/virtualbox-ose-source.dirs.in @@ -0,0 +1,3 @@ +usr/src/vboxdrv-CVERSION +usr/src/vboxnetflt-CVERSION +usr/src/vboxnetadp-CVERSION only in patch2: unchanged: --- virtualbox-ose-3.0.8-dfsg.orig/debian/virtualbox-ose-guest-source.prerm +++ virtualbox-ose-3.0.8-dfsg/debian/virtualbox-ose-guest-source.prerm @@ -0,0 +1,16 @@ +#!/bin/sh +# Copyright (C) 2008 Mario Limonciello + +set -e + +#DEBHELPER# + +CVERSION=`dpkg-query -W -f='${Version}' virtualbox-ose-guest-source | awk -F "-" '{print $1}' | cut -d\: -f2` + +case "$1" in + remove|upgrade|purge) + echo "Removing all DKMS Modules" + dkms remove -m virtualbox-ose-guest -v $CVERSION --all > /dev/null || true + echo "Done." + ;; +esac only in patch2: unchanged: --- virtualbox-ose-3.0.8-dfsg.orig/debian/virtualbox-ose-source.postinst +++ virtualbox-ose-3.0.8-dfsg/debian/virtualbox-ose-source.postinst @@ -0,0 +1,40 @@ +#!/bin/sh +# Copyright (C) 2008 Mario Limonciello + +set -e + +#DEBHELPER# + +CVERSION=`dpkg-query -W -f='${Version}' virtualbox-ose-source | awk -F "-" '{print $1}' | cut -d\: -f2` + +case "$1" in + configure) + #Silently remove existing modules + dkms remove -m vboxdrv -v $CVERSION --all > /dev/null 2>&1 || true + dkms remove -m vboxnetflt -v $CVERSION --all > /dev/null 2>&1 || true + dkms remove -m vboxnetadp -v $CVERSION --all > /dev/null 2>&1 || true + #Create DKMS modules + echo "Adding modules to DKMS build system" + dkms add -m vboxdrv -v $CVERSION > /dev/null + dkms add -m vboxnetflt -v $CVERSION > /dev/null + dkms add -m vboxnetadp -v $CVERSION > /dev/null + echo "Doing initial module builds" + dkms build -m vboxdrv -v $CVERSION > /dev/null + dkms build -m vboxnetflt -v $CVERSION > /dev/null + dkms build -m vboxnetadp -v $CVERSION > /dev/null + echo "Installing initial modules" + dkms install -m vboxdrv -v $CVERSION --force > /dev/null + dkms install -m vboxnetflt -v $CVERSION --force > /dev/null + dkms install -m vboxnetadp -v $CVERSION --force > /dev/null + echo "Done." + + # only restart if VirtualBox isn't running + if test -x /etc/init.d/virtualbox-ose && ! pidof VBoxSVC > /dev/null; then + if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then + invoke-rc.d virtualbox-ose restart || true + else + /etc/init.d/virtualbox-ose restart || true + fi + fi + ;; +esac only in patch2: unchanged: --- virtualbox-ose-3.0.8-dfsg.orig/debian/virtualbox-ose-source.prerm +++ virtualbox-ose-3.0.8-dfsg/debian/virtualbox-ose-source.prerm @@ -0,0 +1,18 @@ +#!/bin/sh +# Copyright (C) 2008 Mario Limonciello + +set -e + +#DEBHELPER# + +CVERSION=`dpkg-query -W -f='${Version}' virtualbox-ose-source | awk -F "-" '{print $1}' | cut -d\: -f2` + +case "$1" in + remove|upgrade|purge) + echo "Removing all DKMS Modules" + dkms remove -m vboxdrv -v $CVERSION --all > /dev/null || true + dkms remove -m vboxnetflt -v $CVERSION --all > /dev/null || true + dkms remove -m vboxnetadp -v $CVERSION --all > /dev/null || true + echo "Done." + ;; +esac only in patch2: unchanged: --- virtualbox-ose-3.0.8-dfsg.orig/debian/virtualbox-ose-source.install.in +++ virtualbox-ose-3.0.8-dfsg/debian/virtualbox-ose-source.install.in @@ -0,0 +1,7 @@ +out/bin/src/vboxdrv/* /usr/src/vboxdrv-CVERSION +out/bin/src/vboxnetflt/* /usr/src/vboxnetflt-CVERSION +out/bin/src/vboxnetadp/* /usr/src/vboxnetadp-CVERSION + +debian/virtualbox-ose-source.files/do_Module.symvers /usr/src/vboxdrv-CVERSION +debian/virtualbox-ose-source.files/do_Module.symvers /usr/src/vboxnetflt-CVERSION +debian/virtualbox-ose-source.files/do_Module.symvers /usr/src/vboxnetadp-CVERSION only in patch2: unchanged: --- virtualbox-ose-3.0.8-dfsg.orig/debian/lpi-bug.xpm +++ virtualbox-ose-3.0.8-dfsg/debian/lpi-bug.xpm @@ -0,0 +1,143 @@ +/* XPM */ +static char * lpi_bug_xpm[] = { +"16 16 124 2", +" c None", +". c #C4A100", +"+ c #C5A100", +"@ c #C4A000", +"# c #C6A300", +"$ c #ECDE8B", +"% c #CAAB15", +"& c #C6A400", +"* c #CAAA16", +"= c #CDAF29", +"- c #C5A200", +"; c #D4B835", +"> c #FFFFFF", +", c #FDFAE4", +"' c #DEC856", +") c #D7BE3F", +"! c #F3E9A9", +"~ c #D0B42D", +"{ c #C8A200", +"] c #EEE191", +"^ c #F7EA84", +"/ c #F2DF3F", +"( c #FCF8D6", +"_ c #FDFAE8", +": c #FCF7D1", +"< c #FAF3B7", +"[ c #F9F4D0", +"} c #C5A205", +"| c #C9A811", +"1 c #C5A201", +"2 c #C7A50D", +"3 c #FDFBE8", +"4 c #F2DE35", +"5 c #0E0D01", +"6 c #131104", +"7 c #F1DC26", +"8 c #F0D811", +"9 c #FAF3B9", +"0 c #E1CC60", +"a c #C9A912", +"b c #FEFCED", +"c c #F8ED90", +"d c #F2DB1D", +"e c #2B2705", +"f c #332F07", +"g c #F1DA1A", +"h c #FFFFFD", +"i c #DDC64E", +"j c #FDFADF", +"k c #F3DD27", +"l c #F3DD22", +"m c #F4DE26", +"n c #48410C", +"o c #554D0E", +"p c #FAF2AC", +"q c #F7EFBA", +"r c #C6A301", +"s c #F3E7A4", +"t c #FAF09D", +"u c #F5DF2A", +"v c #F6E02F", +"w c #655D15", +"x c #786D18", +"y c #F3DD26", +"z c #FAF1A8", +"A c #D0B32B", +"B c #CCAD24", +"C c #FEFBE7", +"D c #F6E131", +"E c #F7E237", +"F c #F8E33C", +"G c #F8EB7F", +"H c #FEFCEC", +"I c #F3E9AE", +"J c #CDAE20", +"K c #F5EBAF", +"L c #FAF1A0", +"M c #F7E235", +"N c #F8E43E", +"O c #3A3510", +"P c #FFFEFB", +"Q c #CAAA1A", +"R c #C8A401", +"S c #C7A300", +"T c #E8D67A", +"U c #FEFCE9", +"V c #FAEF8D", +"W c #F9E540", +"X c #3A3511", +"Y c #FDF8D0", +"Z c #DFC858", +"` c #C7A40B", +" . c #EADA7E", +".. c #DDC653", +"+. c #CAAA1C", +"@. c #FEFDF3", +"#. c #F8E546", +"$. c #F9E64A", +"%. c #FDF4B2", +"&. c #FEFDF1", +"*. c #FDF8CD", +"=. c #FCF7C8", +"-. c #FBF8DC", +";. c #C7A401", +">. c #C5A000", +",. c #C7A202", +"'. c #C6A402", +"). c #F9F3C8", +"!. c #FAEE8C", +"~. c #FEFADD", +"{. c #F4EAAC", +"]. c #C7A60F", +"^. c #DDC650", +"/. c #F3E9AA", +"(. c #D7BD3E", +"_. c #C6A100", +":. c #F0E399", +"<. c #E4D16C", +"[. c #C7A302", +"}. c #C7A403", +"|. c #C9A508", +"1. c #CCAC21", +"2. c #D1B534", +"3. c #D2B42D", +" . + . @ ", +" # $ % & * = - ", +" ; > , ' @ ) ! > ~ ", +" { ] ^ / ( _ : < [ - ", +"@ } | 1 2 3 4 5 6 7 8 9 0 ", +" a > > b c d e f d g h 2 ", +" i j k l m n o m l p q a ", +" r s t u v w x v u y z > A - ", +" B C D E F F E D G H I J + ", +" r K L M N O O N M P Q R ", +" S T > U V W X X W E Y Z ", +" ` ...+.@.#.$.%.&.*.=.-.;. ", +"@ >.,. '.).!.~.{.].^./.> (. ", +" _.:.> <.[. }.|.1.@ ", +" 2.3.[. >. ", +" @ "}; only in patch2: unchanged: --- virtualbox-ose-3.0.8-dfsg.orig/debian/virtualbox-ose-guest-source.install.in +++ virtualbox-ose-3.0.8-dfsg/debian/virtualbox-ose-guest-source.install.in @@ -0,0 +1,25 @@ +out/bin/additions/src/vboxadd/*.* /usr/src/virtualbox-ose-guest-CVERSION/vboxadd +out/bin/additions/src/vboxadd/alloc /usr/src/virtualbox-ose-guest-CVERSION/vboxadd +out/bin/additions/src/vboxadd/build_in_tmp /usr/src/virtualbox-ose-guest-CVERSION/vboxadd +out/bin/additions/src/vboxadd/Makefile /usr/src/virtualbox-ose-guest-CVERSION/vboxadd + +out/bin/additions/src/vboxvfs/*.* /usr/src/virtualbox-ose-guest-CVERSION/vboxvfs +out/bin/additions/src/vboxvfs/build_in_tmp /usr/src/virtualbox-ose-guest-CVERSION/vboxvfs +out/bin/additions/src/vboxvfs/Makefile /usr/src/virtualbox-ose-guest-CVERSION/vboxvfs + +out/bin/additions/src/vboxvideo_drm/*.* /usr/src/virtualbox-ose-guest-CVERSION/vboxvideo_drm +out/bin/additions/src/vboxvideo_drm/build_in_tmp /usr/src/virtualbox-ose-guest-CVERSION/vboxvideo_drm +out/bin/additions/src/vboxvideo_drm/Makefile /usr/src/virtualbox-ose-guest-CVERSION/vboxvideo_drm + +out/bin/additions/src/vboxadd/include/iprt/* /usr/src/virtualbox-ose-guest-CVERSION/include/iprt +out/bin/additions/src/vboxadd/include/VBox/* /usr/src/virtualbox-ose-guest-CVERSION/include/VBox +out/bin/additions/src/vboxadd/include/internal/* /usr/src/virtualbox-ose-guest-CVERSION/include/internal + +out/bin/additions/src/vboxvfs/include/iprt/* /usr/src/virtualbox-ose-guest-CVERSION/include/iprt +out/bin/additions/src/vboxvfs/include/VBox/* /usr/src/virtualbox-ose-guest-CVERSION/include/VBox +out/bin/additions/src/vboxvfs/include/internal/* /usr/src/virtualbox-ose-guest-CVERSION/include/internal + +out/bin/additions/src/vboxadd/r0drv /usr/src/virtualbox-ose-guest-CVERSION/ + +debian/virtualbox-ose-guest-source.files/Makefile /usr/src/virtualbox-ose-guest-CVERSION +debian/virtualbox-ose-guest-source.files/dkms.conf /usr/src/virtualbox-ose-guest-CVERSION only in patch2: unchanged: --- virtualbox-ose-3.0.8-dfsg.orig/debian/patches/u02-lp-integration.dpatch +++ virtualbox-ose-3.0.8-dfsg/debian/patches/u02-lp-integration.dpatch @@ -0,0 +1,104 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## u02-lp-integration.dpatch by Felix Geyer +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Add "Report a problem" menu entry + +@DPATCH@ + +diff -Nur virtualbox-ose-3.0.0-dfsg/src/VBox/Frontends/VirtualBox/include/VBoxHelpActions.h virtualbox-ose-3.0.0-dfsg.patch/src/VBox/Frontends/VirtualBox/include/VBoxHelpActions.h +--- virtualbox-ose-3.0.0-dfsg/src/VBox/Frontends/VirtualBox/include/VBoxHelpActions.h 2009-07-01 09:47:13.000000000 +0200 ++++ virtualbox-ose-3.0.0-dfsg.patch/src/VBox/Frontends/VirtualBox/include/VBoxHelpActions.h 2009-07-09 17:22:27.477635065 +0200 +@@ -44,7 +44,7 @@ + struct VBoxHelpActions + { + VBoxHelpActions() +- : contentsAction (NULL), webAction (NULL) ++ : contentsAction (NULL), webAction (NULL), reportBugAction (NULL) + , resetMessagesAction (NULL), registerAction (NULL) + , updateAction (NULL), aboutAction (NULL) + {} +@@ -55,6 +55,7 @@ + + QAction *contentsAction; + QAction *webAction; ++ QAction *reportBugAction; + QAction *resetMessagesAction; + QAction *registerAction; + QAction *updateAction; +diff -Nur virtualbox-ose-3.0.0-dfsg/src/VBox/Frontends/VirtualBox/include/VBoxProblemReporter.h virtualbox-ose-3.0.0-dfsg.patch/src/VBox/Frontends/VirtualBox/include/VBoxProblemReporter.h +--- virtualbox-ose-3.0.0-dfsg/src/VBox/Frontends/VirtualBox/include/VBoxProblemReporter.h 2009-07-01 09:47:13.000000000 +0200 ++++ virtualbox-ose-3.0.0-dfsg.patch/src/VBox/Frontends/VirtualBox/include/VBoxProblemReporter.h 2009-07-09 17:43:50.462134792 +0200 +@@ -383,6 +383,7 @@ + public slots: + + void showHelpWebDialog(); ++ void reportBugLP(); + void showHelpAboutDialog(); + void showHelpHelpDialog(); + void resetSuppressedMessages(); +diff -Nur virtualbox-ose-3.0.0-dfsg/src/VBox/Frontends/VirtualBox/src/VBoxHelpActions.cpp virtualbox-ose-3.0.0-dfsg.patch/src/VBox/Frontends/VirtualBox/src/VBoxHelpActions.cpp +--- virtualbox-ose-3.0.0-dfsg/src/VBox/Frontends/VirtualBox/src/VBoxHelpActions.cpp 2009-07-01 09:47:13.000000000 +0200 ++++ virtualbox-ose-3.0.0-dfsg.patch/src/VBox/Frontends/VirtualBox/src/VBoxHelpActions.cpp 2009-07-09 17:29:19.804635840 +0200 +@@ -37,6 +37,9 @@ + webAction = new QAction (aParent); + webAction->setIcon (VBoxGlobal::iconSet (":/site_16px.png")); + ++ reportBugAction = new QAction (aParent); ++ reportBugAction->setIcon (VBoxGlobal::iconSet (":/report_bug_16px.xpm")); ++ + resetMessagesAction = new QAction (aParent); + resetMessagesAction->setIcon (VBoxGlobal::iconSet (":/reset_16px.png")); + +@@ -54,6 +57,8 @@ + &vboxProblem(), SLOT (showHelpHelpDialog())); + QObject::connect (webAction, SIGNAL (triggered()), + &vboxProblem(), SLOT (showHelpWebDialog())); ++ QObject::connect (reportBugAction, SIGNAL (triggered()), ++ &vboxProblem(), SLOT (reportBugLP())); + QObject::connect (resetMessagesAction, SIGNAL (triggered()), + &vboxProblem(), SLOT (resetSuppressedMessages())); + QObject::connect (registerAction, SIGNAL (triggered()), +@@ -75,6 +80,7 @@ + + aMenu->addAction (contentsAction); + aMenu->addAction (webAction); ++ aMenu->addAction (reportBugAction); + aMenu->addSeparator(); + + aMenu->addAction (resetMessagesAction); +@@ -109,6 +115,8 @@ + webAction->setStatusTip (VBoxProblemReporter::tr ( + "Open the browser and go to the VirtualBox product web site")); + ++ reportBugAction->setText (VBoxProblemReporter::tr ("Re&port a problem...")); ++ + resetMessagesAction->setText (VBoxProblemReporter::tr ("&Reset All Warnings")); + resetMessagesAction->setStatusTip (VBoxProblemReporter::tr ( + "Cause all suppressed warnings and messages to be shown again")); +diff -Nur virtualbox-ose-3.0.0-dfsg/src/VBox/Frontends/VirtualBox/src/VBoxProblemReporter.cpp virtualbox-ose-3.0.0-dfsg.patch/src/VBox/Frontends/VirtualBox/src/VBoxProblemReporter.cpp +--- virtualbox-ose-3.0.0-dfsg/src/VBox/Frontends/VirtualBox/src/VBoxProblemReporter.cpp 2009-07-01 09:47:13.000000000 +0200 ++++ virtualbox-ose-3.0.0-dfsg.patch/src/VBox/Frontends/VirtualBox/src/VBoxProblemReporter.cpp 2009-07-09 17:46:34.461454809 +0200 +@@ -2357,6 +2357,11 @@ + vboxGlobal().openURL ("http://www.virtualbox.org"); + } + ++void VBoxProblemReporter::reportBugLP() ++{ ++ QProcess::startDetached ("launchpad-integration -P virtualbox-ose-qt -b"); ++} ++ + void VBoxProblemReporter::showHelpAboutDialog() + { + CVirtualBox vbox = vboxGlobal().virtualBox(); +diff -Nur virtualbox-ose-3.0.0-dfsg/src/VBox/Frontends/VirtualBox/VirtualBox.qrc virtualbox-ose-3.0.0-dfsg.patch/src/VBox/Frontends/VirtualBox/VirtualBox.qrc +--- virtualbox-ose-3.0.0-dfsg/src/VBox/Frontends/VirtualBox/VirtualBox.qrc 2009-07-01 09:47:13.000000000 +0200 ++++ virtualbox-ose-3.0.0-dfsg.patch/src/VBox/Frontends/VirtualBox/VirtualBox.qrc 2009-07-09 17:40:48.140636318 +0200 +@@ -136,6 +136,7 @@ + images/site_16px.png + images/site_32px.png + images/site_disabled_32px.png ++ ../../../../debian/lpi-bug.xpm + images/register_16px.png + images/register_32px.png + images/register_disabled_16px.png only in patch2: unchanged: --- virtualbox-ose-3.0.8-dfsg.orig/debian/patches/u01-disable-update-action.dpatch +++ virtualbox-ose-3.0.8-dfsg/debian/patches/u01-disable-update-action.dpatch @@ -0,0 +1,67 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## u01-disable-update-action.dpatch by Daniel Hahler +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Disable "Check for Updates" action (LP: #272212) + +@DPATCH@ +diff -urNad virtualbox-ose-2.2.2-dfsg/src/VBox/Frontends/VirtualBox/src/VBoxGlobal.cpp virtualbox-ose-2.2.2-dfsg.patch/src/VBox/Frontends/VirtualBox/src/VBoxGlobal.cpp +--- virtualbox-ose-2.2.2-dfsg/src/VBox/Frontends/VirtualBox/src/VBoxGlobal.cpp 2009-04-29 09:12:58.000000000 +0200 ++++ virtualbox-ose-2.2.2-dfsg.patch/src/VBox/Frontends/VirtualBox/src/VBoxGlobal.cpp 2009-05-16 16:07:45.094522826 +0200 +@@ -4936,6 +4936,9 @@ + */ + void VBoxGlobal::showUpdateDialog (bool aForce) + { ++ /* Update dialog disabled in Ubuntu: */ ++ return; ++ + /* Silently check in one day after current time-stamp */ + QTimer::singleShot (24 /* hours */ * 60 /* minutes */ * + 60 /* seconds */ * 1000 /* milliseconds */, +diff -urNad virtualbox-ose-2.2.2-dfsg/src/VBox/Frontends/VirtualBox/src/VBoxGLSettingsUpdate.cpp virtualbox-ose-2.2.2-dfsg.patch/src/VBox/Frontends/VirtualBox/src/VBoxGLSettingsUpdate.cpp +--- virtualbox-ose-2.2.2-dfsg/src/VBox/Frontends/VirtualBox/src/VBoxGLSettingsUpdate.cpp 2009-04-29 09:12:58.000000000 +0200 ++++ virtualbox-ose-2.2.2-dfsg.patch/src/VBox/Frontends/VirtualBox/src/VBoxGLSettingsUpdate.cpp 2009-05-16 16:07:06.586518040 +0200 +@@ -46,7 +46,7 @@ + VBoxUpdateData data (vboxGlobal().virtualBox(). + GetExtraData (VBoxDefs::GUI_UpdateDate)); + +- mCbCheck->setChecked (!data.isNeverCheck()); ++ mCbCheck->setChecked (false); + if (mCbCheck->isChecked()) + mCbOncePer->setCurrentIndex (data.index()); + mTxDate->setText (data.date()); +diff -urNad virtualbox-ose-2.2.2-dfsg/src/VBox/Frontends/VirtualBox/src/VBoxHelpActions.cpp virtualbox-ose-2.2.2-dfsg.patch/src/VBox/Frontends/VirtualBox/src/VBoxHelpActions.cpp +--- virtualbox-ose-2.2.2-dfsg/src/VBox/Frontends/VirtualBox/src/VBoxHelpActions.cpp 2009-04-29 09:12:58.000000000 +0200 ++++ virtualbox-ose-2.2.2-dfsg.patch/src/VBox/Frontends/VirtualBox/src/VBoxHelpActions.cpp 2009-05-16 16:11:47.386517660 +0200 +@@ -87,8 +87,7 @@ + #endif + + aMenu->addAction (updateAction); +- updateAction->setEnabled (vboxGlobal().virtualBox(). +- GetExtraData (VBoxDefs::GUI_UpdateDlgWinID).isEmpty()); ++ updateAction->setEnabled (false); + + #ifndef Q_WS_MAC + aMenu->addSeparator(); +diff -urNad virtualbox-ose-2.2.2-dfsg/src/VBox/Frontends/VirtualBox/ui/VBoxGLSettingsUpdate.ui virtualbox-ose-2.2.2-dfsg.patch/src/VBox/Frontends/VirtualBox/ui/VBoxGLSettingsUpdate.ui +--- virtualbox-ose-2.2.2-dfsg/src/VBox/Frontends/VirtualBox/ui/VBoxGLSettingsUpdate.ui 2009-04-29 09:12:58.000000000 +0200 ++++ virtualbox-ose-2.2.2-dfsg.patch/src/VBox/Frontends/VirtualBox/ui/VBoxGLSettingsUpdate.ui 2009-05-16 16:12:57.066517714 +0200 +@@ -18,6 +18,9 @@ + + VBoxGLSettingsUpdate + ++ ++ false ++ + + + 0 +@@ -48,7 +51,7 @@ + &Check for updates + + +- true ++ false + + + only in patch2: unchanged: --- virtualbox-ose-3.0.8-dfsg.orig/debian/virtualbox-ose-guest-source.files/dkms.conf.in +++ virtualbox-ose-3.0.8-dfsg/debian/virtualbox-ose-guest-source.files/dkms.conf.in @@ -0,0 +1,13 @@ +PACKAGE_NAME="virtualbox-ose-guest" +PACKAGE_VERSION="CVERSION" +CLEAN="rm -f *.*o" +BUILT_MODULE_NAME[0]="vboxadd" +BUILT_MODULE_LOCATION[0]="vboxadd" +DEST_MODULE_LOCATION[0]="/updates" +BUILT_MODULE_NAME[1]="vboxvfs" +BUILT_MODULE_LOCATION[1]="vboxvfs" +DEST_MODULE_LOCATION[1]="/updates" +BUILT_MODULE_NAME[2]="vboxvideo" +BUILT_MODULE_LOCATION[2]="vboxvideo_drm" +DEST_MODULE_LOCATION[2]="/updates" +AUTOINSTALL="yes" only in patch2: unchanged: --- virtualbox-ose-3.0.8-dfsg.orig/debian/virtualbox-ose-source.files/dkms.conf.vboxnetflt.in +++ virtualbox-ose-3.0.8-dfsg/debian/virtualbox-ose-source.files/dkms.conf.vboxnetflt.in @@ -0,0 +1,7 @@ +PACKAGE_NAME="vboxnetflt" +PACKAGE_VERSION="CVERSION" +CLEAN="make -C $dkms_tree/$module/$module_version/build clean" +BUILT_MODULE_NAME[0]="vboxnetflt" +DEST_MODULE_LOCATION[0]="/updates/vboxnetflt" +AUTOINSTALL="yes" +PRE_BUILD="do_Module.symvers vboxdrv restore $dkms_tree/$module/$module_version/build/Module.symvers" only in patch2: unchanged: --- virtualbox-ose-3.0.8-dfsg.orig/debian/virtualbox-ose-source.files/dkms.conf.vboxdrv.in +++ virtualbox-ose-3.0.8-dfsg/debian/virtualbox-ose-source.files/dkms.conf.vboxdrv.in @@ -0,0 +1,7 @@ +PACKAGE_NAME="vboxdrv" +PACKAGE_VERSION="CVERSION" +CLEAN="make -C $dkms_tree/$module/$module_version/build clean" +BUILT_MODULE_NAME[0]="vboxdrv" +DEST_MODULE_LOCATION[0]="/updates/vboxdrv" +AUTOINSTALL="yes" +POST_BUILD="do_Module.symvers vboxdrv save $dkms_tree/$module/$module_version/build/Module.symvers" only in patch2: unchanged: --- virtualbox-ose-3.0.8-dfsg.orig/debian/virtualbox-ose-source.files/do_Module.symvers +++ virtualbox-ose-3.0.8-dfsg/debian/virtualbox-ose-source.files/do_Module.symvers @@ -0,0 +1,46 @@ +#!/bin/sh + +# +# This script is used when building kernel modules from DKMS. I don't +# know how to solve the problem of inter-module dependencies better. +# +# Copyright (C) 2008 Sun Microsystems, Inc. +# +# This file is part of VirtualBox Open Source Edition (OSE), as +# available from http://www.virtualbox.org. This file is free software; +# you can redistribute it and/or modify it under the terms of the GNU +# General Public License (GPL) as published by the Free Software +# Foundation, in version 2 as it comes in the "COPYING" file of the +# VirtualBox OSE distribution. VirtualBox OSE is distributed in the +# hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. +# +# The contents of this file may alternatively be used under the terms +# of the Common Development and Distribution License Version 1.0 +# (CDDL) only, as it comes in the "COPYING.CDDL" file of the +# VirtualBox OSE distribution, in which case the provisions of the +# CDDL are applicable instead of those of the GPL. +# +# You may elect to license modified versions of this file under the +# terms and conditions of either the GPL or the CDDL or both. +# +# Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa +# Clara, CA 95054 USA or visit http://www.sun.com if you need +# additional information or have any questions. +# + +SYMFILE="/tmp/$1-Module.symvers" +case "$2" in + save) + if [ -f "$3" ]; then + cp "$3" "$SYMFILE" + fi + ;; + restore) + if [ -f "$SYMFILE" ]; then + cp "$SYMFILE" "$3" + fi + ;; + *) + echo "Usage: save|restore " + ;; +esac only in patch2: unchanged: --- virtualbox-ose-3.0.8-dfsg.orig/debian/virtualbox-ose-source.files/dkms.conf.vboxnetadp.in +++ virtualbox-ose-3.0.8-dfsg/debian/virtualbox-ose-source.files/dkms.conf.vboxnetadp.in @@ -0,0 +1,7 @@ +PACKAGE_NAME="vboxnetadp" +PACKAGE_VERSION="CVERSION" +CLEAN="make -C $dkms_tree/$module/$module_version/build clean" +BUILT_MODULE_NAME[0]="vboxnetadp" +DEST_MODULE_LOCATION[0]="/updates/vboxnetadp" +AUTOINSTALL="yes" +PRE_BUILD="do_Module.symvers vboxdrv restore $dkms_tree/$module/$module_version/build/Module.symvers" only in patch2: unchanged: --- virtualbox-ose-3.0.8-dfsg.orig/debian/virtualbox-ose.files/source_virtualbox-ose.py +++ virtualbox-ose-3.0.8-dfsg/debian/virtualbox-ose.files/source_virtualbox-ose.py @@ -0,0 +1,11 @@ +import apport.hookutils + +def add_info(report): + """Add a list of installed packages matching 'virtualbox'""" + report['VirtualBoxOse.DpkgList'] = apport.hookutils.command_output(["sh", "-c", "dpkg -l | grep virtualbox"]) + + """Add information about installed VirtualBox kernel modules""" + report['VirtualBoxOse.ModInfo'] = apport.hookutils.command_output(["sh", "-c", + "find /lib/modules/`uname -r` -name \"vbox*\" | xargs -r modinfo"]) + + report['LsMod'] = apport.hookutils.command_output(["lsmod"])