← Back to branch summary

~ubuntu-branches/ubuntu/trusty/nvidia-graphics-drivers-331-updates/trusty-security

« back to all changes in this revision

Viewing changes to debian/changelog

  • Committer: Package Import Robot
  • Author(s): Graham Inggs
  • Date: 2014-06-08 11:59:01 UTC
  • mto: This revision was merged to the branch mainline in revision 18.
  • Revision ID: package-import@ubuntu.com-20140608115901-mbwqd6zwk789sfyw
Tags: 331.38-0ubuntu7.1
https://launchpad.net/bugs/1247736
* Backport the followings changes from 331.38-0ubuntu8 in Utopic to make
  packages using CUDA and OpenCL co-installable:
  - debian/templates/control.in, package nvidia-opencl-icd-*:
    - Remove breaks/replaces on opencl-icd (LP: #1247736).
    - Depend on ocl-icd-libopencl1 | nvidia-libopencl1-*.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/changelog
 
1
nvidia-graphics-drivers-331-updates (331.38-0ubuntu7.1) trusty; urgency=medium
 
2
 
 
3
  * Backport the followings changes from 331.38-0ubuntu8 in Utopic to make
 
4
    packages using CUDA and OpenCL co-installable:
 
5
    - debian/templates/control.in, package nvidia-opencl-icd-*:
 
6
      - Remove breaks/replaces on opencl-icd (LP: #1247736).
 
7
      - Depend on ocl-icd-libopencl1 | nvidia-libopencl1-*.
 
8
 
 
9
 -- Graham Inggs <graham@nerve.org.za>  Sun, 08 Jun 2014 11:59:01 +0200
 
10
 
1
11
nvidia-graphics-drivers-331-updates (331.38-0ubuntu7) trusty; urgency=medium
2
12
 
3
13
  [ Tim O'Shea ]