[Pkg-opencl-devel] [clinfo] 03/06: Imported Debian patch 0.0.20130409-2

[Andreas Beckmann]

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

anbe pushed a commit to branch master
in repository clinfo.

commit ed32e79656725de673d50119c04a1951eeec06b2
Author: Simon Richter <sjr at debian.org>
Date:   Fri Apr 26 12:02:59 2013 +0200

    Imported Debian patch 0.0.20130409-2
---
 debian/changelog | 6 ++++++
 debian/control   | 2 ++
 2 files changed, 8 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index e5d4e3b..e5fe6c0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+clinfo (0.0.20130409-2) unstable; urgency=low
+
+  * Conflict/Replace amd-clinfo (Closes: #706093)
+
+ -- Simon Richter <sjr at debian.org>  Fri, 26 Apr 2013 12:02:59 +0200
+
 clinfo (0.0.20130409-1) unstable; urgency=low
 
   * Initial release
diff --git a/debian/control b/debian/control
index dfbf90f..2ea287a 100644
--- a/debian/control
+++ b/debian/control
@@ -10,6 +10,8 @@ Homepage: http://www.simonrichter.eu/clinfo
 Package: clinfo
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
+Conflicts: amd-clinfo
+Replaces: amd-clinfo
 Description: Query OpenCL system information
  OpenCL (Open Computing Language) is a multivendor open standard for
  general-purpose parallel programming of heterogeneous systems that include

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