[package-plan] 02/02: Merge branch 'master' into experimental

[Joachim Breitner]

This is an automated email from the git hooks/post-receive script.

nomeata pushed a commit to branch experimental
in repository package-plan.

commit c9dae8bf506300814db1aac0f009a1fe3d2dc86f
Merge: 771c2e9 e7a600d
Author: Joachim Breitner <mail at joachim-breitner.de>
Date:   Mon Aug 24 18:45:38 2015 +0200

    Merge branch 'master' into experimental

 packages.txt                               |   2 +-
 patches/xcffib/0.3.6/language-python.patch |  95 +++++++++++++++++++++++++++++
 patches/xcffib/0.3.6/series                |   1 +
 splitpatch.sh                              |  30 +++++++++
 update-suggestions                         | Bin 0 -> 3611159 bytes
 update-suggestions.hi                      | Bin 0 -> 8413 bytes
 update-suggestions.o                       | Bin 0 -> 58920 bytes
 7 files changed, 127 insertions(+), 1 deletion(-)

diff --cc packages.txt
index d11a10e,665c4c9..7175318
--- a/packages.txt
+++ b/packages.txt
@@@ -319,8 -313,8 +319,8 @@@ hmatrix 0.16.1.
  hoauth 0.3.5 obsolete
  hoauth2 0.4.8
  hoogle 4.2.41 notest
 -hOpenPGP 2.2.1 ahead
 +hOpenPGP 2.2.1 key
- hopenpgp-tools 0.16.2 binary key
+ hopenpgp-tools 0.16.3 binary ahead
  hostname 1.0
  hothasktags 0.3.3 binary key
  hourglass 0.2.9
diff --cc splitpatch.sh
index 0000000,0000000..8c420ae
new file mode 100644
--- /dev/null
+++ b/splitpatch.sh
@@@ -1,0 -1,0 +1,30 @@@
++#!/bin/bash
++
++file=$1
++patch=$2
++
++
++hunks=$(grep ^@@ $patch|wc -l)
++
++echo "Detected $hunks hunks"
++
++cp $file $file.orig
++
++sel=
++
++for n in $(seq 1 $hunks)
++do
++cp $file.orig $file
++filterdiff -# $n < $patch | patch --quiet $file
++
++if schroot -c haskell-exp -- ./test-packages.pl >/dev/null
++then
++  echo "Hunk $n is usable on its own"
++  ok="$ok $n"
++else
++  echo "Hunk $n is not usable on its own"
++fi
++done
++cp $file.orig $file
++
++echo Usable hunks: $(echo $ok|tr ' ' ,)
diff --cc update-suggestions
index 0000000,0000000..c9a292f
new file mode 100755
Binary files differ
diff --cc update-suggestions.hi
index 0000000,0000000..4c92dd4
new file mode 100644
Binary files differ
diff --cc update-suggestions.o
index 0000000,0000000..4d15009
new file mode 100644
Binary files differ

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-haskell/package-plan.git