[SCM] geant321: Particle detector description and simulation tool branch, debian, updated. 8b66aaf84b0af200ce2a80932d84c591f0b3d9e1

[Lifeng Sun]

The following commit has been merged in the debian branch:
commit d3acc2553221c03d9f21464b93ab535f06b03a75
Author: Lifeng Sun <lifongsun at gmail.com>
Date:   Tue Mar 29 09:35:13 2011 +0800

    Change "Conflicts" field to "Breaks".
    
    debian/control.d/libgeant321-2-dev.control: change "Conflicts" to
    "Breaks" and set priority to optional.

diff --git a/debian/control b/debian/control
index ade3dee..73f1510 100644
--- a/debian/control
+++ b/debian/control
@@ -46,11 +46,10 @@ Description: [Physics] Particle detector description and simulation tool
 
 Package: libgeant321-2-dev
 Architecture: any
-Priority: extra
 Section: libdevel
 Depends: libgeant321-2-gfortran (= ${binary:Version}), libpawlib-lesstif3-dev (>= 1:2.14.04.dfsg.2-2), ${misc:Depends}
 Recommends: geant321
-Conflicts: libgeant1-dev
+Breaks: libgeant1-dev (<= 2004.11.04.dfsg-0sarge1)
 Replaces: libgeant1-dev
 Description: [Physics] Library for GEANT 3.21 (development files)
  GEANT is a framework for simulating the passage of subatomic particles
diff --git a/debian/control.d/libgeant321-2-dev.control b/debian/control.d/libgeant321-2-dev.control
index c83e055..da763e3 100644
--- a/debian/control.d/libgeant321-2-dev.control
+++ b/debian/control.d/libgeant321-2-dev.control
@@ -1,10 +1,9 @@
 Package: libgeant321-2-dev
 Architecture: any
-Priority: extra
 Section: libdevel
 Depends: libgeant321-2-gfortran (= ${binary:Version}), libpawlib-lesstif3-dev (>= 1:2.14.04.dfsg.2-2), ${misc:Depends}
 Recommends: geant321
-Conflicts: libgeant1-dev
+Breaks: libgeant1-dev (<= 2004.11.04.dfsg-0sarge1)
 Replaces: libgeant1-dev
 Description: [Physics] Library for GEANT 3.21 (development files)
  GEANT is a framework for simulating the passage of subatomic particles

-- 
geant321: Particle detector description and simulation tool