From 0cb0cdde3efaab78432588921218860467cde3f0 Mon Sep 17 00:00:00 2001
From: Ole Tange <ole@tange.dk>
Date: Wed, 22 May 2013 00:51:54 +0200
Subject: [PATCH] Released as 20130522 ('Rana Plaza').

---
 NEWS                                           | 17 +++++++++++++++++
 doc/release_new_version                        |  2 +-
 packager/debian/debian-template/changelog      |  2 +-
 packager/obs/Makefile                          |  2 +-
 packager/obs/home:tange/parallel/parallel.spec |  2 +-
 5 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/NEWS b/NEWS
index cbeb6d72..5e4dea76 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,20 @@
+20130522
+
+* --ctrlc is now default if --pipe is not used; thus making it
+  possible to kill remotely started jobs simply by pressing Ctrl-C.
+
+* --timeout 200% now means kill jobs that take more than twice the
+  time of the median run time of a job.
+
+* Jobs are now distributed round robin when having mulitiple
+  --sshlogin instead of filling up one --sshlogin at a time.
+
+* niceload: darwin version of --io --mem --swap. Thanks to Anders F
+  Björklund.
+
+* Bug fixes and man page updates.
+
+
 20130422
 
 * 10 seconds installation: wget -O - pi.dk/3 | sh
diff --git a/doc/release_new_version b/doc/release_new_version
index 7f7317a2..b911a7e2 100644
--- a/doc/release_new_version
+++ b/doc/release_new_version
@@ -62,7 +62,7 @@ perl -i -pe "s/20\d\d\d\d\d\d/$YYYYMMDD/" parallel-*.tar.*directive
 gpg --clearsign parallel-$YYYYMMDD.tar.bz2.directive
 
 cp doc/parallel.latest.directive parallel-latest.tar.bz2.directive
-perl -i -pe "s/20\d\d\d\d\d\d/latest/" parallel-latest.tar.*directive
+perl -i -pe "s/20\d\d\d\d\d\d/$YYYYMMDD/" parallel-latest.tar.*directive
 gpg --clearsign --yes parallel-latest.tar.bz2.directive
 
 (echo "To check the signature run:";
diff --git a/packager/debian/debian-template/changelog b/packager/debian/debian-template/changelog
index f27a77f3..d1d139c1 100644
--- a/packager/debian/debian-template/changelog
+++ b/packager/debian/debian-template/changelog
@@ -1,4 +1,4 @@
-parallel (20110422-1) unstable; urgency=low
+parallel (20130522-1) unstable; urgency=low
 
   * New upstream version
 
diff --git a/packager/obs/Makefile b/packager/obs/Makefile
index 05225092..7dcb39bf 100644
--- a/packager/obs/Makefile
+++ b/packager/obs/Makefile
@@ -2,7 +2,7 @@ all:
 	cd ../debian/ && make
 	osc rm home\:tange/parallel/parallel_*.dsc || true
 	cp ../debian/parallel_*.dsc ../debian/parallel_*.tar.gz home\:tange/parallel/
-	cp `ls ../../parallel-*.tar.bz2|tail -n1` home\:tange/parallel/
+	cp `ls ../../parallel-2*.tar.bz2|tail -n1` home\:tange/parallel/
 	cd home\:tange/parallel/ && osc up 
 	cd home\:tange/parallel/ && parallel osc add ::: *.spec *.dsc *.tar.gz *.tar.bz2 && echo Src added OK || true
 	cd home\:tange/parallel/ && osc ci -m "New release"
diff --git a/packager/obs/home:tange/parallel/parallel.spec b/packager/obs/home:tange/parallel/parallel.spec
index ccab0c0f..ea2697ff 100644
--- a/packager/obs/home:tange/parallel/parallel.spec
+++ b/packager/obs/home:tange/parallel/parallel.spec
@@ -1,6 +1,6 @@
 Summary:	Shell tool for executing jobs in parallel
 Name: 		parallel
-Version: 	20130422
+Version: 	20130522
 Release: 	1
 License: 	GPL
 Group: 		Productivity/File utilities