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

[Andreas Tille]

Author: tille
Date: 2011-12-23 20:31:38 +0000 (Fri, 23 Dec 2011)
New Revision: 9087

Modified:
   trunk/packages/sofa-framework/trunk/debian/rules
Log:
Make debian/rules slightly more robust - not fully working yet


Modified: trunk/packages/sofa-framework/trunk/debian/rules
===================================================================
--- trunk/packages/sofa-framework/trunk/debian/rules	2011-12-23 15:50:23 UTC (rev 9086)
+++ trunk/packages/sofa-framework/trunk/debian/rules	2011-12-23 20:31:38 UTC (rev 9087)
@@ -21,7 +21,7 @@
 	(cd applications/projects/runSofa; qmake -o Makefile runSofa.pro)
 
 	# create a folder without object files
-	cp -r $(CURDIR)/applications/tutorials $(CURDIR)/tutorials
+	cp -a $(CURDIR)/applications/tutorials $(CURDIR)/tutorials
 
 	touch $@
 
@@ -47,7 +47,6 @@
 build-arch-stamp: configure
 	dh_testdir
 
-        # Add here commands to compile the package.
 	$(MAKE)
 
 	touch $@
@@ -99,10 +98,10 @@
 	dh_install -psofa-tutorials    tutorials     usr/share/sofa
 
 	find share -type f -exec chmod 644 \{\} \;
-	find share -name "*.sh" | xargs chmod 755
+	find share -name "*.sh" -exec chmod 755 \{\} \;
 
 	find examples -type f -exec chmod 644 \{\} \;
-	find examples -name "*.sh" | xargs chmod 755
+	find examples -name "*.sh" -exec chmod 755 \{\} \;
 
 	dh_install -psofa-data   share                                usr/share/sofa
 	dh_install -psofa-data   examples                             usr/share/sofa
@@ -123,7 +122,6 @@
 	dh_install -psofa-apps   debian/sofa.desktop                      usr/share/applications
 	dh_install -psofa-apps   debian/sofa.xpm                          usr/share/pixmaps
 
-	# Add here commands to install the package into debian/tmp
 #	$(MAKE) install
 #	$(MAKE) INSTALL_DIR=$(CURDIR)/debian/tmp install
 
@@ -135,17 +133,17 @@
 
 	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/
-	cp -rf $(CURDIR)/debian/tmp/usr/include/framework/* $(CURDIR)/debian/tmp/usr/include/
+	cp -af $(CURDIR)/debian/tmp/usr/include/framework/* $(CURDIR)/debian/tmp/usr/include/
 	rm -rf $(CURDIR)/debian/tmp/usr/include/framework
 
 	find modules -name "*.h" | xargs -i cp --parents {} $(CURDIR)/debian/tmp/usr/include/
 	find modules -name "*.inl" | xargs -i cp --parents {} $(CURDIR)/debian/tmp/usr/include/
-	cp -rf $(CURDIR)/debian/tmp/usr/include/modules/* $(CURDIR)/debian/tmp/usr/include/
+	cp -af $(CURDIR)/debian/tmp/usr/include/modules/* $(CURDIR)/debian/tmp/usr/include/
 	rm -rf $(CURDIR)/debian/tmp/usr/include/modules
 
 	find applications -name "*.h" | xargs -i cp --parents {} $(CURDIR)/debian/tmp/usr/include/
 	find applications -name "*.inl" | xargs -i cp --parents {} $(CURDIR)/debian/tmp/usr/include/
-	cp -rf $(CURDIR)/debian/tmp/usr/include/applications/* $(CURDIR)/debian/tmp/usr/include/
+	cp -af $(CURDIR)/debian/tmp/usr/include/applications/* $(CURDIR)/debian/tmp/usr/include/
 	rm -rf $(CURDIR)/debian/tmp/usr/include/applications
 
 	mv $(CURDIR)/bin/runSofa         $(CURDIR)/debian/tmp/usr/lib/sofa-framework/sofa
@@ -155,7 +153,7 @@
 ###	mv $(CURDIR)/bin/mixedPendulum   $(CURDIR)/debian/tmp/usr/bin/sofa_mixed_pendulum
 
 
-	cp -r $(CURDIR)/lib/linux/lib* $(CURDIR)/debian/tmp/usr/lib/
+	cp -a $(CURDIR)/lib/linux/lib* $(CURDIR)/debian/tmp/usr/lib/
 
 
 	dh_install -plibsofa1        debian/tmp/usr/lib/lib*.so.*             usr/lib