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

[Anton Gladky]

The following commit has been merged in the master branch:
commit 9f43e4a7311f893ea53042efee46ad0348a30dfc
Merge: e5a0fb3eae767d5dbab16fde244ab2952c0ab888 2ae8ef27add9224104071c179b4a2f314722eec4
Author: Anton Gladky <gladky.anton at gmail.com>
Date:   Thu Mar 15 20:06:21 2012 +0100

    Update of changelog.

diff --combined debian/changelog
index 9715a03,5fcb411..e2e4948
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,3 -1,10 +1,16 @@@
++liggghts (1.5.2-2) unstable; urgency=low
++
++  * [e5a0fb3] Disable mpirun-test on some platforms, where it crashes.
++
++ -- Anton Gladky <gladky.anton at gmail.com>  Thu, 15 Mar 2012 20:05:37 +0100
++
+ liggghts (1.5.2-1) unstable; urgency=low
+ 
+   * [5b3ec1c] Imported Upstream version 1.5.2
+   * [cfb6bac] Do not start mpirun-autotests on mips* archs.
+ 
+  -- Anton Gladky <gladky.anton at gmail.com>  Wed, 14 Mar 2012 20:41:52 +0100
+ 
  liggghts (1.5.1-5) unstable; urgency=low
  
    * [d7df2ea] Fix typo in archs.
diff --combined debian/rules
index dbac0bc,8d1cfd8..8411931
--- a/debian/rules
+++ b/debian/rules
@@@ -5,8 -5,7 +5,12 @@@
  
  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
@@@ -17,15 -16,14 +21,18 @@@ override_dh_auto_build
  	mv src/lmp_fedora src/liggghts
  
  override_dh_auto_test:
 -ifeq (,$(filter $(DEB_HOST_ARCH),$(disable_auto_test_archs)))
 +ifeq (,$(filter $(DEB_HOST_ARCH),$(disable_auto_test_archs_simple)))
  	mkdir test
  	cp -r examples/LIGGGHTS/chute_wear/* test/
- 	cd test; ./../src/liggghts < in.chute_wear || true
+ 	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; mpirun -np 2 ./../src/liggghts < in.chute_wear || true
+ 	cd test; ./../src/liggghts < in.chute_wear
  	rm -rf test
- endif
+ 

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