[libkate] 02/03: Added 0004-fix-katedj-option-handling.patch to fix option handling problem in KateDJ.

[Petter Reinholdtsen]

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

pere pushed a commit to branch master
in repository libkate.

commit bd0d1c22f211aa1408862cf86f271956cbb30248
Author: Petter Reinholdtsen <pere at hungry.com>
Date:   Tue Feb 16 11:57:12 2016 +0100

    Added 0004-fix-katedj-option-handling.patch to fix option handling problem in KateDJ.
---
 .../patches/0004-fix-katedj-option-handling.patch  | 33 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 2 files changed, 34 insertions(+)

diff --git a/debian/patches/0004-fix-katedj-option-handling.patch b/debian/patches/0004-fix-katedj-option-handling.patch
new file mode 100644
index 0000000..a91ddd9
--- /dev/null
+++ b/debian/patches/0004-fix-katedj-option-handling.patch
@@ -0,0 +1,33 @@
+Description: Fix incorrect option handling int KateDK
+ This patch make sure -V do not trigger "unknown option" warning
+ and get both -V and -h to print what they should.
+Author: Petter Reinholdtsen <pere at hungry.com>
+Forwarded: no
+Reviewed-By: Petter Reinholdtsen <pere at hungry.com>
+Last-Update: 2016-02-16
+
+diff --git a/tools/KateDJ/KateDJ b/tools/KateDJ/KateDJ
+index ae9c7ed..4f2b2cc 100755
+--- a/tools/KateDJ/KateDJ
++++ b/tools/KateDJ/KateDJ
+@@ -8,15 +8,15 @@ stop=False
+ if len(sys.argv)>1:
+   arg=sys.argv[1]
+   if arg=='-V' or arg=='--version':
+-    print kdj_name_version+', a remuxing program for Kate streams.\n'
++    print constants.kdj_name_version+', a remuxing program for Kate streams.\n'
+     stop=True
+-  if arg=='-h' or arg=='--help':
+-    print kdj_name_version+', a remuxing program for Kate streams.\n'
++  elif arg=='-h' or arg=='--help':
++    print constants.kdj_name_version+', a remuxing program for Kate streams.\n'
+     print '\n'+\
+-          kdj_name+' is a remuxing program that allows extracting and decoding Kate tracks\n'+\
++          constants.kdj_name+' is a remuxing program that allows extracting and decoding Kate tracks\n'+\
+           'from an Ogg stream, and recreating that Ogg stream after the Kate streams\n'+\
+           'have been altered.\n'+\
+-          kdj_name+' requires both the Kate tools (kateenc and katedec) and the oggz tools.\n'+\
++          constants.kdj_name+' requires both the Kate tools (kateenc and katedec) and the oggz tools.\n'+\
+           '\n'+\
+           'This is a GUI program. Click the \'Help\' button in the main window for more help.\n'
+     stop=True
diff --git a/debian/patches/series b/debian/patches/series
index 965174a..7086550 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 0001-Fix-tests-check_sizes.c-on-x32.patch
 0002-Disable-Werror-for-automake-to-fix-FTBFS-while-autor.patch
 0003-fix-retval-katedesc_restart.patch
+0004-fix-katedj-option-handling.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-xiph/libkate.git