1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
|
The Debian packaging of OCRmyPDF is maintained using dgit. For the
sake of an efficient workflow, Debian modifications to the upstream
source are squashed into a single diff, rather than a series of quilt
patches. To obtain a patch queue for package version 1.2.3-1:
# apt-get install dgit
% dgit clone ocrmypdf
% cd ocrmypdf
% git log --oneline 1.2.3..debian/1.2.3-1 -- . ':!debian'
See dgit(1), dgit(7) and dgit-maint-merge(7) for more information.
Index: ocrmypdf-16.1.2/docs/conf.py
===================================================================
Index: ocrmypdf-16.1.2/docs/index.rst
===================================================================
Index: ocrmypdf-16.1.2/pyproject.toml
===================================================================
Index: ocrmypdf-16.1.2/src/ocrmypdf/cli.py
===================================================================
--- ocrmypdf-16.7.0+dfsg1.orig/docs/conf.py
+++ ocrmypdf-16.7.0+dfsg1/docs/conf.py
@@ -99,7 +99,7 @@ if on_rtd:
# The full version, including alpha/beta/rc tags.
-release = package_version('ocrmypdf')
+release = os.environ['DEB_VERSION_UPSTREAM']
version = '.'.join(release.split('.')[:2])
--- ocrmypdf-16.7.0+dfsg1.orig/docs/index.rst
+++ ocrmypdf-16.7.0+dfsg1/docs/index.rst
@@ -19,7 +19,6 @@ image processing and OCR (recognized, se
introduction
release_notes
- installation
languages
jbig2
--- ocrmypdf-16.7.0+dfsg1.orig/pyproject.toml
+++ ocrmypdf-16.7.0+dfsg1/pyproject.toml
@@ -105,7 +105,6 @@ exclude_lines = [
minversion = "6.0"
norecursedirs = ["lib", ".pc", ".git", "venv", "output", "cache", "resources"]
testpaths = ["tests"]
-addopts = "-n auto"
markers = ["slow"]
filterwarnings = [
"ignore:.*XMLParser.*:DeprecationWarning",
--- ocrmypdf-16.7.0+dfsg1.orig/src/ocrmypdf/cli.py
+++ ocrmypdf-16.7.0+dfsg1/src/ocrmypdf/cli.py
@@ -143,7 +143,7 @@ minimize the number of changes made to y
If OCRmyPDF is given an image file as input, it will attempt to convert the
image to a PDF before processing. For more control over the conversion of
-images to PDF, use the Python package img2pdf or other image to PDF software.
+images to PDF, use img2pdf, or other image to PDF software.
For example, this command uses img2pdf to convert all .png files beginning
with the 'page' prefix to a PDF, fitting each image on A4-sized paper, and
@@ -151,8 +151,9 @@ sending the result to OCRmyPDF through a
img2pdf --pagesize A4 page*.png | ocrmypdf - myfile.pdf
-Online documentation is located at:
- https://ocrmypdf.readthedocs.io/en/latest/introduction.html
+HTML documentation is located at:
+ /usr/share/doc/ocrmypdf/html/index.html
+after installing the ocrmypdf-doc package.
""",
)
--- ocrmypdf-16.7.0+dfsg1.orig/src/ocrmypdf/__main__.py
+++ ocrmypdf-16.7.0+dfsg1/src/ocrmypdf/__main__.py
@@ -79,5 +79,6 @@ def run(args=None):
if __name__ == '__main__':
multiprocessing.freeze_support()
if os.name == 'posix':
- multiprocessing.set_start_method('forkserver')
+ with suppress(RuntimeError):
+ multiprocessing.set_start_method('forkserver')
sys.exit(run())
|
