[pkg-nvidia-devel] r570 - in /packages/nvidia-graphics-drivers-legacy-173xx/trunk: conftest.h debian.binary/changelog debian/changelog debian/upstream_info

Sun Jul 19 01:38:51 UTC 2009

Author: rdonald
Date: Sun Jul 19 01:38:50 2009
New Revision: 570

URL: http://svn.debian.org/wsvn/pkg-nvidia/?sc=1&rev=570
Log:
173.14.20

Modified:
    packages/nvidia-graphics-drivers-legacy-173xx/trunk/conftest.h
    packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian.binary/changelog
    packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/changelog
    packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/upstream_info

Modified: packages/nvidia-graphics-drivers-legacy-173xx/trunk/conftest.h
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers-legacy-173xx/trunk/conftest.h?rev=570&op=diff
==============================================================================

--- packages/nvidia-graphics-drivers-legacy-173xx/trunk/conftest.h (original)
+++ packages/nvidia-graphics-drivers-legacy-173xx/trunk/conftest.h Sun Jul 19 01:38:50 2009
@@ -23,7 +23,7 @@
 
 /* Implement conftest.sh function change_page_attr */
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,20) && \
-		LINUX_VERSION_CODE < KERNEL_VERSION(2,6,25)
+               LINUX_VERSION_CODE < KERNEL_VERSION(2,6,25)
  #ifndef NV_SET_PAGES_UC_PRESENT
   #define NV_CHANGE_PAGE_ATTR_PRESENT
  #endif
@@ -76,9 +76,11 @@
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
  #define NV_I2C_ADAPTER_HAS_INC_USE
  #define NV_I2C_ADAPTER_HAS_DEC_USE
+ #define NV_I2C_ADAPTER_HAS_CLIENT_REGISTER
 #else
  #undef NV_I2C_ADAPTER_HAS_INC_USE
  #undef NV_I2C_ADAPTER_HAS_DEC_USE
+ #undef NV_I2C_ADAPTER_HAS_CLIENT_REGISTER
 #endif
 
 /* Implement conftest.sh function sysctl_max_map_count */
@@ -126,7 +128,7 @@
 
 /* Implement conftest.sh function acpi_device_ops */
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,10) && \
-		LINUX_VERSION_CODE < KERNEL_VERSION(2,6,21)
+               LINUX_VERSION_CODE < KERNEL_VERSION(2,6,21)
  #define NV_ACPI_DEVICE_OPS_HAS_MATCH
 #else
  #undef NV_ACPI_DEVICE_OPS_HAS_MATCH
@@ -160,7 +162,7 @@
 /* Only kernels sometime before 2.4.0 don't have this function, and who */
 /* cares anymore */
 #define NV_SMP_CALL_FUNCTION_PRESENT
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,29)
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,27)
  #define NV_SMP_CALL_FUNCTION_ARGUMENT_COUNT 3
 #else
  #define NV_SMP_CALL_FUNCTION_ARGUMENT_COUNT 4
@@ -198,6 +200,20 @@
  #undef NV_IOREMAP_WC_PRESENT
 #endif
 
+/* Implement conftest.sh function proc_dir_entry */
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,30)
+ #define NV_PROC_DIR_ENTRY_HAS_OWNER
+#else
+ #undef NV_PROC_DIR_ENTRY_HAS_OWNER
+#endif
+
+/* Implement conftest.sh function agp_memory */
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,31)
+ #define NV_AGP_MEMORY_HAS_PAGES
+#else
+ #undef NV_AGP_MEMORY_HAS_PAGES
+#endif
+
 /* Check for linux/semaphore.h */
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,26)
  #define NV_LINUX_SEMAPHORE_H_PRESENT

Modified: packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian.binary/changelog
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian.binary/changelog?rev=570&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian.binary/changelog (original)
+++ packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian.binary/changelog Sun Jul 19 01:38:50 2009
@@ -1,3 +1,14 @@
+nvidia-kernel-legacy-173xx (173.14.18-1) unstable; urgency=low
+
+  * New upstream.
+  * Patched for Debian 2.6.29 thanks to Lennart Sorensen 
+    (closes: #523024, #504626, #523024)
+  * Remove suggesting of nvidia-settings (closes: #524107)
+  * Divert proper package in ia32 package (closes: #521690) 
+  * Remove video-2 Provides.
+
+ -- Randall Donald <rdonald at debian.org>  Sun, 26 Apr 2009 13:10:22 -0700
+
 nvidia-kernel-legacy-173xx (173.14.15-2) unstable; urgency=low
 
   * Remove kernel lintian overrides. 

Modified: packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/changelog?rev=570&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/changelog (original)
+++ packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/changelog Sun Jul 19 01:38:50 2009
@@ -1,3 +1,11 @@
+nvidia-graphics-drivers-legacy-173xx (173.14.20-1) unstable; urgency=low
+
+  * New Upstream (pre-release for 2.6.30 support)
+  * Note ia32 support has not been transitioned in this release.
+  * conftest.sh patch from Lennart Sorensen <lsorense at csclub.uwaterloo.ca>
+
+ -- Randall Donald <rdonald at debian.org>  Sat, 18 Jul 2009 18:27:17 -0700
+
 nvidia-graphics-drivers-legacy-173xx (173.14.18-1) unstable; urgency=low
 
   * New upstream.

Modified: packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/upstream_info
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/upstream_info?rev=570&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/upstream_info (original)
+++ packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/upstream_info Sun Jul 19 01:38:50 2009
@@ -1,8 +1,8 @@
 eval `dpkg-architecture`
 
 #BASE_VERSION=1.0
-RELEASE=173.14.18
-NEXTVER=173.14.19
+RELEASE=173.14.20
+NEXTVER=173.14.21
 
 if [ "$DEB_BUILD_ARCH" = "amd64" ] ; then
 	BASE_URL=ftp://download.nvidia.com/XFree86/Linux-x86_64/${RELEASE}


