[oce] 03/03: Apply cme fix dpkg.
Anton Gladky
gladk at moszumanska.debian.org
Wed Jan 27 21:24:36 UTC 2016
This is an automated email from the git hooks/post-receive script.
gladk pushed a commit to branch debian
in repository oce.
commit 5348aae7f5897bb1ccfc9cf9b01aeb3ebc2fb8c2
Author: Anton Gladky <gladk at debian.org>
Date: Wed Jan 27 22:19:17 2016 +0100
Apply cme fix dpkg.
---
debian/control | 140 ++++++++++++++++++++++++--------------
debian/patches/split-export.patch | 41 +++++------
2 files changed, 110 insertions(+), 71 deletions(-)
diff --git a/debian/control b/debian/control
index f8d599a..05ae41f 100644
--- a/debian/control
+++ b/debian/control
@@ -1,23 +1,34 @@
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, 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,
+ 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-foundation10
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 +48,11 @@ Description: OpenCASCADE Community Edition CAE platform shared library
Package: liboce-modeling10
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 +72,11 @@ Description: OpenCASCADE Community Edition CAE platform shared library
Package: liboce-visualization10
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 +93,11 @@ Description: OpenCASCADE Community Edition CAE platform shared library
Package: liboce-ocaf-lite10
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 +116,11 @@ Description: OpenCASCADE Community Edition CAE platform shared library
Package: liboce-ocaf10
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 +140,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 +161,13 @@ Description: OpenCASCADE Community Edition CAE platform shared library
Package: liboce-foundation-dev
Architecture: any
+Multi-Arch: same
Section: libdevel
-Depends: liboce-foundation10 (>= ${source:Upstream-Version}), liboce-foundation10 (<< ${source:Upstream-Version}+1~),
+Depends: liboce-foundation10 (>= ${source:Upstream-Version}),
+ liboce-foundation10 (<< ${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 +179,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-modeling10 (>= ${source:Upstream-Version}), liboce-modeling10 (<< ${source:Upstream-Version}+1~),
+Depends: liboce-foundation-dev (>= ${source:Upstream-Version}),
+ liboce-foundation-dev (<< ${source:Upstream-Version}+1~),
+ liboce-modeling10 (>= ${source:Upstream-Version}),
+ liboce-modeling10 (<< ${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 +199,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-lite10 (>= ${source:Upstream-Version}), liboce-ocaf-lite10 (<< ${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-lite10 (>= ${source:Upstream-Version}),
+ liboce-ocaf-lite10 (<< ${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 +221,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-ocaf10 (>= ${source:Upstream-Version}), liboce-ocaf10 (<< ${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-ocaf10 (>= ${source:Upstream-Version}),
+ liboce-ocaf10 (<< ${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 +247,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-visualization10 (>= ${source:Upstream-Version}), liboce-visualization10 (<< ${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-visualization10 (>= ${source:Upstream-Version}),
+ liboce-visualization10 (<< ${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 +276,3 @@ Description: OpenCASCADE Community Edition CAE platform library development file
.
This package contains the headers and symlinks for libraries shipped by
liboce-visualization10.
-
diff --git a/debian/patches/split-export.patch b/debian/patches/split-export.patch
index e90395e..3652710 100644
--- a/debian/patches/split-export.patch
+++ b/debian/patches/split-export.patch
@@ -1,29 +1,30 @@
Description: Split export file into several pieces
+ In Debian, OCE libraries are split into several packages.
+ Prior to oce 0.10-3, the OCE-libraries-release.cmake file contained all
+ targets computed when compiling. But then CMake projects could load this
+ file only if all files referenced by these targets were present, which
+ means that nearly all oce packages have to be installed.
+ .
+ With this patch, each package contains a cmake script which declares
+ only its own targets, and OCEConfig.cmake loads all those scripts
+ in the right order.
+ .
+ The only downside is that cmake reports errors when generating files:
+ CMake Error: INSTALL(EXPORT "OCE02_ModelingTargets" ...) includes target "TKG2d" which requires target "TKernel" that is not in the export set.
+ CMake Error: INSTALL(EXPORT "OCE02_ModelingTargets" ...) includes target "TKG3d" which requires target "TKMath" that is not in the export set.
+ [...]
+ and thus returns 1 instead of 0.
+ .
+ This is related to
+ http://www.cmake.org/Bug/view.php?id=12588
+ .
+ This patch is Debian specific and does not have to be forwarded upstream.
+ .
Author: Denis Barbier <bouzim at gmail.com>
Origin: Debian
Forwarded: no
Last-Update: 2013-08-07
-In Debian, OCE libraries are split into several packages.
-Prior to oce 0.10-3, the OCE-libraries-release.cmake file contained all
-targets computed when compiling. But then CMake projects could load this
-file only if all files referenced by these targets were present, which
-means that nearly all oce packages have to be installed.
-
-With this patch, each package contains a cmake script which declares
-only its own targets, and OCEConfig.cmake loads all those scripts
-in the right order.
-
-The only downside is that cmake reports errors when generating files:
- CMake Error: INSTALL(EXPORT "OCE02_ModelingTargets" ...) includes target "TKG2d" which requires target "TKernel" that is not in the export set.
- CMake Error: INSTALL(EXPORT "OCE02_ModelingTargets" ...) includes target "TKG3d" which requires target "TKMath" that is not in the export set.
- [...]
-and thus returns 1 instead of 0.
-
-This is related to
- http://www.cmake.org/Bug/view.php?id=12588
-
-This patch is Debian specific and does not have to be forwarded upstream.
Index: oce-OCE-0.17.1/CMakeLists.txt
===================================================================
--
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