[freecad] 03/06: Update install files, dependencies.

Anton Gladky gladk at moszumanska.debian.org
Sun May 25 22:52:33 UTC 2014


This is an automated email from the git hooks/post-receive script.

gladk pushed a commit to branch master
in repository freecad.

commit 60ad7cc3301a8f8bea556b8b3d01f6febef01af2
Author: Anton Gladky <gladk at debian.org>
Date:   Sun May 25 16:59:37 2014 +0200

    Update install files, dependencies.
---
 debian/control          | 3 +++
 debian/freecad-doc.docs | 2 +-
 debian/freecad.install  | 9 ++++-----
 debian/rules            | 3 ++-
 4 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/debian/control b/debian/control
index 7e2764d..a23759b 100644
--- a/debian/control
+++ b/debian/control
@@ -36,8 +36,10 @@ Build-Depends:
  liboce-ocaf-dev,
  liboce-visualization-dev,
  libode-dev,
+ libpyside-dev,
  libqt4-dev,
  libqtwebkit-dev,
+ libshiboken-dev,
  libsoqt4-dev (>=1.6),
  libspnav-dev,
  libswscale-dev,
@@ -65,6 +67,7 @@ Depends:
  python-matplotlib,
  python-pivy (>=0.5.0~v609hg-2) [!powerpc],
  python-ply,
+ python-pyside,
  ${misc:Depends},
  ${python:Depends},
  ${shlibs:Depends}
diff --git a/debian/freecad-doc.docs b/debian/freecad-doc.docs
index 27e5cb8..1b5962b 100644
--- a/debian/freecad-doc.docs
+++ b/debian/freecad-doc.docs
@@ -1 +1 @@
-debian/tmp/usr/doc/*
+debian/tmp/usr/lib/freecad/doc/*
diff --git a/debian/freecad.install b/debian/freecad.install
index 30e2fa0..1126c6f 100644
--- a/debian/freecad.install
+++ b/debian/freecad.install
@@ -1,7 +1,6 @@
 debian/freecad.desktop usr/share/applications
 debian/menu usr/share/menu/freecad
-usr/Mod  usr/lib/freecad/
-usr/bin/ usr/lib/freecad/
-usr/data/Mod  usr/lib/freecad/data
-usr/data/freeca*.* /usr/share/freecad/
-usr/lib/ usr/lib/freecad/
+usr/lib/freecad/bin
+usr/lib/freecad/data
+usr/lib/freecad/Mod
+usr/lib/freecad/lib
diff --git a/debian/rules b/debian/rules
index d5c7d42..00e1f5d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,8 +9,9 @@ extra_flags += \
 -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)" \
--DINSTALL_RPATH="/usr/lib/freecad/lib" \
+-DLIB_SUFFIX="" \
 -DOCC_INCLUDE_DIR="/usr/include/oce" \
+-DCMAKE_INSTALL_PREFIX="/usr/lib/freecad" \
 
 override_dh_auto_configure:
 	dh_auto_configure -- $(extra_flags)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/freecad.git



More information about the debian-science-commits mailing list