debian/changelog |    8 ++++++++
 debian/control   |    2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

New commits:
commit c38124628104829e8c4c8da0103280733d361f3d
Author: Christopher James Halse Rogers <r...@ubuntu.com>
Date:   Fri Feb 26 15:37:47 2010 +1100

    Import -0ubuntu2 changes into git:
    
    * debian/control
      + Add -pae as fulfilling dependency
        (LP: #524792)

diff --git a/debian/changelog b/debian/changelog
index a8eb3d0..688e3b9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+xserver-xorg-video-nouveau (1:0.0.15+git20100219+9b4118d-0ubuntu2) lucid; 
urgency=low
+
+  * debian/control
+    + Add -pae as fulfilling dependency
+      (LP: #524792)
+
+ -- Bryce Harrington <br...@ubuntu.com>  Mon, 22 Feb 2010 21:32:09 -0800
+
 xserver-xorg-video-nouveau (1:0.0.15+git20100219+9b4118d-0ubuntu1) lucid; 
urgency=low
 
   [ Christopher James Halse Rogers ]
diff --git a/debian/control b/debian/control
index d4e30a7..0895c94 100644
--- a/debian/control
+++ b/debian/control
@@ -31,7 +31,7 @@ Architecture: any
 Depends: ${shlibs:Depends}, 
  ${misc:Depends}, 
  ${xserver:Depends}, 
- linux-backports-modules-nouveau-lucid-generic
+ linux-backports-modules-nouveau-lucid-generic | 
linux-backports-modules-nouveau-lucid-generic-pae
 Provides: ${xviddriver:Provides}
 Replaces: xserver-xorg (<< 6.8.2-35), nvidia-glx
 Conflicts: nvidia-glx


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1nkrzm-0004nl...@alioth.debian.org

Reply via email to