# HG changeset patch
# User Chris Cannam
# Date 1352472117 0
# Node ID 48ddad528c51ada8ebb1d1a9c6a59672a84637e2
# Parent  c2b09e16f9fa3586b1171685763c7d1292af218f# Parent  f8a93c42287b967c11c4dac9d7674ca940158a40
Merge

diff -r c2b09e16f9fa -r 48ddad528c51 extra/soundsoftware/extract-javadoc.sh
--- a/extra/soundsoftware/extract-javadoc.sh	Fri Nov 09 14:41:49 2012 +0000
+++ b/extra/soundsoftware/extract-javadoc.sh	Fri Nov 09 14:41:57 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=