[SCM] root-system: CERN's ROOT Data Analysis Framework branch, master, updated. upstream/5.34.02-57-ge0da5ff

[Lifeng Sun]

The following commit has been merged in the master branch:
commit e0da5ff00a6b30a5ba201b4035d9e72c44f7705b
Author: Lifeng Sun <lifongsun at gmail.com>
Date:   Fri Oct 26 07:48:14 2012 +0800

    libroot-proof-dev: breaks libroot-proof-proofplayer-dev (<= 5.34.00-1).

diff --git a/debian/changelog b/debian/changelog
index 2ad51e9..2a96080 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+root-system (5.34.02-1~exp2) experimental; urgency=low
+
+  * libroot-proof-dev: breaks libroot-proof-proofplayer-dev
+    (<= 5.34.00-1) (Closes: #691437)
+
+ -- Lifeng Sun <lifongsun at gmail.com>  Fri, 26 Oct 2012 07:49:46 +0800
+
 root-system (5.34.02-1~exp1) experimental; urgency=low
 
   * New upstream release.
diff --git a/debian/control b/debian/control
index ad3b7cd..3af6b97 100644
--- a/debian/control
+++ b/debian/control
@@ -1422,7 +1422,7 @@ Architecture: any
 Section: libdevel
 Depends: libroot-proof5.34 (= ${binary:Version}), libroot-math-mathcore-dev, libroot-tree-dev, ${misc:Depends}
 Replaces: root-plugin-proof
-Breaks: root-plugin-proof (<< 5.19.01-1)
+Breaks: root-plugin-proof (<< 5.19.01-1), libroot-proof-proofplayer-dev (<= 5.34.00-1)
 Description: PROOF library for ROOT - development files
  The ROOT system provides a set of OO frameworks with all the
  functionality needed to handle and analyze large amounts of data
diff --git a/debian/skel/libroot-proof.control b/debian/skel/libroot-proof.control
index e6024ee..5546a28 100644
--- a/debian/skel/libroot-proof.control
+++ b/debian/skel/libroot-proof.control
@@ -17,7 +17,7 @@ Architecture: any
 Section: libdevel
 Depends: libroot-proof at libvers@ (= ${binary:Version}), libroot-math-mathcore-dev, libroot-tree-dev, ${misc:Depends}
 Replaces: root-plugin-proof
-Breaks: root-plugin-proof (<< 5.19.01-1)
+Breaks: root-plugin-proof (<< 5.19.01-1), libroot-proof-proofplayer-dev (<= 5.34.00-1)
 Description: PROOF library for ROOT - development files
  The ROOT system provides a set of OO frameworks with all the
  functionality needed to handle and analyze large amounts of data

-- 
root-system: CERN's ROOT Data Analysis Framework