Update to 3.0.0 stable

This commit is contained in:
Peter Robinson 2013-10-14 13:35:11 +01:00
parent f39d1cf101
commit 04fe1245d7
10 changed files with 65 additions and 2074 deletions

6
.gitignore vendored
View File

@ -1,4 +1,2 @@
abiword-2.8.5.tar.gz
abiword-docs-2.8.5.tar.gz
abiword-docs-2.8.6.tar.gz
abiword-2.8.6.tar.gz
/abiword-3.*.tar.gz
/abiword-docs-3.*.tar.gz

View File

@ -1,732 +0,0 @@
diff -u -r abiword-2.6.4.orig/user/wp/templates/normal.awt abiword-2.6.4/user/wp/templates/normal.awt
--- abiword-2.6.4.orig/user/wp/templates/normal.awt 2008-07-13 15:11:00.000000000 +0200
+++ abiword-2.6.4/user/wp/templates/normal.awt 2008-07-21 19:20:42.000000000 +0200
@@ -9,7 +9,7 @@
<!-- ===================================================================== -->
<styles>
-<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
+<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:DejaVu Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
</styles>
<pagesize pagetype="Letter" orientation="portrait" width="8.500000" height="11.000000" units="in" page-scale="1.000000"/>
diff -u -r abiword-2.6.4.orig/user/wp/templates/normal.awt-am_ET abiword-2.6.4/user/wp/templates/normal.awt-am_ET
--- abiword-2.6.4.orig/user/wp/templates/normal.awt-am_ET 2008-07-13 15:11:00.000000000 +0200
+++ abiword-2.6.4/user/wp/templates/normal.awt-am_ET 2008-07-21 19:20:43.000000000 +0200
@@ -9,7 +9,7 @@
<!-- ===================================================================== -->
<styles>
-<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
+<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:DejaVu Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
</styles>
<pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
<section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
diff -u -r abiword-2.6.4.orig/user/wp/templates/normal.awt-ar abiword-2.6.4/user/wp/templates/normal.awt-ar
--- abiword-2.6.4.orig/user/wp/templates/normal.awt-ar 2008-07-13 15:11:00.000000000 +0200
+++ abiword-2.6.4/user/wp/templates/normal.awt-ar 2008-07-21 19:20:43.000000000 +0200
@@ -9,7 +9,7 @@
<!-- ===================================================================== -->
<styles>
-<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
+<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:DejaVu Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
</styles>
<pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
<section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
diff -u -r abiword-2.6.4.orig/user/wp/templates/normal.awt-ar_EG abiword-2.6.4/user/wp/templates/normal.awt-ar_EG
--- abiword-2.6.4.orig/user/wp/templates/normal.awt-ar_EG 2008-07-13 15:11:00.000000000 +0200
+++ abiword-2.6.4/user/wp/templates/normal.awt-ar_EG 2008-07-21 19:20:43.000000000 +0200
@@ -9,7 +9,7 @@
<!-- ===================================================================== -->
<styles>
-<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
+<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:DejaVu Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
</styles>
<pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
<section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
diff -u -r abiword-2.6.4.orig/user/wp/templates/normal.awt-ar_SA abiword-2.6.4/user/wp/templates/normal.awt-ar_SA
--- abiword-2.6.4.orig/user/wp/templates/normal.awt-ar_SA 2008-07-13 15:11:00.000000000 +0200
+++ abiword-2.6.4/user/wp/templates/normal.awt-ar_SA 2008-07-21 19:20:43.000000000 +0200
@@ -9,7 +9,7 @@
<!-- ===================================================================== -->
<styles>
-<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
+<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:DejaVu Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
</styles>
<pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
<section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
diff -u -r abiword-2.6.4.orig/user/wp/templates/normal.awt-bg_BG abiword-2.6.4/user/wp/templates/normal.awt-bg_BG
--- abiword-2.6.4.orig/user/wp/templates/normal.awt-bg_BG 2008-07-13 15:11:00.000000000 +0200
+++ abiword-2.6.4/user/wp/templates/normal.awt-bg_BG 2008-07-21 19:20:43.000000000 +0200
@@ -9,7 +9,7 @@
<!-- ===================================================================== -->
<styles>
-<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
+<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:DejaVu Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
</styles>
<pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
<section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
diff -u -r abiword-2.6.4.orig/user/wp/templates/normal.awt-ca_ES abiword-2.6.4/user/wp/templates/normal.awt-ca_ES
--- abiword-2.6.4.orig/user/wp/templates/normal.awt-ca_ES 2008-07-13 15:11:00.000000000 +0200
+++ abiword-2.6.4/user/wp/templates/normal.awt-ca_ES 2008-07-21 19:20:43.000000000 +0200
@@ -9,7 +9,7 @@
<!-- ===================================================================== -->
<styles>
-<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
+<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:DejaVu Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
</styles>
<pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
<section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
diff -u -r abiword-2.6.4.orig/user/wp/templates/normal.awt-cs_CZ abiword-2.6.4/user/wp/templates/normal.awt-cs_CZ
--- abiword-2.6.4.orig/user/wp/templates/normal.awt-cs_CZ 2008-07-13 15:11:00.000000000 +0200
+++ abiword-2.6.4/user/wp/templates/normal.awt-cs_CZ 2008-07-21 19:20:43.000000000 +0200
@@ -9,7 +9,7 @@
<!-- ===================================================================== -->
<styles>
-<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
+<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:DejaVu Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
</styles>
<pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
<section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
diff -u -r abiword-2.6.4.orig/user/wp/templates/normal.awt-da_DK abiword-2.6.4/user/wp/templates/normal.awt-da_DK
--- abiword-2.6.4.orig/user/wp/templates/normal.awt-da_DK 2008-07-13 15:11:00.000000000 +0200
+++ abiword-2.6.4/user/wp/templates/normal.awt-da_DK 2008-07-21 19:20:43.000000000 +0200
@@ -9,7 +9,7 @@
<!-- ===================================================================== -->
<styles>
-<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
+<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:DejaVu Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
</styles>
<pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
<section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
diff -u -r abiword-2.6.4.orig/user/wp/templates/normal.awt-de abiword-2.6.4/user/wp/templates/normal.awt-de
--- abiword-2.6.4.orig/user/wp/templates/normal.awt-de 2008-07-13 15:11:00.000000000 +0200
+++ abiword-2.6.4/user/wp/templates/normal.awt-de 2008-07-21 19:20:43.000000000 +0200
@@ -9,7 +9,7 @@
<!-- ===================================================================== -->
<styles>
-<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
+<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:DejaVu Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
</styles>
<pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
<section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
diff -u -r abiword-2.6.4.orig/user/wp/templates/normal.awt-de_AT abiword-2.6.4/user/wp/templates/normal.awt-de_AT
--- abiword-2.6.4.orig/user/wp/templates/normal.awt-de_AT 2008-07-13 15:11:00.000000000 +0200
+++ abiword-2.6.4/user/wp/templates/normal.awt-de_AT 2008-07-21 19:20:43.000000000 +0200
@@ -9,7 +9,7 @@
<!-- ===================================================================== -->
<styles>
-<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
+<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:DejaVu Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
</styles>
<pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
<section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
diff -u -r abiword-2.6.4.orig/user/wp/templates/normal.awt-de_CH abiword-2.6.4/user/wp/templates/normal.awt-de_CH
--- abiword-2.6.4.orig/user/wp/templates/normal.awt-de_CH 2008-07-13 15:11:00.000000000 +0200
+++ abiword-2.6.4/user/wp/templates/normal.awt-de_CH 2008-07-21 19:20:43.000000000 +0200
@@ -9,7 +9,7 @@
<!-- ===================================================================== -->
<styles>
-<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
+<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:DejaVu Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
</styles>
<pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
<section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
diff -u -r abiword-2.6.4.orig/user/wp/templates/normal.awt-de_DE abiword-2.6.4/user/wp/templates/normal.awt-de_DE
--- abiword-2.6.4.orig/user/wp/templates/normal.awt-de_DE 2008-07-13 15:11:00.000000000 +0200
+++ abiword-2.6.4/user/wp/templates/normal.awt-de_DE 2008-07-21 19:20:43.000000000 +0200
@@ -9,7 +9,7 @@
<!-- ===================================================================== -->
<styles>
-<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
+<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:DejaVu Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
</styles>
<pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
<section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
diff -u -r abiword-2.6.4.orig/user/wp/templates/normal.awt-div_MV abiword-2.6.4/user/wp/templates/normal.awt-div_MV
--- abiword-2.6.4.orig/user/wp/templates/normal.awt-div_MV 2008-07-13 15:11:00.000000000 +0200
+++ abiword-2.6.4/user/wp/templates/normal.awt-div_MV 2008-07-21 19:20:43.000000000 +0200
@@ -9,7 +9,7 @@
<!-- ===================================================================== -->
<styles>
-<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; lang:div-MV; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
+<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:DejaVu Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; lang:div-MV; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
</styles>
<pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
<section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
diff -u -r abiword-2.6.4.orig/user/wp/templates/normal.awt-el_GR abiword-2.6.4/user/wp/templates/normal.awt-el_GR
--- abiword-2.6.4.orig/user/wp/templates/normal.awt-el_GR 2008-07-13 15:11:00.000000000 +0200
+++ abiword-2.6.4/user/wp/templates/normal.awt-el_GR 2008-07-21 19:20:43.000000000 +0200
@@ -9,7 +9,7 @@
<!-- ===================================================================== -->
<styles>
-<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
+<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:DejaVu Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
</styles>
<pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
<section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
diff -u -r abiword-2.6.4.orig/user/wp/templates/normal.awt-en_AU abiword-2.6.4/user/wp/templates/normal.awt-en_AU
--- abiword-2.6.4.orig/user/wp/templates/normal.awt-en_AU 2008-07-13 15:11:00.000000000 +0200
+++ abiword-2.6.4/user/wp/templates/normal.awt-en_AU 2008-07-21 19:20:43.000000000 +0200
@@ -9,7 +9,7 @@
<!-- ===================================================================== -->
<styles>
-<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
+<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:DejaVu Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
</styles>
<pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
<section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
diff -u -r abiword-2.6.4.orig/user/wp/templates/normal.awt-en_CA abiword-2.6.4/user/wp/templates/normal.awt-en_CA
--- abiword-2.6.4.orig/user/wp/templates/normal.awt-en_CA 2008-07-13 15:11:00.000000000 +0200
+++ abiword-2.6.4/user/wp/templates/normal.awt-en_CA 2008-07-21 19:20:43.000000000 +0200
@@ -9,7 +9,7 @@
<!-- ===================================================================== -->
<styles>
-<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
+<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:DejaVu Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
</styles>
<pagesize pagetype="Letter" orientation="portrait" width="216.000000" height="279.000000" units="mm" page-scale="1.000000"/>
<section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
diff -u -r abiword-2.6.4.orig/user/wp/templates/normal.awt-en_GB abiword-2.6.4/user/wp/templates/normal.awt-en_GB
--- abiword-2.6.4.orig/user/wp/templates/normal.awt-en_GB 2008-07-13 15:11:00.000000000 +0200
+++ abiword-2.6.4/user/wp/templates/normal.awt-en_GB 2008-07-21 19:20:43.000000000 +0200
@@ -9,7 +9,7 @@
<!-- ===================================================================== -->
<styles>
-<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
+<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:DejaVu Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
</styles>
<pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
<section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
diff -u -r abiword-2.6.4.orig/user/wp/templates/normal.awt-en_IE abiword-2.6.4/user/wp/templates/normal.awt-en_IE
--- abiword-2.6.4.orig/user/wp/templates/normal.awt-en_IE 2008-07-13 15:11:00.000000000 +0200
+++ abiword-2.6.4/user/wp/templates/normal.awt-en_IE 2008-07-21 19:20:43.000000000 +0200
@@ -9,7 +9,7 @@
<!-- ===================================================================== -->
<styles>
-<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
+<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:DejaVu Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
</styles>
<pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
<section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
diff -u -r abiword-2.6.4.orig/user/wp/templates/normal.awt-en_NZ abiword-2.6.4/user/wp/templates/normal.awt-en_NZ
--- abiword-2.6.4.orig/user/wp/templates/normal.awt-en_NZ 2008-07-13 15:11:00.000000000 +0200
+++ abiword-2.6.4/user/wp/templates/normal.awt-en_NZ 2008-07-21 19:20:43.000000000 +0200
@@ -9,7 +9,7 @@
<!-- ===================================================================== -->
<styles>
-<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
+<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:DejaVu Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
</styles>
<pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
<section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
diff -u -r abiword-2.6.4.orig/user/wp/templates/normal.awt-en_ZA abiword-2.6.4/user/wp/templates/normal.awt-en_ZA
--- abiword-2.6.4.orig/user/wp/templates/normal.awt-en_ZA 2008-07-13 15:11:00.000000000 +0200
+++ abiword-2.6.4/user/wp/templates/normal.awt-en_ZA 2008-07-21 19:20:43.000000000 +0200
@@ -9,7 +9,7 @@
<!-- ===================================================================== -->
<styles>
-<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
+<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:DejaVu Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
</styles>
<pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
<section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
diff -u -r abiword-2.6.4.orig/user/wp/templates/normal.awt-es abiword-2.6.4/user/wp/templates/normal.awt-es
--- abiword-2.6.4.orig/user/wp/templates/normal.awt-es 2008-07-13 15:11:00.000000000 +0200
+++ abiword-2.6.4/user/wp/templates/normal.awt-es 2008-07-21 19:20:43.000000000 +0200
@@ -9,7 +9,7 @@
<!-- ===================================================================== -->
<styles>
-<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
+<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:DejaVu Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
</styles>
<pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
<section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
diff -u -r abiword-2.6.4.orig/user/wp/templates/normal.awt-es_AR abiword-2.6.4/user/wp/templates/normal.awt-es_AR
--- abiword-2.6.4.orig/user/wp/templates/normal.awt-es_AR 2008-07-13 15:11:00.000000000 +0200
+++ abiword-2.6.4/user/wp/templates/normal.awt-es_AR 2008-07-21 19:20:43.000000000 +0200
@@ -9,7 +9,7 @@
<!-- ===================================================================== -->
<styles>
-<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
+<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:DejaVu Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
</styles>
<pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
<section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
diff -u -r abiword-2.6.4.orig/user/wp/templates/normal.awt-es_ES abiword-2.6.4/user/wp/templates/normal.awt-es_ES
--- abiword-2.6.4.orig/user/wp/templates/normal.awt-es_ES 2008-07-13 15:11:00.000000000 +0200
+++ abiword-2.6.4/user/wp/templates/normal.awt-es_ES 2008-07-21 19:20:43.000000000 +0200
@@ -9,7 +9,7 @@
<!-- ===================================================================== -->
<styles>
-<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
+<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:DejaVu Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
</styles>
<pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
<section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
diff -u -r abiword-2.6.4.orig/user/wp/templates/normal.awt-es_IR abiword-2.6.4/user/wp/templates/normal.awt-es_IR
--- abiword-2.6.4.orig/user/wp/templates/normal.awt-es_IR 2008-07-13 15:11:00.000000000 +0200
+++ abiword-2.6.4/user/wp/templates/normal.awt-es_IR 2008-07-21 19:20:43.000000000 +0200
@@ -9,7 +9,7 @@
<!-- ===================================================================== -->
<styles>
-<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
+<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:DejaVu Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
</styles>
<pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
<section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
diff -u -r abiword-2.6.4.orig/user/wp/templates/normal.awt-es_MX abiword-2.6.4/user/wp/templates/normal.awt-es_MX
--- abiword-2.6.4.orig/user/wp/templates/normal.awt-es_MX 2008-07-13 15:11:00.000000000 +0200
+++ abiword-2.6.4/user/wp/templates/normal.awt-es_MX 2008-07-21 19:20:43.000000000 +0200
@@ -9,7 +9,7 @@
<!-- ===================================================================== -->
<styles>
-<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
+<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:DejaVu Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
</styles>
<pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
<section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
diff -u -r abiword-2.6.4.orig/user/wp/templates/normal.awt-fa_IR abiword-2.6.4/user/wp/templates/normal.awt-fa_IR
--- abiword-2.6.4.orig/user/wp/templates/normal.awt-fa_IR 2008-07-13 15:11:00.000000000 +0200
+++ abiword-2.6.4/user/wp/templates/normal.awt-fa_IR 2008-07-21 19:20:43.000000000 +0200
@@ -9,7 +9,7 @@
<!-- ===================================================================== -->
<styles>
-<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
+<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:DejaVu Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
</styles>
<pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
<section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
diff -u -r abiword-2.6.4.orig/user/wp/templates/normal.awt-fi_FI abiword-2.6.4/user/wp/templates/normal.awt-fi_FI
--- abiword-2.6.4.orig/user/wp/templates/normal.awt-fi_FI 2008-07-13 15:11:00.000000000 +0200
+++ abiword-2.6.4/user/wp/templates/normal.awt-fi_FI 2008-07-21 19:20:43.000000000 +0200
@@ -9,7 +9,7 @@
<!-- ===================================================================== -->
<styles>
-<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
+<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:DejaVu Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
</styles>
<pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
<section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
diff -u -r abiword-2.6.4.orig/user/wp/templates/normal.awt-fr abiword-2.6.4/user/wp/templates/normal.awt-fr
--- abiword-2.6.4.orig/user/wp/templates/normal.awt-fr 2008-07-13 15:11:00.000000000 +0200
+++ abiword-2.6.4/user/wp/templates/normal.awt-fr 2008-07-21 19:20:43.000000000 +0200
@@ -9,7 +9,7 @@
<!-- ===================================================================== -->
<styles>
-<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
+<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:DejaVu Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
</styles>
<pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
<section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
diff -u -r abiword-2.6.4.orig/user/wp/templates/normal.awt-fr_BE abiword-2.6.4/user/wp/templates/normal.awt-fr_BE
--- abiword-2.6.4.orig/user/wp/templates/normal.awt-fr_BE 2008-07-13 15:11:00.000000000 +0200
+++ abiword-2.6.4/user/wp/templates/normal.awt-fr_BE 2008-07-21 19:20:43.000000000 +0200
@@ -9,7 +9,7 @@
<!-- ===================================================================== -->
<styles>
-<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
+<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:DejaVu Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
</styles>
<pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
<section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
diff -u -r abiword-2.6.4.orig/user/wp/templates/normal.awt-fr_CA abiword-2.6.4/user/wp/templates/normal.awt-fr_CA
--- abiword-2.6.4.orig/user/wp/templates/normal.awt-fr_CA 2008-07-13 15:11:00.000000000 +0200
+++ abiword-2.6.4/user/wp/templates/normal.awt-fr_CA 2008-07-21 19:20:43.000000000 +0200
@@ -9,7 +9,7 @@
<!-- ===================================================================== -->
<styles>
-<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
+<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:DejaVu Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
</styles>
<pagesize pagetype="Letter" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
<section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
diff -u -r abiword-2.6.4.orig/user/wp/templates/normal.awt-fr_CH abiword-2.6.4/user/wp/templates/normal.awt-fr_CH
--- abiword-2.6.4.orig/user/wp/templates/normal.awt-fr_CH 2008-07-13 15:11:00.000000000 +0200
+++ abiword-2.6.4/user/wp/templates/normal.awt-fr_CH 2008-07-21 19:20:43.000000000 +0200
@@ -9,7 +9,7 @@
<!-- ===================================================================== -->
<styles>
-<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
+<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:DejaVu Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
</styles>
<pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
<section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
diff -u -r abiword-2.6.4.orig/user/wp/templates/normal.awt-fr_FR abiword-2.6.4/user/wp/templates/normal.awt-fr_FR
--- abiword-2.6.4.orig/user/wp/templates/normal.awt-fr_FR 2008-07-13 15:11:00.000000000 +0200
+++ abiword-2.6.4/user/wp/templates/normal.awt-fr_FR 2008-07-21 19:20:43.000000000 +0200
@@ -9,7 +9,7 @@
<!-- ===================================================================== -->
<styles>
-<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
+<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:DejaVu Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
</styles>
<pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
<section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
diff -u -r abiword-2.6.4.orig/user/wp/templates/normal.awt-gl_ES abiword-2.6.4/user/wp/templates/normal.awt-gl_ES
--- abiword-2.6.4.orig/user/wp/templates/normal.awt-gl_ES 2008-07-13 15:11:00.000000000 +0200
+++ abiword-2.6.4/user/wp/templates/normal.awt-gl_ES 2008-07-21 19:20:43.000000000 +0200
@@ -9,7 +9,7 @@
<!-- ===================================================================== -->
<styles>
-<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
+<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:DejaVu Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
</styles>
<pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
<section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
diff -u -r abiword-2.6.4.orig/user/wp/templates/normal.awt-he abiword-2.6.4/user/wp/templates/normal.awt-he
--- abiword-2.6.4.orig/user/wp/templates/normal.awt-he 2008-07-13 15:11:00.000000000 +0200
+++ abiword-2.6.4/user/wp/templates/normal.awt-he 2008-07-21 19:20:43.000000000 +0200
@@ -9,7 +9,7 @@
<!-- ===================================================================== -->
<styles>
-<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
+<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:DejaVu Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
</styles>
<pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
<section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
diff -u -r abiword-2.6.4.orig/user/wp/templates/normal.awt-he_IL abiword-2.6.4/user/wp/templates/normal.awt-he_IL
--- abiword-2.6.4.orig/user/wp/templates/normal.awt-he_IL 2008-07-13 15:11:00.000000000 +0200
+++ abiword-2.6.4/user/wp/templates/normal.awt-he_IL 2008-07-21 19:20:43.000000000 +0200
@@ -9,7 +9,7 @@
<!-- ===================================================================== -->
<styles>
-<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
+<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:DejaVu Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
</styles>
<pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
<section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
diff -u -r abiword-2.6.4.orig/user/wp/templates/normal.awt-hu_HU abiword-2.6.4/user/wp/templates/normal.awt-hu_HU
--- abiword-2.6.4.orig/user/wp/templates/normal.awt-hu_HU 2008-07-13 15:11:00.000000000 +0200
+++ abiword-2.6.4/user/wp/templates/normal.awt-hu_HU 2008-07-21 19:20:43.000000000 +0200
@@ -9,7 +9,7 @@
<!-- ===================================================================== -->
<styles>
-<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
+<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:DejaVu Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
</styles>
<pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
<section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
diff -u -r abiword-2.6.4.orig/user/wp/templates/normal.awt-it_IT abiword-2.6.4/user/wp/templates/normal.awt-it_IT
--- abiword-2.6.4.orig/user/wp/templates/normal.awt-it_IT 2008-07-13 15:11:00.000000000 +0200
+++ abiword-2.6.4/user/wp/templates/normal.awt-it_IT 2008-07-21 19:20:43.000000000 +0200
@@ -9,7 +9,7 @@
<!-- ===================================================================== -->
<styles>
-<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
+<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:DejaVu Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
</styles>
<pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
<section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
diff -u -r abiword-2.6.4.orig/user/wp/templates/normal.awt-ja_JP abiword-2.6.4/user/wp/templates/normal.awt-ja_JP
--- abiword-2.6.4.orig/user/wp/templates/normal.awt-ja_JP 2008-07-13 15:11:00.000000000 +0200
+++ abiword-2.6.4/user/wp/templates/normal.awt-ja_JP 2008-07-21 19:20:43.000000000 +0200
@@ -9,7 +9,7 @@
<!-- ===================================================================== -->
<styles>
-<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
+<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:DejaVu Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
</styles>
<pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
<section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
diff -u -r abiword-2.6.4.orig/user/wp/templates/normal.awt-lt_LT abiword-2.6.4/user/wp/templates/normal.awt-lt_LT
--- abiword-2.6.4.orig/user/wp/templates/normal.awt-lt_LT 2008-07-13 15:11:00.000000000 +0200
+++ abiword-2.6.4/user/wp/templates/normal.awt-lt_LT 2008-07-21 19:20:43.000000000 +0200
@@ -9,7 +9,7 @@
<!-- ===================================================================== -->
<styles>
-<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
+<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:DejaVu Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
</styles>
<pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
<section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
diff -u -r abiword-2.6.4.orig/user/wp/templates/normal.awt-nb_NO abiword-2.6.4/user/wp/templates/normal.awt-nb_NO
--- abiword-2.6.4.orig/user/wp/templates/normal.awt-nb_NO 2008-07-13 15:11:00.000000000 +0200
+++ abiword-2.6.4/user/wp/templates/normal.awt-nb_NO 2008-07-21 19:20:43.000000000 +0200
@@ -9,7 +9,7 @@
<!-- ===================================================================== -->
<styles>
-<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
+<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:DejaVu Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
</styles>
<pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
<section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
diff -u -r abiword-2.6.4.orig/user/wp/templates/normal.awt-nl_NL abiword-2.6.4/user/wp/templates/normal.awt-nl_NL
--- abiword-2.6.4.orig/user/wp/templates/normal.awt-nl_NL 2008-07-13 15:11:00.000000000 +0200
+++ abiword-2.6.4/user/wp/templates/normal.awt-nl_NL 2008-07-21 19:20:43.000000000 +0200
@@ -9,7 +9,7 @@
<!-- ===================================================================== -->
<styles>
-<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
+<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:DejaVu Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
</styles>
<pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
<section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
diff -u -r abiword-2.6.4.orig/user/wp/templates/normal.awt-nn_NO abiword-2.6.4/user/wp/templates/normal.awt-nn_NO
--- abiword-2.6.4.orig/user/wp/templates/normal.awt-nn_NO 2008-07-13 15:11:00.000000000 +0200
+++ abiword-2.6.4/user/wp/templates/normal.awt-nn_NO 2008-07-21 19:20:43.000000000 +0200
@@ -9,7 +9,7 @@
<!-- ===================================================================== -->
<styles>
-<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
+<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:DejaVu Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
</styles>
<pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
<section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
diff -u -r abiword-2.6.4.orig/user/wp/templates/normal.awt-pl_PL abiword-2.6.4/user/wp/templates/normal.awt-pl_PL
--- abiword-2.6.4.orig/user/wp/templates/normal.awt-pl_PL 2008-07-13 15:11:00.000000000 +0200
+++ abiword-2.6.4/user/wp/templates/normal.awt-pl_PL 2008-07-21 19:20:43.000000000 +0200
@@ -9,7 +9,7 @@
<!-- ===================================================================== -->
<styles>
-<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
+<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:DejaVu Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
</styles>
<pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
<section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
diff -u -r abiword-2.6.4.orig/user/wp/templates/normal.awt-ps abiword-2.6.4/user/wp/templates/normal.awt-ps
--- abiword-2.6.4.orig/user/wp/templates/normal.awt-ps 2008-07-13 15:11:00.000000000 +0200
+++ abiword-2.6.4/user/wp/templates/normal.awt-ps 2008-07-21 19:20:43.000000000 +0200
@@ -9,7 +9,7 @@
<!-- ===================================================================== -->
<styles>
-<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
+<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:DejaVu Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
</styles>
<pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
<section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
diff -u -r abiword-2.6.4.orig/user/wp/templates/normal.awt-pt_BR abiword-2.6.4/user/wp/templates/normal.awt-pt_BR
--- abiword-2.6.4.orig/user/wp/templates/normal.awt-pt_BR 2008-07-13 15:11:00.000000000 +0200
+++ abiword-2.6.4/user/wp/templates/normal.awt-pt_BR 2008-07-21 19:20:43.000000000 +0200
@@ -9,7 +9,7 @@
<!-- ===================================================================== -->
<styles>
-<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
+<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:DejaVu Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
</styles>
<pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
<section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
diff -u -r abiword-2.6.4.orig/user/wp/templates/normal.awt-pt_PT abiword-2.6.4/user/wp/templates/normal.awt-pt_PT
--- abiword-2.6.4.orig/user/wp/templates/normal.awt-pt_PT 2008-07-13 15:11:00.000000000 +0200
+++ abiword-2.6.4/user/wp/templates/normal.awt-pt_PT 2008-07-21 19:20:43.000000000 +0200
@@ -9,7 +9,7 @@
<!-- ===================================================================== -->
<styles>
-<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
+<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:DejaVu Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
</styles>
<pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
<section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
diff -u -r abiword-2.6.4.orig/user/wp/templates/normal.awt-ru abiword-2.6.4/user/wp/templates/normal.awt-ru
--- abiword-2.6.4.orig/user/wp/templates/normal.awt-ru 2008-07-13 15:11:00.000000000 +0200
+++ abiword-2.6.4/user/wp/templates/normal.awt-ru 2008-07-21 19:20:43.000000000 +0200
@@ -9,7 +9,7 @@
<!-- ===================================================================== -->
<styles>
-<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
+<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:DejaVu Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
</styles>
<pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
<section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
diff -u -r abiword-2.6.4.orig/user/wp/templates/normal.awt-ru_RU abiword-2.6.4/user/wp/templates/normal.awt-ru_RU
--- abiword-2.6.4.orig/user/wp/templates/normal.awt-ru_RU 2008-07-13 15:11:00.000000000 +0200
+++ abiword-2.6.4/user/wp/templates/normal.awt-ru_RU 2008-07-21 19:20:43.000000000 +0200
@@ -9,7 +9,7 @@
<!-- ===================================================================== -->
<styles>
-<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
+<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:DejaVu Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
</styles>
<pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
<section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
diff -u -r abiword-2.6.4.orig/user/wp/templates/normal.awt-sk_SK abiword-2.6.4/user/wp/templates/normal.awt-sk_SK
--- abiword-2.6.4.orig/user/wp/templates/normal.awt-sk_SK 2008-07-13 15:11:00.000000000 +0200
+++ abiword-2.6.4/user/wp/templates/normal.awt-sk_SK 2008-07-21 19:20:43.000000000 +0200
@@ -9,7 +9,7 @@
<!-- ===================================================================== -->
<styles>
-<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
+<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:DejaVu Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
</styles>
<pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
<section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
diff -u -r abiword-2.6.4.orig/user/wp/templates/normal.awt-sl abiword-2.6.4/user/wp/templates/normal.awt-sl
--- abiword-2.6.4.orig/user/wp/templates/normal.awt-sl 2008-07-13 15:11:00.000000000 +0200
+++ abiword-2.6.4/user/wp/templates/normal.awt-sl 2008-07-21 19:20:43.000000000 +0200
@@ -9,7 +9,7 @@
<!-- ===================================================================== -->
<styles>
-<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
+<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:DejaVu Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
</styles>
<pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
<section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
diff -u -r abiword-2.6.4.orig/user/wp/templates/normal.awt-sv abiword-2.6.4/user/wp/templates/normal.awt-sv
--- abiword-2.6.4.orig/user/wp/templates/normal.awt-sv 2008-07-13 15:11:00.000000000 +0200
+++ abiword-2.6.4/user/wp/templates/normal.awt-sv 2008-07-21 19:20:43.000000000 +0200
@@ -9,7 +9,7 @@
<!-- ===================================================================== -->
<styles>
-<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
+<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:DejaVu Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
</styles>
<pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
<section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
diff -u -r abiword-2.6.4.orig/user/wp/templates/normal.awt-sv_SE abiword-2.6.4/user/wp/templates/normal.awt-sv_SE
--- abiword-2.6.4.orig/user/wp/templates/normal.awt-sv_SE 2008-07-13 15:11:00.000000000 +0200
+++ abiword-2.6.4/user/wp/templates/normal.awt-sv_SE 2008-07-21 19:20:43.000000000 +0200
@@ -9,7 +9,7 @@
<!-- ===================================================================== -->
<styles>
-<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
+<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:DejaVu Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
</styles>
<pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
<section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
diff -u -r abiword-2.6.4.orig/user/wp/templates/normal.awt-syr abiword-2.6.4/user/wp/templates/normal.awt-syr
--- abiword-2.6.4.orig/user/wp/templates/normal.awt-syr 2008-07-13 15:11:00.000000000 +0200
+++ abiword-2.6.4/user/wp/templates/normal.awt-syr 2008-07-21 19:20:43.000000000 +0200
@@ -9,7 +9,7 @@
<!-- ===================================================================== -->
<styles>
-<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; lang:syr; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
+<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:DejaVu Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; lang:syr; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
</styles>
<pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
<section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
diff -u -r abiword-2.6.4.orig/user/wp/templates/normal.awt-tr abiword-2.6.4/user/wp/templates/normal.awt-tr
--- abiword-2.6.4.orig/user/wp/templates/normal.awt-tr 2008-07-13 15:11:00.000000000 +0200
+++ abiword-2.6.4/user/wp/templates/normal.awt-tr 2008-07-21 19:20:43.000000000 +0200
@@ -9,7 +9,7 @@
<!-- ===================================================================== -->
<styles>
-<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
+<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:DejaVu Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
</styles>
<pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
<section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
diff -u -r abiword-2.6.4.orig/user/wp/templates/normal.awt-tr_TR abiword-2.6.4/user/wp/templates/normal.awt-tr_TR
--- abiword-2.6.4.orig/user/wp/templates/normal.awt-tr_TR 2008-07-13 15:11:00.000000000 +0200
+++ abiword-2.6.4/user/wp/templates/normal.awt-tr_TR 2008-07-21 19:20:43.000000000 +0200
@@ -9,7 +9,7 @@
<!-- ===================================================================== -->
<styles>
-<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
+<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:DejaVu Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
</styles>
<pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
<section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
diff -u -r abiword-2.6.4.orig/user/wp/templates/normal.awt-uk_UA abiword-2.6.4/user/wp/templates/normal.awt-uk_UA
--- abiword-2.6.4.orig/user/wp/templates/normal.awt-uk_UA 2008-07-13 15:11:00.000000000 +0200
+++ abiword-2.6.4/user/wp/templates/normal.awt-uk_UA 2008-07-21 19:20:43.000000000 +0200
@@ -9,7 +9,7 @@
<!-- ===================================================================== -->
<styles>
-<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
+<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:DejaVu Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
</styles>
<pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
<section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
diff -u -r abiword-2.6.4.orig/user/wp/templates/normal.awt-ur_PK abiword-2.6.4/user/wp/templates/normal.awt-ur_PK
--- abiword-2.6.4.orig/user/wp/templates/normal.awt-ur_PK 2008-07-13 15:11:00.000000000 +0200
+++ abiword-2.6.4/user/wp/templates/normal.awt-ur_PK 2008-07-21 19:20:43.000000000 +0200
@@ -9,7 +9,7 @@
<!-- ===================================================================== -->
<styles>
-<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
+<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:DejaVu Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
</styles>
<pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
<section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
diff -u -r abiword-2.6.4.orig/user/wp/templates/normal.awt-yi abiword-2.6.4/user/wp/templates/normal.awt-yi
--- abiword-2.6.4.orig/user/wp/templates/normal.awt-yi 2008-07-13 15:11:00.000000000 +0200
+++ abiword-2.6.4/user/wp/templates/normal.awt-yi 2008-07-21 19:20:43.000000000 +0200
@@ -9,7 +9,7 @@
<!-- ===================================================================== -->
<styles>
-<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
+<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:DejaVu Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
</styles>
<pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
<section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
diff -u -r abiword-2.6.4.orig/user/wp/templates/normal.awt-zh_CN abiword-2.6.4/user/wp/templates/normal.awt-zh_CN
--- abiword-2.6.4.orig/user/wp/templates/normal.awt-zh_CN 2008-07-13 15:10:59.000000000 +0200
+++ abiword-2.6.4/user/wp/templates/normal.awt-zh_CN 2008-07-21 19:20:43.000000000 +0200
@@ -9,7 +9,7 @@
<!-- ===================================================================== -->
<styles>
-<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
+<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:DejaVu Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
</styles>
<pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
<section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">
diff -u -r abiword-2.6.4.orig/user/wp/templates/normal.awt-zh_TW abiword-2.6.4/user/wp/templates/normal.awt-zh_TW
--- abiword-2.6.4.orig/user/wp/templates/normal.awt-zh_TW 2008-07-13 15:11:01.000000000 +0200
+++ abiword-2.6.4/user/wp/templates/normal.awt-zh_TW 2008-07-21 19:20:43.000000000 +0200
@@ -9,7 +9,7 @@
<!-- ===================================================================== -->
<styles>
-<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:Times New Roman; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
+<s type="P" name="Normal" basedon="" followedby="Current Settings" props="font-family:DejaVu Serif; margin-top:0pt; font-variant:normal; margin-left:0pt; text-indent:0in; widows:2; font-style:normal; font-weight:normal; text-decoration:none; color:000000; line-height:1.0; text-align:left; margin-bottom:0pt; text-position:normal; margin-right:0pt; bgcolor:transparent; font-size:12pt; font-stretch:normal"/>
</styles>
<pagesize pagetype="A4" orientation="portrait" width="210.000000" height="297.000000" units="mm" page-scale="1.000000"/>
<section props="page-margin-right:1.0000in; page-margin-footer:0.5000in; page-margin-header:0.5000in; page-margin-left:1.0000in; page-margin-top:1.0000in; page-margin-bottom:1.0000in">

