[med-svn] r8934 - in trunk/packages/sofa-framework/trunk/debian: . patches

[Andreas Tille]

Author: tille
Date: 2011-12-13 12:18:52 +0000 (Tue, 13 Dec 2011)
New Revision: 8934

Added:
   trunk/packages/sofa-framework/trunk/debian/patches/qwt5-qt4.patch
Modified:
   trunk/packages/sofa-framework/trunk/debian/changelog
   trunk/packages/sofa-framework/trunk/debian/rules
Log:
Clean up after clean target which leaves several files behind.


Modified: trunk/packages/sofa-framework/trunk/debian/changelog
===================================================================
--- trunk/packages/sofa-framework/trunk/debian/changelog	2011-12-13 11:52:48 UTC (rev 8933)
+++ trunk/packages/sofa-framework/trunk/debian/changelog	2011-12-13 12:18:52 UTC (rev 8934)
@@ -8,13 +8,20 @@
   * debian/control:
     - Standards-Version: 3.9.2 (no changes needed)
     - Fixed Vcs-Svn
-    - Build-Depends: s/libpng-dev/libpng12-dev/
+    - Build-Depends:
+      + s/libpng-dev/libpng12-dev/
+      + s/libqwt-dev/libqwt5-qt4-dev/
   * debian/rules
     - Do not remove extlibs/tinyxml in clean target which is just
       part of the upstream source.  The proper place to remove things
       like this would be in get-orig-source.
+    - Polishing after clean target which leaves several files hanging
+      around
+  * debian/patches/qwt5-qt4.patch: Sofa does not build properly with
+    libqwt-dev so adjusting include directory and fixing some header
+    file is needed
 
- -- Andreas Tille <tille at debian.org>  Fri, 09 Dec 2011 12:02:24 +0100
+ -- Andreas Tille <tille at debian.org>  Tue, 13 Dec 2011 12:55:52 +0100
 
 sofa-framework (1.0~beta4-5.1) unstable; urgency=high
 

Added: trunk/packages/sofa-framework/trunk/debian/patches/qwt5-qt4.patch
===================================================================
--- trunk/packages/sofa-framework/trunk/debian/patches/qwt5-qt4.patch	                        (rev 0)
+++ trunk/packages/sofa-framework/trunk/debian/patches/qwt5-qt4.patch	2011-12-13 12:18:52 UTC (rev 8934)
@@ -0,0 +1,28 @@
+Author: Andreas Tille <tille at debian.org>
+Last-Changed: Tue, 13 Dec 2011 12:55:52 +0100
+Description: Sofa does not build properly with
+ libqwt-dev so adjusting include directory and fixing some header
+ file is needed
+
+--- sofa-framework-1.0~beta4.orig/applications/sofa/gui/qt/GraphDataWidget.h
++++ sofa-framework-1.0~beta4/applications/sofa/gui/qt/GraphDataWidget.h
+@@ -33,6 +33,8 @@
+ #include <qwt_plot.h>
+ #include <qwt_legend.h>
+ #include <qwt_scale_engine.h>
++#include <qwt_data.h>
++#include <qwt_double_rect.h>
+ 
+ namespace sofa
+ {
+--- sofa-framework-1.0~beta4.orig/sofa.cfg
++++ sofa-framework-1.0~beta4/sofa.cfg
+@@ -212,7 +212,7 @@
+                $$SOFA_DIR/modules \
+                $$SOFA_DIR/applications \
+                /usr/include/qt4 \
+-               /usr/include/qwt
++               /usr/include/qwt-qt4
+ 
+ 
+ 

Modified: trunk/packages/sofa-framework/trunk/debian/rules
===================================================================
--- trunk/packages/sofa-framework/trunk/debian/rules	2011-12-13 11:52:48 UTC (rev 8933)
+++ trunk/packages/sofa-framework/trunk/debian/rules	2011-12-13 12:18:52 UTC (rev 8934)
@@ -60,9 +60,31 @@
 	rm -rf bin lib tutorials doc OBJ
 	# - rm -rf extlibs/tinyxml/
 	
-	dh_clean 
+	dh_clean
 
+	# some packages might remain after clean
+	find . -name "*.o" -delete
+	find . -name "Makefile" -delete
+	find . -name "Makefile.lib*" -delete
+	find . -name "moc_*" -delete
+	rm -rf  applications/sofa/gui/qt/PluginManager.h \
+                applications/sofa/gui/qt/VisitorGUI.cpp \
+                applications/sofa/gui/qt/GUI.cpp \
+                applications/sofa/gui/qt/GUI.h \
+                applications/sofa/gui/qt/DialogAddObject.h \
+                applications/sofa/gui/qt/PluginManager.cpp \
+                applications/sofa/gui/qt/BaseGenGraphForm.h \
+                applications/sofa/gui/qt/VisitorGUI.h \
+                applications/sofa/gui/qt/DialogAddObject.cpp \
+                applications/sofa/gui/qt/BaseGenGraphForm.cpp \
+                applications/projects/Modeler/lib/PluginManager.h \
+                applications/projects/Modeler/lib/Modeler.cpp \
+                applications/projects/Modeler/lib/DialogAddPreset.cpp \
+                applications/projects/Modeler/lib/PluginManager.cpp \
+                applications/projects/Modeler/lib/DialogAddPreset.h \
+                applications/projects/Modeler/lib/Modeler.h
 
+
 install: install-indep install-arch
 
 install-indep: build-indep