From: Edward Betts Date: Thu, 4 Dec 2014 22:00:10 +0000 (+0000) Subject: abiword (3.0.0-8) unstable; urgency=medium X-Git-Tag: archive/raspbian/3.0.2-9+rpi1~1^2^2^2~12 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=6674036dc175a8b1a3e1dfbd568a3a10a5aa1156;p=abiword.git abiword (3.0.0-8) unstable; urgency=medium * QA upload. * Apply an upstream patch to fix format painter bug. (Closes: #766845). [dgit import unpatched abiword 3.0.0-8] --- 6674036dc175a8b1a3e1dfbd568a3a10a5aa1156 diff --cc debian/README.Debian index 0000000,0000000..1316d02 new file mode 100644 --- /dev/null +++ b/debian/README.Debian @@@ -1,0 -1,0 +1,36 @@@ ++abiword for Debian ++------------------ ++ ++GNOME dependencies ++================== ++ ++The normal abiword and abiword-gnome packages have been merged into ++one abiword package. The gnomeui and gnomevfs support is ++intentionally disabled in debian/rules to avoid depending on a large ++array of GNOME libraries. ++ ++ -- Masayuki Hatta (mhatta) Sun, 22 Mar 2009 18:42:01 +0900 ++ ++Smooth scrolling issue ++====================== ++ ++Debian bug #276070 complains that smooth-scrolling is obnoxious and slow. ++As of 2.6.3-1, it has been disabled by default using a patch. However, if ++you are a previous AbiWord user, your preferences file may have the smooth ++scroll setting set to true in your config file, overriding the default. ++ ++To fix this, I quote from the AbiWord ML: ++ ++"I think you can turn this feature off with a profile change. Open up ++your AbiWord.Profile file and in the custom scheme section ( Fri, 11 Jul 2008 14:08:34 +0300 ++ ++ diff --cc debian/TODO.Debian index 0000000,0000000..9d07450 new file mode 100644 --- /dev/null +++ b/debian/TODO.Debian @@@ -1,0 -1,0 +1,6 @@@ ++ ++Building using --with-gtk2 fixes the following bugs: ++ ++ - (Closes: #672150) "Clip art window is practically unusable". ++ ++but completely breaks all collaborative editing. diff --cc debian/abiword-common.install index 0000000,0000000..8169967 new file mode 100644 --- /dev/null +++ b/debian/abiword-common.install @@@ -1,0 -1,0 +1,7 @@@ ++usr/share/abiword-*/certs ++usr/share/abiword-*/clipart ++usr/share/abiword-*/strings ++usr/share/abiword-*/system.* ++usr/share/abiword-*/templates ++usr/share/abiword-*/ui ++usr/share/abiword-*/xsltml diff --cc debian/abiword-common.sharedmimeinfo index 0000000,0000000..c0afaab new file mode 100644 --- /dev/null +++ b/debian/abiword-common.sharedmimeinfo @@@ -1,0 -1,0 +1,7 @@@ ++ ++ ++ ++ AbiWord Collaborative Document ++ ++ ++ diff --cc debian/abiword-plugin-grammar.install index 0000000,0000000..6583a8c new file mode 100644 --- /dev/null +++ b/debian/abiword-plugin-grammar.install @@@ -1,0 -1,0 +1,1 @@@ ++usr/lib/*/abiword-*/plugins/grammar.so diff --cc debian/abiword-plugin-mathview.install index 0000000,0000000..ff7e699 new file mode 100644 --- /dev/null +++ b/debian/abiword-plugin-mathview.install @@@ -1,0 -1,0 +1,1 @@@ ++usr/lib/*/abiword-*/plugins/mathview.so diff --cc debian/abiword.docs index 0000000,0000000..951130f new file mode 100644 --- /dev/null +++ b/debian/abiword.docs @@@ -1,0 -1,0 +1,3 @@@ ++AUTHORS ++user/wp/readme.txt ++user/wp/readme.abw diff --cc debian/abiword.install index 0000000,0000000..bb8b244 new file mode 100644 --- /dev/null +++ b/debian/abiword.install @@@ -1,0 -1,0 +1,5 @@@ ++usr/bin ++usr/lib/*/abiword-*/plugins/*.so ++usr/share/applications ++abiword.png usr/share/pixmaps ++debian/abiword.xpm usr/share/pixmaps diff --cc debian/abiword.lintian-overrides index 0000000,0000000..d3bd83c new file mode 100644 --- /dev/null +++ b/debian/abiword.lintian-overrides @@@ -1,0 -1,0 +1,5 @@@ ++# false-positives ++hardening-no-fortify-functions ++ ++# perhaps not important for plugins ++library-not-linked-against-libc usr/lib/*/abiword-*/plugins/* diff --cc debian/abiword.manpages index 0000000,0000000..e26b89b new file mode 100644 --- /dev/null +++ b/debian/abiword.manpages @@@ -1,0 -1,0 +1,1 @@@ ++abiword.1 diff --cc debian/abiword.menu index 0000000,0000000..79e9250 new file mode 100644 --- /dev/null +++ b/debian/abiword.menu @@@ -1,0 -1,0 +1,5 @@@ ++?package(abiword):needs="X11" section="Applications/Office"\ ++ title="AbiWord Word Processor" command="/usr/bin/abiword"\ ++ hints="Word processor"\ ++ icon="/usr/share/pixmaps/abiword.xpm" ++ diff --cc debian/abiword.mime index 0000000,0000000..27b22eb new file mode 100644 --- /dev/null +++ b/debian/abiword.mime @@@ -1,0 -1,0 +1,22 @@@ ++application/docbook+xml; abiword '%s' ; edit=abiword '%s' ; test=test "$DISPLAY" != "" ; description="DocBook XML Document" ; priority=2 ++application/msword; abiword '%s' ; edit=abiword '%s' ; test=test "$DISPLAY" != "" ; description="Microsoft Word Document" ; priority=2 ++application/rtf; abiword '%s' ; edit=abiword '%s' ; test=test "$DISPLAY" != "" ; description="Rich Text document" ; priority=2 ++application/vnd.oasis.opendocument.text; abiword '%s' ; edit=abiword '%s' ; test=test "$DISPLAY" != "" ; description="OASIS Open Document" ; priority=2 ++application/vnd.palm; abiword '%s' ; edit=abiword '%s' ; test=test "$DISPLAY" != "" ; description="Palm Database" ; priority=2 ++application/vnd.plain; abiword '%s' ; edit=abiword '%s' ; test=test "$DISPLAY" != "" ; description="Plain text" ; priority=2 ++application/vnd.stardivision.writer; abiword '%s' ; edit=abiword '%s' ; test=test "$DISPLAY" != "" ; description="StarOffice Writer document" ; priority=2 ++application/vnd.sun.xml.writer; abiword '%s' ; edit=abiword '%s' ; test=test "$DISPLAY" != "" ; description="OpenOffice.org Text document" ; priority=2 ++application/vnd.ms-word; abiword '%s' ; edit=abiword '%s' ; test=test "$DISPLAY" != "" ; nametemplate=%s.doc ; description="Microsoft Word Document" ; priority=2 ++application/wordperfect; abiword '%s' ; edit=abiword '%s' ; test=test "$DISPLAY" != "" ; nametemplate=%s.wpd ; description="Corel WordPerfect Document" ++application/vnd.wordperfect; abiword '%s' ; edit=abiword '%s' ; test=test "$DISPLAY" != "" ; nametemplate=%s.wpd ; description="Corel WordPerfect Document" ++application/wordperfect5.1; abiword '%s' ; edit=abiword '%s' ; test=test "$DISPLAY" != "" ; description="Corel WordPerfect Document" ; priority=2 ++application/wordperfect6; abiword '%s' ; edit=abiword '%s' ; test=test "$DISPLAY" != "" ; description="Corel WordPerfect Document" ; priority=2 ++application/x-abiword; abiword '%s' ; edit=abiword '%s' ; test=test "$DISPLAY" != "" ; description="AbiWord Document" ; priority=2 ++application/x-abicollab; abiword '%s' ; edit=abiword '%s' ; test=test "$DISPLAY" != "" ; description="AbiWord Collaborative Document" ; priority=2 ++application/x-applix-word; abiword '%s' ; edit=abiword '%s' ; test=test "$DISPLAY" != "" ; description="Applix Word Document" ; priority=2 ++application/x-palm-database; abiword '%s' ; edit=abiword '%s' ; test=test "$DISPLAY" != "" ; description="Palm Database" ; priority=2 ++text/abiword; abiword '%s' ; edit=abiword '%s' ; test=test "$DISPLAY" != "" ; description="AbiWord Document" ; priority=2 ++text/plain; abiword '%s' ; edit=abiword '%s' ; test=test "$DISPLAY" != "" ; description="Text file" ; priority=2 ++text/richtext; abiword '%s' ; edit=abiword '%s' ; test=test "$DISPLAY" != "" ; description="Rich Text document" ; priority=2 ++text/rtf; abiword '%s' ; edit=abiword '%s' ; test=test "$DISPLAY" != "" ; description="Rich Text document" ; priority=2 ++text/vnd.wap.wml; abiword '%s' ; edit=abiword '%s' ; test=test "$DISPLAY" != "" ; description="Wireless Application Protocol WML file" ; priority=2 diff --cc debian/abiword.preinst index 0000000,0000000..5ba5284 new file mode 100644 --- /dev/null +++ b/debian/abiword.preinst @@@ -1,0 -1,0 +1,38 @@@ ++#!/bin/sh ++# preinst script for abiword ++# ++# see: dh_installdeb(1) ++ ++set -e ++ ++# summary of how this script can be called: ++# * `install' ++# * `install' ++# * `upgrade' ++# * `abort-upgrade' ++# for details, see http://www.debian.org/doc/debian-policy/ or ++# the debian-policy package ++ ++ ++case "$1" in ++ install|upgrade) ++ if [ -f /usr/bin/defoma-app ] ; then ++ defoma-app purge abiword > /dev/null || true ++ fi ++ ;; ++ ++ abort-upgrade) ++ ;; ++ ++ *) ++ echo "preinst called with unknown argument \`$1'" >&2 ++ exit 1 ++ ;; ++esac ++ ++# dh_installdeb will replace this with shell code automatically ++# generated by other debhelper scripts. ++ ++#DEBHELPER# ++ ++exit 0 diff --cc debian/changelog index 0000000,0000000..57d58e4 new file mode 100644 --- /dev/null +++ b/debian/changelog @@@ -1,0 -1,0 +1,2363 @@@ ++abiword (3.0.0-8) unstable; urgency=medium ++ ++ * QA upload. ++ * Apply an upstream patch to fix format painter bug. (Closes: #766845). ++ ++ -- Edward Betts Thu, 04 Dec 2014 22:00:10 +0000 ++ ++abiword (3.0.0-7) unstable; urgency=medium ++ ++ * Build-Depends: libjpeg8-dev --> libjpeg-dev (Closes: #763464). ++ Facilitates transition to "libjpeg-turbo". Thanks, Ondřej Surý. ++ * Standards-Version: 3.9.6. ++ * Orphaning package. ++ ++ -- Dmitry Smirnov Thu, 02 Oct 2014 19:57:42 +1000 ++ ++abiword (3.0.0-6) unstable; urgency=medium ++ ++ [ Rene Engelhard ] ++ * Add "librevenge.patch" (from Fedora 20) to fix build with new ++ librevenge/libwp{,g} 0.3 and adapt Build-Depends; ++ Add exta dh_autoreconf calls for plugins/wpg and plugins/wordperfect ++ dirs so they get generated (and dh_autoreconf_clean). ++ ++ [ Dmitry Smirnov ] ++ * Added "debian/gbp.conf". ++ * Standards-Version to 3.9.5. ++ ++ -- Dmitry Smirnov Sat, 09 Aug 2014 11:14:12 +1000 ++ ++abiword (3.0.0-5) unstable; urgency=medium ++ ++ * Build-Depends: +libgcrypt20-dev. ++ * New patch to fix gnutls-related FTBFS (Closes: #754554); ++ Thanks, Andreas Metzler. ++ ++ -- Dmitry Smirnov Thu, 24 Jul 2014 03:13:18 +1000 ++ ++abiword (3.0.0-4) unstable; urgency=medium ++ ++ * New patch to fix FTBFS with libboost1.54 (Closes: #737551). ++ ++ -- Dmitry Smirnov Thu, 06 Feb 2014 04:25:45 +1100 ++ ++abiword (3.0.0-3) unstable; urgency=medium ++ ++ * Upload to unstable (Closes: #677402, #705145). ++ * New patch to fix FTBFS with bison v3 (Closes: #733391). ++ ++ -- Dmitry Smirnov Sun, 02 Feb 2014 20:49:49 +1100 ++ ++abiword (3.0.0-2) experimental; urgency=low ++ ++ * No longer Build-Depends on "valgrind" on "armel" (Closes: #729137). ++ ++ -- Dmitry Smirnov Mon, 25 Nov 2013 08:11:33 +1100 ++ ++abiword (3.0.0-1) experimental; urgency=low ++ ++ * New upstream stable release [October 2013]. ++ * Transition: evolution-data-server (Closes: #722030) ++ + new "evolution-data-server3.8.patch". ++ + versioned Build-Deps: ++ + libebook1.2-dev (>= 3.8.5) ++ + libecal1.2-dev (>= 3.8.5) ++ Thanks, Michael Biebl. ++ * "debian/watch": no longer check development releases. ++ * "debian/rules": ++ + better checking for library name ++ + adaptive dh-clean to facilitate build from source archive and from ++ repository checkout. ++ + export LDFLAGS using DEB_LDFLAGS_MAINT_APPEND. ++ * Removed libgoffice note from README.Debian as abiword is linked with ++ libgoffice again. ++ ++ -- Dmitry Smirnov Tue, 22 Oct 2013 15:38:08 +1100 ++ ++abiword (3.0.0~svn20130523-2) experimental; urgency=low ++ ++ * Re-build to facilitate "libcogl" transition (Closes: #721196). ++ * libabiword-3.0-dev: added missing Depends (Closes: #711088). ++ * (Build-)Depends: ++ + versioned depends only when required. ++ + sort and update. ++ * Added lintian-override for "library-not-linked-against-libc" ++ in plugins. ++ ++ -- Dmitry Smirnov Sun, 01 Sep 2013 03:55:10 +1000 ++ ++abiword (3.0.0~svn20130523-1) experimental; urgency=low ++ ++ * New upstream pre-release [r33076]. ++ * Dropped all backported patches. ++ * Dropped unused lintian-overrides. ++ * Removed obsolete "DM-Upload-Allowed" field. ++ * Build-Depends: ++ + libchamplain-gtk-0.12-dev ++ + libebook1.2-dev ++ + libecal1.2-dev ++ + libgoffice-0.10-dev (>= 0.10.2) ++ * Standards to version 3.9.4. ++ * Updated copyright, added translator's copyrights. ++ * Updated and improved rules and get-orig-source ++ + added pre-build check for library version. ++ + build "--with-goffice" and "goffice" plugin. ++ * Replaced "-2.9" with "-*" in install paths. ++ * Updated my email address; bumped copyright years. ++ ++ -- Dmitry Smirnov Sat, 01 Jun 2013 15:04:42 +1000 ++ ++abiword (2.9.2+svn20120603-8) unstable; urgency=medium ++ ++ * new backported patch to fix yet another crash on open .DOC files. ++ ++ -- Dmitry Smirnov Fri, 05 Oct 2012 10:54:53 +1000 ++ ++abiword (2.9.2+svn20120603-7) unstable; urgency=low ++ ++ * new backported patches: ++ + r31854_bug-13397-RTF-import-fix-missing-text.patch ++ to fix missing numbers in beginning of lines on RTF/DOC import ++ (Closes: #688552). ++ + r31855_gtk3-bug-13405.patch ++ + r31877_start-layout-only-after-document-is-fully-loaded.patch ++ - removed unused (duplicate) patch file. ++ ++ -- Dmitry Smirnov Mon, 24 Sep 2012 11:10:44 +1000 ++ ++abiword (2.9.2+svn20120603-6) unstable; urgency=low ++ ++ * debian/watch to find all available versions with fallback to latest-dev. ++ * new patch to fix collab backend if built --with-gtk2 and to fix FTBFS ++ without libgtk-3-dev (finally abiword can be built for GTK2). ++ * new backported patches: ++ + r31861_fix-FTBFS-with-fake-collab-backend.patch ++ + r31901_fix-crash-on-open-doc-with-table-in-header.patch ++ + r31909_fix-doc-corruption.patch ++ + r31910_fix-memory-leak-in-ABW-exporter.patch ++ + r31914_fix-clip-art-window.patch (Closes: #672150) ++ * beautified list of Build-Depends. ++ * libchamplain-gtk-0.12-dev (optional build-dependency) is added to ++ Build-Depends (commented, to conform with freeze policy). ++ ++ -- Dmitry Smirnov Thu, 13 Sep 2012 13:08:48 +1000 ++ ++abiword (2.9.2+svn20120603-5) unstable; urgency=low ++ ++ * xz compression for binary packages. ++ * new backported patch to fix gtk3 presentation (Closes: #682613). ++ ++ -- Dmitry Smirnov Thu, 30 Aug 2012 13:24:15 +1000 ++ ++abiword (2.9.2+svn20120603-4) unstable; urgency=low ++ ++ * new backported patches: ++ + r31490_fix-crash-if-inserting-a-footnote.patch ++ + r31566_rearrange-date-and-time-formats.patch ++ + r31576_remove-separator-from-insert-dialogs.patch ++ + r31748_fix-crash-with-copy-paste.patch ++ + r31749_fix-bug-with-copy-paste.patch ++ + r31753_fix-crash-on-paste.patch ++ + r31755_fix-crash-with-create-and-modify-styles-dialog.patch ++ + r31767_fix-possible-crash.patch ++ + r31768_correct-horizontal-scroll-limit.patch ++ + r31842_fix-crash-13401.patch ++ + r31843_prevent-crash.patch ++ + r31847_fix-program-hanging-during-paste-unformatted.patch ++ * old backported patches are renamed to have revision number in file name. ++ * lintian-override for 'no-symbols-control-file' (not useful for CPP). ++ ++ -- Dmitry Smirnov Fri, 24 Aug 2012 11:09:56 +1000 ++ ++abiword (2.9.2+svn20120603-3) unstable; urgency=low ++ ++ * Replace no-dbl-buf.patch with backported fix-dbl-buff.patch ++ to fix 'Paste Unformatted' and re-enable double buffering. ++ ++ -- Dmitry Smirnov Fri, 17 Aug 2012 20:16:51 +1000 ++ ++abiword (2.9.2+svn20120603-2) unstable; urgency=low ++ ++ * build verbosity increased with --disable-silent-rules ++ * lintian-overrides: ++ + 'hardening-no-fortify-functions' (false-positives). ++ + 'dev-pkg-without-shlib-symlink' (libabiword-2.9.so is a library, ++ not a symlink). ++ * new patches: ++ + format-hardening.patch to avoid FTBFS on --with-gtk2 build. ++ + fix-wheel-scrolling.patch (Closes: #672149). ++ + fix-paste.patch (backported) with fix for ++ "Crash on unicode character paste" (Closes: #681060). ++ + no-dbl-buf.patch to disable double buffering in order to prevent ++ crash on 'Paste Unformatted'. ++ ++ -- Dmitry Smirnov Fri, 17 Aug 2012 11:08:23 +1000 ++ ++abiword (2.9.2+svn20120603-1) unstable; urgency=low ++ ++ * New upstream version based on 'trunk' r31326 as of 2012-06-02 ++ + updated man page ++ + updated translations ++ + fixed crash on text selection (Closes: #672412) ++ + fixed crash with 'borders and shading' (Closes: #672148) ++ * depends on 'fonts-lyx' instead of transitional 'ttf-lyx' ++ (Closes: #674820) ++ * dropped debian/copyright.hints and its generation code ++ * new patch to avoid FTBFS in 'grammar' plugin ++ * minor make-clean.patch update ++ * Debian source compression to .xz ++ * DM-Upload-Allowed: yes! (Thanks to Aron Xu) ++ ++ -- Dmitry Smirnov Wed, 06 Jun 2012 03:37:53 +1000 ++ ++abiword (2.9.2+svn20120406-1) unstable; urgency=low ++ ++ * New upstream version based on 'trunk' r30779 as of 2012-04-05 ++ (Closes: #666491 N:"document totally crashes abiword...") ++ • dropped FTBFS-regression.patch (applied-upstream) ++ • dropped gnomeoffice-url.patch (applied-upstream) ++ * d-rules: get correct number of CPUs for parallel build on Linux ++ (Closes: #665853 W:"Build process not is paralleled on some Linux ++ architectures") ++ * minor update to get-orig-source to produce cleaner ©.hints file ++ ++ -- Dmitry Smirnov Sat, 07 Apr 2012 14:40:54 +1000 ++ ++abiword (2.9.2+svn20120215-2) unstable; urgency=low ++ ++ * d-copyright: ++ + audit of upstream copyrights/licenses; ++ + added copyrights of debian contributors ++ + DEP-5 URL is updated ++ * copyright.hints and 'licensecheck' target ++ to track upstream copyright/licensing changes ++ * d-control: ++ + build-deps: transition from 'libpng12-dev' to 'libpng-dev' ++ (Closes: #662262 I:"Build-Depends on libpng-dev..." ++ + standards to 3.9.3 ++ + 'flex' moved to build-deps from build-deps-indep ++ to always rebuild arc-independent files ++ * d-rules: build with '+bindnow' hardening ++ ++ -- Dmitry Smirnov Mon, 05 Mar 2012 15:11:31 +1100 ++ ++abiword (2.9.2+svn20120215-1) unstable; urgency=low ++ ++ * New Upstream Release, based on 'trunk' version as of 2012-02-14 ++ * dropped hardening-format.patch (applied upstream) ++ * patch to fix dangerous regression causing FTBFS on GNU Hurd ++ * debian/watch is corrected to mangle/ignore subversion number ++ ++ -- Dmitry Smirnov Sun, 19 Feb 2012 19:40:39 +1100 ++ ++abiword (2.9.2+svn20120213-1) unstable; urgency=low ++ ++ * New Upstream Release, based on 'trunk' version as of 2012-02-12 ++ (Closes: #659658 "segfaults on powerpc") ++ ++ -- Dmitry Smirnov Fri, 17 Feb 2012 21:11:38 +1100 ++ ++abiword (2.9.2+svn20120131-1) unstable; urgency=low ++ ++ * New Upstream Release, based on 'trunk' version as of 2012-01-30 ++ * compat & debhelper to version 9 ++ * updates for multi-arch ++ * .xpm icon generated with imagemagick on build time ++ * make-clean patch is updated to prevent breakage in trunk source tree ++ * enabled format hardening thanks to new format hardening patch ++ (applied upstream) ++ * arch-dependent patching redone in GNU Make style ++ * get-orig-source split in GNU Make style ++ * orig.source compression to xz ++ * added some build-time information print-out ++ ++ -- Dmitry Smirnov Mon, 06 Feb 2012 19:40:51 +1100 ++ ++abiword (2.9.2+svn20120123-1) unstable; urgency=low ++ ++ * New Upstream Release, based on 'trunk' version as of 2012-01-23 ++ (Closes: #657287 "very slow start with many fonts installed") ++ * Added upstream ChangeLog ++ * Drop FTBFS patch for GNU/Hurd (accepted upstream) ++ * Drop 656335-telepathy.patch (not needed in trunk) ++ * Disabled make-clean.patch (not needed in trunk) ++ * Disabled old fix-format-security.patch (needs update) ++ * Patch to update Gnome Office URL (Closes: #657909) ++ * Recommend fonts-liberation instead of ttf-liberation ++ * flex added to Build-Depends-Indep to force regeneration of lex.yy.c ++ * subversion(-tools) added to Build-Depends to satisfy get-orig-source ++ * debian/rules: ++ + get-orig-source modified for SVN ++ + --enable-collab-backend-sugar ++ + --with-redland ++ + safer defaults for parallel build ++ * Bugs squashed: ++ - (Closes: #582225 "Abiword hangs/freezes when trying to embed ++ Gnumeric file") ++ - (Closes: #650302 "When changing principal direction of bidi text, ++ it gets reversed and then cursor skips) ++ - (Closes: #456624 "renders Khmer Unicode as small circles unless a ++ Khmer font is applied") ++ ++ -- Dmitry Smirnov Fri, 27 Jan 2012 19:21:11 +1100 ++ ++abiword (2.9.2-5) unstable; urgency=low ++ ++ * debian/control: removed unnecessary build-deps ++ * debian/rules: check if flex is available to regenerate ++ plugins/mathview/itex2mml/lex.yy.c ++ ++ -- Dmitry Smirnov Wed, 25 Jan 2012 16:21:31 +1100 ++ ++abiword (2.9.2-4) unstable; urgency=low ++ ++ * FTBFS4Hurd.patch is updated. ++ * force build-time regeneration of binary files shipped with sources ++ + 'bison' added to Build-Depends ++ * patch to prevent abiword from breaking its own source tree ++ (prevent failure on second build) ++ * arch-specific patch no longer break second build ++ ++ -- Dmitry Smirnov Sat, 21 Jan 2012 12:20:09 +1100 ++ ++abiword (2.9.2-3) unstable; urgency=low ++ ++ * debian/abiword.mime: added missing end-of-line ++ (Closes: #623136) Thanks to Kalle Olavi Niemitalo ++ * VCS links updated to point to collab-maint ++ * Build options updated: ++ + new plugin: epub ++ + new backend: telepathy (Closes: #656335) Thanks to Svante Signell ++ (implemented with patch to add missing upstream file from trunk) ++ + --with-libtidy to clean up HTML before importing (MHT plugin) ++ - removed --enable-static (no longer build static libraries) ++ - removed --enable-shave (use --enable-silent-rules instead) ++ + added --enable-silent-rules ++ + added --enable-dependency-tracking (speed up build) ++ * new abiword-dbg package (Closes: #562733) ++ ++ -- Dmitry Smirnov Thu, 19 Jan 2012 19:31:11 +1100 ++ ++abiword (2.9.2-2) unstable; urgency=low ++ ++ * libabiword-2.9-dev Depends (Closes: #656252) ++ * fixed debian/patches/series ++ * fixed arch-dependent patching (Closes: #648153) ++ * safer parallel build ++ ++ -- Dmitry Smirnov Thu, 19 Jan 2012 03:13:36 +1100 ++ ++abiword (2.9.2-1) unstable; urgency=low ++ ++ * New Upstream Release (2011-11-14) ++ * New maintainer (Closes: #648341) ++ * Packaging update ++ + standards to recent versions ++ - completely dropped CDBS, in favour of debhelper ++ + parallel build ++ + --as-needed to minimize needless linking ++ + dh-autoreconf replaced old patches for make files ++ + use dpkg-provided build flags + hardening ++ + build-depends update (Closes: #655308) ++ - dropped libgoffice dependency (to package latest abiword 2.9.2) ++ + added note to README.Debian ++ + debian/copyright to DEP-5 format ++ + revised mime-types-desktop patch (Closes: #608164) ++ + new patch to disable smooth scrolling (Closes: #624095) ++ + new patch (only applied on Hurd) to fix GNU Hurd build problem ++ (Closes: #648153) (Thanks to Svante Signell) ++ + debian/watch is updated ++ - README.source is removed ++ ++ -- Dmitry Smirnov Mon, 21 Nov 2011 01:58:27 +1100 ++ ++abiword (2.9.1-0.2) unstable; urgency=low ++ ++ * Non-maintainer upload. ++ * Drop Build-Depends on obsolete libgucharmap2-dev. Closes: #648026 ++ ++ -- Michael Biebl Tue, 08 Nov 2011 13:06:45 +0100 ++ ++abiword (2.9.1-0.1) unstable; urgency=low ++ ++ [ Hector Oron ] ++ * New upstream release. ++ * Fix plugin license incompatibility introduced in NMU ++ abiword/2.8.6-0.1 (Closes: #602687). ++ * Merge diff for NMU version 2.8.6-0.3 (Closes: #613294). ++ * Build depend on libgsf-1-dev, librasqal3-dev, librdf0-dev. ++ * Fix bogus build depend on libwpd8-dev to libwpd-dev. ++ * Fix build with hardening flags (format-security). ++ * Refresh fix_no_undefined patch. ++ ++ [ Patrik Fimml ] ++ * New upstream release (closes: #577733) ++ * Do not ship libtool .la file (Policy 10.2) ++ * Remove build-dependency on libaspell-dev (closes: #570647) ++ * Switch to 3.0 (quilt) source package format ++ ++ -- Hector Oron Thu, 20 Oct 2011 01:00:54 +0000 ++ ++abiword (2.8.6-0.4) unstable; urgency=low ++ ++ * Non-maintainer upload. ++ * Stop shipping .la files. Closes: #33314. ++ * Pass -Wl,--no-undefined instead of --no-undefined. Closes: #628267. ++ ++ -- Regis Boudin Wed, 24 Aug 2011 20:50:05 +0100 ++ ++abiword (2.8.6-0.3) unstable; urgency=low ++ ++ * Non-maintainer upload. ++ * by request of the release team: disable psion plugin, as it blocks ++ this package ++ ++ -- Rene Engelhard Sun, 13 Feb 2011 22:26:18 +0100 ++ ++abiword (2.8.6-0.2) unstable; urgency=low ++ ++ * Non-maintainer upload. ++ * build against libwpd 0.9.0/libwpg 0.2.0/libwps 0.2.0 (closes: #604826) ++ * build-depend on libxcb-render-util0-dev ++ ++ -- Rene Engelhard Sun, 13 Feb 2011 14:14:51 +0100 ++ ++abiword (2.8.6-0.1) unstable; urgency=low ++ ++ [ Jari Aalto ] ++ * Non-maintainer upload. ++ * New upstream release. Fixes: ++ - Can't open password protected ODT files (Closes: #577733). ++ - Scrolling with cursor keys is slow (important; Closes: #498285). ++ - Crash on occasions when importing OpenDocument files. ++ - Crash when trying to print (important; Closes: #580346). ++ - Crash on accessing Tools -> Thesaurus menu (normal; Closes: #569272). ++ - Crash on saving as PDF (normal; Closes: #520424). ++ - Crash on trying to access Help (normal: Closes: #586245). ++ - Crash on 3 MiB RTF file (normal; Closes: #552575); ++ * debian/control ++ - (Standards-Version): Update to 3.9.1. ++ * debian/patches ++ - (fixes/svn-backports.diff): Remove. Obsoleted by new release ++ - (fixes/mime-types.diff): Refresh. Move abiword.desktop changes to ++ separate diff. ++ - (fixes/mime-types-desktop.diff): New file. ++ ++ [ Hideki Yamane (Debian-JP) ] ++ * debian/rules ++ - (CC, CXX): Remove variables. ++ - (LDFLAGS): New variable. Move content from --as-needed from CC, CXX ++ variable. See bug #577871 for details. ++ * debian/control ++ - (Build-Depends): Add flex, bison. ++ ++ -- Jari Aalto Wed, 20 Oct 2010 14:46:20 +0300 ++ ++abiword (2.8.2-2) unstable; urgency=low ++ ++ * Move from libgoffice-0-8-dev to libgoffice-0.8-dev (see #570351, ++ closes: #573653, #572043) ++ ++ -- Patrik Fimml Sat, 13 Mar 2010 13:31:40 +0100 ++ ++abiword (2.8.2-1) unstable; urgency=low ++ ++ * New upstream release ++ * Build-depend on libaspell-dev (closes: 569373) ++ * Move from latex-xft-fonts to ttf-lyx (closes: 539529) ++ ++ -- Patrik Fimml Sat, 13 Feb 2010 17:56:03 +0100 ++ ++abiword (2.8.1-2) unstable; urgency=low ++ ++ * Ship abiword.pc (closes: #557021) ++ * Tighten libasio-dev build-dependency (closes: #557037) ++ * Fix goffice interface function signature mismatch (closes: #560475) ++ * Build without gucharmap (buggy, dropped in trunk; closes: #556746) ++ * Rewrite manpage (closes: #537988) ++ * Do not build abiword-plugin-goffice ++ ++ -- Patrik Fimml Fri, 11 Dec 2009 19:11:17 +0100 ++ ++abiword (2.8.1-1) unstable; urgency=low ++ ++ * New upstream release ++ * Make myself maintainer (closes: #548365) ++ * Documentation is now in abiword-docs, built from a separate source ++ package. ++ * Merge abiword-plugin-goffice into main package, as abiword requires ++ goffice in any case. ++ * Ship libabiword-2.8 (closes: #512777) ++ * Remove dependency on libreadline5-dev (closes: #553713) ++ * Drop build-dep on libgnomeprintui (closes: #542552) ++ ++ -- Patrik Fimml Tue, 03 Nov 2009 22:00:58 +0100 ++ ++abiword (2.6.8-5) unstable; urgency=low ++ ++ * To make sure, -plugins are installed two times at different points ++ - closes: #521223 ++ ++ -- Masayuki Hatta (mhatta) Thu, 26 Mar 2009 19:23:21 +0900 ++ ++abiword (2.6.8-4) unstable; urgency=low ++ ++ * debian/rules: Rearranged the order of targets again, now installs ++ some missing .glades. ++ ++ -- Masayuki Hatta (mhatta) Wed, 25 Mar 2009 22:34:35 +0900 ++ ++abiword (2.6.8-3) unstable; urgency=low ++ ++ * valgrind is available only on selected architectures, and not ++ really required for building abiword. Thus, I removed it from ++ Build-Depends - closes: #521030. ++ * abiword-common: not depends on abiword anymore - closes: #495744 ++ * 04_comma_subscript.diff: seems I forgot to import this patch from ++ the old package. Added. ++ ++ -- Masayuki Hatta (mhatta) Wed, 25 Mar 2009 08:54:40 +0900 ++ ++abiword (2.6.8-2) unstable; urgency=low ++ ++ * The configure scripts of -docs and -extras need a working abiword ++ binary at the build time, which is not available unless you've ++ already installed (existing) abiword package. To solve this ++ chicken-or-egg question(especially for buildd), I rearranged the ++ order of targets in debian/rules. pbuilder is your friend ++ - closes: #521074 ++ ++ -- Masayuki Hatta (mhatta) Tue, 24 Mar 2009 22:41:32 +0900 ++ ++abiword (2.6.8-1) unstable; urgency=low ++ ++ * New upstream release. ++ * Rewrote the build system with CDBS & Quilt. ++ * Added Recommends: ttf-liberation - closes: #495927 ++ * Added Homepage: field in debian/control - closes: #508733 ++ * Added debian/watch - closes: #494830 ++ * Added CREDITS.TXT - closes: #491237 ++ * debian/copyright: Cleaned it up. Now the abiword tarballs don't ++ contain any source trees of external 3rd party libraries. ++ ++ -- Masayuki Hatta (mhatta) Sun, 22 Mar 2009 18:42:01 +0900 ++ ++abiword (2.6.4-5) unstable; urgency=low ++ ++ * Fix a crash when returning from Print Preview. closes: #492211 ++ ++ -- Joshua Kwan Tue, 19 Aug 2008 19:55:01 -0700 ++ ++abiword (2.6.4-4) unstable; urgency=high ++ ++ * The "Strike three, yer out!" release. ++ * Creating the dummy abiword-plugins package created yet another scenario ++ where we have to remove the diversions to the desktop files created by ++ the old packages. ++ ++ -- Joshua Kwan Tue, 22 Jul 2008 22:20:21 -0700 ++ ++abiword (2.6.4-3) unstable; urgency=medium ++ ++ * The "Strike two" release. ++ * Creating the dummy abiword-plugins package created a scenario where ++ abiword-plugin-grammar would conflict filewise with the old ++ abiword-plugins package, so add a Conflicts for abiword-plugins (<< 2.6.4) ++ to the grammar and mathview plugin packages. ++ ++ -- Joshua Kwan Mon, 14 Jul 2008 17:29:27 -0700 ++ ++abiword (2.6.4-2) unstable; urgency=medium ++ ++ * I disabled the "auto-save by default" patch by mistake and kept ++ a "disable smooth scrolling by default" patch in that I decided ++ to drop at the last minute. Fix dumb mistake. ++ ++ -- Joshua Kwan Mon, 14 Jul 2008 12:02:50 -0700 ++ ++abiword (2.6.4-1) unstable; urgency=medium ++ ++ * The "Please Ubuntu, take this package!" release. ++ * New upstream stable release, incorporating many build bits from Ryan ++ Pavlik. Thanks! (His Ubuntu changelogs follow this entry.) ++ closes: #473508, #488069 ++ * Using medium priority to try and beat the freeze given the NEW delay ++ that this package will incur. ++ ++ * Major changes: ++ - Split out the abiword-plugins and abiword-plugins-gnome package into ++ three individual plugin packages: ++ ++ Recommended: abiword-plugin-mathview, abiword-plugin-grammar ++ Suggested: abiword-plugin-goffice (due to GNOME dependencies) ++ ++ - The old abiword-plugins and abiword-plugins-gnome packages have been ++ obsoleted and abiword-plugins-gnome is now a Conflicts/Replaces in ++ abiword. Because abiword-plugins has been split into two packages, ++ though, there is a dummy abiword-plugins package to ease upgrades. ++ ++ - There is no more abiword-gnome package. We only ship the GTK2 version, ++ which does depend on GNOME-Print, but that does not rely on the usual ++ large set of GNOME UI libraries. ++ ++ - Many of the file import/export plugins formerly provided only by the ++ abiword-plugins package are now included in the base distribution to ++ provide the best out-of-box functionality for those who install only ++ the abiword package. This means that no matter what, the abiword package ++ now has ODF/OOXML support. ++ ++ * Minor changes: ++ - Drop psiconv support overall to alleviate dependency bloat/package spam, ++ at the risk of offending the one guy who still has a Psion 5. ++ - Upgrade to debhelper 7 and Policy 3.8.0. ++ - Drop one of Ryan's Ubuntu patches by building abiword-2.6.pc in the ++ configure stage of debian/rules. Lose autoconf/automake build dep. ++ - Upgrade boost build-dependency to 1.35 to quell some apt-get insanity ++ while pbuilder satisfies the Build-Depends. ++ ++ * Bug fixes from upstream: ++ - Print preview now matches onscreen layout more accurately. ++ closes: #336216 ++ - Font operations are all done using Pango now, so the XAP_UnixFont ++ crash should no longer occur. closes: #443048, #444957 ++ - Spellcheck button is no longer greyed out gratuitously. closes: #422520 ++ - "!!" and "??" in DejaVu Sans Mono seem to be correctly monospaced ++ now. closes: #470949 ++ - AbiWord can now import OpenWriter files without a MIME type. ++ closes: #376417 ++ - Build error affecting 2.4.6 was already fixed upstream, but thanks ++ to Peter Green for the patch and Lucas Nussbaum for the report. ++ closes: #490414 ++ ++ -- Joshua Kwan Mon, 14 Jul 2008 10:26:14 -0700 ++ ++abiword (2.6.3-0ubuntu1+ppa2) hardy; urgency=low ++ ++ * Add dh_desktop to register MIME types. ++ * Update control for better upgrading. ++ ++ -- Ryan Pavlik Mon, 26 May 2008 14:41:28 -0500 ++ ++abiword (2.6.3-0ubuntu1+ppa1) hardy; urgency=low ++ ++ * Fix FTBFS due to problem in 02_add_mimetypes_to_desktop.dpatch ++ ++ -- Ryan Pavlik Fri, 02 May 2008 18:51:01 +0200 ++ ++abiword (2.6.3-0ubuntu1) hardy; urgency=low ++ ++ * Update to new upstream release. ++ * Remove debian/patches/50_backport_pre263.dpatch due to update. ++ * Remove debian/patches/20_disable_smooth_scrolling_default.dpatch ++ based on additional feedback on modern (Hardy-class) machines. ++ ++ -- Ryan Pavlik Thu, 01 May 2008 23:39:57 +0200 ++ ++abiword (2.6.2-0ubuntu2+ppa3) hardy; urgency=low ++ ++ * Add 20_disable_smooth_scrolling_default to improve ++ responsiveness by default. ++ * Upload to new abiword-stable repository. ++ * Fix 00list file for backport patch. ++ ++ -- Ryan Pavlik Sun, 27 Apr 2008 12:25:45 +0200 ++ ++abiword (2.6.2-0ubuntu2+ppa2) hardy; urgency=low ++ ++ * Fix FTBFS - add libpopt-dev build-dep for same reason as below. ++ ++ -- Ryan Pavlik Tue, 22 Apr 2008 04:41:14 +0200 ++ ++abiword (2.6.2-0ubuntu2+ppa1) hardy; urgency=low ++ ++ * Fix FTBFS - add libglade2-dev dependency that was being pulled ++ in presumably by libgoffice, even though Abi uses it directly ++ itself. ++ * Add poppler-utils to recommends for PDF import. ++ * Remove libgnome2-dev build-dep, not needed since GTK and GNOME ++ versions were merged. ++ ++ -- Ryan Pavlik Tue, 22 Apr 2008 01:48:37 +0200 ++ ++abiword (2.6.2-0ubuntu2) hardy; urgency=low ++ ++ * Removed libgoffice build-dep due to incompatibility with 0.6 and ++ 0.4 (libgoffice-0-dev)'s presence only in universe ++ * Removed python-dev build-dep: we never needed it. ++ * Removed libpoppler build-dep: new PDF import plugin uses runtime ++ binaries (pdftotxt or pdftoabw) which should be included with ++ poppler. ++ * Updated control file to always appropriately upgrade plugins. ++ ++ -- Ryan Pavlik Mon, 21 Apr 2008 21:10:09 +0200 ++ ++abiword (2.6.2-0ubuntu1) hardy; urgency=low ++ ++ * New upstream version and associated packaging changes. ++ (LP: #202174) (LP: #36807) (LP: #56694) (LP: #3197) ++ * Updated build dependencies. ++ * Move all plugins without unreasonable dependencies into main ++ abiword package (LP: #24195) ++ * Merge abiword[-gtk], abiword-gnome, abiword-common (LP: #58662) ++ * Use upstream build system to handle installation during package ++ creation. ++ * Eliminated duplicated "desktop" file and icon in debian/misc in ++ favor of upstream. ++ * Copied manpage into debian/misc due to elimination from upstream ++ source. ++ * Ubuntu changes dropped: ++ - debian/patches/01_aaa_fix_plugins_m4.dpatch: not actually ++ applied in previous package, obsoleted by upstream build system. ++ - debian/patches/01_relibtoolize.dpatch: change obsoleted by ++ improvements to upstream build system. ++ - debian/patches/02_no_pedantic_configure.dpatch: change obsoleted ++ by improvements to upstream build system. ++ - debian/patches/09_bad_MANIFEST_omission.dpatch: change obsoleted ++ by improvements to upstream build system. ++ - debian/patches/13_base_strings.dpatch: upstream build system ++ handles strings properly. ++ - debian/patches/15_pt_BR_string_fix.dpatch: obsoleted by upstream ++ string updates. ++ - debian/patches/17_de_string_fix.dpatch: obsoleted by upstream ++ string updates. ++ - debian/patches/03_workaround_for_ots.dpatch: obsoleted by ++ upstream. ++ - debian/patches/10_browser_handling.dpatch: a better, simpler fix ++ is upstream. ++ - debian/patches/11_history_fullpath.dpatch: better, simpler fix ++ is upstream. ++ - debian/patches/18_new_poppler.dpatch: patch no longer applies - ++ plugin rewritten to use poppler binaries at runtime. ++ - debian/patches/poppler06-api.dpatch: patch no longer applies - ++ plugin rewritten to use poppler binaries at runtime. ++ * Added patches: ++ - debian/patches02_add_mimetypes_to_desktop.dpatch: account for ++ import/export support included in the main package now. ++ - debian/patches/03_modify_extras_pkgconfig.dpatch: fix configure ++ of abiword-extras source sub-package against a non-installed ++ AbiWord ++ * Backported important (reliability/crasher) changes from SVN - ++ patch should be removed from a 2.6.3 package. (Upstream ++ revisions 23441, 23443, 23446, 23451, 23453, 23477, 23481, 23482, 23526) ++ - debian/patches/50_backport_pre263.dpatch ++ ++ -- Ryan Pavlik Mon, 21 Apr 2008 18:53:02 +0200 ++ ++abiword (2.4.6-5) unstable; urgency=low ++ ++ * Rebuilt with the new libots-1-0. ++ * Bumped to Standards-Version: 3.7.3. ++ * Fixed various lintian warnings. ++ ++ -- Masayuki Hatta (mhatta) Sun, 09 Dec 2007 14:21:36 +0900 ++ ++abiword (2.4.6-4) unstable; urgency=low ++ ++ * Sorted out dpatch names. ++ 0- : Debian specific ++ 20-: Translation related ++ 30-: Temporary build fixes. ++ * Rebuilt with libpoppler2, thanks Dmitry E. Oboukhov for build fix! ++ - closes: #452676 ++ ++ -- Masayuki Hatta (mhatta) Tue, 04 Dec 2007 16:23:30 +0900 ++ ++abiword (2.4.6-3) unstable; urgency=low ++ ++ * Maintainer upload, acknowledged NMU - closes: #425066 ++ * Updated menu section - closes: #445031 ++ * Now recommends aspell-dictionary - closes: #447376 ++ * Enabled psion plugin again. ++ * Disabled abigochart plugin for now, since its build fails with the current libgoffice-0-5. I'll investigate this issue later. ++ * Removed a mysterious file named debian/j. Is this joshk's? ++ ++ -- Masayuki Hatta (mhatta) Mon, 29 Oct 2007 21:26:06 +0900 ++ ++abiword (2.4.6-2.1) unstable; urgency=medium ++ ++ * Non-maintainer upload. ++ * Adjust for current version of poppler. Closes: #425066 ++ ++ -- Andreas Barth Tue, 3 Jul 2007 18:20:08 +0000 ++ ++abiword (2.4.6-2) unstable; urgency=low ++ ++ * Acknowledged NMU - closes: #403352 ++ * Now Build-Deps: libgucharmap-dev - closes: #421051 ++ ++ -- Masayuki Hatta (mhatta) Fri, 27 Apr 2007 11:43:36 +0900 ++ ++abiword (2.4.6-1.1) unstable; urgency=low ++ ++ * NMU. ++ * Use unversioned build dependency on python-dev instead of python2.3-dev. ++ ++ -- Matthias Klose Sat, 16 Dec 2006 15:48:30 +0100 ++ ++abiword (2.4.6-1) unstable; urgency=low ++ ++ * New upstream release, which means 01_relibtoolize was updated. ++ - Someone got around to fixing a longstanding DocBook support bug, ++ closes: #164683. ++ - FcFini fix merged upstream, patch removed. ++ - Toolbar buttons now scale, closes: #190690 ++ * Fix a minor, longstanding typo in abw2html.1. Thanks A Costa. ++ closes: #350352. ++ * Fix a typo in German strings file, closes: #321810 ++ * Enable the AbiGOChart plugin (in abiword-plugins-gnome). This allows ++ Gnumeric charts to be pasted into abiword-gnome. closes: #346207 ++ * Merge the AbiRSVG plugin into abiword-plugins. librsvg no longer depends ++ on the GNOME library set (as of quite a while ago!) ++ * Make abiword-plugins a Recommends for abiword and abiword-plugins-gnome ++ a Recommends for abiword-gnome. Remove the Suggests for abiword-common ++ that achieve a similar, but erroneous effect. closes: #362470 ++ ++ -- Joshua Kwan Wed, 29 Nov 2006 02:18:47 -0800 ++ ++abiword (2.4.5-2) unstable; urgency=medium ++ ++ * Fix crash in FcFini(). closes: #388445, #389852 ++ * Build-depend on libfreetype6-dev. closes: #381058 ++ ++ -- Joshua Kwan Wed, 27 Sep 2006 22:56:36 -0700 ++ ++abiword (2.4.5-1) unstable; urgency=low ++ ++ * New upstream release. ++ * Add startup notification bit for the desktop files. closes: #358494 ++ * Merged patches: 17_toolbar_buttons_crash, 16_make_docs_fix ++ * Bump Standards-Version to 3.7.2, no changes required. ++ ++ -- Joshua Kwan Tue, 11 Jul 2006 15:48:51 -0700 ++ ++abiword (2.4.4-1) unstable; urgency=medium ++ ++ * New upstream release. ++ * Acknowledge NMU, thanks Ray. closes: #341201 ++ * Definitely rebuild against libenchant1c2a. (I think binNMUs did this for ++ us, but it's our bug). closes: #342806 ++ * Resolve circular dependency of abiword-common on abiword | abiword-gnome ++ by lowering it to a Recommends. closes: #340015 ++ * Correct a pt_BR string or two. Thanks, Jakson. closes: #344350 ++ * Fix some m4 muck in abiword-plugins before autoreconfiguring. ++ * Add copyright information on included library sources (that aren't used ++ anyway, but oh well). closes: #355774 ++ * Move online help to /usr/share/doc/abiword-help/html and fix the doc-base ++ file. closes: #333647 ++ * Add 16_make_docs.dpatch to fix doc building, which was fixed after 2.4.4 ++ was tagged. ++ * Add 17_toolbar_buttons_crash.dpatch to fix notorious Save-button crash ++ on AMD64. closes: #365841, #334382 ++ ++ -- Joshua Kwan Wed, 10 May 2006 15:42:01 -0700 ++ ++abiword (2.4.2-1) unstable; urgency=low ++ ++ * Works done at Codefest in Malaysia 2006. ++ * New upstream release, long overdue ++ * Acknowledged NMU, thanks jdassen - closes: #338831 ++ * Added Build-Dep: libfreetype6-dev - closes: #340260 ++ * Added gochart & abigrammar plugins - closes: #345087 ++ * Bumped to Standards-Version: 3.6.2.2. ++ ++ -- Masayuki Hatta (mhatta) Sat, 4 Mar 2006 21:47:40 +0900 ++ ++abiword (2.4.1-2.1) unstable; urgency=high ++ ++ * NMU to produce packages that are installable again in a current pure sid ++ environment. (Closes: #338831) ++ * [debian/control] Bumped the libgsf-1-dev, librsvg2-dev, libwpd8-dev build ++ dependencies to make the libgsf transition; versioned the ++ libaiksaurus-1.2-dev and libaiksaurusgtk-1.2-dev build dependencies to ++ make the libstdc++ allocator transition. ++ ++ -- J.H.M. Dassen (Ray) Tue, 29 Nov 2005 06:43:02 +0100 ++ ++abiword (2.4.1-2) unstable; urgency=medium ++ ++ * It looks like Depends: abiword-common (${Source-Version}) doesn't hold up ++ when binNMU'd. Fix this (hence urgency medium.) ++ * Add libpoppler-dev to enable PDF rendering for documents. ++ * Enable the excitingly sexy AbiMathView plugin, add libgtkmathview-dev to ++ build-deps, latex-xft-fonts to Recommends for abiword-plugins. ++ * Also enable the 'AbiCollab' plugin. ++ * Remove libpsiconv-dev from build-deps as it isn't new enough for the ++ current AbiWord. ++ ++ -- Joshua Kwan Tue, 18 Oct 2005 16:35:34 -0700 ++ ++abiword (2.4.1-1) unstable; urgency=medium ++ ++ * New upstream release. ++ * Patch work: ++ - 01_relibtoolize: rediffed, yay automake. ++ - 11_history_fullpath, 13_base_strings: rediffed ++ - 16_msword_importer_fixes, 17_msword_importer_more_fixes: removed (they ++ were HEAD backports) ++ - 18_race_fix.dpatch: removed (also HEAD backport) ++ - 15_manpage_typo.dpatch: merged ++ * Drop the old xfonts-abi package. closes: #327520 ++ * Lose no longer used build-dependency on libgal2.2-dev. closes: #332677 ++ ++ -- Joshua Kwan Sat, 8 Oct 2005 00:19:06 -0700 ++ ++abiword (2.2.10-2) unstable; urgency=medium ++ ++ * Patch work: ++ - 18_race_fix: Fix race condition that manifested itself in Word Count, ++ which could (and did, on amd64) cause a nasty infinite loop. ++ ++ -- Joshua Kwan Sun, 2 Oct 2005 23:18:28 -0700 ++ ++abiword (2.2.10-1) unstable; urgency=high ++ ++ * New upstream release. ++ * Includes security fix for RTF buffer overflow exploit. closes: #329839 ++ (CAN-2005-2964) ++ * Change build-dependency on libreadline4-dev to libreadline5-dev | ++ libreadline-dev. closes: #326391 ++ ++ -- Joshua Kwan Thu, 29 Sep 2005 11:07:10 -0700 ++ ++abiword (2.2.9-1) unstable; urgency=low ++ ++ * New upstream release. ++ * Patch work: ++ - 18_missing_info_files.dpatch (REMOVED): integrated upstream ++ - 06_support_vnd.ms-word.dpatch (REMOVED): integrated upstream ++ - 19_mailmerge_gcc4.dpatch (REMOVED): was a backport. ++ * Correct description for abiword-plugins-gnome - Gnome DB plugin is ++ not available anymore. ++ ++ -- Joshua Kwan Sat, 13 Aug 2005 16:18:34 -0700 ++ ++abiword (2.2.8-2) unstable; urgency=medium ++ ++ * Doh, build-depend on libaiksaurus-1.2-dev! ++ * Bumped Standards-Version to 3.6.2: ++ - Changed Suggests on doc-base to a Recommends. ++ ++ -- Joshua Kwan Mon, 18 Jul 2005 19:23:53 -0700 ++ ++abiword (2.2.8-1) unstable; urgency=medium ++ ++ * The "YOU DO NOT MESS WITH SLEEPING PEOPLE" post-Debconf release. ++ * New upstream release and a rebuild for new enchant, closes: #318212 ++ * Add Recommends on aspell-en | aspell6-dictionary, closes: #303332 ++ * Clean up generated documents to provide build idempotency, closes: #310892 ++ * Fix typo in man page, closes: #300334 ++ * Changed Build-Depends on libnautilus2-dev to libgnomeui-dev, thanks ++ Mohammed Adnène Trojette for the patch. closes: #315178 ++ * Add doc-base references to abiword-help, closes: #314734 ++ * Trash abiword-doc for now, realizing that it's tutorials that are several ++ years old and refer only to the Windows port. closes: #314735 ++ * Patch work: ++ - 16_msword_importer_fixes.dpatch: fix regression of crasher bug #218806, ++ patch from CVS-HEAD. ++ - 17_msword_importer_more_fixes.dpatch: allow 0-byte Word documents to ++ be opened without crashing/burning. (What a concept, eh?) ++ - 18_missing_info_files.dpatch: Add .info files to allow docs to build ++ properly, upstream will fix this soon. ++ - 19_mailmerge_gcc4.dpatch: Add a forward declaration for a class to allow ++ building with GCC 4.x. ++ - 12_gcc4_fix.dpatch (REMOVED): alternate fix pushed upstream. ++ ++ -- Joshua Kwan Fri, 8 Jul 2005 01:40:30 -0700 ++ ++abiword (2.2.7-3) unstable; urgency=medium ++ ++ * Really remove the gnomedb dependencies this time. Thanks Jordi for ++ pointing that out. ++ ++ -- Joshua Kwan Fri, 15 Apr 2005 13:01:33 -0700 ++ ++abiword (2.2.7-2) unstable; urgency=medium ++ ++ * Disable the GDA plugin because of new libgda2-3 which is incompatible. ++ Also, no one uses it... ++ ++ -- Joshua Kwan Fri, 8 Apr 2005 13:25:54 -0700 ++ ++abiword (2.2.7-1) unstable; urgency=medium ++ ++ * Upstream brown paper bag release. ++ ++ -- Joshua Kwan Mon, 4 Apr 2005 17:22:18 -0700 ++ ++abiword (2.2.6-1) unstable; urgency=medium ++ ++ * New upstream release, marked by use of new libwpd8, which fixes 99% ++ of #240895. ++ * This version also sucks much less than 2.2.4 and 2.2.3. closes: #297652 ++ * 64-bit compatibility fix pushed upstream, closes: #285085 ++ * "Page Setup" crasher fixed upstream, closes: #299201 ++ * Locale problems fixed in Debian (not quite clean enough for upstream ++ yet, though.) closes: #264447, #267852 ++ ++ -- Joshua Kwan Sun, 3 Apr 2005 17:22:25 -0700 ++ ++abiword (2.2.4-1) unstable; urgency=low ++ ++ * New upstream release. ++ * Remove aspell-dictionary relationship. closes: #294608 ++ * Patch work: ++ - (UPDATED) 01_relibtoolize.dpatch: autotools still suck! ++ ++ -- Joshua Kwan Sun, 20 Feb 2005 16:36:27 -0800 ++ ++abiword (2.2.3-1) unstable; urgency=low ++ ++ * New upstream release. ++ * Add dh_installmime -i to get our MIME associations back. Oops! ++ * Patch work: ++ - (ADDED) 01_relibtoolize.dpatch: We got lucky that time. Added back. ++ - (ADDED) 14_comma_subscript.dpatch: Ctrl-, is now a subscript toggle key. ++ * Turn some leading capital letters in Description fields to lowercase, ++ to appease lintian. ++ ++ -- Joshua Kwan Wed, 19 Jan 2005 00:53:34 -0800 ++ ++abiword (2.2.2-1) unstable; urgency=low ++ ++ * New upstream release. ++ * Acknowledge really old NMU, closes: #267199 ++ * Patch work: ++ - (REMOVED) 01_relibtoolise.dpatch: Upstream is using a newer automake. ++ - (ADDED): 12_gcc4_fix.dpatch: fixes compile partially on gcc-4.0/amd64 ++ (awaiting a better fix for one part), thanks Andreas Jochens. ++ Closes-halfway: #285085 ++ - (ADDED): 13_base_strings.dpatch: try 'base' languages before giving up ++ on finding a stringset. (closes: #285753) ++ * Add 'Office' to Categories for GNOME desktop files. closes: #287115 ++ * Fix icon paths in desktop files and move abiword_48.png to ++ /usr/share/pixmaps. Thanks Dan Korostelev for the hint about relative ++ icon paths. closes: #284400, #285463 ++ * Re-add the Debian menu file by changing dh_installmenu -a to ++ dh_installmenu -i. Oops! closes: #283376 ++ * Really really add support for application/vnd.ms-word. Thanks ++ Michael Graham for alerting me to my mistake. (was bug#274643) ++ * Delete the obsoleted AbiWord.desktop.kde. ++ * Ditch the nroff plugin which does absolutely nothing right now. ++ closes: #285464 ++ ++ -- Joshua Kwan Sun, 26 Dec 2004 21:37:42 -0800 ++ ++abiword (2.2.1-1) unstable; urgency=low ++ ++ * Incorporated 2.0.14-2 manpage/changelog changes. ++ * New upstream release. ++ * Patch work: ++ - (UPDATED) 01_relibtoolise.dpatch: autotools still suck ++ - (REMOVED) 11_fix_doc_build.dpatch: merged upstream ++ - (REMOVED) 08_bad_g_prgname.dpatch: merged upstream ++ - (ADDED) 11_history_fullpath.dpatch: Make sure file history always points ++ to absolute paths whenever we can detect it. ++ ++ -- Joshua Kwan Fri, 3 Dec 2004 20:16:58 -0800 ++ ++abiword (2.0.14-2) unstable; urgency=low ++ ++ * Be a little less rude to Dan Jacobson in -1's changelog entry. ++ * Fix more typos in abw2html.1. closes: #279826 ++ ++ -- Joshua Kwan Thu, 4 Nov 2004 22:08:41 -0800 ++ ++abiword (2.1.96-1) experimental; urgency=low ++ ++ * New upstream development release. Most changes inherited from 2.0.12-1. ++ * Patch work: ++ - (REMOVED) 05_perl_bindings.dpatch: No longer relevant for this version ++ - (REMOVED) 07_page_down_crash.dpatch: Was a backport from this version. ++ - (ADDED) 09_bad_MANIFEST_omission.dpatch: Added fix for build error, ++ committed upstream already. ++ - (CHANGED) 10_browser_handling.dpatch: adapted from 2.0.x patch. ++ - (ADDED) 11_fix_doc_build.dpatch: Adopted to CVS HEAD, fixes ++ documentation build that generated blank HTML. ++ ++ -- Joshua Kwan Fri, 29 Oct 2004 18:15:43 -0700 ++ ++abiword (2.0.14-1) unstable; urgency=low ++ ++ * I'm now a comaintainer. I think. Add myself to Uploaders. ++ < mhatta_> do you want to be a co-maintainer of abiword? ++ < mhatta_> I'm a MIA in reality, so your help is appreciated ++ * New upstream version fixes: ++ - spontaneous window opening on AbiWord startup, closes: #263707 ++ - inability to print grayscale PNGs, closes: #117005, #140025, #256650 ++ * Patch work: ++ - (CHANGED) 01_relibtoolise.dpatch: Refresh. Autotools suck. ++ - (ADDED) 06_support_vnd.ms-word.dpatch: Part of the fix for #274643. ++ - (ADDED) 07_page_down_crash.dpatch: Backport from HEAD a crash fix ++ based on a graphics generation race condition that could occur if ++ one pressed Page Down before it finished. ++ - (ADDED) 08_bad_g_prgname.dpatch: Set g_prgname to something that ++ matches the name of the corresponding binary (AbiWord-2.0 in this ++ case, instead of AbiWord.) This allows bug-buddy to grab a stack ++ trace from the right program in case a crash occurs. closes: #243243 ++ - (ADDED) 09_browser_handling.dpatch: Improve browser handling (launch ++ console browsers in an x-terminal-emulator, and check for x-www-browser ++ above all.) ++ * Fix grammatical error in abw2html.1. closes: #272604 ++ * Also s/\.pl//g; s/\.sh//g in all manpages. ++ * Add abiword as a viewer for application/vnd.ms-word. closes: #274643 ++ * Add more mailcap entries for abiword/abiword-plugins, based on the ++ .server file provided by upstream. ++ * Remove upstream-obsoleted ttftool/ttfadmin. Only useful in the ++ pre-Fontconfig days of AbiWord. Since it is no longer installed, this ++ closes: #233321. ++ * Stop shipping the old KDE desktop file. closes: #273217 ++ * Install mime-info, applications and desktop files in the common package. ++ There's no sin in letting non-gnomeui apps use them. (Replaces: in ++ abiword-common takes care of transitioning for us.) ++ * Change Recommends: abiword | abiword-gnome to a Depends. By virtue of ++ the problem no longer really existing this closes: #228260 ++ * Add a blank postinst file for abiword-common (only containing hashbang + ++ #DEBHELPER#) to potentially ease some upgrades. closes: #270815 ++ ++ -- Joshua Kwan Fri, 29 Oct 2004 17:56:42 -0700 ++ ++abiword (2.0.10-1.2) unstable; urgency=high ++ ++ * Non-Maintainer Upload. ++ * debian/patches/01_relibtoolise.dpatch: damn, I missed the *other* ++ configure script. Abiword's source tarball sucks in many ways... ++ (really closes: #267199). ++ ++ -- Jordi Mallach Sun, 29 Aug 2004 03:47:46 +0200 ++ ++abiword (2.0.10-1.1) unstable; urgency=high ++ ++ * Non-Maintainer Upload. ++ * High urgency as this is needed for the libexif transition. ++ * debian/patches/01_relibtoolise.dpatch: new, relibtoolise the abi/ ++ directory to fix FTBFS in mips (closes: #267199). ++ ++ -- Jordi Mallach Tue, 24 Aug 2004 22:59:51 +0200 ++ ++abiword (2.0.10-1) unstable; urgency=high ++ ++ * The "Brief Return From The Hell" release. ++ * Maintainer upload. ++ * Acknowledged an NMU, thanks joshk - closes:#259175, #231193, #189539, #259809, #261667, #261003, #215861, #262551 ++ * New upstream release ++ - Let's use the released tarball, are you happy, drew? - closes: #217265 ++ * Linked abiword.1.gz <-> AbiWord-*2.0*.gz, really - closes: #259039 ++ * Moved AbiRSVG plugin to abiword-plugins-gnome - closes: #260648 ++ * [copyright] revised. Not really fixes #258918, but close enough. ++ ++ -- Masayuki Hatta (mhatta) Tue, 10 Aug 2004 19:31:14 +0900 ++ ++abiword (2.0.9-0.1) unstable; urgency=medium ++ ++ * Non-maintainer upload. ++ * New upstream stable release. (Closes: #259175) ++ - Resolves for sarge: Print button crash (closes: #259809) ++ - Resolves for sarge: gdk_pixbuf_render_to_drawable() undefined ++ (closes: #261003) ++ * Bump Build-Depends on libgucharmap3 to libgucharmap4. (Closes: #261667) ++ * Link abiword.1.gz <-> AbiWord-2.0.1.gz. (Closes: #259039) ++ * Patch work: ++ - (REMOVED) 01_ia64_build_fix.dpatch: Seems to have been fixed ++ differently upstream. ++ - (ADDED) 04_autosave_default.dpatch: Save backup copies of files every ++ 5 minutes by default. (Closes: #231193) ++ - (ADDED) 05_perl_bindings.dpatch: Timestamp issue tickled a desync ++ between the shipped AbiWord.cpp for the Perl bindings, and revealed ++ a missing argument to a findNext function. Rebuild with xsubpp. ++ * abw2html.pl link in abiword-common becomes just 'abw2html' (still ++ points to the abw2html.pl in /usr/share, though.) (Closes: #189539) ++ * Quote entries in the menu file for abiword-common. ++ ++ -- Joshua Kwan Wed, 4 Aug 2004 07:34:19 -0700 ++ ++abiword (2.0.7+cvs.2004.05.05-1) unstable; urgency=low ++ ++ * The "God Bless The Child" release. ++ * New upstream release (CVS snapshot). ++ * Removed AbiWord.exe.MANIFEST - closes: #245215 ++ ++ -- Masayuki Hatta (mhatta) Wed, 5 May 2004 22:35:50 +0900 ++ ++abiword (2.0.6+cvs.2004.04.07-1) unstable; urgency=low ++ ++ * The "Ericka" release. ++ * New upstream release (CVS snapshot). ++ ++ -- Masayuki Hatta (mhatta) Wed, 7 Apr 2004 21:44:26 +0900 ++ ++abiword (2.0.6+cvs.2004.03.28-1) unstable; urgency=low ++ ++ * The "Are You Still Dreaming Ever-Free?" release. ++ * New upstream release (CVS snapshot). ++ ++ -- Masayuki Hatta (mhatta) Sun, 28 Mar 2004 22:26:19 +0900 ++ ++abiword (2.0.5+cvs.2004.03.12-1) unstable; urgency=low ++ ++ * New upstream release (CVS snapshot). ++ * Do not set --enable-gnome when build plugins - closes: #237270 ++ ++ -- Masayuki Hatta (mhatta) Fri, 12 Mar 2004 02:11:21 +0900 ++ ++abiword (2.0.5+cvs.2004.03.09-1) unstable; urgency=low ++ ++ * The "G-Man" release. ++ * New upstream release (CVS snapshot). ++ * Adjusted Sections appropriately. ++ ++ -- Masayuki Hatta (mhatta) Tue, 9 Mar 2004 08:49:52 +0900 ++ ++abiword (2.0.3+cvs.2004.02.22-1) unstable; urgency=low ++ ++ * The "Captain Buckles" release. ++ * New upstream release (CVS snapshot). ++ * Tweaked the order of build options - closes: #231337 ++ * Now can be buildable on NFS-mounted fs - closes: #231315 ++ * Set debhelpers -i and -a - closes: #226081 ++ * Now psion plugin sorta works - closes: #220316, #217611 ++ * Fixed description - closes: #229639, #228771 ++ * Built with sane tar - closes: #232382 ++ ++ -- Masayuki Hatta (mhatta) Sun, 22 Feb 2004 04:34:10 +0900 ++ ++abiword (2.0.3+cvs.2004.02.07-1) unstable; urgency=low ++ ++ * New upstream release (CVS snapshot). ++ * [control] changed Maintainer field. ++ * Acknowledged NMUs, thank you folks - closes: #223606, #226102 ++ ++ -- Masayuki Hatta (mhatta) Sat, 7 Feb 2004 20:12:40 +0900 ++ ++abiword (2.0.1+cvs.2003.11.07-2.2) unstable; urgency=low ++ ++ * NMU ++ * add libenchant-dev to Build-Depends: (closes: #226102) ++ ++ -- Rene Engelhard Sun, 4 Jan 2004 16:53:59 +0100 ++ ++abiword (2.0.1+cvs.2003.11.07-2.1) unstable; urgency=low ++ ++ * NMU from Minneapolis BSP. ++ * Rebuit against new libwmf. (Closes: #223606) ++ ++ -- Scott Dier Sat, 13 Dec 2003 19:41:23 -0600 ++ ++abiword (2.0.1+cvs.2003.11.07-2) unstable; urgency=low ++ ++ * Rebuilt with libwpd4. ++ * Disabled perl binding since it doesn't build with Perl 5.8.2. *sigh* ++ ++ -- Masayuki Hatta Mon, 10 Nov 2003 18:40:59 +0900 ++ ++abiword (2.0.1+cvs.2003.11.07-1) unstable; urgency=low ++ ++ * The "Muffin Man" release. ++ * New upstream release (CVS snapshot) ++ - Now uses STABLE branch - closes: #217265 ++ * Now depends on libwpd3 - closes: #219491 ++ * Now printing in non-GNOME version works - closes: #214016, #214836 ++ * Now garbages don't enter when you paste from emacs - closes: #206759 ++ * Now Abi survives when HT Text plugin is disabled - closes: #201430 ++ * Now Abi survives when the view is changed - closes: #203616, #218726 ++ * Now Abi survives when the ruler is removed - closes: #213519 ++ * Now Abi survives when you push F11 - closes: #215434 ++ ++ -- Masayuki Hatta Fri, 7 Nov 2003 11:38:50 +0900 ++ ++abiword (2.0.0+cvs.2003.10.29-1) unstable; urgency=low ++ ++ * The "Blame It On Cain" release. ++ * New upstream release (CVS snapshot). ++ * Acknowledged NMU, thanks Jordi - closes: #216171, #216235, #213660 ++ * New package: abiword-doc contains a manual and tutorials. ++ * New package: abiword-help contains online help - closes: #166145, #204142, #207551 ++ * New package: abiword-plugins-gnome contains plugins which depend on GNOME libraries - closes: #211754 ++ * New package: xfonts-abi provides a dummy package for smooth upgrade - closes: #192056 ++ * Built with libenchant1, and now spell checker does nothing when ++ dictionary for specified language is not available - closes: #204143, #204264 ++ * Now abiword-gnome depends on libgucharmap3 - closes: #212727 ++ * This is actually 2.1.0+, but I'll package the stable 2.0.1 when it is ++ ready, thus stick with calling 2.0.0 for a while. ++ ++ -- Masayuki Hatta Wed, 29 Oct 2003 20:31:14 +0900 ++ ++abiword (2.0.0+cvs.2003.09.25-1.1) unstable; urgency=low ++ ++ * Non-Maintainer Upload. ++ * Rebuild against the new libwpd-dev which changed soname (closes: #216171). ++ * debian/patches/01_ia64_build_fix.dpatch: add more fixes for ia64 and ++ alpha (thanks Bdale; closes: #213660). ++ ++ -- Jordi Mallach Fri, 17 Oct 2003 13:18:30 +0200 ++ ++abiword (2.0.0+cvs.2003.09.25-1) unstable; urgency=low ++ ++ * The "I HATE IA64" release. ++ * New upstream release (CVS snapshot). ++ * Applied Matt Kraai's IA64 build fix patch again - closes: #211060 ++ * Built with the new libgucharmap3 - closes: #212635, #212385, #200910 ++ * Built with the sane g++-3.3, now Insert -> Table works ++ - closes: #211196, #208579, #211624 ++ ++ -- Masayuki Hatta Thu, 25 Sep 2003 09:44:50 +0900 ++ ++abiword (2.0.0+cvs.2003.09.15-2) unstable; urgency=low ++ ++ * Linked with the sane libwpd0. ++ ++ -- Masayuki Hatta Mon, 15 Sep 2003 16:22:00 +0900 ++ ++abiword (2.0.0+cvs.2003.09.15-1) unstable; urgency=low ++ ++ * The "Zazueira" release. ++ * New upstream release (CVS snapshot). ++ * Applied Matt's patch to fix ia64 build problem - closes: #207902 ++ * Now uses dpatch. ++ ++ -- Masayuki Hatta Mon, 15 Sep 2003 10:41:30 +0900 ++ ++abiword (1.99.5+cvs.2003.08.30-1) unstable; urgency=low ++ ++ * The "September Song" release. ++ * New upstream release (CVS snapshot). ++ * Updated es-ES.po - closes: #207527 ++ * Build fix for ia64, thanks Matt - closes: #207682 ++ * Bumped Standards-Version to 3.6.0. ++ * abiword.application -> abiword.applications. ++ ++ -- Masayuki Hatta Sat, 30 Aug 2003 06:36:37 +0900 ++ ++abiword (1.99.5+cvs.2003.08.28-1) unstable; urgency=low ++ ++ * The "Misty" release. ++ * New upstream release (CVS snapshot). ++ * Fixed in the upstream - closes: #149797, #200359, #207369 ++ * More rigorous GNOME support - closes: #194756, #197351, #186850 ++ * Added Build-Depends: libpng12-dev. ++ ++ -- Masayuki Hatta Thu, 28 Aug 2003 17:01:51 +0900 ++ ++abiword (1.99.5+cvs.2003.08.27-1) unstable; urgency=low ++ ++ * The "Bantu Penda" release. ++ * New upstream release (CVS snapshot). ++ * Disabled imagemagick plugin explicitly (by the upstream's request). ++ * Enabled ots plugin. ++ * Fixed typos in description (thanks Jens Seidel). ++ * Now depends on python2.3 - closes: #204760, #205823 ++ ++ -- Masayuki Hatta Wed, 27 Aug 2003 15:51:53 +0900 ++ ++abiword (1.99.2+cvs.2003.07.10-1) unstable; urgency=low ++ ++ * The "Sister Caroline" release. ++ * New upstream release (CVS snapshot). ++ ++ -- Masayuki Hatta Thu, 10 Jul 2003 16:30:57 +0900 ++ ++abiword (1.99.1+cvs.2003.07.03-1) unstable; urgency=low ++ ++ * The "Selim" release. ++ * New upstream release (CVS snapshot). ++ * Now 'Insert Symbol' works - closes: #181289 ++ * Now buildable - closes: #198874 ++ * Rebuilt with proper libraries - closes: #198180, #196333 ++ * Now claims "Word Processor" prominently in menu - closes: #197376 ++ ++ -- Masayuki Hatta Thu, 3 Jul 2003 00:38:32 +0900 ++ ++abiword (1.9.0+cvs.2003.05.10-1) unstable; urgency=low ++ ++ * The "Sungi Mungi" release. ++ * New upstream release (CVS snapshot). ++ * libwpd0 is now available in unstable - closes: #191944 ++ * Fixed in the upstream - closes: #186942 ++ * Fixed a typo in .server - closes: #192514 ++ ++ -- Masayuki Hatta Sat, 10 May 2003 09:54:34 +0900 ++ ++abiword (1.9.0+cvs.2003.05.03-2) unstable; urgency=low ++ ++ * Really linked with libwpd0. ++ ++ -- Masayuki Hatta Sun, 4 May 2003 12:45:27 +0900 ++ ++abiword (1.9.0+cvs.2003.05.03-1) unstable; urgency=low ++ ++ * The "Gumbo Filet" release. ++ * New upstream release (CVS snapshot). ++ ++ -- Masayuki Hatta Sat, 3 May 2003 20:54:25 +0900 ++ ++abiword (1.9.0+cvs.2003.04.24-1) unstable; urgency=low ++ ++ * The "Dementia" release. ++ * New upstream release (CVS snapshot). ++ ++ -- Masayuki Hatta Thu, 24 Apr 2003 00:52:41 +0900 ++ ++abiword (1.9.0+cvs.2003.04.20-1) unstable; urgency=low ++ ++ * The "Hippy Dip" release. ++ * New upstream release (CVS snapshot). ++ * Fixed in the upstream - closes: #188650 ++ ++ -- Masayuki Hatta Sun, 20 Apr 2003 20:27:22 +0900 ++ ++abiword (1.1.4+cvs.2003.04.17-1) unstable; urgency=low ++ ++ * The "Jeepers Creepers" release. ++ * New upstream release (CVS snapshot). ++ * Bumped to Standards-Version: 3.5.9. ++ * Fixed in the upstream - closes: #181286, #146060, #152397 ++ ++ -- Masayuki Hatta Thu, 17 Apr 2003 21:47:36 +0900 ++ ++abiword (1.1.4+cvs.2003.04.10-1) unstable; urgency=low ++ ++ * The "Bennie's Diggin'" release. ++ * New upstream release (CVS snapshot). ++ ++ -- Masayuki Hatta Thu, 10 Apr 2003 14:25:01 +0900 ++ ++abiword (1.1.4+cvs.2003.04.01-1) unstable; urgency=low ++ ++ * The "Root Down (and Get It)" release. ++ * New upstream release (CVS snapshot). ++ ++ -- Masayuki Hatta Tue, 1 Apr 2003 20:23:24 +0900 ++ ++abiword (1.1.4+cvs.2003.03.25-1) unstable; urgency=low ++ ++ * The "The MIghty Burner" release. ++ * New upstream release (CVS snapshot). ++ ++ -- Masayuki Hatta Tue, 25 Mar 2003 03:18:28 +0900 ++ ++abiword (1.1.3+cvs.2003.03.18-1) unstable; urgency=low ++ ++ * The "One Finger Snap" release. ++ * New upstream release (CVS snapshot). ++ * Rebuilt with new libgal2.0-1 - closes: #185231 ++ * Now installs manpages - closes: #174619, #174683 ++ * Added Replaces: abiword-common (<< 1.1.3+cvs.2003.03.13-1) to abiword and abiword-gnome - closes: #185210 ++ * Fixed in the upstream - closes: #180955, #181285, #181326 ++ ++ -- Masayuki Hatta Tue, 18 Mar 2003 11:21:48 +0900 ++ ++abiword (1.1.3+cvs.2003.03.13-1) unstable; urgency=low ++ ++ * The "Workin' On A Groovy Thing" release. ++ * New upstream release (CVS snapshot). ++ ++ -- Masayuki Hatta Thu, 13 Mar 2003 13:34:01 +0900 ++ ++abiword (1.1.3+cvs.2003.03.10-1) unstable; urgency=low ++ ++ * The "It's Too Late" release. ++ * New upstream release (CVS snapshot). ++ * Added Depends: gsfonts - closes: #182619, #180624, #180887 ++ * -gnome is back now - closes: #182242 ++ * Added kderemove tag to abiword-common.menu - closes: #181549 ++ * Now installs MIME entries - closes: #181430 ++ * Now removes defoma leftover - closes: #179795 ++ ++ -- Masayuki Hatta Mon, 10 Mar 2003 13:54:43 +0900 ++ ++abiword (1.1.3+cvs.2003.02.04-2) unstable; urgency=low ++ ++ * Fixed confused Conflicts: - closes: #179834, #179891 ++ ++ -- Masayuki Hatta Mon, 10 Feb 2003 01:57:02 +0900 ++ ++abiword (1.1.3+cvs.2003.02.04-1) unstable; urgency=low ++ ++ * The "That's The Groovy Thing" release. ++ * New upstream release (CVS snapshot). ++ * Now abiword doesn't have any binary-all packages - closes: #167578 ++ * Now can read this doc file - closes: #176299 ++ * Added menu entries - closes: #179289, #179302 ++ * Now Provides: abiword-gtk, abiword-gnome - closes: #179633 ++ * Seems this bug has gone - closes: #157862 ++ * Not reproducible, if persists please reopen - closes: #163960, #172507, #172510, #172511 ++ * I don't think this is a bug - closes: #172509 ++ ++ -- Masayuki Hatta Tue, 4 Feb 2003 00:53:54 +0900 ++ ++abiword (1.1.3+cvs.2003.01.31-1) unstable; urgency=low ++ ++ * The "Transition" release. ++ * Now uses CVS HEAD(the development branch). Well, it's still ++ somewhat shaky, but rapidly maturing. Bug reports are welcome. ++ * Before bitching me, think what "sid" is all about. ++ * Now installable - closes: #177357, #177447, #178198, #178064, #176179 ++ * Now uses fontconfig, so these bugs are gone ++ - closes: #134451, #139045, #145317, #145332, #147992, #150552, #153447, #160380, #175215, #162714, #165120, #172205, #142558, #160380, #168916, #171788, #144132, #163761 ++ * Now uses libxml2, so this bug is gone - closes: #143942 ++ * Now AbiWord uses new GNU aspell, so these bugs shold be gone - closes: #162302, #162534, #166361 ++ * Seems AbiWord uses GNOME's default browser - closes: #174306 ++ * Now fixed (or possibly fixed) in the upstream - closes: #171069, #146061, #137414, #161149, #167866, #178092, #148330 ++ * Thanks, but not needed anymore - closes: #174737 ++ ++ -- Masayuki Hatta Fri, 31 Jan 2003 02:43:28 +0900 ++ ++abiword (1.0.4+cvs.2002.11.22-1) unstable; urgency=low ++ ++ * The "These Foolish Things" release. ++ * New upstream release (CVS snapshot). ++ * Built with libgal21 - closes: #169582 ++ ++ -- Masayuki Hatta Fri, 22 Nov 2002 13:23:04 +0900 ++ ++abiword (1.0.3+cvs.2002.11.04-1) unstable; urgency=low ++ ++ * The "Watch What Happens" release. ++ * New upstream release (CVS snapshot). ++ * Oops, libgal20 doesn't exist in sid - closes: #167627 ++ ++ -- Masayuki Hatta Mon, 4 Nov 2002 19:42:07 +0900 ++ ++abiword (1.0.3+cvs.2002.11.03-1) unstable; urgency=low ++ ++ * The "You And The Night And The Music" release. ++ * New upstream release (CVS snapshot). ++ * Well, I should have stated that's in abiword-common - closes: #165709 ++ * Build-Depends: automake1.4 - closes: #166383 ++ ++ -- Masayuki Hatta Sun, 3 Nov 2002 01:16:51 +0900 ++ ++abiword (1.0.3+cvs.2002.09.06-1) unstable; urgency=low ++ ++ * The "Lies" release. ++ * New upstream release (CVS). ++ * Bumped Standards-Version to 3.5.7. ++ * Enabled Perl bindings again. ++ ++ -- Masayuki Hatta Fri, 6 Sep 2002 14:03:54 +0900 ++ ++abiword (1.0.2+cvs.2002.08.31-1) unstable; urgency=low ++ ++ * The "Blue Drag" release. ++ * New upstream release (CVS). ++ * Disabled Perl bindings. ++ ++ -- Masayuki Hatta Sat, 31 Aug 2002 18:27:50 +0900 ++ ++abiword (1.0.2+cvs.2002.08.30-1) unstable; urgency=low ++ ++ * The "Everybody's Cryin' Mercy" release. ++ * New upstream release (CVS). ++ * Well, let's built with libpng2 for a while - closes: #158401 ++ * Built with gdk-pixbuf in unstable - closes: #157833, #158259, #158262 ++ * Acknowledged NMU(actually done by me ;-) - closes: #157807 ++ * Disabled perl binding. ++ ++ -- Masayuki Hatta Fri, 30 Aug 2002 10:43:04 +0900 ++ ++abiword (1.0.2+cvs.2002.08.21-1) unstable; urgency=low ++ ++ * The "Expensive Shit" release. ++ * New upstream release (CVS). ++ * Fixed in the upstream - closes: #156808 ++ * Added Build-Depends: libungif4-dev - closes: #157048 ++ * Removed build dependency on libmagick5-dev, libmagick5++-dev and libwmf-dev. ++ ++ -- Masayuki Hatta Wed, 21 Aug 2002 12:33:29 +0900 ++ ++abiword (1.0.2+cvs.2002.08.10-1) unstable; urgency=low ++ ++ * The "Truckin'" release. ++ * New upstream release (CVS). ++ * Added OpenWriter plugin. ++ ++ -- Masayuki Hatta Sat, 10 Aug 2002 10:37:15 +0900 ++ ++abiword (1.0.2+cvs.2002.07.30-1) unstable; urgency=low ++ ++ * The "Do You Know What It Means To Miss New Orleans" release. ++ * New upstream release (CVS). ++ * Now abiword-common pre-depends on defoma - closes: #153292 ++ * Added aspell-en to Depends - closes: #153264 ++ * The priority of -gnome is now set to 35(and -gtk is set to 30), which ++ means in case -gnome is installed, /usr/bin/AbiWord_d should be always ++ symlinked to /usr/bin/AbiWord_d.gnome unless you changed it explicitly ++ by using /usr/sbin/update-alternatives - closes: #151043 ++ ++ -- Masayuki Hatta Tue, 30 Jul 2002 19:50:32 +0900 ++ ++abiword (1.0.2+cvs.2002.07.15-1) unstable; urgency=low ++ ++ * The "Iko Iko" release. ++ * New upstream release (CVS). ++ * Seems these bugs are gone...if not please reopen - closes: #146654, #146875, #149771 ++ * Improved description - closes: #151358 ++ * Removed dependencies for aspell-* except aspell-dictionary - closes: #152618 ++ * Now uses nextgen.sh for building plugins(suggested by fjf). ++ * Revised README.Debian. ++ * Removed more leftover directories. Tried to shut linda up, quite ++ unsuccessfully... ++ ++ -- Masayuki Hatta Sat, 6 Jul 2002 12:16:06 +0900 ++ ++abiword (1.0.2+cvs.2002.06.19-1) unstable; urgency=low ++ ++ * The "Got A Good Thing Goin'" release. ++ * Rebuilt with libesd0 from sid - closes: #150320 ++ * Fixed Build-Depends: - closes: #150282, #150312 ++ * Included non-Latin1 help docs - closes: #150379 ++ ++ -- Masayuki Hatta Wed, 19 Jun 2002 14:22:50 +0900 ++ ++abiword (1.0.2+cvs.2002.06.17-1) unstable; urgency=low ++ ++ * The "Moon In June" release. ++ * New upstream release (CVS). ++ ++ -- Masayuki Hatta Mon, 17 Jun 2002 21:54:11 +0900 ++ ++abiword (1.0.2+cvs.2002.06.12-1) unstable; urgency=low ++ ++ * The "Doin' The Thing" release. ++ * New upstream release (CVS). ++ * Added aiksaurus plugin. ++ ++ -- Masayuki Hatta Wed, 12 Jun 2002 13:20:53 +0900 ++ ++abiword (1.0.2+cvs.2002.06.05-1) unstable; urgency=low ++ ++ * The "I'm Your Puppet" release. ++ * New upstream release (CVS). ++ * Added Categories entry to AbiWord.desktop.gnome - closes: #148744 ++ * Moved credits.* into abiword-common - closes: #148889 ++ * Added tt_unregister routine to abiword-common.defoma. ++ ++ -- Masayuki Hatta Wed, 5 Jun 2002 21:41:07 +0900 ++ ++abiword (1.0.1+cvs.2002.05.30-1) unstable; urgency=low ++ ++ * The "A Smooth One" release. ++ * New upstream release (CVS). ++ * Disabled freetrans plugin since it doesn't work now. ++ * Now install *.oaf under /usr/share/oaf (suggested by MG, thanks). ++ * Fixed a typo in abiword-common.defoma. ++ * Now Depends: psfontmgr. ++ ++ -- Masayuki Hatta Thu, 30 May 2002 19:20:18 +0900 ++ ++abiword (1.0.1+cvs.2002.05.24-1) unstable; urgency=low ++ ++ * The "Play It Back" release. ++ * New upstream release (CVS). ++ ++ -- Masayuki Hatta Fri, 24 May 2002 20:18:28 +0900 ++ ++abiword (1.0.1+cvs.2002.05.06-1) unstable; urgency=high ++ ++ * The "I Heard It Through The Grapevine" release. ++ * New upstream release (CVS). ++ * Added Japanese template. ++ * Added gdict plugin. ++ * Fixed abiword-common.menu - closes: #145858, #145425 ++ * Tightened dependency between abiword packages - closes: #145875 ++ * Seems fixed in the upstream - closes: #144005 ++ * Set urgency to high - would be nice if we have this one in woody. ++ ++ -- Masayuki Hatta Mon, 6 May 2002 09:13:33 +0900 ++ ++abiword (1.0.0+cvs.2002.04.28-2) unstable; urgency=high ++ ++ * Oops, defoma-app returns value 1 - closes: #144930 ++ * Removed american.hash - closes: #144886 ++ * This one really should go into woody *SIGH* ++ ++ -- Masayuki Hatta Mon, 29 Apr 2002 10:23:32 +0900 ++ ++abiword (1.0.0+cvs.2002.04.28-1) unstable; urgency=high ++ ++ * The "Don't Keep Me Wonderin'" release. ++ * New upstream release (CVS). ++ * Cosmetic changes only - hope they don't cause any serious problem. ++ * Purge old abiword configuration - closes: #144215 ++ * Fixed menu hint - closes: #144281 ++ * Check whether XF86Config-4 exists - closes: #144423 ++ * Set urgency to high, since this one should go into woody. ++ ++ -- Masayuki Hatta Sun, 28 Apr 2002 15:17:07 +0900 ++ ++abiword (1.0.0+cvs.2002.04.21-1) unstable; urgency=low ++ ++ * The "Now's The Time" release. ++ * New upstream release (CVS). ++ * Fixed Spanish template - closes: #143754 ++ ++ -- Masayuki Hatta Sun, 21 Apr 2002 10:38:44 +0900 ++ ++abiword (0.99.5+cvs.2002.04.17-1) unstable; urgency=low ++ ++ * The "A Change Is Gonna Come" release. ++ * New upstream release (CVS). This is actually RC1. ++ * Sueggests: aspell-* - closes: #143078 ++ * Suppressed defoma messages - closes: #142933 ++ * The upstream discarded the old help, so I don't need to include new one ++ to abiword-docs. So abiword-doc/help is removed. ++ ++ -- Masayuki Hatta Tue, 16 Apr 2002 23:52:29 +0900 ++ ++abiword (0.99.5+cvs.2002.04.12-1) unstable; urgency=low ++ ++ * The "I Believe My Time Ain't Long" release. ++ * New upstream release (CVS). ++ * Patch for building on s390 accepted by the upstream - closes: #142402 ++ * Make sure the old /var/lib/defoma/abiword.d is removed - closes: #142425 ++ * abiword-doc/XHTML is obsoleted, now install abiword-doc/help instead - closes: #139642 ++ ++ -- Masayuki Hatta Fri, 12 Apr 2002 10:52:22 +0900 ++ ++abiword (0.99.5+cvs.2002.04.11-1) unstable; urgency=low ++ ++ * The "Don't Explain" release. ++ * New upstream release (CVS). ++ * Hopefully this release can be built on ppc - closes: #140758 ++ ++ -- Masayuki Hatta Thu, 11 Apr 2002 01:09:30 +0900 ++ ++abiword (0.99.3+cvs.2002.04.04-1) unstable; urgency=low ++ ++ * The "Life's Backward Glance" release. ++ * New upstream release (CVS). ++ * Added some more plugins. ++ * Added some notes about running it on remote machines - closes: #59267, #102764, #139086 ++ * Commented out zh-HK stuff - closes: #140932 ++ ++ -- Masayuki Hatta Thu, 4 Apr 2002 09:00:25 +0900 ++ ++abiword (0.99.3+cvs.2002.04.01-1) unstable; urgency=low ++ ++ * The "April Fool" release. Well, this is an Eric Dolphy tune ;-) ++ * New upstream release (CVS). ++ * Refined description - closes: #140607 ++ * Refined copyright - closes: #140636 ++ * BTW, the distribution of AbiWord by Debian is already acknowledged ++ by the upstream, so this is the "official" or at least "semi-official" ++ product of AbiWord for Debian. I think we can call it AbiWord anyway. ++ Man, who cares ;-) ++ * Added Brazilian Portuguese templates - closes: #140410 ++ * Fixed in the upstream - closes: #134054, #139646 ++ ++ -- Masayuki Hatta Mon, 1 Apr 2002 08:39:46 +0900 ++ ++abiword (0.99.3+cvs.2002.03.28-1) unstable; urgency=low ++ ++ * The "Out-Bloody-Rageous" release. ++ * New upstream release (CVS). ++ * Added missing Build-Depends: libgnome-vfs-dev - closes: #140253 ++ * Added a workaround for building arm, ppc and s390 - closes: #127007 ++ ++ -- Masayuki Hatta Thu, 28 Mar 2002 13:18:32 +0900 ++ ++abiword (0.99.3+cvs.2002.03.27-1) unstable; urgency=low ++ ++ * The "Foolin' Myself" release. ++ * New upstream release (CVS). ++ * Added missing Build-Depends: libgal-dev. ++ * Changed package name "abiword" to "abiword_common" in ++ abiword-common.defoma. ++ * Added Depends: abiword-{gtk,gnome} to abiword dummy package. ++ ++ -- Masayuki Hatta Wed, 27 Mar 2002 09:01:19 +0900 ++ ++abiword (0.99.3+cvs.2002.03.25-1) unstable; urgency=low ++ ++ * The "To Lay Me Down" release. ++ * New upstream release (CVS). ++ ++ -- Masayuki Hatta Mon, 25 Mar 2002 18:05:52 +0900 ++ ++abiword (0.99.3+cvs.2002.03.24-4) unstable; urgency=low ++ ++ * Disabled magick plugin since libmagick5 depends on libwmf0.2-2 which in ++ turn depends on libxml2. *SIGH* - closes: #139638, #135923, #139399 ++ ++ -- Masayuki Hatta Sun, 24 Mar 2002 16:16:19 +0900 ++ ++abiword (0.99.3+cvs.2002.03.24-3) unstable; urgency=low ++ ++ * Added missing Build-Depends: libgnome-dev. ++ ++ -- Masayuki Hatta Sun, 24 Mar 2002 13:33:53 +0900 ++ ++abiword (0.99.3+cvs.2002.03.24-2) unstable; urgency=low ++ ++ * Oops, conflicting aspell-dictionary was actually a bad idea - ++ removed and stated in README.Debian instead. ++ ++ -- Masayuki Hatta Sun, 24 Mar 2002 08:51:42 +0900 ++ ++abiword (0.99.3+cvs.2002.03.24-1) unstable; urgency=low ++ ++ * The "Who Cares?" release. ++ * New upstream release (CVS). ++ * Made a dirty workaround to cope with Autoconf 2.53 - closes: #139445 ++ * Not reproducible, seems fixed in the upstream? - closes: #117614 ++ * Weird...when aspell-en is installed, -gtk freezes as the submitter ++ reported. Maybe the upstream pspell-related code bug, but I added ++ Conflicts: aspell-dictionary for the time being - closes: #139367 ++ ++ -- Masayuki Hatta Sun, 24 Mar 2002 00:27:58 +0900 ++ ++abiword (0.99.3+cvs.2002.03.22-1) unstable; urgency=low ++ ++ * The "What A Diff'rence A Day Made'" release. ++ * New upstream release (CVS). ++ * Added Build-Depends: autotools-dev. config.{guess,sub} are now ++ updated from /usr/share/misc at build time. ++ * Now Depends: libpspell-ispell1 | aspell-dictionary - closes: #139448 ++ * Debian's gnome-print uses libxml1 while libwmf0.2-2 uses libxml2. ++ This is where it all began. Anywise, just removing ++ --with-libwmf fixed this long-standing annoying ++ print-preview bug - closes: #135585, #137847, #138996 ++ * But this made HTML plugin unusable, so disabled. ++ ++ -- Masayuki Hatta Fri, 22 Mar 2002 19:48:29 +0900 ++ ++abiword (0.99.3+cvs.2002.03.21-1) unstable; urgency=low ++ ++ * The "Don't Blame Me, Take 2" release. ++ * New upstream release (CVS). ++ * Wow, Bi-di is back. Enabled - closes: #121407 ++ * Depends: -> Recommends: abiword-gtk | abiword-gnome. ++ * Added "Recommends: psfontmgr, x-ttcidfont-conf". ++ * Added "Suggests: xfs". ++ ++ -- Masayuki Hatta Thu, 21 Mar 2002 09:32:59 +0900 ++ ++abiword (0.99.3+cvs.2002.03.18-1) unstable; urgency=low ++ ++ * The "But Not For Me" release. ++ * New upstream release (CVS). ++ * Made symlinks of fonts in /usr/X11R6/lib/X11/fonts/Type1 and ++ generates fonts.{dir,scale} - closes: #138491 ++ * The change above should fix this one, too - closes: #138193 ++ * Added ABIWORD_BINARY feature(explained in README.Debian) - closes: #138277 ++ * Don't show debconf note if /etc/X11/XF86Config-4 contains "type1" - closes: #135764 ++ ++ -- Masayuki Hatta Mon, 18 Mar 2002 09:28:34 +0900 ++ ++abiword (0.99.2+cvs.2002.03.15-1) unstable; urgency=low ++ ++ * The "Well, You Needn't" release. ++ * New upstream release (CVS). ++ * Fixed in the upstream (Bug 2780) - closes: #137412 ++ * Now depends on libpspell-ispell1 to make sure at least en-US spell ++ checker works - closes: #137413, #136883 ++ ++ -- Masayuki Hatta Fri, 15 Mar 2002 17:00:00 +0900 ++ ++abiword (0.99.2+cvs.2002.03.13-1) unstable; urgency=low ++ ++ * The "Don't Blame Me" release. ++ * New upstream release (CVS). ++ * Removed entries for text/plain and text/html from mime - closes: #136120 ++ * Added French template - closes: #136109 ++ * Added Spanish template - closes: #136364 ++ * Added Russian template - closes: #137160 ++ * Added German template - closes: #137213 ++ * Added a little FAQ about Debianized abiword package. Questions are welcome! ++ * Now Recommends: abiword-doc & abiword-plugin - closes: #135987, #138007 ++ (You need abiword-doc to see credits, and abiword-plugin to read HTML) ++ * Moved KDE menu hints - closes: #137740 ++ ++ -- Masayuki Hatta Wed, 13 Mar 2002 13:37:59 +0900 ++ ++abiword (0.99.2+cvs.2002.02.25-3) unstable; urgency=low ++ ++ * Fixed manpage problem - closes: #135783 ++ * Added Conflicts: abiword (<< 0.99.2) to xfonts-abi - closes: #135883 ++ * Changed abiword dummy's arch to any - closes: #135726 ++ ++ -- Masayuki Hatta Tue, 26 Feb 2002 23:21:44 +0900 ++ ++abiword (0.99.2+cvs.2002.02.25-2) unstable; urgency=low ++ ++ * Added Build-Depends: libtool - closes: #135685 ++ * Added Conflicts: abiword (<< 0.99.2) to abiword-doc - closes: #135682 ++ ++ -- Masayuki Hatta Tue, 26 Feb 2002 01:46:15 +0900 ++ ++abiword (0.99.2+cvs.2002.02.25-1) unstable; urgency=low ++ ++ * The "Look Ma, I'm Cryin'" release. ++ * New upstream release (CVS). ++ * Show notes about Type1 font during the installation - closes: #121223, #134451 ++ * Call update-alternatives --auto when removed - closes: #135607 ++ * Not reproducible, seems fixed in the upstream? - closes: #122912 ++ ++ -- Masayuki Hatta Mon, 25 Feb 2002 11:35:20 +0900 ++ ++abiword (0.99.2+cvs.2002.02.23-1) unstable; urgency=low ++ ++ * The "Tons Of Sobs" release. ++ * New upstream release (CVS). ++ * Divided into several packages. Notably, ++ abiword-doc - closes: #130002 ++ abiword-gnome - closes: #122565, #52944, #113540 ++ xfonts-abi - closes: #57322 ++ * I think I can assume these bug has been fixed - closes: #52278 ++ * No reply from the submitter, assumes this bug has been fixed - closes: #129963 ++ * Linked with expat...this is a workaround, but fixes this annoying ++ strings problem - closes: #134479, #134483, #135191 ++ * This bug is not present in 0.99.1+, explained to the submitter - closes: #134835, #135043 ++ * Pasting works in this version - closes: #134750 ++ ++ -- Masayuki Hatta Sat, 23 Feb 2002 22:29:22 +0900 ++ ++abiword (0.99.1+cvs.2002.02.18-1) unstable; urgency=low ++ ++ * New upstream release (CVS). ++ * Added GNOME/KDE menu files - closes: #117812, #110089, #109708, #64772 ++ * Now AbiWord can handle RTF files properly - closes: #120106, #42703 ++ * No GNOME support yet, though. ++ ++ -- Masayuki Hatta Tue, 19 Feb 2002 06:32:09 +0900 ++ ++abiword (0.99.1+cvs.2002.02.17-2) unstable; urgency=low ++ ++ * Added libpspell-ispell-dev to Build-Depends - closes: #134337 ++ * Now Recommends: libpspell-ispell1 | aspell-en. ++ ++ -- Masayuki Hatta Sun, 17 Feb 2002 13:31:03 +0900 ++ ++abiword (0.99.1+cvs.2002.02.17-1) unstable; urgency=low ++ ++ * New upstream release (CVS). ++ * Daily update of the fat stuff - sorry for downloaders! ++ * Now I understand what "pspell support" really means... ++ * What we need now is aspell-en, not ispell-dictionary - closes: #134334 ++ * I think most of spell checker problem has gone since spell checking is now ++ done via pspell. if not please reopen - closes: #108980, #111586 ++ * If you want to check Espanol spelling, try aspell-es - closes: #123331 ++ * When I tested examples/Unicode1.abw.gz today, seems unrecognized UTF8 ++ characters are mapped to "o". I think this is a sane behavior - closes: #63321 ++ * Now abiword says "Error importing file foobar.doc" in such cases, ++ that's also a sane behavior - closes: #134052 ++ ++ -- Masayuki Hatta Sun, 17 Feb 2002 10:32:31 +0900 ++ ++abiword (0.99.1+cvs.2002.02.16-1) unstable; urgency=low ++ ++ * New maintainer: Masayuki Hatta - closes: #133016 ++ * Thank you aaronl, foka, Jan and Joy! ++ * Switched to CVS snapshot. That's (slightly) better. ++ * abiword doesn't depend on expat anymore (libxml2 only). ++ * Enabled Perl scripting support. ++ * Disabled Bi-di support (now can be built, but still doesn't work). ++ * /var/lib/defoma/abiword.d/dirs/zh-CW should be zh-TW, of course... ++ * Added preliminary zh-HK support. ++ * Fixed typo in abiword.defoma - closes: #133929, #134074, #134107 ++ * Fixed ttftool problem (which affect ttf-thryomanes, etc.) - closes: #133921 ++ * Fixed in the upstream - closes: #95305 ++ * Not reproducible, seems fixed in the upstream? - closes: #111587 ++ * Not reproducible, seems fixed in nautilus? - closes: #126874 ++ * Forgot to close - closes: #94566 ++ * Acknowledged NMU - closes: #129314, #133856, #122341, #127268, #128240, #129610, #131713, #93271, #113461, #114513, #119985, #121307, #130392, #130209, #133535 ++ ++ -- Masayuki Hatta Fri, 15 Feb 2002 09:29:38 +0900 ++ ++abiword (0.9.6.1-0.2) unstable; urgency=low ++ ++ * NMU. ++ * Added Build-Depends: libltdl3-dev - closes: #133856 ++ * This package doesn't make a symlink anymore - closes: #93271 ++ * Copy and paste seems work now...if not please reopen - closes: #127268 ++ ++ -- Masayuki Hatta Thu, 14 Feb 2002 15:02:46 +0900 ++ ++abiword (0.9.6.1-0.1) unstable; urgency=low ++ ++ * NMU. ++ * New upstream release. - closes: #130392, #130209 ++ * Seems wv package doesn't provide files for development, so uses supplied ++ one for now. ++ * Seems Perl scripting support and bi-directional support are broken ++ and can not be built, so disabled for now. ++ * Seems it doesn't depend on libstdc++3 anyway, even if Build-Conflicts is ++ removed(fixed at libgtk1.2?). ++ * Rewrote and cleaned up debian/rules. ++ * Completed defoma support. ++ * Enabled pspell support. ++ * Enabled libjpeg support. ++ * Enabled libwmf support. ++ * No GNOME support yet. ++ * Several manpages are missing. Someone should write it. ++ * (Almost) Lintian-free. ++ * Assume these are fixed...if not please reopen - closes: #121307, #128240, #131713 ++ * Seems fixed - closes: #119985 ++ * Included ttftool and ttfadmin.sh - closes: #122341 ++ * Install mime entry - closes: #133535 ++ * This version of abiword can handle it - closes: #129610 ++ * "Recommends: ispell-dictionary" must have fixed it - closes: #113461 ++ * Get'em defomized! - closes: #114513 ++ ++ -- Masayuki Hatta Wed, 13 Feb 2002 19:14:50 +0900 ++ ++abiword (0.9.5-1.1) unstable; urgency=low ++ ++ * NMU ++ * Add -ffunction-sections for hppa. Closes: #129314. ++ ++ -- LaMont Jones Sun, 27 Jan 2002 02:23:47 -0700 ++ ++abiword (0.9.5-1) unstable; urgency=low ++ ++ * New upstream version ++ ++ -- Aaron Lehmann Wed, 21 Nov 2001 14:59:03 -0800 ++ ++abiword (0.9.4.1-6) unstable; urgency=low ++ ++ * Build-Conflicted on most architectures with libstdc++3 as a workaround ++ for the libstd++3 dependencies. ++ The real cause of the problem is GTK bug #118221. (Closes: #118705) ++ * Correct path to help (Closes: #117844) ++ ++ -- Aaron Lehmann Mon, 12 Nov 2001 22:45:46 -0800 ++ ++abiword (0.9.4.1-5) unstable; urgency=high ++ ++ * Rebuild against the new expat, which UNEXPECTEDLY BROKE BINARY COMPATIBILITY ++ ++ -- Aaron Lehmann Mon, 22 Oct 2001 16:24:05 -0700 ++ ++abiword (0.9.4.1-4) unstable; urgency=low ++ ++ * Fix Chinese input (Closes: #113610) ++ * Resize menu icon to appropriate dimensions (Closes: #110043) ++ * Remove README symlink. It wasn't relevant. (Closes: #114560) ++ ++ -- Aaron Lehmann Tue, 9 Oct 2001 23:04:36 -0700 ++ ++abiword (0.9.4.1-3) unstable; urgency=low ++ ++ * Fix lintian complaints ++ * Move help to /usr/share/doc/abiword ++ * add +x bit to configure scripts before trying to run them ++ ++ -- Aaron Lehmann Thu, 4 Oct 2001 08:12:39 -0700 ++ ++abiword (0.9.4.1-2) unstable; urgency=low ++ ++ * Use autoconf-based build system. Should fix MIPS. (Closes: #108986) ++ * Add better error output to wrapper script ++ ++ -- Aaron Lehmann Wed, 3 Oct 2001 23:57:33 -0700 ++ ++abiword (0.9.4.1-1) unstable; urgency=low ++ ++ * Semi-new upstream release. Upstream "botched" 0.9.4, and this replaces it. ++ RTF export should be fixed. ++ * HPPA support integrated upstream. ++ ++ -- Aaron Lehmann Mon, 1 Oct 2001 23:13:14 -0700 ++ ++abiword (0.9.4-2) unstable; urgency=medium ++ ++ * Use system expat, despite accidentally including a copy. Fixes a busted ++ build in certain circumstances. ++ ++ * Know about the endianness of PA-RISC. This does not fix mips, which is ++ a PITA. ++ ++ -- Aaron Lehmann Tue, 25 Sep 2001 00:25:58 -0700 ++ ++abiword (0.9.4-1) unstable; urgency=low ++ ++ * Newer upstream release ++ * New maintainer ++ * Bumped standards-version ++ * gsfonts are used instead of included duplicates ++ ++ -- Aaron Lehmann Thu, 13 Sep 2001 20:54:35 -0700 ++ ++abiword (0.9.0-0.1) unstable; urgency=low ++ ++ * Non-maintainer upload. ++ * New upstream release. (Closes: #107352) ++ * Added Depends on xbase-clients. (Closes: #100689) ++ * Updated config.guess and config.sub (2001-08-02). (Closes: #99805) ++ * Included more example from abi/test/wp/. (Closes: #87543) ++ * For now, use own american.hash instead of that from iamerican package. ++ * Use fonts that are already included in gsfonts package. ++ * Modified debian/rules to use upstream's install.sh for the most part. ++ Also used features from debhelper (>= 3). ++ * Added /usr/share/AbiSuite/fonts/zh-{CN,TW}/fonts.dir as a quick fix. ++ (Defoma is the future, but I don't have time nor the skill now.) ++ The Debian JP and KR Teams may want to add {ja,ko}/fonts.dir too. :-) ++ ++ -- Anthony Fok Fri, 10 Aug 2001 04:49:54 +0800 ++ ++abiword (0.7.13-0.3) unstable; urgency=low ++ * Non-maintainer upload. ++ * Run libtoolize to get support for new architectures. Closes: #103347 ++ ++ -- LaMont Jones Mon, 9 Jul 2001 21:39:34 -0600 ++ ++abiword (0.7.13-0.2) unstable; urgency=low ++ * NMU ++ * rm debian/files in clean target so it really can be autobuilt (Closes: #86729) ++ * Point to standard Debian GPL file in copyright. ++ * Switch back to expat, since now we can use the shared library version, and expat appears smaller and faster. ++ ++ -- Aaron Lehmann Tue, 20 Feb 2001 12:50:44 -0800 ++ ++abiword (0.7.13-0.1) unstable; urgency=low ++ * NMU ++ * New upstream version ++ * Fix binary{-arch} targets in debian/rules so that autobuilders are not confused ++ * Use libxml2 library instead of built-in expat sources ++ * Determine version number from the changelog; don't hardcode it in the rules file ++ ++ -- Aaron Lehmann Sun, 18 Feb 2001 15:41:53 -0800 ++ ++abiword (0.7.12-0.1) unstable; urgency=low ++ * NMU to bring back into testing ++ * New upstream version (Closes: #80211, #83133, #74882, #61581, #85444, #85569) ++ * Moving back into one package. Sorry about this, folks. (Closes: #79202) ++ * Add Build-dependencies (Closes: #70060) ++ * Fix typos (Closes: #81239) ++ * Reintroduce menu item (Closes: #79055) ++ ++ -- Aaron Lehmann Sun, 11 Feb 2001 19:54:06 -0800 ++ ++abiword (0.7.8-2) unstable; urgency=low ++ ++ * added icon to menu entry (closes #58663) ++ * added a patch for the arm (closes #59096, forwarded) ++ * added a patch for "spaces in filenames" (close #57382) ++ * updated the man page ++ ++ -- Darren Benham Wed, 22 Mar 2000 22:15:26 -0800 ++ ++abiword (0.7.8-1) unstable; urgency=low ++ ++ * New upstream version ++ * Upstream changes: (no upstream changelog) ++ - User Interface ++ + True WYSIWYG support (BruceP@wn.com.au) ++ + No more character dirt (BruceP@wn.com.au) ++ + Overline (msevior@mccubbin.ph.unimelb.edu.au) ++ + Fixed minor display glitches ++ + Insert Date and Time dialog (megabyte@salesexplosion.com) ++ + Page-level navigation ++ - Localizations ++ + Better support for non-English content (henrik@lansen.se) ++ + Swedish (henrik@lansen.se) ++ + Indonesian (tim@proximity.com.au, made@nakula.rvs.uni-bielefeld.de) ++ + Updates for Danish, Finnish, French, Italian, Norwegian, and Spanish ++ - File Formats ++ + LaTeX exporter (cuenca@ie2.u-psud.fr) ++ + Various Word import improvements ++ + Fix for RTF import POW (malcolm@mpeacock.demon.co.uk) ++ + Minor .abw file format change ++ - Other ++ + Error propagation to fix (sytobinh@uchicago.edu) ++ + Mouse wheel support for Windows (BruceP@wn.com.au) ++ + Unix no longer requires libstdc++ ++ + Misc PostScript fixes (bob@sbst.com) ++ * Verified call path for menu entry (closes #50506) ++ * Upstream changes: (no upstream changelog) ++ + Speed up of spelling checks ++ + Profiles have been fixed ++ + Subscript and superscript. Luke Jordan added ++ support for subscripts and superscripts. ++ + View ruler. Stephen Hack implemented this menu item ++ so that you can hide or show the ruler on a per-window basis. ++ + Compressed AbiWord files. The AbiWord file format (*.abw) was ++ designed from the get-go to be a highly-readable form of XML. ++ However, for those of you who care more about bloat than legibility, ++ Richard Jefts added import/export logic for a ++ gzip-compressed variant (*.zabw). ++ + The following translations have been added or updated: ++ # Catalan -- Jordi Mas ++ # Czech -- Zbynek Miksa ++ # Danish -- Birger Langkjer ++ # Finnish -- Jarmo Karvonen ++ # Portuguese -- Rui Silva ++ + Word import improvements. ++ + Options dialog started. ++ ++ -- Darren Benham Wed, 22 Mar 2000 09:36:26 -0800 ++ ++abiword (0.7.6-2) unstable; urgency=low ++ ++ * recompiled against the new libpng ++ ++ -- Darren Benham Wed, 10 Nov 1999 08:13:26 -0700 ++ ++abiword (0.7.6-1) unstable; urgency=low ++ ++ * New upstream version ++ * Added a recommends for ispell-dictionary (closes: #42218) ++ * Upstream changes: (no upstream changelog) ++ + Spell checking improvements. ++ # a spiffy Spelling dialog with the usual Ignore / Add / Change ++ functionality, including suggestions and a custom dictionary. ++ # a context menu to remove those pesky red squiggles. ++ + Zoom and Paragraph dialogs. ++ + Full paragraph justification ++ + Clipboard code has been streamlined to be much more efficient. ++ + Middle-mouse X selections should Just Work now ++ + Word import improvements ++ ++ -- Darren Benham Tue, 02 Nov 1999 15:41:51 -0700 ++ ++abiword (0.7.5-1) unstable; urgency=low ++ ++ * new upstream version (closes: #42778) ++ (closes: #44926) ++ * changed menu entry to abiword (closes: #42875) ++ ++ -- Darren Benham Thu, 10 Aug 1999 08:13:26 -0700 ++ ++abiword (0.7.4-2) unstable; urgency=low ++ ++ * changed zip (I hope) to use minizip ++ * added Roman Hodek's changes to allow debuild to work ++ ++ -- Darren Benham Thu, 10 Aug 1999 08:13:26 -0700 ++ ++abiword (0.7.4-1) unstable; urgency=low ++ ++ * New Upstream Version ++ * Upstream changes: (no upstream changelog) ++ + Snazzy new importer for Word 97, Word 95, and Word 6! ++ + RTF improvements ++ + Clipboard now honors formatting ++ + Italian localization ++ + Various bug fixes (closes #41980) ++ * Added a recommends on ispell (closes #42218) ++ * Fixed the doc direcotry (closes #42044) ++ ++ -- Darren Benham Thu, 5 Aug 1999 20:32:26 -0700 ++ ++abiword (0.7.3-1) unstable; urgency=low ++ ++ * New Upstream Version ++ * Upstream changes: (no upstream changelog) ++ + French localization updates (duperron@mail.dotcom.fr) ++ + German localization updates (cterboven@gmx.net) ++ + Finnish localization updates (jarmo@dawn.joensuu.fi) ++ + Now works on Alpha/NT (ayoung@teleport.com) ++ + Various bug fixes ++ + Fixed annoying suffix bug number 464 ++ + Spell dictionaries are now endian-specific ++ * New build system. Fonts included in deb at request of upstream authors ++ ++ -- Darren Benham Fri, 22 Jul 1999 10:49:00 -0800 ++ ++abiword (0.5.5-1) unstable; urgency=low ++ ++ * New Upstream Version ++ * Upstream changes: (no upstream changelog) ++ + Improvements to localization support ++ + New dialog: Insert Break ++ + Several bug fixes in the editing portions of the code ++ + Reworked command line parsing ++ + Finnish localization (jarmo@dawn.joensuu.fi) ++ + Patch to fix ispell hashfiles (gecko@benham.net) ++ + More vi keybindings. (stepp@mithril.res.cmu.edu) ++ ++ -- Darren Benham Sun, 2 May 1999 23:20:03 -0700 ++ ++abiword (0.5.3-3) unstable; urgency=low ++ ++ * Gotten rid of the need to use special dictionary...abiword.hash ++ * Removed requirement of Fonts directory to build (for other archs) ++ * change default spellchecker from american.hash to default.hash ++ ++ -- Darren Benham Fri, 9 Apr 1999 15:52:23 -0700 ++ ++abiword (0.5.3-2) unstable; urgency=low ++ ++ * fixed copyright path in copyright file (closes: #35622) ++ ++ -- Darren Benham Fri, 9 Apr 1999 10:36:50 -0700 ++ ++abiword (0.5.3-1) unstable; urgency=low ++ ++ * New Upstream Version ++ * Upstream changes: (no upstream changelog) ++ + Better support for GTK themes ++ + Hardcoded Style sets ++ + Very basic support for headers and footers. (Not yet editable) ++ + Simple support for time, page number, and page count fields ++ including page numbers ++ + Improvements to GTK file dialog, font dialog, and popup menus ++ + vi keybindings! :-) (rwerner@lx1.microbsys.com) ++ + Start of a status bar ++ ++ ++ -- Darren Benham Thu, 8 Apr 1999 22:24:48 -0700 ++ ++abiword (0.5.2-5) unstable; urgency=low ++ ++ * Removed Build dependency on uninstalled source package ++ * Turned off debug flag to prevent some security issues ++ ++ -- Darren Benh Mon, 29 Mar 1999 18:32:40 -0800 ++ ++abiword (0.5.2-4) unstable; urgency=low ++ ++ * Removed kernel version and arch -isms ++ ++ -- Darren Benham Sun, 28 Mar 1999 17:47:18 -0800 ++ ++abiword (0.5.2-3) unstable; urgency=low ++ ++ * What happened to the depends for abi-fonts??? ++ ++ -- Darren Benham Thu, 25 Mar 1999 20:46:43 -0800 ++ ++abiword (0.5.2-2) unstable; urgency=low ++ ++ * Compiling for gtk1.2 at request of the bleeding edgers ++ we're still at glibc2.0, though ++ * Added a custom dictionary for spell checking ++ To use this, you have to delete ~/.abiword or change the two ++ entries to point to /usr/share/abiword/abiword.hash ++ ++ -- Darren Benham Wed, 24 Mar 1999 23:31:10 -0800 ++ ++abiword (0.5.2-1) unstable; urgency=low ++ ++ * New upstream version ++ * Added two documents: ++ - one describes abword and fonts and how to add fonts ++ - one describes the format of abword documents (saved in abiword ++ format) ++ * Upstream changes: (no upstream changelog) ++ - Complete set of menu items (stubs only) ++ - Improvements to the Word97 importer ++ - XP mechanism for user options ++ - Improvements to Unix font chooser dialog ++ - Emacs-style key bindings (optional) ++ - Zoom ++ - New dialog: More Windows ++ - New dialog: About ++ - More cleanup of Unix font handling ++ - MRU menu ++ - Context menus ++ ++ -- Darren Benham Sat, 20 Mar 1999 16:40:36 -0800 ++ ++abiword (0.5.1-1) unstable; urgency=low ++ ++ * Initial Release. 0.5.1 came out before 0.5.0 was uploaded. ++ ++ -- Darren Benham Wed, 17 Mar 1999 14:10:33 -0800 ++ ++abiword (0.5.0-1) unstable; urgency=low ++ ++ * Initial Release (canceled, see above). ++ ++ -- Darren Benham Tue, 16 Mar 1999 12:59:22 -0800 diff --cc debian/clean index 0000000,0000000..8d74dfd new file mode 100644 --- /dev/null +++ b/debian/clean @@@ -1,0 -1,0 +1,9 @@@ ++# Remove the following files to force their regeneration with bison ++plugins/mathview/itex2mml/y.tab.c ++plugins/mathview/itex2mml/y.tab.h ++ ++# Generated files: ++debian/abiword.xpm ++src/wp/test/*/Makefile ++src/wp/test/unix/tf-vgdump ++src/wp/test/win/testwrap.sh diff --cc debian/compat index 0000000,0000000..ec63514 new file mode 100644 --- /dev/null +++ b/debian/compat @@@ -1,0 -1,0 +1,1 @@@ ++9 diff --cc debian/control index 0000000,0000000..23c2ac1 new file mode 100644 --- /dev/null +++ b/debian/control @@@ -1,0 -1,0 +1,175 @@@ ++Source: abiword ++Section: gnome ++Priority: optional ++Maintainer: Debian QA Group ++Build-Depends: debhelper (>= 9), dh-autoreconf, quilt, imagemagick ++ ,bison ++ ,flex ++# ,gobject-introspection ++# ,libgirepository1.0-dev ++ ,libaiksaurus-1.2-dev ++ ,libaiksaurusgtk-1.2-dev ++ ,libasio-dev ++ ,libchamplain-gtk-0.12-dev ++ ,libebook1.2-dev (>= 3.8.5) ++ ,libecal1.2-dev (>= 3.8.5) ++ ,libenchant-dev ++ ,libfribidi-dev ++ ,libgcrypt20-dev ++ ,libgoffice-0.10-dev ++ ,libgtk2.0-dev ++ ,libglib2.0-dev ++ ,libgtk-3-dev ++ ,libgtkmathview-dev ++ ,libjpeg-dev ++ ,liblink-grammar4-dev ++ ,libloudmouth1-dev ++ ,libots-dev ++ ,libpng-dev ++ ,librdf0-dev ++ ,libreadline-dev ++ ,librevenge-dev ++ ,librsvg2-dev ++ ,libsoup2.4-dev ++ ,libtelepathy-glib-dev ++ ,libtidy-dev ++ ,libwmf-dev ++ ,libwpd-dev (>= 0.10) ++ ,libwpg-dev (>= 0.3) ++ ,libwps-dev (>= 0.3) ++ ,libwv-dev ++ ,libxslt-dev | libxslt1-dev ++# subversion is used by get-orig-source ++ ,subversion, svn2cl | subversion-tools (<< 1.7.5) ++# valgrind is only used in post-build tests, enable on available architectures ++ ,valgrind [amd64 armhf i386 powerpc] ++Standards-Version: 3.9.6 ++Homepage: http://www.abisource.com/ ++Vcs-Browser: http://anonscm.debian.org/gitweb/?p=collab-maint/abiword.git ++Vcs-Git: git://anonscm.debian.org/collab-maint/abiword.git ++ ++Package: abiword-common ++Section: editors ++Architecture: all ++Depends: ${misc:Depends} ++Description: efficient, featureful word processor with collaboration -- common files ++ AbiWord is a full-featured, efficient word processing application. ++ It is suitable for a wide variety of word processing tasks, and ++ is extensible with a variety of plugins. ++ . ++ This package contains the common files that are used on all architectures ++ without modification. ++ ++Package: abiword ++Section: editors ++Architecture: any ++Depends: ${misc:Depends}, ${shlibs:Depends}, abiword-common (>= ${source:Version}), gsfonts ++Recommends: abiword-plugin-grammar, abiword-plugin-mathview, aspell-en | aspell-dictionary, poppler-utils, fonts-liberation ++Description: efficient, featureful word processor with collaboration ++ AbiWord is a full-featured, efficient word processing application. ++ It is suitable for a wide variety of word processing tasks, and ++ is extensible with a variety of plugins. ++ . ++ This package includes many of the available import/export plugins allowing ++ AbiWord to interact with ODT, WordPerfect, and other formats. It also ++ includes tools plugins, offering live collaboration with AbiWord users ++ on Linux and Windows (using TCP or Jabber/XMPP), web translation and ++ dictionary support, and more. ++ . ++ Additional plugins that require significant amounts of extra software to ++ function are in the various abiword-plugin-* packages. ++ ++Package: abiword-plugin-grammar ++Section: editors ++Architecture: any ++Depends: ${misc:Depends}, ${shlibs:Depends}, abiword (= ${binary:Version}) ++Description: grammar checking plugin for AbiWord ++ AbiWord is a full-featured, efficient word processing application. ++ It is suitable for a wide variety of word processing tasks, and ++ is extensible with a variety of plugins. ++ . ++ This package contains an in-line grammar checking system for AbiWord ++ documents. ++ ++Package: abiword-plugin-mathview ++Section: editors ++Architecture: any ++Depends: ${misc:Depends}, ${shlibs:Depends}, abiword (= ${binary:Version}), fonts-lyx ++Description: equation editor plugin for AbiWord ++ AbiWord is a full-featured, efficient word processing application. ++ It is suitable for a wide variety of word processing tasks, and ++ is extensible with a variety of plugins. ++ . ++ This package contains an equation editing system for AbiWord ++ documents. ++ ++Package: libabiword-3.0 ++Section: libs ++Architecture: any ++Multi-Arch: same ++Pre-Depends: ${misc:Pre-Depends} ++Depends: ${misc:Depends}, ${shlibs:Depends} ++Description: efficient, featureful word processor with collaboration -- shared library ++ AbiWord is a full-featured, efficient word processing application. ++ It is suitable for a wide variety of word processing tasks, and ++ is extensible with a variety of plugins. ++ . ++ This package contains the shared library, enabling other applications to ++ integrate AbiWord functionality. ++ ++Package: libabiword-3.0-dev ++Section: libdevel ++Architecture: any ++Depends: ${misc:Depends}, libabiword-3.0 (= ${binary:Version}) ++ ,libcairo-dev | libcairo2-dev ++ ,libebook1.2-dev ++ ,libenchant-dev ++ ,libecal1.2-dev ++ ,libfribidi-dev ++ ,libglib2.0-dev ++ ,libgoffice-0.10-dev ++ ,libgsf-1-dev ++ ,libgtk-3-dev ++ ,libical-dev (>= 0.46) ++ ,libpango1.0-dev ++ ,librasqal3-dev ++ ,librdf0-dev ++ ,librsvg2-dev ++ ,libwv-dev ++ ,libx11-dev ++ ,libxslt-dev | libxslt1-dev ++Description: efficient, featureful word processor with collaboration -- development files ++ AbiWord is a full-featured, efficient word processing application. ++ It is suitable for a wide variety of word processing tasks, and ++ is extensible with a variety of plugins. ++ . ++ This package contains development files for software linking against ++ libabiword-3.0. ++ ++#Package: gir1.2-abiword-3.0 ++#Section: introspection ++#Architecture: any ++#Depends: ${gir:Depends}, ${misc:Depends} ++#Description: GObject introspection data for libabiword ++# This package contains introspection data for libabiword. ++# . ++# It can be used by packages using the GIRepository format to generate ++# dynamic bindings. ++ ++Package: abiword-dbg ++Section: debug ++Priority: extra ++Architecture: any ++Depends: abiword (= ${binary:Version}), ${misc:Depends} ++Description: debugging symbols for abiword word processor ++ AbiWord is a full-featured, efficient word processing application. ++ It is suitable for a wide variety of word processing tasks, and ++ is extensible with a variety of plugins. ++ . ++ This package includes many of the available import/export plugins allowing ++ AbiWord to interact with ODT, WordPerfect, and other formats. It also ++ includes tools plugins, offering live collaboration with AbiWord users ++ on Linux and Windows (using TCP or Jabber/XMPP), web translation and ++ dictionary support, and more. ++ . ++ This package contains debugging symbols needed for debugging abiword. diff --cc debian/copyright index 0000000,0000000..27b6e79 new file mode 100644 --- /dev/null +++ b/debian/copyright @@@ -1,0 -1,0 +1,651 @@@ ++Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ ++Upstream-Name: abiword ++Source: http://www.abisource.com/download/ ++Comment: This package was debianized by ++ Masayuki Hatta (mhatta) on Sun, 22 Mar 2009 18:42:01 +0900 ++ ++Files: debian/* ++Copyright: 2011-2013 Dmitry Smirnov ++ 2001 Aaron Lehmann ++ 2001 Anthony Fok ++ 1999-2000 Darren Benham ++ 2011 Hector Oron ++ 2005 J.H.M. Dassen (Ray) ++ 2010 Jari Aalto ++ 2004-2008 Joshua Kwan ++ 2004 Jordi Mallach ++ 2001-2002 LaMont Jones ++ 2002-2009 Masayuki Hatta (mhatta) ++ 2006 Matthias Klose ++ 2007 Matthias Klose ++ 2011 Michael Biebl ++ 2009-2010 Patrik Fimml ++ 2011 Regis Boudin ++ 2011 Rene Engelhard ++ 2008 Ryan Pavlik ++License: GPL-3+ ++ ++Files: * ++Copyright: 2012 AbiSource.com ++ 1998-2005,2010 AbiSource, Inc ++ 2008-2010 AbiSource Corporation B.V ++ 1999-2006,2008-2010 Free Software Foundation, Inc ++ 1997-2003,2005 Net Integration Technologies Inc. ++ 2007,2012 One Laptop Per Child ++ 2003 Red Hat, Inc ++ 2002 Screetch ++ 2004-2005,2009 The AbiWord Project ++ 2011 abel ++ 2004-2005 Adam Weinberger ++ 2009 Alex ++ 2012 Olexij Tkatchenko ++ 2004-2006 Amos Batto ++ 2010 Amos Batto ++ 2000 Andraz Tori ++ 2001 Andrew Dunbar ++ 2002 Andrzej Pruszynski ++ 2010 Antón Méixome ++ 2012 Aputsiaq Janussen ++ 2003 Arafat Medini ++ 2006 baidongyi ++ 2011-2012 Ben Martin ++ 2007-2008 Benno Schulenberg ++ 2002-2012 Besnik Bleta ++ 2012 Carlos Garnacho ++ 2006 Camille Moulin ++ 2000 Chih-Wei Huang ++ 2001-2002 Christian Biesinger ++ 2001-2002 Christian Meyer ++ 2002 Christian Neumair ++ 2011-2013 Chris Leonard ++ 2011 Chris Leonard ++ 2005 Daniel d'Andrada T. de Carvalho ++ 2004 David Bolack ++ 2006 Djihed Afifi ++ 2000-2003,2005 Dom Lachowicz ++ 2001 Dom Lachowicz ++ 2001 Dom Lachowicz ++ 2006,2008 Dominic Lachowicz ++ 1998-2011 Dominic Lachowicz ++ 2011 Fabiano Fidencio ++ 2010 F Wolff ++ 2010 Florence ++ 2008-2009 Firat Kiyak ++ 2001-2005 Francis James Franklin ++ 2003 Francisco Javier F. Serrador ++ 2004-2005 Francisco Javier F. Serrador ++ 2006 Fridrich Strba ++ 2000-2001,2004 Frodo Looijaard ++ 2012 Gabor Kelemen ++ 2002 Ge'ez Frontier Foundation ++ 2002 Gilles Saint-Denis ++ 2001 Görkem Çetin ++ 2000-2009,2011-2013 Hubert Figuière ++ 2001,2004,2009,2011 Hubert Figuiere ++ 2010-2012 Ibrahima SARR ++ 2003 IBRAHIM ALIBRAHIM ++ 2007 Ihar Hrachyshka ++ 2005-2006 INdT ++ 2010-2011 Ingo Brueckl ++ 2012 Ingo Brückl ++ 2011 Irma Alvarez ++ 2001-2002 Jared Davis ++ 2008-2012 Jaroslav Ryník ++ 2005 Jean Brefort ++ 2006 Jonathan Ernst ++ 2002-2007 Jordi Mas i Hernàndez ++ 2002 Jesper Skov ++ 2009 J.M. Maurer ++ 2001 Kai Lahmann ++ 2002 Karl Ove Hufthammer ++ 2000 Kenneth Christiansen ++ 2007,2009,2011-2012 Khaled Hosny ++ 2012 kousikkumar771 ++ 2005 Kostas Papadimas ++ 2002 Ladislav Michl ++ 2000-2005 Luca Padovani ++ 2012 lite 2012 ++ 2010-2011 Maleesh Prasan ++ 2012 Marcin ++ 2007,2009 Marc 'Foddex' Oude Kotte ++ 2002-2010 Marc Maurer ++ 2003-2005 Marek Laane ++ 2004-2006 Maria Elena Pozo Tapia ++ 2003-2005 Mark Gilbert ++ 2003 Mark Pazolli ++ 2001 Martin Lacko ++ 2006,2012 Martin Srebotnjak ++ 2000-2007,2010 Martin Sevior ++ 2008-2009 Martin Sevior ++ 2003 Masayuki Hatta ++ 1999 Matt Kimball ++ 2001,2003 Mike Nordell ++ 2001 Michael D. Pritchett ++ 2007 Michael Gorse ++ 2011-2012 Miguel Anxo Bouzada ++ 2004 Mikey Cooper ++ 2012 Mohomodou Houssouba ++ 2004 Morten Welinder ++ 2004 Nelson Ferraz ++ 2002 Nick Niktaris ++ 2003 Nickolay Shmyrev (Николай В. Шмырёв) ++ 2012 Niraj Paudel ++ 2010 Patrik Fimml ++ 2001,2002 Patrick Lam ++ 2009 Pedro Lino ++ 2001-2012 Per Larsson ++ 2001 Petr Tomasek ++ 2007 Philippe Milot ++ 2003 Pierre Abbat ++ 2012 Pjotr Kan ++ 2012 Prashant Bafna ++ 2002 Raphael Finkel ++ 2004-2005 Reinout van Schouwen ++ 1996 Robert de Bath ++ 2004-2005 Robert Staudinger ++ 2006,2008 Robert Staudinger ++ 2003 Rhoslyn Prys ++ 2007 Rhoslyn Prys ++ 2007-2008 Ryan Pavlik ++ 2000-2002 Rui Miguel Seabra ++ 2008 Сергей Ирюпин ++ 2001 Sam Tobin-Hochstadt ++ 2001 Sean Young ++ 2006 shai sztern ++ 2005 Simon Smith ++ 2012 Simon Larochelle ++ 2001,2005 Simos Xenitellis ++ 2005 Socrates Vavilis ++ 2005 Stefan Ihringer ++ 2012 Svante Signell ++ 2012 Tanya Guza ++ 2001-2007 Tomas Frydrych ++ 1994-1996 Thomas G. Lane ++ 2011 Urmas Dren ++ 2005 Vijay Durairaj ++ 2002-2003 Vital Khilko ++ 2009-2011 Volker Ribbert ++ 2011 Volodymyr Rudyj ++ 2006 Walter Cheuk ++ 2002-2005 William Lachance ++ 2011 wwycheuk ++ 2001-2002 Yaacov Akiba Slama ++ 2006 YunSong Hwang ++ 2006 Youssef CHAHIBI ++ 2008 Xun Sun ++ 2004 Zaklina Gjalevska ++ 2004 Zaklina Gjalevska ++ 1998-2012 AbiWord developers, listed in AUTHORS file ++License: GPL-2+ ++Comment: ++ About Trademark ++ (See also http://www.abisource.com/information/license/tm_guide.phtml) ++ . ++ Trademark Usage Guidelines ++ . ++ AbiSource Trademarks ++ . ++ AbiSource, AbiWord, AbiCalc, AbiFile, AbiSuite, AbiShow and other ++ AbiSource graphics, logos and service names are trademarks of Dom ++ Lachowicz. These trademarks may not be used in connection with any ++ product or service that is not AbiSource's, in any manner that is ++ likely to cause confusion among customers, or in any manner that ++ disparages or discredits AbiSource. ++ . ++ Trademarks and the GPL ++ . ++ AbiSource software products, such as AbiWord, are copyrighted works ++ released under the terms of the GNU General Public License ++ (GPL). Verbatim copies of such works may be made and distributed, by ++ anyone, in accordance with the terms of the GPL without violating the ++ AbiSource trademarks. The GPL also grants you certain rights to make ++ and distribute derivative works based on the source code to AbiSource ++ products. ++ . ++ The GPL does not grant you any right to use AbiSource trademarks in ++ connection with these derivative works. AbiSource trademarks may not ++ be used in connection with any such derivative works unless that usage ++ is explicitly and specifically licensed, in writing, from Dom ++ Lachowicz. ++ . ++ Personal exemption ++ . ++ As a specific exception, AbiSource freely licenses the use of certain ++ of its trademarks solely in combination with the suffix "Personal" ++ when applied to derivative works based on an AbiSource GPL ++ product. Thus, for example, you are free to use the mark "AbiWord ++ Personal" in connection with derivative works that are based on ++ "AbiWord". To help maintain this distinction, AbiSource releases the ++ sources to its GPL products with Personal-based trademarks. ++ . ++ We are not lawyers ++ . ++ Trademark and copyright issues are, at heart, legal matters. We've ++ tried to keep this explanation as simple and common-sense as possible, ++ but if you have any questions about when and how to use AbiSource ++ trademarks, your best bet is to ask a lawyer. We are not lawyers. ++ . ++ We are not evil ++ . ++ Our goal is very simple. We want to make sure our software stays Open ++ Source, no matter what. That's why we chose the GPL. We also want ++ everyone to know which products are ours. That's why we are so picky ++ about our trademarks. ++ . ++ "AbiWord" vs. "AbiWord Personal" for Debian? ++ . ++ Maybe this is informative for now. ++ . ++ > From: Dom Lachowicz ++ > Date: 20 July 2004 22:08:34 BST ++ > To: Andy Korvemaker, abiword-dev@abisource.com ++ > Subject: Re: Abiword being removed from Debian/unstable? ++ > ++ > ++ > I'm not sure if this is the reason or not, but please ++ > see: ++ > ++ > http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=258918 ++ > ++ > For the record, I've recently acquired the AbiWord ++ > trademarks and whatnot. I haven't had a chance to ++ > update the TM information on the website. ++ > ++ > To be expressly clear here for any Debian guys that ++ > read this message: ++ > ++ > Within reason, I don't care if you use "AbiWord" vs. ++ > "AbiWord Personal." In fact, I'd prefer it if you used ++ > "AbiWord." ++ > ++ > Within reason, I don't care if you use the "official" ++ > artwork or the "personal" artwork. In fact, I'd prefer ++ > it if you used the "official" artwork. ++ > ++ > I do begin to care if you use my trademarks to promote ++ > other products, or in ways that disparage my ++ > trademarks or products. If you "forked" AbiWord, you ++ > couldn't use the trademarks. But you're clearly not ++ > going to do that. The USPTO has more info and case law ++ > on this sort of thing. ++ > ++ > Debian and the other distros are clearly distributing ++ > AbiWord, and providing a beneficial service to the ++ > community. Even though Debian's version might have a ++ > few patches against our "mainline" branch, I don't ++ > believe it constitutes a "fork." As such, I think that ++ > it is fine (if not preferable) for you guys to use the ++ > official name and artwork in your distribution. ++ > ++ > So, you have my blessing to call your AbiWord + ++ > patches "AbiWord". You can use the official artwork ++ > too. ++ > ++ > Dom ++ > ++ ++Files: ++ src/text/fmt/xp/fp_TableContainer.cpp ++ src/text/fmt/xp/fp_TableContainer.h ++ src/text/fmt/xp/fp_ContainerObject.h ++ src/af/xap/cocoa/xap_CocoaEncodingManager.cpp ++ src/af/util/xp/ut_string.cpp ++Copyright: 1998-2000 AbiSource, Inc ++ 1994-1998 Free Software Foundation, Inc. ++ 1997-2000 Free Software Foundation ++ 1995-1997 Peter Mattis ++ 1995-1997 Spencer Kimball ++ 1995-1997 Josh MacDonald ++ 2002 Martin Sevior ++ 2001 Hubert Figuiere ++License: GPL-2+ ++Comment: ++ with portions licensed as LGPL-2 ++ ++Files: src/af/xap/gtk/xap_UnixEncodingManager.cpp ++Copyright: 1995-1998 Free Software Foundation, Inc. ++ 1997-2000 Free Software Foundation ++License: LGPL-2+ ++ ++Files: ++ src/af/xap/win/winezmouse.h ++ src/af/util/xp/ut_rand.cpp ++Copyright: 2000 CodeWeavers ++ 1983 Regents of the University of California ++ 1991,1996 Free Software Foundation, Inc ++License: LGPL-2.1+ ++ ++Files: plugins/latex/xsltml/README ++Copyright: 2001-2003, Vasil Yaroshevich ++License: MIT/X11 (BSD like) ++ Permission is hereby granted, free of charge, to any person ++ obtaining a copy of this software and associated documentation ++ files (the ``Software''), to deal in the Software without ++ restriction, including without limitation the rights to use, ++ copy, modify, merge, publish, distribute, sublicense, and/or ++ sell copies of the Software, and to permit persons to whom the ++ Software is furnished to do so, subject to the following ++ conditions: ++ . ++ The above copyright notice and this permission notice shall be ++ included in all copies or substantial portions of the Software. ++ . ++ Except as contained in this notice, the names of individuals ++ credited with contribution to this software shall not be used in ++ advertising or otherwise to promote the sale, use or other ++ dealings in this Software without prior written authorization ++ from the individuals in question. ++ . ++ Any stylesheet derived from this Software that is publically ++ distributed will be identified with a different name and the ++ version strings in any derived Software will be changed so that ++ no possibility of confusion between the derived package and this ++ Software will exist. ++ . ++ Warranty ++ -------- ++ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, ++ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES ++ OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND ++ NONINFRINGEMENT. IN NO EVENT SHALL NORMAN WALSH OR ANY OTHER ++ CONTRIBUTOR BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, ++ WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING ++ FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR ++ ++Files: plugins/collab/backends/service/cacert.pem ++Copyright: 1994-2000 ++License: MPL-1.1 or GPL-2+ ++ ++Files: src/af/ev/gtk/ev_UnixKeysym2ucs.cpp ++Copyright: not applicable ++License: Public domain ++ This software is in the public domain. Share and enjoy! ++ ++Files: src/wp/impexp/xp/MathSVGScript.h ++Copyright: 2006 Sam Ruby ++License: MIT ++ Permission is hereby granted, free of charge, to any person obtaining a copy ++ of this software and associated documentation files (the 'Software'), to deal ++ in the Software without restriction, including without limitation the rights ++ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell ++ copies of the Software, and to permit persons to whom the Software is ++ furnished to do so, subject to the following conditions: ++ . ++ The above copyright notice and this permission notice shall be included in all ++ copies or substantial portions of the Software. ++ THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, EXPRESS OR ++ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, ++ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE ++ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER ++ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, ++ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE ++ SOFTWARE ++ ++Files: ++ plugins/paint/win/bmp2png.cpp ++ plugins/paint/win/png2bmp.cpp ++Copyright: 2002 Jason Summers ++License: ++ This software is distributed in the hope that it will be useful, but ++ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY ++ or FITNESS FOR A PARTICULAR PURPOSE. ++ . ++ Permission is hereby granted to use, copy, modify, and distribute this ++ source code for any purpose, without fee. ++ ++Files: ++ plugins/mathview/itex2mml/y.tab.c.msvc ++ plugins/mathview/itex2mml/y.tab.h.msvc ++Copyright: 1984,1989-1990,2000-2006 Free Software Foundation, Inc. ++License: GPL-3+ ++Disclaimer: ++ As a special exception, you may create a larger work that contains ++ part or all of the Bison parser skeleton and distribute that work ++ under terms of your choice, so long as that work isn't itself a ++ parser generator using the skeleton or a modified version thereof ++ as a parser skeleton. Alternatively, if you modify or redistribute ++ the parser skeleton itself, you may (at your option) remove this ++ special exception, which will cause the skeleton and the resulting ++ Bison output files to be licensed under the GNU General Public ++ License without this special exception. ++ ++Files: ++ src/af/ev/gtk/ev_UnixFontCombo.cpp ++ src/af/ev/gtk/ev_UnixFontCombo.h ++Copyright: 2005 Robert Staudinger ++License: LGPL-2+ ++ ++Files: ++ plugins/collab/backends/service/xp/msc_stdint.h ++ plugins/collab/backends/service/xp/soa.h ++ plugins/collab/backends/service/xp/soa_result.cpp ++ plugins/collab/backends/service/xp/soa_result.h ++ plugins/collab/backends/service/xp/soa_soup.cpp ++ plugins/collab/backends/service/xp/soa_soup.h ++ plugins/collab/backends/service/xp/soa_types.h ++ plugins/collab/backends/service/xp/tls_tunnel.cpp ++ plugins/collab/backends/service/xp/tls_tunnel.h ++Copyright: 2008-2009 AbiSource Corporation B.V ++License: BSD-2-clause ++ ++Files: goffice-bits2/goffice/utils/go-color.h ++Copyright: 1999-2000, EMC Capital Management, Inc ++License: GPL-2+ ++ ++Files: ++ goffice-bits/goffice/app/go-cmd-context.c ++ goffice-bits2/goffice/app/go-cmd-context.c ++ goffice-bits/goffice/utils/go-glib-extras.c ++ goffice-bits2/goffice/utils/go-glib-extras.c ++ goffice-bits/goffice/goffice-features.h ++ goffice-bits2/goffice/goffice-features.h ++Copyright: 1999-2004 Jody Goldberg ++ 2005 Morten Welinder ++License: GPL-2+ ++Comment: ++ no license header, assumed to be under same license terms as application ++ ++Files: ++ goffice-bits/goffice/utils/go-file.h ++ goffice-bits2/goffice/utils/go-file.h ++ goffice-bits/goffice/app/go-cmd-context.h ++ goffice-bits/goffice/app/goffice-app.h ++ goffice-bits/goffice/goffice-priv.h ++ goffice-bits/goffice/goffice.c ++ goffice-bits/goffice/goffice.h ++ goffice-bits/goffice/gtk/goffice-gtk.c ++ goffice-bits/goffice/gtk/go-palette.c ++ goffice-bits/goffice/gtk/go-palette.h ++ goffice-bits/goffice/utils/go-color.c ++ goffice-bits/goffice/utils/go-image.c ++ goffice-bits/goffice/utils/goffice-utils.h ++ goffice-bits2/goffice/app/go-cmd-context.h ++ goffice-bits2/goffice/app/goffice-app.h ++ goffice-bits2/goffice/goffice-priv.h ++ goffice-bits2/goffice/goffice.c ++ goffice-bits2/goffice/goffice.h ++ goffice-bits2/goffice/gtk/goffice-gtk.c ++ goffice-bits2/goffice/utils/go-color.c ++ goffice-bits2/goffice/utils/go-image.c ++ goffice-bits2/goffice/utils/goffice-utils.h ++ goffice-bits2/goffice/gtk/go-palette.c ++ goffice-bits2/goffice/gtk/go-palette.h ++Copyright: 2003 Red Hat, Inc ++ 2006 Emmanuel Pacaud ++ 2003-2005 Jody Goldberg ++ 2004,2009-2010 Morten Welinder ++ 2004 Yukihiro Nakai ++License: GPL-2 ++ ++Files: ++ goffice-bits/goffice/gtk/go-color-palette.c ++ goffice-bits2/goffice/gtk/go-color-palette.c ++ goffice-bits/goffice/gtk/go-color-palette.h ++ goffice-bits2/goffice/gtk/go-color-palette.h ++ goffice-bits/goffice/gtk/go-combo-box.c ++ goffice-bits/goffice/gtk/go-combo-box.h ++ goffice-bits/goffice/gtk/go-combo-color.c ++ goffice-bits/goffice/gtk/go-combo-color.h ++ goffice-bits2/goffice/gtk/go-combo-box.c ++ goffice-bits2/goffice/gtk/go-combo-box.h ++ goffice-bits2/goffice/gtk/go-combo-color.c ++ goffice-bits2/goffice/gtk/go-combo-color.h ++ goffice-bits/goffice/gtk/goffice-gtk.h ++ goffice-bits2/goffice/gtk/goffice-gtk.h ++ goffice-bits/goffice/utils/go-image.h ++ goffice-bits2/goffice/utils/go-image.h ++ goffice-bits/goffice/gtk/go-color-group.c ++ goffice-bits2/goffice/gtk/go-color-group.c ++ goffice-bits/goffice/gtk/go-color-group.h ++ goffice-bits2/goffice/gtk/go-color-group.h ++ goffice-bits/goffice/gtk/go-color-selector.c ++ goffice-bits2/goffice/gtk/go-color-selector.c ++ goffice-bits/goffice/gtk/go-color-selector.h ++ goffice-bits2/goffice/gtk/go-color-selector.h ++ src/af/xap/gtk/xap_UnixTableWidget.cpp ++ src/af/xap/gtk/xap_UnixTableWidget.h ++Copyright: 2000-2004 Ximian, Inc ++ 2001 Almer S. Tigelaar ++ 2006 Emmanuel pacaud ++ 2002 Joaquin Cuenca Abela ++ 2004 Jody Goldberg ++ 2000 Michael Levy ++License: LGPL-2 ++ ++Files: ++ goffice-bits/goffice/utils/go-cairo.h ++ goffice-bits/goffice/utils/go-cairo.c ++ goffice-bits/goffice/utils/go-locale.h ++ goffice-bits/goffice/utils/go-locale.c ++Copyright: 2000 Eazel, Inc ++ 1998 Chris Lahey ++ 1998 Miguel de Icaza ++ 2003-2005 Jody Goldberg ++ 2005-2007 Morten Welinder ++ 2003-2005 Jody Goldberg ++ 2007 Emmanuel Pacaud ++License: GPL-2 ++ ++License: MPL-1.1 ++ Software distributed under the License is distributed on an "AS IS" basis, ++ WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License ++ for the specific language governing rights and limitations under the ++ License. ++ . ++ The Original Code is the Netscape security libraries. ++ . ++ The Initial Developer of the Original Code is Netscape Communications ++ Corporation. Portions created by Netscape are Copyright (C) 1994-2000 ++ Netscape Communications Corporation. All Rights Reserved. ++ . ++ You may obtain a copy of the License at http://www.mozilla.org/MPL/ ++ ++License: BSD-2-clause ++ Redistribution and use in source and binary forms, with or without ++ modification, are permitted provided that the following conditions are met: ++ * Redistributions of source code must retain the above copyright ++ notice, this list of conditions and the following disclaimer. ++ * Redistributions in binary form must reproduce the above copyright ++ notice, this list of conditions and the following disclaimer in the ++ documentation and/or other materials provided with the distribution. ++ * Neither the name of AbiSource Corporation B.V. nor the ++ names of other contributors may be used to endorse or promote products ++ derived from this software without specific prior written permission. ++ THIS SOFTWARE IS PROVIDED BY ABISOURCE CORPORATION B.V. AND OTHER ++ CONTRIBUTORS ''AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, ++ BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS ++ FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL ABISOURCE ++ CORPORATION B.V OR OTHER CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, ++ INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT ++ LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, ++ OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF ++ LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING ++ NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, ++ EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ++ ++License: GPL-3+ ++ This program is free software: you can redistribute it and/or modify ++ it under the terms of the GNU General Public License as published by ++ the Free Software Foundation, either version 3 of the License, or ++ (at your option) any later version. ++ . ++ This program is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ GNU General Public License for more details. ++ . ++ The complete text of the GNU General Public License 3 ++ can be found in "/usr/share/common-licenses/GPL-3". ++ ++License: GPL-2+ ++ This program is free software: you can redistribute it and/or modify ++ it under the terms of the GNU General Public License as published by ++ the Free Software Foundation, either version 2 of the License, or ++ (at your option) any later version. ++ . ++ This package is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ GNU General Public License for more details. ++ . ++ You should have received a copy of the GNU General Public License ++ along with this program. If not, see . ++ . ++ On Debian systems, the complete text of the GNU General Public License ++ version 2 can be found in `/usr/share/common-licenses/GPL-2'. ++ ++License: GPL-2 ++ This program is free software; you can redistribute it and/or modify ++ it under the terms of the GNU General Public License version 2 ++ as published by the Free Software Foundation. ++ . ++ This program is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ GNU General Public License for more details. ++ . ++ The complete text of the GNU General Public License 2 ++ can be found in "/usr/share/common-licenses/GPL-2". ++ ++License: LGPL-2.1+ ++ This library is free software; you can redistribute it and/or ++ modify it under the terms of the GNU Lesser General Public ++ License as published by the Free Software Foundation; either ++ version 2.1 of the License, or (at your option) any later version. ++ . ++ This library is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ Lesser General Public License for more details. ++ . ++ The complete text of the GNU Lesser General Public License ++ version 2.1 can be found in "/usr/share/common-licenses/LGPL-2.1". ++ ++License: LGPL-2+ ++ This library is free software; you can redistribute it and/or ++ modify it under the terms of the GNU Library General Public ++ License as published by the Free Software Foundation; either ++ version 2 of the License, or (at your option) any later version. ++ . ++ This library is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ Library General Public License for more details. ++ . ++ The complete text of the GNU Library General Public License ++ version 2 can be found in "/usr/share/common-licenses/LGPL-2". ++ ++License: LGPL-2 ++ This library is free software; you can redistribute it and/or ++ modify it under the terms of the GNU Library General Public ++ License as published by the Free Software Foundation; either ++ version 2 of the License. ++ . ++ This library is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ Library General Public License for more details. ++ . ++ The complete text of the GNU Library General Public License ++ version 2 can be found in "/usr/share/common-licenses/LGPL-2". ++ diff --cc debian/gbp.conf index 0000000,0000000..c281bae new file mode 100644 --- /dev/null +++ b/debian/gbp.conf @@@ -1,0 -1,0 +1,4 @@@ ++ ++[import-orig] ++pristine-tar = False ++merge = False diff --cc debian/gir1.2-abiword-3.0.install index 0000000,0000000..e8a103c new file mode 100644 --- /dev/null +++ b/debian/gir1.2-abiword-3.0.install @@@ -1,0 -1,0 +1,1 @@@ ++usr/lib/girepository-* diff --cc debian/libabiword-3.0-dev.install index 0000000,0000000..30c4f02 new file mode 100644 --- /dev/null +++ b/debian/libabiword-3.0-dev.install @@@ -1,0 -1,0 +1,3 @@@ ++usr/include ++usr/lib/*/pkgconfig/abiword-*.pc ++#usr/share/gir-* diff --cc debian/libabiword-3.0.install index 0000000,0000000..656a17c new file mode 100644 --- /dev/null +++ b/debian/libabiword-3.0.install @@@ -1,0 -1,0 +1,1 @@@ ++usr/lib/*/libabiword-*.so diff --cc debian/libabiword-3.0.lintian-overrides index 0000000,0000000..9291f73 new file mode 100644 --- /dev/null +++ b/debian/libabiword-3.0.lintian-overrides @@@ -1,0 -1,0 +1,7 @@@ ++# Upstream build system do not generate symlink to libabiword-*.so.N ++# libabiword-*.so is a library itself, (binary file) not a symlink. ++dev-pkg-without-shlib-symlink ++ ++# symbols are not very useful for CPP, ++# see http://wiki.debian.org/UsingSymbolsFiles#See_also ++no-symbols-control-file diff --cc debian/patches/624095-disable_smooth_scrolling.patch index 0000000,0000000..1da45c6 new file mode 100644 --- /dev/null +++ b/debian/patches/624095-disable_smooth_scrolling.patch @@@ -1,0 -1,0 +1,33 @@@ ++Author: Dmitry Smirnov ++From: Thomas Richter ++Subject: Cannot disable smooth scrolling ++Origin: other, http://bugs.debian.org/624095 ++Bug-Debian: http://bugs.debian.org/624095 ++Last-Update: 2011-11-21 ++Forwarded: yes ++Description: Disable smooth scrolling ++ Commenting code which is enabling smooth scrolling disregarding preferences ++ to leave decision whenever use the smooth scrolling or not to user. ++ ++--- a/src/text/fmt/xp/fv_View.cpp +++++ b/src/text/fmt/xp/fv_View.cpp ++@@ -14313,16 +14313,19 @@ ++ if(static_cast(m_iNumHorizPages) > m_pLayout->countPages()) ++ { ++ m_iNumHorizPages = m_pLayout->countPages(); ++ } +++/* Debian bug #624095: smooth scrolling enabled, preferences ignored. +++ * Commenting to leave decision whenever use the smooth scrolling to user. ++ if (m_iNumHorizPages > 1) ++ { ++ XAP_App::getApp()->setEnableSmoothScrolling(false); ++ } ++ else ++ { ++ XAP_App::getApp()->setEnableSmoothScrolling(true); ++ } +++*/ ++ if(iOldNo != static_cast(m_iNumHorizPages)) ++ { ++ UT_uint32 iPrevYOffset = m_yScrollOffset; ++ XAP_Frame * pFrame = static_cast(getParentData()); diff --cc debian/patches/autosave.diff index 0000000,0000000..8c217c1 new file mode 100644 --- /dev/null +++ b/debian/patches/autosave.diff @@@ -1,0 -1,0 +1,26 @@@ ++From: Patrik Fimml ++Subject: [PATCH] debian/autosave ++ ++Enable autosave by default ++ ++Signed-off-by: Patrik Fimml ++ ++--- ++ src/af/xap/xp/xap_Prefs_SchemeIds.h | 2 +- ++ 1 files changed, 1 insertions(+), 1 deletions(-) ++ ++diff --git a/src/af/xap/xp/xap_Prefs_SchemeIds.h b/src/af/xap/xp/xap_Prefs_SchemeIds.h ++index a88650b..0fe58d4 100644 ++--- a/src/af/xap/xp/xap_Prefs_SchemeIds.h +++++ b/src/af/xap/xp/xap_Prefs_SchemeIds.h ++@@ -77,7 +77,7 @@ ++ #define XAP_PREF_DEFAULT_LatinLigatures "0" ++ ++ #define XAP_PREF_KEY_AutoSaveFile "AutoSaveFile" ++-#define XAP_PREF_DEFAULT_AutoSaveFile "0" /* Auto save files by default */ +++#define XAP_PREF_DEFAULT_AutoSaveFile "1" /* Auto save files by default */ ++ ++ #define XAP_PREF_KEY_AutoSaveFilePeriod "AutoSaveFilePeriod" ++ #define XAP_PREF_DEFAULT_AutoSaveFilePeriod "5" /* Auto save files by default */ ++-- ++tg: (a60ef3b..) debian/autosave (depends on: master) diff --cc debian/patches/boost54.patch index 0000000,0000000..f7cfeae new file mode 100644 --- /dev/null +++ b/debian/patches/boost54.patch @@@ -1,0 -1,0 +1,31 @@@ ++Last-Update: 2014-02-05 ++Forwarded: yes ++Author: Dmitry Smirnov ++Bug-Debian: http://bugs.debian.org/737551 ++Bug-Abiword: http://bugzilla.abisource.com/13602 ++Description: fix FTBFS with libboost1.54-dev ++ ++--- a/plugins/collab/core/sync/xp/SynchronizedQueue.h +++++ b/plugins/collab/core/sync/xp/SynchronizedQueue.h ++@@ -21,8 +21,9 @@ ++ ++ #include ++ #include ++ #include +++#include ++ #include ++ #include ++ ++ class EmptyQueueException {}; ++--- a/plugins/collab/backends/tcp/xp/Session.h +++++ b/plugins/collab/backends/tcp/xp/Session.h ++@@ -21,8 +21,9 @@ ++ ++ #include ++ #include ++ #include +++#include ++ #include ++ #include ++ #include ++ diff --cc debian/patches/ctrl-comma-subscript.diff index 0000000,0000000..5fd4904 new file mode 100644 --- /dev/null +++ b/debian/patches/ctrl-comma-subscript.diff @@@ -1,0 -1,0 +1,26 @@@ ++From: Patrik Fimml ++Subject: [PATCH] fixes/ctrl-comma-subscript ++ ++Make ctrl-comma (C-,) a shortcut for subscript text. ++ ++Signed-off-by: Patrik Fimml ++ ++--- ++ src/wp/ap/xp/ap_LB_Default.cpp | 2 +- ++ 1 files changed, 1 insertions(+), 1 deletions(-) ++ ++diff --git a/src/wp/ap/xp/ap_LB_Default.cpp b/src/wp/ap/xp/ap_LB_Default.cpp ++index 8581fb1..c7b8165 100644 ++--- a/src/wp/ap/xp/ap_LB_Default.cpp +++++ b/src/wp/ap/xp/ap_LB_Default.cpp ++@@ -480,7 +480,7 @@ ap_bs_Char CharTable[] = ++ {0x29, /* ) */ { "insertClosingParenthesis","", "", "" }}, ++ {0x2a, /* * */ { "insertData", "viewPara", "", "" }}, ++ {0x2b, /* + */ { "insertData", "zoomIn", "", "" }}, ++- {0x2c, /* , */ { "insertData", "", "", "" }}, +++ {0x2c, /* , */ { "insertData", "toggleSub", "", "" }}, ++ {0x2d, /* - */ { "insertData", "zoomOut", "", "" }}, ++ {0x2e, /* . */ { "insertData", "pasteSpecial", "", "" }}, ++ {0x2f, /* / */ { "insertData", "", "", "" }}, ++-- ++tg: (a60ef3b..) fixes/ctrl-comma-subscript (depends on: master) diff --cc debian/patches/evolution-data-server3.8.patch index 0000000,0000000..cad165a new file mode 100644 --- /dev/null +++ b/debian/patches/evolution-data-server3.8.patch @@@ -1,0 -1,0 +1,20 @@@ ++Last-Update: 2013-09-07 ++Forwarded: not-needed ++Author: Dmitry Smirnov ++Bug-Debian: http://bugs.debian.org/722030 ++Bug-Abiword: http://bugzilla.abisource.com/13532 ++Description: fix FTBFS with evolution-data-server (>= 3.8) ++ ++--- a/src/text/ptbl/xp/pd_DocumentRDF.cpp +++++ b/src/text/ptbl/xp/pd_DocumentRDF.cpp ++@@ -1883,9 +1883,9 @@ ++ ++ ++ #ifdef WITH_EVOLUTION_DATA_SERVER ++ extern "C" { ++- #include +++ #include ++ }; ++ ++ static std::string get( EVCard* c, const char* v ) ++ { diff --cc debian/patches/format-painter-fix.patch index 0000000,0000000..99c048a new file mode 100644 --- /dev/null +++ b/debian/patches/format-painter-fix.patch @@@ -1,0 -1,0 +1,92 @@@ ++Last-Update: 2014-11-15 ++Bug-Debian: http://bugs.debian.org/766845 ++Bug-Abiword: http://bugzilla.abisource.com/13586 ++Description: fix format painter bug ++ ++Index: abiword/src/text/fmt/gtk/fv_UnixSelectionHandles.cpp ++=================================================================== ++--- abiword.orig/src/text/fmt/gtk/fv_UnixSelectionHandles.cpp +++++ abiword/src/text/fmt/gtk/fv_UnixSelectionHandles.cpp ++@@ -36,42 +36,60 @@ static void handle_dragged_cb (FvTextHan ++ ++ mode = _fv_text_handle_get_mode (handle); ++ ++- if (pos == FV_TEXT_HANDLE_POSITION_SELECTION_START) +++ if (pos == FV_TEXT_HANDLE_POSITION_SELECTION_START) { ++ handles->updateSelectionStart ((UT_sint32)x, (UT_sint32)y); +++ } ++ else { ++- if (mode == FV_TEXT_HANDLE_MODE_SELECTION) +++ if (mode == FV_TEXT_HANDLE_MODE_SELECTION) { ++ handles->updateSelectionEnd ((UT_sint32)x, (UT_sint32)y); ++- else +++ } +++ else { ++ handles->updateCursor((UT_sint32)x, (UT_sint32)y); +++ } ++ } ++ } ++ ++ FV_UnixSelectionHandles::FV_UnixSelectionHandles(FV_View *view, FV_Selection selection) ++ : FV_SelectionHandles (view, selection) +++ , m_text_handle(NULL) ++ { ++ XAP_Frame * pFrame = static_cast(m_pView->getParentData()); ++- XAP_UnixFrameImpl * pFrameImpl =static_cast( pFrame->getFrameImpl()); ++- GtkWidget * pWidget = pFrameImpl->getViewWidget(); ++- ++- m_text_handle = _fv_text_handle_new (pWidget); ++- _fv_text_handle_set_relative_to (m_text_handle, ++- gtk_widget_get_window (pWidget)); ++- g_signal_connect (m_text_handle, "handle-dragged", ++- G_CALLBACK(handle_dragged_cb), this); +++ // When saving to PDF (and printing) we don't have a frame +++ // See bug 13586 +++ if (pFrame) { +++ XAP_UnixFrameImpl * pFrameImpl = static_cast(pFrame->getFrameImpl()); +++ GtkWidget * pWidget = pFrameImpl->getViewWidget(); +++ +++ m_text_handle = _fv_text_handle_new (pWidget); +++ _fv_text_handle_set_relative_to (m_text_handle, +++ gtk_widget_get_window (pWidget)); +++ g_signal_connect (m_text_handle, "handle-dragged", +++ G_CALLBACK(handle_dragged_cb), this); +++ } ++ } ++ ++ FV_UnixSelectionHandles::~FV_UnixSelectionHandles() ++ { +++ if(!m_text_handle) { +++ return; +++ } ++ g_object_unref (m_text_handle); ++ } ++ ++ void FV_UnixSelectionHandles::hide() ++ { +++ if(!m_text_handle) { +++ return; +++ } ++ _fv_text_handle_set_mode (m_text_handle, FV_TEXT_HANDLE_MODE_NONE); ++ } ++ ++ void FV_UnixSelectionHandles::setCursorCoords(UT_sint32 x, UT_sint32 y, UT_uint32 height, bool visible) ++ { +++ if(!m_text_handle) { +++ return; +++ } +++ ++ GdkRectangle rect; ++ ++ _fv_text_handle_set_mode(m_text_handle, FV_TEXT_HANDLE_MODE_CURSOR); ++@@ -92,6 +110,10 @@ void FV_UnixSelectionHandles::setCursorC ++ void FV_UnixSelectionHandles::setSelectionCoords(UT_sint32 start_x, UT_sint32 start_y, UT_uint32 start_height, bool start_visible, ++ UT_sint32 end_x, UT_sint32 end_y, UT_uint32 end_height, bool end_visible) ++ { +++ if(!m_text_handle) { +++ return; +++ } +++ ++ GdkRectangle rect; ++ ++ _fv_text_handle_set_mode(m_text_handle, FV_TEXT_HANDLE_MODE_SELECTION); diff --cc debian/patches/gnutls-no-libgcrypt.patch index 0000000,0000000..d9c7a39 new file mode 100644 --- /dev/null +++ b/debian/patches/gnutls-no-libgcrypt.patch @@@ -1,0 -1,0 +1,113 @@@ ++Last-Update: 2014-07-24 ++Forwarded: not-needed ++Origin: http://bugzilla.abisource.com/attachment.cgi?id=5720 ++Bug-Debian: http://bugs.debian.org/754554 ++Bug-Abiword: http://bugzilla.abisource.com/13657 ++Description: fix FTBFS with gnutls3 ++ ++--- a/plugins/collab/backends/service/xp/tls_tunnel.cpp +++++ b/plugins/collab/backends/service/xp/tls_tunnel.cpp ++@@ -48,91 +48,9 @@ ++ typedef boost::shared_ptr socket_ptr_t; ++ typedef boost::shared_ptr session_ptr_t; ++ typedef boost::shared_ptr< std::vector > buffer_ptr_t; ++ ++-class mutex { ++-public: ++- mutex() { ++-#ifdef WIN32 ++- repr = CreateMutex(0, FALSE, 0); ++-#else ++- pthread_mutex_init(&repr, NULL); ++-#endif ++- } ++- ++- void lock() { ++-#ifdef WIN32 ++- WaitForSingleObject(repr, INFINITE); ++-#else ++- pthread_mutex_lock(&repr); ++-#endif ++- } ++- ++- void unlock() { ++-#ifdef WIN32 ++- ReleaseMutex(repr); ++-#else ++- pthread_mutex_unlock(&repr); ++-#endif ++- } ++- ++- ~mutex() ++- { ++-#ifdef WIN32 ++- CloseHandle(repr); ++-#else ++- pthread_mutex_destroy(&repr); ++-#endif ++- } ++- ++-private: ++- mutex( const mutex& ); ++- const mutex& operator=( const mutex& ); ++- ++-#ifdef WIN32 ++- HANDLE repr; ++-#else ++- pthread_mutex_t repr; ++-#endif ++-}; ++- ++-static int gcry_tunnel_mutex_init(void **priv) ++-{ ++- if (!priv) ++- return -1; ++- *priv = new mutex(); ++- return 0; ++-} ++- ++-static int gcry_tunnel_mutex_destroy(void **priv) ++-{ ++- if (!priv || !*priv) ++- return -1; ++- delete reinterpret_cast(*priv); ++- return 0; ++-} ++- ++-static int gcry_tunnel_mutex_lock(void **priv) ++-{ ++- reinterpret_cast(*priv)->lock(); ++- return 0; ++-} ++- ++-static int gcry_tunnel_mutex_unlock(void **priv) ++-{ ++- reinterpret_cast(*priv)->unlock(); ++- return 0; ++-} ++- ++-static struct gcry_thread_cbs gcry_threads_tunnel = ++-{ GCRY_THREAD_OPTION_USER, NULL, ++- gcry_tunnel_mutex_init, gcry_tunnel_mutex_destroy, ++- gcry_tunnel_mutex_lock, gcry_tunnel_mutex_unlock, ++- NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL }; ++- ++ bool Proxy::tls_tunnel_init() { ++- if (gcry_control(GCRYCTL_SET_THREAD_CBS, &tls_tunnel::gcry_threads_tunnel) != 0) ++- return false; ++ if (gnutls_global_init() != 0) ++ return false; ++ return true; ++ } ++--- a/plugins/collab/backends/service/xp/tls_tunnel.h +++++ b/plugins/collab/backends/service/xp/tls_tunnel.h ++@@ -39,9 +39,8 @@ ++ #ifdef _MSC_VER ++ typedef long ssize_t; ++ typedef int pid_t; ++ #endif ++-#include ++ #include ++ #include ++ ++ namespace tls_tunnel { diff --cc debian/patches/itex2MML.y.patch index 0000000,0000000..0299520 new file mode 100644 --- /dev/null +++ b/debian/patches/itex2MML.y.patch @@@ -1,0 -1,0 +1,28 @@@ ++Last-update: 2014-02-02 ++Author: Dimitri John Ledkov ++Description: Cherrypick patch from NetBSD, to fix FTBFS with bison 3.0. ++ ++--- a/plugins/mathview/itex2mml/itex2MML.y +++++ b/plugins/mathview/itex2mml/itex2MML.y ++@@ -1,8 +1,10 @@ ++ /* itex2MML 1.4.8 ++ * itex2MML.y last modified 9/21/2011 ++ */ ++ +++%parse-param {char **ret_str} +++ ++ %{ ++ #include ++ #include ++ #include ++@@ -26,9 +28,9 @@ ++ } ++ ++ void (*itex2MML_error) (const char * msg) = itex2MML_default_error; ++ ++- static void yyerror (char * s) +++ static void yyerror (char **ret_str, char * s) ++ { ++ char * msg = itex2MML_copy3 (s, " at token ", yytext); ++ if (itex2MML_error) ++ (*itex2MML_error) (msg); diff --cc debian/patches/librevenge.patch index 0000000,0000000..9bf10c2 new file mode 100644 --- /dev/null +++ b/debian/patches/librevenge.patch @@@ -1,0 -1,0 +1,1294 @@@ ++Last-Update: 2014-08-09 ++Forwarded: http://bugzilla.abisource.com/show_bug.cgi?id=13658 ++Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=753428 ++Author: Rene Engelhard ++From: David Tardon ++Description: switch to librevenge-based import libs ++ ++--- a/plugins/wpg/xp/ie_impGraphic_WPG.cpp +++++ b/plugins/wpg/xp/ie_impGraphic_WPG.cpp ++@@ -30,39 +30,44 @@ ++ #include ++ #include ++ #include ++ #include ++-#include +++#include ++ #include "xap_Module.h" ++ ++ using libwpg::WPGraphics; ++ ++ ABI_PLUGIN_DECLARE("WPG") ++ ++-class AbiWordPerfectGraphicsInputStream : public WPXInputStream +++class AbiWordPerfectGraphicsInputStream : public librevenge::RVNGInputStream ++ { ++ public: ++ AbiWordPerfectGraphicsInputStream(GsfInput *input); ++ ~AbiWordPerfectGraphicsInputStream(); ++ ++- virtual bool isOLEStream(); ++- virtual WPXInputStream * getDocumentOLEStream(); ++- virtual WPXInputStream * getDocumentOLEStream(const char * name); +++ virtual bool isStructured(); +++ virtual unsigned subStreamCount(); +++ virtual const char* subStreamName(unsigned); +++ bool existsSubStream(const char*); +++ virtual librevenge::RVNGInputStream* getSubStreamByName(const char*); +++ virtual librevenge::RVNGInputStream* getSubStreamById(unsigned); ++ virtual const unsigned char *read(unsigned long numBytes, unsigned long &numBytesRead); ++- virtual int seek(long offset, WPX_SEEK_TYPE seekType); +++ virtual int seek(long offset, librevenge::RVNG_SEEK_TYPE seekType); ++ virtual long tell(); ++- virtual bool atEOS(); +++ virtual bool isEnd(); ++ ++ private: ++ ++ GsfInput *m_input; ++ GsfInfile *m_ole; +++ std::map m_substreams; ++ }; ++ ++ AbiWordPerfectGraphicsInputStream::AbiWordPerfectGraphicsInputStream(GsfInput *input) : ++- WPXInputStream(), +++ librevenge::RVNGInputStream(), ++ m_input(input), ++- m_ole(NULL) +++ m_ole(NULL), +++ m_substreams() ++ { ++ g_object_ref(G_OBJECT(input)); ++ } ++ ++@@ -85,47 +90,117 @@ ++ ++ return buf; ++ } ++ ++-int AbiWordPerfectGraphicsInputStream::seek(long offset, WPX_SEEK_TYPE seekType) +++int AbiWordPerfectGraphicsInputStream::seek(long offset, librevenge::RVNG_SEEK_TYPE seekType) ++ { ++ GSeekType gsfSeekType = G_SEEK_SET; ++ switch(seekType) ++ { ++- case WPX_SEEK_CUR: +++ case librevenge::RVNG_SEEK_CUR: ++ gsfSeekType = G_SEEK_CUR; ++ break; ++- case WPX_SEEK_SET: +++ case librevenge::RVNG_SEEK_SET: ++ gsfSeekType = G_SEEK_SET; ++ break; +++ case librevenge::RVNG_SEEK_END: +++ gsfSeekType = G_SEEK_END; +++ break; ++ } ++ ++ return gsf_input_seek(m_input, offset, gsfSeekType); ++ } ++ ++-bool AbiWordPerfectGraphicsInputStream::isOLEStream() +++bool AbiWordPerfectGraphicsInputStream::isStructured() ++ { ++ if (!m_ole) ++ m_ole = GSF_INFILE(gsf_infile_msole_new (m_input, NULL)); ++ ++- if (m_ole != NULL) +++ if (!m_ole) +++ m_ole = GSF_INFILE(gsf_infile_zip_new (m_input, NULL)); +++ +++ if (m_ole) ++ return true; ++ ++ return false; ++ } ++ ++-WPXInputStream * AbiWordPerfectGraphicsInputStream::getDocumentOLEStream() +++unsigned AbiWordPerfectGraphicsInputStream::subStreamCount() ++ { ++- return getDocumentOLEStream("PerfectOffice_MAIN"); +++ if (!m_ole) +++ m_ole = GSF_INFILE(gsf_infile_msole_new (m_input, NULL)); +++ +++ if (!m_ole) +++ m_ole = GSF_INFILE(gsf_infile_zip_new (m_input, NULL)); +++ +++ if (m_ole) +++ { +++ int numChildren = gsf_infile_num_children(m_ole); +++ if (numChildren > 0) +++ return numChildren; +++ return 0; +++ } +++ +++ return 0; ++ } ++ ++-WPXInputStream * AbiWordPerfectGraphicsInputStream::getDocumentOLEStream(const char * name) +++const char * AbiWordPerfectGraphicsInputStream::subStreamName(unsigned id) ++ { ++- WPXInputStream *documentStream = NULL; +++ if (!m_ole) +++ m_ole = GSF_INFILE(gsf_infile_msole_new (m_input, NULL)); +++ +++ if (!m_ole) +++ m_ole = GSF_INFILE(gsf_infile_zip_new (m_input, NULL)); ++ +++ if (m_ole) +++ { +++ if ((int)id >= gsf_infile_num_children(m_ole)) +++ { +++ return 0; +++ } +++ std::map::iterator i = m_substreams.lower_bound(id); +++ if (i == m_substreams.end() || m_substreams.key_comp()(id, i->first)) +++ { +++ std::string name = gsf_infile_name_by_index(m_ole, (int)id); +++ i = m_substreams.insert(i, std::map::value_type(id, name)); +++ } +++ return i->second.c_str(); +++ } +++ +++ return 0; +++} +++ +++bool AbiWordPerfectGraphicsInputStream::existsSubStream(const char * name) +++{ ++ if (!m_ole) ++ m_ole = GSF_INFILE(gsf_infile_msole_new (m_input, NULL)); ++ +++ if (!m_ole) +++ m_ole = GSF_INFILE(gsf_infile_zip_new (m_input, NULL)); +++ +++ if (m_ole) +++ { +++ GsfInput *document = gsf_infile_child_by_name(m_ole, name); +++ if (document) +++ { +++ g_object_unref(G_OBJECT (document)); +++ return true; +++ } +++ } +++ +++ return false; +++} +++ +++librevenge::RVNGInputStream * AbiWordPerfectGraphicsInputStream::getSubStreamByName(const char * name) +++{ +++ librevenge::RVNGInputStream *documentStream = NULL; +++ +++ if (!m_ole) +++ m_ole = GSF_INFILE(gsf_infile_msole_new (m_input, NULL)); +++ +++ if (!m_ole) +++ m_ole = GSF_INFILE(gsf_infile_zip_new (m_input, NULL)); +++ ++ if (m_ole) ++ { ++ GsfInput *document = gsf_infile_child_by_name(m_ole, name); ++ if (document) ++@@ -137,14 +212,37 @@ ++ ++ return documentStream; ++ } ++ +++librevenge::RVNGInputStream * AbiWordPerfectGraphicsInputStream::getSubStreamById(unsigned id) +++{ +++ librevenge::RVNGInputStream *documentStream = NULL; +++ +++ if (!m_ole) +++ m_ole = GSF_INFILE(gsf_infile_msole_new (m_input, NULL)); +++ +++ if (!m_ole) +++ m_ole = GSF_INFILE(gsf_infile_zip_new (m_input, NULL)); +++ +++ if (m_ole) +++ { +++ GsfInput *document = gsf_infile_child_by_index(m_ole, (int)id); +++ if (document) +++ { +++ documentStream = new AbiWordPerfectGraphicsInputStream(document); +++ g_object_unref(G_OBJECT (document)); // the only reference should be encapsulated within the new stream +++ } +++ } +++ +++ return documentStream; +++} +++ ++ long AbiWordPerfectGraphicsInputStream::tell() ++ { ++ return gsf_input_tell(m_input); ++ } ++ ++-bool AbiWordPerfectGraphicsInputStream::atEOS() +++bool AbiWordPerfectGraphicsInputStream::isEnd() ++ { ++ return gsf_input_eof(m_input); ++ } ++ ++@@ -243,15 +341,25 @@ ++ ++ UT_Error IE_Imp_WordPerfectGraphics::importGraphic(GsfInput *input, FG_Graphic **ppfg) ++ { ++ AbiWordPerfectGraphicsInputStream gsfInput(input); ++- WPXString svgOutput; ++- if (WPGraphics::generateSVG(&gsfInput, svgOutput)) +++ librevenge::RVNGString svgOutput; +++ librevenge::RVNGStringVector vec; +++ librevenge::RVNGSVGDrawingGenerator generator(vec, ""); +++ +++ if (!libwpg::WPGraphics::parse(&gsfInput, &generator) || vec.empty() || vec[0].empty()) ++ { ++- 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; +++ return UT_ERROR; ++ } ++- return UT_ERROR; +++ +++ svgOutput.append("\n"); +++ svgOutput.append("\n"); +++ svgOutput.append(vec[0]); +++ svgOutput.append("\n"); +++ +++ 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; ++ } ++ ++--- a/plugins/wpg/plugin.m4 +++++ b/plugins/wpg/plugin.m4 ++@@ -1,6 +1,6 @@ ++ ++-wpg_pkgs="$gsf_req libwpg-0.2 >= 0.2.0 libwpd-0.9 >= 0.9.0 libwpd-stream-0.9 >= 0.9.0" +++wpg_pkgs="libwpg-0.3 $gsf_req" ++ wpg_deps="no" ++ ++ if test "$enable_wpg" != ""; then ++ ++--- a/plugins/wordperfect/xp/ie_imp_WordPerfect.h +++++ b/plugins/wordperfect/xp/ie_imp_WordPerfect.h ++@@ -29,9 +29,9 @@ ++ #ifndef IE_IMP_WP_H ++ #define IE_IMP_WP_H ++ ++ #include ++-#include +++#include ++ #include "ie_imp.h" ++ #include "ut_string.h" ++ #include "ut_string_class.h" ++ #include "ut_growbuf.h" ++@@ -91,79 +91,93 @@ ++ virtual UT_Error constructImporter (PD_Document * pDocument, ++ IE_Imp ** ppie); ++ }; ++ ++-class IE_Imp_WordPerfect : public IE_Imp, public WPXDocumentInterface +++class IE_Imp_WordPerfect : public IE_Imp, public librevenge::RVNGTextInterface ++ { ++ public: ++ IE_Imp_WordPerfect(PD_Document * pDocument); ++ virtual ~IE_Imp_WordPerfect(); ++ ++ virtual void pasteFromBuffer(PD_DocumentRange * pDocRange, ++ UT_uint8 * pData, UT_uint32 lenData, const char * szEncoding = 0); ++ ++- virtual void setDocumentMetaData(const WPXPropertyList &propList); +++ virtual void setDocumentMetaData(const librevenge::RVNGPropertyList &propList); ++ ++- virtual void startDocument(); ++- virtual void endDocument(); +++ virtual void startDocument(const librevenge::RVNGPropertyList &propList); +++ virtual void endDocument(); ++ ++- virtual void openPageSpan(const WPXPropertyList &propList); ++- virtual void closePageSpan() {} ++- virtual void openHeader(const WPXPropertyList &propList); ++- virtual void closeHeader(); ++- virtual void openFooter(const WPXPropertyList &propList); ++- virtual void closeFooter(); ++- ++- virtual void openParagraph(const WPXPropertyList &propList, const WPXPropertyListVector &tabStops); ++- virtual void closeParagraph() {} ++- ++- virtual void openSpan(const WPXPropertyList &propList); ++- virtual void closeSpan() {} ++- ++- virtual void openSection(const WPXPropertyList &propList, const WPXPropertyListVector &columns); ++- virtual void closeSection() {} ++- ++- virtual void insertTab(); ++- virtual void insertText(const WPXString &text); ++- virtual void insertLineBreak(); ++- ++- virtual void defineOrderedListLevel(const WPXPropertyList &propList); ++- virtual void defineUnorderedListLevel(const WPXPropertyList &propList); ++- virtual void openOrderedListLevel(const WPXPropertyList &propList); ++- virtual void openUnorderedListLevel(const WPXPropertyList &propList); ++- virtual void closeOrderedListLevel(); ++- virtual void closeUnorderedListLevel(); ++- virtual void openListElement(const WPXPropertyList &propList, const WPXPropertyListVector &tabStops); ++- virtual void closeListElement() {} ++- ++- virtual void openFootnote(const WPXPropertyList &propList); ++- virtual void closeFootnote(); ++- virtual void openEndnote(const WPXPropertyList &propList); ++- virtual void closeEndnote(); ++- ++- virtual void openTable(const WPXPropertyList &propList, const WPXPropertyListVector &columns); ++- virtual void openTableRow(const WPXPropertyList &propList); ++- virtual void closeTableRow() {} ++- virtual void openTableCell(const WPXPropertyList &propList); ++- virtual void closeTableCell() {} ++- 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&) {} +++ virtual void defineEmbeddedFont(const librevenge::RVNGPropertyList & /* propList */) {} ++ +++ virtual void definePageStyle(const librevenge::RVNGPropertyList &) {} +++ virtual void openPageSpan(const librevenge::RVNGPropertyList &propList); +++ virtual void closePageSpan() {} +++ virtual void openHeader(const librevenge::RVNGPropertyList &propList); +++ virtual void closeHeader(); +++ virtual void openFooter(const librevenge::RVNGPropertyList &propList); +++ virtual void closeFooter(); +++ +++ virtual void defineSectionStyle(const librevenge::RVNGPropertyList &) {} +++ virtual void openSection(const librevenge::RVNGPropertyList &propList); +++ virtual void closeSection() {} +++ +++ virtual void defineParagraphStyle(const librevenge::RVNGPropertyList &) {} +++ virtual void openParagraph(const librevenge::RVNGPropertyList &propList); +++ virtual void closeParagraph() {} +++ +++ virtual void defineCharacterStyle(const librevenge::RVNGPropertyList &) {} +++ virtual void openSpan(const librevenge::RVNGPropertyList &propList); +++ virtual void closeSpan() {} +++ +++ virtual void openLink(const librevenge::RVNGPropertyList & /* propList */) {} +++ virtual void closeLink() {} +++ +++ virtual void insertTab(); +++ virtual void insertText(const librevenge::RVNGString &text); +++ virtual void insertSpace(); +++ virtual void insertLineBreak(); +++ virtual void insertField(const librevenge::RVNGPropertyList & /* propList */) {} +++ +++ virtual void openOrderedListLevel(const librevenge::RVNGPropertyList &propList); +++ virtual void openUnorderedListLevel(const librevenge::RVNGPropertyList &propList); +++ virtual void closeOrderedListLevel(); +++ virtual void closeUnorderedListLevel(); +++ virtual void openListElement(const librevenge::RVNGPropertyList &propList); +++ virtual void closeListElement() {} +++ +++ virtual void openFootnote(const librevenge::RVNGPropertyList &propList); +++ virtual void closeFootnote(); +++ virtual void openEndnote(const librevenge::RVNGPropertyList &propList); +++ virtual void closeEndnote(); +++ virtual void openComment(const librevenge::RVNGPropertyList & /* propList */) {} +++ virtual void closeComment() {} +++ virtual void openTextBox(const librevenge::RVNGPropertyList & /* propList */) {} +++ virtual void closeTextBox() {} +++ +++ virtual void openTable(const librevenge::RVNGPropertyList &propList); +++ virtual void openTableRow(const librevenge::RVNGPropertyList &propList); +++ virtual void closeTableRow() {} +++ virtual void openTableCell(const librevenge::RVNGPropertyList &propList); +++ virtual void closeTableCell() {} +++ virtual void insertCoveredTableCell(const librevenge::RVNGPropertyList & /* propList */) {} +++ virtual void closeTable(); +++ +++ virtual void openFrame(const librevenge::RVNGPropertyList & /* propList */) {} +++ virtual void closeFrame() {} +++ +++ virtual void openGroup(const librevenge::RVNGPropertyList & /* propList */) {} +++ virtual void closeGroup() {} +++ +++ virtual void defineGraphicStyle(const librevenge::RVNGPropertyList & /* propList */) {} +++ virtual void drawRectangle(const librevenge::RVNGPropertyList & /* propList */) {} +++ virtual void drawEllipse(const librevenge::RVNGPropertyList & /* propList */) {} +++ virtual void drawPolygon(const librevenge::RVNGPropertyList & /* propList */) {} +++ virtual void drawPolyline(const librevenge::RVNGPropertyList & /* propList */) {} +++ virtual void drawPath(const librevenge::RVNGPropertyList & /* propList */) {} +++ virtual void drawConnector(const librevenge::RVNGPropertyList & /* propList */) {} +++ +++ virtual void insertBinaryObject(const librevenge::RVNGPropertyList & /* propList */) {} +++ virtual void insertEquation(const librevenge::RVNGPropertyList & /* propList */) {} ++ ++ protected: ++ virtual UT_Error _loadFile(GsfInput * input); ++ UT_Error _appendSection(int numColumns, const float, const float); ++--- a/plugins/wordperfect/xp/ie_impexp_WordPerfect.cpp +++++ b/plugins/wordperfect/xp/ie_impexp_WordPerfect.cpp ++@@ -34,9 +34,8 @@ ++ ++ ABI_PLUGIN_DECLARE("WordPerfect") ++ ++ static IE_Imp_WordPerfect_Sniffer * m_ImpSniffer = 0; ++-static IE_Exp_WordPerfect_Sniffer * m_ExpSniffer = 0; ++ ++ #ifdef HAVE_LIBWPS ++ static IE_Imp_MSWorks_Sniffer * m_MSWorks_ImpSniffer = 0; ++ #endif ++@@ -48,15 +47,9 @@ ++ { ++ m_ImpSniffer = new IE_Imp_WordPerfect_Sniffer (); ++ } ++ ++- if (!m_ExpSniffer) ++- { ++- m_ExpSniffer = new IE_Exp_WordPerfect_Sniffer (); ++- } ++- ++ UT_ASSERT (m_ImpSniffer); ++- UT_ASSERT (m_ExpSniffer); ++ ++ #ifdef HAVE_LIBWPS ++ if (!m_MSWorks_ImpSniffer) ++ { ++@@ -78,9 +71,9 @@ ++ mi->author = "Marc Maurer, William Lachance"; ++ mi->usage = "No Usage"; ++ ++ IE_Imp::registerImporter (m_ImpSniffer); ++- //IE_Exp::registerExporter (m_ExpSniffer); +++ ++ return 1; ++ } ++ ++ ABI_FAR_CALL ++@@ -92,20 +85,13 @@ ++ mi->author = 0; ++ mi->usage = 0; ++ ++ UT_ASSERT (m_ImpSniffer); ++- UT_ASSERT (m_ExpSniffer); ++ ++ IE_Imp::unregisterImporter (m_ImpSniffer); ++ delete m_ImpSniffer; ++ m_ImpSniffer = 0; ++ ++- /* ++- IE_Exp::unregisterExporter (m_ExpSniffer); ++- delete m_ExpSniffer; ++- m_ExpSniffer = 0; ++- */ ++- ++ #ifdef HAVE_LIBWPS ++ IE_Imp::unregisterImporter (m_MSWorks_ImpSniffer); ++ delete m_MSWorks_ImpSniffer; ++ m_MSWorks_ImpSniffer = 0; ++--- a/plugins/wordperfect/xp/ie_imp_WordPerfect.cpp +++++ b/plugins/wordperfect/xp/ie_imp_WordPerfect.cpp ++@@ -30,8 +30,10 @@ ++ #include ++ #include ++ #include ++ #include +++#include +++#include ++ #include ++ #include ++ #include ++ ++@@ -59,44 +61,49 @@ ++ #include "ie_impexp_WordPerfect.h" ++ ++ // Stream class ++ ++-#include +++#include +++#include ++ ++ #include ++ #include ++ #include +++#include ++ ++ #ifdef HAVE_LIBWPS ++ #include ++ #endif ++ ++-class AbiWordperfectInputStream : public WPXInputStream +++class AbiWordperfectInputStream : public librevenge::RVNGInputStream ++ { ++ public: ++ AbiWordperfectInputStream(GsfInput *input); ++ ~AbiWordperfectInputStream(); ++ ++- virtual bool isOLEStream(); ++- virtual WPXInputStream * getDocumentOLEStream(); ++- ++- virtual WPXInputStream * getDocumentOLEStream(const char * name); ++- +++ virtual bool isStructured(); +++ virtual unsigned subStreamCount(); +++ virtual const char* subStreamName(unsigned); +++ bool existsSubStream(const char*); +++ virtual librevenge::RVNGInputStream* getSubStreamByName(const char*); +++ virtual librevenge::RVNGInputStream* getSubStreamById(unsigned); ++ virtual const unsigned char *read(unsigned long numBytes, unsigned long &numBytesRead); ++- virtual int seek(long offset, WPX_SEEK_TYPE seekType); +++ virtual int seek(long offset, librevenge::RVNG_SEEK_TYPE seekType); ++ virtual long tell(); ++- virtual bool atEOS(); +++ virtual bool isEnd(); ++ ++ private: ++ ++ GsfInput *m_input; ++ GsfInfile *m_ole; +++ std::map m_substreams; ++ }; ++ ++ AbiWordperfectInputStream::AbiWordperfectInputStream(GsfInput *input) : ++- WPXInputStream(), +++ librevenge::RVNGInputStream(), ++ m_input(input), ++- m_ole(NULL) +++ m_ole(NULL), +++ m_substreams() ++ { ++ g_object_ref(G_OBJECT(input)); ++ } ++ ++@@ -119,47 +126,117 @@ ++ ++ return buf; ++ } ++ ++-int AbiWordperfectInputStream::seek(long offset, WPX_SEEK_TYPE seekType) +++int AbiWordperfectInputStream::seek(long offset, librevenge::RVNG_SEEK_TYPE seekType) ++ { ++ GSeekType gsfSeekType = G_SEEK_SET; ++ switch(seekType) ++ { ++- case WPX_SEEK_CUR: +++ case librevenge::RVNG_SEEK_CUR: ++ gsfSeekType = G_SEEK_CUR; ++ break; ++- case WPX_SEEK_SET: +++ case librevenge::RVNG_SEEK_SET: ++ gsfSeekType = G_SEEK_SET; ++ break; +++ case librevenge::RVNG_SEEK_END: +++ gsfSeekType = G_SEEK_END; +++ break; ++ } ++ ++ return gsf_input_seek(m_input, offset, gsfSeekType); ++ } ++ ++-bool AbiWordperfectInputStream::isOLEStream() +++bool AbiWordperfectInputStream::isStructured() ++ { ++ if (!m_ole) ++ m_ole = GSF_INFILE(gsf_infile_msole_new (m_input, NULL)); ++ ++- if (m_ole != NULL) +++ if (!m_ole) +++ m_ole = GSF_INFILE(gsf_infile_zip_new (m_input, NULL)); +++ +++ if (m_ole) ++ return true; ++ ++ return false; ++ } ++ ++-WPXInputStream * AbiWordperfectInputStream::getDocumentOLEStream() +++unsigned AbiWordperfectInputStream::subStreamCount() ++ { ++- return getDocumentOLEStream("PerfectOffice_MAIN"); +++ if (!m_ole) +++ m_ole = GSF_INFILE(gsf_infile_msole_new (m_input, NULL)); +++ +++ if (!m_ole) +++ m_ole = GSF_INFILE(gsf_infile_zip_new (m_input, NULL)); +++ +++ if (m_ole) +++ { +++ int numChildren = gsf_infile_num_children(m_ole); +++ if (numChildren > 0) +++ return numChildren; +++ return 0; +++ } +++ +++ return 0; ++ } ++ ++-WPXInputStream * AbiWordperfectInputStream::getDocumentOLEStream(const char * name) +++const char * AbiWordperfectInputStream::subStreamName(unsigned id) ++ { ++- WPXInputStream *documentStream = NULL; +++ if (!m_ole) +++ m_ole = GSF_INFILE(gsf_infile_msole_new (m_input, NULL)); ++ ++ if (!m_ole) +++ m_ole = GSF_INFILE(gsf_infile_zip_new (m_input, NULL)); +++ +++ if (m_ole) +++ { +++ if ((int)id >= gsf_infile_num_children(m_ole)) +++ { +++ return 0; +++ } +++ std::map::iterator i = m_substreams.lower_bound(id); +++ if (i == m_substreams.end() || m_substreams.key_comp()(id, i->first)) +++ { +++ std::string name = gsf_infile_name_by_index(m_ole, (int)id); +++ i = m_substreams.insert(i, std::map::value_type(id, name)); +++ } +++ return i->second.c_str(); +++ } +++ +++ return 0; +++} +++ +++bool AbiWordperfectInputStream::existsSubStream(const char * name) +++{ +++ if (!m_ole) ++ m_ole = GSF_INFILE(gsf_infile_msole_new (m_input, NULL)); ++ +++ if (!m_ole) +++ m_ole = GSF_INFILE(gsf_infile_zip_new (m_input, NULL)); +++ +++ if (m_ole) +++ { +++ GsfInput *document = gsf_infile_child_by_name(m_ole, name); +++ if (document) +++ { +++ g_object_unref(G_OBJECT (document)); +++ return true; +++ } +++ } +++ +++ return false; +++} +++ +++librevenge::RVNGInputStream * AbiWordperfectInputStream::getSubStreamByName(const char * name) +++{ +++ librevenge::RVNGInputStream *documentStream = NULL; +++ +++ if (!m_ole) +++ m_ole = GSF_INFILE(gsf_infile_msole_new (m_input, NULL)); +++ +++ if (!m_ole) +++ m_ole = GSF_INFILE(gsf_infile_zip_new (m_input, NULL)); +++ ++ if (m_ole) ++ { ++ GsfInput *document = gsf_infile_child_by_name(m_ole, name); ++ if (document) ++@@ -171,14 +248,37 @@ ++ ++ return documentStream; ++ } ++ +++librevenge::RVNGInputStream * AbiWordperfectInputStream::getSubStreamById(unsigned id) +++{ +++ librevenge::RVNGInputStream *documentStream = NULL; +++ +++ if (!m_ole) +++ m_ole = GSF_INFILE(gsf_infile_msole_new (m_input, NULL)); +++ +++ if (!m_ole) +++ m_ole = GSF_INFILE(gsf_infile_zip_new (m_input, NULL)); +++ +++ if (m_ole) +++ { +++ GsfInput *document = gsf_infile_child_by_index(m_ole, (int)id); +++ if (document) +++ { +++ documentStream = new AbiWordperfectInputStream(document); +++ g_object_unref(G_OBJECT (document)); // the only reference should be encapsulated within the new stream +++ } +++ } +++ +++ return documentStream; +++} +++ ++ long AbiWordperfectInputStream::tell() ++ { ++ return gsf_input_tell(m_input); ++ } ++ ++-bool AbiWordperfectInputStream::atEOS() +++bool AbiWordperfectInputStream::isEnd() ++ { ++ return gsf_input_eof(m_input); ++ } ++ ++@@ -246,15 +346,15 @@ ++ UT_Confidence_t IE_Imp_WordPerfect_Sniffer::recognizeContents (GsfInput * input) ++ { ++ AbiWordperfectInputStream gsfInput(input); ++ ++- WPDConfidence confidence = WPDocument::isFileFormatSupported(&gsfInput); ++- +++ libwpd::WPDConfidence confidence = libwpd::WPDocument::isFileFormatSupported(&gsfInput); +++ ++ switch (confidence) ++ { ++- case WPD_CONFIDENCE_NONE: +++ case libwpd::WPD_CONFIDENCE_NONE: ++ return UT_CONFIDENCE_ZILCH; ++- case WPD_CONFIDENCE_EXCELLENT: +++ case libwpd::WPD_CONFIDENCE_EXCELLENT: ++ return UT_CONFIDENCE_PERFECT; ++ default: ++ return UT_CONFIDENCE_ZILCH; ++ } ++@@ -311,11 +411,11 @@ ++ ++ UT_Error IE_Imp_WordPerfect::_loadFile(GsfInput * input) ++ { ++ AbiWordperfectInputStream gsfInput(input); ++- WPDResult error = WPDocument::parse(&gsfInput, static_cast(this), NULL); +++ libwpd::WPDResult error = libwpd::WPDocument::parse(&gsfInput, static_cast(this), NULL); ++ ++- if (error != WPD_OK) +++ if (error != libwpd::WPD_OK) ++ { ++ UT_DEBUGMSG(("AbiWordPerfect: ERROR: %i!\n", (int)error)); ++ return UT_IE_IMPORTERROR; ++ } ++@@ -328,9 +428,9 @@ ++ { ++ // nada ++ } ++ ++-void IE_Imp_WordPerfect::setDocumentMetaData(const WPXPropertyList &propList) +++void IE_Imp_WordPerfect::setDocumentMetaData(const librevenge::RVNGPropertyList &propList) ++ { ++ if (propList["dc:author"]) ++ getDoc()->setMetaDataProp(PD_META_KEY_CREATOR, propList["dc:author"]->getStr().cstr()); ++ if (propList["dc:subject"]) ++@@ -338,17 +438,17 @@ ++ if (propList["dc:publisher"]) ++ getDoc()->setMetaDataProp(PD_META_KEY_PUBLISHER, propList["dc:publisher"]->getStr().cstr()); ++ if (propList["dc:type"]) ++ getDoc()->setMetaDataProp(PD_META_KEY_TYPE, propList["dc:category"]->getStr().cstr()); ++- if (propList["libwpd:keywords"]) ++- getDoc()->setMetaDataProp(PD_META_KEY_KEYWORDS, propList["libwpd:keywords"]->getStr().cstr()); +++ if (propList["librevenge:keywords"]) +++ getDoc()->setMetaDataProp(PD_META_KEY_KEYWORDS, propList["librevenge:keywords"]->getStr().cstr()); ++ if (propList["dc:language"]) ++ getDoc()->setMetaDataProp(PD_META_KEY_LANGUAGE, propList["dc:language"]->getStr().cstr()); ++- if (propList["libwpd:abstract"]) ++- getDoc()->setMetaDataProp(PD_META_KEY_DESCRIPTION, propList["libwpd:abstract"]->getStr().cstr()); +++ if (propList["librevenge:abstract"]) +++ getDoc()->setMetaDataProp(PD_META_KEY_DESCRIPTION, propList["librevenge:abstract"]->getStr().cstr()); ++ } ++ ++-void IE_Imp_WordPerfect::startDocument() +++void IE_Imp_WordPerfect::startDocument(const librevenge::RVNGPropertyList & /* propList */) ++ { ++ UT_DEBUGMSG(("AbiWordPerfect: startDocument\n")); ++ } ++ ++@@ -356,9 +456,9 @@ ++ { ++ UT_DEBUGMSG(("AbiWordPerfect: endDocument\n")); ++ } ++ ++-void IE_Imp_WordPerfect::openPageSpan(const WPXPropertyList &propList) +++void IE_Imp_WordPerfect::openPageSpan(const librevenge::RVNGPropertyList &propList) ++ { ++ if (m_bHdrFtrOpenCount) return; // HACK ++ UT_DEBUGMSG(("AbiWordPerfect: openPageSpan\n")); ++ ++@@ -377,9 +477,9 @@ ++ m_rightPageMargin = marginRight; ++ ++ } ++ ++-void IE_Imp_WordPerfect::openHeader(const WPXPropertyList & /*propList*/) +++void IE_Imp_WordPerfect::openHeader(const librevenge::RVNGPropertyList & /*propList*/) ++ { ++ m_bHdrFtrOpenCount++; ++ ++ /* ++@@ -419,9 +519,9 @@ ++ m_nextFreeId++; ++ */ ++ } ++ ++-void IE_Imp_WordPerfect::openFooter(const WPXPropertyList & /*propList*/) +++void IE_Imp_WordPerfect::openFooter(const librevenge::RVNGPropertyList & /*propList*/) ++ { ++ m_bHdrFtrOpenCount++; ++ // see above comments re: openHeader ++ } ++@@ -431,9 +531,9 @@ ++ m_bHdrFtrOpenCount--; ++ // see above comments re: closeHeader ++ } ++ ++-void IE_Imp_WordPerfect::openParagraph(const WPXPropertyList &propList, const WPXPropertyListVector &tabStops) +++void IE_Imp_WordPerfect::openParagraph(const librevenge::RVNGPropertyList &propList) ++ { ++ if (m_bHdrFtrOpenCount) return; // HACK ++ UT_DEBUGMSG(("AbiWordPerfect: openParagraph()\n")); ++ // for now, we always append these options ++@@ -477,15 +577,17 @@ ++ UT_String_sprintf(tmpBuffer, "; margin-top:%dpt; margin-bottom:%dpt; margin-left:%.4fin; margin-right:%.4fin; text-indent:%.4fin; line-height:%.4f", ++ (int)(m_topMargin*72), (int)(m_bottomMargin*72), m_leftMarginOffset, m_rightMarginOffset, m_textIndent, lineSpacing); ++ propBuffer += tmpBuffer; ++ ++- if (tabStops.count() > 0) // Append the tabstop information +++ const librevenge::RVNGPropertyListVector *tabStops = propList.child("style:tab-stops"); +++ +++ if (tabStops && tabStops->count()) // Append the tabstop information ++ { ++ propBuffer += "; tabstops:"; ++ tmpBuffer = ""; ++- WPXPropertyListVector::Iter i(tabStops); ++- for (i.rewind(); i.next();) ++- { +++ librevenge::RVNGPropertyListVector::Iter i(*tabStops); +++ for (i.rewind(); i.next();) +++ { ++ propBuffer += tmpBuffer; ++ if (i()["style:position"]) ++ { ++ UT_String_sprintf(tmpBuffer, "%.4fin", i()["style:position"]->getDouble()); ++@@ -514,10 +616,10 @@ ++ else ++ propBuffer += "0"; ++ ++ tmpBuffer = ","; ++- } ++- } +++ } +++ } ++ ++ ++ ++ UT_DEBUGMSG(("AbiWordPerfect: Appending paragraph properties: %s\n", propBuffer.c_str())); ++@@ -542,9 +644,9 @@ ++ } ++ } ++ } ++ ++-void IE_Imp_WordPerfect::openSpan(const WPXPropertyList &propList) +++void IE_Imp_WordPerfect::openSpan(const librevenge::RVNGPropertyList &propList) ++ { ++ if (m_bHdrFtrOpenCount) return; // HACK ++ UT_DEBUGMSG(("AbiWordPerfect: Appending current text properties\n")); ++ ++@@ -613,15 +715,16 @@ ++ propsArray[2] = NULL; ++ X_CheckDocumentError(appendFmt(propsArray)); ++ } ++ ++-void IE_Imp_WordPerfect::openSection(const WPXPropertyList &propList, const WPXPropertyListVector &columns) +++void IE_Imp_WordPerfect::openSection(const librevenge::RVNGPropertyList &propList) ++ { ++ if (m_bHdrFtrOpenCount) return; // HACK ++ UT_DEBUGMSG(("AbiWordPerfect: openSection\n")); ++ ++ float marginLeft = 0.0f, marginRight = 0.0f; ++- int columnsCount = ((columns.count() == 0) ? 1 : columns.count()); +++ const librevenge::RVNGPropertyListVector *columns = propList.child("style:columns"); +++ int columnsCount = ((!columns || !columns->count()) ? 1 : columns->count()); ++ ++ // TODO: support spaceAfter ++ if (propList["fo:start-indent"]) ++ marginLeft = propList["fo:start-indent"]->getDouble(); ++@@ -646,9 +749,9 @@ ++ UT_UCS4Char ucs = UCS_TAB; ++ X_CheckDocumentError(appendSpan(&ucs,1)); ++ } ++ ++-void IE_Imp_WordPerfect::insertText(const WPXString &text) +++void IE_Imp_WordPerfect::insertText(const librevenge::RVNGString &text) ++ { ++ if (m_bHdrFtrOpenCount) return; // HACK ++ if (text.len()) ++ { ++@@ -657,8 +760,17 @@ ++ X_CheckDocumentError(appendSpan(ucs4.ucs4_str(), ucs4.length())); ++ } ++ } ++ +++void IE_Imp_WordPerfect::insertSpace() +++{ +++ if (m_bHdrFtrOpenCount) return; // HACK +++ UT_DEBUGMSG(("AbiWordPerfect: insertSpace\n")); +++ +++ UT_UCS4Char ucs = UCS_SPACE; +++ X_CheckDocumentError(appendSpan(&ucs,1)); +++} +++ ++ void IE_Imp_WordPerfect::insertLineBreak() ++ { ++ if (m_bHdrFtrOpenCount) return; // HACK ++ UT_DEBUGMSG(("AbiWordPerfect: insertLineBreak\n")); ++@@ -667,26 +779,25 @@ ++ X_CheckDocumentError(appendSpan(&ucs,1)); ++ } ++ ++ ++- ++-void IE_Imp_WordPerfect::defineOrderedListLevel(const WPXPropertyList &propList) +++void IE_Imp_WordPerfect::openOrderedListLevel(const librevenge::RVNGPropertyList &propList) ++ { ++ if (m_bHdrFtrOpenCount) return; // HACK ++- UT_DEBUGMSG(("AbiWordPerfect: defineOrderedListLevel\n")); ++- +++ UT_DEBUGMSG(("AbiWordPerfect: openOrderedListLevel\n")); +++ ++ int listID = 0, startingNumber = 0, level = 1; ++ char listType = '1'; ++ UT_UTF8String textBeforeNumber, textAfterNumber; ++ float listLeftOffset = 0.0f; ++ float listMinLabelWidth = 0.0f; ++ ++- if (propList["libwpd:id"]) ++- listID = propList["libwpd:id"]->getInt(); +++ if (propList["librevenge:id"]) +++ listID = propList["librevenge:id"]->getInt(); ++ if (propList["text:start-value"]) ++ startingNumber = propList["text:start-value"]->getInt(); ++- if (propList["libwpd:level"]) ++- level = propList["libwpd:level"]->getInt(); +++ if (propList["librevenge:level"]) +++ level = propList["librevenge:level"]->getInt(); ++ if (propList["style:num-prefix"]) ++ textBeforeNumber += propList["style:num-prefix"]->getStr().cstr(); ++ if (propList["style:num-suffix"]) ++ textAfterNumber += propList["style:num-suffix"]->getStr().cstr(); ++@@ -715,24 +826,40 @@ ++ m_pCurrentListDefinition->setListLeftOffset(level, listLeftOffset); ++ m_pCurrentListDefinition->setListMinLabelWidth(level, listMinLabelWidth); ++ _updateDocumentOrderedListDefinition(m_pCurrentListDefinition, level, listType, textBeforeNumber, textAfterNumber, startingNumber); ++ } +++ +++ m_iCurrentListLevel++; ++ } ++ ++-void IE_Imp_WordPerfect::defineUnorderedListLevel(const WPXPropertyList &propList) +++void IE_Imp_WordPerfect::closeOrderedListLevel() ++ { ++ if (m_bHdrFtrOpenCount) return; // HACK ++- UT_DEBUGMSG(("AbiWordPerfect: defineUnorderedListLevel\n")); +++ UT_DEBUGMSG(("AbiWordPerfect: closeOrderedListLevel (level: %i)\n", m_iCurrentListLevel)); +++ UT_ASSERT(m_iCurrentListLevel > 0); +++ +++ // every time we close a list level, the level above it is normally renumbered to start at "1" +++ // again. this code takes care of that. +++ if (m_iCurrentListLevel < (WP6_NUM_LIST_LEVELS-1)) +++ m_pCurrentListDefinition->setLevelNumber(m_iCurrentListLevel + 1, 0); +++ +++ m_iCurrentListLevel--; +++} ++ +++void IE_Imp_WordPerfect::openUnorderedListLevel(const librevenge::RVNGPropertyList &propList) +++{ +++ if (m_bHdrFtrOpenCount) return; // HACK +++ UT_DEBUGMSG(("AbiWordPerfect: openUNorderedListLevel\n")); +++ ++ int listID = 0, level = 1; ++- WPXString textBeforeNumber, textAfterNumber; +++ librevenge::RVNGString textBeforeNumber, textAfterNumber; ++ float listLeftOffset = 0.0f; ++ float listMinLabelWidth = 0.0f; ++ ++- if (propList["libwpd:id"]) ++- listID = propList["libwpd:id"]->getInt(); ++- if (propList["libwpd:level"]) ++- level = propList["libwpd:level"]->getInt(); +++ if (propList["librevenge:id"]) +++ listID = propList["librevenge:id"]->getInt(); +++ if (propList["librevenge:level"]) +++ level = propList["librevenge:level"]->getInt(); ++ if (propList["text:space-before"]) ++ listLeftOffset = propList["text:space-before"]->getDouble(); ++ if (propList["text:min-label-width"]) ++ listMinLabelWidth = propList["text:min-label-width"]->getDouble(); ++@@ -751,38 +878,9 @@ ++ m_pCurrentListDefinition->setListLeftOffset(level, listLeftOffset); ++ m_pCurrentListDefinition->setListMinLabelWidth(level, listMinLabelWidth); ++ _updateDocumentUnorderedListDefinition(m_pCurrentListDefinition, level); ++ } ++-} ++ ++-//void IE_Imp_WordPerfect::openOrderedListLevel(const int listID) ++-void IE_Imp_WordPerfect::openOrderedListLevel(const WPXPropertyList & /*propList*/) ++-{ ++- if (m_bHdrFtrOpenCount) return; // HACK ++- UT_DEBUGMSG(("AbiWordPerfect: openOrderedListLevel\n")); ++- ++- m_iCurrentListLevel++; ++-} ++- ++-void IE_Imp_WordPerfect::closeOrderedListLevel() ++-{ ++- if (m_bHdrFtrOpenCount) return; // HACK ++- UT_DEBUGMSG(("AbiWordPerfect: closeOrderedListLevel (level: %i)\n", m_iCurrentListLevel)); ++- UT_ASSERT(m_iCurrentListLevel > 0); ++- ++- // every time we close a list level, the level above it is normally renumbered to start at "1" ++- // again. this code takes care of that. ++- if (m_iCurrentListLevel < (WP6_NUM_LIST_LEVELS-1)) ++- m_pCurrentListDefinition->setLevelNumber(m_iCurrentListLevel + 1, 0); ++- ++- m_iCurrentListLevel--; ++-} ++- ++-void IE_Imp_WordPerfect::openUnorderedListLevel(const WPXPropertyList & /*propList*/) ++-{ ++- if (m_bHdrFtrOpenCount) return; // HACK ++- UT_DEBUGMSG(("AbiWordPerfect: openUNorderedListLevel\n")); ++- ++ m_iCurrentListLevel++; ++ } ++ ++ void IE_Imp_WordPerfect::closeUnorderedListLevel() ++@@ -795,9 +893,9 @@ ++ } ++ ++ // ASSUMPTION: We assume that unordered lists will always pass a number of "0". unpredictable behaviour ++ // may result otherwise ++-void IE_Imp_WordPerfect::openListElement(const WPXPropertyList &propList, const WPXPropertyListVector & /*tabStops*/) +++void IE_Imp_WordPerfect::openListElement(const librevenge::RVNGPropertyList &propList) ++ { ++ if (m_bHdrFtrOpenCount) return; // HACK ++ UT_DEBUGMSG(("AbiWordPerfect: openListElement\n")); ++ ++@@ -884,9 +982,9 @@ ++ UT_UCS4Char ucs = UCS_TAB; ++ X_CheckDocumentError(appendSpan(&ucs,1)); ++ } ++ ++-void IE_Imp_WordPerfect::openFootnote(const WPXPropertyList & /*propList*/) +++void IE_Imp_WordPerfect::openFootnote(const librevenge::RVNGPropertyList & /*propList*/) ++ { ++ if (m_bHdrFtrOpenCount) return; // HACK ++ ++ if (!m_bInSection) ++@@ -933,9 +1031,9 @@ ++ if (m_bHdrFtrOpenCount) return; // HACK ++ X_CheckDocumentError(appendStrux(PTX_EndFootnote,NULL)); ++ } ++ ++-void IE_Imp_WordPerfect::openEndnote(const WPXPropertyList & /*propList*/) +++void IE_Imp_WordPerfect::openEndnote(const librevenge::RVNGPropertyList & /*propList*/) ++ { ++ if (m_bHdrFtrOpenCount) return; // HACK ++ const gchar** propsArray = NULL; ++ ++@@ -974,9 +1072,9 @@ ++ if (m_bHdrFtrOpenCount) return; // HACK ++ X_CheckDocumentError(appendStrux(PTX_EndEndnote,NULL)); ++ } ++ ++-void IE_Imp_WordPerfect::openTable(const WPXPropertyList &propList, const WPXPropertyListVector &columns) +++void IE_Imp_WordPerfect::openTable(const librevenge::RVNGPropertyList &propList) ++ { ++ if (m_bHdrFtrOpenCount) return; // HACK ++ // TODO: handle 'marginLeftOffset' and 'marginRightOffset' ++ UT_DEBUGMSG(("AbiWordPerfect: openTable\n")); ++@@ -999,16 +1097,20 @@ ++ UT_String_sprintf(propBuffer, "table-column-leftpos:%s; ", propList["fo:margin-left"]->getStr().cstr()); ++ } ++ } ++ ++- propBuffer += "table-column-props:"; ++- WPXPropertyListVector::Iter i(columns); ++- for (i.rewind(); i.next();) ++- { ++- UT_String tmpBuffer; ++- if (i()["style:column-width"]) ++- UT_String_sprintf(tmpBuffer, "%s/", i()["style:column-width"]->getStr().cstr()); ++- propBuffer += tmpBuffer; +++ const librevenge::RVNGPropertyListVector *columns = propList.child("librevenge:table-columns"); +++ if (columns) +++ { +++ propBuffer += "table-column-props:"; +++ librevenge::RVNGPropertyListVector::Iter i(*columns); +++ for (i.rewind(); i.next();) +++ { +++ UT_String tmpBuffer; +++ if (i()["style:column-width"]) +++ UT_String_sprintf(tmpBuffer, "%s/", i()["style:column-width"]->getStr().cstr()); +++ propBuffer += tmpBuffer; +++ } ++ } ++ ++ const gchar* propsArray[3]; ++ propsArray[0] = "props"; ++@@ -1017,9 +1119,9 @@ ++ ++ X_CheckDocumentError(appendStrux(PTX_SectionTable, propsArray)); ++ } ++ ++-void IE_Imp_WordPerfect::openTableRow(const WPXPropertyList & /*propList*/) +++void IE_Imp_WordPerfect::openTableRow(const librevenge::RVNGPropertyList & /*propList*/) ++ { ++ if (m_bHdrFtrOpenCount) return; // HACK ++ UT_DEBUGMSG(("AbiWordPerfect: openRow\n")); ++ if (m_bInCell) ++@@ -1029,16 +1131,16 @@ ++ ++ m_bInCell = false; ++ } ++ ++-void IE_Imp_WordPerfect::openTableCell(const WPXPropertyList &propList) +++void IE_Imp_WordPerfect::openTableCell(const librevenge::RVNGPropertyList &propList) ++ { ++ if (m_bHdrFtrOpenCount) return; // HACK ++ int col =0, row = 0, colSpan = 0, rowSpan = 0; ++- if (propList["libwpd:column"]) ++- col = propList["libwpd:column"]->getInt(); ++- if (propList["libwpd:row"]) ++- row = propList["libwpd:row"]->getInt(); +++ if (propList["librevenge:column"]) +++ col = propList["librevenge:column"]->getInt(); +++ if (propList["librevenge:row"]) +++ row = propList["librevenge:row"]->getInt(); ++ if (propList["table:number-columns-spanned"]) ++ colSpan = propList["table:number-columns-spanned"]->getInt(); ++ if (propList["table:number-rows-spanned"]) ++ rowSpan = propList["table:number-rows-spanned"]->getInt(); ++@@ -1246,11 +1348,11 @@ ++ protected: ++ virtual UT_Error _loadFile(GsfInput * input) ++ { ++ AbiWordperfectInputStream gsfInput(input); ++- WPSResult error = WPSDocument::parse(&gsfInput, static_cast(this)); +++ libwps::WPSResult error = libwps::WPSDocument::parse(&gsfInput, static_cast(this)); ++ ++- if (error != WPS_OK) +++ if (error != libwps::WPS_OK) ++ { ++ UT_DEBUGMSG(("AbiMSWorks: ERROR: %i!\n", (int)error)); ++ return UT_IE_IMPORTERROR; ++ } ++@@ -1285,15 +1387,19 @@ ++ UT_Confidence_t IE_Imp_MSWorks_Sniffer::recognizeContents (GsfInput * input) ++ { ++ AbiWordperfectInputStream gsfInput(input); ++ ++- WPSConfidence confidence = WPSDocument::isFileFormatSupported(&gsfInput); +++ libwps::WPSKind kind; +++ libwps::WPSConfidence confidence = libwps::WPSDocument::isFileFormatSupported(&gsfInput, kind); +++ +++ if (kind != libwps::WPS_TEXT) +++ confidence = libwps::WPS_CONFIDENCE_NONE; ++ ++ switch (confidence) ++ { ++- case WPS_CONFIDENCE_NONE: +++ case libwps::WPS_CONFIDENCE_NONE: ++ return UT_CONFIDENCE_ZILCH; ++- case WPS_CONFIDENCE_EXCELLENT: +++ case libwps::WPS_CONFIDENCE_EXCELLENT: ++ return UT_CONFIDENCE_PERFECT; ++ default: ++ return UT_CONFIDENCE_ZILCH; ++ } ++--- a/plugins/wordperfect/xp/Makefile.am +++++ b/plugins/wordperfect/xp/Makefile.am ++@@ -5,10 +5,8 @@ ++ $(WORDPERFECT_CFLAGS) \ ++ -DABI_BUILD_VERSION=\"$(VERSION)\" ++ ++ libxp_la_SOURCES = \ ++- ie_exp_WordPerfect.cpp \ ++- ie_exp_WordPerfect.h \ ++ ie_impexp_WordPerfect.cpp \ ++ ie_impexp_WordPerfect.h \ ++ ie_imp_WordPerfect.cpp \ ++ ie_imp_WordPerfect.h ++--- a/plugins/wordperfect/xp/ie_impexp_WordPerfect.h +++++ b/plugins/wordperfect/xp/ie_impexp_WordPerfect.h ++@@ -23,9 +23,8 @@ ++ * Corel Corporation or Corel Corporation Limited." ++ */ ++ ++ #include "ie_imp_WordPerfect.h" ++-#include "ie_exp_WordPerfect.h" ++ #include "xap_Module.h" ++ ++ #define IE_MIMETYPE_WP_51 "application/wordperfect5.1" ++ #define IE_MIMETYPE_WP_6 "application/wordperfect6" ++--- a/plugins/wordperfect/plugin.m4 +++++ b/plugins/wordperfect/plugin.m4 ++@@ -1,7 +1,7 @@ ++ ++-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_pkgs="libwpd-0.10 $gsf_req" +++wordperfect_wps_pkgs='libwps-0.3' ++ wordperfect_deps="no" ++ ++ WORDPERFECT_CFLAGS= ++ WORDPERFECT_LIBS= ++@@ -28,9 +28,9 @@ ++ wp_deps_pkgs="$wordperfect_pkgs" ++ ++ PKG_CHECK_EXISTS([ $wordperfect_wps_pkgs ], ++ [ ++- wp_deps_pkgs="$wp_deps_pkgs $wordperfect_wps_pkgs" +++ wp_deps_pkgs="$wordperfect_wps_pkgs $wp_deps_pkgs" ++ WPS_DEFINE=" -DHAVE_LIBWPS" ++ ]) ++ ++ PKG_CHECK_MODULES(WORDPERFECT,[ $wp_deps_pkgs ]) ++--- a/plugin-configure.m4 +++++ b/plugin-configure.m4 ++@@ -1354,9 +1354,9 @@ ++ AC_SUBST([BMP_CFLAGS]) ++ AC_SUBST([BMP_LIBS]) ++ ++ ++-wpg_pkgs="$gsf_req libwpg-0.2 >= 0.2.0 libwpd-0.9 >= 0.9.0 libwpd-stream-0.9 >= 0.9.0" +++wpg_pkgs="libwpg-0.3 $gsf_req" ++ wpg_deps="no" ++ ++ if test "$enable_wpg" != ""; then ++ ++@@ -1472,10 +1472,10 @@ ++ AC_SUBST([AIKSAURUS_CFLAGS]) ++ AC_SUBST([AIKSAURUS_LIBS]) ++ ++ ++-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_pkgs="libwpd-0.10 $gsf_req" +++wordperfect_wps_pkgs='libwps-0.3' ++ wordperfect_deps="no" ++ ++ WORDPERFECT_CFLAGS= ++ WORDPERFECT_LIBS= ++@@ -1502,9 +1502,9 @@ ++ wp_deps_pkgs="$wordperfect_pkgs" ++ ++ PKG_CHECK_EXISTS([ $wordperfect_wps_pkgs ], ++ [ ++- wp_deps_pkgs="$wp_deps_pkgs $wordperfect_wps_pkgs" +++ wp_deps_pkgs="$wordperfect_wps_pkgs $wp_deps_pkgs" ++ WPS_DEFINE=" -DHAVE_LIBWPS" ++ ]) ++ ++ PKG_CHECK_MODULES(WORDPERFECT,[ $wp_deps_pkgs ]) diff --cc debian/patches/libwpd-0.9.diff index 0000000,0000000..1fdc793 new file mode 100644 --- /dev/null +++ b/debian/patches/libwpd-0.9.diff @@@ -1,0 -1,0 +1,412 @@@ ++--- 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 +++#include ++ ++ #include ++ #include ++@@ -70,12 +70,7 @@ ++ #include ++ #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(this)); +++ WPDResult error = WPDocument::parse(&gsfInput, static_cast(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(this)); +++ WPSResult error = WPSDocument::parse(&gsfInput, static_cast(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 ++-#ifdef _WIN32 ++-#define POINT WPX_POINT ++-#endif ++ #include ++-#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 ++ #include ++ #include ++-#include +++#include ++ #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 ++ ++--- configure 2010-11-24 17:29:47.000000000 +0100 +++++ configure 2010-11-24 17:31:56.000000000 +0100 ++@@ -20604,7 +20604,7 @@ ++ ++ ++ ++-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 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 ++@@ -22664,8 +22664,8 @@ ++ ++ ++ ++-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= diff --cc debian/patches/make-clean.patch index 0000000,0000000..c2b8a19 new file mode 100644 --- /dev/null +++ b/debian/patches/make-clean.patch @@@ -1,0 -1,0 +1,34 @@@ ++Author: Dmitry Smirnov ++Last-Update: 2012-05-14 ++Forwarded: not-needed ++Description: prevent breaking of source tree ++ Without this patch abiword breaks its own source tree ++ so the second build fail ++ ++ ++--- a/Makefile.am +++++ b/Makefile.am ++@@ -59,13 +59,9 @@ ++ compile-resource \ ++ lt-compile-resource ++ ++ DISTCLEANFILES = \ ++- abiword-$(ABIWORD_SERIES).pc \ ++- plugin-builtin.m4 \ ++- plugin-configure.m4 \ ++- plugin-list.m4 \ ++- plugin-makefiles.m4 +++ abiword-$(ABIWORD_SERIES).pc ++ ++ abiword-$(ABIWORD_SERIES).pc: libabiword.pc ++ cp $< $@ ++ ++--- a/src/wp/test/Makefile.am +++++ b/src/wp/test/Makefile.am ++@@ -18,5 +18,5 @@ ++ ++ #include $(top_srcdir)/includes.mk ++ ++ SUBDIRS= xp @PLATFORM@ ++-DIST_SUBDIRS = cocoa unix win xp +++DIST_SUBDIRS = unix xp diff --cc debian/patches/mime-types-desktop.diff index 0000000,0000000..ed8d64b new file mode 100644 --- /dev/null +++ b/debian/patches/mime-types-desktop.diff @@@ -1,0 -1,0 +1,21 @@@ ++Last-Update: 2012-01-15 ++Reviewed-by: Dmitry Smirnov ++Forwarded: no ++Origin: Jari Aalto ++Description: extends mimetypes ++ Date: Wed, 5 May 2010 14:26:48 +0300 ++ ++--- a/abiword.desktop +++++ b/abiword.desktop ++@@ -6,7 +6,7 @@ Type=Application ++ Categories=Office;WordProcessor;GNOME;GTK;X-Red-Hat-Base; ++ StartupNotify=true ++ X-Desktop-File-Install-Version=0.9 ++-MimeType=application/x-abiword;text/x-abiword;text/x-xml-abiword;text/plain;application/msword;application/rtf;application/vnd.plain;application/xhtml+xml;text/html;application/x-crossmark;application/docbook+xml;application/x-t602;application/vnd.oasis.opendocument.text;application/vnd.oasis.opendocument.text-template;application/vnd.oasis.opendocument.text-web;application/vnd.sun.xml.writer;application/vnd.stardivision.writer;text/vnd.wap.wml;application/wordperfect6;application/wordperfect5.1;application/vnd.wordperfect;application/x-abicollab; +++MimeType=application/x-abiword;text/x-abiword;text/x-xml-abiword;text/plain;application/msword;application/rtf;application/vnd.plain;application/xhtml+xml;text/html;application/x-crossmark;application/docbook+xml;application/x-t602;application/vnd.oasis.opendocument.text;application/vnd.oasis.opendocument.text-template;application/vnd.oasis.opendocument.text-web;application/vnd.sun.xml.writer;application/vnd.stardivision.writer;text/vnd.wap.wml;application/wordperfect6;application/wordperfect5.1;application/vnd.wordperfect;application/x-abicollab;application/vnd.palm;application/x-applix-word;application/x-kword;application/x-mif;application/x-mswrite;application/x-palm-database;text/abiword;text/richtext;text/rtf; ++ Name=AbiWord ++ GenericName=Word Processor ++ Comment=Compose, edit, and view documents ++-- ++1.7.0 ++ diff --cc debian/patches/mime-types.diff index 0000000,0000000..3b7e987 new file mode 100644 --- /dev/null +++ b/debian/patches/mime-types.diff @@@ -1,0 -1,0 +1,128 @@@ ++From 9936beb5f7ddd2d68ddf5076af2ccba6949dedf3 Mon Sep 17 00:00:00 2001 ++From: Jari Aalto ++Date: Wed, 5 May 2010 01:28:35 +0300 ++Subject: [PATCH] abiword.keys: Add more MIME types ++Organization: Private ++Content-Type: text/plain; charset="utf-8" ++Content-Transfer-Encoding: 8bit ++ ++Signed-off-by: Jari Aalto ++--- ++ abiword.keys | 104 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ ++ 1 files changed, 104 insertions(+), 0 deletions(-) ++ ++diff --git a/abiword.keys b/abiword.keys ++index 308384d..b098aed 100644 ++--- a/abiword.keys +++++ b/abiword.keys ++@@ -9,3 +9,107 @@ application/msword: ++ application/rtf: ++ open=abiword %f ++ view=abiword %f +++ +++application/x-abicollab: +++ open=abiword %f +++ view=abiword %f +++ +++application/x-crossmark: +++ open=abiword %f +++ view=abiword %f +++ +++application/docbook+xml: +++ open=abiword %f +++ open=abiword %f +++ +++application/vnd.oasis.opendocument.text: +++ open=abiword %f +++ open=abiword %f +++ +++application/vnd.palm: +++ open=abiword %f +++ open=abiword %f +++ +++application/vnd.plain: +++ open=abiword %f +++ open=abiword %f +++ +++application/vnd.stardivision.writer: +++ open=abiword %f +++ open=abiword %f +++ +++application/vnd.sun.xml.writer: +++ open=abiword %f +++ open=abiword %f +++ +++application/vnd.wordperfect: +++ open=abiword %f +++ open=abiword %f +++ +++application/wordperfect5.1: +++ open=abiword %f +++ open=abiword %f +++ +++application/wordperfect6: +++ open=abiword %f +++ open=abiword %f +++ +++application/xhtml+xml: +++ open=abiword %f +++ open=abiword %f +++ +++application/x-applix-word: +++ open=abiword %f +++ open=abiword %f +++ +++application/x-kword: +++ open=abiword %f +++ open=abiword %f +++ +++application/x-mif: +++ open=abiword %f +++ open=abiword %f +++ +++application/x-mswrite: +++ open=abiword %f +++ open=abiword %f +++ +++application/x-palm-database: +++ open=abiword %f +++ open=abiword %f +++ +++application/x-t602: +++ open=abiword %f +++ open=abiword %f +++ +++text/abiword: +++ open=abiword %f +++ open=abiword %f +++ +++text/html: +++ open=abiword %f +++ open=abiword %f +++ +++text/plain: +++ open=abiword %f +++ open=abiword %f +++ +++text/richtext: +++ open=abiword %f +++ open=abiword %f +++ +++text/rtf: +++ open=abiword %f +++ open=abiword %f +++ +++text/vnd.wap.wml: +++ open=abiword %f +++ open=abiword %f +++ +++text/x-abiword: +++ open=abiword %f +++ open=abiword %f +++ +++text/x-xml-abiword: +++ open=abiword %f +++ open=abiword %f ++-- ++1.7.0 ++ diff --cc debian/patches/series index 0000000,0000000..167d750 new file mode 100644 --- /dev/null +++ b/debian/patches/series @@@ -1,0 -1,0 +1,13 @@@ ++evolution-data-server3.8.patch ++gnutls-no-libgcrypt.patch ++boost54.patch ++itex2MML.y.patch ++librevenge.patch ++ ++624095-disable_smooth_scrolling.patch ++make-clean.patch ++autosave.diff -p1 ++ctrl-comma-subscript.diff -p1 ++mime-types-desktop.diff -p1 ++mime-types.diff -p1 ++format-painter-fix.patch diff --cc debian/rules index 0000000,0000000..27b029a new file mode 100755 --- /dev/null +++ b/debian/rules @@@ -1,0 -1,0 +1,123 @@@ ++#!/usr/bin/make -f ++# -*- makefile -*- ++ ++# Uncomment this to turn on verbose mode. ++#export DH_VERBOSE=1 ++# arch-dependent patching ++archpatch=$(wildcard debian/patches/series.$(DEB_HOST_ARCH_OS)) ++$(info $(if $(archpatch), $(shell cat $(archpatch) >> debian/patches/series \ ++&& $(RM) $(archpatch) && dh_quilt_patch))) ++ ++# parallel build by default on linux ++ifeq ($(DEB_HOST_ARCH_OS),linux) ++ ifeq ($(findstring parallel=,$(DEB_BUILD_OPTIONS)),) ++ export DEB_BUILD_OPTIONS+=parallel=$(shell getconf _NPROCESSORS_ONLN) ++ endif ++endif ++$(info DEB_BUILD_OPTIONS:$(origin DEB_BUILD_OPTIONS)=$(DEB_BUILD_OPTIONS)) ++ ++#: Disabling format hardening (-format) might help for error: ++#: "format not a string literal and "no format arguments [-Werror=format-security]" ++export DEB_BUILD_MAINT_OPTIONS=hardening=+bindnow ++$(info DEB_BUILD_MAINT_OPTIONS:$(origin DEB_BUILD_MAINT_OPTIONS)=$(DEB_BUILD_MAINT_OPTIONS)) ++ ++# minimise needless linking ++export DEB_LDFLAGS_MAINT_APPEND= -Wl,--as-needed ++ ++plugins := aiksaurus applix babelfish bmp clarisworks collab command docbook \ ++ eml epub freetranslation garble gdict gimp google grammar hancom \ ++ hrtext iscii kword latex loadbindings mathview mht mif mswrite \ ++ opendocument openwriter openxml opml ots paint passepartout pdb \ ++ pdf presentation s5 sdw t602 urldict wikipedia wmf wml \ ++ wordperfect wpg xslfo goffice ++# plugin 'rsvg' deliberately not used due to build problems. Is it deprecated? ++ ++PKD = $(abspath $(dir $(MAKEFILE_LIST))) ++PKG = $(word 2,$(shell dpkg-parsechangelog -l$(PKD)/changelog | grep ^Source)) ++ifneq (,$(wildcard configure.*)) ++ # API version ++ apiver:=$(shell perl -0ne 'print "$$1.$$2" if m{\[abi_version_major\],\s+\[(\d+)\].*?\[abi_version_minor\],\s+\[(\d+)\]}s' configure.*) ++endif ++# The base library name ++plib=lib$(PKG)-$(apiver) ++pdev=lib$(PKG)-$(apiver)-dev ++ ++%: ++ dh $@ --parallel --with autoreconf ++# dh $@ --parallel --with autoreconf,gir ++ ++override_dh_clean: ++ ## adaptive cleaning meant to work for source archive or repository checkout. ++ ## clean files only if possible to regenerate ++ [ ! -x "$(which flex)" ] || $(RM) -v plugins/mathview/itex2mml/lex.yy.c ++ [ ! -x "tools/cdump/xp/cdump.pl" ] || $(RM) -v src/wp/ap/xp/ap_wp_sidebar.cpp ++ [ ! -x "./autogen-common.sh" ] || $(RM) -v plugin*.m4 po/*.strings ++ dh_clean ++ ++override_dh_autoreconf: ++ $(info I: library-name=$(plib)) ++ $(if $(wildcard debian/$(plib).install),,$(error invalid package/library name.)) ++ $(if $(wildcard debian/$(pdev).install),,$(error invalid dev package/library name.)) ++ # make plugins configuration if building from trunk ++ [ ! -x "./autogen-common.sh" ] || ./autogen-common.sh ++ dh_autoreconf -v --as-needed ++ ++#: Build instructions http://www.abisource.com/~fjf/BUILD.phtml ++#: configure options reference: http://www.abisource.com/wiki/Compiling_AbiWord ++override_dh_auto_configure: ++ # generate icon ++ convert abiword.png -resize 32x32 debian/abiword.xpm ++ dh_auto_configure -- \ ++ --without-gnomevfs \ ++ --with-gio \ ++ --with-redland \ ++ --with-libtidy \ ++ --with-goffice \ ++ --enable-shared \ ++ --enable-clipart \ ++ --enable-templates \ ++ --enable-collab-backend-tcp \ ++ --enable-collab-backend-xmpp \ ++ --enable-collab-backend-sugar \ ++ --enable-collab-backend-service \ ++ --enable-collab-backend-telepathy \ ++ --disable-silent-rules \ ++ --enable-dependency-tracking \ ++ --enable-plugins="$(plugins)" ++# --with-gtk2 \ ++# --enable-debug \ ++# --enable-introspection \ ++ ++override_dh_auto_test: ++ # do not stop on failed test(s) ++ -dh_auto_test ++ ++override_dh_makeshlibs: ++ $(RM) -v debian/abiword/usr/lib/$(DEB_HOST_MULTIARCH)/abiword-*/plugins/grammar.* ++ $(RM) -v debian/abiword/usr/lib/$(DEB_HOST_MULTIARCH)/abiword-*/plugins/mathview.* ++ dh_makeshlibs -V ++ ++override_dh_strip: ++ dh_strip --dbg-package=abiword-dbg ++ ++override_dh_builddeb: ++ dh_builddeb -- -Zxz ++ ++.PHONY: get-orig-source ++VER ?= $(shell dpkg-parsechangelog -l$(PKD)/changelog | perl -ne 'print $$1 if m/Version:\s*([\d\.~+svn]+)/') ++get-orig-source: $(PKG)-$(VER)/ChangeLog ++ @echo "Packing..." ++ XZ_OPT="-6v" tar -caf "$(PKG)_$(VER).orig.tar.xz" "$(PKG)-$(VER)" \ ++ && $(RM) -r "$(PKG)-$(VER)" ++ ++$(PKG)-$(VER)/ChangeLog: $(PKG)-$(VER) ++ @echo "Generating ChangeLog..." ++ cd "$(PKG)-$(VER)" \ ++ && svn2cl --break-before-msg --include-rev \ ++ && perl -0pi -e 's{(\d+\])[^:]+?:\s+}{$$1 }sgm' ChangeLog \ ++ && find . -depth -name ".svn" -exec $(RM) -rf '{}' \; ++ ++$(PKG)-$(VER): ++ svn checkout -r {$$(echo $(VER) | perl -ne 'print $$1 if m/\Dsvn(\d+)/')} \ ++ http://svn.abisource.com/abiword/branches/ABI-3-0-0-STABLE $(PKG)-$(VER) \ ++ || $(RM) -r $(PKG)-$(VER) diff --cc debian/source/format index 0000000,0000000..163aaf8 new file mode 100644 --- /dev/null +++ b/debian/source/format @@@ -1,0 -1,0 +1,1 @@@ ++3.0 (quilt) diff --cc debian/source/options index 0000000,0000000..b7bc1f2 new file mode 100644 --- /dev/null +++ b/debian/source/options @@@ -1,0 -1,0 +1,1 @@@ ++compression = "xz" diff --cc debian/watch index 0000000,0000000..41dfa35 new file mode 100644 --- /dev/null +++ b/debian/watch @@@ -1,0 -1,0 +1,9 @@@ ++# uscan(1) configuration file. ++version=3 ++ ++## all versions ++opts=\ ++dversionmangle=s/\+svn\d+//,\ ++downloadurlmangle=s/([0-9.]+)\//$1\/source\/abiword-$1\.tar\.gz/,\ ++filenamemangle=s/.*/orig.tar.gz/,\ ++ http://www.abisource.com/downloads/abiword/ ([0-9.]+)\/