xserver-xorg-video-nv: Changes to 'debian-unstable'
debian/changelog | 31 ++++++++++++++++++++++++
debian/control | 4 +--
debian/copyright | 3 ++
debian/patches/01_gen_pci_ids.diff | 14 ++++++++++
debian/patches/series | 1
debian/rules | 4 +--
debian/xserver-xorg-video-nv.install | 1
src/Makefile.in | 45 ++++++++++++++++++++++++++++-------
8 files changed, 90 insertions(+), 13 deletions(-)
New commits:
commit 0a41db100c7b562895b82516ff9a974532e3c83f
Author: David Nusinow <dnusinow@debian.org>
Date: Sun Sep 16 16:18:38 2007 -0400
* Upload to unstable
diff --git a/debian/changelog b/debian/changelog
index b1115c6..cb40e69 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-nv (1:2.1.3-5) unstable; urgency=low
+
+ * Upload to unstable
+
+ -- David Nusinow <dnusinow@debian.org> Sun, 16 Sep 2007 15:43:46 -0400
+
xserver-xorg-video-nv (1:2.1.3-4) experimental; urgency=low
* Build against xserver 1.4.
commit 3d0a32f0567a5304ad725563e5093efb7e5b3f3b
Author: Brice Goglin <bgoglin@debian.org>
Date: Thu Sep 13 23:02:48 2007 +0200
Build against xserver 1.4
diff --git a/debian/changelog b/debian/changelog
index 1313fd6..b1115c6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+xserver-xorg-video-nv (1:2.1.3-4) experimental; urgency=low
+
+ * Build against xserver 1.4.
+ * Add upstream URL to debian/copyright.
+ * Add myself to Uploaders.
+
+ -- Brice Goglin <bgoglin@debian.org> Thu, 13 Sep 2007 23:00:29 +0200
+
xserver-xorg-video-nv (1:2.1.3-3) experimental; urgency=low
* Add quilt to build-depends
diff --git a/debian/control b/debian/control
index b2637ad..58bc5f8 100644
--- a/debian/control
+++ b/debian/control
@@ -2,8 +2,8 @@ Source: xserver-xorg-video-nv
Section: x11
Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
-Uploaders: David Nusinow <dnusinow@debian.org>, Julien Cristau <jcristau@debian.org>
-Build-Depends: debhelper (>= 5.0.0), pkg-config, quilt, xserver-xorg-dev (>= 2:1.3.99.0), x11proto-video-dev, x11proto-core-dev, x11proto-fonts-dev, x11proto-randr-dev (>= 1.2), x11proto-render-dev, x11proto-xext-dev
+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
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
diff --git a/debian/copyright b/debian/copyright
index cad7191..86b6bf3 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,3 +1,6 @@
+This package was downloaded from
+http://xorg.freedesktop.org/releases/individual/driver/
+
Copyright (c) 2007 NVIDIA, Corporation
Permission is hereby granted, free of charge, to any person obtaining a
commit 3e445c51d9308ed3bae7e986cc09190ee7f6531b
Author: David Nusinow <dnusinow@debian.org>
Date: Sun Aug 19 15:03:11 2007 -0400
Add quilt to build-depends
diff --git a/debian/changelog b/debian/changelog
index e803338..1313fd6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-nv (1:2.1.3-3) experimental; urgency=low
+
+ * Add quilt to build-depends
+
+ -- David Nusinow <dnusinow@debian.org> Sun, 19 Aug 2007 15:02:48 -0400
+
xserver-xorg-video-nv (1:2.1.3-2) experimental; urgency=low
* Build against X server 1.3.99.0 (build-dep on it)
diff --git a/debian/control b/debian/control
index 58d6478..b2637ad 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: x11
Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Uploaders: David Nusinow <dnusinow@debian.org>, Julien Cristau <jcristau@debian.org>
-Build-Depends: debhelper (>= 5.0.0), pkg-config, xserver-xorg-dev (>= 2:1.3.99.0), x11proto-video-dev, x11proto-core-dev, x11proto-fonts-dev, x11proto-randr-dev (>= 1.2), x11proto-render-dev, x11proto-xext-dev
+Build-Depends: debhelper (>= 5.0.0), pkg-config, quilt, xserver-xorg-dev (>= 2:1.3.99.0), 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
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 67b0b4a70ab5ab044eeef23e3ec78ceef7b8daee
Author: David Nusinow <dnusinow@debian.org>
Date: Sun Aug 19 12:23:00 2007 -0400
Add 01_gen_pci_ids.diff.
This will ship a set of pci ids that this driver supports so that the
server can automatically load it under the right conditions.
+ Enable our patch system in debian/rules
+ autoreconf because this patch touches src/Makefile.am
diff --git a/debian/changelog b/debian/changelog
index ea274bb..e803338 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,13 @@
xserver-xorg-video-nv (1:2.1.3-2) experimental; urgency=low
* Build against X server 1.3.99.0 (build-dep on it)
+ * Add 01_gen_pci_ids.diff. This will ship a set of pci ids that this driver
+ supports so that the server can automatically load it under the right
+ conditions.
+ + Enable our patch system in debian/rules
+ + autoreconf because this patch touches src/Makefile.am
- -- David Nusinow <dnusinow@debian.org> Sun, 19 Aug 2007 11:51:00 -0400
+ -- David Nusinow <dnusinow@debian.org> Sun, 19 Aug 2007 12:20:31 -0400
xserver-xorg-video-nv (1:2.1.3-1) unstable; urgency=low
diff --git a/debian/patches/01_gen_pci_ids.diff b/debian/patches/01_gen_pci_ids.diff
new file mode 100644
index 0000000..5b1fe10
--- /dev/null
+++ b/debian/patches/01_gen_pci_ids.diff
@@ -0,0 +1,14 @@
+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 @@
+ EXTRA_nv_drv_la_SOURCES = local_xf86Rename.h
+ nodist_nv_drv_la_SOURCES = $(xmode_sources)
+ endif
++
++pcidatadir = $(datadir)/xserver-xorg/pci
++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
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..b55d79f
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+01_gen_pci_ids.diff
diff --git a/debian/rules b/debian/rules
index 5603d55..035a8f9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -31,7 +31,7 @@ endif
# kbd_drv.a isn't phenomenally useful; kbd_drv.so more so
confflags += --disable-static
-build: build-stamp
+build: patch build-stamp
build-stamp:
dh_testdir
@@ -44,7 +44,7 @@ build-stamp:
touch build-stamp
-clean:
+clean: xsfclean
dh_testdir
dh_testroot
rm -f build-stamp
diff --git a/debian/xserver-xorg-video-nv.install b/debian/xserver-xorg-video-nv.install
index 614cfb4..8a9f4ba 100644
--- a/debian/xserver-xorg-video-nv.install
+++ b/debian/xserver-xorg-video-nv.install
@@ -1,2 +1,3 @@
usr/lib/xorg/modules/drivers/*.so
usr/share/man/man4/*
+usr/share/xserver-xorg/pci/*
diff --git a/src/Makefile.in b/src/Makefile.in
index 977b225..e951501 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -34,6 +34,7 @@
# IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@ -67,7 +68,8 @@ am__vpath_adj = case $$p in \
*) f=$$p;; \
esac;
am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-am__installdirs = "$(DESTDIR)$(nv_drv_ladir)"
+am__installdirs = "$(DESTDIR)$(nv_drv_ladir)" \
+ "$(DESTDIR)$(pcidatadir)"
nv_drv_laLTLIBRARIES_INSTALL = $(INSTALL)
LTLIBRARIES = $(nv_drv_la_LTLIBRARIES)
nv_drv_la_LIBADD =
@@ -104,6 +106,8 @@ SOURCES = $(nv_drv_la_SOURCES) $(EXTRA_nv_drv_la_SOURCES) \
$(nodist_nv_drv_la_SOURCES)
DIST_SOURCES = $(nv_drv_la_SOURCES) \
$(am__EXTRA_nv_drv_la_SOURCES_DIST)
+pcidataDATA_INSTALL = $(INSTALL_DATA)
+DATA = $(pcidata_DATA)
ETAGS = etags
CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -317,6 +321,8 @@ xmode_sources = \
@BUILD_XMODES_TRUE@EXTRA_nv_drv_la_SOURCES = local_xf86Rename.h
@BUILD_XMODES_TRUE@nodist_nv_drv_la_SOURCES = $(xmode_sources)
+pcidatadir = $(datadir)/xserver-xorg/pci
+pcidata_DATA = nv.ids
all: all-am
.SUFFIXES:
@@ -503,6 +509,23 @@ mostlyclean-libtool:
clean-libtool:
-rm -rf .libs _libs
+install-pcidataDATA: $(pcidata_DATA)
+ @$(NORMAL_INSTALL)
+ test -z "$(pcidatadir)" || $(MKDIR_P) "$(DESTDIR)$(pcidatadir)"
+ @list='$(pcidata_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ f=$(am__strip_dir) \
+ echo " $(pcidataDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(pcidatadir)/$$f'"; \
+ $(pcidataDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(pcidatadir)/$$f"; \
+ done
+
+uninstall-pcidataDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(pcidata_DATA)'; for p in $$list; do \
+ f=$(am__strip_dir) \
+ echo " rm -f '$(DESTDIR)$(pcidatadir)/$$f'"; \
+ rm -f "$(DESTDIR)$(pcidatadir)/$$f"; \
+ done
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
@@ -580,9 +603,9 @@ distdir: $(DISTFILES)
done
check-am: all-am
check: check-am
-all-am: Makefile $(LTLIBRARIES)
+all-am: Makefile $(LTLIBRARIES) $(DATA)
installdirs:
- for dir in "$(DESTDIR)$(nv_drv_ladir)"; do \
+ for dir in "$(DESTDIR)$(nv_drv_ladir)" "$(DESTDIR)$(pcidatadir)"; do \
test -z "$$dir" || $(MKDIR_P) "$$dir"; \
done
install: install-am
@@ -630,7 +653,7 @@ info: info-am
info-am:
-install-data-am: install-nv_drv_laLTLIBRARIES
+install-data-am: install-nv_drv_laLTLIBRARIES install-pcidataDATA
install-dvi: install-dvi-am
@@ -666,7 +689,7 @@ ps: ps-am
ps-am:
-uninstall-am: uninstall-nv_drv_laLTLIBRARIES
+uninstall-am: uninstall-nv_drv_laLTLIBRARIES uninstall-pcidataDATA
.MAKE: install-am install-strip
@@ -677,13 +700,17 @@ uninstall-am: uninstall-nv_drv_laLTLIBRARIES
install install-am install-data install-data-am install-dvi \
install-dvi-am install-exec install-exec-am install-html \
install-html-am install-info install-info-am install-man \
- install-nv_drv_laLTLIBRARIES install-pdf install-pdf-am \
- install-ps install-ps-am install-strip installcheck \
- installcheck-am installdirs maintainer-clean \
+ install-nv_drv_laLTLIBRARIES install-pcidataDATA install-pdf \
+ install-pdf-am install-ps install-ps-am install-strip \
+ installcheck installcheck-am installdirs maintainer-clean \
maintainer-clean-generic mostlyclean mostlyclean-compile \
mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
- tags uninstall uninstall-am uninstall-nv_drv_laLTLIBRARIES
+ tags uninstall 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
# 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:
commit da08f16ba841a3c0dc1d26f79c9a46f1a0f6d2a5
Author: David Nusinow <dnusinow@debian.org>
Date: Sun Aug 19 11:53:57 2007 -0400
Build against server 1.3.99.0 and build-dep on it as well
diff --git a/debian/changelog b/debian/changelog
index 2003aa8..ea274bb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-nv (1:2.1.3-2) experimental; urgency=low
+
+ * Build against X server 1.3.99.0 (build-dep on it)
+
+ -- David Nusinow <dnusinow@debian.org> Sun, 19 Aug 2007 11:51:00 -0400
+
xserver-xorg-video-nv (1:2.1.3-1) unstable; urgency=low
[ Julien Cristau ]
diff --git a/debian/control b/debian/control
index 2a87cde..58d6478 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: x11
Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Uploaders: David Nusinow <dnusinow@debian.org>, Julien Cristau <jcristau@debian.org>
-Build-Depends: debhelper (>= 5.0.0), pkg-config, xserver-xorg-dev (>= 2:1.2.99.902), x11proto-video-dev, x11proto-core-dev, x11proto-fonts-dev, x11proto-randr-dev (>= 1.2), x11proto-render-dev, x11proto-xext-dev
+Build-Depends: debhelper (>= 5.0.0), pkg-config, xserver-xorg-dev (>= 2:1.3.99.0), 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
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
Reply to: