[SCM] Packaging for LIGGGHTS, an Open Source Discrete Element Method Particle Simulation Software. branch, master, updated. upstream/1.5.2-52-g55ee828

[Anton Gladky]

The following commit has been merged in the master branch:
commit 55ee828c6ddef37cc953b6d8ddead6b7a2904633
Author: Anton Gladky <gladky.anton at gmail.com>
Date:   Thu Mar 15 20:09:16 2012 +0100

    Fix conflicts.

diff --git a/debian/rules b/debian/rules
index 8411931..e7a6ad2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,12 +5,8 @@
 
 export OMPI_MCA_plm_rsh_agent=/bin/false		#workaround to start MPI-applications in chroot
 
-<<<<<<< HEAD
 disable_auto_test_archs_simple = armel armhf 
 disable_auto_test_archs_mpi = hurd-i386 mips mipsel s390 s390x
-=======
-disable_auto_test_archs = mips mipsel
->>>>>>> 2ae8ef27add9224104071c179b4a2f314722eec4
 
 override_dh_auto_clean:
 	cd src; make clean-all
@@ -27,12 +23,10 @@ ifeq (,$(filter $(DEB_HOST_ARCH),$(disable_auto_test_archs_simple)))
 	cd test; mpirun -np 2 ./../src/liggghts < in.chute_wear
 	rm -rf test
 endif
-<<<<<<< HEAD
 ifeq (,$(filter $(DEB_HOST_ARCH),$(disable_auto_test_archs_mpi)))
-=======
->>>>>>> 2ae8ef27add9224104071c179b4a2f314722eec4
 	mkdir test
 	cp -r examples/LIGGGHTS/chute_wear/* test/
 	cd test; ./../src/liggghts < in.chute_wear
 	rm -rf test
+endif
 

-- 
Packaging for LIGGGHTS, an Open Source Discrete Element Method Particle Simulation Software.