[SCM] ATLAS packaging for Debian branch, master, updated. upstream/3.8.4-16-gede4b56

Sébastien Villemot sebastien at debian.org
Wed Jun 5 16:07:34 UTC 2013


The following commit has been merged in the master branch:
commit 7b577ebcbfa5f6271e967e7853510348d7b6936a
Author: Sébastien Villemot <sebastien at debian.org>
Date:   Wed Jun 5 14:00:47 2013 +0200

    Remove Conflicts/Replaces against pre-squeeze packages

diff --git a/debian/changelog b/debian/changelog
index 5afa598..abe8cbf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ atlas (3.10.1-1) UNRELEASED; urgency=low
   * Use my @debian.org email address
   * Remove obsolete DM-Upload-Allowed flag
   * Switch VCS to git
+  * Remove Conflicts/Replaces against pre-squeeze packages
 
  -- Sylvestre Ledru <sylvestre at debian.org>  Mon, 16 Jul 2012 14:57:17 +0200
 
diff --git a/debian/control b/debian/control
index 3651727..fdb589b 100644
--- a/debian/control
+++ b/debian/control
@@ -19,19 +19,9 @@ Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Provides: libatlas.so.3gf, libblas.so.3gf, liblapack.so.3gf,
  libatlas.so.3, libblas.so.3, liblapack.so.3
-Conflicts: atlas2 (<< 3.2.1-1), libblas3gf (<< 1.2-5), 
- liblapack3gf (<< 3.2.1-4), libatlas3gf-sse (<< 3.8.3-25), 
- libatlas3gf-sse2 (<< 3.8.3-25), libatlas3gf-sse3 (<< 3.8.3-25), 
- libatlas3gf-core2sse3 (<< 3.8.3-25), libatlas3gf-amd64sse3 (<< 3.8.3-25),
- libatlas3gf-corei7sse3 (<< 3.8.3-25), libatlas3gf-altivec (<< 3.8.3-25), 
- libatlas3gf-v9 (<< 3.8.3-25), libatlas3gf-ev6 (<< 3.8.3-25), 
- libatlas3gf-2.0 (<< 3.8.3-25), libatlas3gf-base (<< 3.8.4-4)
-Replaces: atlas2 (<< 3.2.1-1),  libatlas3gf-sse (<< 3.8.3-25), 
- libatlas3gf-sse2 (<< 3.8.3-25), libatlas3gf-sse3 (<< 3.8.3-25), 
- libatlas3gf-core2sse3 (<< 3.8.3-25), libatlas3gf-amd64sse3 (<< 3.8.3-25),
- libatlas3gf-corei7sse3 (<< 3.8.3-25), libatlas3gf-altivec (<< 3.8.3-25), 
- libatlas3gf-v9 (<< 3.8.3-25), libatlas3gf-ev6 (<< 3.8.3-25), 
- libatlas3gf-2.0 (<< 3.8.3-25), libblas3gf (<< 1.2.20110419-3),
+Conflicts: libblas3gf (<< 1.2-5), liblapack3gf (<< 3.2.1-4),
+ libatlas3gf-base (<< 3.8.4-4)
+Replaces: libblas3gf (<< 1.2.20110419-3),
  libatlas3gf-base (<< 3.8.4-4), libopenblas-base (<< 0.1.1-3),
  liblapack3gf (<< 3.4.0-1)
 Breaks: libblas3gf (<< 1.2.20110419-3), libatlas3gf-base (<< 3.8.4-4),
@@ -74,20 +64,6 @@ Depends: libatlas3-base (= ${binary:Version}), libatlas-dev, ${misc:Depends},
  ${shlibs:Depends}
 Provides: libatlas-3gf.so, libblas-3gf.so, liblapack-3gf.so,
  libatlas-3.so, liblapack-3.so
-Conflicts: atlas2-dev (<< 3.2.1-3), atlas2-base-dev, libblas-dev (<< 1.2-5), 
- liblapack-dev (<< 3.2.1-4), libatlas-sse-dev (<< 3.8.3-25), 
- libatlas-sse2-dev (<< 3.8.3-25), libatlas-sse3-dev (<< 3.8.3-25), 
- libatlas-core2sse3-dev (<< 3.8.3-25), libatlas-amd64sse3-dev (<< 3.8.3-25),
- libatlas-corei7sse3-dev (<< 3.8.3-25), libatlas-altivec-dev (<< 3.8.3-25), 
- libatlas-v9-dev (<< 3.8.3-25), libatlas-ev6-dev (<< 3.8.3-25), 
- libatlas-2.0-dev (<< 3.8.3-25)
-Replaces: atlas2-dev (<< 3.2.1-3), atlas2-base-dev, libatlas-sse-dev, 
- libatlas-sse-dev (<< 3.8.3-25), 
- libatlas-sse2-dev (<< 3.8.3-25), libatlas-sse3-dev (<< 3.8.3-25), 
- libatlas-core2sse3-dev (<< 3.8.3-25), libatlas-amd64sse3-dev (<< 3.8.3-25),
- libatlas-corei7sse3-dev (<< 3.8.3-25), libatlas-altivec-dev (<< 3.8.3-25), 
- libatlas-v9-dev (<< 3.8.3-25), libatlas-ev6-dev (<< 3.8.3-25), 
- libatlas-2.0-dev (<< 3.8.3-25)
 Suggests: libblas-doc, liblapack-doc
 Description: Automatically Tuned Linear Algebra Software, generic static
  ATLAS is an approach for the automatic generation and optimization of
@@ -103,9 +79,7 @@ Package: libatlas-dev
 Section: libdevel
 Architecture: all
 Depends: libc6-dev, libblas-dev, ${misc:Depends}, ${shlibs:Depends}
-Conflicts: atlas-dev, atlas2-dev (<< 3.2.1-3), atlas2-headers, atlas3-headers,
- libblas-dev (<< 1.2-5), liblapack-dev (<< 3.2.1-4)
-Replaces: atlas2-dev (<< 3.2.1-3), atlas2-headers, atlas3-headers
+Conflicts: libblas-dev (<< 1.2-5), liblapack-dev (<< 3.2.1-4)
 Suggests: liblapack-dev, liblapack-doc
 Description: Automatically Tuned Linear Algebra Software, C header files
  ATLAS is an approach for the automatic generation and optimization of
@@ -121,7 +95,6 @@ Package: libatlas-test
 Architecture: any
 Section: devel
 Priority: extra
-Replaces: atlas-test, atlas3-test
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Recommends: liblapack3
 Description: Automatically Tuned Linear Algebra Software, test programs
@@ -137,8 +110,6 @@ Description: Automatically Tuned Linear Algebra Software, test programs
 Package: libatlas-doc
 Section: doc
 Depends: ${misc:Depends}
-Conflicts: atlas-doc, atlas3-doc
-Replaces: atlas-doc, atlas3-doc
 Architecture: all
 Description: Automatically Tuned Linear Algebra Software, documentation
  ATLAS is an approach for the automatic generation and optimization of

-- 
ATLAS packaging for Debian



More information about the debian-science-commits mailing list