[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#688953: freeze-exception: nvidia-graphics-drivers/304.48-3 - libgl1-nvidia-glx package split



Hi,

here I'm attaching the debdiffs for the two further proposed new
packages that I mentioned in the initial mail:

* adding a new "nvidia-cuda-proxy" binary package

and

* turning the virtual package libgl1-nvidia-glx-i386 into a real package
  (with M-A: foreign) to automatically pull libgl1-nvidia-glx:i386 on
  systems with i386 as secondary architecture and enabled installation
  of Recommends.

Andreas
diff -Naur --exclude .svn trunk-clean/debian/changelog trunk-proxy/debian/changelog
--- trunk-clean/debian/changelog	2012-09-30 02:00:23.160420988 +0200
+++ trunk-proxy/debian/changelog	2012-09-30 01:45:57.866655383 +0200
@@ -5,6 +5,7 @@
   * Split libxvmcnvidia1 from libgl1-nvidia-glx.
     - Drops libxvmc1 dependency from libgl1-nvidia-glx, making the package
       multi-arch co-installable.  (Closes: #676723, #685054, #686033, #688714)
+  * nvidia-cuda-proxy: New package for nvidia-cuda-proxy-{control,server}.
 
  -- Andreas Beckmann <debian@abeckmann.de>  Thu, 27 Sep 2012 09:38:46 +0200
 
diff -Naur --exclude .svn trunk-clean/debian/control trunk-proxy/debian/control
--- trunk-clean/debian/control	2012-09-30 02:00:23.144421473 +0200
+++ trunk-proxy/debian/control	2012-09-30 01:45:37.255280196 +0200
@@ -418,6 +418,22 @@
  system state and diagnostic information for the NVIDIA Tesla Visual
  Computing Systems.
 
+Package: nvidia-cuda-proxy
+Section: non-free/utils
+Architecture: i386 amd64
+Depends:
+ ${shlibs:Depends}, ${misc:Depends}
+Description: NVIDIA CUDA Proxy
+ The Compute Unified Device Architecture (CUDA) enables NVIDIA
+ graphics processing units (GPUs) to be used for massively parallel
+ general purpose computation.
+ .
+ CUDA proxy is a feature that allows multiple CUDA processes to share a single
+ GPU context.  The proxy mode should be transparent to CUDA programs.
+ .
+ Proxy mode requires a device that supports Unified Virtual Address (UVA).
+ Pre-CUDA 4.0 APIs are not supported under proxy mode.
+
 Package: libcuda1
 Architecture: i386 amd64
 Multi-Arch: same
diff -Naur --exclude .svn trunk-clean/debian/nvidia-cuda-proxy.dirs trunk-proxy/debian/nvidia-cuda-proxy.dirs
--- trunk-clean/debian/nvidia-cuda-proxy.dirs	1970-01-01 01:00:00.000000000 +0100
+++ trunk-proxy/debian/nvidia-cuda-proxy.dirs	2012-09-30 01:45:37.391276073 +0200
@@ -0,0 +1 @@
+var/log/nvidia-proxy
diff -Naur --exclude .svn trunk-clean/debian/nvidia-cuda-proxy.install trunk-proxy/debian/nvidia-cuda-proxy.install
--- trunk-clean/debian/nvidia-cuda-proxy.install	1970-01-01 01:00:00.000000000 +0100
+++ trunk-proxy/debian/nvidia-cuda-proxy.install	2012-09-30 01:45:37.275279589 +0200
@@ -0,0 +1,2 @@
+nvidia-cuda-proxy-control	usr/bin/
+nvidia-cuda-proxy-server	usr/sbin/
diff -Naur --exclude .svn trunk-clean/debian/nvidia-cuda-proxy.lintian-overrides trunk-proxy/debian/nvidia-cuda-proxy.lintian-overrides
--- trunk-clean/debian/nvidia-cuda-proxy.lintian-overrides	1970-01-01 01:00:00.000000000 +0100
+++ trunk-proxy/debian/nvidia-cuda-proxy.lintian-overrides	2012-09-30 01:45:37.255280196 +0200
@@ -0,0 +1,3 @@
+# The NVIDIA license does not allow any form of modification.
+hardening-no-fortify-functions
+hardening-no-relro
diff -Naur --exclude .svn trunk-clean/debian/nvidia-cuda-proxy.manpages trunk-proxy/debian/nvidia-cuda-proxy.manpages
--- trunk-clean/debian/nvidia-cuda-proxy.manpages	1970-01-01 01:00:00.000000000 +0100
+++ trunk-proxy/debian/nvidia-cuda-proxy.manpages	2012-09-30 01:45:37.259280074 +0200
@@ -0,0 +1 @@
+debian/tmp/nvidia-cuda-proxy-control.1.gz
Index: debian/control
===================================================================
--- debian/control	(revision 3427)
+++ debian/control	(working copy)
@@ -136,12 +136,12 @@
  nvidia-kernel${nvidia:Legacy}-dkms (>= ${nvidia:Version})
  | nvidia-kernel${nvidia:Legacy}-source (>= ${nvidia:Version})
 Provides:
- libgl1-nvidia${nvidia:Legacy}-glx-i386 [i386],
+# libgl1-nvidia${nvidia:Legacy}-glx-i386 [i386],
  libgl1-nvidia-glx-any,
 Conflicts:
  libgl1-nvidia${nvidia:Legacy}-dev,
  nvidia-glx${nvidia:Legacy}-dev,
- libgl1-nvidia${nvidia:Legacy}-glx-ia32 [i386],
+# libgl1-nvidia${nvidia:Legacy}-glx-ia32 [i386],
 Breaks:
  libgl1-nvidia${nvidia:Legacy}-glx-ia32 (<< ${nvidia:Version}) [amd64],
  nvidia-glx (<< 275.09.07-3),
@@ -191,6 +191,20 @@
  See /usr/share/doc/libgl1-nvidia${nvidia:Legacy}-glx/README.txt.gz
  for instructions how to enable XvMC acceleration.
 
+Package: libgl1-nvidia-glx-i386
+Section: non-free/oldlibs
+Priority: extra
+Architecture: i386
+Multi-Arch: foreign
+Depends:
+ libgl1-nvidia${nvidia:Legacy}-glx,
+ ${shlibs:Depends}, ${misc:Depends}
+Description: helper for switching to multiarch libgl1-nvidia${nvidia:Legacy}-glx:i386
+ This is an empty transitional package to aid switching to multiarch.
+ .
+ It adds support for "cross-arch Recommends" in libgl1-nvidia-glx-ia32 to
+ smoothen the migration path from -ia32:amd64 to :i386 packages.
+
 Package: libgl1-nvidia-glx-ia32
 Section: non-free/oldlibs
 Priority: extra
Index: debian/changelog
===================================================================
--- debian/changelog	(revision 3427)
+++ debian/changelog	(working copy)
@@ -5,6 +5,8 @@
   * Split libxvmcnvidia1 from libgl1-nvidia-glx.
     - Drops libxvmc1 dependency from libgl1-nvidia-glx, making the package
       multi-arch co-installable.  (Closes: #676723, #685054, #686033, #688714)
+  * libgl1-nvidia-glx-i386:i386: New M-A: foreign helper package that can be
+    recommended by libgl1-nvidia-glx-ia32:amd64.  (Closes: #687506)
 
  -- Andreas Beckmann <debian@abeckmann.de>  Thu, 27 Sep 2012 09:38:46 +0200
 

Reply to: