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

[Andreas Tille]

Author: tille
Date: 2011-12-23 23:48:12 +0000 (Fri, 23 Dec 2011)
New Revision: 9090

Added:
   trunk/packages/sofa-framework/trunk/debian/libsofa1-dev.install
   trunk/packages/sofa-framework/trunk/debian/libsofa1.install
   trunk/packages/sofa-framework/trunk/debian/sofa-apps.manpages
Modified:
   trunk/packages/sofa-framework/trunk/debian/changelog
   trunk/packages/sofa-framework/trunk/debian/rules
Log:
Package now builds, needs further checking


Modified: trunk/packages/sofa-framework/trunk/debian/changelog
===================================================================
--- trunk/packages/sofa-framework/trunk/debian/changelog	2011-12-23 22:19:52 UTC (rev 9089)
+++ trunk/packages/sofa-framework/trunk/debian/changelog	2011-12-23 23:48:12 UTC (rev 9090)
@@ -8,6 +8,8 @@
     - updated to latest upstream code
     - turned from dpatch syntax to quilt syntax
     - renamed: 10_* is for upstream, 20_* is Debian specific
+  * debian/rules -> debian/*.{install,manpages}
+    make more use of dh_* helper files
 
  -- Andreas Tille <tille at debian.org>  Mon, 19 Dec 2011 15:05:24 +0100
 

Added: trunk/packages/sofa-framework/trunk/debian/libsofa1-dev.install
===================================================================
--- trunk/packages/sofa-framework/trunk/debian/libsofa1-dev.install	                        (rev 0)
+++ trunk/packages/sofa-framework/trunk/debian/libsofa1-dev.install	2011-12-23 23:48:12 UTC (rev 9090)
@@ -0,0 +1,2 @@
+lib/lib*.a	usr/lib
+lib/lib*.so	usr/lib

Added: trunk/packages/sofa-framework/trunk/debian/libsofa1.install
===================================================================
--- trunk/packages/sofa-framework/trunk/debian/libsofa1.install	                        (rev 0)
+++ trunk/packages/sofa-framework/trunk/debian/libsofa1.install	2011-12-23 23:48:12 UTC (rev 9090)
@@ -0,0 +1 @@
+lib/lib*.so.[0-9]*	usr/lib

Modified: trunk/packages/sofa-framework/trunk/debian/rules
===================================================================
--- trunk/packages/sofa-framework/trunk/debian/rules	2011-12-23 22:19:52 UTC (rev 9089)
+++ trunk/packages/sofa-framework/trunk/debian/rules	2011-12-23 23:48:12 UTC (rev 9090)
@@ -147,28 +147,18 @@
 	rm -rf $(CURDIR)/debian/tmp/usr/include/applications
 
 	mv $(CURDIR)/bin/runSofa         $(CURDIR)/debian/tmp/usr/lib/sofa-framework/sofa
-###	mv $(CURDIR)/bin/oneParticule    $(CURDIR)/debian/tmp/usr/bin/sofa_particule
-###	mv $(CURDIR)/bin/oneTetrahedron  $(CURDIR)/debian/tmp/usr/bin/sofa_tetrahedron
-###	mv $(CURDIR)/bin/chainHybrid     $(CURDIR)/debian/tmp/usr/bin/sofa_chain_hybrid
-###	mv $(CURDIR)/bin/mixedPendulum   $(CURDIR)/debian/tmp/usr/bin/sofa_mixed_pendulum
 
 
-	cp -a $(CURDIR)/lib/linux/lib* $(CURDIR)/debian/tmp/usr/lib/
+	# use dh_install directly
+###	cp -a $(CURDIR)/lib/lib* $(CURDIR)/debian/tmp/usr/lib/
+###	dh_install -plibsofa1        debian/tmp/usr/lib/lib*.so.*             usr/lib
+###	dh_install -plibsofa1-dev    debian/tmp/usr/lib/lib*.so               usr/lib
 
-
-	dh_install -plibsofa1        debian/tmp/usr/lib/lib*.so.*             usr/lib
-
-	dh_install -plibsofa1-dev    debian/tmp/usr/lib/lib*.so               usr/lib
 	dh_install -plibsofa1-dev    debian/tmp/usr/include/*                 usr/include
 
 	dh_install -psofa-apps   debian/tmp/usr/lib/sofa-framework/sofa   usr/lib/sofa-framework
-###	dh_install -psofa-apps   debian/tmp/usr/bin/sofa_particule        usr/bin
-###	dh_install -psofa-apps   debian/tmp/usr/bin/sofa_tetrahedron      usr/bin
-###	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
 
-	dh_installman -psofa-apps debian/sofa.1
 
 # called by binary-indep and binary-arch
 binary-common:

Added: trunk/packages/sofa-framework/trunk/debian/sofa-apps.manpages
===================================================================
--- trunk/packages/sofa-framework/trunk/debian/sofa-apps.manpages	                        (rev 0)
+++ trunk/packages/sofa-framework/trunk/debian/sofa-apps.manpages	2011-12-23 23:48:12 UTC (rev 9090)
@@ -0,0 +1 @@
+debian/*.1