From bba2dd581bc2666775dcded7d87a5755f572838c Mon Sep 17 00:00:00 2001 From: wmayer Date: Sun, 19 Apr 2015 13:42:02 +0200 Subject: [PATCH] + update Debian packaging files --- package/debian/changelog | 24 +++++ package/debian/control | 21 ++-- package/debian/copyright | 4 +- package/debian/dirs | 1 - package/debian/freecad-doc.doc-base | 7 +- package/debian/freecad-doc.docs | 2 +- package/debian/freecad.install | 6 ++ package/debian/freecad.lintian-overrides | 1 + package/debian/freecad.manpages | 1 + package/debian/menu | 2 +- package/debian/rules | 117 ++++++----------------- 11 files changed, 78 insertions(+), 108 deletions(-) create mode 100644 package/debian/freecad.install create mode 100644 package/debian/freecad.lintian-overrides diff --git a/package/debian/changelog b/package/debian/changelog index 6ff7e60de..0ccd1a2ce 100644 --- a/package/debian/changelog +++ b/package/debian/changelog @@ -1,3 +1,27 @@ +freecad (0.15-1precise3) precise; urgency=low + + * control: added netgen-headers to Build Depends. + + -- Normand Chamberland Sat, 04 Apr 2015 11:14:23 -0400 + +freecad (0.15-1precise2) precise; urgency=low + + * control: added pyside-tools to build deps, broke down python-pyside depends + + -- Normand Chamberland Thu, 06 Nov 2014 22:10:44 -0500 + +freecad (0.15-1precise1) precise; urgency=low + + * Bumped version number as per upstream version + + -- Normand Chamberland Thu, 07 Aug 2014 11:34:39 -0400 + +freecad (0.14-1precise2) precise; urgency=low + + * Set new version number. + + -- Werner Mayer Sat, 13 Jul 2013 12:53:55 +0200 + freecad (0.13-1precise2) precise; urgency=low * Fix hard dependency on libgl1-mesa-glx preventing installation on diff --git a/package/debian/control b/package/debian/control index 645b49338..a389c2632 100644 --- a/package/debian/control +++ b/package/debian/control @@ -5,24 +5,25 @@ 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: https://sourceforge.net/apps/mediawiki/free-cad/index.php?title=Main_Page +Homepage: http://www.freecadweb.org/ 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-thread-dev, libboost-python-dev, python-dev, python-support, libqt4-dev, libxt-dev, libxext-dev, libxmu-dev, libxi-dev, libx11-dev, - libcoin80-dev, libsoqt4-dev, libeigen3-dev, - zlib1g-dev, libxerces-c-dev, liboce-foundation-dev, - liboce-modeling-dev, liboce-ocaf-dev, - liboce-visualization-dev, python-cxx-dev, libswscale-dev, - libzipios++-dev, swig, gfortran, f2c, libqtwebkit-dev, libspnav-dev, libfreetype6-dev, - libpyside-dev, libshiboken-dev, pyside-tools -Standards-Version: 3.9.1 + libcoin60-dev, libsoqt4-dev, libeigen3-dev, + zlib1g-dev, libxerces-c2-dev, liboce-foundation-dev, + liboce-modeling-dev, liboce-ocaf-dev, liboce-visualization-dev, + python-cxx-dev, libswscale-dev, libzipios++-dev, swig, gfortran, + f2c, libqtwebkit-dev, libspnav-dev, libfreetype6-dev, libfreeimage-dev, + libpyside-dev, libshiboken-dev, pyside-tools, netgen-headers +Standards-Version: 3.9.3 Package: freecad Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends} +Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, python-pyside.qtcore, + python-pyside.qtsvg, python-pyside.qtuitools Recommends: python-pivy, python Suggests: freecad-doc Description: Extensible Open Source CAx program (beta) @@ -62,7 +63,7 @@ Description: FreeCAD documentation . This package contains the FreeCAD documentation. . - The documentation is provided in Qt help format; + The documentation is provided in Qt's new help format; the new help format version can be viewed in conjunction with the Qt Assistant found in the qt4-dev-tools package. diff --git a/package/debian/copyright b/package/debian/copyright index a97cf019d..479804425 100644 --- a/package/debian/copyright +++ b/package/debian/copyright @@ -1,5 +1,5 @@ -Format-Specification: http://dep.debian.net/deps/dep5/ -Maintainer: Werner Mayer +Format: http://dep.debian.net/deps/dep5/ +Upstream-Contact: Werner Mayer X-Packaged-By: Werner Mayer X-Packaged-Date: 2006-09-26_16:55:15+02:00 Source: http://sourceforge.net/projects/free-cad diff --git a/package/debian/dirs b/package/debian/dirs index 4efc3d33b..a01c68cdf 100644 --- a/package/debian/dirs +++ b/package/debian/dirs @@ -4,5 +4,4 @@ usr/share/icons/hicolor/48x48/apps usr/share/icons/hicolor/64x64/apps usr/share/icons/hicolor/scalable/apps usr/share/icons/hicolor/64x64/mimetypes -usr/share/pixmaps diff --git a/package/debian/freecad-doc.doc-base b/package/debian/freecad-doc.doc-base index 8e58ee3aa..1376307b7 100644 --- a/package/debian/freecad-doc.doc-base +++ b/package/debian/freecad-doc.doc-base @@ -11,8 +11,5 @@ Abstract: FreeCAD is a general purpose Open Source 3D Section: Science/Engineering Format: HTML -Index: /usr/share/doc/freecad/Start_Page.html -Files: /usr/share/doc/freecad/*.q* - -Format: PDF -Files: /usr/share/doc/freecad/kr_16.pdf.gz /usr/share/doc/freecad/kr_210_2.pdf.gz /usr/share/doc/freecad/kr_500_2.pdf.gz +Index: /usr/share/doc/freecad-doc/Start_Page.html +Files: /usr/share/doc/freecad-doc/*.q* diff --git a/package/debian/freecad-doc.docs b/package/debian/freecad-doc.docs index 27e5cb820..1b5962bf5 100644 --- a/package/debian/freecad-doc.docs +++ b/package/debian/freecad-doc.docs @@ -1 +1 @@ -debian/tmp/usr/doc/* +debian/tmp/usr/lib/freecad/doc/* diff --git a/package/debian/freecad.install b/package/debian/freecad.install new file mode 100644 index 000000000..1cf7aae3c --- /dev/null +++ b/package/debian/freecad.install @@ -0,0 +1,6 @@ +debian/freecad.desktop usr/share/applications +debian/menu usr/share/menu/freecad +usr/share/freecad +usr/lib/freecad/bin +usr/lib/freecad/Mod +usr/lib/freecad/lib diff --git a/package/debian/freecad.lintian-overrides b/package/debian/freecad.lintian-overrides new file mode 100644 index 000000000..d74c29d56 --- /dev/null +++ b/package/debian/freecad.lintian-overrides @@ -0,0 +1 @@ +freecad: binary-or-shlib-defines-rpath diff --git a/package/debian/freecad.manpages b/package/debian/freecad.manpages index 4586a8594..569795642 100644 --- a/package/debian/freecad.manpages +++ b/package/debian/freecad.manpages @@ -1 +1,2 @@ debian/freecad.1 +debian/mime/freecad-thumbnailer.1 diff --git a/package/debian/menu b/package/debian/menu index fcfa2169f..c939246be 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/pixmaps/freecad.xpm" + icon="/usr/share/freecad/freecad.xpm" diff --git a/package/debian/rules b/package/debian/rules index 092ad0b96..ae83b2750 100755 --- a/package/debian/rules +++ b/package/debian/rules @@ -1,100 +1,41 @@ #!/usr/bin/make -f -# -*- makefile -*- +%: + dh $@ --buildsystem=cmake --parallel --with python2 -# Uncomment this to turn on verbose mode. -#export DH_VERBOSE=1 - -# 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) -DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) -CFLAGS = -Wall -g - -ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) - CFLAGS += -O0 -else - CFLAGS += -O2 -endif - -configure: - dh_testdir - cmake . \ +extra_flags += \ -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 +-DBUILD_FEM_NETGEN=ON \ +-DCMAKE_CXX_FLAGS="-Wall -DHAVE_SWIG=1 -fpermissive $(shell dpkg-buildflags --get CXXFLAGS) $(shell dpkg-buildflags --get CPPFLAGS)" \ +-DCMAKE_C_FLAGS="-Wall -fpermissive $(shell dpkg-buildflags --get CFLAGS) $(shell dpkg-buildflags --get CPPFLAGS)" \ +-DCMAKE_SHARED_LINKER_FLAGS="$(shell dpkg-buildflags --get LDFLAGS)" \ +-DLIB_SUFFIX="" \ +-DOCC_INCLUDE_DIR="/usr/include/oce" \ +-DCMAKE_INSTALL_PREFIX="/usr/lib/freecad" \ +-DCMAKE_INSTALL_DATADIR="/usr/share/freecad" -build: build-stamp - -build-stamp: configure - dh_testdir - $(MAKE) - touch $@ - -clean: - dh clean - rm -f build-stamp - find -name '*.pyc' | xargs rm -f - find -name 'moc_*.cpp' | xargs rm -f - find -name 'ui_*.h' | xargs rm -f - find -name 'CMakeFiles' | xargs rm -rf - rm -f stamp-h1 - -install: build install-stamp -install-stamp: - dh_testdir - dh_testroot - dh_prep - dh_installdirs - $(MAKE) install/fast DESTDIR=$(CURDIR)/debian/tmp/freecad - # install the core system - dh_install -pfreecad debian/tmp/freecad/usr/share/freecad/* usr/share/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-32.png debian/freecad/usr/share/icons/hicolor/48x48/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 - install -m 644 debian/tmp/freecad/usr/share/freecad/freecad-doc.png debian/freecad/usr/share/icons/hicolor/64x64/mimetypes/application-x-extension-fcstd.png - - dh_install -pfreecad debian/tmp/freecad/usr/lib/freecad/bin usr/lib/freecad - 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 debian/mime/freecad-thumbnailer.1 - dh_installchangelogs ChangeLog.txt - # install the gnome app file - df_install debian/freecad.appdata.xml debian/freecad/usr/share/appdata - # 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_auto_configure: + dh_auto_configure -- $(extra_flags) + cp -f src/Build/Version.h obj-$(DEB_BUILD_GNU_TYPE)/src/Build/Version.h override_dh_compress: dh_compress -X.qch -X.qhc -override_dh_makeshlibs: +override_dh_installchangelogs: + dh_installchangelogs ChangeLog.txt + +override_dh_installmime: + dh_installmime + 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 +override_dh_icons: + install -m 644 debian/freecad/usr/share/freecad/freecad-icon-16.png debian/freecad/usr/share/icons/hicolor/16x16/apps/freecad.png + install -m 644 debian/freecad/usr/share/freecad/freecad-icon-32.png debian/freecad/usr/share/icons/hicolor/32x32/apps/freecad.png + install -m 644 debian/freecad/usr/share/freecad/freecad-icon-32.png debian/freecad/usr/share/icons/hicolor/48x48/apps/freecad.png + install -m 644 debian/freecad/usr/share/freecad/freecad-icon-64.png debian/freecad/usr/share/icons/hicolor/64x64/apps/freecad.png + install -m 644 debian/freecad/usr/share/freecad/freecad.svg debian/freecad/usr/share/icons/hicolor/scalable/apps/freecad.svg + install -m 644 debian/freecad/usr/share/freecad/freecad-doc.png debian/freecad/usr/share/icons/hicolor/64x64/mimetypes/application-x-extension-fcstd.png -binary-indep: build install - dh binary-indep - -binary-arch: build install - dh binary-arch - -binary: binary-indep binary-arch -.PHONY: build clean binary-indep binary-arch binary install