debian/changelog |    5 +++++
 debian/rules     |    2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

New commits:
commit 41d172ec545dcf335e2e9c673a99f5df7e89b509
Author: Christopher James Halse Rogers <christopher.halse.rog...@canonical.com>
Date:   Wed May 19 20:24:31 2010 +1000

    Ensure Intel (and sis and unichrome) drivers acutally build on i386 - 
Maverick has i686, not i486 as DEB_HOST_GNU_CPU

diff --git a/debian/changelog b/debian/changelog
index bdfa7b7..79eabcd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -36,6 +36,8 @@ mesa (7.8.1-1ubuntu1) UNRELEASED; urgency=low
   * debian/rules
     - Add get-orig-source target to document the way the orig.tar.gz is
       generated.
+    - The i386 architecture for Maverick is now i686, not i486.  Adapt rules
+      so that the Intel DRI drivers are actually built.
 
  -- Christopher James Halse Rogers <r...@ubuntu.com>  Wed, 19 May 2010 
14:47:25 +1000
 
diff --git a/debian/rules b/debian/rules
index 063c646..435154a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -71,7 +71,7 @@ else
        DRI_DRIVERS += i915 i965
   else ifneq ($(DEB_HOST_ARCH), s390)
        DRI_DRIVERS += mga r128 r200 r300 r600 radeon savage tdfx
-    ifeq ($(DEB_HOST_GNU_CPU), i486)
+    ifeq ($(DEB_HOST_GNU_CPU), i686)
        DRI_DRIVERS += i810 i915 i965 sis unichrome
     else ifeq ($(DEB_HOST_GNU_CPU), x86_64)
        DRI_DRIVERS += i915 i965 sis unichrome

commit 651ff253695571ebe3c16c12be3d410f1c6d071d
Author: Christopher James Halse Rogers <christopher.halse.rog...@canonical.com>
Date:   Wed May 19 20:20:28 2010 +1000

    Add changelog ently for get-orig-source

diff --git a/debian/changelog b/debian/changelog
index 671feff..bdfa7b7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -33,6 +33,9 @@ mesa (7.8.1-1ubuntu1) UNRELEASED; urgency=low
     - Refresh for driCreateConfigs API change
   * debian/gbp.conf
     - Set debian-branch=ubuntu to make git-buildpackage less annoying
+  * debian/rules
+    - Add get-orig-source target to document the way the orig.tar.gz is
+      generated.
 
  -- Christopher James Halse Rogers <r...@ubuntu.com>  Wed, 19 May 2010 
14:47:25 +1000
 


-- 
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/e1oehs3-00042m...@alioth.debian.org

Reply via email to