xserver-xorg-video-nv: Changes to 'debian-experimental'
ChangeLog | 67 +++++++++++++++++++++++++++++++++++++++++++++++++-
debian/changelog | 7 +++++
debian/rules | 2 -
debian/xsfbs/xsfbs.mk | 9 ++----
4 files changed, 78 insertions(+), 7 deletions(-)
New commits:
commit 099997e5d61959688405d71adc6a04c73b052ab2
Author: Julien Cristau <jcristau@debian.org>
Date: Thu Apr 19 14:10:22 2007 +0200
Update upstream changelog.
diff --git a/ChangeLog b/ChangeLog
index abb367d..a73698e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,69 @@
+commit dd305c3f64f9267d54324d734f1028bfc00e474f
+Author: Aaron Plattner <aplattner@nvidia.com>
+Date: Wed Jan 17 21:41:06 2007 -0800
+
+ Remove the riva128 submodule. Link Riva support into nv_drv.so directly.
+
+commit 96bd57b0597dbbda0ca5c46c2135e5813c80d79f
+Author: Daniel Stone <daniel@fooishbar.org>
+Date: Sun Dec 24 06:34:31 2006 +0200
+
+ configure.ac: bump to 1.2.2.1 (respin)
+ No code changes, just built with an updated util-macros.
+
+commit 10c7c54888d1dd4198c79e852c57420e8d52ccc5
+Author: Daniel Stone <daniel@fooishbar.org>
+Date: Sat Dec 16 01:47:42 2006 +0200
+
+ bump to 1.2.2
+
+commit 6d02bdb71bb34205955e76a99939a7be34c676c7
+Author: Daniel Stone <daniel@fooishbar.org>
+Date: Wed Dec 6 18:48:37 2006 +0200
+
+ Makefile.am: make ChangeLog hook safer
+ Make ChangeLog hook as safe as possible.
+
+commit 33e10132a87409bdfa77d5eef9f7044cb9ce1ac9
+Author: Aaron Plattner <aplattner@nvidia.com>
+Date: Mon Dec 4 12:52:55 2006 -0800
+
+ Remove redundant XORG_RELEASE_VERSION.
+
+commit 2d4b4bb06029e60e5c7b96d94b31c8aadac91843
+Author: Aaron Plattner <aplattner@nvidia.com>
+Date: Thu Nov 30 17:41:41 2006 -0800
+
+ Bump to 1.2.1.
+
+commit 558ef7e26e361529a05360610abc3cbcdb04fd67
+Author: Aaron Plattner <aplattner@nvidia.com>
+Date: Thu Nov 30 17:36:29 2006 -0800
+
+ Save and restore DAC0 register 608 when probing for connected CRTs.
+
+ Adapted from a patch by Egbert Eich for Novell bug #220197.
+
+commit 08bb966abbca11c4581d666af3249e4922156e03
+Author: Aaron Plattner <aplattner@nvidia.com>
+Date: Thu Nov 30 17:14:38 2006 -0800
+
+ Use XORG_RELEASE_VERSION.
+
+commit 162391f8fb640184db3917f3842fbff0bc9ce606
+Author: Aaron Plattner <aplattner@nvidia.com>
+Date: Thu Oct 26 19:08:29 2006 -0700
+
+ Handle more than 1 digit in the version numbers.
+
+ Based on a change by George Sapountzis <gsap7@yahoo.gr>.
+
+commit 98372d0f94a9d658a7257d2199ef37a2449b9961
+Author: Adam Jackson <ajax@benzedrine.nwnk.net>
+Date: Fri Aug 11 16:02:28 2006 -0400
+
+ Replace panel message + MODE_BAD with MODE_PANEL.
+
commit 43ec66396f805aba87017d193d97a03372c29909
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Fri Jun 30 12:54:44 2006 -0700
@@ -560,4 +626,3 @@ Author: Kaleb Keithley <kaleb@freedesktop.org>
Date: Fri Nov 14 15:54:48 2003 +0000
R6.6 is the Xorg base-line
-
commit 339462c249afb729cca90575aef69a6eeea346b6
Author: Bastian Kleineidam <calvin@debian.org>
Date: Thu Apr 19 14:06:30 2007 +0200
Install the upstream changelog.
diff --git a/debian/changelog b/debian/changelog
index 354ddb2..64592fa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xserver-xorg-video-nv (1:1.2.2.1-2) UNRELEASED; urgency=low
+
+ * Install the upstream changelog (closes: #420006). Thanks, Bastian
+ Kleineidam!
+
+ -- Julien Cristau <jcristau@debian.org> Thu, 19 Apr 2007 14:03:02 +0200
+
xserver-xorg-video-nv (1:1.2.2.1-1) experimental; urgency=low
* New upstream version plus a git update that removes the riva128 module and
diff --git a/debian/rules b/debian/rules
index a7be659..5603d55 100755
--- a/debian/rules
+++ b/debian/rules
@@ -71,7 +71,7 @@ binary-arch: build install serverabi
dh_testroot
dh_installdocs
- dh_installchangelogs
+ dh_installchangelogs ChangeLog
dh_install --sourcedir=debian/tmp --list-missing
dh_link
dh_strip
commit 271778bd6338575afa3e4ae7f614f38cdff8e2fb
Author: Branden Robinson <branden@sisyphus.(none)>
Date: Thu Apr 12 23:18:32 2007 -0400
Test for existence of debian/patches directory before creating a symlink to it.
This prevents packages that apply no patches from ending up with a broken
symlink in them.
Remove SVN keyword.
Update copyright notice.
diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index d88c6db..63dde45 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -1,11 +1,10 @@
#!/usr/bin/make -f
-# $Id$
-# Debian rules file for xorg-x11 source package
+# Debian X Strike Force Build System (XSFBS): Make portion
# Copyright 1996 Stephen Early
# Copyright 1997 Mark Eichin
-# Copyright 1998-2005 Branden Robinson
+# Copyright 1998-2005, 2007 Branden Robinson
# Copyright 2005 David Nusinow
#
# Licensed under the GNU General Public License, version 2. See the file
@@ -127,7 +126,7 @@ $(STAMP_DIR)/prepare: $(STAMP_DIR)/stampdir
if [ ! -e $(STAMP_DIR)/log ]; then \
mkdir $(STAMP_DIR)/log; \
fi; \
- if [ ! -e patches ]; then \
+ if [ -e debian/patches ] && [ ! -e patches ]; then \
ln -s debian/patches patches; \
fi; \
>$@
commit 72811b4cede7275a35d36b44bcb5f431a8aa0133
Author: Julien Cristau <jcristau@debian.org>
Date: Fri Mar 2 20:28:15 2007 +0100
Fix copy/paste typo in the input driver provides.
diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index 0343aec..d88c6db 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -359,7 +359,7 @@ VIDEOABI = $(shell cat /usr/share/xserver-xorg/videoabiver 2>/dev/null)
INPUTABI = $(shell cat /usr/share/xserver-xorg/inputabiver 2>/dev/null)
SERVER_DEPENDS = xserver-xorg-core (>= $(SERVERMINVERS))
VIDDRIVER_PROVIDES = xserver-xorg-video-$(VIDEOABI)
-INPDRIVER_PROVIDES = xserver-xorg-video-$(INPUTABI)
+INPDRIVER_PROVIDES = xserver-xorg-input-$(INPUTABI)
ifeq ($(PACKAGE),)
PACKAGE=$(shell awk '/^Package:/ { print $$2; exit }' < debian/control)
endif
Reply to: