[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

xserver-xorg-video-nouveau: Changes to 'ubuntu'



 debian/changelog |    8 +++++++-
 debian/control   |    2 +-
 debian/postinst  |    7 +++++++
 debian/postrm    |    5 +++++
 debian/rules     |    2 +-
 5 files changed, 21 insertions(+), 3 deletions(-)

New commits:
commit 1d46cf0f598e77ef03ceda2956d251d78292c7c7
Author: Christopher James Halse Rogers <raof@ubuntu.com>
Date:   Fri Feb 19 23:19:35 2010 +1100

    Tighten libdrm-dev version dependency for nouveau_class.h changes

diff --git a/debian/changelog b/debian/changelog
index eec7e6d..d8c01f0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,8 +12,10 @@ xserver-xorg-video-nouveau (1:0.0.15+git20100219+9b4118d-0ubuntu1) UNRELEASED; u
   * debian/postrm:
     + Trigger update-initramfs on install and removal to ensure kms hook is 
       used.
+  * debian/control:
+    + Tighten libdrm-dev build-depend to >= 2.4.18~ for nouveau_class.h updates
 
- -- Christopher James Halse Rogers <raof@ubuntu.com>  Fri, 19 Feb 2010 21:22:39 +1100
+ -- Christopher James Halse Rogers <raof@ubuntu.com>  Fri, 19 Feb 2010 23:19:00 +1100
 
 xserver-xorg-video-nouveau (1:0.0.15+git20100128+2630a15-0ubuntu2) lucid; urgency=low
 
diff --git a/debian/control b/debian/control
index e07c9ea..aead551 100644
--- a/debian/control
+++ b/debian/control
@@ -13,7 +13,7 @@ Build-Depends: debhelper (>= 7),
  x11proto-randr-dev (>= 1.2),
  x11proto-render-dev,
  x11proto-xext-dev,
- libdrm-dev (>= 2.4.17-1ubuntu1~),
+ libdrm-dev (>= 2.4.18~)
  x11proto-xf86dri-dev,
  x11proto-gl-dev,
  mesa-common-dev,

commit bdd1017b193e92a5961583a658783f07c6f179e5
Author: Christopher James Halse Rogers <raof@ubuntu.com>
Date:   Fri Feb 19 23:09:56 2010 +1100

    Add postinst and postrm update-initramfs triggers

diff --git a/debian/changelog b/debian/changelog
index f22f641..eec7e6d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,10 @@ xserver-xorg-video-nouveau (1:0.0.15+git20100219+9b4118d-0ubuntu1) UNRELEASED; u
   * debian/nouveau_kms
     + initramfs-tools hook to add lbm_nouveau to the initramfs, like the other
       KMS framebuffer drivers.
+  * debian/postinst:
+  * debian/postrm:
+    + Trigger update-initramfs on install and removal to ensure kms hook is 
+      used.
 
  -- Christopher James Halse Rogers <raof@ubuntu.com>  Fri, 19 Feb 2010 21:22:39 +1100
 
diff --git a/debian/postinst b/debian/postinst
new file mode 100644
index 0000000..0b6bad7
--- /dev/null
+++ b/debian/postinst
@@ -0,0 +1,7 @@
+#!/bin/sh -e
+
+if [ "$1" = "configure" ] ; then
+    dpkg-trigger update-initramfs
+fi
+
+#DEBHELPER#
diff --git a/debian/postrm b/debian/postrm
new file mode 100644
index 0000000..f39a6f2
--- /dev/null
+++ b/debian/postrm
@@ -0,0 +1,5 @@
+#!/bin/sh -e
+
+dpkg-trigger update-initramfs
+
+#DEBHELPER#
\ No newline at end of file

commit e35458618d48531b81d9a65576e11d92a69660d2
Author: Christopher James Halse Rogers <raof@ubuntu.com>
Date:   Fri Feb 19 23:00:13 2010 +1100

    Install nouveau_kms hook directly into the deb directory after dh_install

diff --git a/debian/rules b/debian/rules
index 2e6fd86..a3e032e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -67,7 +67,6 @@ install: build
 	dh_testroot
 	dh_prep
 	dh_installdirs
-	install -m755 debian/nouveau_kms debian/tmp/usr/share/initramfs-tools/hooks
 
 	cd obj-$(DEB_BUILD_GNU_TYPE) && $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install
 
@@ -77,6 +76,7 @@ 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


Reply to: