[Pkg-asciidoc-commits] r67 - in trunk/debian: . patches

[Alexander Wirt]

Author: formorer
Date: 2010-01-02 10:32:52 +0000 (Sat, 02 Jan 2010)
New Revision: 67

Added:
   trunk/debian/patches/testasciidoc_usage.patch
Modified:
   trunk/debian/asciidoc.install
Log:
Add config and fix usage output


Modified: trunk/debian/asciidoc.install
===================================================================
--- trunk/debian/asciidoc.install	2010-01-02 10:26:11 UTC (rev 66)
+++ trunk/debian/asciidoc.install	2010-01-02 10:32:52 UTC (rev 67)
@@ -1,4 +1,5 @@
 *.conf /etc/asciidoc/
+tests/testasciidoc.conf /etc/asciidoc/
 
 debian/asciidoc.yaml /usr/share/vim/registry
 stylesheets /etc/asciidoc/

Added: trunk/debian/patches/testasciidoc_usage.patch
===================================================================
--- trunk/debian/patches/testasciidoc_usage.patch	                        (rev 0)
+++ trunk/debian/patches/testasciidoc_usage.patch	2010-01-02 10:32:52 UTC (rev 67)
@@ -0,0 +1,29 @@
+diff -Nur -x '*.orig' -x '*~' asciidoc-8.5.2.obsolete.0.391026079728366/tests/testasciidoc.py asciidoc-8.5.2.obsolete.0.391026079728366.new/tests/testasciidoc.py
+--- asciidoc-8.5.2.obsolete.0.391026079728366/tests/testasciidoc.py	2010-01-02 11:29:22.000000000 +0100
++++ asciidoc-8.5.2.obsolete.0.391026079728366.new/tests/testasciidoc.py	2010-01-02 11:30:39.000000000 +0100
+@@ -1,6 +1,6 @@
+ #!/usr/bin/env python
+ 
+-USAGE = '''Usage: testasciidoc.py [OPTIONS] COMMAND
++USAGE = '''Usage: testasciidoc [OPTIONS] COMMAND
+ 
+ Run AsciiDoc conformance tests specified in configuration FILE.
+ 
+@@ -12,7 +12,7 @@
+ Options:
+   -f, --conf-file=CONF_FILE
+         Use configuration file CONF_FILE (default configuration file is
+-        testasciidoc.conf in testasciidoc.py directory)
++        /etc/asciidoc/testasciidoc.conf)
+   --force
+         Update all test data overwriting existing data'''
+ 
+@@ -377,7 +377,7 @@
+     if len(args) == 0:
+         usage()
+         sys.exit(1)
+-    conffile = os.path.join(os.path.dirname(sys.argv[0]), 'testasciidoc.conf')
++    conffile = '/etc/asciidoc/testasciidoc.conf'
+     force = False
+     for o,v in opts:
+         if o == '--force':