New upstream snapshot

6 files changed, 26 insertions, 13 deletions

diff --git a/aclocal.m4 b/aclocal.m4
index cdb0a74..2ab5fdd 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -18,7 +18,7 @@ you should regenerate the build system entirely.], [63])])
 
 # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
 
-# serial 51 Debian 1.5.24-1 AC_PROG_LIBTOOL
+# serial 51 Debian 1.5.24-2 AC_PROG_LIBTOOL
 
 
 # AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
diff --git a/configure b/configure
index 469bc26..daa3f53 100755
--- a/configure
+++ b/configure
@@ -21053,7 +21053,7 @@ _ACEOF
 fi
 
 
-if test "x$DRI" = xauto; then
+if test "$DRI" != no; then
 	as_ac_File=`echo "ac_cv_file_${sdkdir}/dri.h" | $as_tr_sh`
 { echo "$as_me:$LINENO: checking for ${sdkdir}/dri.h" >&5
 echo $ECHO_N "checking for ${sdkdir}/dri.h... $ECHO_C" >&6; }
diff --git a/debian/changelog b/debian/changelog
index 75623d0..cd2a104 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+xserver-xorg-video-ati (1:6.7.196-2) UNRELEASED; urgency=low
+
+  * New upstream snapshot, containing commits up to 5022d006.
+    + Fix the washed out color, closes: #440174.
+    + Update 01_gen_pci_ids.diff to use the new ati_pciids_gen.h.
+
+ -- Brice Goglin <bgoglin@debian.org>  Mon, 03 Dec 2007 21:22:13 +0100
+
 xserver-xorg-video-ati (1:6.7.196-1) experimental; urgency=low
 
   * New upstream release candidate.
diff --git a/debian/patches/01_gen_pci_ids.diff b/debian/patches/01_gen_pci_ids.diff
index 0bd0d92..f2e5606 100644
--- a/debian/patches/01_gen_pci_ids.diff
+++ b/debian/patches/01_gen_pci_ids.diff
@@ -6,13 +6,13 @@ Index: xserver-xorg-video-ati/src/Makefile.am
 ===================================================================
 --- xserver-xorg-video-ati.orig/src/Makefile.am	2007-10-06 02:44:47.000000000 +0200
 +++ xserver-xorg-video-ati/src/Makefile.am	2007-10-06 02:48:34.000000000 +0200
-@@ -192,3 +192,9 @@
- 	theatre_reg.h \
- 	atipciids.h \
- 	atipcirename.h
+@@ -197,3 +197,9 @@
+ 	radeon_pci_chipset_gen.h \
+ 	pcidb/ati_pciids.csv \
+ 	pcidb/parse_pci_ids.pl
 +
 +pcidatadir = $(datadir)/xserver-xorg/pci
 +pcidata_DATA = ati.ids
 +
-+ati.ids: atipciids.h
-+	awk '/^#define.*PCI_CHIP/ {print $$3}' ${srcdir}/atipciids.h | sed -e 's/0x/1002/' > ati.ids
++ati.ids: ati_pciids_gen.h
++	awk '/^#define.*PCI_CHIP/ {print $$3}' ${srcdir}/ati_pciids_gen.h | sed -e 's/0x/1002/' > ati.ids
diff --git a/ltmain.sh b/ltmain.sh
index f924d30..13c5494 100644
--- a/ltmain.sh
+++ b/ltmain.sh
@@ -43,7 +43,7 @@ EXIT_FAILURE=1
 
 PROGRAM=ltmain.sh
 PACKAGE=libtool
-VERSION="1.5.24 Debian 1.5.24-1"
+VERSION="1.5.24 Debian 1.5.24-2"
 TIMESTAMP=" (1.1220.2.456 2007/06/24 02:25:32)"
 
 # Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE).
diff --git a/src/Makefile.in b/src/Makefile.in
index a68ef76..8470c74 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -470,7 +470,6 @@ EXTRA_DIST = \
 	r128_reg.h \
 	r128_sarea.h \
 	r128_version.h \
-	radeon_chipset.h \
 	radeon_common.h \
 	radeon_commonfuncs.c \
 	radeon_dri.h \
@@ -490,7 +489,13 @@ EXTRA_DIST = \
 	theatre.h \
 	theatre_reg.h \
 	atipciids.h \
-	atipcirename.h
+	atipcirename.h \
+	ati_pciids_gen.h \
+	radeon_chipinfo_gen.h \
+	radeon_chipset_gen.h \
+	radeon_pci_chipset_gen.h \
+	pcidb/ati_pciids.csv \
+	pcidb/parse_pci_ids.pl
 
 pcidatadir = $(datadir)/xserver-xorg/pci
 pcidata_DATA = ati.ids
@@ -1081,8 +1086,8 @@ uninstall-am: uninstall-ati_drv_laLTLIBRARIES \
 	uninstall-theatre_drv_laLTLIBRARIES
 
 
-ati.ids: atipciids.h
-	awk '/^#define.*PCI_CHIP/ {print $$3}' ${srcdir}/atipciids.h | sed -e 's/0x/1002/' > ati.ids
+ati.ids: ati_pciids_gen.h
+	awk '/^#define.*PCI_CHIP/ {print $$3}' ${srcdir}/ati_pciids_gen.h | sed -e 's/0x/1002/' > ati.ids
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT: