debian/changelog | 6 ++++++ debian/i915-kms.conf | 1 + debian/rules | 4 ++++ debian/xserver-xorg-video-intel.postinst.in | 21 +++++++++++++++++++++ debian/xserver-xorg-video-intel.postrm.in | 21 +++++++++++++++++++++ debian/xserver-xorg-video-intel.prerm.in | 21 +++++++++++++++++++++ 6 files changed, 74 insertions(+)
New commits: commit c8e49cd447d2b23f6bdd30d40607b5289ab7365e Author: Julien Cristau <jcris...@debian.org> Date: Thu Nov 12 15:29:00 2009 +0100 Enable kernel mode setting by default on linux. diff --git a/debian/changelog b/debian/changelog index 3ec5f31..9454c74 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +xserver-xorg-video-intel (2:2.9.1-2) UNRELEASED; urgency=low + + * Enable kernel mode setting by default on linux (closes: #555906). + + -- Julien Cristau <jcris...@debian.org> Wed, 25 Nov 2009 17:09:10 +0100 + xserver-xorg-video-intel (2:2.9.1-1) unstable; urgency=medium * New upstream bugfix release (closes: #508005). diff --git a/debian/i915-kms.conf b/debian/i915-kms.conf new file mode 100644 index 0000000..597ac60 --- /dev/null +++ b/debian/i915-kms.conf @@ -0,0 +1 @@ +options i915 modeset=1 diff --git a/debian/rules b/debian/rules index e58d55a..414e4bb 100755 --- a/debian/rules +++ b/debian/rules @@ -87,6 +87,10 @@ binary-arch: build install serverabi dh_installdocs README NEWS dh_installchangelogs ChangeLog dh_install --sourcedir=debian/tmp --list-missing --exclude=.la --exclude=usr/share/man/man4 +ifeq ($(DEB_HOST_ARCH_OS), linux) + install -d -m 755 debian/xserver-xorg-video-intel/etc/modprobe.d/ + install -m 644 debian/i915-kms.conf debian/xserver-xorg-video-intel/etc/modprobe.d/ +endif dh_installman dh_link dh_strip --dbg-package=xserver-xorg-video-intel-dbg diff --git a/debian/xserver-xorg-video-intel.postinst.in b/debian/xserver-xorg-video-intel.postinst.in new file mode 100644 index 0000000..d3a09ec --- /dev/null +++ b/debian/xserver-xorg-video-intel.postinst.in @@ -0,0 +1,21 @@ +#!/bin/sh + +set -e + +THIS_SCRIPT=postinst +THIS_PACKAGE=xserver-xorg-video-intel + +#INCLUDE_SHELL_LIB# + +case "$1" in + abort-upgrade) + if dpkg --compare-versions "$2" lt-nl 2:2.9.1; then + # failed downgrading to a version without kms + remove_conffile_rollback /etc/modprobe.d/i915-kms.conf + fi + ;; +esac + +#DEBHELPER# + +# vim:set ai et sw=2 ts=2 tw=80: diff --git a/debian/xserver-xorg-video-intel.postrm.in b/debian/xserver-xorg-video-intel.postrm.in new file mode 100644 index 0000000..3967436 --- /dev/null +++ b/debian/xserver-xorg-video-intel.postrm.in @@ -0,0 +1,21 @@ +#!/bin/sh + +set -e + +THIS_SCRIPT=postrm +THIS_PACKAGE=xserver-xorg-video-intel + +#INCLUDE_SHELL_LIB# + +case "$1" in + upgrade) + if dpkg --compare-versions "$2" lt-nl 2:2.9.1; then + # downgrading to a version without kms + remove_conffile_commit /etc/modprobe.d/i915-kms.conf + fi + ;; +esac + +#DEBHELPER# + +# vim:set ai et sw=2 ts=2 tw=80: diff --git a/debian/xserver-xorg-video-intel.prerm.in b/debian/xserver-xorg-video-intel.prerm.in new file mode 100644 index 0000000..58082ed --- /dev/null +++ b/debian/xserver-xorg-video-intel.prerm.in @@ -0,0 +1,21 @@ +#!/bin/sh + +set -e + +THIS_SCRIPT=prerm +THIS_PACKAGE=xserver-xorg-video-intel + +#INCLUDE_SHELL_LIB# + +case "$1" in + upgrade) + if dpkg --compare-versions "$2" lt-nl 2:2.9.1; then + # downgrading to a version without kms + remove_conffile_lookup $THIS_PACKAGE /etc/modprobe.d/i915-kms.conf + fi + ;; +esac + +#DEBHELPER# + +# vim:set ai et sw=2 ts=2 tw=80: -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org