[khronos-opencl-headers] 31/94: move from contrib to main

[Andreas Beckmann]

This is an automated email from the git hooks/post-receive script.

anbe pushed a commit to branch master
in repository khronos-opencl-headers.

commit 97c62c0c3494f1de3605b76c8e9933f587f8fda9
Author: Andreas Beckmann <debian at abeckmann.de>
Date:   Sat Jun 2 18:17:28 2012 +0000

    move from contrib to main
    
    git-svn-id: svn://svn.debian.org/svn/pkg-nvidia/packages/khronos-opencl-headers/trunk@3027 b6a4b1ba-b714-0410-8a2d-fc0b36c6496e
---
 debian/changelog | 7 +++++++
 debian/control   | 2 +-
 debian/copyright | 7 -------
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 3c1c5c6..c2e9de9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+khronos-opencl-headers (1.2-2012.04.18-2) unstable; urgency=low
+
+  * Move from contrib to main.  There is a free version of libopencl1 (from
+    http://forge.imag.fr/projects/ocl-icd/) coming, see #675528.
+
+ -- Andreas Beckmann <debian at abeckmann.de>  Sat, 02 Jun 2012 20:11:28 +0200
+
 khronos-opencl-headers (1.2-2012.04.18-1) unstable; urgency=low
 
   * New upstream release.
diff --git a/debian/control b/debian/control
index f5af0ca..ddbce08 100644
--- a/debian/control
+++ b/debian/control
@@ -1,5 +1,5 @@
 Source: khronos-opencl-headers
-Section: contrib/libdevel
+Section: libdevel
 Priority: extra
 Maintainer: Debian NVIDIA Maintainers <pkg-nvidia-devel at lists.alioth.debian.org>
 Uploaders:
diff --git a/debian/copyright b/debian/copyright
index 366ddf0..185d352 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -2,13 +2,6 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: OpenCL headers
 Upstream-Contact: The Khronos Group Inc. <http://www.khronos.org/>
 Source: http://www.khronos.org/registry/cl/
-Disclaimer:
- This package is not part of the GNU/Linux Debian distribution.  It is
- provided in the contrib archive area as a convenience to Debian users.
- The headers provided by this package are free, but to make use of these
- files a library that implements OpenCL is needed, too.  These
- implementations (e.g. from NVIDIA or AMD) are only distributed under
- non-free licenses and without source code.
 
 Files: *
 Copyright: (c) 2008-2012 The Khronos Group Inc.

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-opencl/khronos-opencl-headers.git