diff -Nru /tmp/vSOSlMjBUw/virtualbox-ose-modules-2/debian/changelog /tmp/uu99ON67MO/virtualbox-ose-modules-3/debian/changelog --- /tmp/vSOSlMjBUw/virtualbox-ose-modules-2/debian/changelog 2007-10-09 03:29:43.000000000 +0200 +++ /tmp/uu99ON67MO/virtualbox-ose-modules-3/debian/changelog 2007-10-11 12:51:14.000000000 +0200 @@ -1,3 +1,17 @@ +virtualbox-ose-modules (3) gutsy; urgency=low + + * Provide modules for 2.6.22-14 (LP: #151379) + * Improved build system (according to linux-meta) + * Added debian/postinst scripts, to call depmod after install + * debian/rules: + - use kernel_abi_version and export it to dh_gencontrol + * debian/control: + - create packages virtualbox-ose-modules-{generic,server} + (leaving the kernel-abi-version out of the package name) + - Replaces virtualbox-ose-modules-2.6.22-13-generic (for upgrade) + + -- dAniel hAhler Thu, 11 Oct 2007 03:31:25 +0200 + virtualbox-ose-modules (2) gutsy; urgency=low * Correct some really bozo errors in the rules file. diff -Nru /tmp/vSOSlMjBUw/virtualbox-ose-modules-2/debian/control /tmp/uu99ON67MO/virtualbox-ose-modules-3/debian/control --- /tmp/vSOSlMjBUw/virtualbox-ose-modules-2/debian/control 2007-10-08 08:59:28.000000000 +0200 +++ /tmp/uu99ON67MO/virtualbox-ose-modules-3/debian/control 2007-10-11 11:34:16.000000000 +0200 @@ -5,31 +5,31 @@ Standards-Version: 3.7.2 Build-Depends: debhelper (>= 5), virtualbox-ose-source, linux-headers-generic [i386 amd64], linux-headers-server [i386 amd64] -Package: virtualbox-ose-modules-2.6.22-13-generic +Package: virtualbox-ose-modules-generic Architecture: i386 amd64 Provides: virtualbox-ose-modules Conflicts: virtualbox-ose-modules -Replaces: virtualbox-ose-modules -Depends: linux-image-2.6.22-13-generic -Description: virtualbox-ose modules for linux-image-2.6.22-13-generic +Replaces: virtualbox-ose-modules, virtualbox-ose-modules-2.6.22-13-generic +Depends: linux-image-${kernel-abi-version}-generic +Description: virtualbox-ose modules for linux-image-${kernel-abi-version}-generic VirtualBox is a free PC virtualization solution allowing you to run a wide range of PC operating systems on your Linux system. This includes Windows, Linux, FreeBSD, DOS, OpenBSD and others. . This package provides the virtualbox-ose module (vboxdrv.ko) for the - 2.6.22-13-generic kernel. + ${kernel-abi-version}-generic kernel. -Package: virtualbox-ose-modules-2.6.22-13-server +Package: virtualbox-ose-modules-server Architecture: i386 amd64 Provides: virtualbox-ose-modules Conflicts: virtualbox-ose-modules -Replaces: virtualbox-ose-modules -Depends: linux-image-2.6.22-13-server -Description: virtualbox-ose modules for linux-image-2.6.22-13-server +Replaces: virtualbox-ose-modules, virtualbox-ose-modules-2.6.22-13-generic +Depends: linux-image-${kernel-abi-version}-server +Description: virtualbox-ose modules for linux-image-${kernel-abi-version}-server VirtualBox is a free PC virtualization solution allowing you to run a wide range of PC operating systems on your Linux system. This includes Windows, Linux, FreeBSD, DOS, OpenBSD and others. . This package provides the virtualbox-ose module (vboxdrv.ko) for the - 2.6.22-13-server kernel. + ${kernel-abi-version}-server kernel. diff -Nru /tmp/vSOSlMjBUw/virtualbox-ose-modules-2/debian/files /tmp/uu99ON67MO/virtualbox-ose-modules-3/debian/files --- /tmp/vSOSlMjBUw/virtualbox-ose-modules-2/debian/files 1970-01-01 01:00:00.000000000 +0100 +++ /tmp/uu99ON67MO/virtualbox-ose-modules-3/debian/files 2007-10-11 12:49:05.000000000 +0200 @@ -0,0 +1,2 @@ +virtualbox-ose-modules-generic_3_i386.deb misc optional +virtualbox-ose-modules-server_3_i386.deb misc optional diff -Nru /tmp/vSOSlMjBUw/virtualbox-ose-modules-2/debian/rules /tmp/uu99ON67MO/virtualbox-ose-modules-3/debian/rules --- /tmp/vSOSlMjBUw/virtualbox-ose-modules-2/debian/rules 2007-10-09 03:29:11.000000000 +0200 +++ /tmp/uu99ON67MO/virtualbox-ose-modules-3/debian/rules 2007-10-11 12:53:12.000000000 +0200 @@ -1,9 +1,11 @@ #!/usr/bin/make -f +#export DH_VERBOSE=1 + # Flavours of the kernel we build for flavours := generic server # Current kernel version -KERNEL := 2.6.22-13 +kernel_abi_version := 2.6.22-14 build: build-stamp build-stamp: @@ -11,7 +13,7 @@ for i in $(flavours) ; do \ mkdir $(CURDIR)/debian/build-$$i ; \ tar jxfC /usr/src/virtualbox-ose.tar.bz2 $(CURDIR)/debian/build-$$i;\ - export KDIR=/usr/src/linux-headers-$(KERNEL)-$$i; \ + export KDIR=/usr/src/linux-headers-$(kernel_abi_version)-$$i; \ $(MAKE) -C $(CURDIR)/debian/build-$$i/modules/virtualbox-ose; \ done touch $@ @@ -20,8 +22,8 @@ install-stamp: # Install the modules for i in $(flavours) ; do \ - mkdir -p debian/virtualbox-ose-modules-$(KERNEL)-$$i/lib/modules/$(KERNEL)-$$i/misc; \ - cp $(CURDIR)/debian/build-$$i/modules/virtualbox-ose/vboxdrv.ko debian/virtualbox-ose-modules-$(KERNEL)-$$i/lib/modules/$(KERNEL)-$$i/misc; \ + mkdir -p debian/virtualbox-ose-modules-$$i/lib/modules/$(kernel_abi_version)-$$i/misc; \ + cp $(CURDIR)/debian/build-$$i/modules/virtualbox-ose/vboxdrv.ko debian/virtualbox-ose-modules-$$i/lib/modules/$(kernel_abi_version)-$$i/misc; \ done touch $@ @@ -34,16 +36,16 @@ dh_compress dh_fixperms dh_installdeb - dh_gencontrol + dh_gencontrol -- \ + -Vkernel-abi-version=$(kernel_abi_version) dh_md5sums dh_builddeb clean: - $(RM) -r $(CURDIR)/debian/virtualbox-ose-modules-* $(RM) -r $(CURDIR)/debian/build-* $(RM) *-stamp dh_clean -k binary: binary-indep binary-arch -.PHONY: clean build install binary-indep binary-arch +.PHONY: clean build install binary-indep binary-arch diff -Nru /tmp/vSOSlMjBUw/virtualbox-ose-modules-2/debian/virtualbox-ose-modules-generic.postinst /tmp/uu99ON67MO/virtualbox-ose-modules-3/debian/virtualbox-ose-modules-generic.postinst --- /tmp/vSOSlMjBUw/virtualbox-ose-modules-2/debian/virtualbox-ose-modules-generic.postinst 1970-01-01 01:00:00.000000000 +0100 +++ /tmp/uu99ON67MO/virtualbox-ose-modules-3/debian/virtualbox-ose-modules-generic.postinst 2007-10-11 12:42:53.000000000 +0200 @@ -0,0 +1,23 @@ +#!/bin/sh +# postinst script for virtualbox-ose-modules + +set -e + +case "$1" in + configure) + depmod -q + ;; + + abort-upgrade|abort-remove|abort-deconfigure) + ;; + + *) + echo "postinst called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +#DEBHELPER# + +exit 0 + diff -Nru /tmp/vSOSlMjBUw/virtualbox-ose-modules-2/debian/virtualbox-ose-modules-server.postinst /tmp/uu99ON67MO/virtualbox-ose-modules-3/debian/virtualbox-ose-modules-server.postinst --- /tmp/vSOSlMjBUw/virtualbox-ose-modules-2/debian/virtualbox-ose-modules-server.postinst 1970-01-01 01:00:00.000000000 +0100 +++ /tmp/uu99ON67MO/virtualbox-ose-modules-3/debian/virtualbox-ose-modules-server.postinst 2007-10-11 12:42:58.000000000 +0200 @@ -0,0 +1,23 @@ +#!/bin/sh +# postinst script for virtualbox-ose-modules + +set -e + +case "$1" in + configure) + depmod -q + ;; + + abort-upgrade|abort-remove|abort-deconfigure) + ;; + + *) + echo "postinst called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +#DEBHELPER# + +exit 0 +