xserver-xorg-video-nv: Changes to 'debian-unstable'
debian/changelog | 8 ++++++++
debian/control | 2 +-
debian/patches/01_gen_pci_ids.diff | 8 ++++----
debian/rules | 2 +-
src/Makefile.in | 2 +-
5 files changed, 15 insertions(+), 7 deletions(-)
New commits:
commit 3c30b7bbec1f310739ab4bf3f8a1e8d24a782296
Author: David Nusinow <dnusinow@debian.org>
Date: Wed Mar 26 21:01:01 2008 -0400
Exclude .la files on dh_install
diff --git a/debian/changelog b/debian/changelog
index 2d2a3d3..e7e569d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,9 @@ xserver-xorg-video-nv (1:2.1.8-2) unstable; urgency=low
* Add patch from Timo Aaltonen to include some missing PCI ID's
* Bump standards version to 3.7.3. No changes needed.
+ * Exclude .la files on dh_install
- -- David Nusinow <dnusinow@debian.org> Wed, 26 Mar 2008 20:58:15 -0400
+ -- David Nusinow <dnusinow@debian.org> Wed, 26 Mar 2008 20:59:15 -0400
xserver-xorg-video-nv (1:2.1.8-1) unstable; urgency=low
diff --git a/debian/rules b/debian/rules
index 035a8f9..83828c4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -72,7 +72,7 @@ binary-arch: build install serverabi
dh_installdocs
dh_installchangelogs ChangeLog
- dh_install --sourcedir=debian/tmp --list-missing
+ dh_install --sourcedir=debian/tmp --list-missing --exclude=.la
dh_link
dh_strip
dh_compress
commit 77b030506b5420bd02dd530974106a8fa83865bc
Author: David Nusinow <dnusinow@debian.org>
Date: Wed Mar 26 20:58:31 2008 -0400
Bump standards version to 3.7.3. No changes needed.
diff --git a/debian/changelog b/debian/changelog
index bea52b9..2d2a3d3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
xserver-xorg-video-nv (1:2.1.8-2) unstable; urgency=low
* Add patch from Timo Aaltonen to include some missing PCI ID's
+ * Bump standards version to 3.7.3. No changes needed.
- -- David Nusinow <dnusinow@debian.org> Wed, 26 Mar 2008 20:45:29 -0400
+ -- David Nusinow <dnusinow@debian.org> Wed, 26 Mar 2008 20:58:15 -0400
xserver-xorg-video-nv (1:2.1.8-1) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 58bc5f8..de2eb68 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Uploaders: David Nusinow <dnusinow@debian.org>, Julien Cristau <jcristau@debian.org>, Brice Goglin <bgoglin@debian.org>
Build-Depends: debhelper (>= 5.0.0), pkg-config, quilt, xserver-xorg-dev (>= 2:1.4), x11proto-video-dev, x11proto-core-dev, x11proto-fonts-dev, x11proto-randr-dev (>= 1.2), x11proto-render-dev, x11proto-xext-dev
-Standards-Version: 3.7.2.2
+Standards-Version: 3.7.3
XS-Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-nv
XS-Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-nv.git
commit bf169df1557ded8a8277665f6fa7b52b74bf40d6
Author: David Nusinow <dnusinow@debian.org>
Date: Wed Mar 26 20:57:16 2008 -0400
Add patch from Timo Aaltonen to include some missing PCI ID's
diff --git a/debian/changelog b/debian/changelog
index a7796e5..bea52b9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-nv (1:2.1.8-2) unstable; urgency=low
+
+ * Add patch from Timo Aaltonen to include some missing PCI ID's
+
+ -- David Nusinow <dnusinow@debian.org> Wed, 26 Mar 2008 20:45:29 -0400
+
xserver-xorg-video-nv (1:2.1.8-1) unstable; urgency=low
* New upstream release.
diff --git a/debian/patches/01_gen_pci_ids.diff b/debian/patches/01_gen_pci_ids.diff
index 5b1fe10..f23512d 100644
--- a/debian/patches/01_gen_pci_ids.diff
+++ b/debian/patches/01_gen_pci_ids.diff
@@ -1,8 +1,8 @@
Index: xserver-xorg-video-nv/src/Makefile.am
===================================================================
---- xserver-xorg-video-nv.orig/src/Makefile.am 2007-08-19 12:15:48.000000000 -0400
-+++ xserver-xorg-video-nv/src/Makefile.am 2007-08-19 12:16:58.000000000 -0400
-@@ -104,3 +104,9 @@
+--- xserver-xorg-video-nv.orig/src/Makefile.am 2008-03-26 20:47:57.000000000 -0400
++++ xserver-xorg-video-nv/src/Makefile.am 2008-03-26 20:53:20.000000000 -0400
+@@ -103,3 +103,9 @@
EXTRA_nv_drv_la_SOURCES = local_xf86Rename.h
nodist_nv_drv_la_SOURCES = $(xmode_sources)
endif
@@ -11,4 +11,4 @@ Index: xserver-xorg-video-nv/src/Makefile.am
+pcidata_DATA = nv.ids
+
+nv.ids : nv_driver.c
-+ awk '/{ 0x.*/ {print $$2}' ${srcdir}/nv_driver.c | sed -e s/0x// -e s/,// > nv.ids
++ 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
diff --git a/src/Makefile.in b/src/Makefile.in
index 5cc8fe1..09b6902 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.*/ {print $$2}' ${srcdir}/nv_driver.c | sed -e s/0x// -e s/,// > nv.ids
+ 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
# 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: