← Back to branch summary

~computersforpeace/ubuntu/utopic/nvidia-graphics-drivers-331/fix-for-1367468

« back to all changes in this revision

Viewing changes to debian/control

  • Committer: Package Import Robot
  • Author(s): Alberto Milone, Alberto Milone, Graham Inggs
  • Date: 2014-09-12 16:34:08 UTC
  • Revision ID: package-import@ubuntu.com-20140912163408-m01999nko3tvj3mn
Tags: 331.89-0ubuntu4
https://launchpad.net/bugs/1328762
https://launchpad.net/bugs/1347926
[ Alberto Milone ]
* debian/71-nvidia.rules:
  - Make the rule more generic.

[ Graham Inggs ]
* debian/templates/control.in:
  - Drop the recommends on nvidia-libopencl1-$flavour,
    as nvidia-opencl-icd-$flavour already has its own
    dependencies.
  - Recommend the uvm driver instead of suggesting it.
  - Create the 'nvidia-opencl-icd' and the 'nvidia-uvm'
    virtual packages so that the real packages stop
    trying to overwrite each other's files
    (LP: #1328762, LP: #1347926).

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/control
15
15
 patch, acpid, lib32gcc1 [amd64], libc6-i386 [amd64], passwd, adduser,
16
16
 ${shlibs:Depends}, ${misc:Depends}, ${xviddriver:Depends}
17
17
Recommends: nvidia-settings (>= 331.20), nvidia-prime (>= 0.5) | bumblebee,
18
 
 libcuda1-331, nvidia-libopencl1-331, nvidia-opencl-icd-331
 
18
 libcuda1-331, nvidia-opencl-icd-331, nvidia-331-uvm
19
19
Provides: xorg-driver-binary, nvidia-driver-binary, nvidia-persistenced,
20
20
 ${xviddriver:Provides}
21
21
Conflicts: xorg-driver-binary, nvidia-persistenced
22
22
Replaces: xorg-driver-binary, nvidia-persistenced
23
 
Suggests: nvidia-331-uvm
24
23
XB-Modaliases: ${modaliases}
25
24
Description: NVIDIA binary driver - version 331.89
26
25
 The binary driver provide optimized hardware acceleration of OpenGL
81
80
Architecture: i386 amd64
82
81
Depends: ${shlibs:Depends}, ${misc:Depends}, ocl-icd-libopencl1 | nvidia-libopencl1-331
83
82
Enhances: libopencl1
84
 
Provides: opencl-icd
 
83
Conflicts: nvidia-opencl-icd
 
84
Replaces: nvidia-opencl-icd
 
85
Provides: nvidia-opencl-icd, opencl-icd
85
86
Description: NVIDIA OpenCL ICD
86
87
 OpenCL (Open Computing Language) is a multivendor open standard for
87
88
 general-purpose parallel programming of heterogeneous systems that include
93
94
Package: nvidia-331-uvm
94
95
Architecture: i386 amd64 armhf
95
96
Depends: ${misc:Depends}, nvidia-331 (>= 331.89)
 
97
Conflicts: nvidia-uvm
 
98
Replaces: nvidia-uvm
 
99
Provides: nvidia-uvm
96
100
Description: NVIDIA Unified Memory kernel module
97
101
 This package contains the NVIDIA Unified Memory kernel module.
98
102