[SCM] PAW: Physics Analysis Workstation branch, debian-patch/2.14.04.dfsg.2-7, updated. upstream/2.14.04.dfsg.2-24-g4a7652d

[Lifeng Sun]

The following commit has been merged in the debian-patch/2.14.04.dfsg.2-7 branch:
commit aace38b82e53078634567d14b304d785a428882d
Author: Lifeng Sun <lifongsun at gmail.com>
Date:   Mon Mar 28 10:07:50 2011 +0800

    Change "Conflicts" field to "Breaks".
    
    * debian/control.d/libpawlib{2,-lesstif3}-dev.control:
      change "Conflicts" to "Breaks".

diff --git a/debian/control b/debian/control
index 36027e8..880438a 100644
--- a/debian/control
+++ b/debian/control
@@ -12,7 +12,7 @@ Package: libpawlib-lesstif3-dev
 Architecture: any
 Priority: extra
 Section: libdevel
-Conflicts: libpaw1-dev, libpawlib2-lesstif-dev
+Breaks: libpaw1-dev (<= 2004.11.04.dfsg-0sarge1), libpawlib2-lesstif-dev (<= 1:2.14.04.dfsg-1)
 Replaces: libpaw1-dev, libpawlib2-lesstif-dev
 Depends: cernlib-base-dev (>= 2006.dfsg.2-7), libpawlib2-dev (= ${binary:Version}), libpacklib-lesstif1-dev (>= 2006.dfsg.2-7), lesstif2-dev, libxbae-dev, libxaw7-dev, libpawlib-lesstif3-gfortran (= ${binary:Version}), ${misc:Depends}
 Description: CERNLIB PAW library (Lesstif-dependent part - development files)
@@ -51,7 +51,7 @@ Priority: extra
 Section: libdevel
 Depends: cernlib-base-dev (>= 2006.dfsg.2-7), libgraflib1-dev (>= 2006.dfsg.2-7), libmathlib2-dev (>= 2006.dfsg.2-7), libpawlib2-gfortran (= ${binary:Version}), ${misc:Depends}
 Replaces: libpaw1-dev
-Conflicts: libpaw1-dev
+Breaks: libpaw1-dev (<= 2004.11.04.dfsg-0sarge1)
 Suggests: libpawlib-lesstif3-dev
 Description: CERNLIB PAW library - portion without Lesstif (development files)
  CERNLIB is a suite of data analysis tools and libraries created for
diff --git a/debian/control.d/libpawlib-lesstif3-dev.control b/debian/control.d/libpawlib-lesstif3-dev.control
index 62c915e..b063655 100644
--- a/debian/control.d/libpawlib-lesstif3-dev.control
+++ b/debian/control.d/libpawlib-lesstif3-dev.control
@@ -2,7 +2,7 @@ Package: libpawlib-lesstif3-dev
 Architecture: any
 Priority: extra
 Section: libdevel
-Conflicts: libpaw1-dev, libpawlib2-lesstif-dev
+Breaks: libpaw1-dev (<= 2004.11.04.dfsg-0sarge1), libpawlib2-lesstif-dev (<= 1:2.14.04.dfsg-1)
 Replaces: libpaw1-dev, libpawlib2-lesstif-dev
 Depends: cernlib-base-dev (>= 2006.dfsg.2-7), libpawlib2-dev (= ${binary:Version}), libpacklib-lesstif1-dev (>= 2006.dfsg.2-7), lesstif2-dev, libxbae-dev, libxaw7-dev, libpawlib-lesstif3-gfortran (= ${binary:Version}), ${misc:Depends}
 Description: CERNLIB PAW library (Lesstif-dependent part - development files)
diff --git a/debian/control.d/libpawlib2-dev.control b/debian/control.d/libpawlib2-dev.control
index 0687153..492eb23 100644
--- a/debian/control.d/libpawlib2-dev.control
+++ b/debian/control.d/libpawlib2-dev.control
@@ -4,7 +4,7 @@ Priority: extra
 Section: libdevel
 Depends: cernlib-base-dev (>= 2006.dfsg.2-7), libgraflib1-dev (>= 2006.dfsg.2-7), libmathlib2-dev (>= 2006.dfsg.2-7), libpawlib2-gfortran (= ${binary:Version}), ${misc:Depends}
 Replaces: libpaw1-dev
-Conflicts: libpaw1-dev
+Breaks: libpaw1-dev (<= 2004.11.04.dfsg-0sarge1)
 Suggests: libpawlib-lesstif3-dev
 Description: CERNLIB PAW library - portion without Lesstif (development files)
  CERNLIB is a suite of data analysis tools and libraries created for

-- 
PAW: Physics Analysis Workstation