summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--bin/quilt.in15
-rw-r--r--po/de.po9
-rw-r--r--po/fr.po9
-rw-r--r--po/ja.po9
-rw-r--r--po/quilt.pot8
-rw-r--r--quilt.changes6
6 files changed, 37 insertions, 19 deletions
diff --git a/bin/quilt.in b/bin/quilt.in
index 2e31b93..7a2abfb 100644
--- a/bin/quilt.in
+++ b/bin/quilt.in
@@ -17,7 +17,7 @@ fi
usage()
{
- echo $"Usage: quilt [--trace] [--quiltrc=XX] command [-h] ..."
+ echo $"Usage: quilt [--trace[=verbose]] [--quiltrc=XX] command [-h] ..."
echo $"Commands are:"
quilt_commands \
@@ -68,8 +68,17 @@ do
[ "$QUILTRC" = - ] && unset QUILTRC
shift ;;
# Trace execution of commands
- --trace)
- BASH_OPTS=-x ;;
+ --trace*)
+ BASH_OPTS="${BASH_OPTS:+$BASH_OPTS }-x"
+ case "${1:7}" in
+ '')
+ ;;
+ =verbose)
+ BASH_OPTS="${BASH_OPTS:+$BASH_OPTS }-v" ;;
+ *)
+ command=
+ break ;;
+ esac ;;
*)
args[${#args[@]}]=$1 ;;
esac
diff --git a/po/de.po b/po/de.po
index 777cdeb..9591f05 100644
--- a/po/de.po
+++ b/po/de.po
@@ -12,7 +12,8 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
#: ../bin/quilt.in:20
-msgid "Usage: quilt [--trace] [--quiltrc=XX] command [-h] ..."
+#, fuzzy
+msgid "Usage: quilt [--trace[=verbose]] [--quiltrc=XX] command [-h] ..."
msgstr "Verwendung: quilt [--trace] [--quiltrc=XX] befehl [-h] ..."
#: ../bin/quilt.in:22
@@ -380,15 +381,15 @@ msgstr ""
"Falls der Name bereits mit Bindestrich-Nummer endet, wird die Nummer\n"
"erhöht (z.B. patch.diff, patch-2.diff, patch-3.diff).\n"
-#: ../quilt/fork.in:91
+#: ../quilt/fork.in:92
msgid "Patch %s exists already, please choose a new name\\n"
msgstr "Patch %s existiert bereits, bitte neuen Namen wählen\\n"
-#: ../quilt/fork.in:103
+#: ../quilt/fork.in:104
msgid "Fork of patch %s to patch %s failed\\n"
msgstr "Fehler beim Aufspalten von %s auf %s\\n"
-#: ../quilt/fork.in:109
+#: ../quilt/fork.in:110
msgid "Fork of patch %s created as %s\\n"
msgstr "Neue Version von %s erstellt als %s\\n"
diff --git a/po/fr.po b/po/fr.po
index c3c517e..f5da2e3 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -13,7 +13,8 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
#: ../bin/quilt.in:20
-msgid "Usage: quilt [--trace] [--quiltrc=XX] command [-h] ..."
+#, fuzzy
+msgid "Usage: quilt [--trace[=verbose]] [--quiltrc=XX] command [-h] ..."
msgstr "Usage : quilt [--trace] [--quiltrc=XX] commande [-h] ..."
#: ../bin/quilt.in:22
@@ -388,15 +389,15 @@ msgstr ""
"un tiret et un nombre, ce nombre sera incrment. (ex: patch.diff,\n"
"patch-2.diff, patch-3.diff).\n"
-#: ../quilt/fork.in:91
+#: ../quilt/fork.in:92
msgid "Patch %s exists already, please choose a new name\\n"
msgstr "Le patch %s existe dj, veuillez choisir un nouveau nom.\\n"
-#: ../quilt/fork.in:103
+#: ../quilt/fork.in:104
msgid "Fork of patch %s to patch %s failed\\n"
msgstr "Le fork de %s en %s a chou.\\n"
-#: ../quilt/fork.in:109
+#: ../quilt/fork.in:110
msgid "Fork of patch %s created as %s\\n"
msgstr "Le fork de %s a t cr en tant que %s\\n"
diff --git a/po/ja.po b/po/ja.po
index 24dd4d8..03333fe 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -13,7 +13,8 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
#: ../bin/quilt.in:20
-msgid "Usage: quilt [--trace] [--quiltrc=XX] command [-h] ..."
+#, fuzzy
+msgid "Usage: quilt [--trace[=verbose]] [--quiltrc=XX] command [-h] ..."
msgstr "使い方: quilt [--trace] [--quiltrc=XX] command [-h] ..."
#: ../bin/quilt.in:22
@@ -371,15 +372,15 @@ msgstr ""
"終っている場合、番号の値が1増える (例: patch.diff、patch-2.diff、\n"
"patch-3.diff)。\n"
-#: ../quilt/fork.in:91
+#: ../quilt/fork.in:92
msgid "Patch %s exists already, please choose a new name\\n"
msgstr "パッチ %sはすでに存在します。新しい名前を選んでください\\n"
-#: ../quilt/fork.in:103
+#: ../quilt/fork.in:104
msgid "Fork of patch %s to patch %s failed\\n"
msgstr "パッチ %sからパッチ %sへの分岐に失敗しました\\n"
-#: ../quilt/fork.in:109
+#: ../quilt/fork.in:110
msgid "Fork of patch %s created as %s\\n"
msgstr "パッチ %sの分岐で %sが作成されました\\n"
diff --git a/po/quilt.pot b/po/quilt.pot
index f3c5fa7..c2ce9d9 100644
--- a/po/quilt.pot
+++ b/po/quilt.pot
@@ -1,5 +1,5 @@
#: ../bin/quilt.in:20
-msgid "Usage: quilt [--trace] [--quiltrc=XX] command [-h] ..."
+msgid "Usage: quilt [--trace[=verbose]] [--quiltrc=XX] command [-h] ..."
msgstr ""
#: ../bin/quilt.in:22
@@ -267,15 +267,15 @@ msgid ""
"further incremented (e.g., patch.diff, patch-2.diff, patch-3.diff).\n"
msgstr ""
-#: ../quilt/fork.in:91
+#: ../quilt/fork.in:92
msgid "Patch %s exists already, please choose a new name\\n"
msgstr ""
-#: ../quilt/fork.in:103
+#: ../quilt/fork.in:104
msgid "Fork of patch %s to patch %s failed\\n"
msgstr ""
-#: ../quilt/fork.in:109
+#: ../quilt/fork.in:110
msgid "Fork of patch %s created as %s\\n"
msgstr ""
diff --git a/quilt.changes b/quilt.changes
index d5e320a..f5194ef 100644
--- a/quilt.changes
+++ b/quilt.changes
@@ -1,4 +1,10 @@
-------------------------------------------------------------------
+Mon Sep 13 22:28:21 CEST 2004 - agruen@suse.de
+
+- bin/quilt.in: Add optional verbose modifier to --trace option
+ by request of Dean Roehrich <roehrich@sgi.com>.
+
+-------------------------------------------------------------------
Sun Sep 12 18:33:07 CEST 2004 - agruen@suse.de
- scripts/inspect.in: Run the RPM %prep section in /var/tmp and