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

[Alexander Wirt]

Author: formorer
Date: 2010-01-02 10:18:58 +0000 (Sat, 02 Jan 2010)
New Revision: 65

Added:
   trunk/debian/patches/a2x-defaultdirs.patch
Modified:
   trunk/debian/changelog
Log:
Add default dirs to a2x


Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2010-01-02 09:54:44 UTC (rev 64)
+++ trunk/debian/changelog	2010-01-02 10:18:58 UTC (rev 65)
@@ -2,6 +2,8 @@
 
   * New upstream version 
   * Add libxml2-utils to recommends (Closes: #556970)
+  * Patch a2x to get resource dir and icons dir per default
+    (Closes: #559305, #491187)
 
  -- Alexander Wirt <formorer at debian.org>  Sat, 02 Jan 2010 10:11:17 +0100
 

Added: trunk/debian/patches/a2x-defaultdirs.patch
===================================================================
--- trunk/debian/patches/a2x-defaultdirs.patch	                        (rev 0)
+++ trunk/debian/patches/a2x-defaultdirs.patch	2010-01-02 10:18:58 UTC (rev 65)
@@ -0,0 +1,21 @@
+diff -Nur -x '*.orig' -x '*~' asciidoc-8.5.2/a2x.py asciidoc-8.5.2.new/a2x.py
+--- asciidoc-8.5.2/a2x.py	2009-12-07 00:52:05.000000000 +0100
++++ asciidoc-8.5.2.new/a2x.py	2010-01-02 11:12:06.000000000 +0100
+@@ -671,7 +671,7 @@
+         help='use admonition, callout and navigation icons')
+     parser.add_option('--icons-dir',
+         action='store', dest='icons_dir',
+-        default=None, metavar='PATH',
++        default='/etc/asciidoc/images/icons/', metavar='PATH',
+         help='admonition and navigation icon directory')
+     parser.add_option('-k', '--keep-artifacts',
+         action='store_true', dest='keep_artifacts', default=False,
+@@ -686,7 +686,7 @@
+         action='store_true', dest='dry_run', default=False,
+         help='just print the commands that would have been executed')
+     parser.add_option('-r','--resource-dir',
+-        action='append', dest='resource_dirs', default=[],
++        action='append', dest='resource_dirs', default=['/etc/asciidoc'],
+         metavar='PATH',
+         help='directory containing images and stylesheets')
+     #DEPRECATED