On Tue, Nov 11, 2008 at 04:25:01PM +0100, Robert Millan wrote: > > I'll check your package, compare it with mine, and see if anything I wrote > is worthy of being merged with your tree.
Here, please consider the following changes: - Some improvements in debian/control (control.diff) - 01_disable_pivy.diff (see https://sourceforge.net/tracker/index.php?func=detail&aid=2256647&group_id=49159&atid=455298) - 02_fix_make_deps.diff (see https://sourceforge.net/tracker/index.php?func=detail&aid=2256700&group_id=49159&atid=455300) Also, you might want to re-use my debian/rules. It makes the package much simpler IMHO, but this is just a matter of preference.. -- Robert Millan The DRM opt-in fallacy: "Your data belongs to us. We will decide when (and how) you may access your data; but nobody's threatening your freedom: we still allow you to remove your data and not access it at all."
diff --git a/debian/control b/debian/control index 5263dc2..aea3b7a 100644 --- a/debian/control +++ b/debian/control @@ -1,13 +1,12 @@ Source: freecad -Section: x11 -Priority: optional +Priority: extra Maintainer: Debian Science Maintainers <[EMAIL PROTECTED]> Uploaders: Teemu Ikonen <[EMAIL PROTECTED]> Vcs-Browser: http://git.debian.org/?p=debian-science/packages/freecad.git Vcs-Git: http://git.debian.org/git/debian-science/packages/freecad.git -Homepage: http://sourceforge.net/projects/free-cad -Build-Depends: debhelper (>= 7), autotools-dev, libc6-dev (>= 2.1.3), - libstdc++6, libboost-dev, libboost-date-time-dev, libboost-filesystem-dev, +Homepage: http://juergen-riegel.net/FreeCAD/Docu/index.php?title=Main_Page +Build-Depends: debhelper (>= 7), autotools-dev, + libboost-dev, libboost-date-time-dev, libboost-filesystem-dev, libboost-graph-dev, libboost-iostreams-dev, libboost-program-options-dev, libboost-regex-dev, libboost-serialization-dev, libboost-signals-dev, python2.5-dev, libqt4-dev, zlib1g-dev, libxerces27-dev, libxt-dev, @@ -20,7 +19,7 @@ XS-Python-Version: current Package: freecad Architecture: any Section: science -Depends: ${shlibs:Depends}, ${python:Depends} +Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends} XB-Python-Version: ${python:Versions} Conflicts: freecad (<= 0.6.472-1) Suggests: gnochm | kchmviewer | kchmviewer-nokde | xchm, python-opencv @@ -30,7 +29,7 @@ Description: An extensible Open Source CAx program (alpha) to run as a server and dynamically loadable application extensions and it is designed to be platform independent. . - Currently, FreeCAD can import and display CAD models in IGES, STEP, and + Currently, FreeCAD can import and display CAD models in IGES, STEP, and BRep formats and meshes in STL, BMS, AST and Wavefront OBJ formats. Editing and modeling features are currently somewhat limited.
$ wc -l coin_wrap.cpp 335644 coin_wrap.cpp This beast eats more than 2 GiB of memory to compile... --- FreeCAD_0.7.1672/src/3rdParty/Makefile.am~ 2008-10-24 23:27:58.000000000 +0200 +++ FreeCAD_0.7.1672/src/3rdParty/Makefile.am 2008-11-10 16:34:00.000000000 +0100 @@ -1,4 +1,4 @@ -SUBDIRS=Pivy +#SUBDIRS=Pivy EXTRA_DIST = \ atlas/cblas.h \
--- src/Mod/Part/App/Makefile.am~ 2008-10-24 23:23:28.000000000 +0200 +++ src/Mod/Part/App/Makefile.am 2008-11-10 17:11:26.000000000 +0100 @@ -194,6 +194,8 @@ $(libPart_la_LIBADD) \ -lPart +Part_la_DEPENDENCIES = libPart.la + #-------------------------------------------------------------------------------------- # set the include path found by configure --- src/Mod/Raytracing/App/Makefile.am~ 2008-10-24 23:23:02.000000000 +0200 +++ src/Mod/Raytracing/App/Makefile.am 2008-11-10 17:20:10.000000000 +0100 @@ -71,6 +71,8 @@ $(libRaytracing_la_LIBADD) \ -lRaytracing +Raytracing_la_DEPENDENCIES = libRaytracing.la + #-------------------------------------------------------------------------------------- # set the include path found by configure --- src/Mod/Complete/Gui/Makefile.am~ 2008-10-24 23:23:54.000000000 +0200 +++ src/Mod/Complete/Gui/Makefile.am 2008-11-10 17:42:45.000000000 +0100 @@ -38,6 +38,8 @@ Resources/libResources.la \ -lCompleteGui +CompleteGui_la_DEPENDENCIES = libCompleteGui.la + #-------------------------------------------------------------------------------------- # rule for Qt MetaObject Compiler: --- src/Tools/_TEMPLATE_/App/Makefile.am~ 2008-10-24 23:24:40.000000000 +0200 +++ src/Tools/_TEMPLATE_/App/Makefile.am 2008-11-10 17:44:04.000000000 +0100 @@ -31,6 +31,8 @@ $(lib_TEMPLATE__la_LIBADD) \ -l_TEMPLATE_ +_TEMPLATE__la_DEPENDENCIES = lib_TEMPLATE_.la + #-------------------------------------------------------------------------------------- # set the include path found by configure --- src/Mod/Points/App/Makefile.am~ 2008-10-25 01:24:06.000000000 +0200 +++ src/Mod/Points/App/Makefile.am 2008-11-10 19:01:06.000000000 +0100 @@ -52,6 +52,8 @@ $(libPoints_la_LIBADD) \ -lPoints +Points_la_DEPENDENCIES = libPoints.la + #-------------------------------------------------------------------------------------- # set the include path found by configure --- src/Mod/Image/App/Makefile.am~ 2008-10-25 01:20:54.000000000 +0200 +++ src/Mod/Image/App/Makefile.am 2008-11-10 19:09:24.000000000 +0100 @@ -40,6 +40,8 @@ $(libImage_la_LIBADD) \ -lImage +Image_la_DEPENDENCIES = libImage.la + #-------------------------------------------------------------------------------------- # set the include path found by configure
