Package: atool Version: 0.39.0-2 Severity: wishlist Dear Maintainer,
it would be nice if atool would provide a word-based diff tool named e.g. awdiff and based upon either wdiff or dwdiff. Example case with a (renamed, see #748617) LibreOffice Writer (.odt) file: $ adiff /tmp/foo.zip /tmp/bla.zip | cut -c-75 diff -ru Unpack-5671/content.xml Unpack-0120/content.xml --- Unpack-5671/content.xml 2014-05-18 21:26:22.000000000 +0200 +++ Unpack-0120/content.xml 2014-05-18 21:25:52.000000000 +0200 @@ -1,2 +1,2 @@ <?xml version="1.0" encoding="UTF-8"?> -<office:document-content xmlns:office="urn:oasis:names:tc:opendocument:xml \ No newline at end of file +<office:document-content xmlns:office="urn:oasis:names:tc:opendocument:xml \ No newline at end of file diff -ru Unpack-5671/meta.xml Unpack-0120/meta.xml --- Unpack-5671/meta.xml 2014-05-18 21:26:22.000000000 +0200 +++ Unpack-0120/meta.xml 2014-05-18 21:25:52.000000000 +0200 @@ -1,2 +1,2 @@ <?xml version="1.0" encoding="UTF-8"?> -<office:document-meta xmlns:office="urn:oasis:names:tc:opendocument:xmlns: \ No newline at end of file +<office:document-meta xmlns:office="urn:oasis:names:tc:opendocument:xmlns: \ No newline at end of file diff -ru Unpack-5671/settings.xml Unpack-0120/settings.xml --- Unpack-5671/settings.xml 2014-05-18 21:26:22.000000000 +0200 +++ Unpack-0120/settings.xml 2014-05-18 21:25:52.000000000 +0200 @@ -1,2 +1,2 @@ <?xml version="1.0" encoding="UTF-8"?> -<office:document-settings xmlns:office="urn:oasis:names:tc:opendocument:xm \ No newline at end of file +<office:document-settings xmlns:office="urn:oasis:names:tc:opendocument:xm \ No newline at end of file Binary files Unpack-5671/Thumbnails/thumbnail.png and Unpack-0120/Thumbnail $ There is not much difference in e.g. content.xml as wdiff shows (pipe the following through colordiff to easily see the difference): $ wdiff bla/content.xml foo/content.xml | colordiff <?xml version="1.0" encoding="UTF-8"?> <office:document-content xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:xlink="http://www.w3.org/1999/xlink"; xmlns:dc="http://purl.org/dc/elements/1.1/"; xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" xmlns:math="http://www.w3.org/1998/Math/MathML"; xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" xmlns:ooo="http://openoffice.org/2004/office"; xmlns:ooow="http://openoffice.org/2004/writer"; xmlns:oooc="http://openoffice.org/2004/calc"; xmlns:dom="http://www.w3.org/2001/xml-events"; xmlns:xforms="http://www.w3.org/2002/xforms"; xmlns:xsd="http://www.w3.org/2001/XMLSchema"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xmlns:rpt="http://openoffice.org/2005/report"; xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" xmlns:xhtml="http://www.w3.org/1999/xhtml"; xmlns:grddl="http://www.w3.org/2003/g/data-view#"; xmlns:officeooo="http://openoffice.org/2009/office"; xmlns:tableooo="http://openoffice.org/2009/table"; xmlns:drawooo="http://openoffice.org/2010/draw"; xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0" xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0" xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" xmlns:formx="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0" xmlns:css3t="http://www.w3.org/TR/css3-text/"; office:version="1.2"><office:scripts/><office:font-face-decls><style:font-face style:name="FreeSans1" svg:font-family="FreeSans" style:font-family-generic="swiss"/><style:font-face style:name="M+ 1c black" svg:font-family="'M+ 1c black'" style:font-pitch="variable"/><style:font-face style:name="Vollkorn Semibold" svg:font-family="'Vollkorn Semibold'" style:font-pitch="variable"/><style:font-face style:name="[F500]" svg:font-family="[F500]" style:font-pitch="variable"/><style:font-face style:name="Liberation Serif" svg:font-family="'Liberation Serif'" style:font-family-generic="roman" style:font-pitch="variable"/><style:font-face style:name="Liberation Sans" svg:font-family="'Liberation Sans'" style:font-family-generic="swiss" style:font-pitch="variable"/><style:font-face style:name="FreeSans" svg:font-family="FreeSans" style:font-family-generic="system" style:font-pitch="variable"/><style:font-face style:name="WenQuanYi Zen Hei" svg:font-family="'WenQuanYi Zen Hei'" style:font-family-generic="system" style:font-pitch="variable"/></office:font-face-decls><office:automatic-styles><style:style style:name="P1" style:family="paragraph" style:parent-style-name="Standard"><style:text-properties style:font-name="M+ 1c black" fo:font-size="72pt" officeooo:rsid="0004b0e2" officeooo:paragraph-rsid="0004b0e2" style:font-size-asian="72pt" style:font-size-complex="72pt"/></style:style><style:style style:name="T1" style:family="text"><style:text-properties style:font-name="[F500]"/></style:style><style:style style:name="T2" style:family="text"><style:text-properties style:font-name="Vollkorn [-Semibold"/></style:style></office:automatic-styles><office:body><office:text><text:sequence-decls><text:sequence-decl-] {+Semibold"/></style:style><style:style style:name="T3" style:family="text"><style:text-properties officeooo:rsid="0006385a"/></style:style></office:automatic-styles><office:body><office:text><text:sequence-decls><text:sequence-decl+} text:display-outline-level="0" text:name="Illustration"/><text:sequence-decl text:display-outline-level="0" text:name="Table"/><text:sequence-decl text:display-outline-level="0" text:name="Text"/><text:sequence-decl text:display-outline-level="0" text:name="Drawing"/></text:sequence-decls><text:p [-text:style-name="P1">Bla-] {+text:style-name="P1"><text:span text:style-name="T3">Foo</text:span>+} <text:span text:style-name="T1">F500 </text:span><text:span text:style-name="T2">Vollkorn</text:span></text:p></office:text></office:body></office:document-content> -- System Information: Debian Release: jessie/sid APT prefers unstable APT policy: (990, 'unstable'), (600, 'testing'), (110, 'experimental') Architecture: amd64 (x86_64) Kernel: Linux 3.14-1-amd64 (SMP w/4 CPU cores) Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash Versions of packages atool depends on: ii perl 5.18.2-4 Versions of packages atool recommends: ii bash-completion 1:2.1-4 ii binutils 2.24.51.20140425-1 ii bzip2 1.0.6-5 ii file 1:5.18-1 ii lbzip2 2.5-1 ii pbzip2 1.1.8-1 ii unzip 6.0-12 ii zip 3.0-8 Versions of packages atool suggests: ii arc 5.21q-1 ii arj 3.10.22-11 ii cpio 2.11+dfsg-2 ii lzip 1.16~pre1-2 ii lzop 1.03-3 ii nomarch 1.4-3 pn p7zip <none> ii rar 2:4.2.0-1 ii rpm 4.11.2-3 ii unace 1.2b-11 ii unalz 0.65-4 ii unrar 1:5.0.10-1 ii xz-utils [lzma] 5.1.1alpha+20120614-2 -- no debconf information -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
