[SCM] root-system: CERN's ROOT Data Analysis Framework branch, master, updated. upstream/5.34.00_rc1-6-gca8c62e
Lifeng Sun
lifongsun at gmail.com
Sun Jun 10 10:13:21 UTC 2012
The following commit has been merged in the master branch:
commit de3859855a5de56c746217b0de7868a480a6e29c
Author: Lifeng Sun <lifongsun at gmail.com>
Date: Sun Jun 10 12:14:52 2012 +0800
Revise patchset.
diff --git a/debian/patches/03-build-libroot-bonjour-package.patch b/debian/patches/03-build-libroot-bonjour-package.patch
index f872ed2..41e4a46 100644
--- a/debian/patches/03-build-libroot-bonjour-package.patch
+++ b/debian/patches/03-build-libroot-bonjour-package.patch
@@ -1,14 +1,3 @@
---- a/build/package/lib/makelists.sh
-+++ b/build/package/lib/makelists.sh
-@@ -133,7 +133,7 @@
- net/rootd) lib=root-system-$sub ; dev=$lib ; bin=$lib ;;
- net/xrootd) set_plugin_names $base $sub ;;
- net/globusauth) set_plugin_names $base globus ;;
-- net/bonjour) set_plugin_names $base $sub ;;
-+ net/bonjour) set_lib_names $base $sub ;;
- net/krb5auth) set_plugin_names $base krb5 ;;
- net/srputils) set_plugin_names $base srp ;;
- net/rpdutils) set_lib_names core "" root-system-bin ;;
--- a/configure
+++ b/configure
@@ -6077,6 +6077,7 @@
diff --git a/debian/patches/05-rename-package-libroot-proof-proofplayer.patch b/debian/patches/05-rename-package-libroot-proof-proofplayer.patch
index 539ee20..c120ebb 100644
--- a/debian/patches/05-rename-package-libroot-proof-proofplayer.patch
+++ b/debian/patches/05-rename-package-libroot-proof-proofplayer.patch
@@ -1,13 +1,3 @@
---- a/build/package/lib/makelists.sh
-+++ b/build/package/lib/makelists.sh
-@@ -142,6 +142,7 @@
- proof/proofx) set_plugin_names $base xproof ;;
- proof/clarens) set_lib_names $base $sub ;;
- proof/proof) set_lib_names $base "" ;;
-+ proof/proofplayer) set_lib_names $base $sub ;;
- proof/*) set_plugin_names $base $sub ;;
- roofit/*) set_lib_names $base "" ;;
- rootx) set_lib_names core "" root-system-bin ;;
--- a/configure
+++ b/configure
@@ -6137,6 +6137,7 @@
diff --git a/debian/patches/06-fix-configre-and-controls.patch b/debian/patches/06-fix-configre-and-controls.patch
deleted file mode 100644
index 23575d0..0000000
--- a/debian/patches/06-fix-configre-and-controls.patch
+++ /dev/null
@@ -1,44 +0,0 @@
---- a/build/package/common/libroot-math-foam.control
-+++ b/build/package/common/libroot-math-foam.control
-@@ -2,7 +2,7 @@
- Section: libs
- Architecture: any
- Depends: ${shlibs:Depends}, ${misc:Depends}
--Description: A Compact Version of the Cellular Event Generator
-+Description: Compact Version of the Cellular Event Generator
- The ROOT system provides a set of OO frameworks with all the
- functionality needed to handle and analyze large amounts of data
- efficiently.
-@@ -19,7 +19,7 @@
- Depends: libroot-math-foam at libvers@ (= ${binary:Version}), libroot-hist-dev, ${misc:Depends}
- Replaces: libroot-dev
- Conflicts: libroot-dev (<= 5.19.01-1)
--Description: A Compact Version of the Cellular Event Generator
-+Description: Compact Version of the Cellular Event Generator
- The ROOT system provides a set of OO frameworks with all the
- functionality needed to handle and analyze large amounts of data
- efficiently.
---- a/build/package/common/libroot-proof-proofplayer.control
-+++ b/build/package/common/libroot-proof-proofplayer.control
-@@ -2,8 +2,8 @@
- Architecture: any
- Depends: ${shlibs:Depends}, ${misc:Depends}
- Suggests: root-plugin-net-netx, root-plugin-proof-xproof
--Replaces: root-plugin-proof-proofplayer (< 5.23.05-1)
--Conflicts: root-plugin-proof-proofplayer (< 5.23.05-1)
-+Replaces: root-plugin-proof-proofplayer (<< 5.23.05-1)
-+Conflicts: root-plugin-proof-proofplayer (<< 5.23.05-1)
- Description: PROOF plugin for ROOT
- The ROOT system provides a set of OO frameworks with all the
- functionality needed to handle and analyze large amounts of data
-@@ -18,8 +18,8 @@
- Architecture: any
- Depends: libroot-proof-proofplayer at libvers@ (= ${binary:Version}), libroot-proof-dev, ${misc:Depends}
- Suggests: root-plugin-net-netx, root-plugin-proof-xproof
--Replaces: root-plugin-proof-proofplayer (< 5.23.05-1)
--Conflicts: root-plugin-proof-proofplayer (< 5.23.05-1)
-+Replaces: root-plugin-proof-proofplayer (<< 5.23.05-1)
-+Conflicts: root-plugin-proof-proofplayer (<< 5.23.05-1)
- Description: PROOF plugin for ROOT
- 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/patches/07-add-python-support.patch b/debian/patches/07-add-python-support.patch
deleted file mode 100644
index c0ae984..0000000
--- a/debian/patches/07-add-python-support.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/build/package/common/root-plugin-geom-gdml.control b/build/package/common/root-plugin-geom-gdml.control
-index 2956648..e3e6fe2 100644
---- a/build/package/common/root-plugin-geom-gdml.control
-+++ b/build/package/common/root-plugin-geom-gdml.control
-@@ -2,7 +2,7 @@ Package: root-plugin-geom-gdml
- Architecture: any
- Conflicts: libroot-dev (<< 5.19.01-1)
- Replaces: libroot-dev
--Depends: ${shlibs:Depends}, ${python:Depends}, libroot-geom-dev, ${misc:Depends}
-+Depends: ${shlibs:Depends}, python-support, ${python:Depends}, libroot-geom-dev, ${misc:Depends}
- Description: GDML import/export module for ROOT geometries
- 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/patches/08-fix-conflicts.patch b/debian/patches/08-fix-conflicts.patch
deleted file mode 100644
index dca3927..0000000
--- a/debian/patches/08-fix-conflicts.patch
+++ /dev/null
@@ -1,663 +0,0 @@
---- a/build/package/common/libroot-bindings-python.control
-+++ b/build/package/common/libroot-bindings-python.control
-@@ -17,7 +17,7 @@
- Depends: libroot-bindings-python at libvers@ (= ${binary:Version}), libroot-core-dev, python-dev (>= 2.1), ${python:Depends}, ${misc:Depends}
- Provides: ${python:Provides}
- Replaces: libroot-python-dev
--Conflicts: libroot-python-dev (<< 5.19.01-1)
-+Breaks: libroot-python-dev (<< 5.19.01-1)
- Description: Python extension 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
---- a/build/package/common/libroot-bindings-ruby.control
-+++ b/build/package/common/libroot-bindings-ruby.control
-@@ -16,7 +16,7 @@
- Architecture: any
- Section: libdevel
- Depends: libroot-bindings-ruby at libvers@ (= ${binary:Version}), libroot-core-dev, ruby1.8-dev | ruby-dev (>= 1.8), ${misc:Depends}
--Conflicts: libroot-ruby (<< 5.19.01-1)
-+Breaks: libroot-ruby (<< 5.19.01-1)
- Replaces: libroot-ruby
- Description: Ruby extension for ROOT - development headers
- The ROOT system provides a set of OO frameworks with all the
---- a/build/package/common/libroot-core.control
-+++ b/build/package/common/libroot-core.control
-@@ -28,7 +28,7 @@
- Recommends: libroot-geom-dev, libroot-gui-dev, libroot-hist-dev, libroot-proof-dev, libroot-tree-dev
- Provides: libroot-dev
- Replaces: libroot-dev (<< 5.19.01-1)
--Conflicts: libroot-dev (<< 5.19.01-1)
-+Breaks: libroot-dev (<< 5.19.01-1)
- Description: Header files for ROOT
- The ROOT system provides a set of OO frameworks with all the
- functionality needed to handle and analyze large amounts of data
---- a/build/package/common/libroot-geom.control
-+++ b/build/package/common/libroot-geom.control
-@@ -16,7 +16,7 @@
- Depends: libroot-geom at libvers@ (= ${binary:Version}), libroot-math-mathcore-dev, ${misc:Depends}
- Recommends: libroot-graf3d-gl-dev
- Replaces: libroot-dev
--Conflicts: libroot-dev (<= 5.19.01-1)
-+Breaks: libroot-dev (<= 5.19.01-1)
- Description: Geometry 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
---- a/build/package/common/libroot-graf2d-gpad.control
-+++ b/build/package/common/libroot-graf2d-gpad.control
-@@ -18,7 +18,7 @@
- Section: libdevel
- Depends: libroot-graf2d-gpad at libvers@ (= ${binary:Version}), libroot-graf2d-graf-dev, ${misc:Depends}
- Replaces: libroot-dev
--Conflicts: libroot-dev (<= 5.19.01-1)
-+Breaks: libroot-dev (<= 5.19.01-1)
- Description: Canvas and pad 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
---- a/build/package/common/libroot-graf2d-graf.control
-+++ b/build/package/common/libroot-graf2d-graf.control
-@@ -18,7 +18,7 @@
- Section: libdevel
- Depends: libroot-graf2d-graf at libvers@ (= ${binary:Version}), libroot-hist-dev, ${misc:Depends}
- Replaces: libroot-dev
--Conflicts: libroot-dev (<< 5.19.01-1)
-+Breaks: libroot-dev (<< 5.19.01-1)
- Description: Graph library for ROOT
- The ROOT system provides a set of OO frameworks with all the
- functionality needed to handle and analyze large amounts of data
---- a/build/package/common/libroot-graf2d-postscript.control
-+++ b/build/package/common/libroot-graf2d-postscript.control
-@@ -13,7 +13,7 @@
- Architecture: any
- Section: libdevel
- Replaces: libroot-dev
--Conflicts: libroot-dev (<< 5.19.01-1)
-+Breaks: libroot-dev (<< 5.19.01-1)
- Depends: libroot-graf2d-postscript at libvers@ (= ${binary:Version}), libroot-graf2d-graf-dev, ${shlibs:Depends}, ${misc:Depends}
- Description: Postscript/PDF renderer library for ROOT
- The ROOT system provides a set of OO frameworks with all the
---- a/build/package/common/libroot-graf3d-eve.control
-+++ b/build/package/common/libroot-graf3d-eve.control
-@@ -2,7 +2,7 @@
- Section: libs
- Architecture: any
- Depends: ${shlibs:Depends}, ${misc:Depends}
--Conflicts: root-plugin-gl (<= 5.19.01-1)
-+Breaks: root-plugin-gl (<= 5.19.01-1)
- Replaces: root-plugin-gl (<= 5.19.01-1)
- Description: Event display library for ROOT
- The ROOT system provides a set of OO frameworks with all the
-@@ -16,7 +16,7 @@
- Section: libdevel
- Depends: libroot-graf3d-eve at libvers@ (= ${binary:Version}), libroot-geom-dev, libroot-gui-ged-dev, libroot-montecarlo-eg-dev, libroot-tree-treeplayer-dev, ${misc:Depends}
- Replaces: root-plugin-gl
--Conflicts: root-plugin-gl (<= 5.19.01-1)
-+Breaks: root-plugin-gl (<= 5.19.01-1)
- Description: Event display library for ROOT
- The ROOT system provides a set of OO frameworks with all the
- functionality needed to handle and analyze large amounts of data
---- a/build/package/common/libroot-graf3d-g3d.control
-+++ b/build/package/common/libroot-graf3d-g3d.control
-@@ -22,7 +22,7 @@
- Depends: libroot-graf3d-g3d at libvers@ (= ${binary:Version}), libroot-graf2d-gpad-dev, ${misc:Depends}
- Recommends: libroot-graf3d-gl-dev
- Replaces: libroot-dev
--Conflicts: libroot-dev (<= 5.19.01-1)
-+Breaks: libroot-dev (<= 5.19.01-1)
- Suggests: libroot-geom-dev
- Description: Basic 3D shapes for ROOT
- The ROOT system provides a set of OO frameworks with all the
---- a/build/package/common/libroot-graf3d-gl.control
-+++ b/build/package/common/libroot-graf3d-gl.control
-@@ -2,7 +2,7 @@
- Architecture: any
- Section: libs
- Depends: ${shlibs:Depends}, ${misc:Depends}
--Conflicts: root-plugin-graf3d-gl (<< 5.19.00-1)
-+Breaks: root-plugin-graf3d-gl (<< 5.19.00-1)
- Replaces: root-plugin-graf3d-gl (<< 5.19.00-1)
- Provides: root-plugin-graf3d-gl
- Description: GL plugin for ROOT - runtime library
-@@ -23,7 +23,7 @@
- Architecture: any
- Section: libdevel
- Depends: libroot-graf3d-gl at libvers@ (= ${binary:Version}), ${misc:Depends}
--Conflicts: root-plugin-graf3d-gl (<< 5.19.00-1)
-+Breaks: root-plugin-graf3d-gl (<< 5.19.00-1)
- Replaces: root-plugin-graf3d-gl
- Description: GL plugin for ROOT - development files
- The ROOT system provides a set of OO frameworks with all the
---- a/build/package/common/libroot-gui-ged.control
-+++ b/build/package/common/libroot-gui-ged.control
-@@ -12,7 +12,7 @@
- Package: libroot-gui-ged-dev
- Architecture: any
- Section: libdevel
--Conflicts: libroot-dev (<< 5.19.01-1)
-+Breaks: libroot-dev (<< 5.19.01-1)
- Replaces: libroot-dev
- Depends: libroot-gui-ged at libvers@ (= ${binary:Version}), libroot-gui-dev, libroot-tree-treeplayer-dev, ${misc:Depends}
- Description: GUI element for editing various ROOT objecs
---- a/build/package/common/libroot-gui.control
-+++ b/build/package/common/libroot-gui.control
-@@ -2,7 +2,7 @@
- Section: libs
- Architecture: any
- Depends: ${shlibs:Depends}, ${misc:Depends}
--Conflicts: libroot (<< 5.19.01-1)
-+Breaks: libroot (<< 5.19.01-1)
- Recommends: root-plugin-gui-guibuilder
- Description: GUI library for ROOT - run-time library
- The ROOT system provides a set of OO frameworks with all the
-@@ -20,7 +20,7 @@
- Section: libdevel
- Depends: libroot-gui at libvers@ (= ${binary:Version}), libroot-graf2d-gpad-dev, ${misc:Depends}
- Replaces: libroot-dev
--Conflicts: libroot-dev (<< 5.19.01-1)
-+Breaks: libroot-dev (<< 5.19.01-1)
- Description: GUI 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
---- a/build/package/common/libroot-hist-spectrum.control
-+++ b/build/package/common/libroot-hist-spectrum.control
-@@ -18,7 +18,7 @@
- Section: libdevel
- Depends: libroot-hist-spectrum at libvers@ (= ${binary:Version}), libroot-hist-dev, ${misc:Depends}
- Replaces: libroot-dev
--Conflicts: libroot-dev (<< 5.19.01-1)
-+Breaks: libroot-dev (<< 5.19.01-1)
- Description: Spectra analysis library for ROOT
- The ROOT system provides a set of OO frameworks with all the
- functionality needed to handle and analyze large amounts of data
---- a/build/package/common/libroot-hist.control
-+++ b/build/package/common/libroot-hist.control
-@@ -15,7 +15,7 @@
- Section: libdevel
- Depends: libroot-hist at libvers@ (= ${binary:Version}), libroot-core-dev, libroot-math-matrix-dev, ${misc:Depends}
- Replaces: libroot-dev
--Conflicts: libroot-dev (<< 5.19.01-1)
-+Breaks: libroot-dev (<< 5.19.01-1)
- Description: Histogram 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
---- a/build/package/common/libroot-html.control
-+++ b/build/package/common/libroot-html.control
-@@ -19,7 +19,7 @@
- Section: libdevel
- Depends: libroot-html at libvers@ (= ${binary:Version}), libroot-core-dev, ${misc:Depends}
- Replaces: libroot-dev
--Conflicts: libroot-dev (<< 5.19.01-1)
-+Breaks: libroot-dev (<< 5.19.01-1)
- Description: Html documentation generator 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
---- a/build/package/common/libroot-io-xmlparser.control
-+++ b/build/package/common/libroot-io-xmlparser.control
-@@ -14,7 +14,7 @@
- Section: libdevel
- Depends: libroot-io-xmlparser at libvers@ (= ${binary:Version}), libroot-core-dev, ${misc:Depends}
- Replaces: libroot-dev, root-plugin-xml
--Conflicts: libroot-dev (<< 5.19.01-1), root-plugin-xml (<< 5.19.01-1)
-+Breaks: libroot-dev (<< 5.19.01-1), root-plugin-xml (<< 5.19.01-1)
- Description: Input/output of ROOT objects - development files
- The ROOT system provides a set of OO frameworks with all the
- functionality needed to handle and analyze large amounts of data
---- a/build/package/common/libroot-io.control
-+++ b/build/package/common/libroot-io.control
-@@ -14,7 +14,7 @@
- Section: libdevel
- Depends: libroot-io at libvers@ (= ${binary:Version}), libroot-core-dev, ${misc:Depends}
- Replaces: libroot-dev, root-plugin-proof
--Conflicts: libroot-dev (<< 5.19.01-1), root-plugin-proof (<< 5.19.01-1)
-+Breaks: libroot-dev (<< 5.19.01-1), root-plugin-proof (<< 5.19.01-1)
- Description: Input/output of ROOT objects - development files
- The ROOT system provides a set of OO frameworks with all the
- functionality needed to handle and analyze large amounts of data
---- a/build/package/common/libroot-math-foam.control
-+++ b/build/package/common/libroot-math-foam.control
-@@ -18,7 +18,7 @@
- Section: libdevel
- Depends: libroot-math-foam at libvers@ (= ${binary:Version}), libroot-hist-dev, ${misc:Depends}
- Replaces: libroot-dev
--Conflicts: libroot-dev (<= 5.19.01-1)
-+Breaks: libroot-dev (<= 5.19.01-1)
- Description: Compact Version of the Cellular Event Generator
- The ROOT system provides a set of OO frameworks with all the
- functionality needed to handle and analyze large amounts of data
---- a/build/package/common/libroot-math-genvector.control
-+++ b/build/package/common/libroot-math-genvector.control
-@@ -15,7 +15,7 @@
- Section: libdevel
- Depends: libroot-math-genvector at libvers@ (= ${binary:Version}), libroot-core-dev, ${misc:Depends}
- Replaces: libroot-dev
--Conflicts: libroot-dev (<= 5.19.01-1)
-+Breaks: libroot-dev (<= 5.19.01-1)
- Description: Generalized vector library for ROOT
- The ROOT system provides a set of OO frameworks with all the
- functionality needed to handle and analyze large amounts of data
---- a/build/package/common/libroot-math-mathcore.control
-+++ b/build/package/common/libroot-math-mathcore.control
-@@ -14,7 +14,7 @@
- Section: libdevel
- Depends: libroot-math-mathcore at libvers@ (= ${binary:Version}), libroot-core-dev, ${misc:Depends}
- Replaces: libroot-dev
--Conflicts: libroot-dev (<< 5.19.01-1)
-+Breaks: libroot-dev (<< 5.19.01-1)
- Description: Core mathemathics library for ROOT
- The ROOT system provides a set of OO frameworks with all the
- functionality needed to handle and analyze large amounts of data
---- a/build/package/common/libroot-math-mathmore.control
-+++ b/build/package/common/libroot-math-mathmore.control
-@@ -14,7 +14,7 @@
- Architecture: any
- Section: libdevel
- Depends: libroot-math-mathmore at libvers@ (= ${binary:Version}), libroot-core-dev, libgsl0-dev, ${misc:Depends}
--Conflicts: libroot-mathmore-dev (<< 5.19.01-1)
-+Breaks: libroot-mathmore-dev (<< 5.19.01-1)
- Replaces: libroot-mathmore-dev
- Description: Mathmore plugin for ROOT
- The ROOT system provides a set of OO frameworks with all the
---- a/build/package/common/libroot-math-matrix.control
-+++ b/build/package/common/libroot-math-matrix.control
-@@ -14,7 +14,7 @@
- Section: libdevel
- Depends: libroot-math-matrix at libvers@ (= ${binary:Version}), libroot-core-dev, libroot-math-mathcore-dev, ${misc:Depends}
- Replaces: libroot-dev
--Conflicts: libroot-dev (<< 5.19.01-1)
-+Breaks: libroot-dev (<< 5.19.01-1)
- Description: Matrix library for ROOT
- The ROOT system provides a set of OO frameworks with all the
- functionality needed to handle and analyze large amounts of data
---- a/build/package/common/libroot-math-minuit.control
-+++ b/build/package/common/libroot-math-minuit.control
-@@ -18,7 +18,7 @@
- Depends: libroot-math-minuit at libvers@ (= ${binary:Version}), libroot-graf2d-graf-dev, ${misc:Depends}
- Provides: root-fitter
- Replaces: root-plugin-minuit (<< 5.09.01-7), libroot-minuit-dev
--Conflicts: libroot-minuit-dev (<< 5.19.01-1)
-+Breaks: libroot-minuit-dev (<< 5.19.01-1)
- Description: Minuit plugin for ROOT
- The ROOT system provides a set of OO frameworks with all the
- functionality needed to handle and analyze large amounts of data
---- a/build/package/common/libroot-math-physics.control
-+++ b/build/package/common/libroot-math-physics.control
-@@ -14,7 +14,7 @@
- Section: libdevel
- Depends: libroot-math-physics at libvers@ (= ${binary:Version}), libroot-math-matrix-dev, ${misc:Depends}
- Replaces: libroot-dev
--Conflicts: libroot-dev (<< 5.19.01-1)
-+Breaks: libroot-dev (<< 5.19.01-1)
- Description: Physics library for ROOT
- The ROOT system provides a set of OO frameworks with all the
- functionality needed to handle and analyze large amounts of data
---- a/build/package/common/libroot-math-quadp.control
-+++ b/build/package/common/libroot-math-quadp.control
-@@ -18,7 +18,7 @@
- Section: libdevel
- Depends: libroot-math-quadp at libvers@ (= ${binary:Version}), libroot-math-matrix-dev, ${misc:Depends}
- Replaces: libroot-quadp
--Conflicts: libroot-quadp (<< 5.19.01-1)
-+Breaks: libroot-quadp (<< 5.19.01-1)
- Description: QuadP extension 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
---- a/build/package/common/libroot-math-smatrix.control
-+++ b/build/package/common/libroot-math-smatrix.control
-@@ -14,7 +14,7 @@
- Section: libdevel
- Depends: libroot-math-smatrix at libvers@ (= ${binary:Version}), libroot-core-dev, ${misc:Depends}
- Replaces: libroot-dev
--Conflicts: libroot-dev (<< 5.19.01-1)
-+Breaks: libroot-dev (<< 5.19.01-1)
- Description: Sparse matrix library for ROOT
- The ROOT system provides a set of OO frameworks with all the
- functionality needed to handle and analyze large amounts of data
---- a/build/package/common/libroot-math-splot.control
-+++ b/build/package/common/libroot-math-splot.control
-@@ -39,7 +39,7 @@
- Section: libdevel
- Depends: libroot-math-splot at libvers@ (= ${binary:Version}), libroot-graf2d-graf-dev, libroot-graf3d-g3d-dev, libroot-tree-treeplayer-dev, ${misc:Depends}
- Replaces: libroot-dev
--Conflicts: libroot-dev (<< 5.19.01-1)
-+Breaks: libroot-dev (<< 5.19.01-1)
- Description: Splot library for ROOT
- The ROOT system provides a set of OO frameworks with all the
- functionality needed to handle and analyze large amounts of data
---- a/build/package/common/libroot-math-unuran.control
-+++ b/build/package/common/libroot-math-unuran.control
-@@ -29,7 +29,7 @@
- Section: libdevel
- Depends: libroot-math-unuran at libvers@ (= ${binary:Version}), libroot-hist-dev, ${misc:Depends}
- Replaces: libroot-unuran-dev
--Conflicts: libroot-unuran-dev (<< 5.19.01-1)
-+Breaks: libroot-unuran-dev (<< 5.19.01-1)
- Homepage: http://statistik.wu-wien.ac.at/unuran/
- Description: Random number generator library - development files
- The ROOT system provides a set of OO frameworks with all the
---- a/build/package/common/libroot-misc-memstat.control
-+++ b/build/package/common/libroot-misc-memstat.control
-@@ -15,7 +15,7 @@
- Section: libdevel
- Depends: libroot-misc-memstat at libvers@ (= ${binary:Version}), libroot-core-dev, ${misc:Depends}
- Replaces: libroot-dev
--Conflicts: libroot-dev (<< 5.19.01-1)
-+Breaks: libroot-dev (<< 5.19.01-1)
- Description: Memory statistics tool for use with ROOT
- The ROOT system provides a set of OO frameworks with all the
- functionality needed to handle and analyze large amounts of data
---- a/build/package/common/libroot-misc-minicern.control
-+++ b/build/package/common/libroot-misc-minicern.control
-@@ -14,7 +14,7 @@
- Section: libdevel
- Depends: libroot-misc-minicern at libvers@ (= ${binary:Version}), libroot-core-dev, ${misc:Depends}
- Replaces: libroot-dev
--Conflicts: libroot-dev (<< 5.19.01-1)
-+Breaks: libroot-dev (<< 5.19.01-1)
- Description: Small version of CERNLIB for use with ROOT
- The ROOT system provides a set of OO frameworks with all the
- functionality needed to handle and analyze large amounts of data
---- a/build/package/common/libroot-misc-table.control
-+++ b/build/package/common/libroot-misc-table.control
-@@ -14,7 +14,7 @@
- Section: libdevel
- Depends: libroot-misc-table at libvers@ (= ${binary:Version}), libroot-graf3d-g3d-dev, libroot-graf2d-gpad-dev, libroot-tree-dev, ${misc:Depends}
- Replaces: libroot-dev
--Conflicts: libroot-dev (<< 5.19.01-1)
-+Breaks: libroot-dev (<< 5.19.01-1)
- Description: Table library for ROOT
- The ROOT system provides a set of OO frameworks with all the
- functionality needed to handle and analyze large amounts of data
---- a/build/package/common/libroot-montecarlo-eg.control
-+++ b/build/package/common/libroot-montecarlo-eg.control
-@@ -14,7 +14,7 @@
- Section: libdevel
- Depends: libroot-montecarlo-eg at libvers@ (= ${binary:Version}), libroot-graf2d-gpad-dev, libroot-graf3d-g3d-dev, ${misc:Depends}
- Replaces: libroot-dev
--Conflicts: libroot-dev (<< 5.19.01-1)
-+Breaks: libroot-dev (<< 5.19.01-1)
- Description: Event generator library for ROOT
- The ROOT system provides a set of OO frameworks with all the
- functionality needed to handle and analyze large amounts of data
---- a/build/package/common/libroot-montecarlo-g4root.control
-+++ b/build/package/common/libroot-montecarlo-g4root.control
-@@ -14,7 +14,7 @@
- Section: libdevel
- Depends: libroot-montecarlo-g4root at libvers@ (= ${binary:Version}), libroot-core-dev, ${misc:Depends}
- Replaces: libroot-dev
--Conflicts: libroot-dev (<< 5.19.01-1)
-+Breaks: libroot-dev (<< 5.19.01-1)
- Description: Geant4 interface library for ROOT
- The ROOT system provides a set of OO frameworks with all the
- functionality needed to handle and analyze large amounts of data
---- a/build/package/common/libroot-montecarlo-vmc.control
-+++ b/build/package/common/libroot-montecarlo-vmc.control
-@@ -15,7 +15,7 @@
- Section: libdevel
- Depends: libroot-montecarlo-vmc at libvers@ (= ${binary:Version}), libroot-geom-dev, libroot-montecarlo-eg-dev, ${misc:Depends}
- Replaces: libroot-dev
--Conflicts: libroot-dev (<< 5.19.01-1)
-+Breaks: libroot-dev (<< 5.19.01-1)
- Description: Virtual Monte-Carlo (simulation) library for ROOT
- The ROOT system provides a set of OO frameworks with all the
- functionality needed to handle and analyze large amounts of data
---- a/build/package/common/libroot-net-auth.control
-+++ b/build/package/common/libroot-net-auth.control
-@@ -15,7 +15,7 @@
- Section: libdevel
- Depends: libroot-net-auth at libvers@ (= ${binary:Version}), libroot-core-dev, ${misc:Depends}
- Replaces: libroot-dev
--Conflicts: libroot-dev (<= 5.19.01-1)
-+Breaks: libroot-dev (<= 5.19.01-1)
- Description: Authentication extension for ROOT
- The ROOT system provides a set of OO frameworks with all the
- functionality needed to handle and analyze large amounts of data
---- a/build/package/common/libroot-net-ldap.control
-+++ b/build/package/common/libroot-net-ldap.control
-@@ -15,7 +15,7 @@
- Architecture: any
- Section: libdevel
- Depends: libroot-net-ldap at libvers@ (= ${binary:Version}), libroot-core-dev, libldap2-dev | libldap-dev, ${misc:Depends}
--Conflicts: libroot-ldap-dev (<< 5.19.01-1)
-+Breaks: libroot-ldap-dev (<< 5.19.01-1)
- Replaces: libroot-ldap-dev (<< 5.19.01-1)
- Description: Ldap extension for ROOT
- The ROOT system provides a set of OO frameworks with all the
---- a/build/package/common/libroot-net.control
-+++ b/build/package/common/libroot-net.control
-@@ -14,7 +14,7 @@
- Section: libdevel
- Depends: libroot-net at libvers@ (= ${binary:Version}), libroot-math-mathcore-dev, ${misc:Depends}
- Replaces: libroot-dev
--Conflicts: libroot-dev (<< 5.19.01-1)
-+Breaks: libroot-dev (<< 5.19.01-1)
- Description: Net library for ROOT
- The ROOT system provides a set of OO frameworks with all the
- functionality needed to handle and analyze large amounts of data
---- a/build/package/common/libroot-proof-clarens.control
-+++ b/build/package/common/libroot-proof-clarens.control
-@@ -20,7 +20,7 @@
- Architecture: any
- Section: libdevel
- Depends: libroot-proof-clarens at libvers@ (= ${binary:Version}), libroot-core-dev, libxmlrpc-c3-dev | libxmlrpc-c-dev, ${misc:Depends}
--Conflicts: libroot-clarens-dev (<< 5.19.01-1)
-+Breaks: libroot-clarens-dev (<< 5.19.01-1)
- Replaces: libroot-clarens-dev
- Homepage: http://clarens.sourceforge.net
- Description: Clarens extension for ROOT - development files
---- a/build/package/common/libroot-proof-proofplayer.control
-+++ b/build/package/common/libroot-proof-proofplayer.control
-@@ -3,7 +3,7 @@
- Depends: ${shlibs:Depends}, ${misc:Depends}
- Suggests: root-plugin-net-netx, root-plugin-proof-xproof
- Replaces: root-plugin-proof-proofplayer (<< 5.23.05-1)
--Conflicts: root-plugin-proof-proofplayer (<< 5.23.05-1)
-+Breaks: root-plugin-proof-proofplayer (<< 5.23.05-1)
- Description: PROOF plugin for ROOT
- The ROOT system provides a set of OO frameworks with all the
- functionality needed to handle and analyze large amounts of data
-@@ -19,7 +19,7 @@
- Depends: libroot-proof-proofplayer at libvers@ (= ${binary:Version}), libroot-proof-dev, ${misc:Depends}
- Suggests: root-plugin-net-netx, root-plugin-proof-xproof
- Replaces: root-plugin-proof-proofplayer (<< 5.23.05-1)
--Conflicts: root-plugin-proof-proofplayer (<< 5.23.05-1)
-+Breaks: root-plugin-proof-proofplayer (<< 5.23.05-1)
- Description: PROOF plugin for ROOT
- The ROOT system provides a set of OO frameworks with all the
- functionality needed to handle and analyze large amounts of data
---- a/build/package/common/libroot-proof.control
-+++ b/build/package/common/libroot-proof.control
-@@ -15,7 +15,7 @@
- Section: libdevel
- Depends: libroot-proof at libvers@ (= ${binary:Version}), libroot-math-mathcore-dev, libroot-tree-dev, ${misc:Depends}
- Replaces: root-plugin-proof
--Conflicts: root-plugin-proof (<< 5.19.01-1)
-+Breaks: root-plugin-proof (<< 5.19.01-1)
- Description: PROOF library for ROOT
- The ROOT system provides a set of OO frameworks with all the
- functionality needed to handle and analyze large amounts of data
---- a/build/package/common/libroot-tree-treeplayer.control
-+++ b/build/package/common/libroot-tree-treeplayer.control
-@@ -11,7 +11,7 @@
- Package: libroot-tree-treeplayer-dev
- Architecture: any
- Section: libdevel
--Conflicts: libroot-dev (<< 5.19.01-1)
-+Breaks: libroot-dev (<< 5.19.01-1)
- Replaces: libroot-dev
- Depends: libroot-tree-treeplayer at libvers@ (= ${binary:Version}), libroot-tree-dev, libroot-graf2d-gpad-dev, libroot-graf3d-g3d-dev, ${misc:Depends}
- Description: Library to loop over a ROOT tree
---- a/build/package/common/libroot-tree.control
-+++ b/build/package/common/libroot-tree.control
-@@ -15,7 +15,7 @@
- Section: libdevel
- Depends: libroot-tree at libvers@ (= ${binary:Version}), libroot-core-dev, ${misc:Depends}
- Replaces: libroot-dev
--Conflicts: libroot-dev (<< 5.19.01-1)
-+Breaks: libroot-dev (<< 5.19.01-1)
- Description: Tree library for ROOT
- The ROOT system provides a set of OO frameworks with all the
- functionality needed to handle and analyze large amounts of data
---- a/build/package/common/root-plugin-geom-gdml.control
-+++ b/build/package/common/root-plugin-geom-gdml.control
-@@ -1,6 +1,6 @@
- Package: root-plugin-geom-gdml
- Architecture: any
--Conflicts: libroot-dev (<< 5.19.01-1)
-+Breaks: libroot-dev (<< 5.19.01-1)
- Replaces: libroot-dev
- Depends: ${shlibs:Depends}, python-support, ${python:Depends}, libroot-geom-dev, ${misc:Depends}
- Description: GDML import/export module for ROOT geometries
---- a/build/package/common/root-plugin-geom-geombuilder.control
-+++ b/build/package/common/root-plugin-geom-geombuilder.control
-@@ -1,6 +1,6 @@
- Package: root-plugin-geom-geombuilder
- Architecture: any
--Conflicts: libroot-dev (<< 5.19.01-1)
-+Breaks: libroot-dev (<< 5.19.01-1)
- Replaces: libroot-dev
- Depends: ${shlibs:Depends}, ${misc:Depends}
- Description: Geometry builder plugin for ROOT
---- a/build/package/common/root-plugin-geom-geompainter.control
-+++ b/build/package/common/root-plugin-geom-geompainter.control
-@@ -1,6 +1,6 @@
- Package: root-plugin-geom-geompainter
- Architecture: any
--Conflicts: libroot-dev (<< 5.19.01-1)
-+Breaks: libroot-dev (<< 5.19.01-1)
- Replaces: libroot-dev
- Depends: ${shlibs:Depends}, ${misc:Depends} , ${misc:Depends}
- Description: Geometry painter plugin for ROOT
---- a/build/package/common/root-plugin-graf2d-x11.control
-+++ b/build/package/common/root-plugin-graf2d-x11.control
-@@ -1,7 +1,7 @@
- Package: root-plugin-graf2d-x11
- Architecture: any
- Replaces: libroot-dev
--Conflicts: libroot-dev (<< 5.19.01-1)
-+Breaks: libroot-dev (<< 5.19.01-1)
- Provides: root-system-display
- Depends: ${shlibs:Depends}, ${misc:Depends}
- Description: X window system plugin for ROOT
---- a/build/package/common/root-plugin-graf3d-x3d.control
-+++ b/build/package/common/root-plugin-graf3d-x3d.control
-@@ -1,6 +1,6 @@
- Package: root-plugin-graf3d-x3d
- Architecture: any
--Conflicts: libroot-dev (<< 5.19.01-1)
-+Breaks: libroot-dev (<< 5.19.01-1)
- Replaces: libroot-dev
- Depends: ${shlibs:Depends}, ${misc:Depends}
- Recommends: root-plugin-graf3d-gl
---- a/build/package/common/root-plugin-gui-fitpanel.control
-+++ b/build/package/common/root-plugin-gui-fitpanel.control
-@@ -1,6 +1,6 @@
- Package: root-plugin-gui-fitpanel
- Architecture: any
--Conflicts: libroot-dev (<< 5.19.01-1)
-+Breaks: libroot-dev (<< 5.19.01-1)
- Replaces: libroot-dev
- Depends: ${shlibs:Depends}, ${misc:Depends}
- Description: GUI element for fits plugin for ROOT
---- a/build/package/common/root-plugin-gui-guibuilder.control
-+++ b/build/package/common/root-plugin-gui-guibuilder.control
-@@ -1,6 +1,6 @@
- Package: root-plugin-gui-guibuilder
- Architecture: any
--Conflicts: libroot-dev (<< 5.19.01-1)
-+Breaks: libroot-dev (<< 5.19.01-1)
- Replaces: libroot-dev
- Depends: ${shlibs:Depends}, ${misc:Depends}
- Description: GUI editor plug-in for ROOT
---- a/build/package/common/root-plugin-gui-sessionviewer.control
-+++ b/build/package/common/root-plugin-gui-sessionviewer.control
-@@ -1,6 +1,6 @@
- Package: root-plugin-gui-sessionviewer
- Architecture: any
--Conflicts: libroot-dev (<< 5.19.01-1)
-+Breaks: libroot-dev (<< 5.19.01-1)
- Replaces: libroot-dev
- Depends: ${shlibs:Depends}, ${misc:Depends}
- Description: GUI to browse an interactive PROOF session
---- a/build/package/common/root-plugin-hist-histpainter.control
-+++ b/build/package/common/root-plugin-hist-histpainter.control
-@@ -1,7 +1,7 @@
- Package: root-plugin-hist-histpainter
- Architecture: any
- Replaces: libroot-dev
--Conflicts: libroot-dev (<< 5.19.01-1)
-+Breaks: libroot-dev (<< 5.19.01-1)
- Depends: ${shlibs:Depends}, ${misc:Depends}
- Description: Histogram painter plugin for ROOT
- The ROOT system provides a set of OO frameworks with all the
---- a/build/package/common/root-plugin-hist-spectrumpainter.control
-+++ b/build/package/common/root-plugin-hist-spectrumpainter.control
-@@ -2,7 +2,7 @@
- Architecture: any
- Depends: ${shlibs:Depends}, ${misc:Depends}
- Replaces: libroot-dev
--Conflicts: libroot-dev (<< 5.19.01-1)
-+Breaks: libroot-dev (<< 5.19.01-1)
- Description: Spectrum painter plugin for ROOT
- The ROOT system provides a set of OO frameworks with all the
- functionality needed to handle and analyze large amounts of data
---- a/build/package/common/root-plugin-proof-proofplayer.control
-+++ b/build/package/common/root-plugin-proof-proofplayer.control
-@@ -3,7 +3,7 @@
- Depends: ${shlibs:Depends}, ${misc:Depends}
- Suggests: root-plugin-net-netx, root-plugin-proof-xproof
- Replaces: root-plugin-proof-proofplayer (< 5.23.05-1)
--Conflicts: root-plugin-proof-proofplayer (< 5.23.05-1)
-+Breaks: root-plugin-proof-proofplayer (< 5.23.05-1)
- Description: PROOF plugin for ROOT
- The ROOT system provides a set of OO frameworks with all the
- functionality needed to handle and analyze large amounts of data
-@@ -18,7 +18,7 @@
- Depends: libroot-proof-proofplayer at libvers@ (= ${binary:Version}), libroot-proof-dev, ${misc:Depends}
- Suggests: root-plugin-net-netx, root-plugin-proof-xproof
- Replaces: root-plugin-proof-proofplayer (< 5.23.05-1)
--Conflicts: root-plugin-proof-proofplayer (< 5.23.05-1)
-+Breaks: root-plugin-proof-proofplayer (< 5.23.05-1)
- Description: PROOF plugin for ROOT
- The ROOT system provides a set of OO frameworks with all the
- functionality needed to handle and analyze large amounts of data
---- a/build/package/common/root-plugin-proof-xproof.control
-+++ b/build/package/common/root-plugin-proof-xproof.control
-@@ -3,7 +3,7 @@
- Depends: ${shlibs:Depends}, ${misc:Depends}
- Suggests: root-plugin-net-netx
- Replaces: root-proofd
--Conflicts: root-proofd (<= 5.13.05-4)
-+Breaks: root-proofd (<= 5.13.05-4)
- Description: XPROOF plugin for ROOT
- The ROOT system provides a set of OO frameworks with all the
- functionality needed to handle and analyze large amounts of data
---- a/build/package/common/root-plugin-tree-treeplayer.control
-+++ b/build/package/common/root-plugin-tree-treeplayer.control
-@@ -1,6 +1,6 @@
- Package: root-plugin-tree-treeplayer
- Architecture: any
--Conflicts: libroot-dev (<< 5.19.01-1)
-+Breaks: libroot-dev (<< 5.19.01-1)
- Replaces: libroot-dev
- Depends: ${shlibs:Depends}, ${misc:Depends}
- Description: Plug-in to loop over a ROOT tree
---- a/build/package/common/root-plugin-tree-treeviewer.control
-+++ b/build/package/common/root-plugin-tree-treeviewer.control
-@@ -1,6 +1,6 @@
- Package: root-plugin-tree-treeviewer
- Architecture: any
--Conflicts: libroot-dev (<< 5.19.01-1)
-+Breaks: libroot-dev (<< 5.19.01-1)
- Replaces: libroot-dev
- Depends: ${shlibs:Depends}, ${misc:Depends}
- Description: GUI to browse an a ROOT tree
---- a/build/package/common/root-system-xrootd.control
-+++ b/build/package/common/root-system-xrootd.control
-@@ -3,7 +3,7 @@
- Architecture: any
- Depends: ${shlibs:Depends}, ${misc:Depends}
- Replaces: root-system-xrootd
--Conflicts: root-system-xrootd (<< 5.19.03-1)
-+Breaks: root-system-xrootd (<< 5.19.03-1)
- Homepage: http://xrootd.slac.stanford.edu
- Description: Plugins for xrootd protocol
- The ROOT system provides a set of OO frameworks with all the
diff --git a/debian/patches/09-fix-spelling-allows-one-to.patch b/debian/patches/09-fix-spelling-allows-one-to.patch
deleted file mode 100644
index dbbc511..0000000
--- a/debian/patches/09-fix-spelling-allows-one-to.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/build/package/common/libroot-math-splot.control
-+++ b/build/package/common/libroot-math-splot.control
-@@ -24,7 +24,7 @@
- data sample. In order to be able to do so, one must be able to unfold
- from the distribution of the whole data sample.
- .
-- The SPlot method allows to reconstruct the distributions for the
-+ The SPlot method allows one to reconstruct the distributions for the
- control variable, independently for each of the various sources of
- events, without making use of any a priori knowledge on this
- variable. The aim is thus to use the knowledge available for the
-@@ -62,7 +62,7 @@
- data sample. In order to be able to do so, one must be able to unfold
- from the distribution of the whole data sample.
- .
-- The SPlot method allows to reconstruct the distributions for the
-+ The SPlot method allows one to reconstruct the distributions for the
- control variable, independently for each of the various sources of
- events, without making use of any a priori knowledge on this
- variable. The aim is thus to use the knowledge available for the
diff --git a/debian/patches/10-remove-obsolete-build-dep.patch b/debian/patches/10-remove-obsolete-build-dep.patch
deleted file mode 100644
index 1e038d6..0000000
--- a/debian/patches/10-remove-obsolete-build-dep.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/build/package/lib/makebuilddepend.sh
-+++ b/build/package/lib/makebuilddepend.sh
-@@ -196,7 +196,7 @@
- libroot-graf3d-eve) ;;
- libroot-graf3d-g3d) ;;
- libroot-graf3d-gl)
-- echo -n ", libglu1-mesa-dev | libglu1-xorg-dev "
-+ echo -n ", libglu1-mesa-dev"
- echo -n "| xlibmesa-glu-dev | libglu-dev"
- echo -n ", libglew1.5-dev | libglew-dev"
- echo -n ", libftgl-dev | ftgl-dev" ;;
-@@ -250,7 +250,7 @@
- # Input the build dependencies of the libafterimage-dev package
- root-plugin-graf2d-asimage)
- echo -n ", libjpeg62-dev, libpng12-dev, libtiff4-dev"
-- echo -n ", libgif-dev | libungif4-dev, libxinerama-dev";;
-+ echo -n ", libgif-dev, libxinerama-dev";;
- root-plugin-graf2d-qt) need_qt=1 ;;
- root-plugin-graf2d-gviz) ;;
- root-plugin-graf3d-x3d) ;;
diff --git a/debian/patches/11-fix-circular-dep.patch b/debian/patches/11-fix-circular-dep.patch
deleted file mode 100644
index 628e20f..0000000
--- a/debian/patches/11-fix-circular-dep.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/build/package/lib/makelists.sh
-+++ b/build/package/lib/makelists.sh
-@@ -136,7 +136,7 @@
- net/bonjour) set_lib_names $base $sub ;;
- net/krb5auth) set_plugin_names $base krb5 ;;
- net/srputils) set_plugin_names $base srp ;;
-- net/rpdutils) set_lib_names core "" root-system-bin ;;
-+ net/rpdutils) set_lib_names $base auth root-system-bin ;;
- net/*) set_plugin_names $base $sub ;;
- proof/proofd) set_plugin_names $base xproof root-system-${base}d ;;
- proof/proofx) set_plugin_names $base xproof ;;
diff --git a/debian/patches/12-fix-net-auth-control.patch b/debian/patches/12-fix-net-auth-control.patch
deleted file mode 100644
index 651c9d3..0000000
--- a/debian/patches/12-fix-net-auth-control.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/build/package/common/libroot-net-auth.control
-+++ b/build/package/common/libroot-net-auth.control
-@@ -15,7 +15,7 @@
- Section: libdevel
- Depends: libroot-net-auth at libvers@ (= ${binary:Version}), libroot-core-dev, ${misc:Depends}
- Replaces: libroot-dev
--Breaks: libroot-dev (<= 5.19.01-1)
-+Breaks: libroot-dev (<= 5.19.01-1), libroot-core-dev (<< 5.30.00-1)
- Description: Authentication extension for ROOT
- 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/patches/13-fix-circular-dep.patch b/debian/patches/13-fix-circular-dep.patch
deleted file mode 100644
index 3312d9e..0000000
--- a/debian/patches/13-fix-circular-dep.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/build/package/common/libroot-core.control
-+++ b/build/package/common/libroot-core.control
-@@ -23,9 +23,9 @@
- Package: libroot-core-dev
- Section: libdevel
- Architecture: any
--Depends: ${shlibs:Depends}, zlib1g-dev, libssl-dev, comerr-dev, libkrb5-dev, libx11-dev, libfreetype6-dev, libpcre3-dev, libxpm-dev, g++ | c++-compiler, ${python:Depends}, cfortran, libroot-io-dev, libroot-net-dev, ${misc:Depends}
-+Depends: ${shlibs:Depends}, zlib1g-dev, libssl-dev, comerr-dev, libkrb5-dev, libx11-dev, libfreetype6-dev, libpcre3-dev, libxpm-dev, g++ | c++-compiler, ${python:Depends}, cfortran, ${misc:Depends}
- Suggests: root-system-bin, gccxml
--Recommends: libroot-geom-dev, libroot-gui-dev, libroot-hist-dev, libroot-proof-dev, libroot-tree-dev
-+Recommends: libroot-geom-dev, libroot-gui-dev, libroot-hist-dev, libroot-proof-dev, libroot-tree-dev, libroot-io-dev, libroot-net-dev
- Provides: libroot-dev
- Replaces: libroot-dev (<< 5.19.01-1)
- Breaks: libroot-dev (<< 5.19.01-1)
diff --git a/debian/patches/16-fix-libroot-html-control.patch b/debian/patches/16-fix-libroot-html-control.patch
deleted file mode 100644
index 2537062..0000000
--- a/debian/patches/16-fix-libroot-html-control.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- a/build/package/common/libroot-html.control
-+++ b/build/package/common/libroot-html.control
-@@ -7,10 +7,6 @@
- functionality needed to handle and analyze large amounts of data
- efficiently.
- .
-- The ROOT system provides a set of OO frameworks with all the
-- functionality needed to handle and analyze large amounts of data
-- efficiently.
-- .
- This package contains classes to automatically extract documentation
- from marked up sources.
-
-@@ -24,10 +20,6 @@
- The ROOT system provides a set of OO frameworks with all the
- functionality needed to handle and analyze large amounts of data
- efficiently.
-- .
-- The ROOT system provides a set of OO frameworks with all the
-- functionality needed to handle and analyze large amounts of data
-- efficiently.
- .
- This package contains classes to automatically extract documentation
- from marked up sources.
diff --git a/debian/patches/17-remove-ld.so.conf.d-in-install-file.patch b/debian/patches/17-remove-ld.so.conf.d-in-install-file.patch
deleted file mode 100644
index 5290ba3..0000000
--- a/debian/patches/17-remove-ld.so.conf.d-in-install-file.patch
+++ /dev/null
@@ -1,5 +0,0 @@
---- a/build/package/common/libroot-core.install.in
-+++ b/build/package/common/libroot-core.install.in
-@@ -1,2 +1 @@
- @prefix@/lib/root/@version@/cint
--/etc/ld.so.conf.d
diff --git a/debian/patches/18-create-so-symlinks-for-plugins.patch b/debian/patches/18-create-so-symlinks-for-plugins.patch
deleted file mode 100644
index 6504e97..0000000
--- a/debian/patches/18-create-so-symlinks-for-plugins.patch
+++ /dev/null
@@ -1,37 +0,0 @@
---- a/build/package/lib/makelist
-+++ b/build/package/lib/makelist
-@@ -71,11 +71,13 @@
- # If the development and library package is the same (plugins), then we need
- # only add the soversion to the library directory
- ifeq ($(DIRS), net/xrootd)
--PKGLIBS := $(ALLLIBS:$(RLIBD)/%=$(RLIBD)/$(SOVER)/%)
-+PKGLIBS := $(ALLLIBS:$(RLIBD)/%=$(RLIBD)/$(SOVER)/%) \
-+ $(ALLLIBS:$(RLIBD)/%=$(RLIBD)/%)
- else
- PKGLIBS := $(ALLLIBS:$(RLIBD)/%=$(RLIBD)/$(SOVER)/%.$(SOVER)) \
- $(ALLLIBS:$(RLIBD)/%=$(RLIBD)/$(SOVER)/%.$(MAJOR)) \
-- $(ALLLIBS:$(RLIBD)/%=$(RLIBD)/$(SOVER)/%)
-+ $(ALLLIBS:$(RLIBD)/%=$(RLIBD)/$(SOVER)/%) \
-+ $(ALLLIBS:$(RLIBD)/%=$(RLIBD)/%.$(SOVER))
- endif # $(DIRS) = net/xrootd
- endif # $(LIB) = $(DEV)
- endif # $(LIB)
-@@ -95,6 +97,18 @@
- b=`basename $$i` ; \
- ln -fs $(SOVER)/$$b . ; \
- ln -fs $(SOVER)/$$b.$(SOVER) . ; done)
-+else # $(LIB) = $(DEV)
-+ifeq ($(DIRS), net/xrootd)
-+ @(cd $(BUILD)/$(RLIBD) && \
-+ for i in $(ALLLIBS) ; do \
-+ b=`basename $$i` ; \
-+ ln -fs $(SOVER)/$$b . ; done)
-+else # $(DIRS) != net/xrootd
-+ @(cd $(BUILD)/$(RLIBD) && \
-+ for i in $(ALLLIBS) ; do \
-+ b=`basename $$i` ; \
-+ ln -fs $(SOVER)/$$b.$(SOVER) . ; done)
-+endif # $(DIRS) = net/xrootd
- endif # $(LIB) = $(DEV)
- endif # $(LIB)
-
diff --git a/debian/patches/20-add-libgl2ps-build-dep.patch b/debian/patches/20-add-libgl2ps-build-dep.patch
deleted file mode 100644
index 8ff1c19..0000000
--- a/debian/patches/20-add-libgl2ps-build-dep.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- a/build/package/lib/makebuilddepend.sh
-+++ b/build/package/lib/makebuilddepend.sh
-@@ -199,7 +199,8 @@
- echo -n ", libglu1-mesa-dev"
- echo -n "| xlibmesa-glu-dev | libglu-dev"
- echo -n ", libglew1.5-dev | libglew-dev"
-- echo -n ", libftgl-dev | ftgl-dev" ;;
-+ echo -n ", libftgl-dev | ftgl-dev"
-+ echo -n ", libgl2ps-dev" ;;
- libroot-gui) ;;
- libroot-gui-ged) ;;
- libroot-hist) ;;
---- a/build/package/common/libroot-graf3d-gl.control
-+++ b/build/package/common/libroot-graf3d-gl.control
-@@ -22,7 +22,7 @@
- Package: libroot-graf3d-gl-dev
- Architecture: any
- Section: libdevel
--Depends: libroot-graf3d-gl at libvers@ (= ${binary:Version}), ${misc:Depends}
-+Depends: libroot-graf3d-gl at libvers@ (= ${binary:Version}), libgl2ps-dev, ${misc:Depends}
- Breaks: root-plugin-graf3d-gl (<< 5.19.00-1)
- Replaces: root-plugin-graf3d-gl
- Description: GL plugin for ROOT - development files
diff --git a/debian/patches/27-fix-typo-writeable-writable.patch b/debian/patches/27-fix-typo-writeable-writable.patch
index 69c68f0..425170f 100644
--- a/debian/patches/27-fix-typo-writeable-writable.patch
+++ b/debian/patches/27-fix-typo-writeable-writable.patch
@@ -1,25 +1,3 @@
---- a/build/package/debian/root-system-rootd.postinst
-+++ b/build/package/debian/root-system-rootd.postinst
-@@ -66,7 +66,7 @@
- -exec chgrp rootd {} \;
-
- # Create the tmp and pub directories in /var/spool/rootd and
-- # make them world read- and writeable.
-+ # make them world read- and writable.
- if [ ! -d /var/spool/rootd/tmp ] ; then
- mkdir -p /var/spool/rootd/tmp
- chmod 1777 /var/spool/rootd/tmp
---- a/build/package/rpm/root-system-rootd.pre
-+++ b/build/package/rpm/root-system-rootd.pre
-@@ -43,7 +43,7 @@
- -exec chgrp rootd {} \;
-
- # Create the tmp and pub directories in /var/spool/rootd and
--# make them world read- and writeable.
-+# make them world read- and writable.
- if [ ! -d /var/spool/rootd/tmp ] ; then
- mkdir -p /var/spool/rootd/tmp
- chmod 777 /var/spool/rootd/tmp
--- a/config/root-help.el.in
+++ b/config/root-help.el.in
@@ -391,7 +391,7 @@
diff --git a/debian/patches/46-fix-typo-explicitely-explicitly.patch b/debian/patches/46-fix-typo-explicitely-explicitly.patch
index 80f935d..fbd78c4 100644
--- a/debian/patches/46-fix-typo-explicitely-explicitly.patch
+++ b/debian/patches/46-fix-typo-explicitely-explicitly.patch
@@ -1,14 +1,3 @@
---- a/build/win/w32pragma.h
-+++ b/build/win/w32pragma.h
-@@ -65,7 +65,7 @@
- #define CRTAPI1 _cdecl
- #define CRTAPI2 _cdecl
- #define _X86_ 1
--// #define _DLL - used to be explicitely defined,
-+// #define _DLL - used to be explicitly defined,
- // but it's implicitely defined via /MD(d)
- #define G__REDIRECTIO 1
- #define G__SHAREDLIB 1
--- a/cint/configure
+++ b/cint/configure
@@ -701,7 +701,7 @@
diff --git a/debian/patches/55-fix-typo-authentification-authentication.patch b/debian/patches/55-fix-typo-authentification-authentication.patch
index 028cd27..7abb7f3 100644
--- a/debian/patches/55-fix-typo-authentification-authentication.patch
+++ b/debian/patches/55-fix-typo-authentification-authentication.patch
@@ -1,34 +1,6 @@
-diff --git a/build/package/debian/root-system-rootd.default b/build/package/debian/root-system-rootd.default
-index 294dd0f..3e8b814 100644
---- a/build/package/debian/root-system-rootd.default
-+++ b/build/package/debian/root-system-rootd.default
-@@ -54,7 +54,7 @@ SSH_PORT=
- # debugging purposes. Only a value of "yes" enables.
- #ROOTD_FOREGROUND=
-
--# Disable authentification (-noauth)
-+# Disable authentication (-noauth)
- # do not require client authentication. This shouldn't be enabled
- # unless you know what you're doing. Only a value of "yes" enables.
- #ROOTD_NO_AUTH=
-diff --git a/build/package/debian/root-system-rootd.init.in b/build/package/debian/root-system-rootd.init.in
-index 7f9677c..6899422 100644
---- a/build/package/debian/root-system-rootd.init.in
-+++ b/build/package/debian/root-system-rootd.init.in
-@@ -51,7 +51,7 @@ test ! "x$ROOTD_DEBUG" = "x" && DAEMON_OPTS="$DAEMON_OPTS -d $ROOTD_DEBUG"
- test ! "x$ROOTD_ACCESS_RULES" = "x" && DAEMON_OPTS="$DAEMON_OPTS -D $ROOTD_ACCESS_RULES"
- # Run in foreground (shouldn't be done in init script)
- test "x$ROOTD_FOREGROUND" = "xyes" && DAEMON_OPTS="$DAEMON_OPTS -f"
--# No client authentification (security issue)
-+# No client authentication (security issue)
- test "x$ROOTD_NO_AUTH" = "xyes" && DAEMON_OPTS="$DAEMON_OPTS -noauth"
- # files can only be opened read-only
- test "x$ROOTD_READ_ONLY" = "xyes" && DAEMON_OPTS="$DAEMON_OPTS -r"
-diff --git a/net/krb5auth/src/Krb5Auth.cxx b/net/krb5auth/src/Krb5Auth.cxx
-index 555d483..c5df15a 100644
--- a/net/krb5auth/src/Krb5Auth.cxx
+++ b/net/krb5auth/src/Krb5Auth.cxx
-@@ -485,7 +485,7 @@ Int_t Krb5Authenticate(TAuthenticate *auth, TString &user, TString &det,
+@@ -485,7 +485,7 @@
if (gDebug > 1)
Info("Krb5Authenticate",
diff --git a/debian/patches/59-remove-duplicate-field.patch b/debian/patches/59-remove-duplicate-field.patch
deleted file mode 100644
index 5cc201d..0000000
--- a/debian/patches/59-remove-duplicate-field.patch
+++ /dev/null
@@ -1,10 +0,0 @@
-diff --git a/build/package/common/root-system-xrootd.control b/build/package/common/root-system-xrootd.control
-index 941edb6..cf1c9c6 100644
---- a/build/package/common/root-system-xrootd.control
-+++ b/build/package/common/root-system-xrootd.control
-@@ -1,5 +1,4 @@
- Package: root-plugin-net-xrootd
--Section: science
- Architecture: any
- Depends: ${shlibs:Depends}, ${misc:Depends}
- Replaces: root-system-xrootd
diff --git a/debian/patches/60-remove-obsolete-package-dependency.patch b/debian/patches/60-remove-obsolete-package-dependency.patch
deleted file mode 100644
index 766d428..0000000
--- a/debian/patches/60-remove-obsolete-package-dependency.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/build/package/common/ttf-root-installer.control b/build/package/common/ttf-root-installer.control
-index ccbbe01..0eabe28 100644
---- a/build/package/common/ttf-root-installer.control
-+++ b/build/package/common/ttf-root-installer.control
-@@ -1,7 +1,7 @@
- Package: ttf-root-installer
- Architecture: all
- Section: contrib/fonts
--Depends: ${misc:Depends}, wget (>= 1.9.1-4), xfonts-utils | xutils (>= 4.0.2), debconf (>= 1.2.0), ${misc:Depends}
-+Depends: ${misc:Depends}, wget (>= 1.9.1-4), xfonts-utils, debconf (>= 1.2.0), ${misc:Depends}
- Provides: root-ttf
- Conflicts: ttf-root
- Description: True type fonts for ROOT - installer package
diff --git a/debian/patches/61-fix-libjpeg-dev-dependency.patch b/debian/patches/61-fix-libjpeg-dev-dependency.patch
deleted file mode 100644
index 7ca496a..0000000
--- a/debian/patches/61-fix-libjpeg-dev-dependency.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/build/package/debian/control
-+++ b/build/package/debian/control
-@@ -3,7 +3,7 @@
- Priority: optional
- Maintainer: Antonio Salvucci <s4lb04 at gmail.com>
- Homepage: http://root.cern.ch
--Build-Depends: debhelper (>= 5.0.37.2), po-debconf, libssl-dev, comerr-dev, libxpm-dev, x11proto-xext-dev, libxext-dev, libfreetype6-dev, libpcre3-dev, zlib1g-dev | libz-dev, python-dev (>= 2.1), graphviz, ttf-freefont, libncurses5-dev | libcurses-dev, libgraphviz-dev, libxft-dev, python-support (>= 0.3), ruby (>= 1.8), ruby1.8-dev | ruby-dev (>= 1.8), libglu1-mesa-dev | libglu1-xorg-dev | xlibmesa-glu-dev | libglu-dev, libglew1.5-dev | libglew-dev, libftgl-dev | ftgl-dev, libxml2-dev, libgsl0-dev, libldap2-dev | libldap-dev, libavahi-compat-libdnssd-dev, libxmlrpc-c3-dev | libxmlrpc-c-dev, libcurl4-gnutls-dev | libcurl4-openssl-dev | libcurl-dev, libjpeg62-dev, libpng12-dev, libtiff4-dev, libgif-dev | libungif4-dev, libxinerama-dev, libfftw3-dev | fftw3-dev, libglobus-gss-assist-dev, libglobus-gssapi-gsi-dev, libglobus-gsi-credential-dev, libglobus-common-dev, libglobus-gsi-callback-dev, libglobus-gsi-sysconfig-dev, libglobus-gssapi-gsi-dev, libglobus-gsi-callback-dev, libglobus-gsi-cert-utils-dev, libglobus-openssl-dev, libglobus-gsi-proxy-core-dev, libglobus-callout-dev, globus-proxy-utils,krb5-user|heimdal-clients, libmysqlclient15-dev | libmysqlclient14-dev| libmysqlclient12-dev| libmysqlclient-dev, libiodbc2-dev | unixodbc-dev, libpq-dev | postgresql-dev, gfortran|fortran-compiler, libqt4-dev (>= 4.3.0) | libqt3-mt-dev (>= 3.3.0), qt4-dev-tools (>= 4.3.0) | qt3-dev-tools (>= 3.3.0), libqt4-opengl-dev, libkrb5-dev|heimdal-dev
-+Build-Depends: debhelper (>= 5.0.37.2), po-debconf, libssl-dev, comerr-dev, libxpm-dev, x11proto-xext-dev, libxext-dev, libfreetype6-dev, libpcre3-dev, zlib1g-dev | libz-dev, python-dev (>= 2.1), graphviz, ttf-freefont, libncurses5-dev | libcurses-dev, libgraphviz-dev, libxft-dev, python-support (>= 0.3), ruby (>= 1.8), ruby1.8-dev | ruby-dev (>= 1.8), libglu1-mesa-dev | libglu1-xorg-dev | xlibmesa-glu-dev | libglu-dev, libglew1.5-dev | libglew-dev, libftgl-dev | ftgl-dev, libxml2-dev, libgsl0-dev, libldap2-dev | libldap-dev, libavahi-compat-libdnssd-dev, libxmlrpc-c3-dev | libxmlrpc-c-dev, libcurl4-gnutls-dev | libcurl4-openssl-dev | libcurl-dev, libjpeg-dev, libpng12-dev, libtiff4-dev, libgif-dev | libungif4-dev, libxinerama-dev, libfftw3-dev | fftw3-dev, libglobus-gss-assist-dev, libglobus-gssapi-gsi-dev, libglobus-gsi-credential-dev, libglobus-common-dev, libglobus-gsi-callback-dev, libglobus-gsi-sysconfig-dev, libglobus-gssapi-gsi-dev, libglobus-gsi-callback-dev, libglobus-gsi-cert-utils-dev, libglobus-openssl-module-dev, libglobus-gsi-proxy-core-dev, libglobus-callout-dev, globus-proxy-utils,krb5-user|heimdal-clients, libmysqlclient15-dev | libmysqlclient14-dev| libmysqlclient12-dev| libmysqlclient-dev, libiodbc2-dev | unixodbc-dev, libpq-dev | postgresql-dev, gfortran|fortran-compiler, libqt4-dev (>= 4.3.0) | libqt3-mt-dev (>= 3.3.0), qt4-dev-tools (>= 4.3.0) | qt3-dev-tools (>= 3.3.0), libqt4-opengl-dev, libkrb5-dev|heimdal-dev
- Standards-Version: 3.8.3
-
- Package: root-system
---- a/build/package/lib/makebuilddepend.sh
-+++ b/build/package/lib/makebuilddepend.sh
-@@ -250,7 +250,7 @@
- # root-plugin-graf3d-asimage) echo -n ", libafterimage-dev" ;;
- # Input the build dependencies of the libafterimage-dev package
- root-plugin-graf2d-asimage)
-- echo -n ", libjpeg62-dev, libpng12-dev, libtiff4-dev"
-+ echo -n ", libjpeg-dev, libpng12-dev, libtiff4-dev"
- echo -n ", libgif-dev, libxinerama-dev";;
- root-plugin-graf2d-qt) need_qt=1 ;;
- root-plugin-graf2d-gviz) ;;
diff --git a/debian/patches/62-fix-duplicated-package-description.patch b/debian/patches/62-fix-duplicated-package-description.patch
deleted file mode 100644
index 003f794..0000000
--- a/debian/patches/62-fix-duplicated-package-description.patch
+++ /dev/null
@@ -1,751 +0,0 @@
---- a/build/package/common/libroot-bindings-python.control
-+++ b/build/package/common/libroot-bindings-python.control
-@@ -23,6 +23,5 @@
- functionality needed to handle and analyze large amounts of data
- efficiently.
- .
-- This package contains the Python plug-in for ROOT. This package
-- provide a Python interface to ROOT, and a ROOT interface to Python.
-+ This package contains the development files of Python plug-in for ROOT.
-
---- a/build/package/common/libroot-geom.control
-+++ b/build/package/common/libroot-geom.control
-@@ -22,5 +22,6 @@
- functionality needed to handle and analyze large amounts of data
- efficiently.
- .
-- This package contains a library for defining geometries in ROOT.
-+ This package contains development files of a library for defining geometries
-+ in ROOT.
-
---- a/build/package/common/libroot-graf2d-gpad.control
-+++ b/build/package/common/libroot-graf2d-gpad.control
-@@ -28,5 +28,6 @@
- functionality needed to handle and analyze large amounts of data
- efficiently.
- .
-- This package contains a library for canvas and pad manipulations.
-+ This package contains development files of a library for canvas and pad
-+ manipulations.
-
---- a/build/package/common/libroot-graf2d-graf.control
-+++ b/build/package/common/libroot-graf2d-graf.control
-@@ -7,10 +7,6 @@
- functionality needed to handle and analyze large amounts of data
- efficiently.
- .
-- The ROOT system provides a set of OO frameworks with all the
-- functionality needed to handle and analyze large amounts of data
-- efficiently.
-- .
- This package contains the Graf library for ROOT.
-
- Package: libroot-graf2d-graf-dev
-@@ -19,14 +15,10 @@
- Depends: libroot-graf2d-graf at libvers@ (= ${binary:Version}), libroot-hist-dev, ${misc:Depends}
- Replaces: libroot-dev
- Breaks: libroot-dev (<< 5.19.01-1)
--Description: Graph library for ROOT
-+Description: Graph 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
- efficiently.
- .
-- The ROOT system provides a set of OO frameworks with all the
-- functionality needed to handle and analyze large amounts of data
-- efficiently.
-- .
-- This package contains the Graf library for ROOT.
-+ This package contains development files of the Graf library for ROOT.
-
---- a/build/package/common/libroot-graf2d-postscript.control
-+++ b/build/package/common/libroot-graf2d-postscript.control
-@@ -15,11 +15,11 @@
- Replaces: libroot-dev
- Breaks: libroot-dev (<< 5.19.01-1)
- Depends: libroot-graf2d-postscript at libvers@ (= ${binary:Version}), libroot-graf2d-graf-dev, ${shlibs:Depends}, ${misc:Depends}
--Description: Postscript/PDF renderer library for ROOT
-+Description: Postscript/PDF renderer 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
- efficiently.
- .
-- This package contains a library for ROOT, which allows rendering
-- postscript and PDF output.
-+ This package contains developemnt files of a library for ROOT, which allows
-+ rendering postscript and PDF output.
-
---- a/build/package/common/libroot-graf3d-eve.control
-+++ b/build/package/common/libroot-graf3d-eve.control
-@@ -17,10 +17,11 @@
- Depends: libroot-graf3d-eve at libvers@ (= ${binary:Version}), libroot-geom-dev, libroot-gui-ged-dev, libroot-montecarlo-eg-dev, libroot-tree-treeplayer-dev, ${misc:Depends}
- Replaces: root-plugin-gl
- Breaks: root-plugin-gl (<= 5.19.01-1)
--Description: Event display library for ROOT
-+Description: Event display 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
- efficiently.
- .
-- This package contains a library for defining event displays in ROOT.
-+ This package contains development files of a library for defining event
-+ displays in ROOT.
-
---- a/build/package/common/libroot-graf3d-g3d.control
-+++ b/build/package/common/libroot-graf3d-g3d.control
-@@ -9,12 +9,8 @@
- functionality needed to handle and analyze large amounts of data
- efficiently.
- .
-- The ROOT system provides a set of OO frameworks with all the
-- functionality needed to handle and analyze large amounts of data
-- efficiently.
-- .
- This library contains the basic 3D shapes and classes for ROOT. For
-- a more full-blown geometry library, see libroot-geom-dev.
-+ a more full-blown geometry library, see libroot-geom.
-
- Package: libroot-graf3d-g3d-dev
- Architecture: any
-@@ -24,16 +20,11 @@
- Replaces: libroot-dev
- Breaks: libroot-dev (<= 5.19.01-1)
- Suggests: libroot-geom-dev
--Description: Basic 3D shapes for ROOT
-- The ROOT system provides a set of OO frameworks with all the
-- functionality needed to handle and analyze large amounts of data
-- efficiently.
-- .
-+Description: Basic 3D shapes 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
- efficiently.
- .
-- This library contains the basic 3D shapes and classes for ROOT. For
-- a more full-blown geometry library, see libroot-geom-dev.
--
-+ This library contains development files of the basic 3D shapes and classes
-+ for ROOT. For a more full-blown geometry library, see libroot-geom-dev.
-
---- a/build/package/common/libroot-gui-ged.control
-+++ b/build/package/common/libroot-gui-ged.control
-@@ -15,11 +15,11 @@
- Breaks: libroot-dev (<< 5.19.01-1)
- Replaces: libroot-dev
- Depends: libroot-gui-ged at libvers@ (= ${binary:Version}), libroot-gui-dev, libroot-tree-treeplayer-dev, ${misc:Depends}
--Description: GUI element for editing various ROOT objecs
-+Description: GUI element for editing various ROOT objecs - development files
- The ROOT system provides a set of OO frameworks with all the
- functionality needed to handle and analyze large amounts of data
- efficiently.
- .
-- This package contains a library to show a pop-up window for editing
-- various ROOT objects.
-+ This package contains development files of a library to show a pop-up window
-+ for editing various ROOT objects.
-
---- a/build/package/common/libroot-gui.control
-+++ b/build/package/common/libroot-gui.control
-@@ -9,10 +9,6 @@
- functionality needed to handle and analyze large amounts of data
- efficiently.
- .
-- The ROOT system provides a set of OO frameworks with all the
-- functionality needed to handle and analyze large amounts of data
-- efficiently.
-- .
- This package contains a library for defining graphical user interfaces.
-
- Package: libroot-gui-dev
-@@ -26,9 +22,6 @@
- functionality needed to handle and analyze large amounts of data
- efficiently.
- .
-- The ROOT system provides a set of OO frameworks with all the
-- functionality needed to handle and analyze large amounts of data
-- efficiently.
-- .
-- This package contains a library for defining graphical user interfaces.
-+ This package contains development files of a library for defining graphical
-+ user interfaces.
-
---- a/build/package/common/libroot-hist-spectrum.control
-+++ b/build/package/common/libroot-hist-spectrum.control
-@@ -7,10 +7,6 @@
- functionality needed to handle and analyze large amounts of data
- efficiently.
- .
-- The ROOT system provides a set of OO frameworks with all the
-- functionality needed to handle and analyze large amounts of data
-- efficiently.
-- .
- This package contains the Spectrum library for ROOT.
-
- Package: libroot-hist-spectrum-dev
-@@ -19,14 +15,10 @@
- Depends: libroot-hist-spectrum at libvers@ (= ${binary:Version}), libroot-hist-dev, ${misc:Depends}
- Replaces: libroot-dev
- Breaks: libroot-dev (<< 5.19.01-1)
--Description: Spectra analysis library for ROOT
-+Description: Spectra analysis 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
- efficiently.
- .
-- The ROOT system provides a set of OO frameworks with all the
-- functionality needed to handle and analyze large amounts of data
-- efficiently.
-- .
-- This package contains the Spectrum library for ROOT.
-+ This package contains development files of the Spectrum library for ROOT.
-
---- a/build/package/common/libroot-hist.control
-+++ b/build/package/common/libroot-hist.control
-@@ -8,7 +8,7 @@
- functionality needed to handle and analyze large amounts of data
- efficiently.
- .
-- This package contains a library for histogrammin
-+ This package contains a library for histogramming.
-
- Package: libroot-hist-dev
- Architecture: any
-@@ -21,5 +21,5 @@
- functionality needed to handle and analyze large amounts of data
- efficiently.
- .
-- This package contains a library for histogrammin
-+ This package contains development files of a library for histogramming.
-
---- a/build/package/common/libroot-io-xmlparser.control
-+++ b/build/package/common/libroot-io-xmlparser.control
-@@ -2,12 +2,12 @@
- Section: libs
- Architecture: any
- Depends: ${shlibs:Depends}, ${misc:Depends}
--Description: Input/output of ROOT objects - runtime library
-+Description: XML parser of ROOT objects - runtime library
- The ROOT system provides a set of OO frameworks with all the
- functionality needed to handle and analyze large amounts of data
- efficiently.
- .
-- This package provides I/O routines for ROOT objects.
-+ This package provides XML parser routines for ROOT objects.
-
- Package: libroot-io-xmlparser-dev
- Architecture: any
-@@ -15,10 +15,11 @@
- Depends: libroot-io-xmlparser at libvers@ (= ${binary:Version}), libroot-core-dev, ${misc:Depends}
- Replaces: libroot-dev, root-plugin-xml
- Breaks: libroot-dev (<< 5.19.01-1), root-plugin-xml (<< 5.19.01-1)
--Description: Input/output of ROOT objects - development files
-+Description: XML parser of ROOT objects - development files
- The ROOT system provides a set of OO frameworks with all the
- functionality needed to handle and analyze large amounts of data
- efficiently.
- .
-- This package provides I/O routines for ROOT objects.
-+ This package provides development files of XML parser routines for ROOT
-+ objects.
-
---- a/build/package/common/libroot-io.control
-+++ b/build/package/common/libroot-io.control
-@@ -20,5 +20,5 @@
- functionality needed to handle and analyze large amounts of data
- efficiently.
- .
-- This package provides I/O routines for ROOT objects.
-+ This package provides development files of I/O routines for ROOT objects.
-
---- a/build/package/common/libroot-math-foam.control
-+++ b/build/package/common/libroot-math-foam.control
-@@ -2,7 +2,7 @@
- Section: libs
- Architecture: any
- Depends: ${shlibs:Depends}, ${misc:Depends}
--Description: Compact Version of the Cellular Event Generator
-+Description: Compact Version of Cellular Event Generator
- The ROOT system provides a set of OO frameworks with all the
- functionality needed to handle and analyze large amounts of data
- efficiently.
-@@ -19,7 +19,7 @@
- Depends: libroot-math-foam at libvers@ (= ${binary:Version}), libroot-hist-dev, ${misc:Depends}
- Replaces: libroot-dev
- Breaks: libroot-dev (<= 5.19.01-1)
--Description: Compact Version of the Cellular Event Generator
-+Description: Compact Version of Cellular Event Generator - development files
- The ROOT system provides a set of OO frameworks with all the
- functionality needed to handle and analyze large amounts of data
- efficiently.
-@@ -29,4 +29,7 @@
- version of the FOAM program, with a slightly limited functionality
- with respect to its parent version. On the other hand, mFOAM is
- easier to use for the average user.
-+ .
-+ This package provides development files of the compact version of Cellular
-+ Event Generator.
-
---- a/build/package/common/libroot-math-genvector.control
-+++ b/build/package/common/libroot-math-genvector.control
-@@ -16,11 +16,11 @@
- Depends: libroot-math-genvector at libvers@ (= ${binary:Version}), libroot-core-dev, ${misc:Depends}
- Replaces: libroot-dev
- Breaks: libroot-dev (<= 5.19.01-1)
--Description: Generalized vector library for ROOT
-+Description: Generalized vector 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
- efficiently.
- .
-- This package contains the Genvector library for ROOT. This provides
-- a generalized vector library.
-+ This package contains development files of the Genvector library for ROOT,
-+ provides a generalized vector library.
-
---- a/build/package/common/libroot-math-mathcore.control
-+++ b/build/package/common/libroot-math-mathcore.control
-@@ -15,10 +15,10 @@
- Depends: libroot-math-mathcore at libvers@ (= ${binary:Version}), libroot-core-dev, ${misc:Depends}
- Replaces: libroot-dev
- Breaks: libroot-dev (<< 5.19.01-1)
--Description: Core mathemathics library for ROOT
-+Description: Core mathemathics 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
- efficiently.
- .
-- This package contains the MathCore library for ROOT.
-+ This package contains development files of the MathCore library for ROOT.
-
---- a/build/package/common/libroot-math-mathmore.control
-+++ b/build/package/common/libroot-math-mathmore.control
-@@ -7,8 +7,8 @@
- functionality needed to handle and analyze large amounts of data
- efficiently.
- .
-- This package contains the MathMore library for ROOT. This provides
-- a partial GNU Scientific Library interface for ROOT.
-+ This package contains the MathMore library for ROOT, a partial GNU
-+ Scientific Library interface.
-
- Package: libroot-math-mathmore-dev
- Architecture: any
-@@ -16,11 +16,11 @@
- Depends: libroot-math-mathmore at libvers@ (= ${binary:Version}), libroot-core-dev, libgsl0-dev, ${misc:Depends}
- Breaks: libroot-mathmore-dev (<< 5.19.01-1)
- Replaces: libroot-mathmore-dev
--Description: Mathmore plugin for ROOT
-+Description: GSL interface 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
- efficiently.
- .
-- This package contains the MathMore library for ROOT. This provides
-- a partial GNU Scientific Library interface for ROOT.
-+ This package contains development files of the MathMore library for ROOT,
-+ a partial GNU Scientific Library interface.
-
---- a/build/package/common/libroot-math-matrix.control
-+++ b/build/package/common/libroot-math-matrix.control
-@@ -15,10 +15,10 @@
- Depends: libroot-math-matrix at libvers@ (= ${binary:Version}), libroot-core-dev, libroot-math-mathcore-dev, ${misc:Depends}
- Replaces: libroot-dev
- Breaks: libroot-dev (<< 5.19.01-1)
--Description: Matrix library for ROOT
-+Description: Matrix 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
- efficiently.
- .
-- This package contains the Matrix library for ROOT.
-+ This package contains development files of the Matrix library for ROOT.
-
---- a/build/package/common/libroot-math-minuit.control
-+++ b/build/package/common/libroot-math-minuit.control
-@@ -19,11 +19,11 @@
- Provides: root-fitter
- Replaces: root-plugin-minuit (<< 5.09.01-7), libroot-minuit-dev
- Breaks: libroot-minuit-dev (<< 5.19.01-1)
--Description: Minuit plugin for ROOT
-+Description: Minuit plugin 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
- efficiently.
- .
-- This package contains the MINUIT plug-in for ROOT. This provides a
-- fitting algorithm for ROOT.
-+ This package contains development files of the MINUIT plug-in for ROOT,
-+ provides a fitting algorithm for ROOT.
-
---- a/build/package/common/libroot-math-mlp.control
-+++ b/build/package/common/libroot-math-mlp.control
-@@ -22,6 +22,6 @@
- functionality needed to handle and analyze large amounts of data
- efficiently.
- .
-- This package contains the mlp plug-in for ROOT. This plugin provides
-+ This package contains development files of the mlp plug-in for ROOT, provides
- a Multi Layer Perceptron Neural Network package for ROOT.
-
---- a/build/package/common/libroot-math-physics.control
-+++ b/build/package/common/libroot-math-physics.control
-@@ -15,10 +15,10 @@
- Depends: libroot-math-physics at libvers@ (= ${binary:Version}), libroot-math-matrix-dev, ${misc:Depends}
- Replaces: libroot-dev
- Breaks: libroot-dev (<< 5.19.01-1)
--Description: Physics library for ROOT
-+Description: Physics 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
- efficiently.
- .
-- This package contains the Physics library for ROOT.
-+ This package contains development files of the Physics library for ROOT.
-
---- a/build/package/common/libroot-math-quadp.control
-+++ b/build/package/common/libroot-math-quadp.control
-@@ -24,8 +24,8 @@
- functionality needed to handle and analyze large amounts of data
- efficiently.
- .
-- This package contains the QuadP plug-in for ROOT. This provides the
-- user a framework in which to do Quadratic Programming. The quadratic
-- programming problem involves minimization of a quadratic function
-- subject to linear constraints.
-+ This package contains development files of the QuadP plug-in for ROOT. This
-+ provides the user a framework in which to do Quadratic Programming.
-+ The quadratic programming problem involves minimization of a quadratic
-+ function subject to linear constraints.
-
---- a/build/package/common/libroot-math-smatrix.control
-+++ b/build/package/common/libroot-math-smatrix.control
-@@ -15,10 +15,10 @@
- Depends: libroot-math-smatrix at libvers@ (= ${binary:Version}), libroot-core-dev, ${misc:Depends}
- Replaces: libroot-dev
- Breaks: libroot-dev (<< 5.19.01-1)
--Description: Sparse matrix library for ROOT
-+Description: Sparse matrix 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
- efficiently.
- .
-- This package contains the Smatrix library for ROOT.
-+ This package contains development files of the Smatrix library for ROOT.
-
---- a/build/package/common/libroot-math-splot.control
-+++ b/build/package/common/libroot-math-splot.control
-@@ -40,7 +40,7 @@
- Depends: libroot-math-splot at libvers@ (= ${binary:Version}), libroot-graf2d-graf-dev, libroot-graf3d-g3d-dev, libroot-tree-treeplayer-dev, ${misc:Depends}
- Replaces: libroot-dev
- Breaks: libroot-dev (<< 5.19.01-1)
--Description: Splot library for ROOT
-+Description: Splot 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
- efficiently.
-@@ -71,4 +71,6 @@
- .
- SPlot is optimal if the control variable is uncorrelated with the
- discriminating variables.
-+ .
-+ This package provides development files of Splot library for ROOT.
-
---- a/build/package/common/libroot-misc-memstat.control
-+++ b/build/package/common/libroot-misc-memstat.control
-@@ -16,11 +16,11 @@
- Depends: libroot-misc-memstat at libvers@ (= ${binary:Version}), libroot-core-dev, ${misc:Depends}
- Replaces: libroot-dev
- Breaks: libroot-dev (<< 5.19.01-1)
--Description: Memory statistics tool for use with ROOT
-+Description: Memory statistics tool for use with 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
- efficiently.
- .
-- This package contains the memory statistics tool for debugging memory
-- leaks and such.
-+ This package contains the development files of memory statistics tool for
-+ debugging memory leaks and such.
-
---- a/build/package/common/libroot-misc-minicern.control
-+++ b/build/package/common/libroot-misc-minicern.control
-@@ -15,10 +15,10 @@
- Depends: libroot-misc-minicern at libvers@ (= ${binary:Version}), libroot-core-dev, ${misc:Depends}
- Replaces: libroot-dev
- Breaks: libroot-dev (<< 5.19.01-1)
--Description: Small version of CERNLIB for use with ROOT
-+Description: Small version of CERNLIB for use with 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
- efficiently.
- .
-- This package contains the mini CERNLIB library for ROOT.
-+ This package contains development files of the mini CERNLIB library for ROOT.
-
---- a/build/package/common/libroot-misc-table.control
-+++ b/build/package/common/libroot-misc-table.control
-@@ -15,10 +15,10 @@
- Depends: libroot-misc-table at libvers@ (= ${binary:Version}), libroot-graf3d-g3d-dev, libroot-graf2d-gpad-dev, libroot-tree-dev, ${misc:Depends}
- Replaces: libroot-dev
- Breaks: libroot-dev (<< 5.19.01-1)
--Description: Table library for ROOT
-+Description: Table 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
- efficiently.
- .
-- This package contains the Table library for ROOT.
-+ This package contains the development files of Table library for ROOT.
-
---- a/build/package/common/libroot-montecarlo-eg.control
-+++ b/build/package/common/libroot-montecarlo-eg.control
-@@ -15,10 +15,10 @@
- Depends: libroot-montecarlo-eg at libvers@ (= ${binary:Version}), libroot-graf2d-gpad-dev, libroot-graf3d-g3d-dev, ${misc:Depends}
- Replaces: libroot-dev
- Breaks: libroot-dev (<< 5.19.01-1)
--Description: Event generator library for ROOT
-+Description: Event generator 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
- efficiently.
- .
-- This package contains the Eg library for ROOT.
-+ This package contains development files of the Eg library for ROOT.
-
---- a/build/package/common/libroot-montecarlo-vmc.control
-+++ b/build/package/common/libroot-montecarlo-vmc.control
-@@ -3,7 +3,7 @@
- Architecture: any
- Depends: ${shlibs:Depends}, ${misc:Depends}
- Recommends: root-vmc
--Description: Virtual Monte-Carlo (simulation) library for ROOT
-+Description: Virtual Monte-Carlo library for ROOT
- The ROOT system provides a set of OO frameworks with all the
- functionality needed to handle and analyze large amounts of data
- efficiently.
-@@ -16,10 +16,10 @@
- Depends: libroot-montecarlo-vmc at libvers@ (= ${binary:Version}), libroot-geom-dev, libroot-montecarlo-eg-dev, ${misc:Depends}
- Replaces: libroot-dev
- Breaks: libroot-dev (<< 5.19.01-1)
--Description: Virtual Monte-Carlo (simulation) library for ROOT
-+Description: Virtual Monte-Carlo 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
- efficiently.
- .
-- This package contains the Vmc library for ROOT.
-+ This package contains development files of the Vmc library for ROOT.
-
---- a/build/package/common/libroot-net-auth.control
-+++ b/build/package/common/libroot-net-auth.control
-@@ -16,10 +16,11 @@
- Depends: libroot-net-auth at libvers@ (= ${binary:Version}), libroot-core-dev, ${misc:Depends}
- Replaces: libroot-dev
- Breaks: libroot-dev (<= 5.19.01-1), libroot-core-dev (<< 5.30.00-1)
--Description: Authentication extension for ROOT
-+Description: Authentication extension 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
- efficiently.
- .
-- This package contains the basic authentication algorithms used by ROOT.
-+ This package contains development files of the basic authentication algorithms
-+ used by ROOT.
-
---- a/build/package/common/libroot-net-ldap.control
-+++ b/build/package/common/libroot-net-ldap.control
-@@ -3,13 +3,13 @@
- Section: libs
- Depends: ${shlibs:Depends}, ${misc:Depends}
- Replaces: root-plugin-ldap (<< 5.09.01-1)
--Description: Ldap extension for ROOT - run-time libraries
-+Description: LDAP extension for ROOT
- The ROOT system provides a set of OO frameworks with all the
- functionality needed to handle and analyze large amounts of data
- efficiently.
- .
-- This package contains the Ldap plug-in for ROOT. This gives you
-- access to Ldap directories via ROOT.
-+ This package contains the LDAP plugin for ROOT. This gives you
-+ access to LDAP directories via ROOT.
-
- Package: libroot-net-ldap-dev
- Architecture: any
-@@ -17,12 +17,10 @@
- Depends: libroot-net-ldap at libvers@ (= ${binary:Version}), libroot-core-dev, libldap2-dev | libldap-dev, ${misc:Depends}
- Breaks: libroot-ldap-dev (<< 5.19.01-1)
- Replaces: libroot-ldap-dev (<< 5.19.01-1)
--Description: Ldap extension for ROOT
-+Description: LDAP extension 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
- efficiently.
- .
-- This package contains the Ldap plug-in for ROOT. This gives you
-- access to Ldap directories via ROOT.
--
-+ This package contains the development files of LDAP plugin for ROOT.
-
---- a/build/package/common/libroot-net.control
-+++ b/build/package/common/libroot-net.control
-@@ -15,10 +15,10 @@
- Depends: libroot-net at libvers@ (= ${binary:Version}), libroot-math-mathcore-dev, ${misc:Depends}
- Replaces: libroot-dev
- Breaks: libroot-dev (<< 5.19.01-1)
--Description: Net library for ROOT
-+Description: Net 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
- efficiently.
- .
-- This package contains the Net library for ROOT.
-+ This package contains development files of the Net library for ROOT.
-
---- a/build/package/common/libroot-proof-clarens.control
-+++ b/build/package/common/libroot-proof-clarens.control
-@@ -4,12 +4,12 @@
- Depends: ${shlibs:Depends}, ${misc:Depends}
- Replaces: root-plugin-clarens (<< 5.09.01-1)
- Homepage: http://clarens.sourceforge.net
--Description: Clarens extension for ROOT - run-time libraries
-+Description: Clarens extension for ROOT
- The ROOT system provides a set of OO frameworks with all the
- functionality needed to handle and analyze large amounts of data
- efficiently.
- .
-- This package contains the Clarens plug-in for ROOT, for use in a GRID
-+ This package contains the Clarens plugin for ROOT, for use in a GRID
- enabled analysis environment.
- .
- The Clarens Grid-Enabled Web Services Framework is an open source,
-@@ -28,8 +28,8 @@
- functionality needed to handle and analyze large amounts of data
- efficiently.
- .
-- This package contains the Clarens plug-in for ROOT, for use in a GRID
-- enabled analysis environment.
-+ This package contains the development files of Clarens plugin for ROOT, for
-+ use in a GRID enabled analysis environment.
- .
- The Clarens Grid-Enabled Web Services Framework is an open source,
- secure, high-performance "portal" for ubiquitous access to data and
---- a/build/package/common/libroot-proof-proofplayer.control
-+++ b/build/package/common/libroot-proof-proofplayer.control
-@@ -9,7 +9,7 @@
- functionality needed to handle and analyze large amounts of data
- efficiently.
- .
-- This package contains the PROOF extension ROOT. This provides a
-+ This package contains the PROOF extension for ROOT. This provides a
- client to use in a PROOF environment.
-
-
-@@ -20,12 +20,12 @@
- Suggests: root-plugin-net-netx, root-plugin-proof-xproof
- Replaces: root-plugin-proof-proofplayer (<< 5.23.05-1)
- Breaks: root-plugin-proof-proofplayer (<< 5.23.05-1)
--Description: PROOF plugin for ROOT
-+Description: PROOF plugin 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
- efficiently.
- .
-- This package contains the PROOF callable extension for ROOT. This
-+ This package contains development files of the PROOF extension for ROOT. This
- provides a client to use in a PROOF environment.
-
-
---- a/build/package/common/libroot-proof.control
-+++ b/build/package/common/libroot-proof.control
-@@ -16,11 +16,11 @@
- 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)
--Description: PROOF library for ROOT
-+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
- efficiently.
- .
-- This package contains the PROOF library for ROOT. This provides a
-- client to use in a PROOF environment.
-+ This package contains development files of the PROOF library for ROOT. This
-+ provides a client to use in a PROOF environment.
-
---- a/build/package/common/libroot-roofit.control
-+++ b/build/package/common/libroot-roofit.control
-@@ -42,4 +42,6 @@
- primarily targeted to the high-energy physicists using the ROOT
- analysis environment, but the general nature of the package make it
- suitable for adoption in different disciplines as well.
-+ .
-+ This package provides development files of RooFit.
-
---- a/build/package/common/libroot-tmva.control
-+++ b/build/package/common/libroot-tmva.control
-@@ -56,4 +56,6 @@
- evaluation). In addition all these methods can be tested in parallel,
- and hence their performance on a particular data set may easily be
- compared.
-+ .
-+ This package provides development files of TMVA package for ROOT.
-
---- a/build/package/common/libroot-tree-treeplayer.control
-+++ b/build/package/common/libroot-tree-treeplayer.control
-@@ -14,10 +14,10 @@
- Breaks: libroot-dev (<< 5.19.01-1)
- Replaces: libroot-dev
- Depends: libroot-tree-treeplayer at libvers@ (= ${binary:Version}), libroot-tree-dev, libroot-graf2d-gpad-dev, libroot-graf3d-g3d-dev, ${misc:Depends}
--Description: Library to loop over a ROOT tree
-+Description: Library to loop over a ROOT tree - development files
- The ROOT system provides a set of OO frameworks with all the
- functionality needed to handle and analyze large amounts of data
- efficiently.
- .
-- Plug-in to loop over a ROOT tree.
-+ This package provides development files to loop over a ROOT tree.
-
---- a/build/package/common/libroot-tree.control
-+++ b/build/package/common/libroot-tree.control
-@@ -16,10 +16,10 @@
- Depends: libroot-tree at libvers@ (= ${binary:Version}), libroot-core-dev, ${misc:Depends}
- Replaces: libroot-dev
- Breaks: libroot-dev (<< 5.19.01-1)
--Description: Tree library for ROOT
-+Description: Tree 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
- efficiently.
- .
-- This package contains the Tree library for ROOT.
-+ This package contains development files of the Tree library for ROOT.
-
---- a/build/package/common/root-plugin-graf2d-qt.control
-+++ b/build/package/common/root-plugin-graf2d-qt.control
-@@ -1,12 +1,11 @@
- Package: root-plugin-graf2d-qt
- Architecture: any
- Depends: ${shlibs:Depends}, ${misc:Depends}
--Description: Qt plugin for ROOT
-+Description: Graf2d Qt plugin for ROOT
- The ROOT system provides a set of OO frameworks with all the
- functionality needed to handle and analyze large amounts of data
- efficiently.
- .
-- This package contains the Qt plug-in for ROOT. This plugin
-- provides an abstraction over a display. Windows are created via Qt.
--
-+ This package contains the Graf2d Qt plug-in for ROOT. This plugin
-+ provides Qt interfaces of Graf2d library.
-
---- a/build/package/common/libroot-html.control
-+++ b/build/package/common/libroot-html.control
-@@ -21,6 +21,6 @@
- functionality needed to handle and analyze large amounts of data
- efficiently.
- .
-- This package contains classes to automatically extract documentation
-- from marked up sources.
-+ This package contains development files of classes to automatically extract
-+ documentation from marked up sources.
-
diff --git a/debian/patches/63-extend-libroot-static-description.patch b/debian/patches/63-extend-libroot-static-description.patch
deleted file mode 100644
index b8f69cc..0000000
--- a/debian/patches/63-extend-libroot-static-description.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/build/package/common/libroot-core.control b/build/package/common/libroot-core.control
-index 6661bb1..86cc2ac 100644
---- a/build/package/common/libroot-core.control
-+++ b/build/package/common/libroot-core.control
-@@ -44,5 +44,9 @@ Architecture: any
- Depends: ${shlibs:Depends}, ${misc:Depends}
- Recommends: libroot-core-dev
- Description: Static archive of ROOT libraries
-+ The ROOT system provides a set of OO frameworks with all the
-+ functionality needed to handle and analyze large amounts of data
-+ efficiently.
-+ .
- This package contains static archive of the ROOT classes.
-
diff --git a/debian/patches/66-build-cintex-only-on-x86-x64.patch b/debian/patches/66-build-cintex-only-on-x86-x64.patch
deleted file mode 100644
index 0a7a8e2..0000000
--- a/debian/patches/66-build-cintex-only-on-x86-x64.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/build/package/lib/makelists.sh
-+++ b/build/package/lib/makelists.sh
-@@ -85,6 +85,12 @@
- cint/cint) set_lib_names core "" root-system-bin
- extra="ALLLIBS=${prefix}/lib/root/libCint.so" ;;
- # extra="NOMAP=1 ALLLIBS=${prefix}/lib/root/libCint.so"
-+ cint/cintex) case `uname -m` in
-+ i*86 | x86_64)
-+ set_lib_names core "" root-system-bin ;;
-+ *)
-+ continue ;;
-+ esac ;;
- cint/reflex) set_lib_names core "" libroot-core-dev
- extra="REFLEXLIB=${prefix}/lib/root/libReflex.so" ;;
- cint/cling) continue ;;
diff --git a/debian/patches/68-po.patch b/debian/patches/68-po.patch
deleted file mode 100644
index c303a35..0000000
--- a/debian/patches/68-po.patch
+++ /dev/null
@@ -1,215 +0,0 @@
-diff --git a/build/package/debian/po/cs.po b/build/package/debian/po/cs.po
-index 3a42550..cc1588f 100644
---- a/build/package/debian/po/cs.po
-+++ b/build/package/debian/po/cs.po
-@@ -11,6 +11,7 @@ msgstr ""
- "PO-Revision-Date: 2009-02-28 13:37+0100\n"
- "Last-Translator: Miroslav Kure <kurem at debian.cz>\n"
- "Language-Team: Czech <debian-l10n-czech at lists.debian.org>\n"
-+"Language: cs\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
- "Content-Transfer-Encoding: 8bit\n"
-diff --git a/build/package/debian/po/da.po b/build/package/debian/po/da.po
-index 69cfa7b..e1a862c 100644
---- a/build/package/debian/po/da.po
-+++ b/build/package/debian/po/da.po
-@@ -20,6 +20,7 @@ msgstr ""
- "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
- "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
- "Language-Team: LANGUAGE <LL at li.org>\n"
-+"Language: \n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=ISO-8859-1\n"
- "Content-Transfer-Encoding: 8bit\n"
-diff --git a/build/package/debian/po/de.po b/build/package/debian/po/de.po
-index a92ae48..dbc791d 100644
---- a/build/package/debian/po/de.po
-+++ b/build/package/debian/po/de.po
-@@ -11,6 +11,7 @@ msgstr ""
- "PO-Revision-Date: 2009-02-18 19:41+0100\n"
- "Last-Translator: Thomas Müller <thomas_mueller_ffb at online.de>\n"
- "Language-Team: de <debian-l10n-german at lists.debian.org>\n"
-+"Language: \n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
- "Content-Transfer-Encoding: 8bit\n"
-diff --git a/build/package/debian/po/es.po b/build/package/debian/po/es.po
-index 9c26c01..f4d7837 100644
---- a/build/package/debian/po/es.po
-+++ b/build/package/debian/po/es.po
-@@ -32,6 +32,7 @@ msgstr ""
- "PO-Revision-Date: 2009-02-16 17:40+0100\n"
- "Last-Translator: Francisco Javier Cuadrado <fcocuadrado at gmail.com>\n"
- "Language-Team: Debian l10n Spanish <debian-l10n-spanish at lists.debian.org>\n"
-+"Language: \n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
- "Content-Transfer-Encoding: 8bit\n"
-diff --git a/build/package/debian/po/eu.po b/build/package/debian/po/eu.po
-index 57db5af..34e7b71 100644
---- a/build/package/debian/po/eu.po
-+++ b/build/package/debian/po/eu.po
-@@ -13,6 +13,7 @@ msgstr ""
- "PO-Revision-Date: 2009-02-18 21:43+0100\n"
- "Last-Translator: Iñaki Larrañaga Murgoitio <dooteo at euskalgnu.org>\n"
- "Language-Team: Basque <itzulpena at euskalgnu.org>\n"
-+"Language: eu\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
- "Content-Transfer-Encoding: 8bit\n"
-diff --git a/build/package/debian/po/fi.po b/build/package/debian/po/fi.po
-index d21199c..5ce1a41 100644
---- a/build/package/debian/po/fi.po
-+++ b/build/package/debian/po/fi.po
-@@ -6,6 +6,7 @@ msgstr ""
- "PO-Revision-Date: 2009-03-04 19:24+0200\n"
- "Last-Translator: Esko Arajärvi <edu at iki.fi>\n"
- "Language-Team: Finnish <debian-l10n-finnish at lists.debian.org>\n"
-+"Language: fi\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=utf-8\n"
- "Content-Transfer-Encoding: 8bit\n"
-diff --git a/build/package/debian/po/fr.po b/build/package/debian/po/fr.po
-index 8ef96e4..78c3f8c 100644
---- a/build/package/debian/po/fr.po
-+++ b/build/package/debian/po/fr.po
-@@ -12,6 +12,7 @@ msgstr ""
- "PO-Revision-Date: 2009-02-15 14:30+0100\n"
- "Last-Translator: Christian Perrier <bubulle at debian.org>\n"
- "Language-Team: French <debian-l10n-french at lists.debian.org>\n"
-+"Language: fr\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
- "Content-Transfer-Encoding: 8bit\n"
-diff --git a/build/package/debian/po/gl.po b/build/package/debian/po/gl.po
-index 14072d7..47b06f4 100644
---- a/build/package/debian/po/gl.po
-+++ b/build/package/debian/po/gl.po
-@@ -11,6 +11,7 @@ msgstr ""
- "PO-Revision-Date: 2009-02-15 21:39+0100\n"
- "Last-Translator: marce villarino <mvillarino at users.sourceforge.net>\n"
- "Language-Team: gl <proxecto at trasno.net>\n"
-+"Language: \n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
- "Content-Transfer-Encoding: 8bit\n"
-@@ -31,8 +32,8 @@ msgid ""
- "interest of cross-platform compatibility\". This is no longer the case, but "
- "they are still available from third parties."
- msgstr ""
--"Os tipos de letra contidos neste paquete fornecíaos Microsoft «no interese da "
--"compatibilidade entre plataformas». Xa non é o caso, pero aínda están "
-+"Os tipos de letra contidos neste paquete fornecíaos Microsoft «no interese "
-+"da compatibilidade entre plataformas». Xa non é o caso, pero aínda están "
- "dispoñíbeis grazas a terceiros."
-
- #. Type: note
-diff --git a/build/package/debian/po/it.po b/build/package/debian/po/it.po
-index 339608a..1e49281 100644
---- a/build/package/debian/po/it.po
-+++ b/build/package/debian/po/it.po
-@@ -11,6 +11,7 @@ msgstr ""
- "PO-Revision-Date: 2009-02-21 14:42+0100\n"
- "Last-Translator: Luca Monducci <luca.mo at tiscali.it>\n"
- "Language-Team: Italian <debian-l10n-italian at lists.debian.org>\n"
-+"Language: it\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
- "Content-Transfer-Encoding: 8bit\n"
-diff --git a/build/package/debian/po/ja.po b/build/package/debian/po/ja.po
-index 5746f44..70ea15f 100644
---- a/build/package/debian/po/ja.po
-+++ b/build/package/debian/po/ja.po
-@@ -10,6 +10,7 @@ msgstr ""
- "PO-Revision-Date: 2009-09-12 04:26+0900\n"
- "Last-Translator: Hideki Yamane (Debian-JP) <henrich at debian.or.jp>\n"
- "Language-Team: Japanese <debian-japanese at lists.debian.org>\n"
-+"Language: ja\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
- "Content-Transfer-Encoding: 8bit\n"
-@@ -41,8 +42,8 @@ msgid ""
- "changes to the file name or packaging format."
- msgstr ""
- "これらのフォントは自分で利用する範囲においては自由にダウンロードして利用でき"
--"ますが、ファイル名の変更やパッケージ形式の変更も含め、改変しての再配布は許され"
--"ていません。"
-+"ますが、ファイル名の変更やパッケージ形式の変更も含め、改変しての再配布は許さ"
-+"れていません。"
-
- #. Type: string
- #. Description
-@@ -115,4 +116,3 @@ msgstr ""
- "圧縮済みマイクロソフト社製コアフォントのアーカイブをずっと保存しておきたい場"
- "合は、保存しておきたいディレクトリの名前を入力してください。この欄を空のまま"
- "にしておくと、インストール後にファイルは削除されます。"
--
-diff --git a/build/package/debian/po/pt.po b/build/package/debian/po/pt.po
-index cba8344..aca6ff2 100644
---- a/build/package/debian/po/pt.po
-+++ b/build/package/debian/po/pt.po
-@@ -11,6 +11,7 @@ msgstr ""
- "PO-Revision-Date: 2009-02-24 20:04+0000\n"
- "Last-Translator: Américo Monteiro <a_monteiro at netcabo.pt>\n"
- "Language-Team: Portuguese <traduz at debianpt.org>\n"
-+"Language: pt\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
- "Content-Transfer-Encoding: 8bit\n"
-diff --git a/build/package/debian/po/pt_BR.po b/build/package/debian/po/pt_BR.po
-index bab488f..e169355 100644
---- a/build/package/debian/po/pt_BR.po
-+++ b/build/package/debian/po/pt_BR.po
-@@ -12,6 +12,7 @@ msgstr ""
- "PO-Revision-Date: 2008-07-25 19:50-0300\n"
- "Last-Translator: Herbert Parentes Fortes Neto <h_p_f_n at yahoo.com.br>\n"
- "Language-Team: l10n Portuguese <debian-l10n-portuguese at lists.debian.org>\n"
-+"Language: \n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
- "Content-Transfer-Encoding: 8bit\n"
-diff --git a/build/package/debian/po/ru.po b/build/package/debian/po/ru.po
-index af67cf3..bff9dbc 100644
---- a/build/package/debian/po/ru.po
-+++ b/build/package/debian/po/ru.po
-@@ -12,12 +12,13 @@ msgstr ""
- "PO-Revision-Date: 2009-02-16 20:34+0300\n"
- "Last-Translator: Yuri Kozlov <yuray at komyakino.ru>\n"
- "Language-Team: Russian <debian-l10n-russian at lists.debian.org>\n"
-+"Language: ru\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
- "Content-Transfer-Encoding: 8bit\n"
- "X-Generator: KBabel 1.11.4\n"
--"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
--"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-
- #. Type: note
- #. Description
-diff --git a/build/package/debian/po/sv.po b/build/package/debian/po/sv.po
-index 0427c39..84e87b9 100644
---- a/build/package/debian/po/sv.po
-+++ b/build/package/debian/po/sv.po
-@@ -11,6 +11,7 @@ msgstr ""
- "PO-Revision-Date: 2009-02-18 13:16+0100\n"
- "Last-Translator: Martin Bagge <brother at bsnet.se>\n"
- "Language-Team: swedish <debian-l10n-swedish at lists.debian.org>\n"
-+"Language: \n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
- "Content-Transfer-Encoding: 8bit\n"
-diff --git a/build/package/debian/po/vi.po b/build/package/debian/po/vi.po
-index 5ea98c2..754b4bd 100644
---- a/build/package/debian/po/vi.po
-+++ b/build/package/debian/po/vi.po
-@@ -10,6 +10,7 @@ msgstr ""
- "PO-Revision-Date: 2009-02-16 22:40+1030\n"
- "Last-Translator: Clytie Siddall <clytie at riverland.net.au>\n"
- "Language-Team: Vietnamese <vi-VN at googlegroups.com>\n"
-+"Language: vi\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
- "Content-Transfer-Encoding: 8bit\n"
diff --git a/debian/patches/69-support-pythia8.patch b/debian/patches/69-support-pythia8.patch
index a082177..310fe1e 100644
--- a/debian/patches/69-support-pythia8.patch
+++ b/debian/patches/69-support-pythia8.patch
@@ -8,18 +8,3 @@
test "x$enable_alien" = "xyes" && pl="$pl root-plugin-net-alien"
test "x$enable_globus" = "xyes" && pl="$pl root-plugin-net-globus"
test "x$enable_krb5" = "xyes" && pl="$pl root-plugin-net-krb5"
---- a/build/package/lib/makebuilddepend.sh
-+++ b/build/package/lib/makebuilddepend.sh
-@@ -272,9 +272,9 @@
- root-plugin-math-fumili) ;;
- root-plugin-math-minuit2) ;;
- root-plugin-math-mlp) ;;
-- root-plugin-montecarlo-pythia5) echo -n ", pythia5-dev" ;;
-- root-plugin-montecarlo-pythia6) echo -n ", pythia6-dev" ;;
-- root-plugin-montecarlo-pythia8) echo -n ", pythia8-dev" ;;
-+ root-plugin-montecarlo-pythia5) echo -n ", libpythia5-dev" ;;
-+ root-plugin-montecarlo-pythia6) echo -n ", libpythia6-dev" ;;
-+ root-plugin-montecarlo-pythia8) echo -n ", libpythia8-dev" ;;
- root-plugin-net-alien) echo -n ", libgapiui-dev" ;;
- root-plugin-net-globus)
- echo -n ", libglobus-gss-assist-dev"
diff --git a/debian/patches/70-ignore-macosx-headers.patch b/debian/patches/70-ignore-macosx-headers.patch
deleted file mode 100644
index 9634e91..0000000
--- a/debian/patches/70-ignore-macosx-headers.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/build/package/lib/makelists.sh
-+++ b/build/package/lib/makelists.sh
-@@ -48,7 +48,7 @@
- # Loop over the directories, and update the file lists based on the
- # information in Module.mk files in each subdirectory
- #
--l=`find . -name "Module.mk" -print0 | xargs -L 1 -0 dirname | sort -u | sed 's,./,,'`
-+l=`find . -name "Module.mk" -print0 | xargs -L 1 -0 dirname | sort -u | sed 's,./,,' | grep -v macosx`
- for d in $l ; do
- #
- # If there's no Module.mk file in the currently inspected
diff --git a/debian/patches/73-ruby-1.9.1.patch b/debian/patches/73-ruby-1.9.1.patch
index 466780d..e57b4f3 100644
--- a/debian/patches/73-ruby-1.9.1.patch
+++ b/debian/patches/73-ruby-1.9.1.patch
@@ -1,36 +1,3 @@
---- a/build/package/common/libroot-bindings-ruby.control
-+++ b/build/package/common/libroot-bindings-ruby.control
-@@ -15,7 +15,7 @@
- Package: libroot-bindings-ruby-dev
- Architecture: any
- Section: libdevel
--Depends: libroot-bindings-ruby at libvers@ (= ${binary:Version}), libroot-core-dev, ruby1.8-dev | ruby-dev (>= 1.8), ${misc:Depends}
-+Depends: libroot-bindings-ruby at libvers@ (= ${binary:Version}), libroot-core-dev, ruby1.9.1-dev | ruby-dev (>= 4.9), ${misc:Depends}
- Breaks: libroot-ruby (<< 5.19.01-1)
- Replaces: libroot-ruby
- Description: Ruby extension for ROOT - development headers
---- a/build/package/lib/makebuilddepend.sh
-+++ b/build/package/lib/makebuilddepend.sh
-@@ -11,8 +11,8 @@
- libroot-bindings-python)
- echo "BuildRequires: python-devel >= 2.1" ;;
- libroot-bindings-ruby)
-- echo "BuildRequires: ruby-devel >= 1.8"
-- echo "BuildRequires: ruby >= 1.8" ;;
-+ echo "BuildRequires: ruby-devel >= 1.9.1"
-+ echo "BuildRequires: ruby >= 1.9.1" ;;
- libroot-core) ;;
- libroot-geom) ;;
- libroot-graf2d-gpad) ;;
-@@ -187,7 +187,7 @@
- libroot-bindings-python)
- echo -n ", python-support (>= 0.3)" ;;
- libroot-bindings-ruby)
-- echo -n ", ruby (>= 1.8), ruby1.8-dev | ruby-dev (>= 1.8)" ;;
-+ echo -n ", ruby (>= 4.9), ruby1.9.1-dev | ruby-dev (>= 4.9)" ;;
- libroot-core) ;;
- libroot-geom) ;;
- libroot-graf2d-gpad) ;;
--- a/bindings/ruby/Module.mk
+++ b/bindings/ruby/Module.mk
@@ -87,5 +87,5 @@
diff --git a/debian/patches/series b/debian/patches/series
index d5532ec..108cb44 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,20 +3,8 @@
03-build-libroot-bonjour-package.patch
04-build-libroot-html-package.patch
05-rename-package-libroot-proof-proofplayer.patch
-06-fix-configre-and-controls.patch
-07-add-python-support.patch
-08-fix-conflicts.patch
-09-fix-spelling-allows-one-to.patch
-10-remove-obsolete-build-dep.patch
-11-fix-circular-dep.patch
-12-fix-net-auth-control.patch
-13-fix-circular-dep.patch
15-enable-extra-ldflags.patch
-16-fix-libroot-html-control.patch
-17-remove-ld.so.conf.d-in-install-file.patch
-18-create-so-symlinks-for-plugins.patch
19-remove-embedded-library-gl2ps.patch
-20-add-libgl2ps-build-dep.patch
21-fix-manpage-hyphen.patch
22-fix-typo-succes-success.patch
23-fix-typo-preceed-preced.patch
@@ -53,17 +41,9 @@
56-fix-typo-appropiate-appropriate.patch
57-fix-typo-another.patch
58-fix-typo-environement-environment.patch
-59-remove-duplicate-field.patch
-60-remove-obsolete-package-dependency.patch
-61-fix-libjpeg-dev-dependency.patch
-62-fix-duplicated-package-description.patch
-63-extend-libroot-static-description.patch
64-support-mipsel.patch
-66-build-cintex-only-on-x86-x64.patch
67-generate-iosenum.h.patch
-68-po.patch
69-support-pythia8.patch
-70-ignore-macosx-headers.patch
71-remove-root-plugin-proof-xproof.patch
72-rpath-ldflag.patch
73-ruby-1.9.1.patch
--
root-system: CERN's ROOT Data Analysis Framework
More information about the debian-science-commits
mailing list