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

[domibel-guest at alioth.debian.org]

Author: domibel-guest
Date: 2008-10-30 20:11:27 +0000 (Thu, 30 Oct 2008)
New Revision: 2598

Modified:
   trunk/packages/sofa-framework/trunk/debian/changelog
   trunk/packages/sofa-framework/trunk/debian/patches/00list
   trunk/packages/sofa-framework/trunk/debian/rules
Log:
fixed segfault on amd64


Modified: trunk/packages/sofa-framework/trunk/debian/changelog
===================================================================
--- trunk/packages/sofa-framework/trunk/debian/changelog	2008-10-30 15:03:14 UTC (rev 2597)
+++ trunk/packages/sofa-framework/trunk/debian/changelog	2008-10-30 20:11:27 UTC (rev 2598)
@@ -1,3 +1,11 @@
+sofa-framework (1.0~beta3-2) unstable; urgency=low
+
+  * fixed segfault on amd64
+  * build arch all packages only in the binary-indep target (Closes: #503555)
+  * fixed MIPS and ARM build error (sqrt/sqrtl)
+
+ -- Dominique Belhachemi <domibel at cs.tu-berlin.de>  Thu, 30 Oct 2008 19:23:49 +0100
+
 sofa-framework (1.0~beta3-1) unstable; urgency=low
 
   * Initial release (Closes: #455064)

Modified: trunk/packages/sofa-framework/trunk/debian/patches/00list
===================================================================
--- trunk/packages/sofa-framework/trunk/debian/patches/00list	2008-10-30 15:03:14 UTC (rev 2597)
+++ trunk/packages/sofa-framework/trunk/debian/patches/00list	2008-10-30 20:11:27 UTC (rev 2598)
@@ -1,3 +1,5 @@
+22_amd64_segfault.dpatch
 25_newmat.dpatch
 #10changes.dpatch
 #44_ogre.dpatch
+55_fix_mips_sqrt.dpatch

Modified: trunk/packages/sofa-framework/trunk/debian/rules
===================================================================
--- trunk/packages/sofa-framework/trunk/debian/rules	2008-10-30 15:03:14 UTC (rev 2597)
+++ trunk/packages/sofa-framework/trunk/debian/rules	2008-10-30 20:11:27 UTC (rev 2598)
@@ -42,6 +42,12 @@
 	# Add here commands to compile the package.
 	$(MAKE)
 
+	touch $@
+
+build-docs: build-stamp docs-stamp
+docs-stamp:
+	dh_testdir
+
 	# Create the documentation files
 	mkdir -p $(CURDIR)/doc/doxygen
 	doxygen -u Doxyfile
@@ -57,7 +63,7 @@
 clean-patched:
 	dh_testdir
 	dh_testroot
-	rm -f build-stamp configure-stamp
+	rm -f build-stamp configure-stamp docs-stamp
 
 	# Add here commands to clean up after the build process.
 #	$(MAKE) clean
@@ -78,7 +84,6 @@
 	mkdir -p $(CURDIR)/debian/tmp/usr/bin
 	mkdir -p $(CURDIR)/debian/tmp/usr/lib
 	mkdir -p $(CURDIR)/debian/tmp/usr/include
-	mkdir -p $(CURDIR)/debian/tmp/usr/share/doc/sofa-doc
 
 	find framework -name "*.h" | xargs -i cp --parents {} $(CURDIR)/debian/tmp/usr/include/
 	find framework -name "*.inl" | xargs -i cp --parents {} $(CURDIR)/debian/tmp/usr/include/
@@ -116,6 +121,18 @@
 ###	dh_install -psofa-apps   debian/tmp/usr/bin/sofa_chain_hybrid     usr/bin
 ###	dh_install -psofa-apps   debian/tmp/usr/bin/sofa_mixed_pendulum   usr/bin
 	dh_install -psofa-apps   debian/sofa                              usr/bin
+
+        # lintian override
+	install -p -D -m644 debian/libsofa1.lintian debian/libsofa1/usr/share/lintian/overrides/libsofa1
+	install -p -D -m644 debian/sofa-apps.lintian debian/sofa-apps/usr/share/lintian/overrides/sofa-apps
+
+
+
+# Build architecture-independent files here.
+binary-indep: build install
+
+	mkdir -p $(CURDIR)/debian/tmp/usr/share/doc/sofa-doc
+
 	dh_install -psofa-apps   debian/sofa.desktop                      usr/share/applications
 	dh_install -psofa-apps   debian/sofa.xpm                          usr/share/pixmaps
 
@@ -134,20 +151,14 @@
 	dh_install -psofa-data   share                                usr/share/sofa
 	dh_install -psofa-data   examples                             usr/share/sofa
 
-	# Documentation
+        # Documentation
 	dh_install -psofa-doc     doc/doxygen/html                    usr/share/doc/sofa-doc
 
-	# lintian override
-	install -p -D -m644 debian/libsofa1.lintian debian/libsofa1/usr/share/lintian/overrides/libsofa1
-	install -p -D -m644 debian/sofa-apps.lintian debian/sofa-apps/usr/share/lintian/overrides/sofa-apps
 
-
-# Build architecture-independent files here.
-binary-indep: build install
 # We have nothing to do by default.
 
 # Build architecture-dependent files here.
-binary-arch: build install
+binary-arch: build build-docs install
 	dh_testdir
 	dh_testroot
 	dh_install