← Back to branch summary

~ubuntu-branches/ubuntu/vivid/virtualbox-ose/vivid

« back to all changes in this revision

Viewing changes to debian/patches/16-no-update.dpatch

  • Committer: Bazaar Package Importer
  • Author(s): Felix Geyer
  • Date: 2009-10-13 23:06:00 UTC
  • mfrom: (0.3.2 upstream) (0.1.12 sid)
  • Revision ID: james.westby@ubuntu.com-20091013230600-xhu2pwizq0wo63l9
Tags: 3.0.8-dfsg-1ubuntu1
https://launchpad.net/bugs/444812
https://launchpad.net/bugs/267097
https://launchpad.net/bugs/288590
https://launchpad.net/bugs/434503
* 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

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/16-no-update.dpatch
5
5
## DP: Do not check for updates
6
6
 
7
7
@DPATCH@
8
 
 
9
 
--- virtualbox-ose-2.2.0-dfsg/src/VBox/Main/VirtualBoxImpl.cpp.orig     2009-04-08 13:47:26.000000000 +0200
10
 
+++ virtualbox-ose-2.2.0-dfsg/src/VBox/Main/VirtualBoxImpl.cpp  2009-04-08 14:20:41.000000000 +0200
11
 
@@ -85,6 +85,9 @@
 
8
diff -urNad virtualbox-ose-3.0.8-dfsg~/src/VBox/Main/VirtualBoxImpl.cpp virtualbox-ose-3.0.8-dfsg/src/VBox/Main/VirtualBoxImpl.cpp
 
9
--- virtualbox-ose-3.0.8-dfsg~/src/VBox/Main/VirtualBoxImpl.cpp 2009-10-07 11:27:14.000000000 +0200
 
10
+++ virtualbox-ose-3.0.8-dfsg/src/VBox/Main/VirtualBoxImpl.cpp  2009-10-07 13:44:02.835497353 +0200
 
11
@@ -90,6 +90,9 @@
12
12
     "<VirtualBox xmlns=\"" VBOX_XML_NAMESPACE "\" "
13
13
         "version=\"" VBOX_XML_VERSION_FULL "\">" RTFILE_LINEFEED
14
14
     "  <Global>"RTFILE_LINEFEED
17
17
+    "    </ExtraData>"RTFILE_LINEFEED
18
18
     "    <MachineRegistry/>"RTFILE_LINEFEED
19
19
     "    <MediaRegistry/>"RTFILE_LINEFEED
20
 
     "    <USBDeviceFilters/>"RTFILE_LINEFEED
21
 
--- virtualbox-ose-2.2.0-dfsg/src/VBox/Frontends/VirtualBox/Makefile.kmk.orig2  2009-04-09 11:19:52.000000000 +0200
22
 
+++ virtualbox-ose-2.2.0-dfsg/src/VBox/Frontends/VirtualBox/Makefile.kmk        2009-04-09 11:20:03.000000000 +0200
23
 
@@ -36,7 +36,7 @@ VBOX_WITH_REGISTRATION := 1
24
 
 
25
 
 # Show the update notifier dialog during startup. If this setting is disabled
26
 
 # the user can still update using the menu if desired.
27
 
-VBOX_WITH_UPDATE_REQUEST := 1
28
 
+#VBOX_WITH_UPDATE_REQUEST := 1
29
 
 
30
 
 
31
 
 #
 
20
     "    <NetserviceRegistry>"RTFILE_LINEFEED