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

xserver-xorg-video-nv: Changes to 'debian-unstable'



 debian/changelog                   |    6 ++++++
 debian/patches/01_gen_pci_ids.diff |    2 +-
 src/Makefile.in                    |    2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)

New commits:
commit b4d526c9337269813136990b1aa801d32c80fcbc
Author: Timo Aaltonen <tjaalton@cc.hut.fi>
Date:   Thu Mar 27 19:16:10 2008 +0200

    Fix the PCI ID one-liner to use 'sort -u'.

diff --git a/debian/changelog b/debian/changelog
index e7e569d..799de35 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-nv (1:2.1.8-3) UNRELEASED; urgency=low
+
+  * Fix the PCI ID one-liner to use 'sort -u'.
+
+ -- Timo Aaltonen <tjaalton@cc.hut.fi>  Thu, 27 Mar 2008 19:14:49 +0200
+
 xserver-xorg-video-nv (1:2.1.8-2) unstable; urgency=low
 
   * Add patch from Timo Aaltonen to include some missing PCI ID's
diff --git a/debian/patches/01_gen_pci_ids.diff b/debian/patches/01_gen_pci_ids.diff
index f23512d..9abc542 100644
--- a/debian/patches/01_gen_pci_ids.diff
+++ b/debian/patches/01_gen_pci_ids.diff
@@ -11,4 +11,4 @@ Index: xserver-xorg-video-nv/src/Makefile.am
 +pcidata_DATA = nv.ids
 +
 +nv.ids : nv_driver.c
-+	awk '/{ 0x.*/ || /case 0x.*/ {print $$2}' ${srcdir}/nv_driver.c | sed -e s/0x// -e s/,// -e s/:// -e s/^0/10DE0/ | uniq | sort > nv.ids
++	awk '/{ 0x.*/ || /case 0x.*/ {print $$2}' ${srcdir}/nv_driver.c | sed -e s/0x// -e s/,// -e s/:// -e s/^0/10DE0/ | sort -u > nv.ids
diff --git a/src/Makefile.in b/src/Makefile.in
index 09b6902..c8ad228 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -721,7 +721,7 @@ uninstall-am: uninstall-nv_drv_laLTLIBRARIES uninstall-pcidataDATA
 
 
 nv.ids : nv_driver.c
-	awk '/{ 0x.*/ || /case 0x.*/ {print $$2}' ${srcdir}/nv_driver.c | sed -e s/0x// -e s/,// -e s/:// -e s/^0/10DE0/ | uniq | sort > nv.ids
+	awk '/{ 0x.*/ || /case 0x.*/ {print $$2}' ${srcdir}/nv_driver.c | sed -e s/0x// -e s/,// -e s/:// -e s/^0/10DE0/ | sort -u > nv.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:


Reply to: