[SCM] mclibs: CERNLIB Monte Carlo libraries branch, debian, updated. upstream/2006.dfsg.2-19-g3a21700

Lifeng Sun lifongsun at gmail.com
Tue Mar 29 13:02:02 UTC 2011


The following commit has been merged in the debian branch:
commit 34b877b0e001f761597c00610e36529ab4a9095e
Author: Lifeng Sun <lifongsun at gmail.com>
Date:   Mon Mar 28 16:46:30 2011 +0800

    Change "Conflicts" field to "Breaks".
    
    debian/control.d/{libcojets2,libherwig59-2,libisajet758-3,libpdflib804-2,
    libphtools2}-dev.control.

diff --git a/debian/control b/debian/control
index 4ab2763..6ba1693 100644
--- a/debian/control
+++ b/debian/control
@@ -31,7 +31,7 @@ Section: libdevel
 Depends: cernlib-base-dev (>= 2006.dfsg.2-7), libmathlib2-dev (>= 2006.dfsg.2-7), libcojets2-gfortran (= ${binary:Version}), ${misc:Depends}
 Recommends: montecarlo-data (>= 2006.dfsg.2)
 Replaces: libcojets1-dev
-Conflicts: libcojets1-dev
+Breaks: libcojets1-dev (<= 2004.11.04.dfsg-0sarge1)
 Description: [Physics] COJETS p-p and pbar-p interaction Monte Carlo
  COJETS is a Monte Carlo library which simulates pbar-p and p-p interactions at
  high energy.  The interaction process is first calculated at the parton level
@@ -93,7 +93,7 @@ Priority: extra
 Section: libdevel
 Depends: cernlib-base-dev (>= 2006.dfsg.2-7), libpdflib804-2-dev (= ${binary:Version}), libherwig59-2-gfortran (= ${binary:Version}), ${misc:Depends}
 Replaces: libherwig59-dev
-Conflicts: libherwig59-dev
+Breaks: libherwig59-dev (<= 2004.11.04.dfsg-0sarge1)
 Description: [Physics] Monte Carlo event generator for hadrons (development)
  HERWIG is a general-purpose event generator for high energy hadronic
  processes, with particular emphasis on the detailed simulation of
@@ -121,7 +121,7 @@ Section: libdevel
 Depends: libpdflib804-2-dev (= ${binary:Version}), libisajet758-3-gfortran (= ${binary:Version}), ${misc:Depends}
 Recommends: montecarlo-data (>= 2006.dfsg.2)
 Replaces: libisajet758-dev, libisajet758-2-dev
-Conflicts: libisajet758-dev, libisajet758-2-dev
+Breaks: libisajet758-dev (<= 2004.11.04.dfsg-0sarge1), libisajet758-2-dev (<= 2006.dfsg.2-3)
 Description: [Physics] Monte Carlo generator for proton/electron reactions
  ISAJET is a Monte Carlo library which simulates p-p, pbar-p, and e+ e-
  interactions at high energies.  The library is based on perturbative QCD
@@ -153,7 +153,7 @@ Priority: extra
 Section: libdevel
 Depends: cernlib-base-dev (>= 2006.dfsg.2-7), libmathlib2-dev (>= 2006.dfsg.2-7), libpdflib804-2-gfortran (= ${binary:Version}), ${misc:Depends}
 Replaces: libpdflib804-dev
-Conflicts: libpdflib804-dev
+Breaks: libpdflib804-dev (<= 2004.11.04.dfsg-0sarge1)
 Description: [Physics] Comprehensive library of parton density functions
  The PDFLIB package gathers about 100 different sets of Parton Density
  Functions into a comprehensive library in a consistent way.  Density functions
@@ -211,7 +211,7 @@ Priority: extra
 Section: libdevel
 Depends: cernlib-base-dev (>= 2006.dfsg.2-7), libmathlib2-dev (>= 2006.dfsg.2-7), libphtools2-gfortran (= ${binary:Version}), ${misc:Depends}
 Replaces: libphtools1-dev
-Conflicts: libphtools1-dev
+Breaks: libphtools1-dev (<= 2004.11.04.dfsg-0sarge1)
 Description: [Physics] General purpose Monte Carlo routines (development files)
  This library contains three main routines.  FOWL allows calculation of phase
  space distributions arising from particle interactions, generated in a
diff --git a/debian/control.d/libcojets2-dev.control b/debian/control.d/libcojets2-dev.control
index 64d4c51..cc44917 100644
--- a/debian/control.d/libcojets2-dev.control
+++ b/debian/control.d/libcojets2-dev.control
@@ -5,7 +5,7 @@ Section: libdevel
 Depends: cernlib-base-dev (>= 2006.dfsg.2-7), libmathlib2-dev (>= 2006.dfsg.2-7), libcojets2-gfortran (= ${binary:Version}), ${misc:Depends}
 Recommends: montecarlo-data (>= 2006.dfsg.2)
 Replaces: libcojets1-dev
-Conflicts: libcojets1-dev
+Breaks: libcojets1-dev (<= 2004.11.04.dfsg-0sarge1)
 Description: [Physics] COJETS p-p and pbar-p interaction Monte Carlo
  COJETS is a Monte Carlo library which simulates pbar-p and p-p interactions at
  high energy.  The interaction process is first calculated at the parton level
diff --git a/debian/control.d/libherwig59-2-dev.control b/debian/control.d/libherwig59-2-dev.control
index aa615b5..280ae1f 100644
--- a/debian/control.d/libherwig59-2-dev.control
+++ b/debian/control.d/libherwig59-2-dev.control
@@ -4,7 +4,7 @@ Priority: extra
 Section: libdevel
 Depends: cernlib-base-dev (>= 2006.dfsg.2-7), libpdflib804-2-dev (= ${binary:Version}), libherwig59-2-gfortran (= ${binary:Version}), ${misc:Depends}
 Replaces: libherwig59-dev
-Conflicts: libherwig59-dev
+Breaks: libherwig59-dev (<= 2004.11.04.dfsg-0sarge1)
 Description: [Physics] Monte Carlo event generator for hadrons (development)
  HERWIG is a general-purpose event generator for high energy hadronic
  processes, with particular emphasis on the detailed simulation of
diff --git a/debian/control.d/libisajet758-3-dev.control b/debian/control.d/libisajet758-3-dev.control
index 138d120..60cddaa 100644
--- a/debian/control.d/libisajet758-3-dev.control
+++ b/debian/control.d/libisajet758-3-dev.control
@@ -5,7 +5,7 @@ Section: libdevel
 Depends: libpdflib804-2-dev (= ${binary:Version}), libisajet758-3-gfortran (= ${binary:Version}), ${misc:Depends}
 Recommends: montecarlo-data (>= 2006.dfsg.2)
 Replaces: libisajet758-dev, libisajet758-2-dev
-Conflicts: libisajet758-dev, libisajet758-2-dev
+Breaks: libisajet758-dev (<= 2004.11.04.dfsg-0sarge1), libisajet758-2-dev (<= 2006.dfsg.2-3)
 Description: [Physics] Monte Carlo generator for proton/electron reactions
  ISAJET is a Monte Carlo library which simulates p-p, pbar-p, and e+ e-
  interactions at high energies.  The library is based on perturbative QCD
diff --git a/debian/control.d/libpdflib804-2-dev.control b/debian/control.d/libpdflib804-2-dev.control
index d5759a1..4ef5546 100644
--- a/debian/control.d/libpdflib804-2-dev.control
+++ b/debian/control.d/libpdflib804-2-dev.control
@@ -4,7 +4,7 @@ Priority: extra
 Section: libdevel
 Depends: cernlib-base-dev (>= 2006.dfsg.2-7), libmathlib2-dev (>= 2006.dfsg.2-7), libpdflib804-2-gfortran (= ${binary:Version}), ${misc:Depends}
 Replaces: libpdflib804-dev
-Conflicts: libpdflib804-dev
+Breaks: libpdflib804-dev (<= 2004.11.04.dfsg-0sarge1)
 Description: [Physics] Comprehensive library of parton density functions
  The PDFLIB package gathers about 100 different sets of Parton Density
  Functions into a comprehensive library in a consistent way.  Density functions
diff --git a/debian/control.d/libphtools2-dev.control b/debian/control.d/libphtools2-dev.control
index 3e67997..c1ceab2 100644
--- a/debian/control.d/libphtools2-dev.control
+++ b/debian/control.d/libphtools2-dev.control
@@ -4,7 +4,7 @@ Priority: extra
 Section: libdevel
 Depends: cernlib-base-dev (>= 2006.dfsg.2-7), libmathlib2-dev (>= 2006.dfsg.2-7), libphtools2-gfortran (= ${binary:Version}), ${misc:Depends}
 Replaces: libphtools1-dev
-Conflicts: libphtools1-dev
+Breaks: libphtools1-dev (<= 2004.11.04.dfsg-0sarge1)
 Description: [Physics] General purpose Monte Carlo routines (development files)
  This library contains three main routines.  FOWL allows calculation of phase
  space distributions arising from particle interactions, generated in a

-- 
mclibs: CERNLIB Monte Carlo libraries



More information about the debian-science-commits mailing list