[pkg-nvidia-devel] r1041 - in /packages/nvidia-graphics-drivers/trunk/debian: changelog nvidia-glx.install.in nvidia.ids rules
anbe-guest at users.alioth.debian.org
anbe-guest at users.alioth.debian.org
Mon Jun 7 00:49:21 UTC 2010
Author: anbe-guest
Date: Mon Jun 7 00:49:06 2010
New Revision: 1041
URL: http://svn.debian.org/wsvn/pkg-nvidia/?sc=1&rev=1041
Log:
provide /usr/share/xserver-xorg/pci/nvidia.ids
Added:
packages/nvidia-graphics-drivers/trunk/debian/nvidia.ids
Modified:
packages/nvidia-graphics-drivers/trunk/debian/changelog
packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.install.in
packages/nvidia-graphics-drivers/trunk/debian/rules
Modified: packages/nvidia-graphics-drivers/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/changelog?rev=1041&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/changelog (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/changelog Mon Jun 7 00:49:06 2010
@@ -50,6 +50,7 @@
way
* nvidia-glx: add Conflicts: fglrx-glx
* overhaul maintainer scripts
+ * nvidia-glx: add /usr/share/xserver-xorg/pci/nvidia.ids (closes: #483821)
-- Russ Allbery <rra at debian.org> Wed, 26 May 2010 07:19:43 -0700
Modified: packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.install.in
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.install.in?rev=1041&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.install.in (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.install.in Mon Jun 7 00:49:06 2010
@@ -7,3 +7,4 @@
usr/X11R6/lib/libXvMCNVIDIA.so.#VERSION# usr/lib/
usr/X11R6/lib/modules/drivers/nvidia_drv.so usr/lib/xorg/modules/drivers/
usr/X11R6/lib/modules/extensions/libglx.so.#VERSION# usr/lib/xorg/modules/extensions/
+debian/nvidia.ids usr/share/xserver-xorg/pci/
Added: packages/nvidia-graphics-drivers/trunk/debian/nvidia.ids
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/nvidia.ids?rev=1041&op=file
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/nvidia.ids (added)
+++ packages/nvidia-graphics-drivers/trunk/debian/nvidia.ids Mon Jun 7 00:49:06 2010
@@ -1,0 +1,352 @@
+10DE0040
+10DE0041
+10DE0042
+10DE0043
+10DE0044
+10DE0045
+10DE0046
+10DE0047
+10DE0048
+10DE0090
+10DE0091
+10DE0092
+10DE0093
+10DE0095
+10DE0098
+10DE0099
+10DE00C0
+10DE00C1
+10DE00C2
+10DE00C3
+10DE00C8
+10DE00C9
+10DE00F1
+10DE00F2
+10DE00F3
+10DE00F4
+10DE00F5
+10DE00F6
+10DE00F9
+10DE0140
+10DE0141
+10DE0142
+10DE0143
+10DE0144
+10DE0145
+10DE0146
+10DE0147
+10DE0148
+10DE0149
+10DE014F
+10DE0160
+10DE0161
+10DE0162
+10DE0163
+10DE0164
+10DE0166
+10DE0167
+10DE0168
+10DE0169
+10DE016A
+10DE0191
+10DE0193
+10DE0194
+10DE0197
+10DE01D0
+10DE01D1
+10DE01D2
+10DE01D3
+10DE01D6
+10DE01D7
+10DE01D8
+10DE01DD
+10DE01DF
+10DE0221
+10DE0222
+10DE0240
+10DE0241
+10DE0242
+10DE0244
+10DE0247
+10DE0290
+10DE0291
+10DE0292
+10DE0293
+10DE0294
+10DE0295
+10DE0297
+10DE0298
+10DE02E0
+10DE02E1
+10DE02E2
+10DE02E3
+10DE02E4
+10DE038B
+10DE0390
+10DE0391
+10DE0392
+10DE0393
+10DE0394
+10DE0395
+10DE0397
+10DE0398
+10DE0399
+10DE03D0
+10DE03D1
+10DE03D2
+10DE03D5
+10DE03D6
+10DE0400
+10DE0401
+10DE0402
+10DE0403
+10DE0404
+10DE0405
+10DE0406
+10DE0407
+10DE0408
+10DE0409
+10DE0410
+10DE0420
+10DE0421
+10DE0422
+10DE0423
+10DE0424
+10DE0425
+10DE0426
+10DE0427
+10DE0428
+10DE042C
+10DE042E
+10DE0531
+10DE0533
+10DE053A
+10DE053B
+10DE053E
+10DE05E0
+10DE05E1
+10DE05E2
+10DE05E3
+10DE05E6
+10DE05E7
+10DE05EA
+10DE05EB
+10DE0600
+10DE0601
+10DE0602
+10DE0603
+10DE0604
+10DE0605
+10DE0606
+10DE0607
+10DE0608
+10DE0609
+10DE060A
+10DE060B
+10DE060C
+10DE060D
+10DE060F
+10DE0610
+10DE0611
+10DE0612
+10DE0613
+10DE0614
+10DE0615
+10DE0617
+10DE0618
+10DE0622
+10DE0623
+10DE0625
+10DE0626
+10DE0627
+10DE0628
+10DE062A
+10DE062B
+10DE062C
+10DE062D
+10DE062E
+10DE0631
+10DE0632
+10DE0635
+10DE0637
+10DE0640
+10DE0641
+10DE0643
+10DE0644
+10DE0645
+10DE0646
+10DE0647
+10DE0648
+10DE0649
+10DE064A
+10DE064B
+10DE064C
+10DE0651
+10DE0652
+10DE0653
+10DE0654
+10DE0656
+10DE065B
+10DE06C0
+10DE06CD
+10DE06D1
+10DE06E0
+10DE06E1
+10DE06E2
+10DE06E3
+10DE06E4
+10DE06E5
+10DE06E6
+10DE06E7
+10DE06E8
+10DE06E9
+10DE06EC
+10DE06EF
+10DE06F1
+10DE07E0
+10DE07E1
+10DE07E2
+10DE07E3
+10DE07E5
+10DE0844
+10DE0845
+10DE0846
+10DE0847
+10DE0848
+10DE0849
+10DE084A
+10DE084B
+10DE084C
+10DE084D
+10DE084F
+10DE0860
+10DE0861
+10DE0862
+10DE0863
+10DE0864
+10DE0865
+10DE0866
+10DE0867
+10DE0868
+10DE086A
+10DE086C
+10DE086D
+10DE086E
+10DE086F
+10DE0870
+10DE0871
+10DE0872
+10DE0873
+10DE0874
+10DE0876
+10DE087A
+10DE087D
+10DE087E
+10DE087F
+10DE0A20
+10DE0A23
+10DE0A28
+10DE0A29
+10DE0A2A
+10DE0A2B
+10DE0A2D
+10DE0A34
+10DE0A35
+10DE0A60
+10DE0A62
+10DE0A63
+10DE0A64
+10DE0A65
+10DE0A66
+10DE0A68
+10DE0A69
+10DE0A6E
+10DE0A6F
+10DE0A70
+10DE0A71
+10DE0A72
+10DE0A73
+10DE0A74
+10DE0A75
+10DE0CA0
+10DE0CA2
+10DE0CA3
+10DE0CA4
+10DE0CA7
+10DE0CA8
+10DE0CA9
+10DE0CAF
+10DE0CB0
+10DE0CB1
+10DE004E
+10DE009D
+10DE00CC
+10DE00CD
+10DE00CE
+10DE00F8
+10DE014A
+10DE014C
+10DE014D
+10DE014E
+10DE0165
+10DE019D
+10DE019E
+10DE01DA
+10DE01DB
+10DE01DC
+10DE01DE
+10DE0245
+10DE0299
+10DE029A
+10DE029B
+10DE029C
+10DE029D
+10DE029E
+10DE029F
+10DE039C
+10DE039E
+10DE040A
+10DE040B
+10DE040C
+10DE040D
+10DE040E
+10DE040F
+10DE0429
+10DE042A
+10DE042B
+10DE042D
+10DE042F
+10DE05ED
+10DE05F8
+10DE05F9
+10DE05FD
+10DE05FE
+10DE05FF
+10DE0619
+10DE061A
+10DE061B
+10DE061C
+10DE061D
+10DE061E
+10DE061F
+10DE0638
+10DE063A
+10DE0658
+10DE0659
+10DE065A
+10DE065C
+10DE06EA
+10DE06EB
+10DE06F8
+10DE06F9
+10DE06FA
+10DE06FB
+10DE06FD
+10DE06FF
+10DE0A2C
+10DE0A3C
+10DE0A6A
+10DE0A6C
+10DE0A78
+10DE0A7C
+10DE0CBC
Modified: packages/nvidia-graphics-drivers/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/rules?rev=1041&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/rules (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/rules Mon Jun 7 00:49:06 2010
@@ -34,9 +34,9 @@
module_tbz = $(subst /modules/,/,$(module_source)).tar.bz2
dkms_source = debian/nvidia-kernel$(legacy)-dkms/usr/src/nvidia-$(version)
-.PHONY: autogen configure
+.PHONY: autogen prepare
autogen: $(AUTOGEN)
-configure: autogen unpack-stamp
+prepare: autogen unpack-stamp nvidia.ids
unpack-stamp: ${filename_x86} ${filename_x86_64}
@@ -49,6 +49,16 @@
ls -al
touch $@
+nvidia.ids: unpack-stamp
+ sed -e '/^A1/,/^Below/{/ 0x/s/.* 0x\([0-9a-fA-F]\{4\}\).*/10DE\1/p};d' \
+ NVIDIA-Linux-$(DEB_HOST_ARCH)/usr/share/doc/README.txt \
+ > $@
+ if ! cmp -s debian/nvidia.ids nvidia.ids ; then \
+ diff -u debian/nvidia.ids nvidia.ids || true ; \
+ echo "*** Supported PCI IDs have changed. See diff above. Aborting. ***"; \
+ exit 1 ; \
+ fi
+
.PHONY: binary binary-arch binary-indep build clean install
binary binary-arch binary-indep build clean install:
@@ -58,13 +68,14 @@
rm -f NVIDIA-Linux-i386 NVIDIA-Linux-amd64
rm -fr $(dirname_x86) $(dirname_x86_64)
rm -fr debian/temp
+ rm -f nvidia.ids
override_dh_clean:
dh_clean
rm -f $(AUTOCLEAN)
$(MAKE) -f debian/rules $(AUTOKEEP)
-override_dh_auto_configure: configure
+override_dh_auto_configure: prepare
# Build two kernel module source tarballs for use with
# - module-assistant and make-kpkg
More information about the Pkg-nvidia-devel
mailing list