Merge /fml/ag-raetsch/home/maan/scm/paraslash_meins/paraslash

diff --git a/NEWS b/NEWS
index c2d75f3988af81bb61afc061a0ebed05661f13f8..fabcc63903b4a30df59d0cb0aaba06590c51964e 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -11,6 +11,7 @@ the 0.2.x series if no serious bugs show up after the release.
        - be more carful wrt. signed vs. unsigned argument passing.
        - cleanup error.h and fix some references to invalid error
          codes.
+       - update to gengetopt-2.20
 
 --------------------------------------
 0.2.16 (2007-04-05) "neural discharge"

diff --git a/grab_client.ggo b/grab_client.ggo
index ded7ee75758682e1763f581b37eb31654d2e344c..263259dd87ab385a7a105442c2d8116154e9e2aa 100644 (file)
--- a/grab_client.ggo
+++ b/grab_client.ggo
@@ -20,12 +20,10 @@ option "audio_format" a
 option "input_grab" i
        "grab the filter input instead of its output"
        flag off
-       optional
 
 option "one_shot" o
        "stop grabbing if audio file changes"
        flag off
-       optional
 
 option "mode" m
        "select grab mode"

diff --git a/server.ggo b/server.ggo
index 2c3ff1d0970258d1ddce7471ce4222f87cf6d508..4f6e05b290a2d0ea4cb1c4f61032124e8666b834 100644 (file)
--- a/server.ggo
+++ b/server.ggo
@@ -134,8 +134,8 @@ option "selector" S
 
 
 
-section "mysql selector:"
-#~~~~~~~~~~~~~~~~~~~~~~~~
+section "mysql selector"
+#~~~~~~~~~~~~~~~~~~~~~~~
 
 
 option "mysql_host" -

diff --git a/write.ggo b/write.ggo
index 02d1a164bb06d031012d86a649dea44f32053abc..1ea8abf29265d9bc6c569f7fbeda5734cd70e972 100644 (file)
--- a/write.ggo
+++ b/write.ggo
@@ -6,7 +6,6 @@ option "list_writers" L
 "print available writers and exit"
 
        flag off
-       optional
 
 option "loglevel" l
 #~~~~~~~~~~~~~~~~~~