diff -pruN 1.4.0~pre1-1/debian/60-kqemu.rules 1.4.0~pre1-1ubuntu3/debian/60-kqemu.rules --- 1.4.0~pre1-1/debian/60-kqemu.rules 1970-01-01 01:00:00.000000000 +0100 +++ 1.4.0~pre1-1ubuntu3/debian/60-kqemu.rules 2009-03-05 18:25:36.000000000 +0000 @@ -0,0 +1 @@ +KERNEL=="kqemu", NAME="%k", GROUP="kqemu", MODE="0660" diff -pruN 1.4.0~pre1-1/debian/changelog 1.4.0~pre1-1ubuntu3/debian/changelog --- 1.4.0~pre1-1/debian/changelog 2009-03-05 18:29:15.000000000 +0000 +++ 1.4.0~pre1-1ubuntu3/debian/changelog 2009-03-05 18:25:36.000000000 +0000 @@ -1,3 +1,28 @@ +kqemu (1.4.0~pre1-1ubuntu3) jaunty; urgency=low + + * debian/config/kqemu.modprobe: Drop, this option is already the default. + * debian/rules: Don't install the modprobe rule + * debian/kqemu-source.preinst: Remove on upgrade + + -- Scott James Remnant Thu, 05 Mar 2009 16:51:14 +0000 + +kqemu (1.4.0~pre1-1ubuntu2) jaunty; urgency=low + + * debian/rules: Install udev rules into /lib/udev/rules.d + * debian/kqemu-source.preinst: Remove old rules if unmodified + * debian/control: Add Breaks to ensure right version of udev is used. + + -- Scott James Remnant Mon, 12 Jan 2009 20:11:05 +0000 + +kqemu (1.4.0~pre1-1ubuntu1) jaunty; urgency=low + + * Merge from debian unstable, remaining changes: + - DKMS support. DKMS isn't yet in Debian. + - User group support, filed in debian bugs + 418516, 425213, 446567. + + -- Mario Limonciello Wed, 05 Nov 2008 19:45:09 -0600 + kqemu (1.4.0~pre1-1) unstable; urgency=low * Upgrading package to debhelper 7. @@ -12,6 +37,34 @@ kqemu (1.4.0~pre1-1) unstable; urgency=l -- Daniel Baumann Sun, 14 Sep 2008 15:39:00 +0200 +kqemu (1.3.0~pre11-8ubuntu1) intrepid; urgency=low + + * Adding DKMS support (LP: #127610, #249493, #107342) + - debian/dkms.conf.in: + + Include a skeleton that is used for making a DKMSified + kqemu-source. + - debian/control: + + Adjust kqemu-source depends. + - debian/rules: + + Adjust where kqemu-source installs to for DKMS support. + - debian/kqemu-source.{postinst,prerm}: + + Include for DKMS support. + + * Adding user group support (LP: #159340, #135067) + - Include 60-kqemu.rules udev rules + - debian/kqemu-source.init: + + Add init script to load kernel module upon boot. + - debian/rules: + + Install 60-kqemu.rules + + Install init script + - debian/kqemu-source.{postinst,prerm}: + + Create a kqemu group. + + * Modify Maintainer value to match the DebianMaintainerField + specification. + + -- Mario Limonciello Sun, 27 Jul 2008 08:41:00 -0500 + kqemu (1.3.0~pre11-8) unstable; urgency=medium * Bumping package to policy 3.7.3. @@ -173,3 +226,4 @@ kqemu (1.3.0~pre9-1) unstable; urgency=l * Initial release (Closes: #396097). -- Daniel Baumann Fri, 17 Nov 2006 08:29:00 +0100 + diff -pruN 1.4.0~pre1-1/debian/control 1.4.0~pre1-1ubuntu3/debian/control --- 1.4.0~pre1-1/debian/control 2009-03-05 18:29:15.000000000 +0000 +++ 1.4.0~pre1-1ubuntu3/debian/control 2009-03-05 18:25:36.000000000 +0000 @@ -1,7 +1,8 @@ Source: kqemu Section: misc Priority: optional -Maintainer: Daniel Baumann +Maintainer: Ubuntu MOTU Developers +XSBC-Original-Maintainer: Daniel Baumann Build-Depends: debhelper (>= 7), dpatch, bzip2 Standards-Version: 3.8.0 Homepage: http://www.qemu.org/ @@ -20,8 +21,8 @@ Description: Common files for the QEMU A Package: kqemu-source Architecture: all -Depends: debhelper (>= 7), dpatch, bzip2, make -Recommends: module-assistant +Depends: dkms, make, libc6-dev +Breaks: udev (<< 136-1) Description: Source for the QEMU Accelerator module This package provides the source code for the kqemu kernel modules. The qemu package is also required in order to make use of these diff -pruN 1.4.0~pre1-1/debian/dkms.conf.in 1.4.0~pre1-1ubuntu3/debian/dkms.conf.in --- 1.4.0~pre1-1/debian/dkms.conf.in 1970-01-01 01:00:00.000000000 +0100 +++ 1.4.0~pre1-1ubuntu3/debian/dkms.conf.in 2009-03-05 18:25:36.000000000 +0000 @@ -0,0 +1,6 @@ +PACKAGE_NAME="kqemu" +PACKAGE_VERSION="CVERSION" +CLEAN="rm -f *.*o" +BUILT_MODULE_NAME[0]="kqemu" +DEST_MODULE_LOCATION[0]="/updates/kqemu" +AUTOINSTALL="yes" diff -pruN 1.4.0~pre1-1/debian/kqemu-source.init 1.4.0~pre1-1ubuntu3/debian/kqemu-source.init --- 1.4.0~pre1-1/debian/kqemu-source.init 1970-01-01 01:00:00.000000000 +0100 +++ 1.4.0~pre1-1ubuntu3/debian/kqemu-source.init 2009-03-05 18:25:36.000000000 +0000 @@ -0,0 +1,50 @@ +#! /bin/sh +### BEGIN INIT INFO +# Provides: kqemu +# Required-Start: +# Required-Stop: +# Default-Start: 2 3 4 5 +# Default-Stop: S 0 1 6 +# Short-Description: KQEMU init script +# Description: This script loads the kernel modules needed by kqemu +### END INIT INFO + +. /lib/lsb/init-functions + +module=kqemu + +case "$1" in + start) + if modprobe "$module" + then + log_success_msg "Loading kqemu kernel module" + else + log_failure_msg "Module $module failed to load" + exit 1 + fi + ;; + stop) + if lsmod | grep -q "$module" + then + if rmmod "$module" + then + log_success_msg "Succesfully unloaded kqemu kernel module" + else + log_failure_msg "Failed to remove $module" + exit 1 + fi + else + log_failure_msg "Module $module not loaded" + fi + ;; + force-reload|restart) + $0 stop + $0 start + ;; + *) + echo "Usage: $0 {start|stop|restart|force-reload}" >&2 + exit 3 + ;; +esac + +: diff -pruN 1.4.0~pre1-1/debian/kqemu-source.postinst 1.4.0~pre1-1ubuntu3/debian/kqemu-source.postinst --- 1.4.0~pre1-1/debian/kqemu-source.postinst 1970-01-01 01:00:00.000000000 +0100 +++ 1.4.0~pre1-1ubuntu3/debian/kqemu-source.postinst 2009-03-05 18:25:36.000000000 +0000 @@ -0,0 +1,24 @@ +#!/bin/sh +# Copyright (C) 2008 Mario Limonciello + +CVERSION=`dpkg-query -W -f='${Version}' kqemu-source | awk -F "-" '{print $1}' | cut -d\: -f2` + +case "$1" in + configure) + #Create Group + addgroup --system kqemu 2>/dev/null + + #Reload udev rules that may have been updated + [ -x /usr/sbin/invoke-rc.d ] && /usr/sbin/invoke-rc.d udev reload + + #Create DKMS modules + echo "Adding Module to DKMS build system" + dkms add -m kqemu -v $CVERSION > /dev/null + echo "Doing initial module build" + dkms build -m kqemu -v $CVERSION > /dev/null + echo "Installing initial module" + dkms install -m kqemu -v $CVERSION --force > /dev/null + echo "Done." + ;; +esac +#DEBHELPER# diff -pruN 1.4.0~pre1-1/debian/kqemu-source.preinst 1.4.0~pre1-1ubuntu3/debian/kqemu-source.preinst --- 1.4.0~pre1-1/debian/kqemu-source.preinst 1970-01-01 01:00:00.000000000 +0100 +++ 1.4.0~pre1-1ubuntu3/debian/kqemu-source.preinst 2009-03-05 18:25:36.000000000 +0000 @@ -0,0 +1,23 @@ +#!/bin/sh + +set -e + +if [ "$1" = install ] || [ "$1" = upgrade ]; then + if [ -e "/etc/udev/rules.d/60-kqemu.rules" ]; then + if [ "`md5sum \"/etc/udev/rules.d/60-kqemu.rules\" | sed -e \"s/ .*//\"`" = \ + "`dpkg-query -W -f='${Conffiles}' kqemu-source | sed -n -e \"\\\\' /etc/udev/rules.d/60-kqemu.rules's/.* //p\"`" ] + then + rm -f "/etc/udev/rules.d/60-kqemu.rules" + fi + fi + + if [ -e "/etc/modprobe.d/kqemu" ]; then + if [ "`md5sum \"/etc/modprobe.d/kqemu\" | sed -e \"s/ .*//\"`" = \ + "`dpkg-query -W -f='${Conffiles}' kqemu-source | sed -n -e \"\\\\' /etc/modprobe.d/kqemu's/.* //p\"`" ] + then + rm -f "/etc/modprobe.d/kqemu" + fi + fi +fi + +#DEBHELPER# diff -pruN 1.4.0~pre1-1/debian/kqemu-source.prerm 1.4.0~pre1-1ubuntu3/debian/kqemu-source.prerm --- 1.4.0~pre1-1/debian/kqemu-source.prerm 1970-01-01 01:00:00.000000000 +0100 +++ 1.4.0~pre1-1ubuntu3/debian/kqemu-source.prerm 2009-03-05 18:25:36.000000000 +0000 @@ -0,0 +1,18 @@ +#!/bin/sh +# Copyright (C) 2008 Mario Limonciello + +#DEBHELPER# + +CVERSION=`dpkg-query -W -f='${Version}' kqemu-source | awk -F "-" '{print $1}' | cut -d\: -f2` +case "$1" in + remove|upgrade|purge) + echo "Removing all DKMS Modules" + dkms remove -m kqemu -v $CVERSION --all > /dev/null + echo "Done." + ;; + purge) + delgroup --quiet kqemu + ;; +esac + + diff -pruN 1.4.0~pre1-1/debian/rules 1.4.0~pre1-1ubuntu3/debian/rules --- 1.4.0~pre1-1/debian/rules 2009-03-05 18:29:15.000000000 +0000 +++ 1.4.0~pre1-1ubuntu3/debian/rules 2009-03-05 18:25:36.000000000 +0000 @@ -21,6 +21,9 @@ psource:=kqemu-source # The short upstream name, used for the module source directory sname:=kqemu +# The package version +cversion := $(shell dpkg-parsechangelog | grep '^Version:' | cut -d' ' -f2 | cut -d- -f1 | cut -d\: -f2) + ### KERNEL SETUP ### Setup the stuff needed for making kernel module packages ### taken from /usr/share/kernel-package/sample.module.rules @@ -99,22 +102,21 @@ install: build dh_installdirs # Create kqemu-common - install -D -m 0644 debian/config/kqemu.modprobe debian/kqemu-common/etc/modprobe.d/kqemu install -d -m 0755 debian/kqemu-common/usr/share/doc/kqemu-common install -m 0644 *.html debian/kqemu-common/usr/share/doc/kqemu-common # Create the directories to install the source into - dh_installdirs -p$(psource) usr/src/modules/$(sname)/debian + dh_installdirs -p$(psource) usr/src/$(sname)-$(cversion) # Copy only the driver source to the proper location - cp -a Changelog Makefile configure install.sh *.c *.h common debian/$(psource)/usr/src/modules/$(sname) - touch debian/$(psource)/usr/src/modules/$(sname)/config-host.mak - # Copy the needed debian/ pieces to the proper location - cp debian/*modules.in* \ - debian/$(psource)/usr/src/modules/$(sname)/debian - cp debian/control debian/rules debian/changelog debian/copyright \ - debian/compat debian/$(psource)/usr/src/modules/$(sname)/debian/ - cd debian/$(psource)/usr/src && tar c modules | bzip2 -9 > $(sname).tar.bz2 && rm -rf modules + cp -a Changelog Makefile configure install.sh *.c *.h common debian/$(psource)/usr/src/$(sname)-$(cversion) + touch debian/$(psource)/usr/src/$(sname)-$(cversion)/config-host.mak + + # Create DKMS conf + sed "s/CVERSION/$(cversion)/" debian/dkms.conf.in > debian/$(psource)/usr/src/$(sname)-$(cversion)/dkms.conf + + # Include udev rules + dh_install -p$(psource) debian/60-kqemu.rules lib/udev/rules.d dh_install @@ -126,6 +128,7 @@ binary-indep: build install dh_installchangelogs Changelog dh_installdocs dh_install + dh_installinit dh_link dh_compress dh_fixperms