debian/0000755000000000000000000000000012207517020007162 5ustar debian/libwv2-4.install0000644000000000000000000000002411277364274012135 0ustar usr/lib/libwv2.so.* debian/rules0000755000000000000000000000174112207515615010255 0ustar #!/usr/bin/make -f # Upstream build system seems to just ignore these, and as a result, libgsf # fails to find libxml headers (see #707417). CPPFLAGS += $(shell pkg-config libgsf-1 --cflags) # Files on CIFS shares can have 64 bit inode numbers, which means we need LFS # enabled to read them (which is something which a library which reads Word # documents really should support). CPPFLAGS += -D_FILE_OFFSET_BITS=64 # Disable debug output, which is very noisy. # (#329109 and (after upstream moved to cmake and the fix was lost) #603871) CXXFLAGS += -DNDEBUG %: dh $@ override_dh_auto_configure: dh_auto_configure override_dh_auto_test: ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS))) ifeq ($(DEB_HOST_GNU_TYPE),$(DEB_BUILD_GNU_TYPE)) $(MAKE) -C obj-* test cp tests/*.doc obj-*/tests cd obj-*/tests ; for t in *test ; do \ echo "Running test $$t" ;\ if [ $$t = handlertest ]; then \ set -e ; ./$$t testole.doc ;\ else \ set -e ; ./$$t ;\ fi \ done endif endif debian/wv2-config.10000644000000000000000000000370011277364274011246 0ustar .TH WV2-CONFIG 1 "June 2003" .SH NAME wv2-config - script to get information about the installed version of wv2 .SH SYNOPSIS .B wv2-config [\fB\-\-prefix\fP[=\fIDIR\fP]] [\fB\-\-exec\-prefix\fP[=\fIDIR\fP]] [\fB\-\-version\fP] [\fB\-\-libs\fP] [\fB\-\-cflags\fP] .SH DESCRIPTION .PP \fIwv2-config\fP is used to determine the compiler and linker flags that should be used to compile and link programs that use \fIwv2\fP. .SH OPTIONS \fIwv2-config\fP accepts the following options. .TP \fB\-\-prefix\fP=\fIDIR\fP If specified, use DIR instead of the installation prefix that \fIwv2\fP was built with when computing the output for the \-\-cflags and \-\-libs options. This option is also used for the exec prefix if \-\-exec\-prefix is not specified. This option must be specified before any \-\-libs or \-\-cflags options. If no DIR is specified then the current installation prefix will be written to standard output. .TP \fB\-\-exec\-prefix\fP=\fIDIR\fP If specified, use DIR instead of the installation exec prefix that \fIwv2\fP was built with when computing the output for the \-\-cflags and \-\-libs options. This option must be specified before any \-\-libs or \-\-cflags options. If no DIR is specified then the current installation exec prefix will be written to standard output. .TP .B \-\-version Print the currently installed version of \fIwv2\fP on standard output. .TP .B \-\-libs Print the linker flags that are necessary to link a program against \fIwv2\fP. .TP .B \-\-cflags Print the compiler flags that are necessary to compile a program that uses \fIwv2\fP. .SH SEE ALSO Some documentation regarding the design of the \fIwv2\fP library is available in \fI/usr/share/doc/libwv2-dev/design/\fP . .SH AUTHOR The \fIwv2\fP library was written by Shaheed Haque , Werner Trobin and David Faure . .br This manual page was prepared by Ben Burton for the Debian GNU/Linux system, but may be used by others. debian/libwv2-dev.install0000644000000000000000000000006511277364274012555 0ustar usr/bin/wv2-config usr/include/wv2 usr/lib/libwv2.so debian/README.Debian0000644000000000000000000000065612151630227011235 0ustar The wv2 source tarball has been repacked to remove the following documentation files for which the licence is unknown: * The doc/ subdirectory * src/generator/generator_wword6.htm * src/generator/generator_wword8.htm You can find these files in the original source tarball, which you can download from here: http://sourceforge.net/projects/wvware/files/ -- Olly Betts Thu, 30 May 2013 10:49:39 +0000 debian/libwv2-dev.docs0000644000000000000000000000000011277364274012024 0ustar debian/libwv2-dev.manpages0000644000000000000000000000002411277364274012675 0ustar debian/wv2-config.1 debian/control0000644000000000000000000000226312151637476010610 0ustar Source: wv2 Section: libs Priority: optional Maintainer: Olly Betts Build-Depends: debhelper (>= 9), cmake, libglib2.0-dev, libgsf-1-dev (>= 1.14.0), libxml2-dev, zlib1g-dev, pkg-config, python Standards-Version: 3.9.4 Homepage: http://wvware.sourceforge.net Package: libwv2-4 Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} Conflicts: libwv2-1 Replaces: libwv2-1 Description: library for accessing Microsoft Word documents The wv2 library allows access to Microsoft Word documents, for the purpose of converting them to other formats. This library is intended as an eventual replacement for the wv library, used in the package wv. Package: libwv2-dev Architecture: any Section: libdevel Depends: libwv2-4 (= ${binary:Version}), libglib2.0-dev, libgsf-1-dev (>= 1.14.0), libxml2-dev, ${misc:Depends} Description: development files for Microsoft Word access library The wv2 library allows access to Microsoft Word documents, for the purpose of converting them to other formats. This library is intended as an eventual replacement for the wv library, used in the package wv. . This package contains development files for using libwv2 within your own projects. debian/source/0000755000000000000000000000000012151624726010474 5ustar debian/source/format0000644000000000000000000000001411277366027011707 0ustar 3.0 (quilt) debian/patches/0000755000000000000000000000000012207516634010623 5ustar debian/patches/fix-nan-and-inf-for-mips.patch0000644000000000000000000000130011701230472016231 0ustar The bit patterns used are wrong for mips and mipsel and cause a bus error when this code is compiled with optimisation. They may also be wrong on other archs, but without causing a crash... --- wv2-0.4.2.dfsg.1/src/ustring.cpp Sun Nov 1 07:22:43 2009 +++ wv2-0.4.2.dfsg.1/src/ustring.cpp Thu Jan 5 18:09:31 2012 @@ -57,8 +57,16 @@ unsigned char Inf_Bytes[] = { 0, 0, 0, 0, 0, 0, 0xf0, 0x7f }; #endif +#ifdef NAN + const double NaN = NAN; +#else const double NaN = *( reinterpret_cast( NaN_Bytes ) ); +#endif +#ifdef INFINITY + const double Inf = INFINITY; +#else const double Inf = *( reinterpret_cast( Inf_Bytes ) ); +#endif } using namespace wvWare; debian/patches/fix-tests.patch0000644000000000000000000000127611665415763013610 0ustar Description: Fix testsuite not to try encoding libiconv doesn't know Author: Olly Betts --- Origin: debian Last-Update: 2010-11-30 --- wv2-0.4.2.dfsg.1.orig/tests/iconvtest.cpp +++ wv2-0.4.2.dfsg.1/tests/iconvtest.cpp @@ -59,7 +59,9 @@ int main( int, char** ) status += cp_test( "CP1256" ); status += cp_test( "CP1257" ); status += cp_test( "UCS-2" ); - status += cp_test( "UCS-2-INTERNAL" ); + // Not supported by iconv(3) on Debian. Isn't used by libwv though, so + // that's not a problem. + //status += cp_test( "UCS-2-INTERNAL" ); status += cp_test( "UNICODEBIG" ); status += cp_test( "UNICODELITTLE" ); status += cp_test( "UTF-8" ); debian/patches/glib-2.32-compat.patch0000644000000000000000000000121411733515621014420 0ustar Description: Fix compatibility with glib 2.32 and later Starting with glib 2.32 it is now mandatory to include glib.h instead of individual headers, or the compiler will generate an error: http://git.gnome.org/browse/glib/commit/?id=7455dd370eb37ce3b0b409ff6120501f37b50569 Author: Olly Betts Bug-Debian: http://bugs.debian.org/665626 Forwarded: no Last-Update: 2012-03-25 --- wv2-0.4.2.dfsg.1.orig/src/olestream.h +++ wv2-0.4.2.dfsg.1/src/olestream.h @@ -23,7 +23,7 @@ #include "global.h" // U8,... typedefs #include -#include // GSeekType +#include // GSeekType namespace wvWare { debian/patches/avoid-writing-after-structures.patch0000644000000000000000000015365411700006341017747 0ustar Description: Avoid writing after word-aligned structures Fixes FTBFS on sparc. Author: Olly Betts --- Origin: debian Forwarded: no Last-Update: 2011-12-01 --- wv2-0.4.2.dfsg.1.orig/tests/word95_test.cpp +++ wv2-0.4.2.dfsg.1/tests/word95_test.cpp @@ -32,18 +32,18 @@ int main(int, char**) { srand( time( 0 ) ); // Some "global" variables... - int *ptr=0; // used to "initialize" the structs + char *ptr=0; // used to "initialize" the structs int tmp; std::cout << "Testing the Word95 structures..." << std::endl; // Begin of writing test for DTTM std::cout << "Testing writing for DTTM: "; DTTM dttm1; - // Initilaize the struct with random data - tmp=sizeof(DTTM)/sizeof(int); - ptr=reinterpret_cast( &dttm1 ); + // Initialize the struct with random data + tmp=sizeof(DTTM); + ptr=reinterpret_cast( &dttm1 ); for(int _i=0; _i> (((sizeof(int)-1)-(sizeof(DTTM) % sizeof(int)))*8)); // yay! :) + // and write it out... if(dttm1.write(writer, false)) std::cout << "Passed." << std::endl; @@ -55,12 +55,12 @@ int main(int, char**) { // Begin of writing test for PRM2 std::cout << "Testing writing for PRM2: "; PRM2 prm21; - // Initilaize the struct with random data - tmp=sizeof(PRM2)/sizeof(int); - ptr=reinterpret_cast( &prm21 ); + // Initialize the struct with random data + tmp=sizeof(PRM2); + ptr=reinterpret_cast( &prm21 ); for(int _i=0; _i> (((sizeof(int)-1)-(sizeof(PRM2) % sizeof(int)))*8)); // yay! :) + // and write it out... if(prm21.write(writer, false)) std::cout << "Passed." << std::endl; @@ -71,12 +71,12 @@ int main(int, char**) { // Begin of writing test for PRM std::cout << "Testing writing for PRM: "; PRM prm1; - // Initilaize the struct with random data - tmp=sizeof(PRM)/sizeof(int); - ptr=reinterpret_cast( &prm1 ); + // Initialize the struct with random data + tmp=sizeof(PRM); + ptr=reinterpret_cast( &prm1 ); for(int _i=0; _i> (((sizeof(int)-1)-(sizeof(PRM) % sizeof(int)))*8)); // yay! :) + // and write it out... if(prm1.write(writer, false)) std::cout << "Passed." << std::endl; @@ -87,12 +87,12 @@ int main(int, char**) { // Begin of writing test for SHD std::cout << "Testing writing for SHD: "; SHD shd1; - // Initilaize the struct with random data - tmp=sizeof(SHD)/sizeof(int); - ptr=reinterpret_cast( &shd1 ); + // Initialize the struct with random data + tmp=sizeof(SHD); + ptr=reinterpret_cast( &shd1 ); for(int _i=0; _i> (((sizeof(int)-1)-(sizeof(SHD) % sizeof(int)))*8)); // yay! :) + // and write it out... if(shd1.write(writer, false)) std::cout << "Passed." << std::endl; @@ -104,12 +104,12 @@ int main(int, char**) { // Begin of writing test for PHE std::cout << "Testing writing for PHE: "; PHE phe1; - // Initilaize the struct with random data - tmp=sizeof(PHE)/sizeof(int); - ptr=reinterpret_cast( &phe1 ); + // Initialize the struct with random data + tmp=sizeof(PHE); + ptr=reinterpret_cast( &phe1 ); for(int _i=0; _i> (((sizeof(int)-1)-(sizeof(PHE) % sizeof(int)))*8)); // yay! :) + // and write it out... if(phe1.write(writer, false)) std::cout << "Passed." << std::endl; @@ -121,12 +121,12 @@ int main(int, char**) { // Begin of writing test for BRC std::cout << "Testing writing for BRC: "; BRC brc1; - // Initilaize the struct with random data - tmp=sizeof(BRC)/sizeof(int); - ptr=reinterpret_cast( &brc1 ); + // Initialize the struct with random data + tmp=sizeof(BRC); + ptr=reinterpret_cast( &brc1 ); for(int _i=0; _i> (((sizeof(int)-1)-(sizeof(BRC) % sizeof(int)))*8)); // yay! :) + // and write it out... if(brc1.write(writer, false)) std::cout << "Passed." << std::endl; @@ -138,12 +138,12 @@ int main(int, char**) { // Begin of writing test for TLP std::cout << "Testing writing for TLP: "; TLP tlp1; - // Initilaize the struct with random data - tmp=sizeof(TLP)/sizeof(int); - ptr=reinterpret_cast( &tlp1 ); + // Initialize the struct with random data + tmp=sizeof(TLP); + ptr=reinterpret_cast( &tlp1 ); for(int _i=0; _i> (((sizeof(int)-1)-(sizeof(TLP) % sizeof(int)))*8)); // yay! :) + // and write it out... if(tlp1.write(writer, false)) std::cout << "Passed." << std::endl; @@ -155,12 +155,12 @@ int main(int, char**) { // Begin of writing test for TC std::cout << "Testing writing for TC: "; TC tc1; - // Initilaize the struct with random data - tmp=sizeof(TC)/sizeof(int); - ptr=reinterpret_cast( &tc1 ); + // Initialize the struct with random data + tmp=sizeof(TC); + ptr=reinterpret_cast( &tc1 ); for(int _i=0; _i> (((sizeof(int)-1)-(sizeof(TC) % sizeof(int)))*8)); // yay! :) + // and write it out... if(tc1.write(writer, false)) std::cout << "Passed." << std::endl; @@ -172,12 +172,12 @@ int main(int, char**) { // Begin of writing test for DPHEAD std::cout << "Testing writing for DPHEAD: "; DPHEAD dphead1; - // Initilaize the struct with random data - tmp=sizeof(DPHEAD)/sizeof(int); - ptr=reinterpret_cast( &dphead1 ); + // Initialize the struct with random data + tmp=sizeof(DPHEAD); + ptr=reinterpret_cast( &dphead1 ); for(int _i=0; _i> (((sizeof(int)-1)-(sizeof(DPHEAD) % sizeof(int)))*8)); // yay! :) + // and write it out... if(dphead1.write(writer, false)) std::cout << "Passed." << std::endl; @@ -188,12 +188,12 @@ int main(int, char**) { // Begin of writing test for DPTXBX std::cout << "Testing writing for DPTXBX: "; DPTXBX dptxbx1; - // Initilaize the struct with random data - tmp=sizeof(DPTXBX)/sizeof(int); - ptr=reinterpret_cast( &dptxbx1 ); + // Initialize the struct with random data + tmp=sizeof(DPTXBX); + ptr=reinterpret_cast( &dptxbx1 ); for(int _i=0; _i> (((sizeof(int)-1)-(sizeof(DPTXBX) % sizeof(int)))*8)); // yay! :) + // and write it out... if(dptxbx1.write(writer, false)) std::cout << "Passed." << std::endl; @@ -207,12 +207,12 @@ int main(int, char**) { // Begin of writing test for ANLD std::cout << "Testing writing for ANLD: "; ANLD anld1; - // Initilaize the struct with random data - tmp=sizeof(ANLD)/sizeof(int); - ptr=reinterpret_cast( &anld1 ); + // Initialize the struct with random data + tmp=sizeof(ANLD); + ptr=reinterpret_cast( &anld1 ); for(int _i=0; _i> (((sizeof(int)-1)-(sizeof(ANLD) % sizeof(int)))*8)); // yay! :) + // and write it out... if(anld1.write(writer, false)) std::cout << "Passed." << std::endl; @@ -224,12 +224,12 @@ int main(int, char**) { // Begin of writing test for ANLV std::cout << "Testing writing for ANLV: "; ANLV anlv1; - // Initilaize the struct with random data - tmp=sizeof(ANLV)/sizeof(int); - ptr=reinterpret_cast( &anlv1 ); + // Initialize the struct with random data + tmp=sizeof(ANLV); + ptr=reinterpret_cast( &anlv1 ); for(int _i=0; _i> (((sizeof(int)-1)-(sizeof(ANLV) % sizeof(int)))*8)); // yay! :) + // and write it out... if(anlv1.write(writer, false)) std::cout << "Passed." << std::endl; @@ -241,12 +241,12 @@ int main(int, char**) { // Begin of writing test for BKF std::cout << "Testing writing for BKF: "; BKF bkf1; - // Initilaize the struct with random data - tmp=sizeof(BKF)/sizeof(int); - ptr=reinterpret_cast( &bkf1 ); + // Initialize the struct with random data + tmp=sizeof(BKF); + ptr=reinterpret_cast( &bkf1 ); for(int _i=0; _i> (((sizeof(int)-1)-(sizeof(BKF) % sizeof(int)))*8)); // yay! :) + // and write it out... if(bkf1.write(writer, false)) std::cout << "Passed." << std::endl; @@ -257,12 +257,12 @@ int main(int, char**) { // Begin of writing test for BKL std::cout << "Testing writing for BKL: "; BKL bkl1; - // Initilaize the struct with random data - tmp=sizeof(BKL)/sizeof(int); - ptr=reinterpret_cast( &bkl1 ); + // Initialize the struct with random data + tmp=sizeof(BKL); + ptr=reinterpret_cast( &bkl1 ); for(int _i=0; _i> (((sizeof(int)-1)-(sizeof(BKL) % sizeof(int)))*8)); // yay! :) + // and write it out... if(bkl1.write(writer, false)) std::cout << "Passed." << std::endl; @@ -273,12 +273,12 @@ int main(int, char**) { // Begin of writing test for BRC10 std::cout << "Testing writing for BRC10: "; BRC10 brc101; - // Initilaize the struct with random data - tmp=sizeof(BRC10)/sizeof(int); - ptr=reinterpret_cast( &brc101 ); + // Initialize the struct with random data + tmp=sizeof(BRC10); + ptr=reinterpret_cast( &brc101 ); for(int _i=0; _i> (((sizeof(int)-1)-(sizeof(BRC10) % sizeof(int)))*8)); // yay! :) + // and write it out... if(brc101.write(writer, false)) std::cout << "Passed." << std::endl; @@ -289,12 +289,12 @@ int main(int, char**) { // Begin of writing test for BTE std::cout << "Testing writing for BTE: "; BTE bte1; - // Initilaize the struct with random data - tmp=sizeof(BTE)/sizeof(int); - ptr=reinterpret_cast( &bte1 ); + // Initialize the struct with random data + tmp=sizeof(BTE); + ptr=reinterpret_cast( &bte1 ); for(int _i=0; _i> (((sizeof(int)-1)-(sizeof(BTE) % sizeof(int)))*8)); // yay! :) + // and write it out... if(bte1.write(writer, false)) std::cout << "Passed." << std::endl; @@ -305,12 +305,12 @@ int main(int, char**) { // Begin of writing test for CHP std::cout << "Testing writing for CHP: "; CHP chp1; - // Initilaize the struct with random data - tmp=sizeof(CHP)/sizeof(int); - ptr=reinterpret_cast( &chp1 ); + // Initialize the struct with random data + tmp=sizeof(CHP); + ptr=reinterpret_cast( &chp1 ); for(int _i=0; _i> (((sizeof(int)-1)-(sizeof(CHP) % sizeof(int)))*8)); // yay! :) + // and write it out... if(chp1.write(writer, false)) std::cout << "Passed." << std::endl; @@ -322,12 +322,12 @@ int main(int, char**) { // Begin of writing test for DCS std::cout << "Testing writing for DCS: "; DCS dcs1; - // Initilaize the struct with random data - tmp=sizeof(DCS)/sizeof(int); - ptr=reinterpret_cast( &dcs1 ); + // Initialize the struct with random data + tmp=sizeof(DCS); + ptr=reinterpret_cast( &dcs1 ); for(int _i=0; _i> (((sizeof(int)-1)-(sizeof(DCS) % sizeof(int)))*8)); // yay! :) + // and write it out... if(dcs1.write(writer, false)) std::cout << "Passed." << std::endl; @@ -339,12 +339,12 @@ int main(int, char**) { // Begin of writing test for DO std::cout << "Testing writing for DO: "; DO do1; - // Initilaize the struct with random data - tmp=sizeof(DO)/sizeof(int); - ptr=reinterpret_cast( &do1 ); + // Initialize the struct with random data + tmp=sizeof(DO); + ptr=reinterpret_cast( &do1 ); for(int _i=0; _i> (((sizeof(int)-1)-(sizeof(DO) % sizeof(int)))*8)); // yay! :) + // and write it out... if(do1.write(writer, false)) std::cout << "Passed." << std::endl; @@ -355,12 +355,12 @@ int main(int, char**) { // Begin of writing test for DOP std::cout << "Testing writing for DOP: "; DOP dop1; - // Initilaize the struct with random data - tmp=sizeof(DOP)/sizeof(int); - ptr=reinterpret_cast( &dop1 ); + // Initialize the struct with random data + tmp=sizeof(DOP); + ptr=reinterpret_cast( &dop1 ); for(int _i=0; _i> (((sizeof(int)-1)-(sizeof(DOP) % sizeof(int)))*8)); // yay! :) + // and write it out... if(dop1.write(writer, false)) std::cout << "Passed." << std::endl; @@ -371,12 +371,12 @@ int main(int, char**) { // Begin of writing test for DPARC std::cout << "Testing writing for DPARC: "; DPARC dparc1; - // Initilaize the struct with random data - tmp=sizeof(DPARC)/sizeof(int); - ptr=reinterpret_cast( &dparc1 ); + // Initialize the struct with random data + tmp=sizeof(DPARC); + ptr=reinterpret_cast( &dparc1 ); for(int _i=0; _i> (((sizeof(int)-1)-(sizeof(DPARC) % sizeof(int)))*8)); // yay! :) + // and write it out... if(dparc1.write(writer, false)) std::cout << "Passed." << std::endl; @@ -387,12 +387,12 @@ int main(int, char**) { // Begin of writing test for DPELLIPSE std::cout << "Testing writing for DPELLIPSE: "; DPELLIPSE dpellipse1; - // Initilaize the struct with random data - tmp=sizeof(DPELLIPSE)/sizeof(int); - ptr=reinterpret_cast( &dpellipse1 ); + // Initialize the struct with random data + tmp=sizeof(DPELLIPSE); + ptr=reinterpret_cast( &dpellipse1 ); for(int _i=0; _i> (((sizeof(int)-1)-(sizeof(DPELLIPSE) % sizeof(int)))*8)); // yay! :) + // and write it out... if(dpellipse1.write(writer, false)) std::cout << "Passed." << std::endl; @@ -403,12 +403,12 @@ int main(int, char**) { // Begin of writing test for DPLINE std::cout << "Testing writing for DPLINE: "; DPLINE dpline1; - // Initilaize the struct with random data - tmp=sizeof(DPLINE)/sizeof(int); - ptr=reinterpret_cast( &dpline1 ); + // Initialize the struct with random data + tmp=sizeof(DPLINE); + ptr=reinterpret_cast( &dpline1 ); for(int _i=0; _i> (((sizeof(int)-1)-(sizeof(DPLINE) % sizeof(int)))*8)); // yay! :) + // and write it out... if(dpline1.write(writer, false)) std::cout << "Passed." << std::endl; @@ -419,12 +419,12 @@ int main(int, char**) { // Begin of writing test for DPRECT std::cout << "Testing writing for DPRECT: "; DPRECT dprect1; - // Initilaize the struct with random data - tmp=sizeof(DPRECT)/sizeof(int); - ptr=reinterpret_cast( &dprect1 ); + // Initialize the struct with random data + tmp=sizeof(DPRECT); + ptr=reinterpret_cast( &dprect1 ); for(int _i=0; _i> (((sizeof(int)-1)-(sizeof(DPRECT) % sizeof(int)))*8)); // yay! :) + // and write it out... if(dprect1.write(writer, false)) std::cout << "Passed." << std::endl; @@ -435,12 +435,12 @@ int main(int, char**) { // Begin of writing test for DPSAMPLE std::cout << "Testing writing for DPSAMPLE: "; DPSAMPLE dpsample1; - // Initilaize the struct with random data - tmp=sizeof(DPSAMPLE)/sizeof(int); - ptr=reinterpret_cast( &dpsample1 ); + // Initialize the struct with random data + tmp=sizeof(DPSAMPLE); + ptr=reinterpret_cast( &dpsample1 ); for(int _i=0; _i> (((sizeof(int)-1)-(sizeof(DPSAMPLE) % sizeof(int)))*8)); // yay! :) + // and write it out... if(dpsample1.write(writer, false)) std::cout << "Passed." << std::endl; @@ -451,12 +451,12 @@ int main(int, char**) { // Begin of writing test for FDOA std::cout << "Testing writing for FDOA: "; FDOA fdoa1; - // Initilaize the struct with random data - tmp=sizeof(FDOA)/sizeof(int); - ptr=reinterpret_cast( &fdoa1 ); + // Initialize the struct with random data + tmp=sizeof(FDOA); + ptr=reinterpret_cast( &fdoa1 ); for(int _i=0; _i> (((sizeof(int)-1)-(sizeof(FDOA) % sizeof(int)))*8)); // yay! :) + // and write it out... if(fdoa1.write(writer, false)) std::cout << "Passed." << std::endl; @@ -467,12 +467,12 @@ int main(int, char**) { // Begin of writing test for FIB std::cout << "Testing writing for FIB: "; FIB fib1; - // Initilaize the struct with random data - tmp=sizeof(FIB)/sizeof(int); - ptr=reinterpret_cast( &fib1 ); + // Initialize the struct with random data + tmp=sizeof(FIB); + ptr=reinterpret_cast( &fib1 ); for(int _i=0; _i> (((sizeof(int)-1)-(sizeof(FIB) % sizeof(int)))*8)); // yay! :) + // and write it out... if(fib1.write(writer, false)) std::cout << "Passed." << std::endl; @@ -483,12 +483,12 @@ int main(int, char**) { // Begin of writing test for LSPD std::cout << "Testing writing for LSPD: "; LSPD lspd1; - // Initilaize the struct with random data - tmp=sizeof(LSPD)/sizeof(int); - ptr=reinterpret_cast( &lspd1 ); + // Initialize the struct with random data + tmp=sizeof(LSPD); + ptr=reinterpret_cast( &lspd1 ); for(int _i=0; _i> (((sizeof(int)-1)-(sizeof(LSPD) % sizeof(int)))*8)); // yay! :) + // and write it out... if(lspd1.write(writer, false)) std::cout << "Passed." << std::endl; @@ -500,12 +500,12 @@ int main(int, char**) { // Begin of writing test for METAFILEPICT std::cout << "Testing writing for METAFILEPICT: "; METAFILEPICT metafilepict1; - // Initilaize the struct with random data - tmp=sizeof(METAFILEPICT)/sizeof(int); - ptr=reinterpret_cast( &metafilepict1 ); + // Initialize the struct with random data + tmp=sizeof(METAFILEPICT); + ptr=reinterpret_cast( &metafilepict1 ); for(int _i=0; _i> (((sizeof(int)-1)-(sizeof(METAFILEPICT) % sizeof(int)))*8)); // yay! :) + // and write it out... if(metafilepict1.write(writer, false)) std::cout << "Passed." << std::endl; @@ -517,12 +517,12 @@ int main(int, char**) { // Begin of writing test for OBJHEADER std::cout << "Testing writing for OBJHEADER: "; OBJHEADER objheader1; - // Initilaize the struct with random data - tmp=sizeof(OBJHEADER)/sizeof(int); - ptr=reinterpret_cast( &objheader1 ); + // Initialize the struct with random data + tmp=sizeof(OBJHEADER); + ptr=reinterpret_cast( &objheader1 ); for(int _i=0; _i> (((sizeof(int)-1)-(sizeof(OBJHEADER) % sizeof(int)))*8)); // yay! :) + // and write it out... if(objheader1.write(writer, false)) std::cout << "Passed." << std::endl; @@ -533,12 +533,12 @@ int main(int, char**) { // Begin of writing test for OLST std::cout << "Testing writing for OLST: "; OLST olst1; - // Initilaize the struct with random data - tmp=sizeof(OLST)/sizeof(int); - ptr=reinterpret_cast( &olst1 ); + // Initialize the struct with random data + tmp=sizeof(OLST); + ptr=reinterpret_cast( &olst1 ); for(int _i=0; _i> (((sizeof(int)-1)-(sizeof(OLST) % sizeof(int)))*8)); // yay! :) + // and write it out... if(olst1.write(writer, false)) std::cout << "Passed." << std::endl; @@ -550,12 +550,12 @@ int main(int, char**) { // Begin of writing test for PCD std::cout << "Testing writing for PCD: "; PCD pcd1; - // Initilaize the struct with random data - tmp=sizeof(PCD)/sizeof(int); - ptr=reinterpret_cast( &pcd1 ); + // Initialize the struct with random data + tmp=sizeof(PCD); + ptr=reinterpret_cast( &pcd1 ); for(int _i=0; _i> (((sizeof(int)-1)-(sizeof(PCD) % sizeof(int)))*8)); // yay! :) + // and write it out... if(pcd1.write(writer, false)) std::cout << "Passed." << std::endl; @@ -566,12 +566,12 @@ int main(int, char**) { // Begin of writing test for PGD std::cout << "Testing writing for PGD: "; PGD pgd1; - // Initilaize the struct with random data - tmp=sizeof(PGD)/sizeof(int); - ptr=reinterpret_cast( &pgd1 ); + // Initialize the struct with random data + tmp=sizeof(PGD); + ptr=reinterpret_cast( &pgd1 ); for(int _i=0; _i> (((sizeof(int)-1)-(sizeof(PGD) % sizeof(int)))*8)); // yay! :) + // and write it out... if(pgd1.write(writer, false)) std::cout << "Passed." << std::endl; @@ -582,12 +582,12 @@ int main(int, char**) { // Begin of writing test for PICF std::cout << "Testing writing for PICF: "; PICF picf1; - // Initilaize the struct with random data - tmp=sizeof(PICF)/sizeof(int); - ptr=reinterpret_cast( &picf1 ); + // Initialize the struct with random data + tmp=sizeof(PICF); + ptr=reinterpret_cast( &picf1 ); for(int _i=0; _i> (((sizeof(int)-1)-(sizeof(PICF) % sizeof(int)))*8)); // yay! :) + // and write it out... if(picf1.write(writer, false)) std::cout << "Passed." << std::endl; @@ -599,12 +599,12 @@ int main(int, char**) { // Begin of writing test for SED std::cout << "Testing writing for SED: "; SED sed1; - // Initilaize the struct with random data - tmp=sizeof(SED)/sizeof(int); - ptr=reinterpret_cast( &sed1 ); + // Initialize the struct with random data + tmp=sizeof(SED); + ptr=reinterpret_cast( &sed1 ); for(int _i=0; _i> (((sizeof(int)-1)-(sizeof(SED) % sizeof(int)))*8)); // yay! :) + // and write it out... if(sed1.write(writer, false)) std::cout << "Passed." << std::endl; @@ -618,12 +618,12 @@ int main(int, char**) { // Begin of writing test for STSHI std::cout << "Testing writing for STSHI: "; STSHI stshi1; - // Initilaize the struct with random data - tmp=sizeof(STSHI)/sizeof(int); - ptr=reinterpret_cast( &stshi1 ); + // Initialize the struct with random data + tmp=sizeof(STSHI); + ptr=reinterpret_cast( &stshi1 ); for(int _i=0; _i> (((sizeof(int)-1)-(sizeof(STSHI) % sizeof(int)))*8)); // yay! :) + // and write it out... if(stshi1.write(writer, false)) std::cout << "Passed." << std::endl; --- wv2-0.4.2.dfsg.1.orig/tests/word97_test.cpp +++ wv2-0.4.2.dfsg.1/tests/word97_test.cpp @@ -32,18 +32,18 @@ srand( time( 0 ) ); // Some "global" variables... - int *ptr=0; // used to "initialize" the structs + char *ptr=0; // used to "initialize" the structs int tmp; std::cout << "Testing the Word97 structures..." << std::endl; // Begin of writing test for DTTM std::cout << "Testing writing for DTTM: "; DTTM dttm1; - // Initilaize the struct with random data - tmp=sizeof(DTTM)/sizeof(int); - ptr=reinterpret_cast( &dttm1 ); + // Initialize the struct with random data + tmp=sizeof(DTTM); + ptr=reinterpret_cast( &dttm1 ); for(int _i=0; _i> (((sizeof(int)-1)-(sizeof(DTTM) % sizeof(int)))*8)); // yay! :) + // and write it out... if(dttm1.write(writer, false)) std::cout << "Passed." << std::endl; @@ -55,12 +55,12 @@ int main(int, char**) { // Begin of writing test for DOPTYPOGRAPHY std::cout << "Testing writing for DOPTYPOGRAPHY: "; DOPTYPOGRAPHY doptypography1; - // Initilaize the struct with random data - tmp=sizeof(DOPTYPOGRAPHY)/sizeof(int); - ptr=reinterpret_cast( &doptypography1 ); + // Initialize the struct with random data + tmp=sizeof(DOPTYPOGRAPHY); + ptr=reinterpret_cast( &doptypography1 ); for(int _i=0; _i> (((sizeof(int)-1)-(sizeof(DOPTYPOGRAPHY) % sizeof(int)))*8)); // yay! :) + // and write it out... if(doptypography1.write(writer, false)) std::cout << "Passed." << std::endl; @@ -71,12 +71,12 @@ int main(int, char**) { // Begin of writing test for PRM2 std::cout << "Testing writing for PRM2: "; PRM2 prm21; - // Initilaize the struct with random data - tmp=sizeof(PRM2)/sizeof(int); - ptr=reinterpret_cast( &prm21 ); + // Initialize the struct with random data + tmp=sizeof(PRM2); + ptr=reinterpret_cast( &prm21 ); for(int _i=0; _i> (((sizeof(int)-1)-(sizeof(PRM2) % sizeof(int)))*8)); // yay! :) + // and write it out... if(prm21.write(writer, false)) std::cout << "Passed." << std::endl; @@ -87,12 +87,12 @@ int main(int, char**) { // Begin of writing test for PRM std::cout << "Testing writing for PRM: "; PRM prm1; - // Initilaize the struct with random data - tmp=sizeof(PRM)/sizeof(int); - ptr=reinterpret_cast( &prm1 ); + // Initialize the struct with random data + tmp=sizeof(PRM); + ptr=reinterpret_cast( &prm1 ); for(int _i=0; _i> (((sizeof(int)-1)-(sizeof(PRM) % sizeof(int)))*8)); // yay! :) + // and write it out... if(prm1.write(writer, false)) std::cout << "Passed." << std::endl; @@ -103,12 +103,12 @@ int main(int, char**) { // Begin of writing test for SHD std::cout << "Testing writing for SHD: "; SHD shd1; - // Initilaize the struct with random data - tmp=sizeof(SHD)/sizeof(int); - ptr=reinterpret_cast( &shd1 ); + // Initialize the struct with random data + tmp=sizeof(SHD); + ptr=reinterpret_cast( &shd1 ); for(int _i=0; _i> (((sizeof(int)-1)-(sizeof(SHD) % sizeof(int)))*8)); // yay! :) + // and write it out... if(shd1.write(writer, false)) std::cout << "Passed." << std::endl; @@ -120,12 +120,12 @@ int main(int, char**) { // Begin of writing test for PHE std::cout << "Testing writing for PHE: "; PHE phe1; - // Initilaize the struct with random data - tmp=sizeof(PHE)/sizeof(int); - ptr=reinterpret_cast( &phe1 ); + // Initialize the struct with random data + tmp=sizeof(PHE); + ptr=reinterpret_cast( &phe1 ); for(int _i=0; _i> (((sizeof(int)-1)-(sizeof(PHE) % sizeof(int)))*8)); // yay! :) + // and write it out... if(phe1.write(writer, false)) std::cout << "Passed." << std::endl; @@ -137,12 +137,12 @@ int main(int, char**) { // Begin of writing test for BRC std::cout << "Testing writing for BRC: "; BRC brc1; - // Initilaize the struct with random data - tmp=sizeof(BRC)/sizeof(int); - ptr=reinterpret_cast( &brc1 ); + // Initialize the struct with random data + tmp=sizeof(BRC); + ptr=reinterpret_cast( &brc1 ); for(int _i=0; _i> (((sizeof(int)-1)-(sizeof(BRC) % sizeof(int)))*8)); // yay! :) + // and write it out... if(brc1.write(writer, false)) std::cout << "Passed." << std::endl; @@ -154,12 +154,12 @@ int main(int, char**) { // Begin of writing test for TLP std::cout << "Testing writing for TLP: "; TLP tlp1; - // Initilaize the struct with random data - tmp=sizeof(TLP)/sizeof(int); - ptr=reinterpret_cast( &tlp1 ); + // Initialize the struct with random data + tmp=sizeof(TLP); + ptr=reinterpret_cast( &tlp1 ); for(int _i=0; _i> (((sizeof(int)-1)-(sizeof(TLP) % sizeof(int)))*8)); // yay! :) + // and write it out... if(tlp1.write(writer, false)) std::cout << "Passed." << std::endl; @@ -171,12 +171,12 @@ int main(int, char**) { // Begin of writing test for TC std::cout << "Testing writing for TC: "; TC tc1; - // Initilaize the struct with random data - tmp=sizeof(TC)/sizeof(int); - ptr=reinterpret_cast( &tc1 ); + // Initialize the struct with random data + tmp=sizeof(TC); + ptr=reinterpret_cast( &tc1 ); for(int _i=0; _i> (((sizeof(int)-1)-(sizeof(TC) % sizeof(int)))*8)); // yay! :) + // and write it out... if(tc1.write(writer, false)) std::cout << "Passed." << std::endl; @@ -188,12 +188,12 @@ int main(int, char**) { // Begin of writing test for ANLD std::cout << "Testing writing for ANLD: "; ANLD anld1; - // Initilaize the struct with random data - tmp=sizeof(ANLD)/sizeof(int); - ptr=reinterpret_cast( &anld1 ); + // Initialize the struct with random data + tmp=sizeof(ANLD); + ptr=reinterpret_cast( &anld1 ); for(int _i=0; _i> (((sizeof(int)-1)-(sizeof(ANLD) % sizeof(int)))*8)); // yay! :) + // and write it out... if(anld1.write(writer, false)) std::cout << "Passed." << std::endl; @@ -205,12 +205,12 @@ int main(int, char**) { // Begin of writing test for ANLV std::cout << "Testing writing for ANLV: "; ANLV anlv1; - // Initilaize the struct with random data - tmp=sizeof(ANLV)/sizeof(int); - ptr=reinterpret_cast( &anlv1 ); + // Initialize the struct with random data + tmp=sizeof(ANLV); + ptr=reinterpret_cast( &anlv1 ); for(int _i=0; _i> (((sizeof(int)-1)-(sizeof(ANLV) % sizeof(int)))*8)); // yay! :) + // and write it out... if(anlv1.write(writer, false)) std::cout << "Passed." << std::endl; @@ -222,12 +222,12 @@ int main(int, char**) { // Begin of writing test for ASUMY std::cout << "Testing writing for ASUMY: "; ASUMY asumy1; - // Initilaize the struct with random data - tmp=sizeof(ASUMY)/sizeof(int); - ptr=reinterpret_cast( &asumy1 ); + // Initialize the struct with random data + tmp=sizeof(ASUMY); + ptr=reinterpret_cast( &asumy1 ); for(int _i=0; _i> (((sizeof(int)-1)-(sizeof(ASUMY) % sizeof(int)))*8)); // yay! :) + // and write it out... if(asumy1.write(writer, false)) std::cout << "Passed." << std::endl; @@ -238,12 +238,12 @@ int main(int, char**) { // Begin of writing test for ASUMYI std::cout << "Testing writing for ASUMYI: "; ASUMYI asumyi1; - // Initilaize the struct with random data - tmp=sizeof(ASUMYI)/sizeof(int); - ptr=reinterpret_cast( &asumyi1 ); + // Initialize the struct with random data + tmp=sizeof(ASUMYI); + ptr=reinterpret_cast( &asumyi1 ); for(int _i=0; _i> (((sizeof(int)-1)-(sizeof(ASUMYI) % sizeof(int)))*8)); // yay! :) + // and write it out... if(asumyi1.write(writer, false)) std::cout << "Passed." << std::endl; @@ -254,12 +254,12 @@ int main(int, char**) { // Begin of writing test for ATRD std::cout << "Testing writing for ATRD: "; ATRD atrd1; - // Initilaize the struct with random data - tmp=sizeof(ATRD)/sizeof(int); - ptr=reinterpret_cast( &atrd1 ); + // Initialize the struct with random data + tmp=sizeof(ATRD); + ptr=reinterpret_cast( &atrd1 ); for(int _i=0; _i> (((sizeof(int)-1)-(sizeof(ATRD) % sizeof(int)))*8)); // yay! :) + // and write it out... if(atrd1.write(writer, false)) std::cout << "Passed." << std::endl; @@ -270,12 +270,12 @@ int main(int, char**) { // Begin of writing test for BKD std::cout << "Testing writing for BKD: "; BKD bkd1; - // Initilaize the struct with random data - tmp=sizeof(BKD)/sizeof(int); - ptr=reinterpret_cast( &bkd1 ); + // Initialize the struct with random data + tmp=sizeof(BKD); + ptr=reinterpret_cast( &bkd1 ); for(int _i=0; _i> (((sizeof(int)-1)-(sizeof(BKD) % sizeof(int)))*8)); // yay! :) + // and write it out... if(bkd1.write(writer, false)) std::cout << "Passed." << std::endl; @@ -286,12 +286,12 @@ int main(int, char**) { // Begin of writing test for BKF std::cout << "Testing writing for BKF: "; BKF bkf1; - // Initilaize the struct with random data - tmp=sizeof(BKF)/sizeof(int); - ptr=reinterpret_cast( &bkf1 ); + // Initialize the struct with random data + tmp=sizeof(BKF); + ptr=reinterpret_cast( &bkf1 ); for(int _i=0; _i> (((sizeof(int)-1)-(sizeof(BKF) % sizeof(int)))*8)); // yay! :) + // and write it out... if(bkf1.write(writer, false)) std::cout << "Passed." << std::endl; @@ -302,12 +302,12 @@ int main(int, char**) { // Begin of writing test for BKL std::cout << "Testing writing for BKL: "; BKL bkl1; - // Initilaize the struct with random data - tmp=sizeof(BKL)/sizeof(int); - ptr=reinterpret_cast( &bkl1 ); + // Initialize the struct with random data + tmp=sizeof(BKL); + ptr=reinterpret_cast( &bkl1 ); for(int _i=0; _i> (((sizeof(int)-1)-(sizeof(BKL) % sizeof(int)))*8)); // yay! :) + // and write it out... if(bkl1.write(writer, false)) std::cout << "Passed." << std::endl; @@ -318,12 +318,12 @@ int main(int, char**) { // Begin of writing test for BRC10 std::cout << "Testing writing for BRC10: "; BRC10 brc101; - // Initilaize the struct with random data - tmp=sizeof(BRC10)/sizeof(int); - ptr=reinterpret_cast( &brc101 ); + // Initialize the struct with random data + tmp=sizeof(BRC10); + ptr=reinterpret_cast( &brc101 ); for(int _i=0; _i> (((sizeof(int)-1)-(sizeof(BRC10) % sizeof(int)))*8)); // yay! :) + // and write it out... if(brc101.write(writer, false)) std::cout << "Passed." << std::endl; @@ -334,12 +334,12 @@ int main(int, char**) { // Begin of writing test for BTE std::cout << "Testing writing for BTE: "; BTE bte1; - // Initilaize the struct with random data - tmp=sizeof(BTE)/sizeof(int); - ptr=reinterpret_cast( &bte1 ); + // Initialize the struct with random data + tmp=sizeof(BTE); + ptr=reinterpret_cast( &bte1 ); for(int _i=0; _i> (((sizeof(int)-1)-(sizeof(BTE) % sizeof(int)))*8)); // yay! :) + // and write it out... if(bte1.write(writer, false)) std::cout << "Passed." << std::endl; @@ -350,12 +350,12 @@ int main(int, char**) { // Begin of writing test for CHP std::cout << "Testing writing for CHP: "; CHP chp1; - // Initilaize the struct with random data - tmp=sizeof(CHP)/sizeof(int); - ptr=reinterpret_cast( &chp1 ); + // Initialize the struct with random data + tmp=sizeof(CHP); + ptr=reinterpret_cast( &chp1 ); for(int _i=0; _i> (((sizeof(int)-1)-(sizeof(CHP) % sizeof(int)))*8)); // yay! :) + // and write it out... if(chp1.write(writer, false)) std::cout << "Passed." << std::endl; @@ -367,12 +367,12 @@ int main(int, char**) { // Begin of writing test for DCS std::cout << "Testing writing for DCS: "; DCS dcs1; - // Initilaize the struct with random data - tmp=sizeof(DCS)/sizeof(int); - ptr=reinterpret_cast( &dcs1 ); + // Initialize the struct with random data + tmp=sizeof(DCS); + ptr=reinterpret_cast( &dcs1 ); for(int _i=0; _i> (((sizeof(int)-1)-(sizeof(DCS) % sizeof(int)))*8)); // yay! :) + // and write it out... if(dcs1.write(writer, false)) std::cout << "Passed." << std::endl; @@ -384,12 +384,12 @@ int main(int, char**) { // Begin of writing test for DOGRID std::cout << "Testing writing for DOGRID: "; DOGRID dogrid1; - // Initilaize the struct with random data - tmp=sizeof(DOGRID)/sizeof(int); - ptr=reinterpret_cast( &dogrid1 ); + // Initialize the struct with random data + tmp=sizeof(DOGRID); + ptr=reinterpret_cast( &dogrid1 ); for(int _i=0; _i> (((sizeof(int)-1)-(sizeof(DOGRID) % sizeof(int)))*8)); // yay! :) + // and write it out... if(dogrid1.write(writer, false)) std::cout << "Passed." << std::endl; @@ -400,12 +400,12 @@ int main(int, char**) { // Begin of writing test for DOP std::cout << "Testing writing for DOP: "; DOP dop1; - // Initilaize the struct with random data - tmp=sizeof(DOP)/sizeof(int); - ptr=reinterpret_cast( &dop1 ); + // Initialize the struct with random data + tmp=sizeof(DOP); + ptr=reinterpret_cast( &dop1 ); for(int _i=0; _i> (((sizeof(int)-1)-(sizeof(DOP) % sizeof(int)))*8)); // yay! :) + // and write it out... if(dop1.write(writer, false)) std::cout << "Passed." << std::endl; @@ -416,12 +416,12 @@ int main(int, char**) { // Begin of writing test for FIB std::cout << "Testing writing for FIB: "; FIB fib1; - // Initilaize the struct with random data - tmp=sizeof(FIB)/sizeof(int); - ptr=reinterpret_cast( &fib1 ); + // Initialize the struct with random data + tmp=sizeof(FIB); + ptr=reinterpret_cast( &fib1 ); for(int _i=0; _i> (((sizeof(int)-1)-(sizeof(FIB) % sizeof(int)))*8)); // yay! :) + // and write it out... if(fib1.write(writer, false)) std::cout << "Passed." << std::endl; @@ -432,12 +432,12 @@ int main(int, char**) { // Begin of writing test for FIBFCLCB std::cout << "Testing writing for FIBFCLCB: "; FIBFCLCB fibfclcb1; - // Initilaize the struct with random data - tmp=sizeof(FIBFCLCB)/sizeof(int); - ptr=reinterpret_cast( &fibfclcb1 ); + // Initialize the struct with random data + tmp=sizeof(FIBFCLCB); + ptr=reinterpret_cast( &fibfclcb1 ); for(int _i=0; _i> (((sizeof(int)-1)-(sizeof(FIBFCLCB) % sizeof(int)))*8)); // yay! :) + // and write it out... if(fibfclcb1.write(writer, false)) std::cout << "Passed." << std::endl; @@ -448,12 +448,12 @@ int main(int, char**) { // Begin of writing test for FRD std::cout << "Testing writing for FRD: "; FRD frd1; - // Initilaize the struct with random data - tmp=sizeof(FRD)/sizeof(int); - ptr=reinterpret_cast( &frd1 ); + // Initialize the struct with random data + tmp=sizeof(FRD); + ptr=reinterpret_cast( &frd1 ); for(int _i=0; _i> (((sizeof(int)-1)-(sizeof(FRD) % sizeof(int)))*8)); // yay! :) + // and write it out... if(frd1.write(writer, false)) std::cout << "Passed." << std::endl; @@ -464,12 +464,12 @@ int main(int, char**) { // Begin of writing test for FSPA std::cout << "Testing writing for FSPA: "; FSPA fspa1; - // Initilaize the struct with random data - tmp=sizeof(FSPA)/sizeof(int); - ptr=reinterpret_cast( &fspa1 ); + // Initialize the struct with random data + tmp=sizeof(FSPA); + ptr=reinterpret_cast( &fspa1 ); for(int _i=0; _i> (((sizeof(int)-1)-(sizeof(FSPA) % sizeof(int)))*8)); // yay! :) + // and write it out... if(fspa1.write(writer, false)) std::cout << "Passed." << std::endl; @@ -480,12 +480,12 @@ int main(int, char**) { // Begin of writing test for FTXBXS std::cout << "Testing writing for FTXBXS: "; FTXBXS ftxbxs1; - // Initilaize the struct with random data - tmp=sizeof(FTXBXS)/sizeof(int); - ptr=reinterpret_cast( &ftxbxs1 ); + // Initialize the struct with random data + tmp=sizeof(FTXBXS); + ptr=reinterpret_cast( &ftxbxs1 ); for(int _i=0; _i> (((sizeof(int)-1)-(sizeof(FTXBXS) % sizeof(int)))*8)); // yay! :) + // and write it out... if(ftxbxs1.write(writer, false)) std::cout << "Passed." << std::endl; @@ -496,12 +496,12 @@ int main(int, char**) { // Begin of writing test for LFO std::cout << "Testing writing for LFO: "; LFO lfo1; - // Initilaize the struct with random data - tmp=sizeof(LFO)/sizeof(int); - ptr=reinterpret_cast( &lfo1 ); + // Initialize the struct with random data + tmp=sizeof(LFO); + ptr=reinterpret_cast( &lfo1 ); for(int _i=0; _i> (((sizeof(int)-1)-(sizeof(LFO) % sizeof(int)))*8)); // yay! :) + // and write it out... if(lfo1.write(writer, false)) std::cout << "Passed." << std::endl; @@ -512,12 +512,12 @@ int main(int, char**) { // Begin of writing test for LFOLVL std::cout << "Testing writing for LFOLVL: "; LFOLVL lfolvl1; - // Initilaize the struct with random data - tmp=sizeof(LFOLVL)/sizeof(int); - ptr=reinterpret_cast( &lfolvl1 ); + // Initialize the struct with random data + tmp=sizeof(LFOLVL); + ptr=reinterpret_cast( &lfolvl1 ); for(int _i=0; _i> (((sizeof(int)-1)-(sizeof(LFOLVL) % sizeof(int)))*8)); // yay! :) + // and write it out... if(lfolvl1.write(writer, false)) std::cout << "Passed." << std::endl; @@ -528,12 +528,12 @@ int main(int, char**) { // Begin of writing test for LSPD std::cout << "Testing writing for LSPD: "; LSPD lspd1; - // Initilaize the struct with random data - tmp=sizeof(LSPD)/sizeof(int); - ptr=reinterpret_cast( &lspd1 ); + // Initialize the struct with random data + tmp=sizeof(LSPD); + ptr=reinterpret_cast( &lspd1 ); for(int _i=0; _i> (((sizeof(int)-1)-(sizeof(LSPD) % sizeof(int)))*8)); // yay! :) + // and write it out... if(lspd1.write(writer, false)) std::cout << "Passed." << std::endl; @@ -545,12 +545,12 @@ int main(int, char**) { // Begin of writing test for LSTF std::cout << "Testing writing for LSTF: "; LSTF lstf1; - // Initilaize the struct with random data - tmp=sizeof(LSTF)/sizeof(int); - ptr=reinterpret_cast( &lstf1 ); + // Initialize the struct with random data + tmp=sizeof(LSTF); + ptr=reinterpret_cast( &lstf1 ); for(int _i=0; _i> (((sizeof(int)-1)-(sizeof(LSTF) % sizeof(int)))*8)); // yay! :) + // and write it out... if(lstf1.write(writer, false)) std::cout << "Passed." << std::endl; @@ -561,12 +561,12 @@ int main(int, char**) { // Begin of writing test for LVLF std::cout << "Testing writing for LVLF: "; LVLF lvlf1; - // Initilaize the struct with random data - tmp=sizeof(LVLF)/sizeof(int); - ptr=reinterpret_cast( &lvlf1 ); + // Initialize the struct with random data + tmp=sizeof(LVLF); + ptr=reinterpret_cast( &lvlf1 ); for(int _i=0; _i> (((sizeof(int)-1)-(sizeof(LVLF) % sizeof(int)))*8)); // yay! :) + // and write it out... if(lvlf1.write(writer, false)) std::cout << "Passed." << std::endl; @@ -577,12 +577,12 @@ int main(int, char**) { // Begin of writing test for METAFILEPICT std::cout << "Testing writing for METAFILEPICT: "; METAFILEPICT metafilepict1; - // Initilaize the struct with random data - tmp=sizeof(METAFILEPICT)/sizeof(int); - ptr=reinterpret_cast( &metafilepict1 ); + // Initialize the struct with random data + tmp=sizeof(METAFILEPICT); + ptr=reinterpret_cast( &metafilepict1 ); for(int _i=0; _i> (((sizeof(int)-1)-(sizeof(METAFILEPICT) % sizeof(int)))*8)); // yay! :) + // and write it out... if(metafilepict1.write(writer, false)) std::cout << "Passed." << std::endl; @@ -594,12 +594,12 @@ int main(int, char**) { // Begin of writing test for NUMRM std::cout << "Testing writing for NUMRM: "; NUMRM numrm1; - // Initilaize the struct with random data - tmp=sizeof(NUMRM)/sizeof(int); - ptr=reinterpret_cast( &numrm1 ); + // Initialize the struct with random data + tmp=sizeof(NUMRM); + ptr=reinterpret_cast( &numrm1 ); for(int _i=0; _i> (((sizeof(int)-1)-(sizeof(NUMRM) % sizeof(int)))*8)); // yay! :) + // and write it out... if(numrm1.write(writer, false)) std::cout << "Passed." << std::endl; @@ -611,12 +611,12 @@ int main(int, char**) { // Begin of writing test for OBJHEADER std::cout << "Testing writing for OBJHEADER: "; OBJHEADER objheader1; - // Initilaize the struct with random data - tmp=sizeof(OBJHEADER)/sizeof(int); - ptr=reinterpret_cast( &objheader1 ); + // Initialize the struct with random data + tmp=sizeof(OBJHEADER); + ptr=reinterpret_cast( &objheader1 ); for(int _i=0; _i> (((sizeof(int)-1)-(sizeof(OBJHEADER) % sizeof(int)))*8)); // yay! :) + // and write it out... if(objheader1.write(writer, false)) std::cout << "Passed." << std::endl; @@ -627,12 +627,12 @@ int main(int, char**) { // Begin of writing test for OLST std::cout << "Testing writing for OLST: "; OLST olst1; - // Initilaize the struct with random data - tmp=sizeof(OLST)/sizeof(int); - ptr=reinterpret_cast( &olst1 ); + // Initialize the struct with random data + tmp=sizeof(OLST); + ptr=reinterpret_cast( &olst1 ); for(int _i=0; _i> (((sizeof(int)-1)-(sizeof(OLST) % sizeof(int)))*8)); // yay! :) + // and write it out... if(olst1.write(writer, false)) std::cout << "Passed." << std::endl; @@ -644,12 +644,12 @@ int main(int, char**) { // Begin of writing test for PCD std::cout << "Testing writing for PCD: "; PCD pcd1; - // Initilaize the struct with random data - tmp=sizeof(PCD)/sizeof(int); - ptr=reinterpret_cast( &pcd1 ); + // Initialize the struct with random data + tmp=sizeof(PCD); + ptr=reinterpret_cast( &pcd1 ); for(int _i=0; _i> (((sizeof(int)-1)-(sizeof(PCD) % sizeof(int)))*8)); // yay! :) + // and write it out... if(pcd1.write(writer, false)) std::cout << "Passed." << std::endl; @@ -660,12 +660,12 @@ int main(int, char**) { // Begin of writing test for PGD std::cout << "Testing writing for PGD: "; PGD pgd1; - // Initilaize the struct with random data - tmp=sizeof(PGD)/sizeof(int); - ptr=reinterpret_cast( &pgd1 ); + // Initialize the struct with random data + tmp=sizeof(PGD); + ptr=reinterpret_cast( &pgd1 ); for(int _i=0; _i> (((sizeof(int)-1)-(sizeof(PGD) % sizeof(int)))*8)); // yay! :) + // and write it out... if(pgd1.write(writer, false)) std::cout << "Passed." << std::endl; @@ -676,12 +676,12 @@ int main(int, char**) { // Begin of writing test for PHE2 std::cout << "Testing writing for PHE2: "; PHE2 phe21; - // Initilaize the struct with random data - tmp=sizeof(PHE2)/sizeof(int); - ptr=reinterpret_cast( &phe21 ); + // Initialize the struct with random data + tmp=sizeof(PHE2); + ptr=reinterpret_cast( &phe21 ); for(int _i=0; _i> (((sizeof(int)-1)-(sizeof(PHE2) % sizeof(int)))*8)); // yay! :) + // and write it out... if(phe21.write(writer, false)) std::cout << "Passed." << std::endl; @@ -692,12 +692,12 @@ int main(int, char**) { // Begin of writing test for PICF std::cout << "Testing writing for PICF: "; PICF picf1; - // Initilaize the struct with random data - tmp=sizeof(PICF)/sizeof(int); - ptr=reinterpret_cast( &picf1 ); + // Initialize the struct with random data + tmp=sizeof(PICF); + ptr=reinterpret_cast( &picf1 ); for(int _i=0; _i> (((sizeof(int)-1)-(sizeof(PICF) % sizeof(int)))*8)); // yay! :) + // and write it out... if(picf1.write(writer, false)) std::cout << "Passed." << std::endl; @@ -709,12 +709,12 @@ int main(int, char**) { // Begin of writing test for RR std::cout << "Testing writing for RR: "; RR rr1; - // Initilaize the struct with random data - tmp=sizeof(RR)/sizeof(int); - ptr=reinterpret_cast( &rr1 ); + // Initialize the struct with random data + tmp=sizeof(RR); + ptr=reinterpret_cast( &rr1 ); for(int _i=0; _i> (((sizeof(int)-1)-(sizeof(RR) % sizeof(int)))*8)); // yay! :) + // and write it out... if(rr1.write(writer, false)) std::cout << "Passed." << std::endl; @@ -725,12 +725,12 @@ int main(int, char**) { // Begin of writing test for RS std::cout << "Testing writing for RS: "; RS rs1; - // Initilaize the struct with random data - tmp=sizeof(RS)/sizeof(int); - ptr=reinterpret_cast( &rs1 ); + // Initialize the struct with random data + tmp=sizeof(RS); + ptr=reinterpret_cast( &rs1 ); for(int _i=0; _i> (((sizeof(int)-1)-(sizeof(RS) % sizeof(int)))*8)); // yay! :) + // and write it out... if(rs1.write(writer, false)) std::cout << "Passed." << std::endl; @@ -741,12 +741,12 @@ int main(int, char**) { // Begin of writing test for SED std::cout << "Testing writing for SED: "; SED sed1; - // Initilaize the struct with random data - tmp=sizeof(SED)/sizeof(int); - ptr=reinterpret_cast( &sed1 ); + // Initialize the struct with random data + tmp=sizeof(SED); + ptr=reinterpret_cast( &sed1 ); for(int _i=0; _i> (((sizeof(int)-1)-(sizeof(SED) % sizeof(int)))*8)); // yay! :) + // and write it out... if(sed1.write(writer, false)) std::cout << "Passed." << std::endl; @@ -760,12 +760,12 @@ int main(int, char**) { // Begin of writing test for STSHI std::cout << "Testing writing for STSHI: "; STSHI stshi1; - // Initilaize the struct with random data - tmp=sizeof(STSHI)/sizeof(int); - ptr=reinterpret_cast( &stshi1 ); + // Initialize the struct with random data + tmp=sizeof(STSHI); + ptr=reinterpret_cast( &stshi1 ); for(int _i=0; _i> (((sizeof(int)-1)-(sizeof(STSHI) % sizeof(int)))*8)); // yay! :) + // and write it out... if(stshi1.write(writer, false)) std::cout << "Passed." << std::endl; @@ -776,12 +776,12 @@ int main(int, char**) { // Begin of writing test for WKB std::cout << "Testing writing for WKB: "; WKB wkb1; - // Initilaize the struct with random data - tmp=sizeof(WKB)/sizeof(int); - ptr=reinterpret_cast( &wkb1 ); + // Initialize the struct with random data + tmp=sizeof(WKB); + ptr=reinterpret_cast( &wkb1 ); for(int _i=0; _i> (((sizeof(int)-1)-(sizeof(WKB) % sizeof(int)))*8)); // yay! :) + // and write it out... if(wkb1.write(writer, false)) std::cout << "Passed." << std::endl; debian/patches/fix-handling-empty-associatedstrings.patch0000644000000000000000000000344611665365552021116 0ustar Description: Fix to handle empty associated strings Author: Olly Betts --- Origin: debian Bug-Debian: http://bugs.debian.org/603868 Forwarded: https://sourceforge.net/tracker/?func=detail&aid=3128662&group_id=10501&atid=110501 Last-Update: 2010-11-17 diff -ru wv2-0.4.2.dfsg.1/src/associatedstrings.cpp wv2-0.4.2.dfsg.1-tweaked/src/associatedstrings.cpp --- wv2-0.4.2.dfsg.1/src/associatedstrings.cpp 2009-11-01 04:52:43.000000000 +1030 +++ wv2-0.4.2.dfsg.1-tweaked/src/associatedstrings.cpp 2010-11-17 22:28:50.263808931 +1030 @@ -27,6 +27,10 @@ AssociatedStrings::AssociatedStrings( U32 fcSttbfAssoc, U32 lcbSttbfAssoc, U16 lid, OLEStreamReader* tableStream ) : m_sttbf( 0 ) { + if ( lcbSttbfAssoc == 0 ) { + m_sttbf = new STTBF(); + return; + } tableStream->push(); tableStream->seek( fcSttbfAssoc ); m_sttbf = new STTBF( lid, tableStream ); diff -ru wv2-0.4.2.dfsg.1/src/word_helper.cpp wv2-0.4.2.dfsg.1-tweaked/src/word_helper.cpp --- wv2-0.4.2.dfsg.1/src/word_helper.cpp 2009-11-01 04:52:43.000000000 +1030 +++ wv2-0.4.2.dfsg.1-tweaked/src/word_helper.cpp 2010-11-17 22:27:14.126649654 +1030 @@ -24,6 +24,10 @@ namespace wvWare { + STTBF::STTBF() : m_extraDataLength( 0 ) + { + } + STTBF::STTBF( U16 lid, OLEStreamReader* reader, bool preservePos ) { if ( preservePos ) diff -ru wv2-0.4.2.dfsg.1/src/word_helper.h wv2-0.4.2.dfsg.1-tweaked/src/word_helper.h --- wv2-0.4.2.dfsg.1/src/word_helper.h 2009-11-01 04:52:43.000000000 +1030 +++ wv2-0.4.2.dfsg.1-tweaked/src/word_helper.h 2010-11-17 22:25:41.591053581 +1030 @@ -44,6 +44,7 @@ class STTBF { public: + STTBF(); STTBF( U16 lid, OLEStreamReader* reader, bool preservePos = false ); STTBF( U16 lid, const U8* ptr ); STTBF( const STTBF& rhs ); debian/patches/fix-ftbfs-with-gold.patch0000644000000000000000000000123112143037666015427 0ustar Description: Fix FTBFS with binutils-gold Author: Olly Betts --- Origin: debian Bug-Debian: http://bugs.debian.org/556686 Forwarded: no Last-Update: 2013-05-10 diff -ru wv2-0.4.2.dfsg.1.orig/CMakeLists.txt wv2-0.4.2.dfsg.1/CMakeLists.txt --- wv2-0.4.2.dfsg.1.orig/CMakeLists.txt 2009-11-01 07:22:43.000000000 +1300 +++ wv2-0.4.2.dfsg.1/CMakeLists.txt 2011-11-30 23:49:51.000000000 +1300 @@ -153,6 +153,7 @@ ENDIF( ICONV_FOUND ) IF( GLIB2_FOUND ) + SET( GLIB2_LIBRARIES ${GLIB2_LIBRARIES} gobject-2.0 ) SET( _WV2_LDFLAGS ${_WV2_LDFLAGS} ${GLIB2_LIBRARIES} ) SET( _WV2_CFLAGS ${_WV2_CFLAGS} ${GLIB2_INCLUDE_DIR} ) ENDIF( GLIB2_FOUND ) debian/patches/buffer-overflow.patch0000644000000000000000000000202512016421373014746 0ustar Description: Make sure not to write behind the allocated memory Validate the input data to not write behind the allocated memory. This fixes a buffer overflow found by Charlie Miller. Origin: https://projects.kde.org/projects/calligra/repository/revisions/8652ab672eaaa145dfb3782f5011de58aa4cc046 Author: Thorsten Zachmann Comment: change to original patch: s/endl/std::endl/ Bug-Debian: http://bugs.debian.org/684078 Reviewed-by: gregor herrmann Last-Update: 2012-08-26 --- a/src/styles.cpp +++ b/src/styles.cpp @@ -188,6 +188,11 @@ bool STD::read( U16 baseSize, U16 totalS #ifdef WV2_DEBUG_STYLESHEET wvlog << "cbUPX: " << cbUPX << std::endl; #endif + // do not overflow the allocated buffer grupx + if (offset + cbUPX > grupxLen) { + wvlog << "====> Error: grupx would overflow!" << std::endl; + return false; + } for ( U16 j = 0; j < cbUPX; ++j ) { grupx[ offset + j ] = stream->readU8(); // read the whole UPX #ifdef WV2_DEBUG_STYLESHEET debian/patches/series0000644000000000000000000000033512207516462012040 0ustar fix-ftbfs-with-gold.patch fix-handling-empty-associatedstrings.patch fix-tests.patch avoid-writing-after-structures.patch fix-nan-and-inf-for-mips.patch glib-2.32-compat.patch buffer-overflow.patch support-endnotes.patch debian/patches/support-endnotes.patch0000644000000000000000000000112212207516626015172 0ustar Description: Parse endnotes Author: manikandaprasad.chandrasekar Origin: upstream Forwarded: http://sourceforge.net/p/wvware/svn/45/tree//wv2-trunk/src/parser9x.cpp?diff=51ae0a3b2718464e814d6236:44 Last-Update: 2009-12-17 --- wv2-0.4.2.dfsg.2.orig/src/parser9x.cpp +++ wv2-0.4.2.dfsg.2/src/parser9x.cpp @@ -310,7 +310,7 @@ void Parser9x::init() m_fields = new Fields( m_table, m_fib ); m_drawings = new Drawings( m_table, m_fib ); - if ( m_fib.ccpFtn != 0 ) + if (( m_fib.ccpFtn != 0 ) || ( m_fib.ccpEdn != 0 )) m_footnotes = new Footnotes97( m_table, m_fib ); } debian/copyright0000644000000000000000000000776111665413725011146 0ustar This package was debianized by Ben Burton on Sat, 7 Jun 2003 15:30:53 +1000. It was downloaded from: http://wvware.sourceforge.net Upstream Authors and copyright holders: Copyright: © 2001-2003 Werner Trobin Copyright: © 1998-10-14 Eric Durbin Copyright: © 1999-2000 Harri Porten Copyright: © 2003 KOffice Team Copyright: © 2001 S.R.Haque Copyright: © 1999 Waldo Bastian Copyright: © 2009 Benjamin Cail Copyright: © 2008 Laurent Montel Copyright: © 2009 Pau Garcia i Quiles License (see below for exceptions) 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; 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. You should have received a copy of the GNU Library General Public License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301 USA On Debian systems, the complete text of the GNU Lesser General Public License 2 can be found in the file /usr/share/common-licenses/LGPL-2 Exceptions: src/crc32.{c,h} are under the public domain. src/zcodec.* are under the LGPL2.1, header says: * GNU Lesser General Public License Version 2.1 * ============================================= * Copyright 2005 by Sun Microsystems, Inc. * 901 San Antonio Road, Palo Alto, CA 94303, USA * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License version 2.1, as published by the Free Software Foundation. * * 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. * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, * MA 02110-1301 USA On Debian systems, the complete text of the GNU Lesser General Public License 2.1 can be found in the file /usr/share/common-licenses/LGPL-2-1. cmake/Find{GLIB2,LIBGSF}.cmake are under the BSD license: Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: 1. Redistributions of source code must retain the copyright notice, this list of conditions and the following disclaimer. 2. Redistributions in binary form must reproduce the copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. 3. The name of the author may not be used to endorse or promote products derived from this software without specific prior written permission. THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 THE AUTHOR 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. debian/compat0000644000000000000000000000000211733040726010367 0ustar 9 debian/changelog0000644000000000000000000002351612207517020011043 0ustar wv2 (0.4.2.dfsg.2-2) unstable; urgency=low * Run "make test" directly to avoid differences between when dh_auto_test thinks the testsuite should be run and when we do. (Closes: #718141) * Enable LFS so that we can read files of CIFS shares. * debian/rules: Simplify - dh compat 9 handles passing CPPFLAGS under cmake. * Support parsing end notes (new patch support-endnotes.patch from upstream SVN). -- Olly Betts Thu, 29 Aug 2013 10:38:30 +1200 wv2 (0.4.2.dfsg.2-1) unstable; urgency=low * Repack to remove src/generator/generator_wword{6,8}.htm, which are based on documents from Microsoft. These two files were documented as removed in README.Debian, but actually still present. * Improve wording in README.Debian. * "Standards-Version: 3.9.4": No changes required. -- Olly Betts Thu, 30 May 2013 11:21:57 +0000 wv2 (0.4.2.dfsg.1-10) unstable; urgency=low * Fix to use -I options from libgsf's pkg-config so libxml headers are found. (Closes: #707417) * Honour DEB_BUILD_OPTIONS nocheck in debian/rules. (Closes: #685920) * Fix double "-l" in output from wv2-config --libs. (LP: #1017413) -- Olly Betts Fri, 10 May 2013 12:06:41 +1200 wv2 (0.4.2.dfsg.1-9.1) unstable; urgency=low * Non-maintainer upload. * [SECURITY] Fix "Buffer overflow": add patch buffer-overflow.patch, taken from calligra git. (Closes: #684078) -- gregor herrmann Sun, 26 Aug 2012 15:20:51 +0200 wv2 (0.4.2.dfsg.1-9) unstable; urgency=low * Apply hardening to CFLAGS too (patch from Simon Ruderich in private mail). * Fix compatibility with glib 2.32 (Closes: #665626) -- Olly Betts Sun, 25 Mar 2012 04:04:44 +0000 wv2 (0.4.2.dfsg.1-8) unstable; urgency=low * "Standards-Version: 3.9.3": No changes required. * Ensure hardening LDFLAGS are used by updating to debhelper compat level 9. (Closes: #662009) -- Olly Betts Fri, 23 Mar 2012 09:30:09 +0000 wv2 (0.4.2.dfsg.1-7) unstable; urgency=low * The mips/mipsel issue appears to be due to the wv2 code assuming it knows the bit pattern for NaN and Inf, so revert the change to disable optimisation (which didn't actually work anyway) and add new patch fix-nan-and-inf-for-mips.patch. -- Olly Betts Thu, 05 Jan 2012 05:14:37 +0000 wv2 (0.4.2.dfsg.1-6) unstable; urgency=low * Enabling hardening build flags also turned on optimisation, which results in a bus error in handlertest on mips and mipsel. The backtrace is useless so just disable optimisation again for these two archs. -- Olly Betts Sun, 01 Jan 2012 11:15:19 +0000 wv2 (0.4.2.dfsg.1-5) unstable; urgency=low * Enable hardened build flags. -- Olly Betts Wed, 28 Dec 2011 23:24:21 +0000 wv2 (0.4.2.dfsg.1-4) unstable; urgency=low * Fix avoid-writing-after-structures.patch to actually work. -- Olly Betts Thu, 01 Dec 2011 05:12:36 +0000 wv2 (0.4.2.dfsg.1-3) unstable; urgency=low * New patch avoid-writing-after-structures.patch to fix word95test and word97test not to write after the end of word-aligned structures, fixing FTBFS on sparc. -- Olly Betts Wed, 30 Nov 2011 14:23:07 +0000 wv2 (0.4.2.dfsg.1-2) unstable; urgency=low * New maintainer. -- Olly Betts Wed, 30 Nov 2011 13:01:02 +0000 wv2 (0.4.2.dfsg.1-1.1) unstable; urgency=low * Non-maintainer upload. * Add patch fix-ftbfs-with-gold.patch to fix FTBFS with binutils-gold. (Closes: #556686) * Add patch fix-handling-empty-associatedstrings.patch to fix handling of .doc files with an empty associated strings section. (Closes: #603868) * Build with debugging messages disabled. (Closes: #603871) * Drop leading article from short description. * Actually run the testsuite, don't just build it (needs new patch fix-tests.patch) * "Standards-Version: 3.9.2": + Include the BSD licence in debian/copyright rather than referring to /usr/share/common-licenses/BSD. -- Olly Betts Wed, 30 Nov 2011 12:04:22 +0000 wv2 (0.4.2.dfsg.1-1) unstable; urgency=low * New upstream release. * Switch to 3.0 (quilt) source format. No changes required further adding debian/source/format. -- Ana Beatriz Guerrero Lopez Sat, 14 Nov 2009 00:28:32 +0100 wv2 (0.4.1.dfsg-1) unstable; urgency=low * New upstream release. "Another release, another bump soname". * Update from upstream to build with GCC 4.4. (Closes: #548708) * Bump soname fom libwv2-3 to libwv2-4, make changes accordingly. -- Ana Beatriz Guerrero Lopez Sat, 10 Oct 2009 18:10:30 +0200 wv2 (0.4.0.dfsg-1) unstable; urgency=low * New upstream release. +++ Changes by Pino Toscano: * Bump SONAME. * Switch to dh, and bump debhelper requirements & compatibility to 7. * wv2's build system is cmake now, so build-depend on it. * Add dependency on ${misc:Depends}, given debhelper is used. * Bump Standards-Version to 3.8.3, no changes required. * Remove duplicate section from binary libwv2-3 in control. * Update copyright. -- Debian Qt/KDE Maintainers Fri, 18 Sep 2009 17:59:51 +0200 wv2 (0.3.1.dfsg-1) unstable; urgency=low * Repack tarball and remove unlicesed documentation. Document this in Debian.README. * Update debian/copyright. -- Ana Beatriz Guerrero Lopez Fri, 07 Aug 2009 16:32:59 +0200 wv2 (0.3.1-1) unstable; urgency=low * New upstream release. * Remove patches: - gcc_4.3_fixes, merged upstream. - 05_relibtoolize.dpatch, 50_autogen.dpatch, 10_wv2-config_static.dpatch, obsolete. - remove quilt patching stuff. * Remove deprecated libstdc++-dev, it is being updated in build-essential. * Rename libwv2-1c2 -> libwv2-2. * Update to debhelper 6. * Add Homepage field. * Update debian/copyright. * Update to Standards-Version: 3.8.2, no changes required. * Update uploaders, remove Isaac. -- Ana Beatriz Guerrero Lopez Fri, 07 Aug 2009 00:31:33 +0200 wv2 (0.2.3-2) unstable; urgency=low * Update Standards-Version to 3.7.3. * Update uploaders. * Move patch system to quilt. * Add gcc_4.3_fixes to fix problems with GCC 4.3. This patch adds a missing include and hack away the #warning stuff. (Closes: #441614) * Replace ${source:Version}) with (= ${binary:Version}) to make package binNMUable. -- Ana Beatriz Guerrero Lopez Wed, 26 Dec 2007 08:32:36 +0100 wv2 (0.2.3-1) unstable; urgency=low * New upstream release. +++ Changes by Christopher Martin: * Drop the libwv2.la file from libwv2-dev, at the request of J.H.M. Dassen (Ray). (Closes: #374332) -- Debian Qt/KDE Maintainers Sun, 18 Jun 2006 15:28:58 -0400 wv2 (0.2.2-6) unstable; urgency=medium +++ Changes by Christopher Martin: * Add a patch which fixes CVE-2006-2197, missing boundary checks which could allow the execution of arbitrary code. Urgency medium. * Revamp patch system; should make further updates easier. * Set Uploaders to the standard Qt/KDE team list. +++ Changes by Pierre Habouzit: * Add -DNDEBUG in the CFLAGS (no more horribly verbose debug output on stderr; see wvlog.h). (Closes: #329109) -- Debian Qt/KDE Maintainers Sat, 17 Jun 2006 19:00:35 -0400 wv2 (0.2.2-5) unstable; urgency=low * wv2-config: introduce a "--static" option to provide options suitable for static linking and have "--libs" output just "-lwv2", closes: #342889 * Update libtool (required to fix FTBFS in GNU/k*BSD), closes: #311988 -- Isaac Clerencia Mon, 12 Dec 2005 08:36:00 +0100 wv2 (0.2.2-4) unstable; urgency=low +++ Changes by Isaac Clerencia: * Rebuild against new libgsf-1-dev, making libwv2-1c2 installable in sid again, closes: #338712 -- Debian Qt/KDE Maintainers Sat, 12 Nov 2005 11:27:27 +0100 wv2 (0.2.2-3) unstable; urgency=low * Changed maintainer to the Debian Qt/KDE group (in coordination with koffice, which has also changed maintainer to the Debian Qt/KDE group). -- Ben Burton Sun, 16 Oct 2005 02:07:54 +1000 wv2 (0.2.2-2) unstable; urgency=low * C++ ABI transition (g++-3.3 -> g++-4.0). * Library package renamed from libwv2-1 to libwv2-1c2. * Build-depends on c++abi2-dev, since the binaries do not depend on libstdc++. * Made libwv2-dev depend on libstdc++-dev since it imports libstdc++ headers. * Removed -pedantic from compilation flags to avoid HUGE_VAL error (#319553). * Bumped standards-version to 3.6.2.1 (no changes required). -- Ben Burton Sat, 23 Jul 2005 10:20:38 +1000 wv2 (0.2.2-1) unstable; urgency=low * New upstream bugfix release. * Builds under gcc 3.4 (closes: #274051). -- Ben Burton Thu, 14 Oct 2004 19:08:15 +1000 wv2 (0.2.1-2) unstable; urgency=low * Build-depends on zlib1g-dev, which no longer seems to be provided by libxml2-dev (closes: #242971). -- Ben Burton Sun, 11 Apr 2004 07:36:57 +1000 wv2 (0.2.1-1) unstable; urgency=low * New upstream release. -- Ben Burton Sun, 7 Dec 2003 20:37:52 +1100 wv2 (0.1.9-1) unstable; urgency=low * New upstream release. * Bumped standards-version to 3.6.1. -- Ben Burton Mon, 29 Sep 2003 10:57:45 +1000 wv2 (0.1.8-1) unstable; urgency=low * New upstream release. * Bumped standards-version to 3.6.0. -- Ben Burton Fri, 8 Aug 2003 08:58:07 +1000 wv2 (0.0.9-1) unstable; urgency=low * Initial Release (closes: #196455). * Patched olestorage.cpp for type correctness with newer versions of libgfs-1. * Using AM_MAINTAINER_MODE. * Updated config.{sub,guess}. -- Ben Burton Sat, 7 Jun 2003 15:30:53 +1000 debian/libwv2-4.shlibs0000644000000000000000000000002211277364274011751 0ustar libwv2 4 libwv2-4