debian/changelog | 22 ++++++++++++++++++++++ debian/control | 8 +++----- debian/dirs | 1 - debian/nouveau_kms | 18 ------------------ debian/postinst | 7 ------- debian/postrm | 5 ----- debian/rules | 1 - 7 files changed, 25 insertions(+), 37 deletions(-)
New commits: commit e8b96fe0d9d361dc1b05bd108a61439d111d4c64 Author: Christopher James Halse Rogers <[email protected]> Date: Wed Mar 10 08:56:01 2010 +1100 Drop lbm dependency, and remove initramfs hook. Also clean up useless nvidia-glx conflicts/replaces diff --git a/debian/changelog b/debian/changelog index 209db1b..47bb279 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,25 @@ +xserver-xorg-video-nouveau (1:0.0.15+git20100219+9b4118d-0ubuntu4) lucid; urgency=low + + * debian/control: + + Drop dependency on linux-backports-modules-nouveau-lucid-FLAVOUR. As of + 2.6.32-16 nouveau is in the main kernel image. Fixes unsatisfiable + depends (LP: #534978) and prevents the alternate-installer being + confused (LP: #526422). + + Drop ancient, unnecessary conflicts/replaces on non-existent nvidia-glx + virtual package. + * debian/nouveau_kms: + * debian/rules: + + Drop nouveau_kms initramfs-tools hook. Now that nouveau is in the main + kernel image the existing framebuffer hook correctly copies nouveau into + the initramfs. + * debian/dirs: + + Drop, no longer need initramfs-tools hook directory + * debian/postinst: + * debian/postrm: + + Drop; update-initramfs trigger is no longer necessary. + + -- Christopher James Halse Rogers <[email protected]> Wed, 10 Mar 2010 08:51:31 +1100 + xserver-xorg-video-nouveau (1:0.0.15+git20100219+9b4118d-0ubuntu3) lucid; urgency=low * debian/patches/02_nouveau_bgnr diff --git a/debian/control b/debian/control index 0895c94..8b921dc 100644 --- a/debian/control +++ b/debian/control @@ -29,12 +29,10 @@ Vcs-Browser: http://git.debian.org/?=pkg-xorg/driver/xserver-xorg-video-nouveau. Package: xserver-xorg-video-nouveau Architecture: any Depends: ${shlibs:Depends}, - ${misc:Depends}, - ${xserver:Depends}, - linux-backports-modules-nouveau-lucid-generic | linux-backports-modules-nouveau-lucid-generic-pae + ${misc:Depends}, + ${xserver:Depends} Provides: ${xviddriver:Provides} -Replaces: xserver-xorg (<< 6.8.2-35), nvidia-glx -Conflicts: nvidia-glx +Replaces: xserver-xorg (<< 6.8.2-35) Description: X.Org X server -- Nouveau display driver (experimental) This driver for the X.Org X server (see xserver-xorg for a further description) provides support for NVIDIA Riva, TNT, GeForce, and Quadro cards. diff --git a/debian/dirs b/debian/dirs deleted file mode 100644 index 52c8c74..0000000 --- a/debian/dirs +++ /dev/null @@ -1 +0,0 @@ -usr/share/initramfs-tools/hooks diff --git a/debian/nouveau_kms b/debian/nouveau_kms deleted file mode 100755 index fa4eaaf..0000000 --- a/debian/nouveau_kms +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/sh -PREREQ="" -prereqs() -{ - echo "$PREREQ" -} - -case $1 in - prereqs) - prereqs - exit 0 - ;; -esac - -. /usr/share/initramfs-tools/hook-functions -# Begin real processing below this line - -manual_add_modules lbm_nouveau diff --git a/debian/postinst b/debian/postinst deleted file mode 100644 index 0b6bad7..0000000 --- a/debian/postinst +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh -e - -if [ "$1" = "configure" ] ; then - dpkg-trigger update-initramfs -fi - -#DEBHELPER# diff --git a/debian/postrm b/debian/postrm deleted file mode 100644 index f39a6f2..0000000 --- a/debian/postrm +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh -e - -dpkg-trigger update-initramfs - -#DEBHELPER# \ No newline at end of file diff --git a/debian/rules b/debian/rules index a3e032e..8b61d76 100755 --- a/debian/rules +++ b/debian/rules @@ -76,7 +76,6 @@ binary-arch: build install serverabi dh_installdocs dh_installchangelogs dh_install --sourcedir=debian/tmp --list-missing - install -m755 debian/nouveau_kms debian/xserver-xorg-video-nouveau/usr/share/initramfs-tools/hooks dh_link dh_strip dh_compress -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected] Archive: http://lists.debian.org/[email protected]
