[oce] 01/02: Apply cme fix dpkg.
Anton Gladky
gladk at moszumanska.debian.org
Mon Jan 25 14:59:04 UTC 2016
This is an automated email from the git hooks/post-receive script.
gladk pushed a commit to branch 0.15.8
in repository oce.
commit 98c68ad560878e7c8c87efab7f664d740c333fd6
Author: Anton Gladky <gladk at debian.org>
Date: Mon Jan 25 15:14:59 2016 +0100
Apply cme fix dpkg.
---
debian/control | 141 ++++++++++++++++----------
debian/copyright | 2 +-
debian/patches/NCollection-align-64bit.patch | 7 +-
debian/patches/disable_BRepAlgoAPI_text.patch | 3 +-
debian/patches/disable_Brep_unittest.patch | 3 +-
debian/patches/include-oce-config.patch | 3 +-
debian/patches/speedup-BRepMesh_test.patch | 11 +-
7 files changed, 102 insertions(+), 68 deletions(-)
diff --git a/debian/control b/debian/control
index 205b142..f70bd07 100644
--- a/debian/control
+++ b/debian/control
@@ -1,23 +1,35 @@
Source: oce
+Maintainer: Debian Science Maintainers <debian-science-maintainers at lists.alioth.debian.org>
+Uploaders: "Adam C. Powell, IV" <hazelsct at debian.org>,
+ Denis Barbier <barbier at debian.org>
Section: science
+XS-Autobuild: no
Priority: extra
-Maintainer: Debian Science Maintainers <debian-science-maintainers at lists.alioth.debian.org>
-Uploaders: "Adam C. Powell, IV" <hazelsct at debian.org>, Denis Barbier <barbier at debian.org>
-Standards-Version: 3.9.5
-Build-Depends: debhelper (>= 9), quilt, cmake,
- libx11-dev, libxmu-dev, libxext-dev, libfreetype6-dev, tcl8.5-dev, tk8.5-dev,
- libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | libglu-dev,
- libgl2ps-dev, libfreeimage-dev
-Homepage: https://github.com/tpaviot/oce/wiki
-Vcs-Browser: http://anonscm.debian.org/gitweb/?p=debian-science/packages/oce.git
+Build-Depends: debhelper (>= 9),
+ quilt,
+ cmake,
+ libx11-dev,
+ libxmu-dev,
+ libxext-dev,
+ libfreetype6-dev,
+ tcl8.5-dev,
+ tk8.5-dev,
+ libgl1-mesa-dev | libgl-dev,
+ libglu1-mesa-dev | libglu-dev,
+ libgl2ps-dev,
+ libfreeimage-dev
+Standards-Version: 3.9.6
+Vcs-Browser: https://anonscm.debian.org/cgit/debian-science/packages/oce.git
Vcs-Git: git://anonscm.debian.org/debian-science/packages/oce.git -b debian
+Homepage: https://github.com/tpaviot/oce/wiki
Package: liboce-foundation8
Architecture: any
+Multi-Arch: same
Section: libs
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends},
+ ${misc:Depends}
Pre-Depends: ${misc:Pre-Depends}
-Multi-Arch: same
Description: OpenCASCADE Community Edition CAE platform shared library
OpenCASCADE is a suite for 3D surface and solid modeling, visualization, data
exchange and rapid application development. It is an excellent platform for
@@ -37,10 +49,11 @@ Description: OpenCASCADE Community Edition CAE platform shared library
Package: liboce-modeling8
Architecture: any
+Multi-Arch: same
Section: libs
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends},
+ ${misc:Depends}
Pre-Depends: ${misc:Pre-Depends}
-Multi-Arch: same
Description: OpenCASCADE Community Edition CAE platform shared library
OpenCASCADE is a suite for 3D surface and solid modeling, visualization, data
exchange and rapid application development. It is an excellent platform for
@@ -60,10 +73,11 @@ Description: OpenCASCADE Community Edition CAE platform shared library
Package: liboce-visualization8
Architecture: any
+Multi-Arch: same
Section: libs
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends},
+ ${misc:Depends}
Pre-Depends: ${misc:Pre-Depends}
-Multi-Arch: same
Description: OpenCASCADE Community Edition CAE platform shared library
OpenCASCADE is a suite for 3D surface and solid modeling, visualization, data
exchange and rapid application development. It is an excellent platform for
@@ -80,10 +94,11 @@ Description: OpenCASCADE Community Edition CAE platform shared library
Package: liboce-ocaf-lite8
Architecture: any
+Multi-Arch: same
Section: libs
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends},
+ ${misc:Depends}
Pre-Depends: ${misc:Pre-Depends}
-Multi-Arch: same
Description: OpenCASCADE Community Edition CAE platform shared library
OpenCASCADE is a suite for 3D surface and solid modeling, visualization, data
exchange and rapid application development. It is an excellent platform for
@@ -102,10 +117,11 @@ Description: OpenCASCADE Community Edition CAE platform shared library
Package: liboce-ocaf8
Architecture: any
+Multi-Arch: same
Section: libs
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends},
+ ${misc:Depends}
Pre-Depends: ${misc:Pre-Depends}
-Multi-Arch: same
Description: OpenCASCADE Community Edition CAE platform shared library
OpenCASCADE is a suite for 3D surface and solid modeling, visualization, data
exchange and rapid application development. It is an excellent platform for
@@ -125,10 +141,14 @@ Description: OpenCASCADE Community Edition CAE platform shared library
Package: oce-draw
Architecture: any
Section: science
-Depends: ${shlibs:Depends}, ${misc:Depends},
- libx11-dev, libfreetype6-dev, tcl8.5-dev, tk8.5-dev
-Replaces: opencascade-draw
+Depends: ${shlibs:Depends},
+ ${misc:Depends},
+ libx11-dev,
+ libfreetype6-dev,
+ tcl8.5-dev,
+ tk8.5-dev
Conflicts: opencascade-draw
+Replaces: opencascade-draw
Description: OpenCASCADE Community Edition CAE platform shared library
OpenCASCADE is a suite for 3D surface and solid modeling, visualization, data
exchange and rapid application development. It is an excellent platform for
@@ -142,12 +162,13 @@ Description: OpenCASCADE Community Edition CAE platform shared library
Package: liboce-foundation-dev
Architecture: any
+Multi-Arch: same
Section: libdevel
-Depends: liboce-foundation8 (>= ${source:Upstream-Version}), liboce-foundation8 (<< ${source:Upstream-Version}+1~),
+Depends: liboce-foundation8 (>= ${source:Upstream-Version}),
+ liboce-foundation8 (<< ${source:Upstream-Version}+1~),
${misc:Depends}
-Replaces: libopencascade-foundation-dev
Conflicts: libopencascade-foundation-dev
-Multi-Arch: same
+Replaces: libopencascade-foundation-dev
Description: OpenCASCADE Community Edition CAE platform library development files
OpenCASCADE is a suite for 3D surface and solid modeling, visualization, data
exchange and rapid application development. It is an excellent platform for
@@ -159,13 +180,15 @@ Description: OpenCASCADE Community Edition CAE platform library development file
Package: liboce-modeling-dev
Architecture: any
+Multi-Arch: same
Section: libdevel
-Depends: liboce-foundation-dev (>= ${source:Upstream-Version}), liboce-foundation-dev (<< ${source:Upstream-Version}+1~),
- liboce-modeling8 (>= ${source:Upstream-Version}), liboce-modeling8 (<< ${source:Upstream-Version}+1~),
+Depends: liboce-foundation-dev (>= ${source:Upstream-Version}),
+ liboce-foundation-dev (<< ${source:Upstream-Version}+1~),
+ liboce-modeling8 (>= ${source:Upstream-Version}),
+ liboce-modeling8 (<< ${source:Upstream-Version}+1~),
${misc:Depends}
-Replaces: libopencascade-modeling-dev
Conflicts: libopencascade-modeling-dev
-Multi-Arch: same
+Replaces: libopencascade-modeling-dev
Description: OpenCASCADE Community Edition CAE platform library development files
OpenCASCADE is a suite for 3D surface and solid modeling, visualization, data
exchange and rapid application development. It is an excellent platform for
@@ -177,14 +200,17 @@ Description: OpenCASCADE Community Edition CAE platform library development file
Package: liboce-ocaf-lite-dev
Architecture: any
+Multi-Arch: same
Section: libdevel
-Depends: liboce-foundation-dev (>= ${source:Upstream-Version}), liboce-foundation-dev (<< ${source:Upstream-Version}+1~),
- liboce-modeling-dev (>= ${source:Upstream-Version}), liboce-modeling-dev (<< ${source:Upstream-Version}+1~),
- liboce-ocaf-lite8 (>= ${source:Upstream-Version}), liboce-ocaf-lite8 (<< ${source:Upstream-Version}+1~),
+Depends: liboce-foundation-dev (>= ${source:Upstream-Version}),
+ liboce-foundation-dev (<< ${source:Upstream-Version}+1~),
+ liboce-modeling-dev (>= ${source:Upstream-Version}),
+ liboce-modeling-dev (<< ${source:Upstream-Version}+1~),
+ liboce-ocaf-lite8 (>= ${source:Upstream-Version}),
+ liboce-ocaf-lite8 (<< ${source:Upstream-Version}+1~),
${misc:Depends}
-Replaces: libopencascade-ocaf-lite-dev
Conflicts: libopencascade-ocaf-lite-dev
-Multi-Arch: same
+Replaces: libopencascade-ocaf-lite-dev
Description: OpenCASCADE Community Edition CAE platform library development files
OpenCASCADE is a suite for 3D surface and solid modeling, visualization, data
exchange and rapid application development. It is an excellent platform for
@@ -196,16 +222,21 @@ Description: OpenCASCADE Community Edition CAE platform library development file
Package: liboce-ocaf-dev
Architecture: any
+Multi-Arch: same
Section: libdevel
-Depends: liboce-foundation-dev (>= ${source:Upstream-Version}), liboce-foundation-dev (<< ${source:Upstream-Version}+1~),
- liboce-modeling-dev (>= ${source:Upstream-Version}), liboce-modeling-dev (<< ${source:Upstream-Version}+1~),
- liboce-ocaf-lite-dev (>= ${source:Upstream-Version}), liboce-ocaf-lite-dev (<< ${source:Upstream-Version}+1~),
- liboce-visualization-dev (>= ${source:Upstream-Version}), liboce-visualization-dev (<< ${source:Upstream-Version}+1~),
- liboce-ocaf8 (>= ${source:Upstream-Version}), liboce-ocaf8 (<< ${source:Upstream-Version}+1~),
+Depends: liboce-foundation-dev (>= ${source:Upstream-Version}),
+ liboce-foundation-dev (<< ${source:Upstream-Version}+1~),
+ liboce-modeling-dev (>= ${source:Upstream-Version}),
+ liboce-modeling-dev (<< ${source:Upstream-Version}+1~),
+ liboce-ocaf-lite-dev (>= ${source:Upstream-Version}),
+ liboce-ocaf-lite-dev (<< ${source:Upstream-Version}+1~),
+ liboce-visualization-dev (>= ${source:Upstream-Version}),
+ liboce-visualization-dev (<< ${source:Upstream-Version}+1~),
+ liboce-ocaf8 (>= ${source:Upstream-Version}),
+ liboce-ocaf8 (<< ${source:Upstream-Version}+1~),
${misc:Depends}
-Replaces: libopencascade-ocaf-dev
Conflicts: libopencascade-ocaf-dev
-Multi-Arch: same
+Replaces: libopencascade-ocaf-dev
Description: OpenCASCADE Community Edition CAE platform library development files
OpenCASCADE is a suite for 3D surface and solid modeling, visualization, data
exchange and rapid application development. It is an excellent platform for
@@ -217,18 +248,27 @@ Description: OpenCASCADE Community Edition CAE platform library development file
Package: liboce-visualization-dev
Architecture: any
+Multi-Arch: same
Section: libdevel
-Depends: liboce-foundation-dev (>= ${source:Upstream-Version}), liboce-foundation-dev (<< ${source:Upstream-Version}+1~),
- liboce-modeling-dev (>= ${source:Upstream-Version}), liboce-modeling-dev (<< ${source:Upstream-Version}+1~),
- liboce-ocaf-lite-dev (>= ${source:Upstream-Version}), liboce-ocaf-lite-dev (<< ${source:Upstream-Version}+1~),
- liboce-visualization8 (>= ${source:Upstream-Version}), liboce-visualization8 (<< ${source:Upstream-Version}+1~),
- libx11-dev, libxmu-dev, libxext-dev, libfreetype6-dev,
- libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | libglu-dev,
- libgl2ps-dev, libfreeimage-dev,
+Depends: liboce-foundation-dev (>= ${source:Upstream-Version}),
+ liboce-foundation-dev (<< ${source:Upstream-Version}+1~),
+ liboce-modeling-dev (>= ${source:Upstream-Version}),
+ liboce-modeling-dev (<< ${source:Upstream-Version}+1~),
+ liboce-ocaf-lite-dev (>= ${source:Upstream-Version}),
+ liboce-ocaf-lite-dev (<< ${source:Upstream-Version}+1~),
+ liboce-visualization8 (>= ${source:Upstream-Version}),
+ liboce-visualization8 (<< ${source:Upstream-Version}+1~),
+ libx11-dev,
+ libxmu-dev,
+ libxext-dev,
+ libfreetype6-dev,
+ libgl1-mesa-dev | libgl-dev,
+ libglu1-mesa-dev | libglu-dev,
+ libgl2ps-dev,
+ libfreeimage-dev,
${misc:Depends}
-Replaces: libopencascade-ocaf-lite-dev
Conflicts: libopencascade-ocaf-lite-dev
-Multi-Arch: same
+Replaces: libopencascade-ocaf-lite-dev
Description: OpenCASCADE Community Edition CAE platform library development files
OpenCASCADE is a suite for 3D surface and solid modeling, visualization, data
exchange and rapid application development. It is an excellent platform for
@@ -237,4 +277,3 @@ Description: OpenCASCADE Community Edition CAE platform library development file
.
This package contains the headers and symlinks for libraries shipped by
liboce-visualization8.
-
diff --git a/debian/copyright b/debian/copyright
index 5514e95..c1435dc 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -12,7 +12,7 @@ Debianized-By: Adam C. Powell, IV <hazelsct at debian.org>
Debianized-Date: Wed, 02 Jan 2008 16:32:57 -0500
Files: *
-Copyright: Copyright (C) 1991-2000 by Matra Datavision SA.,
+Copyright: Copyright (C) 1991-2000 by Matra Datavision SA.,
Copyright (C) 2001-2013 Open CASCADE S.A.S.
License: LGPL-2.1 with OpenCASCADE exception
Open CASCADE Technology is free software; you can redistribute it and / or
diff --git a/debian/patches/NCollection-align-64bit.patch b/debian/patches/NCollection-align-64bit.patch
index 4b5eb76..dbf9a64 100644
--- a/debian/patches/NCollection-align-64bit.patch
+++ b/debian/patches/NCollection-align-64bit.patch
@@ -1,11 +1,10 @@
Description: Fix FTBFS on mips, mipsel and sparc
+ .
+ A similar fix had already been applied upstream for HP-UX.
+Forwarded: no
Author: Denis Barbier <bouzim at gmail.com>
Origin: Debian
-Forwarded: no
Last-Update: 2013-11-24
-
-A similar fix had already been applied upstream for HP-UX.
-
Index: oce/src/NCollection/NCollection_IncAllocator.hxx
===================================================================
--- oce.orig/src/NCollection/NCollection_IncAllocator.hxx
diff --git a/debian/patches/disable_BRepAlgoAPI_text.patch b/debian/patches/disable_BRepAlgoAPI_text.patch
index 6e2660c..5a16c4f 100644
--- a/debian/patches/disable_BRepAlgoAPI_text.patch
+++ b/debian/patches/disable_BRepAlgoAPI_text.patch
@@ -1,8 +1,7 @@
Description: disable BRepAlgoAPI test
-Author: Anton Gladky <gladk at debian.org>
Bug-Debian: https://bugs.debian.org/798760
+Author: Anton Gladky <gladk at debian.org>
Last-Update: 2015-10-08
-
--- oce-0.15.orig/test/BRepAlgoAPI_test/boolean_ops.cpp
+++ oce-0.15/test/BRepAlgoAPI_test/boolean_ops.cpp
@@ -5,34 +5,6 @@
diff --git a/debian/patches/disable_Brep_unittest.patch b/debian/patches/disable_Brep_unittest.patch
index 2eb2bca..597981c 100644
--- a/debian/patches/disable_Brep_unittest.patch
+++ b/debian/patches/disable_Brep_unittest.patch
@@ -1,9 +1,8 @@
Description: Disables Brep* unittest
This patch should be removed in the next oce-version
-Author: Anton Gladky <gladk at debian.org>
Bug-Debian: https://bugs.debian.org/778032
+Author: Anton Gladky <gladk at debian.org>
Last-Update: 2015-07-14
-
Index: oce-0.15/test/BRepOffsetAPI_test/BRepOffsetAPI_test.cpp
===================================================================
--- oce-0.15.orig/test/BRepOffsetAPI_test/BRepOffsetAPI_test.cpp
diff --git a/debian/patches/include-oce-config.patch b/debian/patches/include-oce-config.patch
index 91cc983..87da114 100644
--- a/debian/patches/include-oce-config.patch
+++ b/debian/patches/include-oce-config.patch
@@ -1,9 +1,8 @@
Description: Unconditionnally include oce-config.h in header files
+Forwarded: https://github.com/tpaviot/oce/issues/478
Author: Denis Barbier <bouzim at gmail.com>
Origin: Upstream
-Forwarded: https://github.com/tpaviot/oce/issues/478
Last-Update: 2014-02-19
-
Index: oce/src/OpenGl/OpenGl_GlCore11.hxx
===================================================================
--- oce.orig/src/OpenGl/OpenGl_GlCore11.hxx
diff --git a/debian/patches/speedup-BRepMesh_test.patch b/debian/patches/speedup-BRepMesh_test.patch
index 05fca5a..f49e0ba 100644
--- a/debian/patches/speedup-BRepMesh_test.patch
+++ b/debian/patches/speedup-BRepMesh_test.patch
@@ -1,13 +1,12 @@
Description: Make BRepMesh_test run faster
+ .
+ Changes in OCCT 6.6.0 make this test run slower, and mips
+ again timeouts. As this test already takes 1 hour, let
+ it perform less operations.
+Forwarded: no
Author: Denis Barbier <bouzim at gmail.com>
Origin: Debian
-Forwarded: no
Last-Update: 2013-11-29
-
-Changes in OCCT 6.6.0 make this test run slower, and mips
-again timeouts. As this test already takes 1 hour, let
-it perform less operations.
-
Index: oce/test/BRepMesh_test/BRepMesh_test.cpp
===================================================================
--- oce.orig/test/BRepMesh_test/BRepMesh_test.cpp
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/oce.git
More information about the debian-science-commits
mailing list