Control: tags 729235 + patch Hi,
Please find attached the patch to apply to get rid of the lintian errors and the warning about standard version. This includes a migration from dpatch patching system (deprecated) to quilt 3.0. Tested the build and the installation without any issue. This patch applies to the 8.6.9-1 version uploaded yesterday to unstable. Best regards, Joseph
diff -Nru asciidoc-8.6.9/debian/changelog asciidoc-8.6.9/debian/changelog --- asciidoc-8.6.9/debian/changelog 2013-11-10 17:50:10.000000000 +0100 +++ asciidoc-8.6.9/debian/changelog 2013-11-10 17:18:57.000000000 +0100 @@ -1,3 +1,14 @@ +asciidoc (8.6.9-1.1) unstable; urgency=low + + * Non-maintainer upload. + * Updating Debian Policy to 3.9.4 (Lintian warning) + * dding the buiddepend-indep of python-support to get rid of + python-depends-but-no-python-helper lintina error + * Migrating from dpatch to quilt using deb3 to avoid the + build-depends-on-obsolete-package lintian error + + -- Joseph HERLANT <[email protected]> Sun, 10 Nov 2013 15:35:31 +0100 + asciidoc (8.6.9-1) unstable; urgency=low * [cf6d717] Depend on dpkg-maintscript-helper for removing conffiles diff -Nru asciidoc-8.6.9/debian/control asciidoc-8.6.9/debian/control --- asciidoc-8.6.9/debian/control 2013-11-10 17:50:10.000000000 +0100 +++ asciidoc-8.6.9/debian/control 2013-11-10 17:18:21.000000000 +0100 @@ -3,9 +3,9 @@ Priority: optional Maintainer: Fredrik Steen <[email protected]> Uploaders: Alexander Wirt <[email protected]> -Build-Depends: debhelper (>= 7.0.50), dpatch -Build-Depends-Indep: python (>= 2.4), xmlto -Standards-Version: 3.9.2 +Build-Depends: debhelper (>= 7.0.50), quilt (>= 0.46-7) +Build-Depends-Indep: python (>= 2.4), xmlto, python-support +Standards-Version: 3.9.4 Vcs-Browser: http://git.debian.org/?p=pkg-asciidoc/pkg-asciidoc.git Vcs-Git: git://git.debian.org/pkg-asciidoc/pkg-asciidoc.git Homepage: http://www.methods.co.nz/asciidoc/ diff -Nru asciidoc-8.6.9/debian/patches/00list asciidoc-8.6.9/debian/patches/00list --- asciidoc-8.6.9/debian/patches/00list 2013-11-10 17:50:10.000000000 +0100 +++ asciidoc-8.6.9/debian/patches/00list 1970-01-01 01:00:00.000000000 +0100 @@ -1,6 +0,0 @@ -code-filter.py-python-path.dpatch -normpath-not-realpath.dpatch -testasciidoc_path.dpatch -testasciidoc_usage.dpatch -#enhance_asciidoc_manpage.dpatch -fix_asciidoc_api_doc.dpatch diff -Nru asciidoc-8.6.9/debian/patches/a2x-defaultdirs.dpatch asciidoc-8.6.9/debian/patches/a2x-defaultdirs.dpatch --- asciidoc-8.6.9/debian/patches/a2x-defaultdirs.dpatch 2013-11-10 17:50:10.000000000 +0100 +++ asciidoc-8.6.9/debian/patches/a2x-defaultdirs.dpatch 1970-01-01 01:00:00.000000000 +0100 @@ -1,37 +0,0 @@ -#! /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 - -@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 diff -Nru asciidoc-8.6.9/debian/patches/code-filter.py-python-path.dpatch asciidoc-8.6.9/debian/patches/code-filter.py-python-path.dpatch --- asciidoc-8.6.9/debian/patches/code-filter.py-python-path.dpatch 2013-11-10 17:50:10.000000000 +0100 +++ asciidoc-8.6.9/debian/patches/code-filter.py-python-path.dpatch 1970-01-01 01:00:00.000000000 +0100 @@ -1,16 +0,0 @@ -#! /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 - -@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 diff -Nru asciidoc-8.6.9/debian/patches/code-filter.py-python-path.patch asciidoc-8.6.9/debian/patches/code-filter.py-python-path.patch --- asciidoc-8.6.9/debian/patches/code-filter.py-python-path.patch 1970-01-01 01:00:00.000000000 +0100 +++ asciidoc-8.6.9/debian/patches/code-filter.py-python-path.patch 2013-11-10 15:46:49.000000000 +0100 @@ -0,0 +1,10 @@ +Author: +Description: Fix shebang +--- a/filters/code/code-filter.py ++++ b/filters/code/code-filter.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/python + ''' + NAME + code-filter - AsciiDoc filter to highlight language keywords diff -Nru asciidoc-8.6.9/debian/patches/enhance_asciidoc_manpage.dpatch asciidoc-8.6.9/debian/patches/enhance_asciidoc_manpage.dpatch --- asciidoc-8.6.9/debian/patches/enhance_asciidoc_manpage.dpatch 2013-11-10 17:50:10.000000000 +0100 +++ asciidoc-8.6.9/debian/patches/enhance_asciidoc_manpage.dpatch 1970-01-01 01:00:00.000000000 +0100 @@ -1,29 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## enhance_asciidoc_manpage.dpatch by Alexander Wirt <[email protected]> -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: No description. - -@DPATCH@ -diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' asciidoc-8.6.4~/doc/asciidoc.1.txt asciidoc-8.6.4/doc/asciidoc.1.txt ---- asciidoc-8.6.4~/doc/asciidoc.1.txt 2011-02-19 23:55:46.000000000 +0100 -+++ asciidoc-8.6.4/doc/asciidoc.1.txt 2011-02-20 09:02:56.803772922 +0100 -@@ -17,6 +17,7 @@ - ----------- - The asciidoc(1) command translates the AsciiDoc text file 'FILE' to - DocBook or HTML. If 'FILE' is '-' then the standard input is used. -+See also a2x(1) which can convert e.g. to PDF and and manual page formats. - - - OPTIONS -@@ -151,6 +152,10 @@ - See the AsciiDoc distribution BUGS file. - - -+SEE ALSO -+-------- -+a2x(1) -+ - AUTHOR - ------ - AsciiDoc was originally written by Stuart Rackham. Many people have diff -Nru asciidoc-8.6.9/debian/patches/fix_asciidoc_api_doc.dpatch asciidoc-8.6.9/debian/patches/fix_asciidoc_api_doc.dpatch --- asciidoc-8.6.9/debian/patches/fix_asciidoc_api_doc.dpatch 2013-11-10 17:50:10.000000000 +0100 +++ asciidoc-8.6.9/debian/patches/fix_asciidoc_api_doc.dpatch 1970-01-01 01:00:00.000000000 +0100 @@ -1,59 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## fix_asciidoc_api_doc.dpatch by Alexander Wirt <[email protected]> -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: No description. - -@DPATCH@ -diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' asciidoc-8.6.3~/asciidocapi.py asciidoc-8.6.3/asciidocapi.py ---- asciidoc-8.6.3~/asciidocapi.py 2010-02-06 04:19:59.000000000 +0100 -+++ asciidoc-8.6.3/asciidocapi.py 2010-11-28 14:09:07.002140339 +0100 -@@ -5,6 +5,8 @@ - The AsciiDocAPI class provides an API for executing asciidoc. Minimal example - compiles `mydoc.txt` to `mydoc.html`: - -+ import sys -+ sys.path.append("/usr/share/asciidoc") - import asciidocapi - asciidoc = asciidocapi.AsciiDocAPI() - asciidoc.execute('mydoc.txt') -@@ -17,6 +19,8 @@ - 1. Check execution: - - >>> import StringIO -+ >>> import sys -+ >>> sys.path.append("/usr/share/asciidoc") - >>> infile = StringIO.StringIO('Hello *{author}*') - >>> outfile = StringIO.StringIO() - >>> asciidoc = AsciiDocAPI() -@@ -36,6 +40,8 @@ - 2. Check error handling: - - >>> import StringIO -+ >>> import sys -+ >>> sys.path.append("/usr/share/asciidoc") - >>> asciidoc = AsciiDocAPI() - >>> infile = StringIO.StringIO('---------') - >>> outfile = StringIO.StringIO() -diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' asciidoc-8.6.3~/doc/asciidocapi.txt asciidoc-8.6.3/doc/asciidocapi.txt ---- asciidoc-8.6.3~/doc/asciidocapi.txt 2009-05-26 01:37:47.000000000 +0200 -+++ asciidoc-8.6.3/doc/asciidocapi.txt 2010-11-28 14:10:00.369795845 +0100 -@@ -44,6 +44,8 @@ - - [source,python] - ------------------------------------------------------------------------------- -+import sys -+sys.path.append("/usr/share/asciidoc") - from asciidocapi import AsciiDocAPI - asciidoc = AsciiDocAPI() - asciidoc.execute('mydoc.txt') -@@ -57,6 +59,8 @@ - [GCC 4.2.3 (Ubuntu 4.2.3-2ubuntu7)] on linux2 - Type "help", "copyright", "credits" or "license" for more information. - >>> from asciidocapi import AsciiDocAPI -+>>> import sys -+>>> sys.path.append("/usr/share/asciidoc") - >>> import StringIO - >>> infile = StringIO.StringIO('Hello *{author}*') - >>> outfile = StringIO.StringIO() - diff -Nru asciidoc-8.6.9/debian/patches/fix_asciidoc_api_doc.patch asciidoc-8.6.9/debian/patches/fix_asciidoc_api_doc.patch --- asciidoc-8.6.9/debian/patches/fix_asciidoc_api_doc.patch 1970-01-01 01:00:00.000000000 +0100 +++ asciidoc-8.6.9/debian/patches/fix_asciidoc_api_doc.patch 2013-11-10 16:51:23.000000000 +0100 @@ -0,0 +1,55 @@ +Author: Alexander Wirt <[email protected]> +Description: No description. +Index: asciidoc-8.6.9/asciidocapi.py +=================================================================== +--- asciidoc-8.6.9.orig/asciidocapi.py 2013-11-10 16:00:31.000000000 +0100 ++++ asciidoc-8.6.9/asciidocapi.py 2013-11-10 16:47:40.000000000 +0100 +@@ -5,6 +5,8 @@ + The AsciiDocAPI class provides an API for executing asciidoc. Minimal example + compiles `mydoc.txt` to `mydoc.html`: + ++ import sys ++ sys.path.append("/usr/share/asciidoc") + import asciidocapi + asciidoc = asciidocapi.AsciiDocAPI() + asciidoc.execute('mydoc.txt') +@@ -17,6 +19,8 @@ + 1. Check execution: + + >>> import StringIO ++ >>> import sys ++ >>> sys.path.append("/usr/share/asciidoc") + >>> infile = StringIO.StringIO('Hello *{author}*') + >>> outfile = StringIO.StringIO() + >>> asciidoc = AsciiDocAPI() +@@ -36,6 +40,8 @@ + 2. Check error handling: + + >>> import StringIO ++ >>> import sys ++ >>> sys.path.append("/usr/share/asciidoc") + >>> asciidoc = AsciiDocAPI() + >>> infile = StringIO.StringIO('---------') + >>> outfile = StringIO.StringIO() +Index: asciidoc-8.6.9/doc/asciidocapi.txt +=================================================================== +--- asciidoc-8.6.9.orig/doc/asciidocapi.txt 2013-11-10 16:00:31.000000000 +0100 ++++ asciidoc-8.6.9/doc/asciidocapi.txt 2013-11-10 16:47:40.000000000 +0100 +@@ -44,6 +44,8 @@ + + [source,python] + ------------------------------------------------------------------------------- ++import sys ++sys.path.append("/usr/share/asciidoc") + from asciidocapi import AsciiDocAPI + asciidoc = AsciiDocAPI() + asciidoc.execute('mydoc.txt') +@@ -57,6 +59,8 @@ + [GCC 4.2.3 (Ubuntu 4.2.3-2ubuntu7)] on linux2 + Type "help", "copyright", "credits" or "license" for more information. + >>> from asciidocapi import AsciiDocAPI ++>>> import sys ++>>> sys.path.append("/usr/share/asciidoc") + >>> import StringIO + >>> infile = StringIO.StringIO('Hello *{author}*') + >>> outfile = StringIO.StringIO() diff -Nru asciidoc-8.6.9/debian/patches/normpath-not-realpath.dpatch asciidoc-8.6.9/debian/patches/normpath-not-realpath.dpatch --- asciidoc-8.6.9/debian/patches/normpath-not-realpath.dpatch 2013-11-10 17:50:10.000000000 +0100 +++ asciidoc-8.6.9/debian/patches/normpath-not-realpath.dpatch 1970-01-01 01:00:00.000000000 +0100 @@ -1,19 +0,0 @@ -#! /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 - -@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(): diff -Nru asciidoc-8.6.9/debian/patches/normpath-not-realpath.patch asciidoc-8.6.9/debian/patches/normpath-not-realpath.patch --- asciidoc-8.6.9/debian/patches/normpath-not-realpath.patch 1970-01-01 01:00:00.000000000 +0100 +++ asciidoc-8.6.9/debian/patches/normpath-not-realpath.patch 2013-11-10 15:46:50.000000000 +0100 @@ -0,0 +1,13 @@ +Author: +Description: fixes a python bug with normpath +--- a/asciidoc.py ++++ b/asciidoc.py +@@ -252,7 +252,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(): diff -Nru asciidoc-8.6.9/debian/patches/series asciidoc-8.6.9/debian/patches/series --- asciidoc-8.6.9/debian/patches/series 1970-01-01 01:00:00.000000000 +0100 +++ asciidoc-8.6.9/debian/patches/series 2013-11-10 17:10:20.000000000 +0100 @@ -0,0 +1,5 @@ +code-filter.py-python-path.patch +normpath-not-realpath.patch +testasciidoc_path.patch +testasciidoc_usage.patch +fix_asciidoc_api_doc.patch diff -Nru asciidoc-8.6.9/debian/patches/testasciidoc_path.dpatch asciidoc-8.6.9/debian/patches/testasciidoc_path.dpatch --- asciidoc-8.6.9/debian/patches/testasciidoc_path.dpatch 2013-11-10 17:50:10.000000000 +0100 +++ asciidoc-8.6.9/debian/patches/testasciidoc_path.dpatch 1970-01-01 01:00:00.000000000 +0100 @@ -1,19 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## testasciidoc_path.dpatch by Alexander Wirt <[email protected]> -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: Help testasciidoc to find its libs - -@DPATCH@ -diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' pkg-asciidoc~/tests/testasciidoc.py pkg-asciidoc/tests/testasciidoc.py ---- pkg-asciidoc~/tests/testasciidoc.py 2012-03-18 17:06:06.000000000 +0100 -+++ pkg-asciidoc/tests/testasciidoc.py 2012-03-31 09:28:05.753443111 +0200 -@@ -23,6 +23,8 @@ - - import os, sys, re, difflib - -+sys.path.append('/usr/share/asciidoc/') -+ - if sys.platform[:4] == 'java': - # Jython cStringIO is more compatible with CPython StringIO. - import cStringIO as StringIO diff -Nru asciidoc-8.6.9/debian/patches/testasciidoc_path.patch asciidoc-8.6.9/debian/patches/testasciidoc_path.patch --- asciidoc-8.6.9/debian/patches/testasciidoc_path.patch 1970-01-01 01:00:00.000000000 +0100 +++ asciidoc-8.6.9/debian/patches/testasciidoc_path.patch 2013-11-10 15:46:51.000000000 +0100 @@ -0,0 +1,13 @@ +Author: Alexander Wirt <[email protected]> +Description: Help testasciidoc to find its libs +--- a/tests/testasciidoc.py ++++ b/tests/testasciidoc.py +@@ -23,6 +23,8 @@ + + import os, sys, re, difflib + ++sys.path.append('/usr/share/asciidoc/') ++ + if sys.platform[:4] == 'java': + # Jython cStringIO is more compatible with CPython StringIO. + import cStringIO as StringIO diff -Nru asciidoc-8.6.9/debian/patches/testasciidoc_usage.dpatch asciidoc-8.6.9/debian/patches/testasciidoc_usage.dpatch --- asciidoc-8.6.9/debian/patches/testasciidoc_usage.dpatch 2013-11-10 17:50:10.000000000 +0100 +++ asciidoc-8.6.9/debian/patches/testasciidoc_usage.dpatch 1970-01-01 01:00:00.000000000 +0100 @@ -1,36 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## testasciidoc_usage.dpatch by Alexander Wirt <[email protected]> -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: remove .py extension for usage and tell it where the conf is - -@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': diff -Nru asciidoc-8.6.9/debian/patches/testasciidoc_usage.patch asciidoc-8.6.9/debian/patches/testasciidoc_usage.patch --- asciidoc-8.6.9/debian/patches/testasciidoc_usage.patch 1970-01-01 01:00:00.000000000 +0100 +++ asciidoc-8.6.9/debian/patches/testasciidoc_usage.patch 2013-11-10 15:46:51.000000000 +0100 @@ -0,0 +1,30 @@ +Author: Alexander Wirt <[email protected]> +Description: remove .py extension for usage and tell it where the conf is +--- a/tests/testasciidoc.py ++++ b/tests/testasciidoc.py +@@ -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''' + +@@ -385,7 +385,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': diff -Nru asciidoc-8.6.9/debian/README.source asciidoc-8.6.9/debian/README.source --- asciidoc-8.6.9/debian/README.source 2013-11-10 17:50:10.000000000 +0100 +++ asciidoc-8.6.9/debian/README.source 2013-11-10 16:26:03.000000000 +0100 @@ -1,38 +1,5 @@ -This package uses dpatch to manage all modifications to the upstream -source. Changes are stored in the source package as diffs in -debian/patches and applied during the build. +This package uses quilt to manage all modifications to the upstream source. +Changes are stored in the source package as diffs in debian/patches and +applied during the build. -To get the fully patched source after unpacking the source package, cd -to the root level of the source package and run: - - debian/rules patch - -Removing a patch is as simple as removing its entry from the -debian/patches/00list file, and please also remove the patch file -itself. - -Creating a new patch is done with "dpatch-edit-patch patch XX_patchname" -where you should replace XX with a new number and patchname with a -descriptive shortname of the patch. You can then simply edit all the -files your patch wants to edit, and then simply "exit 0" from the shell -to actually create the patch file. - -To tweak an already existing patch, call "dpatch-edit-patch XX_patchname" -and replace XX_patchname with the actual filename from debian/patches -you want to use. - -To clean up afterwards again, "debian/rules unpatch" will do the -work for you - or you can of course choose to call -"fakeroot debian/rules clean" all together. - - ---- - -this documentation is part of dpatch package, and may be used by -packages using dpatch to comply with policy on README.source. This -documentation is meant to be useful to users who are not proficient in -dpatch in doing work with dpatch-based packages. Please send any -improvements to the BTS of dpatch package. - -original text by Gerfried Fuchs, edited by Junichi Uekawa <[email protected]> -10 Aug 2008. +See /usr/share/doc/quilt/README.source for a detailed explanation. diff -Nru asciidoc-8.6.9/debian/rules asciidoc-8.6.9/debian/rules --- asciidoc-8.6.9/debian/rules 2013-11-10 17:50:10.000000000 +0100 +++ asciidoc-8.6.9/debian/rules 2013-11-10 17:48:48.000000000 +0100 @@ -7,16 +7,20 @@ # This special exception was added by Craig Small in version 0.37 of dh-make. # Uncomment this to turn on verbose mode. - -include /usr/share/dpatch/dpatch.make - export DH_VERBOSE=0 +# include /usr/share/dpatch/dpatch.make +# include /usr/share/quilt/quilt.make -build: patch-stamp +%: + dh $@ --with quilt -clean: unpatch +# build: build-stamp +# build-stamp: $(QUILT_STAMPFN) + +# clean: unpatch +clean: -rm config.log -rm Makefile -rm config.status @@ -45,5 +49,3 @@ override_dh_compress: dh_compress -X.txt -%: - dh $@ diff -Nru asciidoc-8.6.9/debian/source/format asciidoc-8.6.9/debian/source/format --- asciidoc-8.6.9/debian/source/format 1970-01-01 01:00:00.000000000 +0100 +++ asciidoc-8.6.9/debian/source/format 2013-11-10 15:46:48.000000000 +0100 @@ -0,0 +1 @@ +3.0 (quilt)
