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

xorg-server: Changes to 'debian-unstable'



 debian/changelog                 |    9 +++++++++
 debian/control                   |    2 +-
 debian/rules                     |    4 +++-
 hw/xfree86/modes/xf86EdidModes.c |    3 ++-
 4 files changed, 15 insertions(+), 3 deletions(-)

New commits:
commit 1ed6406e3b0a87cc9ba105d4b2cc00807115fa9d
Author: Julien Cristau <jcristau@debian.org>
Date:   Fri Nov 30 14:00:53 2007 +0100

    * Cherry-pick commit f30abe30 from master: edid quirk for MAX 0x77e monitor.

diff --git a/debian/changelog b/debian/changelog
index 28337eb..b600ad9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,8 +3,9 @@ xorg-server (2:1.4.1~git20071119-2) UNRELEASED; urgency=low
   * debian/rules: Use lsb_release -i -s to get the vendor name, instead of
     hardcoding "Debian".
   * debian/control: build-dep on lsb-release.
+  * Cherry-pick commit f30abe30 from master: edid quirk for MAX 0x77e monitor.
 
- -- Julien Cristau <jcristau@debian.org>  Fri, 23 Nov 2007 22:14:06 +0100
+ -- Julien Cristau <jcristau@debian.org>  Fri, 30 Nov 2007 14:00:16 +0100
 
 xorg-server (2:1.4.1~git20071119-1) unstable; urgency=low
 
diff --git a/hw/xfree86/modes/xf86EdidModes.c b/hw/xfree86/modes/xf86EdidModes.c
index 8b5e69d..44bff4d 100644
--- a/hw/xfree86/modes/xf86EdidModes.c
+++ b/hw/xfree86/modes/xf86EdidModes.c
@@ -60,7 +60,8 @@ static Bool quirk_prefer_large_60 (int scrnIndex, xf86MonPtr DDC)
 {
     /* Belinea 10 15 55 */
     if (memcmp (DDC->vendor.name, "MAX", 4) == 0 &&
-	DDC->vendor.prod_id == 1516)
+	((DDC->vendor.prod_id == 1516) ||
+	(DDC->vendor.prod_id == 0x77e)))
 	return TRUE;
     
     /* Acer AL1706 */

commit 73c32263aa7b5309092cec4b6e2e93fa71a387be
Author: Julien Cristau <jcristau@debian.org>
Date:   Fri Nov 23 22:15:02 2007 +0100

    Don't hardcode "Debian" as the vendor name.
    
    * debian/rules: Use lsb_release -i -s to get the vendor name, instead of
      hardcoding "Debian".
    * debian/control: build-dep on lsb-release.

diff --git a/debian/changelog b/debian/changelog
index 93abc92..28337eb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+xorg-server (2:1.4.1~git20071119-2) UNRELEASED; urgency=low
+
+  * debian/rules: Use lsb_release -i -s to get the vendor name, instead of
+    hardcoding "Debian".
+  * debian/control: build-dep on lsb-release.
+
+ -- Julien Cristau <jcristau@debian.org>  Fri, 23 Nov 2007 22:14:06 +0100
+
 xorg-server (2:1.4.1~git20071119-1) unstable; urgency=low
 
   * Ship a .orig.tar.gz that's been autoreconf'ed. Closes: #451891
diff --git a/debian/control b/debian/control
index eaf887c..8907850 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Uploaders: David Nusinow <dnusinow@debian.org>, Steve Langasek <vorlon@debian.or
 # x11proto-xf86dri-dev and libdrm-dev are for DRI support for the Xorg server.
 # x11proto-print-dev and libfreetype6-dev are for Xprint
 # everything on is for the DMX and Xnest servers.
-Build-Depends: debhelper (>= 4.0.0), pkg-config, bison, flex,
+Build-Depends: debhelper (>= 4.0.0), lsb-release, pkg-config, bison, flex,
  x11proto-bigreqs-dev, x11proto-composite-dev (>= 1:0.4), x11proto-core-dev (>= 7.0.9),
  x11proto-damage-dev (>= 1.1), x11proto-evie-dev, x11proto-fixes-dev (>= 4.0),
  x11proto-kb-dev (>= 1.0.3), x11proto-xinerama-dev, x11proto-randr-dev (>= 1.2),
diff --git a/debian/rules b/debian/rules
index a474d4f..ab4e4f7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -44,6 +44,8 @@ endif
 
 INSTALL=/usr/bin/install
 
+VENDOR = $(shell lsb_release -i -s)
+
 # disable-static is so we don't get libfoo.a for modules.  now if only we could
 # kill the .las.
 confflags += --disable-static \
@@ -69,7 +71,7 @@ confflags += --disable-static \
 	     --with-xkb-output=/var/lib/xkb \
 	     --enable-xfree86-utils \
 	     --with-os-name="$(shell uname)" \
-	     --with-os-vendor="Debian ($(SOURCE_NAME) $(SOURCE_VERSION))" \
+	     --with-os-vendor="$(VENDOR) ($(SOURCE_NAME) $(SOURCE_VERSION))" \
 	     --with-int10=x86emu \
 	     --disable-type1
 



Reply to: