[freecad] 01/01: Use packaged version of python-ply.

[Anton Gladky]

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

gladk pushed a commit to branch master
in repository freecad.

commit aa8ab823d1142bfede77d767fa48b450c576b0db
Author: Sebastian Hoogen <sebastian at hoogen.de>
Date:   Wed Sep 25 20:50:47 2013 +0200

    Use packaged version of python-ply.
---
 debian/control                   |    2 +-
 debian/patches/exclude_ply.patch |   28 ++++++++++++++++++++++++++++
 debian/patches/series            |    1 +
 3 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/debian/control b/debian/control
index f1c2468..6ee95b5 100644
--- a/debian/control
+++ b/debian/control
@@ -27,7 +27,7 @@ Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, 
  python-pivy (>=0.5.0~v609hg-2) [!powerpc],  python-matplotlib, 
  libsoqt4-20 (>=1.6)
-Recommends:  python-collada
+Recommends:  python-collada, python-ply
 Suggests: freecad-doc
 Description: Extensible Open Source CAx program (alpha)
  FreeCAD is an Open Source CAx RAD based on OpenCasCade, Qt and Python.
diff --git a/debian/patches/exclude_ply.patch b/debian/patches/exclude_ply.patch
new file mode 100644
index 0000000..7d75456
--- /dev/null
+++ b/debian/patches/exclude_ply.patch
@@ -0,0 +1,28 @@
+Description: exclude ply from build-sources, use packaged version
+Author: Anton Gladky <gladk at debian.org>, Sebastian Hoogen <sebastian at hoogen.de>
+Last-Update: 2013-09-25
+
+--- a/src/Mod/OpenSCAD/CMakeLists.txt
++++ b/src/Mod/OpenSCAD/CMakeLists.txt
+@@ -23,7 +23,7 @@
+ )
+ SOURCE_GROUP("ply" FILES ${ply_SRCS})
+ 
+-set(all_files ${OpenSCAD_SRCS} ${ply_SRCS})
++set(all_files ${OpenSCAD_SRCS} )
+ 
+ ADD_CUSTOM_TARGET(OpenSCAD ALL
+     SOURCES ${allfiles}
+@@ -33,12 +33,6 @@
+ 
+ INSTALL(
+     FILES
+-        ${ply_SRCS}
+-    DESTINATION
+-        Mod/OpenSCAD/ply
+-)
+-INSTALL(
+-    FILES
+         ${OpenSCAD_SRCS}
+     DESTINATION
+         Mod/OpenSCAD
diff --git a/debian/patches/series b/debian/patches/series
index bca02e8..5ca5306 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,3 +7,4 @@ use_share.patch
 #dir_as_string.patch
 #coin80.patch
 do_not_install_binary_examples.patch
+exclude_ply.patch

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