diff --git a/package/debian/changelog b/package/debian/changelog index 88e234be9..6ff7e60de 100644 --- a/package/debian/changelog +++ b/package/debian/changelog @@ -1,3 +1,18 @@ +freecad (0.13-1precise2) precise; urgency=low + + * Fix hard dependency on libgl1-mesa-glx preventing installation on + Ubuntu 12.04.2 with LTSEnablementStack. Removal of shlibs.local file + and libgl1-mesa-dev deleted from BuildDeps. + * Removed version number from libsoqt4-dev BD. + + -- Normand Chamberland Sun, 05 May 2013 18:31:47 -0400 + +freecad (0.13-1precise1) precise; urgency=low + + * New release for Ubuntu 12.04 (precise) + + -- Normand Chamberland Sun, 06 May 2012 14:38:12 -0400 + freecad (0.11.3729.dfsg-2) unstable; urgency=low * Add gfortran and libopencascade-visualization-dev to BD @@ -29,6 +44,25 @@ freecad (0.11.3729.dfsg-1) unstable; urgency=low -- "Adam C. Powell, IV" Tue, 12 Apr 2011 23:40:30 -0400 +freecad (0.10.3247.dfsg-2ubuntu3) natty; urgency=low + + * Fix build failure with ld --as-needed. + + -- Matthias Klose Wed, 15 Dec 2010 01:12:39 +0100 + +freecad (0.10.3247.dfsg-2ubuntu2) natty; urgency=low + + * Rebuild with python 2.7 as the python default. + + -- Matthias Klose Thu, 09 Dec 2010 16:46:45 +0000 + +freecad (0.10.3247.dfsg-2ubuntu1) natty; urgency=low + + * Merge from debian unstable. Remaining changes: + - build on libqtwebkit-dev for qtwebkit transition + + -- Bhavani Shankar Wed, 20 Oct 2010 08:40:53 +0530 + freecad (0.10.3247.dfsg-2) unstable; urgency=low * control: @@ -43,6 +77,20 @@ freecad (0.10.3247.dfsg-2) unstable; urgency=low -- Teemu Ikonen Wed, 18 Aug 2010 19:34:36 +0200 +freecad (0.10.3247.dfsg-1ubuntu2) maverick; urgency=low + + * Rebuild on libqtwebkit-dev for qtwebkit transition + + -- Jonathan Riddell Wed, 21 Jul 2010 10:06:31 +0100 + +freecad (0.10.3247.dfsg-1ubuntu1) maverick; urgency=low + + * Merge from Debian unstable, remaining changes: + - debian/control: Build-Depends on libqt4-webkit-dev due to + QtWebKit is no longer part of libqt4-dev (LP: #604078) + + -- Artur Rona Sat, 10 Jul 2010 21:06:47 +0200 + freecad (0.10.3247.dfsg-1) unstable; urgency=low * New upstream version (closes: #582627) @@ -57,6 +105,12 @@ freecad (0.10.3247.dfsg-1) unstable; urgency=low -- Teemu Ikonen Mon, 05 Jul 2010 15:07:49 +0200 +freecad (0.9.2646.5.dfsg-1ubuntu1) maverick; urgency=low + + * Add build-dep on libqt4-webkit-dev to fix FTBFS with Qt 4.7 + + -- Scott Kitterman Sat, 19 Jun 2010 00:37:12 -0400 + freecad (0.9.2646.5.dfsg-1) unstable; urgency=low * Add 'dfsg' extension to upstream version, upstream sources are unchanged. diff --git a/package/debian/control b/package/debian/control index 6e539444f..b2909693e 100644 --- a/package/debian/control +++ b/package/debian/control @@ -5,25 +5,26 @@ Maintainer: Debian Science Maintainers , "Adam C. Powell, IV" , Anton Gladky Vcs-Browser: http://git.debian.org/?p=debian-science/packages/freecad.git Vcs-Git: git://git.debian.org/git/debian-science/packages/freecad.git -Homepage: http://juergen-riegel.net/FreeCAD/Docu/index.php?title=Main_Page -Build-Depends: debhelper (>= 7.0.50~), autotools-dev, libtool, automake, - autoconf, libboost-dev, libboost-date-time-dev, libboost-filesystem-dev, +Homepage: https://sourceforge.net/apps/mediawiki/free-cad/index.php?title=Main_Page +Build-Depends: debhelper (>= 7.0.50~), cmake, + 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, - libboost-python-dev, python-dev, python-support, + libboost-thread-dev, libboost-python-dev, python-dev, python-support, libqt4-dev, libxt-dev, libxext-dev, libxmu-dev, libxi-dev, libx11-dev, - libcoin60-dev, libsoqt4-dev (>= 1.4.2~svn20090224), libeigen3-dev, libgl1-mesa-dev, - zlib1g-dev, libxerces-c2-dev, libopencascade-foundation-dev, libopencascade-modeling-dev, + libcoin60-dev, libsoqt4-dev, libeigen3-dev, + zlib1g-dev, libxerces-c2-dev, libopencascade-foundation-dev, + libopencascade-modeling-dev, libopencascade-ocaf-dev, libopencascade-visualization-dev, python-cxx-dev, libswscale-dev, - libzipios++-dev, swig, gfortran, libqtwebkit-dev -Standards-Version: 3.9.2 + libzipios++-dev, swig, gfortran, f2c, libqtwebkit-dev, libspnav-dev, libfreetype6-dev +Standards-Version: 3.9.1 Package: freecad Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends} -Recommends: python-pivy python-matplotlib +Recommends: python-pivy, python Suggests: freecad-doc -Description: Extensible Open Source CAx program (alpha) +Description: Extensible Open Source CAx program (beta) FreeCAD is an Open Source CAx RAD based on OpenCasCade, Qt and Python. It features some key concepts like macro recording, workbenches, ability to run as a server and dynamically loadable application extensions and diff --git a/package/debian/dirs b/package/debian/dirs new file mode 100644 index 000000000..e71d501d4 --- /dev/null +++ b/package/debian/dirs @@ -0,0 +1,6 @@ +usr/share/icons/hicolor/16x16/apps +usr/share/icons/hicolor/32x32/apps +usr/share/icons/hicolor/64x64/apps +usr/share/icons/hicolor/scalable/apps +usr/share/pixmaps + diff --git a/package/debian/freecad.desktop b/package/debian/freecad.desktop index 7e0b9e53e..9ef688f95 100644 --- a/package/debian/freecad.desktop +++ b/package/debian/freecad.desktop @@ -10,7 +10,7 @@ Exec=/usr/bin/freecad %F Path=/usr/lib/freecad Terminal=false Type=Application -Icon=/usr/share/freecad/freecad.xpm +Icon=freecad Categories=Graphics;Science;Engineering StartupNotify=true GenericName[de_DE]=Feature-basierter parametrischer Modellierer diff --git a/package/debian/freecad.sharedmimeinfo b/package/debian/freecad.sharedmimeinfo index 91a2b10ed..6d5e93e7d 100644 --- a/package/debian/freecad.sharedmimeinfo +++ b/package/debian/freecad.sharedmimeinfo @@ -1,7 +1,7 @@ - + FreeCAD document files diff --git a/package/debian/menu b/package/debian/menu index c939246be..fcfa2169f 100644 --- a/package/debian/menu +++ b/package/debian/menu @@ -2,5 +2,5 @@ section="Applications/Science/Engineering"\ title="FreeCAD"\ command="/usr/bin/freecad"\ - icon="/usr/share/freecad/freecad.xpm" + icon="/usr/share/pixmaps/freecad.xpm" diff --git a/package/debian/mime/freecad.thumbnailer b/package/debian/mime/freecad.thumbnailer new file mode 100644 index 000000000..e54d9a7a1 --- /dev/null +++ b/package/debian/mime/freecad.thumbnailer @@ -0,0 +1,4 @@ +[Thumbnailer Entry] +TryExec=/usr/bin/freecad-thumbnailer +Exec=/usr/bin/freecad-thumbnailer -s %s %u %o +MimeType=application/x-extension-fcstd; diff --git a/package/debian/rules b/package/debian/rules index 72ac81266..566bad443 100755 --- a/package/debian/rules +++ b/package/debian/rules @@ -4,7 +4,7 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 -MODULES = Part Mesh MeshPart PartDesign Sketcher Points Raytracing Image Drawing ReverseEngineering Complete Fem Robot Import Inspection Arch +# For testing: fakeroot debian/rules binary # These are used for cross-compiling and for saving the configure script # from having to guess our platform (since we know it already) @@ -19,58 +19,32 @@ else CFLAGS += -O2 endif -patch-stamp: - touch $@ - -configure: autogen.sh patch-stamp +configure: dh_testdir - for autotools_mod_file in `find . -name Makefile.in` aclocal.m4 \ - configure m4/libtool.m4 m4/ltmain.sh m4/ltoptions.m4 \ - m4/ltversion.m4 m4/lt~obsolete.m4; do \ - cp -a $$autotools_mod_file $$autotools_mod_file.setaside; \ - done - chmod u+x autogen.sh - ./autogen.sh - -config.status: configure - dh_testdir - ./configure --with-occ-include=/usr/include/opencascade \ ---with-occ-lib=/usr/lib \ ---host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \ ---prefix=/usr/lib/freecad --mandir=/usr/share/man \ ---infodir=/usr/share/info --datadir=/usr/share/freecad \ ---includedir=/usr/include/freecad --docdir=/usr/share/doc/freecad \ -CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs" - touch src/Build/Version.h + cmake . \ +-DFREECAD_BUILD_DEBIAN=ON \ +-DCMAKE_INSTALL_PREFIX=/usr/lib/freecad \ +-DCMAKE_INSTALL_MANDIR=/usr/share/man \ +-DCMAKE_INSTALL_INFODIR=/usr/share/info \ +-DCMAKE_INSTALL_DATADIR=/usr/share/freecad \ +-DCMAKE_INSTALL_INCLUDEDIR=/usr/include/freecad \ +-DCMAKE_INSTALL_DOCDIR=/usr/share/doc/freecad build: build-stamp -build-stamp: config.status +build-stamp: configure dh_testdir $(MAKE) touch $@ clean: - mv src/Build/Version.h src/Build/Version.h.old dh clean - mv src/Build/Version.h.old src/Build/Version.h rm -f build-stamp find -name '*.pyc' | xargs rm -f find -name 'moc_*.cpp' | xargs rm -f - find -name '*.lo' | xargs rm -f - find -name '*.deps' | xargs rm -rf - find -name '*.libs' | xargs rm -rf - rm -f stamp-h1 config.log libtool 71 - if [ -e Makefile.in.setaside ]; then \ - for autotools_mod_file in `find . -name Makefile.in` aclocal.m4 \ - configure m4/libtool.m4 m4/ltmain.sh m4/ltoptions.m4 \ - m4/ltversion.m4 m4/lt~obsolete.m4; do \ - mv -f $$autotools_mod_file.setaside $$autotools_mod_file; \ - done; fi - dh clean - rm -f patch-stamp - #quilt pop -a - #rm -rf .pc/ + find -name 'ui_*.h' | xargs rm -f + find -name 'CMakeFiles' | xargs rm -rf + rm -f stamp-h1 install: build install-stamp install-stamp: @@ -78,44 +52,32 @@ install-stamp: dh_testroot dh_prep dh_installdirs - $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp/freecad - # Remove testing modules we don't want to have in the deb - rm -rf debian/tmp/freecad/usr/lib/freecad/Mod/_TEMPLATE_ - rm -rf debian/tmp/freecad/usr/lib/freecad/Mod/TemplatePyMod + $(MAKE) install/fast DESTDIR=$(CURDIR)/debian/tmp/freecad # install the core system dh_install -pfreecad debian/tmp/freecad/usr/share/freecad/* usr/share/freecad/ - #dh_install -pfreecad debian/tmp/freecad/usr/lib/freecad/share usr/lib/freecad + # Desktop icons + dh_install -pfreecad debian/tmp/freecad/usr/share/freecad/freecad.xpm usr/share/pixmaps + install -m 644 debian/tmp/freecad/usr/share/freecad/freecad-icon-16.png debian/freecad/usr/share/icons/hicolor/16x16/apps/freecad.png + install -m 644 debian/tmp/freecad/usr/share/freecad/freecad-icon-32.png debian/freecad/usr/share/icons/hicolor/32x32/apps/freecad.png + install -m 644 debian/tmp/freecad/usr/share/freecad/freecad-icon-64.png debian/freecad/usr/share/icons/hicolor/64x64/apps/freecad.png + install -m 644 debian/tmp/freecad/usr/share/freecad/freecad.svg debian/freecad/usr/share/icons/hicolor/scalable/apps/freecad.svg + dh_install -pfreecad debian/tmp/freecad/usr/lib/freecad/bin usr/lib/freecad - dh_install -pfreecad debian/tmp/freecad/usr/lib/freecad/lib/FreeCAD.so usr/lib/freecad/lib - dh_install -pfreecad debian/tmp/freecad/usr/lib/freecad/lib/lib*.so.* usr/lib/freecad/lib + dh_install -pfreecad debian/tmp/freecad/usr/lib/freecad/lib usr/lib/freecad + dh_install -pfreecad debian/tmp/freecad/usr/lib/freecad/Mod usr/lib/freecad dh_install debian/freecad.desktop usr/share/applications - dh_installman debian/freecad.1 + dh_installman debian/freecad.1 debian/mime/freecad-thumbnailer.1 dh_installchangelogs ChangeLog.txt - # install the modules - $(foreach MODULE,$(MODULES), \ - dh_install -pfreecad debian/tmp/freecad/usr/lib/freecad/Mod/$(MODULE)/$(MODULE)*.so usr/lib/freecad/Mod/$(MODULE); \ - dh_install -pfreecad debian/tmp/freecad/usr/lib/freecad/Mod/$(MODULE)/lib*.so.* usr/lib/freecad/Mod/$(MODULE); \ - dh_install -pfreecad debian/tmp/freecad/usr/lib/freecad/Mod/$(MODULE)/*.py usr/lib/freecad/Mod/$(MODULE);) - # special treating of PartDesign module - dh_install -pfreecad debian/tmp/freecad/usr/lib/freecad/Mod/PartDesign/Scripts/*.py usr/lib/freecad/Mod/PartDesign/Scripts;) - # special treating of Draft module - dh_install -pfreecad debian/tmp/freecad/usr/lib/freecad/Mod/Draft/*.py usr/lib/freecad/Mod/Draft - dh_install -pfreecad debian/tmp/freecad/usr/lib/freecad/Mod/Draft/draftlibs/*.py usr/lib/freecad/Mod/Draft/draftlibs - # special treating of Test module - dh_install -pfreecad debian/tmp/freecad/usr/lib/freecad/Mod/Test/lib*.so.* usr/lib/freecad/Mod/Test - dh_install -pfreecad debian/tmp/freecad/usr/lib/freecad/Mod/Test/*.py usr/lib/freecad/Mod/Test - dh_install -pfreecad debian/tmp/freecad/usr/lib/freecad/Mod/Test/QtUnitGui.so usr/lib/freecad/Mod/Test - - dh_install -pfreecad-dev debian/tmp/freecad/usr/include/* usr/include - dh_install -pfreecad-dev debian/tmp/freecad/usr/lib/freecad/lib/lib*.so usr/lib/freecad/lib - $(foreach MODULE,$(MODULES), \ - dh_install -pfreecad-dev debian/tmp/freecad/usr/lib/freecad/Mod/$(MODULE)/lib*.la usr/lib/freecad/Mod/$(MODULE); \ - dh_install -pfreecad-dev debian/tmp/freecad/usr/lib/freecad/Mod/$(MODULE)/lib*.so usr/lib/freecad/Mod/$(MODULE);) - # special treating of Arch module - dh_install -pfreecad debian/tmp/freecad/usr/lib/freecad/Mod/Arch/*.py usr/lib/freecad/Mod/Arch - + # install the headers + #dh_install -pfreecad-dev debian/tmp/freecad/usr/include/* usr/include # install the help system dh_install -pfreecad-doc debian/tmp/freecad/usr/share/doc/* usr/share/doc/ + # install MIME stuff + dh_install debian/mime/freecad-thumbnailer usr/bin + dh_install debian/mime/freecad.thumbnailer usr/share/thumbnailers + dh_install debian/mime/freecad.schemas etc/gconf/schemas + dh_gconf -pfreecad + dh_installmime touch install-stamp override_dh_compress: diff --git a/package/debian/source/format b/package/debian/source/format index 163aaf8d8..d3827e75a 100644 --- a/package/debian/source/format +++ b/package/debian/source/format @@ -1 +1 @@ -3.0 (quilt) +1.0 diff --git a/package/debian/source/lintian-overrides b/package/debian/source/lintian-overrides index a7a5da0c9..0a52f43ba 100644 --- a/package/debian/source/lintian-overrides +++ b/package/debian/source/lintian-overrides @@ -1,3 +1,3 @@ -# Lintian thinks uploader Adam Powell's name violates policy -freecad source: uploader-address-missing "Adam C. Powell -freecad source: uploader-not-full-name IV" +# Lintian thinks uploader Adam Powell's name violates policy +freecad source: uploader-address-missing "Adam C. Powell +freecad source: uploader-not-full-name IV"