r45381 - in /packages/code-aster/aster/trunk/debian: code-aster-test.install rules

[apalazzi-guest at users.alioth.debian.org]

Author: apalazzi-guest
Date: Sat Oct  6 15:57:43 2012
New Revision: 45381

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=45381
Log:
Some fixes to the packaging of code-aster-test

Files of the code-aster-test package are no longer under /usr/lib
but under /usr/share; the script as_test.sh is now in /usr/bin.

Modified:
    packages/code-aster/aster/trunk/debian/code-aster-test.install
    packages/code-aster/aster/trunk/debian/rules

Modified: packages/code-aster/aster/trunk/debian/code-aster-test.install
URL: http://svn.debian.org/wsvn/debian-science/packages/code-aster/aster/trunk/debian/code-aster-test.install?rev=45381&op=diff
==============================================================================
--- packages/code-aster/aster/trunk/debian/code-aster-test.install (original)
+++ packages/code-aster/aster/trunk/debian/code-aster-test.install Sat Oct  6 15:57:43 2012
@@ -1,4 +1,4 @@
-usr/lib/codeaster/STABLE/astest
-usr/lib/codeaster/STABLE/astout.export
+usr/share/codeaster/astest
+usr/share/codeaster/astout.export
+usr/bin/as_test.sh
 
-

Modified: packages/code-aster/aster/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/code-aster/aster/trunk/debian/rules?rev=45381&op=diff
==============================================================================
--- packages/code-aster/aster/trunk/debian/rules (original)
+++ packages/code-aster/aster/trunk/debian/rules Sat Oct  6 15:57:43 2012
@@ -32,6 +32,7 @@
 
 export DEB_DESTDIR=$(CURDIR)/debian/tmp
 
+ASTER_SHARE_DIR=/usr/share/codeaster
 ASTOUT_EXPORT=$(STA_VERSION)/astout.export
 
 build: build-stamp
@@ -112,36 +113,32 @@
 	touch $@
 
 build-indep:
