Codebase list doclifter / df4df3b
Update patches Fabian Wolff 5 years ago
7 changed file(s) with 55 addition(s) and 83 deletion(s). Raw diff Collapse all Expand all
+5
-0
debian/changelog less more
44 * Upgrade to Standards-Version 4.2.1 (no changes).
55 * Mark doclifter as Multi-Arch: foreign (as recommended by the
66 Multiarch hinter).
7 * Update patches:
8 - Remove patch 'profiler' (no longer applies).
9 - Update patch 'manlifter-outdir' and rename it to
10 00-manlifter-outdir.patch.
11 - Rename patch 'fix-makefile' to 01-fix-makefile.patch.
712
813 -- Fabian Wolff <fabi.wolff@arcor.de> Mon, 03 Sep 2018 11:56:58 +0200
914
+26
-0
debian/patches/00-manlifter-outdir.patch less more
0 Description: Add -o to manlifter
1 The manlifter man page refers to a -o option, but manlifter itself
2 doesn't recognize it. This patch adds the option.
3 Author: Jeff Licquia <licquia@debian.org>
4 Last-Update: 2018-05-13
5 ---
6 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
7 --- a/manlifter
8 +++ b/manlifter
9 @@ -659,6 +659,8 @@
10 makepatch = True
11 elif (switch == '-M'): # Make a patch with specified page
12 patchlift = True
13 + elif (switch == '-o'): # Specify output directory
14 + outdir = val
15 elif (switch == '-p'): # Specify patch directory
16 patchdir = os.path.abspath(val)
17 elif (switch == '-P'):
18 @@ -744,6 +746,6 @@
19 sys.stderr.write("manlifter: can't find doclifter!\n")
20 sys.exit(1)
21 # Gather options
22 - (options, arguments) = getopt.getopt(sys.argv[1:], "d:ef:hI:mMp:Pqs:SvwX:")
23 + (options, arguments) = getopt.getopt(sys.argv[1:], "d:ef:hI:mMop:Pqs:SvwX:")
24 doclifter_driver(options, arguments)
25 # End
+22
-0
debian/patches/01-fix-makefile.patch less more
0 Description: Fix tests/Makefile
1 Author: Fabian Wolff <fabi.wolff@arcor.de>
2 Last-Update: 2018-05-13
3 ---
4 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
5 --- a/tests/Makefile
6 +++ b/tests/Makefile
7 @@ -5,11 +5,11 @@
8 TESTLOADS := $(shell ls *.man | sed '/.man/s///')
9
10 default:
11 - @setpython python2
12 + @./setpython python2
13 @make -e --quiet regress
14 - @setpython python3
15 + @./setpython python3
16 @make -e --quiet regress
17 - @setpython python
18 + @./setpython python
19 @echo "No output (other than testfile stem names) is good news."
20
21 rebuild:
+0
-22
debian/patches/fix-makefile less more
0 Description: Fix tests/Makefile
1 Author: Fabian Wolff <fabi.wolff@arcor.de>
2 Last-Update: 2018-05-13
3 ---
4 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
5 --- a/tests/Makefile
6 +++ b/tests/Makefile
7 @@ -5,11 +5,11 @@
8 TESTLOADS := $(shell ls *.man | sed '/.man/s///')
9
10 default:
11 - @setpython python2
12 + @./setpython python2
13 @make -e --quiet regress
14 - @setpython python3
15 + @./setpython python3
16 @make -e --quiet regress
17 - @setpython python
18 + @./setpython python
19 @echo "No output (other than testfile stem names) is good news."
20
21 rebuild:
+0
-27
debian/patches/manlifter-outdir less more
0 Description: Add -o to manlifter
1 The manlifter man page refers to a -o option, but manlifter itself
2 doesn't recognize it. This patch adds the option.
3 Author: Jeff Licquia <licquia@debian.org>
4 Last-Update: 2018-05-13
5 ---
6 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
7 --- a/manlifter
8 +++ b/manlifter
9 @@ -625,6 +625,8 @@
10 makepatch = True
11 elif (switch == '-M'): # Make a patch with specified page
12 patchlift = True
13 + elif (switch == '-o'): # Specify output directory
14 + outdir = val
15 elif (switch == '-p'): # Specify patch directory
16 patchdir = os.path.abspath(val)
17 elif (switch == '-P'):
18 @@ -706,7 +708,7 @@
19 sys.stderr.write("manlifter: can't find doclifter!\n")
20 sys.exit(1)
21 # Gather options
22 - (options, arguments) = getopt.getopt(sys.argv[1:], "d:ef:hI:mMp:Pqs:SvwX:")
23 + (options, arguments) = getopt.getopt(sys.argv[1:], "d:ef:hI:mMop:Pqs:SvwX:")
24 # Do the real work
25 if "-P" in sys.argv and hotshot:
26 prof = hotshot.Profile("manlifter.prof")
+0
-31
debian/patches/profiler less more
0 Description: Remove dependency on the Python profiler
1 This patch removes the need for a package dependency on python-profiler,
2 which is no longer available in Debian.
3 Author: Jeff Licquia <licquia@debian.org>
4 Forwarded: not-needed
5 Last-Update: 2018-05-13
6 ---
7 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
8 --- a/manlifter
9 +++ b/manlifter
10 @@ -6,7 +6,10 @@
11 # SPDX-License-Identifier: BSD-2-Clause
12
13 import sys, os, getopt, signal, time, re, subprocess, cStringIO, stat
14 -import hotshot, hotshot.stats
15 +try:
16 + import hotshot, hotshot.stats
17 +except ImportError:
18 + hotshot = False
19
20 try:
21 getstatusoutput = subprocess.getstatusoutput
22 @@ -705,7 +708,7 @@
23 # Gather options
24 (options, arguments) = getopt.getopt(sys.argv[1:], "d:ef:hI:mMp:Pqs:SvwX:")
25 # Do the real work
26 - if "-P" in sys.argv:
27 + if "-P" in sys.argv and hotshot:
28 prof = hotshot.Profile("manlifter.prof")
29 prof.runcall(doclifter_driver, options, arguments)
30 prof.close()
+2
-3
debian/patches/series less more
0 profiler
1 manlifter-outdir
2 fix-makefile
0 00-manlifter-outdir.patch
1 01-fix-makefile.patch