[Pkg-asciidoc-commits] r76 - trunk/debian/patches
Alexander Wirt
formorer at alioth.debian.org
Sun Nov 28 08:32:42 UTC 2010
Author: formorer
Date: 2010-11-28 08:32:30 +0000 (Sun, 28 Nov 2010)
New Revision: 76
Added:
trunk/debian/patches/00list
trunk/debian/patches/a2x-defaultdirs.dpatch
trunk/debian/patches/code-filter.py-python-path.dpatch
trunk/debian/patches/normpath-not-realpath.dpatch
trunk/debian/patches/testasciidoc_path.dpatch
trunk/debian/patches/testasciidoc_usage.dpatch
Removed:
trunk/debian/patches/a2x-defaultdirs.patch
trunk/debian/patches/code-filter.py-python-path.patch
trunk/debian/patches/normpath-not-realpath.patch
trunk/debian/patches/testasciidoc_path.patch
trunk/debian/patches/testasciidoc_usage.patch
Log:
Move to dpatch
Added: trunk/debian/patches/00list
===================================================================
--- trunk/debian/patches/00list (rev 0)
+++ trunk/debian/patches/00list 2010-11-28 08:32:30 UTC (rev 76)
@@ -0,0 +1,5 @@
+a2x-defaultdirs.dpatch
+code-filter.py-python-path.dpatch
+normpath-not-realpath.dpatch
+testasciidoc_path.dpatch
+testasciidoc_usage.dpatch
Added: trunk/debian/patches/a2x-defaultdirs.dpatch
===================================================================
--- trunk/debian/patches/a2x-defaultdirs.dpatch (rev 0)
+++ trunk/debian/patches/a2x-defaultdirs.dpatch 2010-11-28 08:32:30 UTC (rev 76)
@@ -0,0 +1,37 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## a2x-defaultdirs.dpatch
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: use the correct resourcedirs
+
+ at DPATCH@
+diff -Nur -x '*.orig' -x '*~' asciidoc-8.6.3//a2x.py asciidoc-8.6.3.new//a2x.py
+--- asciidoc-8.6.3//a2x.py 2010-11-14 00:54:32.000000000 +0100
++++ asciidoc-8.6.3.new//a2x.py 2010-11-27 23:28:58.922601000 +0100
+@@ -764,7 +764,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,
+@@ -779,7 +779,7 @@
+ action='store_true', dest='dry_run', default=False,
+ help='just print the commands that would have been executed')
+ parser.add_option('-r','--resource',
+- action='append', dest='resources', default=[],
++ action='append', dest='resources', default=['/etc/asciidoc'],
+ metavar='PATH',
+ help='resource file or directory containing resource files')
+ parser.add_option('-m', '--resource-manifest',
+@@ -787,7 +787,7 @@
+ help='read resources from FILE')
+ #DEPRECATED
+ parser.add_option('--resource-dir',
+- action='append', dest='resources', default=[],
++ action='append', dest='resources', default=['/etc/asciidoc'],
+ metavar='PATH',
+ help='DEPRECATED: use --resource')
+ #DEPRECATED
Property changes on: trunk/debian/patches/a2x-defaultdirs.dpatch
___________________________________________________________________
Added: svn:executable
+ *
Deleted: trunk/debian/patches/a2x-defaultdirs.patch
===================================================================
--- trunk/debian/patches/a2x-defaultdirs.patch 2010-11-27 22:45:04 UTC (rev 75)
+++ trunk/debian/patches/a2x-defaultdirs.patch 2010-11-28 08:32:30 UTC (rev 76)
@@ -1,30 +0,0 @@
-diff -Nur -x '*.orig' -x '*~' asciidoc-8.6.3//a2x.py asciidoc-8.6.3.new//a2x.py
---- asciidoc-8.6.3//a2x.py 2010-11-14 00:54:32.000000000 +0100
-+++ asciidoc-8.6.3.new//a2x.py 2010-11-27 23:28:58.922601000 +0100
-@@ -764,7 +764,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,
-@@ -779,7 +779,7 @@
- action='store_true', dest='dry_run', default=False,
- help='just print the commands that would have been executed')
- parser.add_option('-r','--resource',
-- action='append', dest='resources', default=[],
-+ action='append', dest='resources', default=['/etc/asciidoc'],
- metavar='PATH',
- help='resource file or directory containing resource files')
- parser.add_option('-m', '--resource-manifest',
-@@ -787,7 +787,7 @@
- help='read resources from FILE')
- #DEPRECATED
- parser.add_option('--resource-dir',
-- action='append', dest='resources', default=[],
-+ action='append', dest='resources', default=['/etc/asciidoc'],
- metavar='PATH',
- help='DEPRECATED: use --resource')
- #DEPRECATED
Added: trunk/debian/patches/code-filter.py-python-path.dpatch
===================================================================
--- trunk/debian/patches/code-filter.py-python-path.dpatch (rev 0)
+++ trunk/debian/patches/code-filter.py-python-path.dpatch 2010-11-28 08:32:30 UTC (rev 76)
@@ -0,0 +1,16 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## code-filter.py-python-path.dpatch
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fix shebang
+
+ at DPATCH@
+diff -Nur -x '*.orig' -x '*~' asciidoc-8.4.4/filters/code/code-filter.py asciidoc-8.4.4.new/filters/code/code-filter.py
+--- asciidoc-8.4.4/filters/code/code-filter.py 2008-12-31 02:37:47.000000000 +0100
++++ asciidoc-8.4.4.new/filters/code/code-filter.py 2009-04-26 13:16:23.000000000 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/python
+ '''
+ NAME
+ code-filter - AsciiDoc filter to highlight language keywords
Property changes on: trunk/debian/patches/code-filter.py-python-path.dpatch
___________________________________________________________________
Added: svn:executable
+ *
Deleted: trunk/debian/patches/code-filter.py-python-path.patch
===================================================================
--- trunk/debian/patches/code-filter.py-python-path.patch 2010-11-27 22:45:04 UTC (rev 75)
+++ trunk/debian/patches/code-filter.py-python-path.patch 2010-11-28 08:32:30 UTC (rev 76)
@@ -1,9 +0,0 @@
-diff -Nur -x '*.orig' -x '*~' asciidoc-8.4.4/filters/code/code-filter.py asciidoc-8.4.4.new/filters/code/code-filter.py
---- asciidoc-8.4.4/filters/code/code-filter.py 2008-12-31 02:37:47.000000000 +0100
-+++ asciidoc-8.4.4.new/filters/code/code-filter.py 2009-04-26 13:16:23.000000000 +0200
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/python
- '''
- NAME
- code-filter - AsciiDoc filter to highlight language keywords
Added: trunk/debian/patches/normpath-not-realpath.dpatch
===================================================================
--- trunk/debian/patches/normpath-not-realpath.dpatch (rev 0)
+++ trunk/debian/patches/normpath-not-realpath.dpatch 2010-11-28 08:32:30 UTC (rev 76)
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## normpath-not-realpath.dpatch
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: fixes a python bug with normpath
+
+ at DPATCH@
+diff -Nur -x '*.orig' -x '*~' asciidoc-8.4.4/asciidoc.py asciidoc-8.4.4.new/asciidoc.py
+--- asciidoc-8.4.4/asciidoc.py 2009-04-26 01:03:14.000000000 +0200
++++ asciidoc-8.4.4.new/asciidoc.py 2009-04-26 13:18:43.000000000 +0200
+@@ -195,7 +195,7 @@
+ else:
+ assert os.path.isdir(directory)
+ directory = os.path.realpath(directory)
+- fname = os.path.realpath(fname)
++ fname = os.path.normpath(fname)
+ return os.path.commonprefix((directory, fname)) == directory
+
+ def safe():
Property changes on: trunk/debian/patches/normpath-not-realpath.dpatch
___________________________________________________________________
Added: svn:executable
+ *
Deleted: trunk/debian/patches/normpath-not-realpath.patch
===================================================================
--- trunk/debian/patches/normpath-not-realpath.patch 2010-11-27 22:45:04 UTC (rev 75)
+++ trunk/debian/patches/normpath-not-realpath.patch 2010-11-28 08:32:30 UTC (rev 76)
@@ -1,12 +0,0 @@
-diff -Nur -x '*.orig' -x '*~' asciidoc-8.4.4/asciidoc.py asciidoc-8.4.4.new/asciidoc.py
---- asciidoc-8.4.4/asciidoc.py 2009-04-26 01:03:14.000000000 +0200
-+++ asciidoc-8.4.4.new/asciidoc.py 2009-04-26 13:18:43.000000000 +0200
-@@ -195,7 +195,7 @@
- else:
- assert os.path.isdir(directory)
- directory = os.path.realpath(directory)
-- fname = os.path.realpath(fname)
-+ fname = os.path.normpath(fname)
- return os.path.commonprefix((directory, fname)) == directory
-
- def safe():
Added: trunk/debian/patches/testasciidoc_path.dpatch
===================================================================
--- trunk/debian/patches/testasciidoc_path.dpatch (rev 0)
+++ trunk/debian/patches/testasciidoc_path.dpatch 2010-11-28 08:32:30 UTC (rev 76)
@@ -0,0 +1,20 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## testasciidoc_path.dpatch by Alexander Wirt <formorer at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Help testasciidoc to find its libs
+
+ at DPATCH@
+diff -Nur -x '*.orig' -x '*~' asciidoc-8.5.2/tests/testasciidoc.py asciidoc-8.5.2.new/tests/testasciidoc.py
+--- asciidoc-8.5.2/tests/testasciidoc.py 2009-05-25 07:35:56.000000000 +0200
++++ asciidoc-8.5.2.new/tests/testasciidoc.py 2010-01-02 11:22:56.000000000 +0100
+@@ -22,6 +22,9 @@
+
+
+ import os, sys, re, StringIO, difflib
++
++sys.path.append('/usr/share/asciidoc/')
++
+ import asciidocapi
+
+
Property changes on: trunk/debian/patches/testasciidoc_path.dpatch
___________________________________________________________________
Added: svn:executable
+ *
Deleted: trunk/debian/patches/testasciidoc_path.patch
===================================================================
--- trunk/debian/patches/testasciidoc_path.patch 2010-11-27 22:45:04 UTC (rev 75)
+++ trunk/debian/patches/testasciidoc_path.patch 2010-11-28 08:32:30 UTC (rev 76)
@@ -1,13 +0,0 @@
-diff -Nur -x '*.orig' -x '*~' asciidoc-8.5.2/tests/testasciidoc.py asciidoc-8.5.2.new/tests/testasciidoc.py
---- asciidoc-8.5.2/tests/testasciidoc.py 2009-05-25 07:35:56.000000000 +0200
-+++ asciidoc-8.5.2.new/tests/testasciidoc.py 2010-01-02 11:22:56.000000000 +0100
-@@ -22,6 +22,9 @@
-
-
- import os, sys, re, StringIO, difflib
-+
-+sys.path.append('/usr/share/asciidoc/')
-+
- import asciidocapi
-
-
Added: trunk/debian/patches/testasciidoc_usage.dpatch
===================================================================
--- trunk/debian/patches/testasciidoc_usage.dpatch (rev 0)
+++ trunk/debian/patches/testasciidoc_usage.dpatch 2010-11-28 08:32:30 UTC (rev 76)
@@ -0,0 +1,36 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## testasciidoc_usage.dpatch by Alexander Wirt <formorer at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: remove .py extension for usage and tell it where the conf is
+
+ at DPATCH@
+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':
Property changes on: trunk/debian/patches/testasciidoc_usage.dpatch
___________________________________________________________________
Added: svn:executable
+ *
Deleted: trunk/debian/patches/testasciidoc_usage.patch
===================================================================
--- trunk/debian/patches/testasciidoc_usage.patch 2010-11-27 22:45:04 UTC (rev 75)
+++ trunk/debian/patches/testasciidoc_usage.patch 2010-11-28 08:32:30 UTC (rev 76)
@@ -1,29 +0,0 @@
-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':
More information about the Pkg-asciidoc-commits
mailing list