[med-svn] r3497 - trunk/packages/sofa-framework/trunk/debian

[Dominique Belhachemi]

Author: domibel-guest
Date: 2009-06-18 03:37:57 +0000 (Thu, 18 Jun 2009)
New Revision: 3497

Modified:
   trunk/packages/sofa-framework/trunk/debian/changelog
   trunk/packages/sofa-framework/trunk/debian/control
   trunk/packages/sofa-framework/trunk/debian/rules
Log:
csparse support disabled


Modified: trunk/packages/sofa-framework/trunk/debian/changelog
===================================================================
--- trunk/packages/sofa-framework/trunk/debian/changelog	2009-06-18 02:56:54 UTC (rev 3496)
+++ trunk/packages/sofa-framework/trunk/debian/changelog	2009-06-18 03:37:57 UTC (rev 3497)
@@ -1,3 +1,12 @@
+sofa-framework (1.0~beta4-2) unstable; urgency=low
+
+  * csparse support disabled because it conflicts with the
+    newer version in libsuitesparse-dev (Closes: #532693)
+  * Build-Conflicts: qt3-dev-tools added
+  * lost GCC 4.4 patches added (Closes: #532396)
+
+ -- Dominique Belhachemi <domibel at cs.tu-berlin.de>  Wed, 17 Jun 2009 23:10:35 -0400
+
 sofa-framework (1.0~beta4-1) unstable; urgency=low
 
   * new upstream release
@@ -4,8 +13,6 @@
   * Qt OGRE 3D viewer disabled (Closes: #527706)
   * MIPS/ARM patch, AMD64 patch and Newmat patch removed because they
     have been applied by upstream (Thanks to Everton Hermann)
-  * csparse support disabled because it conflicts with the
-    newer version in libsuitesparse-dev (Closes: #532693)
 
  -- Dominique Belhachemi <domibel at cs.tu-berlin.de>  Sun, 07 Jun 2009 14:35:15 -0400
 

Modified: trunk/packages/sofa-framework/trunk/debian/control
===================================================================
--- trunk/packages/sofa-framework/trunk/debian/control	2009-06-18 02:56:54 UTC (rev 3496)
+++ trunk/packages/sofa-framework/trunk/debian/control	2009-06-18 03:37:57 UTC (rev 3497)
@@ -8,6 +8,7 @@
  libglew-dev, libqt4-dev, libqt4-opengl-dev, libboost-dev, libxml2-dev,
  libboost-graph-dev, libboost-thread-dev, libqwt5-qt4-dev, libpng-dev, pkg-config
 Build-Depends-Indep: doxygen, graphviz
+Build-Conflicts: qt3-dev-tools
 Standards-Version: 3.8.1
 Homepage: http://www.sofa-framework.org/
 

Modified: trunk/packages/sofa-framework/trunk/debian/rules
===================================================================
--- trunk/packages/sofa-framework/trunk/debian/rules	2009-06-18 02:56:54 UTC (rev 3496)
+++ trunk/packages/sofa-framework/trunk/debian/rules	2009-06-18 03:37:57 UTC (rev 3497)
@@ -60,11 +60,10 @@
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp configure-stamp docs-stamp
-	rm -rf bin lib tutorials doc
+	rm -rf bin lib tutorials doc OBJ
 	
-
 	# Add here commands to clean up after the build process.
-#	$(MAKE) clean
+	#$(MAKE) clean
 
 	dh_clean