[Pkg-virtualbox-commits] [virtualbox] 01/01: Re-work the packaging to account for the kernel modules being shipped in the master kernel packages, removing the need for dkms.

[Gianfranco Costamagna]

This is an automated email from the git hooks/post-receive script.

locutusofborg-guest pushed a commit to branch master
in repository virtualbox.

commit 87db86590cc380594238c9b6746fb0bc278ec244
Author: Adam Conrad <adconrad at ubuntu.com>
Date:   Wed Apr 22 16:17:02 2015 +0200

    Re-work the packaging to account for the kernel modules being shipped in the master kernel packages, removing the need for dkms.
---
 debian/.gitattributes |  1 -
 debian/changelog      | 12 ++++++++++++
 debian/control        |  4 +++-
 debian/rules          |  1 +
 4 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/debian/.gitattributes b/debian/.gitattributes
deleted file mode 100644
index 6a03163..0000000
--- a/debian/.gitattributes
+++ /dev/null
@@ -1 +0,0 @@
-changelog merge=dpkg-mergechangelogs
diff --git a/debian/changelog b/debian/changelog
index ff66ccd..59b3627 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+virtualbox (4.3.26-dfsg-3) UNRELEASED; urgency=medium
+
+  [ Adam Conrad ]
+  * Re-work the packaging to account for the kernel modules being shipped in
+    the master kernel packages, removing the need for dkms (LP: #1434579):
+    - Make the dkms package provide a virtual package matching what the
+      kernel packages provide to indicate that they ship the dkms modules.
+    - Add an alternate dep from the utils package to the virtual driver.
+    - Make the x11 driver package associate with the VGA controller PCI ID.
+
+ -- Gianfranco Costamagna <costamagnagianfranco at yahoo.it>  Wed, 22 Apr 2015 16:16:23 +0200
+
 virtualbox (4.3.26-dfsg-2) experimental; urgency=medium
 
   [ Gianfranco Costamagna ]
diff --git a/debian/control b/debian/control
index 23f9328..e7372fe 100644
--- a/debian/control
+++ b/debian/control
@@ -167,6 +167,7 @@ Architecture: all
 Pre-Depends: dpkg (>= 1.15.6~)
 Depends: virtualbox-guest-utils (>= ${source:Version}), ${misc:Depends}
 XB-Modaliases: ${modaliases}
+Provides: virtualbox-guest-modules
 Description: x86 virtualization solution - guest addition module source for dkms
  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
@@ -204,6 +205,7 @@ Depends: virtualbox-guest-utils (= ${binary:Version}),
          ${shlibs:Depends},
          ${xserver:Depends}
 Provides: xorg-driver-video
+XB-Modaliases: ${modaliases}
 Description: x86 virtualization solution - 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
@@ -217,7 +219,7 @@ Package: virtualbox-guest-utils
 Architecture: amd64 i386
 Pre-Depends: dpkg (>= 1.15.6~)
 Depends: adduser, pciutils, ${misc:Depends}, ${shlibs:Depends}
-Recommends: virtualbox-guest-dkms (= ${source:Version}) | virtualbox-guest-source (= ${source:Version}),
+Recommends: virtualbox-guest-dkms (= ${source:Version}) | virtualbox-guest-source (= ${source:Version}) | virtualbox-guest-modules,
             virtualbox-guest-x11 (= ${binary:Version})
 Description: x86 virtualization solution - non-X11 guest utilities
  VirtualBox is a free x86 virtualization solution allowing a wide range
diff --git a/debian/rules b/debian/rules
index fa5b8ef..1b7fa4d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -101,6 +101,7 @@ override_dh_auto_install:
 
 ifeq ($(DIST_NAME),Ubuntu)
 	echo "modaliases=vboxguest(pci:v000080EEd0000CAFEsv00000000sd00000000bc*sc*i*)" >> debian/$(gdkms).substvars
+	echo "modaliases=vboxx11(pci:v000080EEd0000BEEFsv00000000sd00000000bc*sc*i*)" >> debian/$(uxname).substvars
 endif
 
 override_dh_install:

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-virtualbox/virtualbox.git