debian/changelog | 7 +++++++
debian/patches/01_gen_pci_ids.diff | 4 ++--
src/Makefile.in | 4 ++--
3 files changed, 11 insertions(+), 4 deletions(-)
New commits:
commit e018ddf93e73a65dd73ac8eba20925ad818d8a5f
Author: Brice Goglin <[EMAIL PROTECTED]>
Date: Mon Jun 16 14:13:19 2008 +0200
Fix 01_gen_pci_ids.diff to drop cyrix ids instead of the ns ones
diff --git a/debian/changelog b/debian/changelog
index 2680480..4e7c7b7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xserver-xorg-video-nsc (1:2.8.3-4) unstable; urgency=low
+
+ * Fix 01_gen_pci_ids.diff to drop cyrix ids instead of the ns ones,
+ closes: #483699.
+
+ -- Brice Goglin <[EMAIL PROTECTED]> Mon, 16 Jun 2008 14:10:24 +0200
+
xserver-xorg-video-nsc (1:2.8.3-3) unstable; urgency=low
* Work-around the upstream driver claiming support for hardware
diff --git a/debian/patches/01_gen_pci_ids.diff
b/debian/patches/01_gen_pci_ids.diff
index d7a54d8..d9abfd7 100644
--- a/debian/patches/01_gen_pci_ids.diff
+++ b/debian/patches/01_gen_pci_ids.diff
@@ -29,5 +29,5 @@ Index: xserver-xorg-video-nsc/src/Makefile.am
+pcidata_DATA = nsc.ids
+
+nsc.ids: nsc_driver.c
-+ awk '/^#define.*PCI_CHIP/ {print $$3}' ${srcdir}/nsc_driver.c | sort -u
| grep -v 0030 | sed -e 's/0x/1078/' > nsc.ids
-+# awk '/^#define.*PCI_CHIP/ {print $$3}' ${srcdir}/nsc_driver.c | sort -u
| grep -v 0030 | sed -e 's/0x/100B/' >> nsc.ids
++ awk '/^#define.*PCI_CHIP/ {print $$3}' ${srcdir}/nsc_driver.c | sort -u
| grep -v 0030 | sed -e 's/0x/100B/' > nsc.ids
++# awk '/^#define.*PCI_CHIP/ {print $$3}' ${srcdir}/nsc_driver.c | sort -u
| grep -v 0030 | sed -e 's/0x/1078/' >> nsc.ids
diff --git a/src/Makefile.in b/src/Makefile.in
index 08c2c7e..a0f639f 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -664,8 +664,8 @@ uninstall-am: uninstall-nsc_drv_laLTLIBRARIES
uninstall-pcidataDATA
nsc.ids: nsc_driver.c
- awk '/^#define.*PCI_CHIP/ {print $$3}' ${srcdir}/nsc_driver.c | sort -u
| grep -v 0030 | sed -e 's/0x/1078/' > nsc.ids
-# awk '/^#define.*PCI_CHIP/ {print $$3}' ${srcdir}/nsc_driver.c | sort -u
| grep -v 0030 | sed -e 's/0x/100B/' >> nsc.ids
+ awk '/^#define.*PCI_CHIP/ {print $$3}' ${srcdir}/nsc_driver.c | sort -u
| grep -v 0030 | sed -e 's/0x/100B/' > nsc.ids
+# awk '/^#define.*PCI_CHIP/ {print $$3}' ${srcdir}/nsc_driver.c | sort -u
| grep -v 0030 | sed -e 's/0x/1078/' >> nsc.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:
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
