Package list unrtf / 3d7bd49
Drop most patches, refresh remaining Willi Mann 8 years ago
13 changed file(s) with 71 addition(s) and 303 deletion(s). Raw diff Collapse all Expand all
0 From: Willi Mann <willi@wm1.at>
1 Date: Tue, 25 Dec 2012 19:59:41 +0100
2 Subject: Disable latex test - latex output is broken
3
4 ---
5 tests/Makefile.am | 2 +-
6 1 file changed, 1 insertion(+), 1 deletion(-)
7
8 diff --git a/tests/Makefile.am b/tests/Makefile.am
9 index 25cbe0a..057ff90 100644
10 --- a/tests/Makefile.am
11 +++ b/tests/Makefile.am
12 @@ -1,5 +1,5 @@
13 # executable test scripts to perform
14 -TESTS = test_html.sh test_latex.sh
15 +TESTS = test_html.sh
16
17 # the data set for the tests
18 testdata = \
+0
-22
debian/patches/0001-Fix-manpage-section-specification.patch less more
0 From: Willi Mann <willi@wm1.at>
1 Date: Sun, 23 Dec 2012 17:35:41 +0100
2 Subject: Fix manpage section specification
3
4 This fixes a lintian warning
5 ---
6 doc/unrtf.1 | 2 +-
7 1 file changed, 1 insertion(+), 1 deletion(-)
8
9 diff --git a/doc/unrtf.1 b/doc/unrtf.1
10 index 5623c9c..9970c49 100644
11 --- a/doc/unrtf.1
12 +++ b/doc/unrtf.1
13 @@ -2,7 +2,7 @@
14 .\"
15 .\" Permission is granted to redistribute this file with UnRTF.
16 .\"
17 -.TH UNRTF "GNU UnRTF 0.21.0"
18 +.TH UNRTF 1 "GNU UnRTF 0.21.0"
19 .SH NAME
20 UnRTF \- converts document in RTF format to other formats
21 .SH SYNOPSIS
0 From: Willi Mann <willi@wm1.at>
1 Date: Wed, 26 Dec 2012 10:03:47 +0100
2 Subject: Get fully rid of hardcoded local/lib paths
3
4 ---
5 src/path.h | 1 +
6 1 file changed, 1 insertion(+)
7
8 diff --git a/src/path.h b/src/path.h
9 index e38f52e..00be872 100644
10 --- a/src/path.h
11 +++ b/src/path.h
12 @@ -1,6 +1,7 @@
13 #ifndef _PATH_H_INCLUDED_
14 #define _PATH_H_INCLUDED_
15
16 +#define DEFAULT_UNRTF_SEARCH_PATH PKGDATADIR "/"
17 #define DEFAULT_UNRTF_SEARCH_PATH CONFIG_DIR
18
19 extern char *search_path;
+0
-21
debian/patches/0002-Hand-over-SHAREDIR-via-CPPFLAGS.patch less more
0 From: Willi Mann <willi@wm1.at>
1 Date: Sun, 23 Dec 2012 21:21:46 +0100
2 Subject: Hand over SHAREDIR via CPPFLAGS
3
4 ---
5 src/Makefile.am | 2 ++
6 1 file changed, 2 insertions(+)
7
8 diff --git a/src/Makefile.am b/src/Makefile.am
9 index d6017b3..83b1d34 100644
10 --- a/src/Makefile.am
11 +++ b/src/Makefile.am
12 @@ -3,6 +3,8 @@
13
14 bin_PROGRAMS = unrtf
15
16 +AM_CPPFLAGS = -DPKGDATADIR=\"$(pkgdatadir)\"
17 +
18 unrtf_SOURCES = attr.c attr.h \
19 convert.c convert.h \
20 defs.h \
+0
-21
debian/patches/0003-Make-SHAREDIR-unrtf-default-path-for-output-format-c.patch less more
0 From: Willi Mann <willi@wm1.at>
1 Date: Sun, 23 Dec 2012 21:42:19 +0100
2 Subject: Make $SHAREDIR/unrtf default path for output format configuration
3
4 ---
5 src/main.h | 2 +-
6 1 file changed, 1 insertion(+), 1 deletion(-)
7
8 diff --git a/src/main.h b/src/main.h
9 index 4230d47..a84839b 100644
10 --- a/src/main.h
11 +++ b/src/main.h
12 @@ -47,7 +47,7 @@ extern int no_remap_mode;
13 #include "output.h"
14 #endif
15
16 -#define CONFIG_DIR "/usr/local/lib/unrtf/"
17 +#define CONFIG_DIR PKGDATADIR "/"
18 #define DEFAULT_OUTPUT "html"
19
20 extern OutputPersonality *op;
0 From: Willi Mann <willi@wm1.at>
1 Date: Wed, 26 Dec 2012 10:38:56 +0100
2 Subject: Update test file set to ensure proper cleaning of tests dir
3
4 ---
5 tests/Makefile.am | 3 +++
6 1 file changed, 3 insertions(+)
7
8 diff --git a/tests/Makefile.am b/tests/Makefile.am
9 index 057ff90..d4814c1 100644
10 --- a/tests/Makefile.am
11 +++ b/tests/Makefile.am
12 @@ -18,6 +18,8 @@ testdata = \
13 cp1251-russian-alphabet.rtf \
14 font_size.rtf \
15 font_styles.rtf \
16 + Greek1.rtf \
17 + Greek2.rtf \
18 lists.rtf \
19 paragraph_formatting.rtf \
20 pict.rtf \
21 @@ -25,6 +27,7 @@ testdata = \
22 symbol.rtf \
23 text_color.rtf \
24 text_formatting.rtf \
25 + Turkish.rtf \
26 unicode4.rtf
27
28 # the result set for the html test
+0
-16
debian/patches/0004-Place-output-config-files-in-sharedir-instead-of-lib.patch less more
0 From: Willi Mann <willi@wm1.at>
1 Date: Sun, 23 Dec 2012 21:44:58 +0100
2 Subject: Place output config files in sharedir instead of libdir
3
4 ---
5 outputs/Makefile.am | 2 +-
6 1 file changed, 1 insertion(+), 1 deletion(-)
7
8 diff --git a/outputs/Makefile.am b/outputs/Makefile.am
9 index 055b75e..3ddef1f 100644
10 --- a/outputs/Makefile.am
11 +++ b/outputs/Makefile.am
12 @@ -1,2 +1,2 @@
13 -outputsdir = ${libdir}/${PACKAGE}
14 +outputsdir = ${pkgdatadir}
15 dist_outputs_DATA = html.conf latex.conf rtf.conf text.conf vt.conf
+0
-22
debian/patches/0005-Tell-unrtf-where-to-look-for-output-format-config-fi.patch less more
0 From: Willi Mann <willi@wm1.at>
1 Date: Tue, 25 Dec 2012 19:13:26 +0100
2 Subject: Tell unrtf where to look for output format config files while
3 running tests
4
5 ---
6 tests/Makefile.am | 2 +-
7 1 file changed, 1 insertion(+), 1 deletion(-)
8
9 diff --git a/tests/Makefile.am b/tests/Makefile.am
10 index e0dd83b..86fcd75 100644
11 --- a/tests/Makefile.am
12 +++ b/tests/Makefile.am
13 @@ -61,7 +61,7 @@ CLEANFILES = $(testresults_html) $(testresults_tex)
14 # add the test scripts and the test data to the distributed files
15 EXTRA_DIST = $(TESTS) $(testdata)
16
17 -TESTS_ENVIRONMENT = UNRTF=$(top_builddir)/src/unrtf
18 +TESTS_ENVIRONMENT = UNRTF=$(top_builddir)/src/unrtf UNRTF_SEARCH_PATH=$(top_builddir)/outputs/:$(top_builddir)/charmaps/
19
20 # ensure that the distributed scripts are executable before distribution.
21 # Could be necessary if checking out CVS.
+0
-19
debian/patches/0006-Disable-latex-test-latex-output-is-broken.patch less more
0 From: Willi Mann <willi@wm1.at>
1 Date: Tue, 25 Dec 2012 19:59:41 +0100
2 Subject: Disable latex test - latex output is broken
3
4 ---
5 tests/Makefile.am | 2 +-
6 1 file changed, 1 insertion(+), 1 deletion(-)
7
8 diff --git a/tests/Makefile.am b/tests/Makefile.am
9 index 86fcd75..ea17293 100644
10 --- a/tests/Makefile.am
11 +++ b/tests/Makefile.am
12 @@ -1,5 +1,5 @@
13 # executable test scripts to perform
14 -TESTS = test_html.sh test_latex.sh
15 +TESTS = test_html.sh
16
17 # the data set for the tests
18 testdata = Greek1.rtf Greek2.rtf \
+0
-32
debian/patches/0007-Get-fully-rid-of-hardcoded-local-lib-paths.patch less more
0 From: Willi Mann <willi@wm1.at>
1 Date: Wed, 26 Dec 2012 10:03:47 +0100
2 Subject: Get fully rid of hardcoded local/lib paths
3
4 ---
5 src/my_iconv.h | 2 +-
6 src/path.h | 2 +-
7 2 files changed, 2 insertions(+), 2 deletions(-)
8
9 diff --git a/src/my_iconv.h b/src/my_iconv.h
10 index 1ca8d26..ac42102 100644
11 --- a/src/my_iconv.h
12 +++ b/src/my_iconv.h
13 @@ -10,7 +10,7 @@
14 #define HAVE_ICONV_H
15 #endif
16
17 -#define CHARMAP_DIR "/usr/local/lib/unrtf/charmaps/"
18 +#define CHARMAP_DIR PKGDATADIR "/charmaps/"
19 #define char_table_size 256
20
21 typedef struct
22 diff --git a/src/path.h b/src/path.h
23 index 68a2167..f6c16d0 100644
24 --- a/src/path.h
25 +++ b/src/path.h
26 @@ -1,4 +1,4 @@
27 -#define DEFAULT_UNRTF_SEARCH_PATH "/usr/local/lib/unrtf/"
28 +#define DEFAULT_UNRTF_SEARCH_PATH PKGDATADIR "/"
29
30 char *search_path;
31 int n_path_dirs;
+0
-21
debian/patches/0008-Ensure-that-the-picture-extracted-during-testing-is-.patch less more
0 From: Willi Mann <willi@wm1.at>
1 Date: Wed, 26 Dec 2012 10:12:07 +0100
2 Subject: Ensure that the picture extracted during testing is also cleaned
3
4 ---
5 tests/Makefile.am | 2 +-
6 1 file changed, 1 insertion(+), 1 deletion(-)
7
8 diff --git a/tests/Makefile.am b/tests/Makefile.am
9 index ea17293..4950e05 100644
10 --- a/tests/Makefile.am
11 +++ b/tests/Makefile.am
12 @@ -56,7 +56,7 @@ testresults_tex = Greek1.rtf.tex Greek2.rtf.tex \
13 unicode4.rtf.tex
14
15 # need to wipe out test results on make clean
16 -CLEANFILES = $(testresults_html) $(testresults_tex)
17 +CLEANFILES = $(testresults_html) $(testresults_tex) pict001.wmf
18
19 # add the test scripts and the test data to the distributed files
20 EXTRA_DIST = $(TESTS) $(testdata)
+0
-120
debian/patches/0009-Update-test-file-set-to-ensure-proper-cleaning-of-te.patch less more
0 From: Willi Mann <willi@wm1.at>
1 Date: Wed, 26 Dec 2012 10:38:56 +0100
2 Subject: Update test file set to ensure proper cleaning of tests dir
3
4 ---
5 tests/Makefile.am | 80 ++++++++++++++++++++++++++++++++---------------------
6 1 file changed, 49 insertions(+), 31 deletions(-)
7
8 diff --git a/tests/Makefile.am b/tests/Makefile.am
9 index 4950e05..768a6d7 100644
10 --- a/tests/Makefile.am
11 +++ b/tests/Makefile.am
12 @@ -2,58 +2,76 @@
13 TESTS = test_html.sh
14
15 # the data set for the tests
16 -testdata = Greek1.rtf Greek2.rtf \
17 +testdata = accents.rtf \
18 ascii_decimal.rtf \
19 backslash.rtf \
20 + body.rtf \
21 borders_shading.rtf \
22 braces.rtf \
23 character_formatting.rtf \
24 chars.rtf \
25 columns.rtf \
26 + cp1251-russian-alphabet.rtf \
27 font_size.rtf \
28 font_styles.rtf \
29 + Greek1.rtf \
30 + Greek2.rtf \
31 lists.rtf \
32 paragraph_formatting.rtf \
33 + pict.rtf \
34 symbol.rtf \
35 text_color.rtf \
36 text_formatting.rtf \
37 + Turkish.rtf \
38 unicode4.rtf
39
40 # the result set for the html test
41 -testresults_html = Greek1.rtf.html Greek2.rtf.html \
42 +testresults_html = accents.rtf.html \
43 ascii_decimal.rtf.html \
44 - backslash.rtf.html \
45 - borders_shading.rtf.html \
46 - braces.rtf.html \
47 - character_formatting.rtf.html \
48 - chars.rtf.html \
49 - columns.rtf.html \
50 - font_size.rtf.html \
51 - font_styles.rtf.html \
52 - lists.rtf.html \
53 - paragraph_formatting.rtf.html \
54 - symbol.rtf.html \
55 - text_color.rtf.html \
56 - text_formatting.rtf.html \
57 - unicode4.rtf.html
58 + backslash.rtf.html \
59 + body.rtf.html \
60 + borders_shading.rtf.html \
61 + braces.rtf.html \
62 + character_formatting.rtf.html \
63 + chars.rtf.html \
64 + columns.rtf.html \
65 + cp1251-russian-alphabet.rtf.html \
66 + font_size.rtf.html \
67 + font_styles.rtf.html \
68 + Greek1.rtf.html \
69 + Greek2.rtf.html \
70 + lists.rtf.html \
71 + paragraph_formatting.rtf.html \
72 + pict.rtf.html \
73 + symbol.rtf.html \
74 + text_color.rtf.html \
75 + text_formatting.rtf.html \
76 + Turkish.rtf.html \
77 + unicode4.rtf.html
78
79 # the result set for the latex test
80 -testresults_tex = Greek1.rtf.tex Greek2.rtf.tex \
81 +testresults_tex = accents.rtf.tex \
82 ascii_decimal.rtf.tex \
83 - backslash.rtf.tex \
84 - borders_shading.rtf.tex \
85 - braces.rtf.tex \
86 - character_formatting.rtf.tex \
87 - chars.rtf.tex \
88 - columns.rtf.tex \
89 - font_size.rtf.tex \
90 - font_styles.rtf.tex \
91 - lists.rtf.tex \
92 - paragraph_formatting.rtf.tex \
93 - symbol.rtf.tex \
94 - text_color.rtf.tex \
95 - text_formatting.rtf.tex \
96 - unicode4.rtf.tex
97 + backslash.rtf.tex \
98 + body.rtf.tex \
99 + borders_shading.rtf.tex \
100 + braces.rtf.tex \
101 + character_formatting.rtf.tex \
102 + chars.rtf.tex \
103 + columns.rtf.tex \
104 + cp1251-russian-alphabet.rtf.tex \
105 + font_size.rtf.tex \
106 + font_styles.rtf.tex \
107 + Greek1.rtf.tex \
108 + Greek2.rtf.tex \
109 + lists.rtf.tex \
110 + paragraph_formatting.rtf.tex \
111 + pict.rtf.tex \
112 + symbol.rtf.tex \
113 + text_color.rtf.tex \
114 + text_formatting.rtf.tex \
115 + Turkish.rtf.tex \
116 + unicode4.rtf.tex
117
118 # need to wipe out test results on make clean
119 CLEANFILES = $(testresults_html) $(testresults_tex) pict001.wmf
0 0001-Fix-manpage-section-specification.patch
1 0002-Hand-over-SHAREDIR-via-CPPFLAGS.patch
2 0003-Make-SHAREDIR-unrtf-default-path-for-output-format-c.patch
3 0004-Place-output-config-files-in-sharedir-instead-of-lib.patch
4 0005-Tell-unrtf-where-to-look-for-output-format-config-fi.patch
5 0006-Disable-latex-test-latex-output-is-broken.patch
6 0007-Get-fully-rid-of-hardcoded-local-lib-paths.patch
7 0008-Ensure-that-the-picture-extracted-during-testing-is-.patch
8 0009-Update-test-file-set-to-ensure-proper-cleaning-of-te.patch
0 0001-Disable-latex-test-latex-output-is-broken.patch
1 0002-Get-fully-rid-of-hardcoded-local-lib-paths.patch
2 0003-Update-test-file-set-to-ensure-proper-cleaning-of-te.patch