diff --git a/debian/patches/0001-Disable-latex-test-latex-output-is-broken.patch b/debian/patches/0001-Disable-latex-test-latex-output-is-broken.patch new file mode 100644 index 0000000..b3983a2 --- /dev/null +++ b/debian/patches/0001-Disable-latex-test-latex-output-is-broken.patch @@ -0,0 +1,19 @@ +From: Willi Mann +Date: Tue, 25 Dec 2012 19:59:41 +0100 +Subject: Disable latex test - latex output is broken + +--- + tests/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tests/Makefile.am b/tests/Makefile.am +index 25cbe0a..057ff90 100644 +--- a/tests/Makefile.am ++++ b/tests/Makefile.am +@@ -1,5 +1,5 @@ + # executable test scripts to perform +-TESTS = test_html.sh test_latex.sh ++TESTS = test_html.sh + + # the data set for the tests + testdata = \ diff --git a/debian/patches/0001-Fix-manpage-section-specification.patch b/debian/patches/0001-Fix-manpage-section-specification.patch deleted file mode 100644 index 82164e3..0000000 --- a/debian/patches/0001-Fix-manpage-section-specification.patch +++ /dev/null @@ -1,22 +0,0 @@ -From: Willi Mann -Date: Sun, 23 Dec 2012 17:35:41 +0100 -Subject: Fix manpage section specification - -This fixes a lintian warning ---- - doc/unrtf.1 | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/doc/unrtf.1 b/doc/unrtf.1 -index 5623c9c..9970c49 100644 ---- a/doc/unrtf.1 -+++ b/doc/unrtf.1 -@@ -2,7 +2,7 @@ - .\" - .\" Permission is granted to redistribute this file with UnRTF. - .\" --.TH UNRTF "GNU UnRTF 0.21.0" -+.TH UNRTF 1 "GNU UnRTF 0.21.0" - .SH NAME - UnRTF \- converts document in RTF format to other formats - .SH SYNOPSIS diff --git a/debian/patches/0002-Get-fully-rid-of-hardcoded-local-lib-paths.patch b/debian/patches/0002-Get-fully-rid-of-hardcoded-local-lib-paths.patch new file mode 100644 index 0000000..b8ed889 --- /dev/null +++ b/debian/patches/0002-Get-fully-rid-of-hardcoded-local-lib-paths.patch @@ -0,0 +1,20 @@ +From: Willi Mann +Date: Wed, 26 Dec 2012 10:03:47 +0100 +Subject: Get fully rid of hardcoded local/lib paths + +--- + src/path.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/path.h b/src/path.h +index e38f52e..00be872 100644 +--- a/src/path.h ++++ b/src/path.h +@@ -1,6 +1,7 @@ + #ifndef _PATH_H_INCLUDED_ + #define _PATH_H_INCLUDED_ + ++#define DEFAULT_UNRTF_SEARCH_PATH PKGDATADIR "/" + #define DEFAULT_UNRTF_SEARCH_PATH CONFIG_DIR + + extern char *search_path; diff --git a/debian/patches/0002-Hand-over-SHAREDIR-via-CPPFLAGS.patch b/debian/patches/0002-Hand-over-SHAREDIR-via-CPPFLAGS.patch deleted file mode 100644 index 5fc0650..0000000 --- a/debian/patches/0002-Hand-over-SHAREDIR-via-CPPFLAGS.patch +++ /dev/null @@ -1,21 +0,0 @@ -From: Willi Mann -Date: Sun, 23 Dec 2012 21:21:46 +0100 -Subject: Hand over SHAREDIR via CPPFLAGS - ---- - src/Makefile.am | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/src/Makefile.am b/src/Makefile.am -index d6017b3..83b1d34 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -3,6 +3,8 @@ - - bin_PROGRAMS = unrtf - -+AM_CPPFLAGS = -DPKGDATADIR=\"$(pkgdatadir)\" -+ - unrtf_SOURCES = attr.c attr.h \ - convert.c convert.h \ - defs.h \ diff --git a/debian/patches/0003-Make-SHAREDIR-unrtf-default-path-for-output-format-c.patch b/debian/patches/0003-Make-SHAREDIR-unrtf-default-path-for-output-format-c.patch deleted file mode 100644 index 5dffac6..0000000 --- a/debian/patches/0003-Make-SHAREDIR-unrtf-default-path-for-output-format-c.patch +++ /dev/null @@ -1,21 +0,0 @@ -From: Willi Mann -Date: Sun, 23 Dec 2012 21:42:19 +0100 -Subject: Make $SHAREDIR/unrtf default path for output format configuration - ---- - src/main.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/main.h b/src/main.h -index 4230d47..a84839b 100644 ---- a/src/main.h -+++ b/src/main.h -@@ -47,7 +47,7 @@ extern int no_remap_mode; - #include "output.h" - #endif - --#define CONFIG_DIR "/usr/local/lib/unrtf/" -+#define CONFIG_DIR PKGDATADIR "/" - #define DEFAULT_OUTPUT "html" - - extern OutputPersonality *op; diff --git a/debian/patches/0003-Update-test-file-set-to-ensure-proper-cleaning-of-te.patch b/debian/patches/0003-Update-test-file-set-to-ensure-proper-cleaning-of-te.patch new file mode 100644 index 0000000..16f12ef --- /dev/null +++ b/debian/patches/0003-Update-test-file-set-to-ensure-proper-cleaning-of-te.patch @@ -0,0 +1,29 @@ +From: Willi Mann +Date: Wed, 26 Dec 2012 10:38:56 +0100 +Subject: Update test file set to ensure proper cleaning of tests dir + +--- + tests/Makefile.am | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/tests/Makefile.am b/tests/Makefile.am +index 057ff90..d4814c1 100644 +--- a/tests/Makefile.am ++++ b/tests/Makefile.am +@@ -18,6 +18,8 @@ testdata = \ + cp1251-russian-alphabet.rtf \ + font_size.rtf \ + font_styles.rtf \ ++ Greek1.rtf \ ++ Greek2.rtf \ + lists.rtf \ + paragraph_formatting.rtf \ + pict.rtf \ +@@ -25,6 +27,7 @@ testdata = \ + symbol.rtf \ + text_color.rtf \ + text_formatting.rtf \ ++ Turkish.rtf \ + unicode4.rtf + + # the result set for the html test diff --git a/debian/patches/0004-Place-output-config-files-in-sharedir-instead-of-lib.patch b/debian/patches/0004-Place-output-config-files-in-sharedir-instead-of-lib.patch deleted file mode 100644 index 6542251..0000000 --- a/debian/patches/0004-Place-output-config-files-in-sharedir-instead-of-lib.patch +++ /dev/null @@ -1,16 +0,0 @@ -From: Willi Mann -Date: Sun, 23 Dec 2012 21:44:58 +0100 -Subject: Place output config files in sharedir instead of libdir - ---- - outputs/Makefile.am | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/outputs/Makefile.am b/outputs/Makefile.am -index 055b75e..3ddef1f 100644 ---- a/outputs/Makefile.am -+++ b/outputs/Makefile.am -@@ -1,2 +1,2 @@ --outputsdir = ${libdir}/${PACKAGE} -+outputsdir = ${pkgdatadir} - dist_outputs_DATA = html.conf latex.conf rtf.conf text.conf vt.conf diff --git a/debian/patches/0005-Tell-unrtf-where-to-look-for-output-format-config-fi.patch b/debian/patches/0005-Tell-unrtf-where-to-look-for-output-format-config-fi.patch deleted file mode 100644 index 01caf7a..0000000 --- a/debian/patches/0005-Tell-unrtf-where-to-look-for-output-format-config-fi.patch +++ /dev/null @@ -1,22 +0,0 @@ -From: Willi Mann -Date: Tue, 25 Dec 2012 19:13:26 +0100 -Subject: Tell unrtf where to look for output format config files while - running tests - ---- - tests/Makefile.am | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/tests/Makefile.am b/tests/Makefile.am -index e0dd83b..86fcd75 100644 ---- a/tests/Makefile.am -+++ b/tests/Makefile.am -@@ -61,7 +61,7 @@ CLEANFILES = $(testresults_html) $(testresults_tex) - # add the test scripts and the test data to the distributed files - EXTRA_DIST = $(TESTS) $(testdata) - --TESTS_ENVIRONMENT = UNRTF=$(top_builddir)/src/unrtf -+TESTS_ENVIRONMENT = UNRTF=$(top_builddir)/src/unrtf UNRTF_SEARCH_PATH=$(top_builddir)/outputs/:$(top_builddir)/charmaps/ - - # ensure that the distributed scripts are executable before distribution. - # Could be necessary if checking out CVS. diff --git a/debian/patches/0006-Disable-latex-test-latex-output-is-broken.patch b/debian/patches/0006-Disable-latex-test-latex-output-is-broken.patch deleted file mode 100644 index 64699bf..0000000 --- a/debian/patches/0006-Disable-latex-test-latex-output-is-broken.patch +++ /dev/null @@ -1,19 +0,0 @@ -From: Willi Mann -Date: Tue, 25 Dec 2012 19:59:41 +0100 -Subject: Disable latex test - latex output is broken - ---- - tests/Makefile.am | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/tests/Makefile.am b/tests/Makefile.am -index 86fcd75..ea17293 100644 ---- a/tests/Makefile.am -+++ b/tests/Makefile.am -@@ -1,5 +1,5 @@ - # executable test scripts to perform --TESTS = test_html.sh test_latex.sh -+TESTS = test_html.sh - - # the data set for the tests - testdata = Greek1.rtf Greek2.rtf \ diff --git a/debian/patches/0007-Get-fully-rid-of-hardcoded-local-lib-paths.patch b/debian/patches/0007-Get-fully-rid-of-hardcoded-local-lib-paths.patch deleted file mode 100644 index cf6ee6c..0000000 --- a/debian/patches/0007-Get-fully-rid-of-hardcoded-local-lib-paths.patch +++ /dev/null @@ -1,32 +0,0 @@ -From: Willi Mann -Date: Wed, 26 Dec 2012 10:03:47 +0100 -Subject: Get fully rid of hardcoded local/lib paths - ---- - src/my_iconv.h | 2 +- - src/path.h | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/my_iconv.h b/src/my_iconv.h -index 1ca8d26..ac42102 100644 ---- a/src/my_iconv.h -+++ b/src/my_iconv.h -@@ -10,7 +10,7 @@ - #define HAVE_ICONV_H - #endif - --#define CHARMAP_DIR "/usr/local/lib/unrtf/charmaps/" -+#define CHARMAP_DIR PKGDATADIR "/charmaps/" - #define char_table_size 256 - - typedef struct -diff --git a/src/path.h b/src/path.h -index 68a2167..f6c16d0 100644 ---- a/src/path.h -+++ b/src/path.h -@@ -1,4 +1,4 @@ --#define DEFAULT_UNRTF_SEARCH_PATH "/usr/local/lib/unrtf/" -+#define DEFAULT_UNRTF_SEARCH_PATH PKGDATADIR "/" - - char *search_path; - int n_path_dirs; diff --git a/debian/patches/0008-Ensure-that-the-picture-extracted-during-testing-is-.patch b/debian/patches/0008-Ensure-that-the-picture-extracted-during-testing-is-.patch deleted file mode 100644 index 38f2f93..0000000 --- a/debian/patches/0008-Ensure-that-the-picture-extracted-during-testing-is-.patch +++ /dev/null @@ -1,21 +0,0 @@ -From: Willi Mann -Date: Wed, 26 Dec 2012 10:12:07 +0100 -Subject: Ensure that the picture extracted during testing is also cleaned - ---- - tests/Makefile.am | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/tests/Makefile.am b/tests/Makefile.am -index ea17293..4950e05 100644 ---- a/tests/Makefile.am -+++ b/tests/Makefile.am -@@ -56,7 +56,7 @@ testresults_tex = Greek1.rtf.tex Greek2.rtf.tex \ - unicode4.rtf.tex - - # need to wipe out test results on make clean --CLEANFILES = $(testresults_html) $(testresults_tex) -+CLEANFILES = $(testresults_html) $(testresults_tex) pict001.wmf - - # add the test scripts and the test data to the distributed files - EXTRA_DIST = $(TESTS) $(testdata) diff --git a/debian/patches/0009-Update-test-file-set-to-ensure-proper-cleaning-of-te.patch b/debian/patches/0009-Update-test-file-set-to-ensure-proper-cleaning-of-te.patch deleted file mode 100644 index 6207c79..0000000 --- a/debian/patches/0009-Update-test-file-set-to-ensure-proper-cleaning-of-te.patch +++ /dev/null @@ -1,120 +0,0 @@ -From: Willi Mann -Date: Wed, 26 Dec 2012 10:38:56 +0100 -Subject: Update test file set to ensure proper cleaning of tests dir - ---- - tests/Makefile.am | 80 ++++++++++++++++++++++++++++++++--------------------- - 1 file changed, 49 insertions(+), 31 deletions(-) - -diff --git a/tests/Makefile.am b/tests/Makefile.am -index 4950e05..768a6d7 100644 ---- a/tests/Makefile.am -+++ b/tests/Makefile.am -@@ -2,58 +2,76 @@ - TESTS = test_html.sh - - # the data set for the tests --testdata = Greek1.rtf Greek2.rtf \ -+testdata = accents.rtf \ - ascii_decimal.rtf \ - backslash.rtf \ -+ body.rtf \ - borders_shading.rtf \ - braces.rtf \ - character_formatting.rtf \ - chars.rtf \ - columns.rtf \ -+ cp1251-russian-alphabet.rtf \ - font_size.rtf \ - font_styles.rtf \ -+ Greek1.rtf \ -+ Greek2.rtf \ - lists.rtf \ - paragraph_formatting.rtf \ -+ pict.rtf \ - symbol.rtf \ - text_color.rtf \ - text_formatting.rtf \ -+ Turkish.rtf \ - unicode4.rtf - - # the result set for the html test --testresults_html = Greek1.rtf.html Greek2.rtf.html \ -+testresults_html = accents.rtf.html \ - ascii_decimal.rtf.html \ -- backslash.rtf.html \ -- borders_shading.rtf.html \ -- braces.rtf.html \ -- character_formatting.rtf.html \ -- chars.rtf.html \ -- columns.rtf.html \ -- font_size.rtf.html \ -- font_styles.rtf.html \ -- lists.rtf.html \ -- paragraph_formatting.rtf.html \ -- symbol.rtf.html \ -- text_color.rtf.html \ -- text_formatting.rtf.html \ -- unicode4.rtf.html -+ backslash.rtf.html \ -+ body.rtf.html \ -+ borders_shading.rtf.html \ -+ braces.rtf.html \ -+ character_formatting.rtf.html \ -+ chars.rtf.html \ -+ columns.rtf.html \ -+ cp1251-russian-alphabet.rtf.html \ -+ font_size.rtf.html \ -+ font_styles.rtf.html \ -+ Greek1.rtf.html \ -+ Greek2.rtf.html \ -+ lists.rtf.html \ -+ paragraph_formatting.rtf.html \ -+ pict.rtf.html \ -+ symbol.rtf.html \ -+ text_color.rtf.html \ -+ text_formatting.rtf.html \ -+ Turkish.rtf.html \ -+ unicode4.rtf.html - - # the result set for the latex test --testresults_tex = Greek1.rtf.tex Greek2.rtf.tex \ -+testresults_tex = accents.rtf.tex \ - ascii_decimal.rtf.tex \ -- backslash.rtf.tex \ -- borders_shading.rtf.tex \ -- braces.rtf.tex \ -- character_formatting.rtf.tex \ -- chars.rtf.tex \ -- columns.rtf.tex \ -- font_size.rtf.tex \ -- font_styles.rtf.tex \ -- lists.rtf.tex \ -- paragraph_formatting.rtf.tex \ -- symbol.rtf.tex \ -- text_color.rtf.tex \ -- text_formatting.rtf.tex \ -- unicode4.rtf.tex -+ backslash.rtf.tex \ -+ body.rtf.tex \ -+ borders_shading.rtf.tex \ -+ braces.rtf.tex \ -+ character_formatting.rtf.tex \ -+ chars.rtf.tex \ -+ columns.rtf.tex \ -+ cp1251-russian-alphabet.rtf.tex \ -+ font_size.rtf.tex \ -+ font_styles.rtf.tex \ -+ Greek1.rtf.tex \ -+ Greek2.rtf.tex \ -+ lists.rtf.tex \ -+ paragraph_formatting.rtf.tex \ -+ pict.rtf.tex \ -+ symbol.rtf.tex \ -+ text_color.rtf.tex \ -+ text_formatting.rtf.tex \ -+ Turkish.rtf.tex \ -+ unicode4.rtf.tex - - # need to wipe out test results on make clean - CLEANFILES = $(testresults_html) $(testresults_tex) pict001.wmf diff --git a/debian/patches/series b/debian/patches/series index b8df39e..b9a1f8e 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,9 +1,3 @@ -0001-Fix-manpage-section-specification.patch -0002-Hand-over-SHAREDIR-via-CPPFLAGS.patch -0003-Make-SHAREDIR-unrtf-default-path-for-output-format-c.patch -0004-Place-output-config-files-in-sharedir-instead-of-lib.patch -0005-Tell-unrtf-where-to-look-for-output-format-config-fi.patch -0006-Disable-latex-test-latex-output-is-broken.patch -0007-Get-fully-rid-of-hardcoded-local-lib-paths.patch -0008-Ensure-that-the-picture-extracted-during-testing-is-.patch -0009-Update-test-file-set-to-ensure-proper-cleaning-of-te.patch +0001-Disable-latex-test-latex-output-is-broken.patch +0002-Get-fully-rid-of-hardcoded-local-lib-paths.patch +0003-Update-test-file-set-to-ensure-proper-cleaning-of-te.patch