View File

@ -1,12 +0,0 @@
diff -u -r abiword-2.6.4.orig/src/text/fmt/xp/fp_FrameContainer.h abiword-2.6.4/src/text/fmt/xp/fp_FrameContainer.h
--- abiword-2.6.4.orig/src/text/fmt/xp/fp_FrameContainer.h 2008-07-13 15:09:27.000000000 +0200
+++ abiword-2.6.4/src/text/fmt/xp/fp_FrameContainer.h 2008-07-21 19:22:08.000000000 +0200
@@ -41,7 +41,7 @@
class fl_DocSectionLayout;
class fl_BlockLayout;
-#define FRAME_HANDLE_SIZE 6
+#define FRAME_HANDLE_SIZE 20
class ABI_EXPORT fp_FrameContainer : public fp_VerticalContainer
{

View File

@ -1,12 +0,0 @@
diff -u -r abiword-2.6.4.orig/src/wp/impexp/xp/ie_exp_HTML.h abiword-2.6.4/src/wp/impexp/xp/ie_exp_HTML.h
--- abiword-2.6.4.orig/src/wp/impexp/xp/ie_exp_HTML.h 2008-07-13 15:10:39.000000000 +0200
+++ abiword-2.6.4/src/wp/impexp/xp/ie_exp_HTML.h 2008-07-21 19:23:33.000000000 +0200
@@ -39,7 +39,7 @@
/* Define if the [P/X]HTML export options dialog is implemented
*/
-#define HTML_DIALOG_OPTIONS
+//#define HTML_DIALOG_OPTIONS
/* Define if the tables are supported
*/

View File

@ -1,35 +0,0 @@
diff -up abiword-2.8.6/goffice-bits/goffice/app/go-cmd-context.c.glibfix abiword-2.8.6/goffice-bits/goffice/app/go-cmd-context.c
--- abiword-2.8.6/goffice-bits/goffice/app/go-cmd-context.c.glibfix 2012-02-27 15:04:45.744812212 -0500
+++ abiword-2.8.6/goffice-bits/goffice/app/go-cmd-context.c 2012-02-27 15:05:51.628239624 -0500
@@ -10,7 +10,7 @@
#include "go-cmd-context-impl.h"
#include <goffice/app/goffice-app.h>
#include <gsf/gsf-impl-utils.h>
-#include <glib/gi18n-lib.h>
+#include <glib.h>
#define GCC_CLASS(o) (G_TYPE_INSTANCE_GET_INTERFACE ((o), GO_CMD_CONTEXT_TYPE, GOCmdContextClass))
diff -up abiword-2.8.6/goffice-bits/goffice/app/goffice-app.h.glibfix abiword-2.8.6/goffice-bits/goffice/app/goffice-app.h
--- abiword-2.8.6/goffice-bits/goffice/app/goffice-app.h.glibfix 2012-02-27 15:06:06.157113352 -0500
+++ abiword-2.8.6/goffice-bits/goffice/app/goffice-app.h 2012-02-27 15:06:11.037070941 -0500
@@ -22,7 +22,7 @@
#ifndef GOFFICE_APP_H
#define GOFFICE_APP_H
-#include <glib/gmacros.h>
+#include <glib.h>
G_BEGIN_DECLS
diff -up abiword-2.8.6/src/af/util/xp/ut_go_file.h.glibfix abiword-2.8.6/src/af/util/xp/ut_go_file.h
--- abiword-2.8.6/src/af/util/xp/ut_go_file.h.glibfix 2012-02-27 15:07:23.222443598 -0500
+++ abiword-2.8.6/src/af/util/xp/ut_go_file.h 2012-02-27 15:07:26.708413289 -0500
@@ -31,7 +31,6 @@
#include <glib.h>
#include <gsf/gsf.h>
-#include <glib/gerror.h>
#include <time.h>
G_BEGIN_DECLS

View File

@ -1,391 +0,0 @@
--- plugins/wordperfect/xp/ie_imp_WordPerfect.cpp (revision 29401)
+++ plugins/wordperfect/xp/ie_imp_WordPerfect.cpp (revision 29403)
@@ -60,7 +60,7 @@
// Stream class
-#include <libwpd/WPXStream.h>
+#include <libwpd-stream/libwpd-stream.h>
#include <gsf/gsf-input.h>
#include <gsf/gsf-infile.h>
@@ -70,12 +70,7 @@
#include <libwps/libwps.h>
#endif
-class AbiWordperfectInputStream :
-#ifdef HAVE_LIBWPS
- public WPSInputStream
-#else
- public WPXInputStream
-#endif
+class AbiWordperfectInputStream : public WPXInputStream
{
public:
AbiWordperfectInputStream(GsfInput *input);
@@ -86,7 +81,7 @@
virtual WPXInputStream * getDocumentOLEStream(const char * name);
- virtual const uint8_t *read(size_t numBytes, size_t &numBytesRead);
+ virtual const unsigned char *read(unsigned long numBytes, unsigned long &numBytesRead);
virtual int seek(long offset, WPX_SEEK_TYPE seekType);
virtual long tell();
virtual bool atEOS();
@@ -98,11 +93,7 @@
};
AbiWordperfectInputStream::AbiWordperfectInputStream(GsfInput *input) :
-#ifdef HAVE_LIBWPS
- WPSInputStream(),
-#else
- WPXInputStream(true),
-#endif
+ WPXInputStream(),
m_input(input),
m_ole(NULL)
{
@@ -117,9 +108,9 @@
g_object_unref(G_OBJECT(m_input));
}
-const uint8_t * AbiWordperfectInputStream::read(size_t numBytes, size_t &numBytesRead)
+const unsigned char * AbiWordperfectInputStream::read(unsigned long numBytes, unsigned long &numBytesRead)
{
- const uint8_t *buf = gsf_input_read(m_input, numBytes, NULL);
+ const unsigned char *buf = gsf_input_read(m_input, numBytes, NULL);
if (buf == NULL)
numBytesRead = 0;
@@ -256,19 +247,12 @@
{
AbiWordperfectInputStream gsfInput(input);
- WPDConfidence confidence = WPDocument::isFileFormatSupported(&gsfInput, true);
+ WPDConfidence confidence = WPDocument::isFileFormatSupported(&gsfInput);
switch (confidence)
{
case WPD_CONFIDENCE_NONE:
- // libwpd > 0.7.1 reports POOR if the text file is plain text (that _could_ be a WP4x document)
- // however, we'll let the text importer handle such cases
- case WPD_CONFIDENCE_POOR:
return UT_CONFIDENCE_ZILCH;
- case WPD_CONFIDENCE_LIKELY:
- return UT_CONFIDENCE_SOSO;
- case WPD_CONFIDENCE_GOOD:
- return UT_CONFIDENCE_GOOD;
case WPD_CONFIDENCE_EXCELLENT:
return UT_CONFIDENCE_PERFECT;
default:
@@ -328,7 +312,7 @@
UT_Error IE_Imp_WordPerfect::_loadFile(GsfInput * input)
{
AbiWordperfectInputStream gsfInput(input);
- WPDResult error = WPDocument::parse(&gsfInput, static_cast<WPXHLListenerImpl *>(this));
+ WPDResult error = WPDocument::parse(&gsfInput, static_cast<WPXDocumentInterface *>(this), NULL);
if (error != WPD_OK)
{
@@ -381,9 +365,9 @@
float marginLeft = 1.0f, marginRight = 1.0f;
if (propList["fo:margin-left"])
- marginLeft = propList["fo:margin-left"]->getFloat();
+ marginLeft = propList["fo:margin-left"]->getDouble();
if (propList["fo:margin-right"])
- marginRight = propList["fo:margin-right"]->getFloat();
+ marginRight = propList["fo:margin-right"]->getDouble();
if (marginLeft != m_leftPageMargin || marginRight != m_rightPageMargin /* || */
/* marginTop != m_marginBottom || marginBottom != m_marginBottom */ )
@@ -456,15 +440,15 @@
float marginTop = 0.0f, marginBottom = 0.0f;
float marginLeft = 0.0f, marginRight = 0.0f, textIndent = 0.0f;
if (propList["fo:margin-top"])
- marginTop = propList["fo:margin-top"]->getFloat();
+ marginTop = propList["fo:margin-top"]->getDouble();
if (propList["fo:margin-bottom"])
- marginBottom = propList["fo:margin-bottom"]->getFloat();
+ marginBottom = propList["fo:margin-bottom"]->getDouble();
if (propList["fo:margin-left"])
- marginLeft = propList["fo:margin-left"]->getFloat();
+ marginLeft = propList["fo:margin-left"]->getDouble();
if (propList["fo:margin-right"])
- marginRight = propList["fo:margin-right"]->getFloat();
+ marginRight = propList["fo:margin-right"]->getDouble();
if (propList["fo:text-indent"])
- textIndent = propList["fo:text-indent"]->getFloat();
+ textIndent = propList["fo:text-indent"]->getDouble();
m_topMargin = marginTop;
m_bottomMargin = marginBottom;
@@ -487,7 +471,7 @@
float lineSpacing = 1.0f;
if (propList["fo:line-height"])
- lineSpacing = propList["fo:line-height"]->getFloat();
+ lineSpacing = propList["fo:line-height"]->getDouble();
UT_String tmpBuffer;
UT_String_sprintf(tmpBuffer, "; margin-top:%.4fin; margin-bottom:%.4fin; margin-left:%.4fin; margin-right:%.4fin; text-indent:%.4fin; line-height:%.4f",
@@ -504,7 +488,7 @@
propBuffer += tmpBuffer;
if (i()["style:position"])
{
- UT_String_sprintf(tmpBuffer, "%.4fin", i()["style:position"]->getFloat());
+ UT_String_sprintf(tmpBuffer, "%.4fin", i()["style:position"]->getDouble());
propBuffer += tmpBuffer;
}
@@ -520,10 +504,10 @@
else // Left aligned is default
propBuffer += "/L";
- if (i()["style:leader-char"])
- if (i()["style:leader-char"]->getStr() == "-")
+ if (i()["style:leader-text"])
+ if (i()["style:leader-text"]->getStr() == "-")
propBuffer += "2";
- else if (i()["style:leader-char"]->getStr() == "_")
+ else if (i()["style:leader-text"]->getStr() == "_")
propBuffer += "3";
else // default to dot leader if the given leader is dot or is not supported by AbiWord
propBuffer += "1";
@@ -586,12 +570,12 @@
propBuffer += "subscript";
}
- if (propList["style:text-underline"] || propList["style:text-crossing-out"])
+ if (propList["style:text-underline-type"] || propList["style:text-line-through-type"])
{
propBuffer += "; text-decoration:";
- if (propList["style:text-underline"])
+ if (propList["style:text-underline-type"])
propBuffer += "underline ";
- if (propList["style:text-crossing-out"])
+ if (propList["style:text-line-through-type"])
propBuffer += "line-through";
}
@@ -615,10 +599,10 @@
propBuffer += propList["fo:color"]->getStr().cstr();
}
- if (propList["style:text-background-color"])
+ if (propList["fo:background-color"])
{
propBuffer += "; bgcolor:";
- propBuffer += propList["style:text-background-color"]->getStr().cstr();
+ propBuffer += propList["fo:background-color"]->getStr().cstr();
}
UT_DEBUGMSG(("AbiWordPerfect: Appending span format: %s\n", propBuffer.c_str()));
@@ -639,10 +623,10 @@
int columnsCount = ((columns.count() == 0) ? 1 : columns.count());
// TODO: support spaceAfter
- if (propList["fo:margin-left"])
- marginLeft = propList["fo:margin-left"]->getFloat();
- if (propList["fo:margin-right"])
- marginRight = propList["fo:margin-right"]->getFloat();
+ if (propList["fo:start-indent"])
+ marginLeft = propList["fo:start-indent"]->getDouble();
+ if (propList["fo:end-indent"])
+ marginRight = propList["fo:end-indent"]->getDouble();
if (marginLeft != m_leftSectionMargin || marginRight != m_rightSectionMargin || m_sectionColumnsCount != columnsCount)
m_bSectionChanged = true;
@@ -709,9 +693,9 @@
if (propList["style:num-format"])
listType = propList["style:num-format"]->getStr().cstr()[0];
if (propList["text:space-before"])
- listLeftOffset = propList["text:space-before"]->getFloat();
+ listLeftOffset = propList["text:space-before"]->getDouble();
if (propList["text:min-label-width"])
- listMinLabelWidth = propList["text:min-label-width"]->getFloat();
+ listMinLabelWidth = propList["text:min-label-width"]->getDouble();
if (!m_pCurrentListDefinition ||
m_pCurrentListDefinition->getOutlineHash() != listID ||
@@ -749,9 +733,9 @@
if (propList["libwpd:level"])
level = propList["libwpd:level"]->getInt();
if (propList["text:space-before"])
- listLeftOffset = propList["text:space-before"]->getFloat();
+ listLeftOffset = propList["text:space-before"]->getDouble();
if (propList["text:min-label-width"])
- listMinLabelWidth = propList["text:min-label-width"]->getFloat();
+ listMinLabelWidth = propList["text:min-label-width"]->getDouble();
if (!m_pCurrentListDefinition || m_pCurrentListDefinition->getOutlineHash() != listID)
{
@@ -871,10 +855,10 @@
UT_String_sprintf(tempBuffer, "margin-left:%.4fin; ", m_pCurrentListDefinition->getListLeftOffset(m_iCurrentListLevel)
+ m_pCurrentListDefinition->getListMinLabelWidth(m_iCurrentListLevel)
- - (propList["fo:text-indent"] ? propList["fo:text-indent"]->getFloat() : 0.0f));
+ - (propList["fo:text-indent"] ? propList["fo:text-indent"]->getDouble() : 0.0f));
propBuffer += tempBuffer;
UT_String_sprintf(tempBuffer, "text-indent:%.4fin", - m_pCurrentListDefinition->getListMinLabelWidth(m_iCurrentListLevel)
- + (propList["fo:text-indent"] ? propList["fo:text-indent"]->getFloat() : 0.0f));
+ + (propList["fo:text-indent"] ? propList["fo:text-indent"]->getDouble() : 0.0f));
propBuffer += tempBuffer;
listAttribs[attribsCount++] = PT_PROPS_ATTRIBUTE_NAME;
@@ -1263,7 +1247,7 @@
virtual UT_Error _loadFile(GsfInput * input)
{
AbiWordperfectInputStream gsfInput(input);
- WPSResult error = WPSDocument::parse(&gsfInput, static_cast<WPXHLListenerImpl *>(this));
+ WPSResult error = WPSDocument::parse(&gsfInput, static_cast<WPXDocumentInterface *>(this));
if (error != WPS_OK)
{
@@ -1302,18 +1286,12 @@
{
AbiWordperfectInputStream gsfInput(input);
- WPSConfidence confidence = WPSDocument::isFileFormatSupported(&gsfInput, true);
+ WPSConfidence confidence = WPSDocument::isFileFormatSupported(&gsfInput);
switch (confidence)
{
case WPS_CONFIDENCE_NONE:
return UT_CONFIDENCE_ZILCH;
- case WPS_CONFIDENCE_POOR:
- return UT_CONFIDENCE_POOR;
- case WPS_CONFIDENCE_LIKELY:
- return UT_CONFIDENCE_SOSO;
- case WPS_CONFIDENCE_GOOD:
- return UT_CONFIDENCE_GOOD;
case WPS_CONFIDENCE_EXCELLENT:
return UT_CONFIDENCE_PERFECT;
default:
--- plugins/wordperfect/xp/ie_imp_WordPerfect.h (revision 29401)
+++ plugins/wordperfect/xp/ie_imp_WordPerfect.h (revision 29403)
@@ -30,13 +30,7 @@
#define IE_IMP_WP_H
#include <stdio.h>
-#ifdef _WIN32
-#define POINT WPX_POINT
-#endif
#include <libwpd/libwpd.h>
-#ifdef _WIN32
-#undef POINT
-#endif
#include "ie_imp.h"
#include "ut_string.h"
#include "ut_string_class.h"
@@ -98,7 +92,7 @@
IE_Imp ** ppie);
};
-class IE_Imp_WordPerfect : public IE_Imp, public WPXHLListenerImpl
+class IE_Imp_WordPerfect : public IE_Imp, public WPXDocumentInterface
{
public:
IE_Imp_WordPerfect(PD_Document * pDocument);
@@ -154,6 +148,21 @@
virtual void insertCoveredTableCell(const WPXPropertyList & /*propList*/) {}
virtual void closeTable();
+ virtual void definePageStyle(const WPXPropertyList&) {}
+ virtual void defineParagraphStyle(const WPXPropertyList&, const WPXPropertyListVector&) {}
+ virtual void defineCharacterStyle(const WPXPropertyList&) {}
+ virtual void defineSectionStyle(const WPXPropertyList&, const WPXPropertyListVector&) {}
+ virtual void insertSpace() {}
+ virtual void insertField(const WPXString&, const WPXPropertyList&) {}
+ virtual void openComment(const WPXPropertyList&) {}
+ virtual void closeComment() {}
+ virtual void openTextBox(const WPXPropertyList&) {}
+ virtual void closeTextBox() {}
+ virtual void openFrame(const WPXPropertyList&) {}
+ virtual void closeFrame() {}
+ virtual void insertBinaryObject(const WPXPropertyList&, const WPXBinaryData&) {}
+ virtual void insertEquation(const WPXPropertyList&, const WPXString&) {}
+
protected:
virtual UT_Error _loadFile(GsfInput * input);
--- plugins/wordperfect/plugin.m4 (revision 29401)
+++ plugins/wordperfect/plugin.m4 (revision 29403)
@@ -1,6 +1,6 @@
-wordperfect_pkgs="libwpd-0.8 >= 0.8.0 $gsf_req"
-wordperfect_wps_pkgs='libwps-0.1 >= 0.1.0'
+wordperfect_pkgs="libwpg-0.2 >= 0.2.0 libwpd-0.9 >= 0.9.0 libwpd-stream-0.9 >= 0.9.0 $gsf_req"
+wordperfect_wps_pkgs='libwps-0.2 >= 0.1.0'
wordperfect_deps="no"
WORDPERFECT_CFLAGS=
--- plugins/wpg/xp/ie_impGraphic_WPG.cpp (revision 29401)
+++ plugins/wpg/xp/ie_impGraphic_WPG.cpp (revision 29403)
@@ -31,11 +31,10 @@
#include <gsf/gsf-input-memory.h>
#include <gsf/gsf-input-stdio.h>
#include <gsf/gsf-infile-msole.h>
-#include <libwpd/WPXStream.h>
+#include <libwpd-stream/libwpd-stream.h>
#include "xap_Module.h"
using libwpg::WPGraphics;
-using libwpg::WPGString;
ABI_PLUGIN_DECLARE("WPG")
@@ -48,7 +47,7 @@
virtual bool isOLEStream();
virtual WPXInputStream * getDocumentOLEStream();
virtual WPXInputStream * getDocumentOLEStream(const char * name);
- virtual const uint8_t *read(size_t numBytes, size_t &numBytesRead);
+ virtual const unsigned char *read(unsigned long numBytes, unsigned long &numBytesRead);
virtual int seek(long offset, WPX_SEEK_TYPE seekType);
virtual long tell();
virtual bool atEOS();
@@ -60,7 +59,7 @@
};
AbiWordPerfectGraphicsInputStream::AbiWordPerfectGraphicsInputStream(GsfInput *input) :
- WPXInputStream(true),
+ WPXInputStream(),
m_input(input),
m_ole(NULL)
{
@@ -75,9 +74,9 @@
g_object_unref(G_OBJECT(m_input));
}
-const uint8_t * AbiWordPerfectGraphicsInputStream::read(size_t numBytes, size_t &numBytesRead)
+const unsigned char * AbiWordPerfectGraphicsInputStream::read(unsigned long numBytes, unsigned long &numBytesRead)
{
- const uint8_t *buf = gsf_input_read(m_input, numBytes, NULL);
+ const unsigned char *buf = gsf_input_read(m_input, numBytes, NULL);
if (buf == NULL)
numBytesRead = 0;
@@ -245,10 +244,10 @@
UT_Error IE_Imp_WordPerfectGraphics::importGraphic(GsfInput *input, FG_Graphic **ppfg)
{
AbiWordPerfectGraphicsInputStream gsfInput(input);
- WPGString svgOutput;
+ WPXString svgOutput;
if (WPGraphics::generateSVG(&gsfInput, svgOutput))
{
- GsfInput * svgInput = gsf_input_memory_new((const guint8*)svgOutput.cstr(), svgOutput.length(), false);
+ GsfInput * svgInput = gsf_input_memory_new((const guint8*)svgOutput.cstr(), svgOutput.len(), false);
UT_Error result = IE_ImpGraphic::loadGraphic(svgInput, IE_ImpGraphic::fileTypeForSuffix(".svg"), ppfg);
g_object_unref(svgInput);
return result;
--- plugins/wpg/plugin.m4 (revision 29401)
+++ plugins/wpg/plugin.m4 (revision 29403)
@@ -1,5 +1,5 @@
-wpg_pkgs="$gsf_req libwpg-0.1 >= 0.1.0 libwpd-0.8 >= 0.8.0"
+wpg_pkgs="$gsf_req libwpg-0.2 >= 0.2.0 libwpd-0.9 >= 0.9.0 libwpd-stream-0.9 >= 0.9.0"
wpg_deps="no"
if test "$enable_wpg" != ""; then

View File

@ -1,21 +0,0 @@
diff -u -r abiword-2.8.6.orig/src/Makefile.am abiword-2.8.6/src/Makefile.am
--- abiword-2.8.6.orig/src/Makefile.am 2009-09-09 15:11:01.000000000 +0200
+++ abiword-2.8.6/src/Makefile.am 2011-08-02 23:35:51.904761961 +0200
@@ -107,7 +107,7 @@
AbiWord_LDFLAGS = \
$(DEPS_LIBS) \
- --no-undefined \
+ -Wl,--no-undefined \
-avoid-version \
-export-dynamic \
-headerpad_max_install_names
@@ -129,7 +129,7 @@
abiword_LDFLAGS = \
$(platform_ldflags) \
- --no-undefined \
+ -Wl,--no-undefined \
-avoid-version \
-export-dynamic

View File

@ -1,111 +0,0 @@
diff -up abiword-2.8.6/plugins/bmp/xp/ie_impGraphic_BMP.cpp.png15 abiword-2.8.6/plugins/bmp/xp/ie_impGraphic_BMP.cpp
--- abiword-2.8.6/plugins/bmp/xp/ie_impGraphic_BMP.cpp.png15 2012-02-27 15:39:39.258617605 -0500
+++ abiword-2.8.6/plugins/bmp/xp/ie_impGraphic_BMP.cpp 2012-02-27 15:48:37.830936901 -0500
@@ -191,7 +191,14 @@ UT_Error IE_ImpGraphic_BMP::_convertGrap
/* Clean Up Memory Used */
+#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4
+ int num_palette;
+ png_colorp palette;
+ png_get_PLTE(m_pPNG, m_pPNGInfo, &palette, &num_palette);
+ FREEP(palette);
+#else
FREEP(m_pPNGInfo->palette);
+#endif
DELETEP(pBB);
png_destroy_write_struct(&m_pPNG, &m_pPNGInfo);
@@ -313,7 +320,11 @@ UT_Error IE_ImpGraphic_BMP::Initialize_P
* the normal method of doing things with libpng). REQUIRED unless you
* set up your own error handlers in the png_create_read_struct() earlier.
*/
+#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4
+ if (setjmp(png_jmpbuf(m_pPNG)))
+#else
if (setjmp(m_pPNG->jmpbuf))
+#endif
{
/* Free all of the memory associated with the png_ptr and info_ptr */
png_destroy_write_struct(&m_pPNG, &m_pPNGInfo);
@@ -332,7 +343,11 @@ UT_Error IE_ImpGraphic_BMP::Initialize_P
UT_Error IE_ImpGraphic_BMP::Convert_BMP_Pallet(UT_ByteBuf* pBB)
{
/* Reset error handling for libpng */
+#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4
+ if (setjmp(png_jmpbuf(m_pPNG)))
+#else
if (setjmp(m_pPNG->jmpbuf))
+#endif
{
png_destroy_write_struct(&m_pPNG, &m_pPNGInfo);
return UT_ERROR;
@@ -372,7 +387,11 @@ UT_Error IE_ImpGraphic_BMP::Initialize_P
UT_Error IE_ImpGraphic_BMP::Convert_BMP(UT_ByteBuf* pBB)
{
/* Reset error handling for libpng */
+#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4
+ if (setjmp(png_jmpbuf(m_pPNG)))
+#else
if (setjmp(m_pPNG->jmpbuf))
+#endif
{
png_destroy_write_struct(&m_pPNG, &m_pPNGInfo);
return UT_ERROR;
diff -up abiword-2.8.6/plugins/garble/xp/abiword-garble-png.cpp.png15 abiword-2.8.6/plugins/garble/xp/abiword-garble-png.cpp
--- abiword-2.8.6/plugins/garble/xp/abiword-garble-png.cpp.png15 2012-02-27 15:31:30.178868169 -0500
+++ abiword-2.8.6/plugins/garble/xp/abiword-garble-png.cpp 2012-02-27 15:36:17.795368497 -0500
@@ -79,7 +79,11 @@ bool abiword_document::garble_png( void*
png_set_strip_alpha( png_ptr );
png_set_interlace_handling( png_ptr );
png_set_bgr( png_ptr );
+#if (PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4) && defined(PNG_EASY_ACCESS_SUPPORTED)
+ rowbytes = png_get_rowbytes( png_ptr, info_ptr );
+#else
rowbytes = info_ptr->rowbytes;
+#endif
png_destroy_read_struct( &png_ptr, &info_ptr, NULL );
}
diff -up abiword-2.8.6/src/af/util/xp/ut_png.cpp.png15 abiword-2.8.6/src/af/util/xp/ut_png.cpp
--- abiword-2.8.6/src/af/util/xp/ut_png.cpp.png15 2012-02-27 15:11:18.599397989 -0500
+++ abiword-2.8.6/src/af/util/xp/ut_png.cpp 2012-02-27 15:12:20.560859433 -0500
@@ -71,7 +71,11 @@ bool UT_PNG_getDimensions(const UT_ByteB
* the normal method of doing things with libpng). REQUIRED unless you
* set up your own error handlers in the png_create_read_struct() earlier.
*/
+#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4
+ if (setjmp(png_jmpbuf(png_ptr)))
+#else
if (setjmp(png_ptr->jmpbuf))
+#endif
{
/* Free all of the memory associated with the png_ptr and info_ptr */
png_destroy_read_struct(&png_ptr, &info_ptr, static_cast<png_infopp>(NULL));
diff -up abiword-2.8.6/src/wp/impexp/gtk/ie_impGraphic_GdkPixbuf.cpp.png15 abiword-2.8.6/src/wp/impexp/gtk/ie_impGraphic_GdkPixbuf.cpp
--- abiword-2.8.6/src/wp/impexp/gtk/ie_impGraphic_GdkPixbuf.cpp.png15 2012-02-27 15:24:23.959572417 -0500
+++ abiword-2.8.6/src/wp/impexp/gtk/ie_impGraphic_GdkPixbuf.cpp 2012-02-27 15:26:42.549367943 -0500
@@ -185,7 +185,11 @@ UT_Error IE_ImpGraphic_GdkPixbuf::import
/** needed for the stejmp context */
UT_Error IE_ImpGraphic_GdkPixbuf::_png_write(GdkPixbuf * pixbuf)
{
+#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4
+ if (setjmp(png_jmpbuf(m_pPNG)))
+#else
if (setjmp(m_pPNG->jmpbuf))
+#endif
{
DELETEP(m_pPngBB);
png_destroy_write_struct(&m_pPNG, &m_pPNGInfo);
@@ -446,7 +450,11 @@ UT_Error IE_ImpGraphic_GdkPixbuf::Initia
* the normal method of doing things with libpng). REQUIRED unless you
* set up your own error handlers in the png_create_read_struct() earlier.
*/
+#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4
+ if (setjmp(png_jmpbuf(m_pPNG)))
+#else
if (setjmp(m_pPNG->jmpbuf))
+#endif
{
/* Free all of the memory associated with the png_ptr and info_ptr */
png_destroy_write_struct(&m_pPNG, &m_pPNGInfo);

View File

@ -1,62 +1,75 @@
%define majorversion 2
%define minorversion 8
%define microversion 6
# tar cjvf ~/rpmbuild/SOURCES/abiword-3.0.0.tar.bz2 abiword-3.0.0/ --exclude=.svn
%define majorversion 3
%define minorversion 0
%define microversion 0
%define svnver 0
Summary: Word processing program
Name: abiword
Version: %{majorversion}.%{minorversion}.%{microversion}
Release: 24%{?dist}
Release: 1%{?dist}
Epoch: 1
Group: Applications/Editors
License: GPLv2+
URL: http://www.abisource.com/
Source0: http://abisource.com/downloads/abiword/%{version}/source/abiword-%{version}.tar.gz
Source1: http://abisource.com/downloads/abiword/%{version}/source/abiword-docs-%{version}.tar.gz
Source11: abiword.mime
Source12: abiword.keys
Source13: abiword.xml
URL: http://www.abisource.com/
Patch0: abiword-2.6.0-windowshelppaths.patch
Patch1: abiword-2.8.3-desktop.patch
Patch2: abiword-2.6.0-boolean.patch
BuildRequires: aiksaurus-devel
BuildRequires: aiksaurus-gtk-devel
BuildRequires: asio-devel
BuildRequires: bison
BuildRequires: boost-devel
BuildRequires: bzip2-devel
BuildRequires: cairo-devel
BuildRequires: dbus-glib-devel
BuildRequires: desktop-file-utils
BuildRequires: enchant-devel
BuildRequires: flex
BuildRequires: fribidi-devel
BuildRequires: gtk3-devel
BuildRequires: gtkmathview-devel
BuildRequires: libgsf-devel
BuildRequires: libpng-devel
BuildRequires: librsvg2-devel
BuildRequires: libsoup-devel
BuildRequires: libwmf-devel
BuildRequires: libwpd-devel
BuildRequires: libwpg-devel
BuildRequires: libxslt-devel
BuildRequires: link-grammar-devel
BuildRequires: loudmouth-devel
BuildRequires: ots-devel
BuildRequires: poppler-devel
BuildRequires: popt-devel
BuildRequires: readline-devel
BuildRequires: t1lib-devel
BuildRequires: telepathy-glib-devel
BuildRequires: wv-devel
BuildRequires: zlib-devel
Requires: libabiword = %{epoch}:%{version}-%{release}
%description
AbiWord is a cross-platform Open Source word processor. It is full-featured,
while still remaining lean.
%package -n libabiword
Summary: Library for developing applications based on AbiWord's core
Group: System Environment/Libraries
Patch0: abiword-2.6.0-windowshelppaths.patch
Patch1: abiword-2.8.3-desktop.patch
Patch2: abiword-2.6.0-boolean.patch
Patch103: abiword-2.8.6-libwpd.patch
Patch104: abiword-2.8.6-no-undefined.patch
Patch105: abiword-2.8.6-glib-header-fix.patch
Patch106: abiword-2.8.6-png15.patch
BuildRequires: autoconf, libtool
BuildRequires: desktop-file-utils
BuildRequires: fribidi-devel, enchant-devel, wv-devel
BuildRequires: zlib-devel, popt-devel, libpng-devel
BuildRequires: gtk2-devel, libgsf-devel
BuildRequires: boost-devel, t1lib-devel
BuildRequires: dbus-glib-devel >= 0.70
BuildRequires: readline-devel
BuildRequires: bzip2-devel
BuildRequires: poppler-devel >= 0.4.0
BuildRequires: ots-devel >= 0.4.2
BuildRequires: libwpd-devel >= 0.9.0
BuildRequires: libwpg-devel
BuildRequires: librsvg2-devel
BuildRequires: libwmf-devel
BuildRequires: aiksaurus-devel, aiksaurus-gtk-devel
BuildRequires: link-grammar-devel >= 4.2.2
BuildRequires: gtkmathview-devel >= 0.7.5, flex, bison
BuildRequires: loudmouth-devel
BuildRequires: asio-devel
BuildRequires: libsoup-devel
%description -n libabiword
Library for developing applications based on AbiWord's core.
%package -n libabiword-devel
Summary: Files for developing with libabiword
Group: Development/Libraries
@ -71,13 +84,7 @@ Includes and definitions for developing with libabiword.
# patch abiword
%patch1 -p1 -b .desktop
%if 0%{?fedora} >= 9
%patch2 -p1 -b .boolean
%endif
%patch103 -p0 -b .libwpd
%patch104 -p1 -b .no-undefined
%patch105 -p1 -b .glibfix
%patch106 -p1 -b .png15
# setup abiword documentation
%setup -q -T -b 1 -n abiword-docs-%{version}
@ -86,9 +93,7 @@ Includes and definitions for developing with libabiword.
%build
# build libabiword and abiword
cd $RPM_BUILD_DIR/abiword-%{version}
# we need to update the generated configuration files because of patch104
autoreconf --force --install
%configure --disable-static --enable-dynamic --enable-plugins --enable-clipart --enable-templates
%configure --enable-plugins --enable-clipart --enable-templates
make %{?_smp_mflags} V=1
# build the documentation
@ -96,10 +101,8 @@ cd $RPM_BUILD_DIR/abiword-docs-%{version}
ABI_DOC_PROG=$(pwd)/../%{name}-%{version}/src/abiword ./make-html.sh
%install
# install abiword
cd $RPM_BUILD_DIR/abiword-%{version}
%make_install
make install DESTDIR=%{buildroot}
# install the documentation
cd $RPM_BUILD_DIR/abiword-docs-%{version}
@ -108,28 +111,13 @@ cp -rp help/* $RPM_BUILD_ROOT/%{_datadir}/%{name}-%{majorversion}.%{minorversion
# some of the help dirs have bad perms (#109261)
find $RPM_BUILD_ROOT/%{_datadir}/%{name}-%{majorversion}.%{minorversion}/AbiWord/help/ -type d -exec chmod -c o+rx {} \;
# finish up
mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps/
cp $RPM_BUILD_DIR/abiword-%{version}/abiword_48.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/abiword_48.png
cd $RPM_BUILD_DIR/abiword-%{version}
mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
desktop-file-install \
%if (0%{?fedora} && 0%{?fedora} < 19) || (0%{?rhel} && 0%{?rhel} < 7)
--vendor fedora \
%endif
--dir $RPM_BUILD_ROOT%{_datadir}/applications \
--add-category Office \
./abiword.desktop
%{__install} -p -m 0644 -D %{SOURCE11} $RPM_BUILD_ROOT%{_datadir}/mime-info/abiword.mime
%{__install} -p -m 0644 -D %{SOURCE12} $RPM_BUILD_ROOT%{_datadir}/mime-info/abiword.keys
%{__install} -p -m 0644 -D %{SOURCE13} $RPM_BUILD_ROOT%{_datadir}/mime/packages/abiword.xml
# nuke .la files
%{__rm} -f $RPM_BUILD_ROOT/%{_libdir}/libabiword-%{majorversion}.%{minorversion}.la
%{__rm} -f $RPM_BUILD_ROOT/%{_libdir}/%{name}-%{majorversion}.%{minorversion}/plugins/*.la
install -p -m 0644 -D %{SOURCE11} $RPM_BUILD_ROOT%{_datadir}/mime-info/abiword.mime
install -p -m 0644 -D %{SOURCE12} $RPM_BUILD_ROOT%{_datadir}/mime-info/abiword.keys
install -p -m 0644 -D %{SOURCE13} $RPM_BUILD_ROOT%{_datadir}/mime/packages/abiword.xml
# Remove libtool archives and static libs
find %{buildroot} -name '*.la' -exec rm -f {} ';'
find %{buildroot} -name '*.a' -exec rm -f {} ';'
%post
update-mime-database %{_datadir}/mime > /dev/null 2>&1 || :
@ -145,8 +133,7 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
%{_datadir}/mime-info/abiword.mime
%{_datadir}/mime-info/abiword.keys
%{_datadir}/mime/packages/abiword.xml
%{_datadir}/pixmaps/*.png
%{_datadir}/icons/*.png
%{_datadir}/icons/hicolor/48x48/apps/abiword.png
# Abiword help
%{_datadir}/%{name}-%{majorversion}.%{minorversion}/AbiWord
%{_mandir}/man1/abiword.1.gz
@ -156,6 +143,8 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
%{_libdir}/libabiword-%{majorversion}.%{minorversion}.so
%{_libdir}/%{name}-%{majorversion}.%{minorversion}
%{_datadir}/%{name}-%{majorversion}.%{minorversion}
%{_datadir}/dbus-1/services/org.freedesktop.Telepathy.Client.AbiCollab.service
%{_datadir}/telepathy/clients/AbiCollab.client
# Abiword help - included in GUI app
%exclude %{_datadir}/%{name}-%{majorversion}.%{minorversion}/AbiWord
@ -164,6 +153,9 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
%{_libdir}/pkgconfig/%{name}-%{majorversion}.%{minorversion}.pc
%changelog
* Mon Oct 14 2013 Peter Robinson <pbrobinson@fedoraproject.org> 1:3.0.0-0.1.svnver
- Update to 3.0.0 stable
* Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1:2.8.6-24
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
@ -268,688 +260,3 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
* Sun Nov 01 2009 Marc Maurer <uwog@abisource.com> - 1:2.8.1-1
- New upstream release
* Tue Sep 01 2009 Marc Maurer <uwog@abisource.com> - 1:2.7.10-2
- Unconditionally add the dbus-glib-devel BR since the AbiCollab
Sugar backend is now always compiled in, even on non-OLPC
platforms.
* Sat Aug 29 2009 Marc Maurer <uwog@abisource.com> - 1:2.7.10-1
- New upstream release
* Mon Aug 24 2009 Marc Maurer <uwog@abisource.com> - 1:2.7.9-2
- Make abiword depend on libabiword
* Sun Aug 23 2009 Marc Maurer <uwog@abisource.com> - 1:2.7.9-1
- New upstream version
* Tue Aug 04 2009 Rex Dieter <rdieter@fedoraproject.org> - 1:2.7.8-2
- drop Req: mathml-fonts (dep moved to gtkmathview)
* Sun Aug 02 2009 Marc Maurer <uwog@abisource.com> - 1:2.7.8-1
- New upstream version
* Mon Jul 27 2009 Marc Maurer <uwog@abisource.com> - 1:2.7.7-3
- Rerun autogen.sh after changing the makefiles
* Mon Jul 27 2009 Marc Maurer <uwog@abisource.com> - 1:2.7.7-2
- Add a patch to work around a templates makefile bug
* Mon Jul 27 2009 Marc Maurer <uwog@abisource.com> - 1:2.7.7-1
- New upstream release
- Add --enable-dynamic to configure so plugins link against libabiword.so
* Fri Jul 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1:2.7.6-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
* Sun Jul 05 2009 Marc Maurer <uwog@abisource.com> - 1:2.7.6-3
- Re-add updated .desktop patch
* Sun Jul 05 2009 Peter Robinson <pbrobinson@gmail.com> - 1:2.7.6-2
- Remove old patch
* Sun Jul 05 2009 Peter Robinson <pbrobinson@gmail.com> - 1:2.7.6-1
- New upstream release
* Fri Jun 26 2009 Peter Robinson <pbrobinson@gmail.com> - 1:2.7.5-3
- Drop old dependencies. Fixes bug 506023
* Sun Jun 21 2009 Marc Maurer <uwog@abisource.com> - 1:2.7.5-2
- Package unpackaged icon
* Fri Jun 19 2009 Marc Maurer <uwog@abisource.com> - 1:2.7.5-1
- New upstream release
* Fri Jun 19 2009 Marc Maurer <uwog@abisource.com> - 1:2.7.4-2
- Add libsoup-devel BR
- Remove version from asio-devel BR
- Add libwpg-devel BR
- Register the .abicollab extension and mimetype
* Thu Jun 11 2009 Marc Maurer <uwog@abisource.com> - 1:2.7.4-1
- New upstream release
* Mon Mar 09 2009 Marc Maurer <uwog@abisource.com> - 1:2.6.8-2
- Make g++ 4.4 and rindex friends again
* Mon Mar 09 2009 Marc Maurer <uwog@abisource.com> - 1:2.6.8-1
- New upstream release
* Mon Feb 23 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1:2.6.6-10
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
* Sat Jan 10 2009 Marc Maurer <uwog@abisource.com> - 1:2.6.6-1
- New upstream release
* Sun Nov 23 2008 Marc Maurer <uwog@abisource.com> - 1:2.6.5-1
- New upstream release
* Thu Nov 20 2008 Peter Robinson <pbrobinson@gmail.com> - 1:2.6.4-9
- Remove unused script to drop perl dependency
* Fri Sep 26 2008 Tom "spot" Callaway <tcallawa@redhat.com> - 1:2.6.4-8
- add t1lib-devel to BuildRequires, fixes FTBFS
* Mon Jul 21 2008 Marc Maurer <uwog@abisource.com> - 1:2.6.4-7
- Fix libabiword-devel requires
* Mon Jul 21 2008 Marc Maurer <uwog@abisource.com> - 1:2.6.4-6
- Drop explicit libabiword requires
* Mon Jul 21 2008 Marc Maurer <uwog@abisource.com> - 1:2.6.4-5
- Fix typo in patch name
* Mon Jul 21 2008 Marc Maurer <uwog@abisource.com> - 1:2.6.4-4
- Merge with the OLPC-3 branch
* Sun Jul 13 2008 Marc Maurer <uwog@abisource.com> - 1:2.6.4-3
- We don't include ispell_dictionary_list.xml anymore, so no
need to ghost it
* Sun Jul 13 2008 Marc Maurer <uwog@abisource.com> - 1:2.6.4-2
- Update patches to apply without fuzz
* Sun Jul 13 2008 Marc Maurer <uwog@abisource.com> - 1:2.6.4-1
- New upstream release
* Thu May 01 2008 Marc Maurer <uwog@abisource.com> - 1:2.6.3-1
- New upstream release
* Sun Apr 06 2008 Marc Maurer <uwog@abisource.com> - 1:2.6.2-1
- New upstream release
* Sun Apr 06 2008 Marc Maurer <uwog@abisource.com> - 1:2.6.1-1
- New upstream release
* Sat Mar 29 2008 Marc Maurer <uwog@abisource.com> - 1:2.6.0-6
- Don't forget to cvs add nextgen.sh
* Sat Mar 29 2008 Marc Maurer <uwog@abisource.com> - 1:2.6.0-5
- Include nextgen.sh as abiword-plugins it's a proper autoconf project
- Fix 439396: abiword includes its own dictionary?
- Don't build libabiword, it's broken; re-enable it when we release
abiword 2.8, which generates a proper library
- Drop aspell-devel BR
* Sat Mar 29 2008 Marc Maurer <uwog@abisource.com> - 1:2.6.0-4
- Don't forget to reautogen after changing the plugin build system
* Sat Mar 29 2008 Marc Maurer <uwog@abisource.com> - 1:2.6.0-3
- Fix 439395: apply patch to remove any runtime dependency on boost
* Fri Mar 28 2008 Marc Maurer <uwog@abisource.com> - 1:2.6.0-2
- Add BigEndian32.american.hash that was missing from the disted
abiword-extras tarball
* Tue Mar 25 2008 Marc Maurer <uwog@abisource.com> - 1:2.6.0-1
- New upstream release
- Split off an experimental devel package
* Wed Feb 20 2008 Fedora Release Engineering <rel-eng@fedoraproject.org> - 1:2.4.6-8
- Autorebuild for GCC 4.3
* Tue Jan 29 2008 Michel Salim <michel.sylvan@gmail.com> - 1:2.4.6-7
- Update license field
- Remove build deps on g++ and libstdc++ (in minimum build environment)
- Remove .cvsignore files from installed doc; fix abw2html.pl permission
- Add support for goffice-0.6 when building on Fedora 9 and above
- Fix for F9 glibc lacking TRUE and FALSE
* Tue Sep 04 2007 Lubomir Kundrak <lkundrak@redhat.com> - 1:2.4.6-6.fc7
- Fix 248103
* Fri Apr 06 2007 Marc Maurer <uwog@abisource.com> - 1:2.4.6-5.fc7
- Rebuild
* Fri Apr 06 2007 Marc Maurer <uwog@abisource.com> - 1:2.4.6-4.fc7
- Fix 234765
* Tue Feb 20 2007 Marc Maurer <uwog@abisource.com> - 1:2.4.6-3.fc7
- Fix 181799
* Fri Feb 02 2007 Marc Maurer <uwog@abisource.com> - 1:2.4.6-2.fc7
- Rebuild
* Sun Nov 05 2006 Marc Maurer <uwog@abisource.com> - 1:2.4.6-1.fc7
- Update to 2.4.6
* Thu Oct 12 2006 Marc Maurer <uwog@abisource.com> - 1:2.4.5-4.fc6
- Fix bug 207294
* Mon Sep 11 2006 Marc Maurer <uwog@abisource.com> - 1:2.4.5-3.fc6
- Rebuild for FC6
* Sat Jul 22 2006 Marc Maurer <uwog@abisource.com> - 1:2.4.5-2.fc6
- Fix http://bugzilla.abisource.com/show_bug.cgi?id=10229
* Sun Jul 09 2006 Marc Maurer <uwog@abisource.com> - 1:2.4.5-1.fc6
- Update to 2.4.5
- Fix bug 196690 - abiword fails to build in mock with minimal
build environment
- Drop the document build patch
* Tue Apr 13 2006 Marc Maurer <uwog@abisource.com> - 1:2.4.4-2.fc6
- Fix documentation generation
- Fix charting support
* Tue Apr 11 2006 Marc Maurer <uwog@abisource.com> - 1:2.4.4-1.fc6
- New upstream version
- Remove the macro patch and update the desktop patch
* Wed Mar 29 2006 Marc Maurer <uwog@abisource.com> - 1:2.4.2-8.fc6
- Rebuild
* Wed Mar 08 2006 Marc Maurer <uwog@abisource.com> - 1:2.4.2-7.fc5
- Disable the collaboration plugin; it is not working in 2.4.x
* Thu Feb 16 2006 Marc Maurer <uwog@abisource.com> - 1:2.4.2-6.fc5
- Rebuild for Fedora Extras 5
* Sun Feb 05 2006 Marc Maurer <uwog@abisource.com> - 1:2.4.2-5.fc5
- bug 171926
* Sat Jan 21 2006 Marc Maurer <uwog@abisource.com> - 1:2.4.2-4.fc5
- Disable the PDF plugin for now, as poppler doesn't ship the xpdf
headers anymore
* Sat Jan 14 2006 Marc Maurer <uwog@abisource.com> - 1:2.4.2-3.fc5
- Remove redundant requires - bug 177305
* Thu Jan 05 2006 Marc Maurer <uwog@abisource.com> - 1:2.4.2-2.fc5
- Bump release, forgot to add desktop patch
* Mon Jan 02 2006 Marc Maurer <uwog@abisource.com> - 1:2.4.2-1.fc5
- Update to 2.4.2
- Add BuildRequires readline-devel for the AbiCommand plugin
- Add BuildRequires bzip2-devel and poppler-devel for plugins
- Update desktop patch
- Patch to fix plugin marcros
* Wed Nov 09 2005 Marc Maurer <uwog@abisource.com> - 1:2.4.1-4.fc5
- Fix bug 171928
* Sun Oct 23 2005 Marc Maurer <uwog@abisource.com> - 1:2.4.1-3.fc5
- Fix bug 161832: "Abiword is not loading certain modules"
- Add libgsf dependecy, which was needed all along
- Disable the collaboration plugin, it is not for general use at all
* Tue Oct 11 2005 Marc Maurer <uwog@abisource.com> - 1:2.4.1-2
- Use %%{?dist} in the release name
* Sun Oct 9 2005 Marc Maurer <uwog@abisource.com> - 1:2.4.1-1
- Update to 2.4.1
* Mon Oct 3 2005 Marc Maurer <uwog@abisource.com> - 1:2.4.0-1
- Require mathml-fonts
- Don't rerun autogen.sh, no need anymore
- Update gtkmathview dependency to 0.7.5
- Update to 2.4.0
* Mon Sep 26 2005 Marc Maurer <uwog@abisource.com> - 1:2.3.99-2
- Fix gtkmathview BuildRequires
* Thu Sep 22 2005 Marc Maurer <uwog@abisource.com> - 1:2.3.99-1
- Update to 2.3.99
* Sat Sep 10 2005 Marc Maurer <uwog@abisource.com> - 1:2.3.6-1
- Update to 2.3.6
- Drop the pango patch
* Sat Sep 3 2005 Marc Maurer <uwog@abisource.com> - 1:2.3.5-3
- Rebuild
* Sat Sep 3 2005 Marc Maurer <uwog@abisource.com> - 1:2.3.5-2
- Enable the abimathview plugin
* Sun Aug 21 2005 Marc Maurer <uwog@abisource.com> - 1:2.3.5-1
- Update to 2.3.5
* Fri Aug 19 2005 Marc Maurer <uwog@abisource.com> - 1:2.3.4-4
- Update the pango patch to disable more pango code
* Fri Aug 19 2005 Marc Maurer <uwog@abisource.com> - 1:2.3.4-3
- Fix the build after applying the pango disabling patch by
rerunning autogen.sh
* Fri Aug 19 2005 Marc Maurer <uwog@abisource.com> - 1:2.3.4-2
- Disable the experimental pango renderer
* Thu Aug 17 2005 Marc Maurer <uwog@abisource.com> - 1:2.3.4-1
- Update to 2.3.4
- Add link-grammar dependency
* Thu Jul 28 2005 Marc Maurer <uwog@abisource.com> - 1:2.2.9-1
- Update to 2.2.9
- Drop the mailmerge patch again
* Sun Jun 6 2005 Marc Maurer <uwog@abisource.com> - 1:2.2.8-2
- Fix build with mailmerge patch
* Sun Jun 6 2005 Marc Maurer <uwog@abisource.com> - 1:2.2.8-1
- Update to 2.2.8
* Sun May 22 2005 Jeremy Katz <katzj@redhat.com> - 1:2.2.7-2
- rebuild on all arches
* Mon Apr 4 2005 Marc Maurer <uwog@abisource.com> - 1:2.2.7-1
- Because we love brown paper bag releases
* Sun Apr 3 2005 Marc Maurer <uwog@abisource.com> - 1:2.2.6-1
- Drop the gcc4, wvread, virtdestr and pt64 patches
- Update the desktop patch
* Fri Mar 15 2005 Marc Maurer <uwog@abisource.com> - 1:2.2.5-3
- Fix 64bit build
- Add virtual destructors to classes with virtual functions
* Fri Mar 14 2005 Marc Maurer <uwog@abisource.com> - 1:2.2.5-2
- Remove the --disable-magick plugin switch
- disable GDA support until the plugin is ported to gnomedb 1.2.x
- Change the download location from SF to http://www.abisource.com/
- patch libole2
- fix read as a macro in new glibc
* Fri Mar 2 2005 Caolan McNamara <caolanm@redhat.com> - 1:2.2.5-1
- bump to latest stable
- drop integrated dashboard patch again
- some gcc4 fixes
* Wed Feb 23 2005 Caolan McNamara <caolanm@redhat.com> - 1:2.2.4-2
- rh#149447# dashboard spam revisited
* Tue Feb 22 2005 Caolan McNamara <caolanm@redhat.com> - 1:2.2.4-1
- bump to latest stable version
- drop integrated nautilus depend patch
- drop integrated libwpd depend patch
* Fri Feb 11 2005 Caolan McNamara <caolanm@redhat.com> - 1:2.2.3-4
- upgrade to libwpd-0.8 and incoroprate necessary changeover patches
* Mon Feb 7 2005 Matthias Clasen <mclasen@redhat.com> - 1:2.2.3-3
- rebuild
* Mon Feb 2 2005 Caolan McNamara <caolanm@redhat.com> - 1:2.2.3-2
- remove unneccessary nautilus dependency
* Mon Jan 17 2005 Caolan McNamara <caolanm@redhat.com> - 1:2.2.3-1
- bump to new version
- drop integrated silenceabidash patch
* Fri Jan 14 2005 Caolan McNamara <caolanm@redhat.com> - 1:2.2.2-4
- RH#145085# annoying cluepacket message on stdout/stderr
* Wed Jan 12 2005 Tim Waugh <twaugh@redhat.com> - 1:2.2.2-3
- Rebuilt for new readline.
* Tue Jan 11 2005 Caolan McNamara <caolanm@redhat.com> - 1:2.2.2-2
- RH#143368# use enchant as spellchecker
* Mon Dec 13 2004 Caolan McNamara <caolanm@redhat.com> - 1:2.2.2-1
- bump to new version
* Mon Dec 6 2004 Caolan McNamara <caolanm@redhat.com> - 1:2.2.1-1
- bump to new version
- geometry patch upstreamed
- security patch upstreamed
- removeoledecod patch upstreamed
- regenerate desktop patch
* Mon Nov 22 2004 Caolan McNamara <caolanm@redhat.com> - 1:2.2.0-2
- #abi7961# remove tempnam usages
* Mon Nov 22 2004 Caolan McNamara <caolanm@redhat.com> - 1:2.2.0-1
- bump to latest major stable version
- #rh140321# sanity check geometry
* Tue Nov 9 2004 Caolan McNamara <caolanm@redhat.com> - 1:2.0.14-1
- bump to latest stable version
* Mon Nov 8 2004 Jeremy Katz <katzj@redhat.com> - 1:2.0.12-4
- rebuild for python 2.4
* Thu Sep 30 2004 Christopher Aillon <caillon@redhat.com> 1:2.0.12-3
- Change to PreReq instead of Requires(post), up to 0.9
* Thu Sep 29 2004 Caolan McNamara <caolanm@redhat.com> 1:2.0.12-2
- Better Requires desktop-file-utils
* Wed Sep 29 2004 Caolan McNamara <caolanm@redhat.com> 1:2.0.12-1
- update to new abiword, + change norwegian wordprocessor translation
* Tue Sep 14 2004 Caolan McNamara <caolanm@redhat.com> 1:2.0.11-3
- #132389# Add more abiword supported mime types to abiword.desktop
* Mon Sep 6 2004 Caolan McNamara <caolanm@redhat.com> 1:2.0.11-2
- merge abiword.keys into abiword.desktop
* Fri Aug 27 2004 Caolan McNamara <caolanm@redhat.com> 1:2.0.11-1
- 2.0.11
* Tue Aug 10 2004 Caolan McNamara <caolanm@redhat.com> 1:2.0.10-2
- use libgnomedb
* Tue Aug 10 2004 Caolan McNamara <caolanm@redhat.com> 1:2.0.10-1
- 2.0.10
- use aiksaurus
* Tue Aug 2 2004 Matthias Clasen <mclasen@redhat.com> 1:2.0.9-4
- rebuilt
* Thu Jul 29 2004 Caolan McNamara <caolanm@redhat.com> 1:2.0.9-3
- #126012# some desktop translations
* Wed Jul 28 2004 Caolan McNamara <caolanm@redhat.com> 1:2.0.9-2
- #128004# fix irritating windows looking filenames for generated pngs
* Fri Jul 16 2004 Caolan McNamara <caolanm@redhat.com> 1:2.0.9-1
- 2.0.9, new version with security fix
* Tue Jun 15 2004 Elliot Lee <sopwith@redhat.com>
- rebuilt
* Thu May 20 2004 Caolan McNamara <caolanm@redhat.com> 1:2.0.6-1
- 2.0.7, new version + gcc34 fixes
* Wed Apr 28 2004 Caolan McNamara <caolanm@redhat.com> 1:2.0.6-1
- 2.0.6, 64bit changes made upstream
* Sat Mar 13 2004 Jeremy Katz <> 1:2.0.5-1
- 2.0.5
* Tue Mar 02 2004 Elliot Lee <sopwith@redhat.com>
- rebuilt
* Thu Feb 19 2004 Jeremy Katz <katzj@redhat.com> - 1:2.0.3-3
- rebuild for newer libots and libwpd
- fix verify as non-root (#109261)
- add wpd files to abiword.keys (#114907)
* Fri Feb 13 2004 Elliot Lee <sopwith@redhat.com>
- rebuilt
* Thu Jan 29 2004 Jeremy Katz <katzj@redhat.com> - 1:2.0.3-1
- 2.0.3 (fixes build against gtk+ 2.3 and lets us rebuild to fix libcroco dep)
* Wed Dec 17 2003 Jeremy Katz <katzj@redhat.com> 1:2.0.2-2
- rebuild for new libwpd
* Sun Nov 30 2003 Jeremy Katz <katzj@redhat.com>
- and librsvg2-devel (#111222)
* Fri Nov 28 2003 Jeremy Katz <katzj@redhat.com>
- buildrequire libgnomeui-devel (#111164)
* Tue Oct 28 2003 Jeremy Katz <katzj@redhat.com> 1:2.0.1-1
- 2.0.1
- really remove duplicate desktop file
* Tue Oct 21 2003 Jeremy Katz <katzj@redhat.com> 1:2.0.0-6
- make the docs with the just built abiword so that we don't have to
have abiword installed to build the docs (#107279)
* Tue Oct 21 2003 Jeremy Katz <katzj@redhat.com> 1:2.0.0-5
- fix linkage to glib 1.2 in hancom plugin (#106033)
* Sun Oct 19 2003 Florian La Roche <Florian.LaRoche@redhat.de>
- add %%clean specfile target
* Tue Oct 14 2003 Jeremy Katz <katzj@redhat.com> 1:2.0.0-4
- remove duplicate desktop file (#107023)
* Tue Sep 23 2003 Jeremy Katz <katzj@redhat.com> 1:2.0.0-3
- include the help
- show the clipart (#104577)
* Mon Sep 15 2003 Jeremy Katz <katzj@redhat.com> 1:2.0.0-2
- rebuild with newer libwpd and libots to get those plugins
* Sun Sep 14 2003 Jeremy Katz <katzj@redhat.com> 1:2.0.0-1
- 2.0.0
* Thu Sep 4 2003 Jeremy Katz <katzj@redhat.com> 1:1.99.6-1
- 1.99.6
* Mon Aug 25 2003 Jeremy Katz <katzj@redhat.com> 1:1.99.5-1
- 1.99.5
* Tue Aug 5 2003 Jeremy Katz <katzj@redhat.com> 1:1.99.3-1
- 1.99.3
- put icon in the right place (#101646)
- fix some 64bit casting issues
- disable ots plugin for now, doesn't seem to build with ots 0.4.0 :/
- disable -pedantic -ansi so that it will build
* Mon Jul 14 2003 Jeremy Katz <katzj@redhat.com> 1:1.99.2-2
- ugly hack to deal with libtool silliness on x86_64
* Fri Jul 11 2003 Jeremy Katz <katzj@redhat.com> 1:1.99.2-1
- 1.99.2
- add buildrequires to make sure the ots and wp plugins get built
- no longer needs libgal2, remove buildrequires
* Mon Jun 16 2003 Jeremy Katz <katzj@redhat.com> 1:1.99.1-1
- 1.99.1
* Wed Jun 04 2003 Elliot Lee <sopwith@redhat.com>
- rebuilt
* Mon May 26 2003 Jeremy Katz <katzj@redhat.com> 1:1.9.1-3
- rebuild for new libgal2
* Mon May 19 2003 Jeremy Katz <katzj@redhat.com> 1:1.9.1-2
- tweak plugins build
* Mon May 12 2003 Jeremy Katz <katzj@redhat.com> 1:1.9.1-0.2
- 1.9.1
- drop old patches, switch to using autoconf based build system instead
of diving makefiles
- build with gnome support
- build with plugins
- add patch to build on AMD64
* Mon Apr 28 2003 Tim Powers <timp@redhat.com> 1:1.0.5-2
- rebuild to fix broken libpspell dep
* Mon Mar 24 2003 Jeremy Katz <katzj@redhat.com> 1:1.0.5-1
- 1.0.5
* Mon Feb 10 2003 Jeremy Katz <katzj@redhat.com> 1:1.0.4-2
- fix for abiword starting off the screen (#82425)
* Thu Jan 23 2003 Jeremy Katz <katzj@redhat.com> 1:1.0.4-1
- 1.0.4
* Wed Jan 22 2003 Tim Powers <timp@redhat.com>
- rebuilt
* Sun Dec 29 2002 Jeremy Katz <katzj@redhat.com> 1:1.0.3-2
- make it build on x86_64
* Sun Dec 29 2002 Jeremy Katz <katzj@redhat.com> 1:1.0.3-1
- 1.0.3 (#80560)
- set umask before running mkfontdir in %%post
- patch AbiWord script to convert utf8 locales into non-utf8 variants (#72633)
* Mon Dec 02 2002 Elliot Lee <sopwith@redhat.com> 1.0.2-7
- Fix doc lines
- Fix multilib
* Sat Aug 10 2002 Elliot Lee <sopwith@redhat.com> 1.0.2-6
- rebuilt with gcc-3.2 (we hope)
* Sat Aug 10 2002 Jeremy Katz <katzj@redhat.com> 1.0.2-5
- fix help index symlink (#71219)
* Thu Aug 1 2002 Jeremy Katz <katzj@redhat.com> 1.0.2-4
- add abiword binary symlink for upstream compatibility (#70267)
* Mon Jul 22 2002 Tim Powers <timp@redhat.com> 1.0.2-3
- rebuild using gcc-3.2-0.1
* Thu Jul 18 2002 Jeremy Katz <katzj@redhat.com> 1.0.2-2
- use included desktop file (#64447)
- use desktop-file-install
* Wed Jun 26 2002 Jeremy Katz <katzj@redhat.com> 1.0.2-1
- 1.0.2
- disable perl module build since we weren't including it anyway
* Wed May 29 2002 Bernhard Rosenkraenzer <bero@redhat.com> 1.0.1-1
- 1.0.1
* Sun Apr 14 2002 Jeremy Katz <katzj@redhat.com> 0.99.5-1
- zh_CN and zh_TW fonts.dir were flipped
- update to 0.99.5 as it fixes some major bugs
- define ABI_BUILD_VERSION so the about screen gives us a version
* Mon Apr 8 2002 Bennhard Rosenkraenzer <bero@redhat.com> 0.99.4-2
- 1st try at fixing up CJK (#61590)
- #if 0'ify font warning dialog (#62909, #64556)
* Tue Apr 2 2002 Bernhard Rosenkraenzer <bero@redhat.com> 0.99.4-1
- Update to 0.99.4, fixes #61153
- Fix #61344
- Nuke the warning about being unable to add anything to font path,
that's not how xfs works.
* Thu Feb 28 2002 Bernhard Rosenkraenzer <bero@redhat.com> 0.99.2-1
- 0.99.2
- remove blank lines in fonts.dir
* Thu Jan 31 2002 Bernhard Rosenkraenzer <bero@redhat.com> 0.99.1-1
- 0.99.1
* Wed Jan 30 2002 Alex Larsson <alexl@redhat.com> 0.9.5-3
- Added patch to use libpng10
- Added patch to fix perl build problems.
* Fri Nov 23 2001 Bernhard Rosenkraenzer <bero@redhat.com> 0.9.5-1
- 0.9.5
* Tue Oct 23 2001 Bernhard Rosenkraenzer <bero@redhat.com> 0.9.4.1-1
- Update to 0.9.4.1 (RFE #54806)
- Add URL (RFE #54590)
* Thu Jul 19 2001 Bernhard Rosenkraenzer <bero@redhat.com> 0.7.14-7
- Fix uninstall (#49350)
* Sat Jul 7 2001 Tim Powers <timp@redhat.com>
- rebuilt so that dirs aren't sgid root
* Tue Jun 26 2001 Bernhard Rosenkraenzer <bero@redhat.com> 0.7.14-5
- Add build requirements (#45157)
* Tue Jun 26 2001 Bernhard Rosenkraenzer <bero@redhat.com> 0.7.14-4
- Remove CVS admin files from documentation (#44916)
* Mon Jun 18 2001 Florian La Roche <Florian.LaRoche@redhat.de>
- add s390x patch from <oliver.paukstadt@millenux.com>
* Sat Jun 09 2001 Florian La Roche <Florian.LaRoche@redhat.de>
- add s390 patch from Helge Deller
* Tue May 22 2001 Bernhard Rosenkraenzer <bero@redhat.com> 0.7.14-1
- Update to 0.7.14
* Tue Feb 27 2001 Bernhard Rosenkraenzer <bero@redhat.com>
- Handle MIME type stuff (Bug #27530)
- Add BuildPrereqs for some of the less common stuff AbiWord uses
(gal-devel, gnome-print-devel, libunicode-devel)
* Tue Feb 20 2001 Bernhard Rosenkraenzer <bero@redhat.com>
- 0.7.13
* Mon Jan 15 2001 Than Ngo <than@redhat.com>
- fixed broken code for building
* Fri Dec 29 2000 Matt Wilson <msw@redhat.com>
- 0.7.12
- copy fonts.dir to fonts.scale so mkfontdir doesn't blow it away
* Tue Dec 12 2000 Bernhard Rosenkraenzer <bero@redhat.com>
- Rebuild to get rid of 0777 dirs
* Fri Nov 17 2000 Bernhard Rosenkraenzer <bero@redhat.com>
- 0.7.11
* Sun Aug 20 2000 Preston Brown <pbrown@redhat.com>
- fix path to chkfontpath, it was wrong.
* Fri Aug 11 2000 Jonathan Blandford <jrb@redhat.com>
- Up Epoch and release
* Mon Aug 7 2000 Jakub Jelinek <jakub@redhat.com>
- Don't ship AbiWord_s if we have AbiWord_d
- Register AbiWord's fontpath with xfs
* Wed Aug 2 2000 Bernhard Rosenkraenzer <bero@redhat.com>
- Rebuild with new libpng. This fixes Bug #13707 - gotta love it when they
change the ABI without increasing the soname!
- fix tooltip (Bug #14711)
- move binaries from /usr/share to /usr/lib
* Wed Jul 12 2000 Jakub Jelinek <jakub@redhat.com>
- Fix build on ia64.
* Wed Jul 12 2000 Prospector <bugzilla@redhat.com>
- automatic rebuild
* Tue Jul 4 2000 Jakub Jelinek <jakub@redhat.com>
- Rebuild with new gcc.
* Sat Jun 18 2000 Bernhard Rosenkraenzer <bero@redhat.com>
- Fix build on ia64
* Fri Jun 17 2000 Bernhard Rosenkraenzer <bero@redhat.com>
- 0.7.10
- update download location
* Fri Jun 9 2000 Bernhard Rosenkraenzer <bero@redhat.com>
- initial build for main CD
- clean up specfile
- fix build with gcc 2.96 and glibc 2.2
- exclude ia64 for now
* Wed May 3 2000 Bernhard Rosenkraenzer <bero@redhat.com>
- 0.7.9
* Wed Feb 2 2000 Bernhard Rosenkraenzer <bero@redhat.com>
- 0.7.8
- move the desktop file to /etc/X11/applnk so it can be used in both
GNOME and KDE
- fix up handling of RPM_OPT_FLAGS
* Thu Jan 20 2000 Tim Powers <timp@redhat.com>
- bzipped source to conserve space.
* Sun Jan 9 2000 Matt Wilson <msw@redhat.com>
- enable GNOME, remove perl hack to do RPM_OPT_FLAGS
- added libpng requirement. 0.7.7 requires 1.0.5 libpng ABI
* Tue Jan 4 2000 Bernhard Rosenkraenzer <bero@redhat.com>
- 0.7.7
- handle RPM_OPT_FLAGS
* Mon Nov 15 1999 Tim Powers <timp@redhat.com>
- first build for inclusion into Powertools.
- some things in this spec file are from the abisuite-0.7.5-1mdk package

View File

@ -1,2 +1,2 @@
197df94c1d9ed287903cb5aa0b60bbc1 abiword-docs-2.8.6.tar.gz
f883b0a7f26229a9c66fd6a1a94381aa abiword-2.8.6.tar.gz
8d9c41cff3a8fbef8d0c835c65600e65 abiword-3.0.0.tar.gz
ed73d0743a19eb85e46b59464e0ef2bb abiword-docs-3.0.0.tar.gz