Your message dated Sat, 07 Mar 2009 15:49:58 +0000
with message-id <[email protected]>
and subject line Bug#491912: fixed in opencascade 6.3.0.dfsg.1-1
has caused the Debian Bug report #491912,
regarding libopencascade6.2: /usr/include/opencascade/arch/Standard_Macro64.hxx
will cause conflicts
to be marked as done.
This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.
(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact [email protected]
immediately.)
--
491912: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=491912
Debian Bug Tracking System
Contact [email protected] with problems
--- Begin Message ---
Package: libopencascade6.2
Version: 6.2-7
Tags: patch
Hi Adam,
I made a mistake when fixing #486386, Standard_Macro64.hxx should
be in a versioned directory to avoid conflicts with newer packages.
Here is a tested patch againt 6.2-7. This patch also ensures that
Standard_Macro64.hxx is not included directly.
Denis
libopencascade6.2: /usr/include/opencascade/arch/Standard_Macro64.hxx will cause conflicts
Standard_Macro64.hxx file has been moved from libopencascade-dev
into libopencascade6.2 as requested in #486386. But this file
will prevent newer libopencascadeX.Y packages from being installed
along with libopencascade6.2, here is a tested patch againt 6.2-7.
This patch also ensures that Standard_Macro64.hxx is not included
directly.
diff --git a/debian/libopencascade6.2.files b/debian/libopencascade6.2.files
index f99f3c9..5b284f0 100644
--- a/debian/libopencascade6.2.files
+++ b/debian/libopencascade6.2.files
@@ -8,4 +8,4 @@ usr/share/opencascade/6.2/src/XmlOcafResource/*
usr/share/opencascade/6.2/src/SHMessage/*
usr/share/opencascade/6.2/src/XSMessage/*
usr/share/opencascade/6.2/src/XSTEPResource/*
-usr/include/opencascade/arch/Standard_Macro64.hxx
+usr/include/opencascade/arch-6.2/Standard_Macro64.hxx
diff --git a/debian/patches/OCC64.patch b/debian/patches/OCC64.patch
index 2b2d420..4cb43c3 100644
--- a/debian/patches/OCC64.patch
+++ b/debian/patches/OCC64.patch
@@ -32,7 +32,7 @@ diff -aur occ6.2/ros/configure.in mod/ros/configure.in
adm/make/WOKSH/Makefile \
adm/make/WOKLibs/Makefile \
adm/make/TKjcas/Makefile \
-+inc/arch/Standard_Macro64.hxx \
++inc/arch-6.2/Standard_Macro64.hxx \
])
--- opencascade-6.2/ros/src/CPPExt/CPPExt_Standard.edl~ 2007-03-21 17:13:42.000000000 -0400
+++ opencascade-6.2/ros/src/CPPExt/CPPExt_Standard.edl 2008-06-12 13:26:47.000000000 -0400
@@ -75,17 +75,22 @@ diff -aur occ6.2/ros/configure.in mod/ros/configure.in
-#define _OCC64 1
-#endif
-#endif
-+#include <arch/Standard_Macro64.hxx>
++#include <arch-6.2/Standard_Macro64.hxx>
#endif
-Index: opencascade-6.2/ros/inc/arch/Standard_Macro64.hxx.in
+Index: opencascade-6.2/ros/inc/arch-6.2/Standard_Macro64.hxx.in
===================================================================
--- /dev/null
-+++ opencascade-6.2/ros/inc/arch/Standard_Macro64.hxx.in
-@@ -0,0 +1,7 @@
++++ opencascade-6.2/ros/inc/arch-6.2/Standard_Macro64.hxx.in
+@@ -0,0 +1,12 @@
+#ifndef _Standard_Macro64_HeaderFile
+# define _Standard_Macro64_HeaderFile
+
++// This file must not be included directly because its name may change.
++#ifndef _Standard_Macro_HeaderFile
++# error "Standard_Macro64.hxx must not be included directly, include Standard_Macro.hxx instead!"
++#endif
++
+// Define _OCC64 variable on 64-bit platforms
+...@occ_define_occ64@
+
diff --git a/debian/rules b/debian/rules
index 3117af7..60b357d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -67,7 +67,7 @@ install: build
$(MAKE) -C ros install DESTDIR=$(CURDIR)/debian/tmp
# Why doesn't OpenCASCADE install its own headers??
cp -a ros/inc debian/tmp/usr/
- rm -f debian/tmp/usr/inc/config.h debian/tmp/usr/inc/arch/Standard_Macro64.hxx.in
+ rm -f debian/tmp/usr/inc/config.h debian/tmp/usr/inc/arch-6.2/Standard_Macro64.hxx.in
cp -a ros/config.h debian/tmp/usr/inc/
install -d debian/tmp/usr/include
mv debian/tmp/usr/inc debian/tmp/usr/include/opencascade
--- End Message ---
--- Begin Message ---
Source: opencascade
Source-Version: 6.3.0.dfsg.1-1
We believe that the bug you reported is fixed in the latest version of
opencascade, which is due to be installed in the Debian FTP archive:
libopencascade-dev_6.3.0.dfsg.1-1_all.deb
to pool/main/o/opencascade/libopencascade-dev_6.3.0.dfsg.1-1_all.deb
libopencascade-foundation-6.3.0_6.3.0.dfsg.1-1_amd64.deb
to
pool/main/o/opencascade/libopencascade-foundation-6.3.0_6.3.0.dfsg.1-1_amd64.deb
libopencascade-foundation-dev_6.3.0.dfsg.1-1_all.deb
to
pool/main/o/opencascade/libopencascade-foundation-dev_6.3.0.dfsg.1-1_all.deb
libopencascade-modeling-6.3.0_6.3.0.dfsg.1-1_amd64.deb
to
pool/main/o/opencascade/libopencascade-modeling-6.3.0_6.3.0.dfsg.1-1_amd64.deb
libopencascade-modeling-dev_6.3.0.dfsg.1-1_all.deb
to pool/main/o/opencascade/libopencascade-modeling-dev_6.3.0.dfsg.1-1_all.deb
libopencascade-ocaf-6.3.0_6.3.0.dfsg.1-1_amd64.deb
to pool/main/o/opencascade/libopencascade-ocaf-6.3.0_6.3.0.dfsg.1-1_amd64.deb
libopencascade-ocaf-dev_6.3.0.dfsg.1-1_all.deb
to pool/main/o/opencascade/libopencascade-ocaf-dev_6.3.0.dfsg.1-1_all.deb
libopencascade-ocaf-lite-6.3.0_6.3.0.dfsg.1-1_amd64.deb
to
pool/main/o/opencascade/libopencascade-ocaf-lite-6.3.0_6.3.0.dfsg.1-1_amd64.deb
libopencascade-ocaf-lite-dev_6.3.0.dfsg.1-1_all.deb
to pool/main/o/opencascade/libopencascade-ocaf-lite-dev_6.3.0.dfsg.1-1_all.deb
libopencascade-visualization-6.3.0_6.3.0.dfsg.1-1_amd64.deb
to
pool/main/o/opencascade/libopencascade-visualization-6.3.0_6.3.0.dfsg.1-1_amd64.deb
libopencascade-visualization-dev_6.3.0.dfsg.1-1_all.deb
to
pool/main/o/opencascade/libopencascade-visualization-dev_6.3.0.dfsg.1-1_all.deb
opencascade-draw_6.3.0.dfsg.1-1_amd64.deb
to pool/main/o/opencascade/opencascade-draw_6.3.0.dfsg.1-1_amd64.deb
opencascade-examples_6.3.0.dfsg.1-1_all.deb
to pool/main/o/opencascade/opencascade-examples_6.3.0.dfsg.1-1_all.deb
opencascade-wok_6.3.0.dfsg.1-1_amd64.deb
to pool/main/o/opencascade/opencascade-wok_6.3.0.dfsg.1-1_amd64.deb
opencascade_6.3.0.dfsg.1-1.diff.gz
to pool/main/o/opencascade/opencascade_6.3.0.dfsg.1-1.diff.gz
opencascade_6.3.0.dfsg.1-1.dsc
to pool/main/o/opencascade/opencascade_6.3.0.dfsg.1-1.dsc
opencascade_6.3.0.dfsg.1.orig.tar.gz
to pool/main/o/opencascade/opencascade_6.3.0.dfsg.1.orig.tar.gz
A summary of the changes between this version and the previous one is
attached.
Thank you for reporting the bug, which will now be closed. If you
have further comments please address them to [email protected],
and the maintainer will reopen the bug report if appropriate.
Debian distribution maintenance software
pp.
Adam C. Powell, IV <[email protected]> (supplier of updated opencascade
package)
(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing [email protected])
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Format: 1.8
Date: Mon, 20 Oct 2008 10:57:41 -0400
Source: opencascade
Binary: libopencascade-foundation-6.3.0 libopencascade-modeling-6.3.0
libopencascade-visualization-6.3.0 libopencascade-ocaf-lite-6.3.0
libopencascade-ocaf-6.3.0 opencascade-draw opencascade-wok libopencascade-dev
libopencascade-foundation-dev libopencascade-modeling-dev
libopencascade-ocaf-lite-dev libopencascade-ocaf-dev
libopencascade-visualization-dev opencascade-examples
Architecture: source amd64 all
Version: 6.3.0.dfsg.1-1
Distribution: unstable
Urgency: low
Maintainer: Debian Science Maintainers
<[email protected]>
Changed-By: Adam C. Powell, IV <[email protected]>
Description:
libopencascade-dev - OpenCASCADE CAE platform library development files
libopencascade-foundation-6.3.0 - OpenCASCADE CAE platform shared library
libopencascade-foundation-dev - OpenCASCADE CAE platform library development
files
libopencascade-modeling-6.3.0 - OpenCASCADE CAE platform shared library
libopencascade-modeling-dev - OpenCASCADE CAE platform library development
files
libopencascade-ocaf-6.3.0 - OpenCASCADE CAE platform shared library
libopencascade-ocaf-dev - OpenCASCADE CAE platform library development files
libopencascade-ocaf-lite-6.3.0 - OpenCASCADE CAE platform shared library
libopencascade-ocaf-lite-dev - OpenCASCADE CAE platform library development
files
libopencascade-visualization-6.3.0 - OpenCASCADE CAE platform shared library
libopencascade-visualization-dev - OpenCASCADE CAE platform library
development files
opencascade-draw - OpenCASCADE CAE platform shared library
opencascade-examples - OpenCASCADE CAE platform library input examples
opencascade-wok - OpenCASCADE CAE platform shared library
Closes: 487116 491912 494715 496668 501128 501352
Changes:
opencascade (6.3.0.dfsg.1-1) unstable; urgency=low
.
[Denis Barbier]
* New Upstream Version. (closes: #501128)
* Upstream replaced Triangle by a free implementation,
thus external-triangle.patch is removed as well as
dependencies against libtriangle-dev.
* Remove ros/src/FontMFT/*.mft files, these font files
have no sources. (As a side effect, closes: #487116)
* All non-free bits have thus been removed, and opencascade
is moved from non-free into main.
* Jason Kraftcheck's patches have been applied upstream,
occ6.2.patch and correct-libs.patch are dropped.
* Split packages as suggested by Jason Kraftcheck in
http://lists.debian.org/debian-science/2008/01/msg00023.html
+ opencascade-tools is split into opencascade-draw
and opencascade-wok
+ libopencascade6.3.0 is split into
libopencascade-foundation-6.3.0, libopencascade-modeling-6.3.0,
libopencascade-ocaf-lite-6.3.0, libopencascade-ocaf-6.3.0 and
libopencascade-visualization-6.3.0.
+ Ditto for -dev packages.
* New upstream build system now installs everything with
'make install', but DESTDIR support was missing and
requires a new destdir.patch patch.
* Call configure from a new directory to ease cleaning up.
* New wok-install.patch to move WOK files into
/usr/share/tcltk/wok2.0/
* Add --disable-dependency-tracking --disable-maintainer-mode
to configure flags to speed up compilation and avoid
running autotools
* New tkernel-ld.patch patch to add -ldl to libTKernel
which uses dlopen. This flag was previously set by
accident because ros/configure.in did set LIBS=$TCL_LIBS.
* New occ6.3.0.patch patch to fix C++ configure tests and
drop #ifdef from installed headers, they must not rely
on config.h providing the expected symbols.
* New dep-libs.patch to fix inter-library dependencies.
* New make-wok-libs-private.patch to move private WOK
libraries into /usr/lib/opencas, and remove library versions.
* New make-draw-libs-private.patch to move private DRAW
libraries into /usr/lib/opencas, and remove library versions.
Add rpath information into DRAWEXE to find plug-ins.
* New wokunix-fdescr.patch patch to fix build failure when
compiling with -D_FORTIFY_SOURCE=2. Patch written by
Andrea Florio for openSUSE.
* New wokstep_extract.patch patch to fix WOK, garbage was written
into generated files. (closes: #501352)
* debian/rules: Replace obsolete dh_movefiles by dh_install.
* Copy ros/adm/UDLIST from Windows binary tarball, the one
shipped with sources is outdated. This is useful to
compile binaries with WOK.
* Add Vcs-Browser and Vcs-Git fields in debian/control.
* Build-depends on default-jdk-builddep to enable java wrapper.
* Modify CreateFactory.tcl to only define CreateFactory function,
this script can then be used by other scripts.
.
[Adam Powell]
* Closing old bugs fixed in previous unreleased versions (closes: #491912,
#494715).
* Changed Maintainer to debian-science and added myself as the first
uploader (closes: #496668).
Checksums-Sha1:
8bb6b2dd4c1aefe6e378ee9491d0acb1511bda1a 1940 opencascade_6.3.0.dfsg.1-1.dsc
3afa8bbc928b54525b08fee0d54e9f6d92d5a2cc 47014010
opencascade_6.3.0.dfsg.1.orig.tar.gz
edf59ce630d88afe2b443ff509f2109a5cd8baca 128656
opencascade_6.3.0.dfsg.1-1.diff.gz
0f256e4bcfd040880baa688bd7fd89630729392d 1622616
libopencascade-foundation-6.3.0_6.3.0.dfsg.1-1_amd64.deb
51b0cf585788f2300c1197e1723def870e1103c3 14727054
libopencascade-modeling-6.3.0_6.3.0.dfsg.1-1_amd64.deb
9be0cb3672aeb0b9064d09edec47c5e450712a35 4980152
libopencascade-visualization-6.3.0_6.3.0.dfsg.1-1_amd64.deb
0cfb3c9687b6ae11ee4eab83ab2be162e95a8e75 2186196
libopencascade-ocaf-lite-6.3.0_6.3.0.dfsg.1-1_amd64.deb
96f6a4dc319c73fa67cf1e23df8df6e82ba5be26 682352
libopencascade-ocaf-6.3.0_6.3.0.dfsg.1-1_amd64.deb
b25961e32c663c91c84e886000887919163f9dba 1572098
opencascade-draw_6.3.0.dfsg.1-1_amd64.deb
de281dea9b5ce129dfcf092bd8754b6e0f422f6c 2041418
opencascade-wok_6.3.0.dfsg.1-1_amd64.deb
d6cef9487e79f0940cd7a8ee6be7cab82c86dfc3 12462
libopencascade-dev_6.3.0.dfsg.1-1_all.deb
5cda2f0add5196e214be075ada6fb5933ea789de 1263714
libopencascade-foundation-dev_6.3.0.dfsg.1-1_all.deb
24150a55624c02284fc37c63f3d7905f243be852 4044204
libopencascade-modeling-dev_6.3.0.dfsg.1-1_all.deb
2cf4e9d90673a0373ae808e8f496cd25257b030a 764224
libopencascade-ocaf-lite-dev_6.3.0.dfsg.1-1_all.deb
d3edfae5868b5066c7b80526e8f1fc894edbee8d 144194
libopencascade-ocaf-dev_6.3.0.dfsg.1-1_all.deb
2fd8b6b2fb0dbf96c42d88706dbba24778dd331d 983250
libopencascade-visualization-dev_6.3.0.dfsg.1-1_all.deb
998ef1a533ae308393d8279f4ad3420ea66aaa44 13047824
opencascade-examples_6.3.0.dfsg.1-1_all.deb
Checksums-Sha256:
dd1502ac9c25812b90e0b34adc16d53ff36b679d94292d9c5b05d930bf616a9f 1940
opencascade_6.3.0.dfsg.1-1.dsc
97e45ba6395ec8de4850c64c7ded08d72ff734b48b32dca12b2b4e67cec73592 47014010
opencascade_6.3.0.dfsg.1.orig.tar.gz
040bbf36e5d003cb9d60b9ffd7e9fe04cd2af7cee935356aad141a4fc1ec5970 128656
opencascade_6.3.0.dfsg.1-1.diff.gz
3ce8673162d797f4c8b8a54def6d75b26de22f343e6ddffaca5f048b99c9239a 1622616
libopencascade-foundation-6.3.0_6.3.0.dfsg.1-1_amd64.deb
7ec5c879a0a8807b1cb3e1958fa2fc4fd5f9821cf938411314b71174828c3b9d 14727054
libopencascade-modeling-6.3.0_6.3.0.dfsg.1-1_amd64.deb
ef4bc3569fa4c617408d0cd3df2e2e99964d562eda5e1b000d19694c7d7bbd8d 4980152
libopencascade-visualization-6.3.0_6.3.0.dfsg.1-1_amd64.deb
557deb4a3a6d0cb90435cf90730816941d5af8b1a1978f7358faa48bb8d0eb40 2186196
libopencascade-ocaf-lite-6.3.0_6.3.0.dfsg.1-1_amd64.deb
d01487edfe5df90a9ba1b2548d7cd7e864abb19c8944ea2d1b7a4d435f75a383 682352
libopencascade-ocaf-6.3.0_6.3.0.dfsg.1-1_amd64.deb
929f128f8855c2713e0edcc5fc2d6213b074a30367349a05cc43043fb13d8d7c 1572098
opencascade-draw_6.3.0.dfsg.1-1_amd64.deb
7caa019f1004a5e9cb176310284eb8ce8a3c84b3f6e98896278e65b4a71a80c8 2041418
opencascade-wok_6.3.0.dfsg.1-1_amd64.deb
850aa62ffd61ce0f69abf89924cbbe883619f853cad255e96f26632f3ab11a61 12462
libopencascade-dev_6.3.0.dfsg.1-1_all.deb
890172e7bcf30603ec82b1bd1d7236cdfad1afa9d3b39550b7e5abede4e2fde5 1263714
libopencascade-foundation-dev_6.3.0.dfsg.1-1_all.deb
26ec48c609e17a759477e5f90c471e78ae92a7f0c50371f695d9e1e05a62e3b7 4044204
libopencascade-modeling-dev_6.3.0.dfsg.1-1_all.deb
cce5c2bc14c4a0a338f9617433a21c70d54c9108c4abf396e1365c573a60899e 764224
libopencascade-ocaf-lite-dev_6.3.0.dfsg.1-1_all.deb
07029e51c11708b9a6f0ba6513f9372ef256cfaff57979bd317f3bd0fedb6870 144194
libopencascade-ocaf-dev_6.3.0.dfsg.1-1_all.deb
e6a231d819b8217ef371499eae428516cd64a271cb5f89ece238e4eb4b17c956 983250
libopencascade-visualization-dev_6.3.0.dfsg.1-1_all.deb
43f6dd67c76b76fec997fd1d48d29d20d9782910d3d2ca2c4f8d727003028918 13047824
opencascade-examples_6.3.0.dfsg.1-1_all.deb
Files:
78253599b5f6b2c073416fa467197bde 1940 science extra
opencascade_6.3.0.dfsg.1-1.dsc
da3b11269aa91567cd32eb6c496d6386 47014010 science extra
opencascade_6.3.0.dfsg.1.orig.tar.gz
ef5daf29c236ee0db7ffd47771f7ca0f 128656 science extra
opencascade_6.3.0.dfsg.1-1.diff.gz
ca2f2b6bfcd81337e208873cf5a7f964 1622616 libs extra
libopencascade-foundation-6.3.0_6.3.0.dfsg.1-1_amd64.deb
a8a611de155608e5969174ff6131bae0 14727054 libs extra
libopencascade-modeling-6.3.0_6.3.0.dfsg.1-1_amd64.deb
6ad55fccdfafeec4a6a9393ff903e7b2 4980152 libs extra
libopencascade-visualization-6.3.0_6.3.0.dfsg.1-1_amd64.deb
19c7e45f82ad2d7baec18f3d4518992e 2186196 libs extra
libopencascade-ocaf-lite-6.3.0_6.3.0.dfsg.1-1_amd64.deb
dc9682df1f6d4b94d9af82c20552df53 682352 libs extra
libopencascade-ocaf-6.3.0_6.3.0.dfsg.1-1_amd64.deb
f59f6afdac6bb53921c64298934b3240 1572098 science extra
opencascade-draw_6.3.0.dfsg.1-1_amd64.deb
d561e13ba3cc5dfed0ececf9bc534bd0 2041418 science extra
opencascade-wok_6.3.0.dfsg.1-1_amd64.deb
e67d83ea664a8e97937476003bf35d4e 12462 libdevel extra
libopencascade-dev_6.3.0.dfsg.1-1_all.deb
e99a2e5f576076fe200168b6c83ce1f7 1263714 libdevel extra
libopencascade-foundation-dev_6.3.0.dfsg.1-1_all.deb
5a8f83697ad8937faa3d3cc5fc4e344e 4044204 libdevel extra
libopencascade-modeling-dev_6.3.0.dfsg.1-1_all.deb
b926c4986fe57f8942a729f15fd8050f 764224 libdevel extra
libopencascade-ocaf-lite-dev_6.3.0.dfsg.1-1_all.deb
ed80710573020c7d1f7d09bbca02a345 144194 libdevel extra
libopencascade-ocaf-dev_6.3.0.dfsg.1-1_all.deb
4279f7df3f28745240ce8fb8f1955704 983250 libdevel extra
libopencascade-visualization-dev_6.3.0.dfsg.1-1_all.deb
9f06f7523d360e2f75f117d6962784e2 13047824 doc extra
opencascade-examples_6.3.0.dfsg.1-1_all.deb
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
iEYEARECAAYFAkj8684ACgkQUm8B6FZO5LaSUgCfQO/3ujPKB69kqmendGXy9hEr
2pUAn0UZ6yTWgN+SJMopp+M8ppPrPhV9
=C3oq
-----END PGP SIGNATURE-----
--- End Message ---
