Index: TODO
===================================================================
--- TODO	(Revision 5130)
+++ TODO	(Revision 5131)
@@ -1 +0,0 @@
- * Investigate a mixed OpenMP/MPI build
Index: regtest.config
===================================================================
--- regtest.config	(Revision 5130)
+++ regtest.config	(Revision 5131)
@@ -1,6 +1,6 @@
 FORT_C_NAME=gfortran
 dir_base="`pwd`/../../"
-cp2k_version=popt
+cp2k_version=psmp
 dir_triplet=`uname`-`uname -m`-gfortran
 cp2k_dir=
 maxtasks=1
Index: changelog
===================================================================
--- changelog	(Revision 5130)
+++ changelog	(Revision 5131)
@@ -12,6 +12,9 @@
   * debian/patches/testsuite_parallel_continue.patch: New patch, prevents an
     endless loop when running the testsuite with more than one thread, but only
     one regtest at a time.
+  * debian/rules (VERSION): Switch to psmp (hybrid OpenMP/MPI).
+  * debian/TODO: Removed.
+  * debian/regtest.config: Switch to psmp.
 
  -- Michael Banck <mbanck@debian.org>  Sun, 02 Mar 2014 12:43:33 +0100
 
Index: rules
===================================================================
--- rules	(Revision 5130)
+++ rules	(Revision 5131)
@@ -18,7 +18,7 @@
 PLATFORM=Linux
 ARCH=`uname -m`
 FORT_C_NAME=gfortran
-VERSION=popt
+VERSION=psmp
 
 %:
 	dh $@ 
