[kernel] r22900 - dists/trunk/linux-tools/debian/templates

[Ben Hutchings]

Author: benh
Date: Tue Aug  4 00:14:39 2015
New Revision: 22900

Log:
Add {Conflicts,Replaces}: linux-tools to linux-perf temporarily

linux-tools-4.1 already exists in experimental.  As linux-perf-4.1
installs the same files, it needs to conflict and replace it.
This won't be needed for 4.2 onward.

Modified:
   dists/trunk/linux-tools/debian/templates/control.main.in

Modified: dists/trunk/linux-tools/debian/templates/control.main.in
==============================================================================
--- dists/trunk/linux-tools/debian/templates/control.main.in	Mon Aug  3 23:46:29 2015	(r22899)
+++ dists/trunk/linux-tools/debian/templates/control.main.in	Tue Aug  4 00:14:39 2015	(r22900)
@@ -11,6 +11,8 @@
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}, ${python:Depends}
 Recommends: linux-base (>= 3.4~)
 Provides: linux-tools- at version@
+Conflicts: linux-tools- at version@
+Replaces: linux-tools- at version@
 Suggests: linux-doc- at version@
 Description: Performance analysis tools for Linux @upstreamversion@
  This package contains the 'perf' performance analysis tools for Linux