# HG changeset patch
# User Chris Cannam
# Date 1352454264 0
# Node ID f8a93c42287b967c11c4dac9d7674ca940158a40
# Parent  a5af76c3fca02bae124604c7e8200aeb931f6481# Parent  3549525ba22a4c697e865881d0b64bb68baf81f7
Merge from branch "live"

diff -r a5af76c3fca0 -r f8a93c42287b extra/soundsoftware/extract-javadoc.sh
--- a/extra/soundsoftware/extract-javadoc.sh	Fri Oct 26 17:19:19 2012 +0100
+++ b/extra/soundsoftware/extract-javadoc.sh	Fri Nov 09 09:44:24 2012 +0000
@@ -35,8 +35,8 @@
 # package declarations
 
 find "$projectdir" -type f -name \*.java \
-    -exec grep '^ *package [a-zA-Z][a-zA-Z0-9\._-]*; *$' \{\} /dev/null \; |
-    sed -e 's/\/[^\/]*: *package */:/' -e 's/; *$//' |
+    -exec egrep '^ *package +[a-zA-Z][a-zA-Z0-9\._-]*;.*$' \{\} /dev/null \; |
+    sed -e 's/\/[^\/]*: *package */:/' -e 's/;.*$//' |
     sort | uniq | (
 	current_prefix=
 	current_packages=