-	mkdir -p $(DEB_DESTDIR)/$(ASTER_ROOT)/$(STA_VERSION)/dtag
-	cp -r $(STA_VERSION) $(DEB_DESTDIR)/$(ASTER_ROOT)
+	mkdir -p $(DEB_DESTDIR)/$(ASTER_SHARE_DIR)/astest
+	cp $(STA_VERSION)/astout.export $(DEB_DESTDIR)/$(ASTER_SHARE_DIR)/
+	cp -r $(STA_VERSION)/astest/* $(DEB_DESTDIR)/$(ASTER_SHARE_DIR)/astest
 # Export file replacements for running tests 
-	sed -i 's:?ASTER_ROOT?:$(ASTER_ROOT):' $(DEB_DESTDIR)/$(ASTER_ROOT)/$(ASTOUT_EXPORT)
-	sed -i 's:?ASTER_VERSION?:$(STA_VERSION):' $(DEB_DESTDIR)/$(ASTER_ROOT)/$(ASTOUT_EXPORT)
+	sed -i 's:?ASTER_ROOT?:$(ASTER_SHARE_DIR):' $(DEB_DESTDIR)/$(ASTER_SHARE_DIR)/$(ASTOUT_EXPORT)
+	sed -i 's:?ASTER_VERSION?:$(STA_VERSION):' $(DEB_DESTDIR)/$(ASTER_SHARE_DIR)/$(ASTOUT_EXPORT)
 # Create liste_short_without_homard
-	cat $(DEB_DESTDIR)/$(ASTER_ROOT)/$(STA_VERSION)/astest/liste_short | grep -v -f debian/liste_homard > $(DEB_DESTDIR)/$(ASTER_ROOT)/$(STA_VERSION)/astest/liste_short_without_homard 
+	cat $(DEB_DESTDIR)/$(ASTER_SHARE_DIR)/astest/liste_short | grep -v -f debian/liste_homard > $(DEB_DESTDIR)/$(ASTER_SHARE_DIR)/astest/liste_short_without_homard 
 # Create liste_without_homard
-	cat $(DEB_DESTDIR)/$(ASTER_ROOT)/$(STA_VERSION)/astest/liste_internet | grep -v -f debian/liste_homard > $(DEB_DESTDIR)/$(ASTER_ROOT)/$(STA_VERSION)/astest/liste_internet_without_homard
+	cat $(DEB_DESTDIR)/$(ASTER_SHARE_DIR)/astest/liste_internet | grep -v -f debian/liste_homard > $(DEB_DESTDIR)/$(ASTER_SHARE_DIR)/astest/liste_internet_without_homard
 # Use the short test list without homard by default
-	sed -i '/liste_internet/ s/^/#/' $(DEB_DESTDIR)/$(ASTER_ROOT)/$(ASTOUT_EXPORT)
-	sed -i 's:#\(.*liste_short.*\):#\1\n\1:' $(DEB_DESTDIR)/$(ASTER_ROOT)/$(ASTOUT_EXPORT)
-	sed -i '/^F/ s:liste_short:&_without_homard:' $(DEB_DESTDIR)/$(ASTER_ROOT)/$(ASTOUT_EXPORT)
+	sed -i '/liste_internet/ s/^/#/' $(DEB_DESTDIR)/$(ASTER_SHARE_DIR)/$(ASTOUT_EXPORT)
+	sed -i 's:#\(.*liste_short.*\):#\1\n\1:' $(DEB_DESTDIR)/$(ASTER_SHARE_DIR)/$(ASTOUT_EXPORT)
+	sed -i '/^F/ s:liste_short:&_without_homard:' $(DEB_DESTDIR)/$(ASTER_SHARE_DIR)/$(ASTOUT_EXPORT)
 # Results will be in /tmp for writing permission
-	sed -i '/resu_test/ s:$(ASTER_ROOT)/$(STA_VERSION):/tmp:' $(DEB_DESTDIR)/$(ASTER_ROOT)/$(ASTOUT_EXPORT)
-
-# Remove extra license file
-	rm -f $(DEB_DESTDIR)$(ASTER_ROOT)/$(STA_VERSION)/LICENSE.TERMS
-	rm -f $(DEB_DESTDIR)$(ASTER_ROOT)/$(STA_VERSION)/GPL.txt
+	sed -i '/resu_test/ s:$(ASTER_SHARE_DIR)/$(STA_VERSION):/tmp:' $(DEB_DESTDIR)/$(ASTER_SHARE_DIR)/$(ASTOUT_EXPORT)
 
 # Remove UMAT binaries from test cases
-	rm -f $(DEB_DESTDIR)$(ASTER_ROOT)/$(STA_VERSION)/astest/umat001a.44
-	rm -f $(DEB_DESTDIR)$(ASTER_ROOT)/$(STA_VERSION)/astest/umat001b.44
-	rm -f $(DEB_DESTDIR)$(ASTER_ROOT)/$(STA_VERSION)/astest/umat002a.44
-	rm -f $(DEB_DESTDIR)$(ASTER_ROOT)/$(STA_VERSION)/astest/umat002a.46
+	rm -fv $(DEB_DESTDIR)/$(ASTER_SHARE_DIR)/astest/umat001a.44
+	rm -fv $(DEB_DESTDIR)/$(ASTER_SHARE_DIR)/astest/umat001b.44
+	rm -fv $(DEB_DESTDIR)/$(ASTER_SHARE_DIR)/astest/umat002a.44
+	rm -fv $(DEB_DESTDIR)/$(ASTER_SHARE_DIR)/astest/umat002a.46
 
 # Add as_test.sh 
-	mkdir -p $(DEB_DESTDIR)/$(ASTER_ROOT)/$(STA_VERSION)/astest
-	cp debian/as_test.sh $(DEB_DESTDIR)/$(ASTER_ROOT)/$(STA_VERSION)/astest
-	chmod 755 $(DEB_DESTDIR)/$(ASTER_ROOT)/$(STA_VERSION)/astest/as_test.sh
+	cp debian/as_test.sh $(DEB_DESTDIR)/usr/bin
+	chmod 755 $(DEB_DESTDIR)/usr/bin/as_test.sh
 	touch $@
 
 clean:
@@ -165,7 +162,7 @@
 	dh_install --sourcedir=debian/tmp --list-missing
 
 # Build architecture-independent files here.
-binary-indep: build
+binary-indep: build-indep
 	dh_testdir -i
 	dh_testroot -i
 	dh_installdirs -i
@@ -185,7 +182,7 @@
 	dh_builddeb -i
 
 # Build architecture-dependent files here.
-binary-arch: build install
+binary-arch: build-arch
 	dh_testdir -a
 	dh_testroot -a
 	dh_installdirs -a