diff -Nru xxdiff-4.0+hg453+dfsg/bin/.cvsignore xxdiff-4.0.1+dfsg/bin/.cvsignore --- xxdiff-4.0+hg453+dfsg/bin/.cvsignore 1970-01-01 00:00:00.000000000 +0000 +++ xxdiff-4.0.1+dfsg/bin/.cvsignore 2016-05-15 22:55:57.000000000 +0000 @@ -0,0 +1 @@ +xxdiff diff -Nru xxdiff-4.0+hg453+dfsg/bin/xx-hg-merge xxdiff-4.0.1+dfsg/bin/xx-hg-merge --- xxdiff-4.0+hg453+dfsg/bin/xx-hg-merge 2014-07-21 20:37:25.000000000 +0000 +++ xxdiff-4.0.1+dfsg/bin/xx-hg-merge 2016-05-15 22:55:57.000000000 +0000 @@ -4,23 +4,10 @@ Basically, it needs to exit with 0 on success, and to place the results of the merge in the 'left' file. -Note [2013-08-04]: this script is probably not necessary anymore. -You can use the following Mercurial configuration instead: - - [merge-tools] - xx-encrypted = - xx-encrypted.priority = 100 - xx-encrypted.premerge = False - xx-encrypted.args = $local $base $other -o $output - xxdiff = - xxdiff.priority = 100 - xxdiff.premerge = False - xxdiff.args = --decision $local $base $other -M $output +Use it like this: [merge-patterns] - **.asc = xx-encrypted - **.gpg = xx-encrypted - ** = xxdiff + ** = xx-hg-merge """ @@ -55,7 +42,7 @@ # Invoke xxdiff. mergedf = None - if not re.match('.*\\.asc$', fl): + if not re.match('.*\\.(asc|gpg)$', fl): decision, mergedf, __retcode = invoke.xxdiff_decision( opts, '--title1=Current', diff -Nru xxdiff-4.0+hg453+dfsg/CHANGES xxdiff-4.0.1+dfsg/CHANGES --- xxdiff-4.0+hg453+dfsg/CHANGES 2015-12-21 18:39:46.000000000 +0000 +++ xxdiff-4.0.1+dfsg/CHANGES 2016-05-15 22:55:57.000000000 +0000 @@ -5,6 +5,12 @@ Current Development Version --------------------------- +Version 4.0.1: Port to Qt4 by Alexandre Feblot +---------------------------------------------- + +Just an update of the tarball with various bug fixes over 3 years. + + Version 4.0b1: Port to Qt4 by Alexandre Feblot ---------------------------------------------- diff -Nru xxdiff-4.0+hg453+dfsg/.cvsignore xxdiff-4.0.1+dfsg/.cvsignore --- xxdiff-4.0+hg453+dfsg/.cvsignore 1970-01-01 00:00:00.000000000 +0000 +++ xxdiff-4.0.1+dfsg/.cvsignore 2016-05-15 22:55:57.000000000 +0000 @@ -0,0 +1,11 @@ +Makefile +Makefile.in +config.* +configure +aclocal.m4 +ltmain.sh +ltconfig +libtool +config.sub +config.guess +xxdiff-*.tar.gz diff -Nru xxdiff-4.0+hg453+dfsg/debian/changelog xxdiff-4.0.1+dfsg/debian/changelog --- xxdiff-4.0+hg453+dfsg/debian/changelog 2015-12-26 12:46:45.000000000 +0000 +++ xxdiff-4.0.1+dfsg/debian/changelog 2016-08-30 20:21:36.000000000 +0000 @@ -1,3 +1,16 @@ +xxdiff (1:4.0.1+dfsg-1) unstable; urgency=medium + + * Fix gnupg package name - thanks Axel (closes: #825660) + * Let uscan repack the upstream tarball using Files-Excluded + * Import Upstream version 4.0.1+dfsg + * Drop patches applied upstream + * Bump packaging copyright years + * Declare compliance with Debian Policy 3.9.8 + * Use secure URIs where possible + * Add 14_spelling.patch + + -- Florian Schlichting Tue, 30 Aug 2016 22:21:36 +0200 + xxdiff (1:4.0+hg453+dfsg-2) unstable; urgency=medium * Let xxdiff-scripts recommend gpg and patch (closes: LP:515558) diff -Nru xxdiff-4.0+hg453+dfsg/debian/control xxdiff-4.0.1+dfsg/debian/control --- xxdiff-4.0+hg453+dfsg/debian/control 2015-12-21 23:34:57.000000000 +0000 +++ xxdiff-4.0.1+dfsg/debian/control 2016-08-30 20:21:36.000000000 +0000 @@ -10,10 +10,10 @@ Section: text Priority: optional Maintainer: Florian Schlichting -Standards-Version: 3.9.6 +Standards-Version: 3.9.8 Homepage: http://furius.ca/xxdiff/ -Vcs-Git: git://anonscm.debian.org/collab-maint/xxdiff.git -Vcs-Browser: http://anonscm.debian.org/gitweb/?p=collab-maint/xxdiff.git +Vcs-Git: https://anonscm.debian.org/git/collab-maint/xxdiff.git +Vcs-Browser: https://anonscm.debian.org/cgit/collab-maint/xxdiff.git Package: xxdiff Architecture: any @@ -38,7 +38,7 @@ Package: xxdiff-scripts Architecture: all Depends: ${misc:Depends}, ${python:Depends}, xxdiff -Recommends: gpg, patch +Recommends: gnupg, patch XB-Python-Version: ${python:Versions} Description: graphical file/directory comparison and merge tool - scripts xxdiff is a powerful tool for viewing the differences between two or three @@ -53,7 +53,7 @@ For example, there are scripts to perform global renaming of strings within a large codebase, where each transformed file is viewed by the user with an xxdiff, accepted, rejected or merged changes written over the original file - (file backups are supported). Also, this infrastructure is mostly provided as + (making backups is supported). Also, this infrastructure is mostly provided as modules, in order to allow users to write file transformations in Python and to leverage this interactive confirmation process. . diff -Nru xxdiff-4.0+hg453+dfsg/debian/copyright xxdiff-4.0.1+dfsg/debian/copyright --- xxdiff-4.0+hg453+dfsg/debian/copyright 2014-07-21 21:47:19.000000000 +0000 +++ xxdiff-4.0.1+dfsg/debian/copyright 2016-08-30 20:18:57.000000000 +0000 @@ -1,6 +1,7 @@ -Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: xxdiff Source: http://furius.ca/xxdiff/ +Files-Excluded: doc/screenshots Comment: The upstream hg source contains a screenshots gallery intended for the author's web site, based on a non-free JavaScript library. The doc/screenshots directory was removed to create the +dfsg source. @@ -32,7 +33,7 @@ Files: debian/* Copyright: 2001-2007, Tomas Pospisek 2007-2008, Y Giridhar Appaji Nag - 2014, Florian Schlichting + 2014-2016, Florian Schlichting License: GPL-2+ License: GPL-2+ diff -Nru xxdiff-4.0+hg453+dfsg/debian/patches/01_script_not_executable.patch xxdiff-4.0.1+dfsg/debian/patches/01_script_not_executable.patch --- xxdiff-4.0+hg453+dfsg/debian/patches/01_script_not_executable.patch 2014-07-21 21:10:21.000000000 +0000 +++ xxdiff-4.0.1+dfsg/debian/patches/01_script_not_executable.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,12 +0,0 @@ -Description: Remove hashbang lines for non executable scripts - This prevents lintian W: script-not-executable -Author: Y Giridhar Appaji Nag - ---- a/etc/bashrc -+++ b/etc/bashrc -@@ -1,5 +1,3 @@ --#!/bin/sh --# - # $Id: bashrc 760 2004-02-09 18:51:12Z blais $ - # $Source$ - # diff -Nru xxdiff-4.0+hg453+dfsg/debian/patches/02_doc_furius.ca_href.patch xxdiff-4.0.1+dfsg/debian/patches/02_doc_furius.ca_href.patch --- xxdiff-4.0+hg453+dfsg/debian/patches/02_doc_furius.ca_href.patch 2014-07-21 21:10:21.000000000 +0000 +++ xxdiff-4.0.1+dfsg/debian/patches/02_doc_furius.ca_href.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,42 +0,0 @@ -Description: Change relative URLs in HTML documentation to http://furius.ca/ -Author: Y Giridhar Appaji Nag - ---- a/doc/xxdiff-integration.html -+++ b/doc/xxdiff-integration.html -@@ -12,8 +12,8 @@ - - -
-- -- -+ -+ -
- -
---- a/doc/xxdiff-scripts.html -+++ b/doc/xxdiff-scripts.html -@@ -12,8 +12,8 @@ - - -
-- -- -+ -+ -
- -
---- a/doc/xxdiff-secrets.html -+++ b/doc/xxdiff-secrets.html -@@ -11,8 +11,8 @@ - - -
-- -- -+ -+ -
- -
diff -Nru xxdiff-4.0+hg453+dfsg/debian/patches/03_cvsrevcomp_cmp_typo.patch xxdiff-4.0.1+dfsg/debian/patches/03_cvsrevcomp_cmp_typo.patch --- xxdiff-4.0+hg453+dfsg/debian/patches/03_cvsrevcomp_cmp_typo.patch 2014-07-21 21:10:21.000000000 +0000 +++ xxdiff-4.0.1+dfsg/debian/patches/03_cvsrevcomp_cmp_typo.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,47 +0,0 @@ -Description: Correct typos -Author: Y Giridhar Appaji Nag - ---- a/doc/xxdiff-doc.html -+++ b/doc/xxdiff-doc.html -@@ -1960,7 +1960,7 @@ - MergedFilename: "%L.merge" - -
--Default merged filename. %L, %M, %R can be used as placeholders for left, middle and right filenames repectively. Note that ClearCase suffixes are stripped automatically. -+Default merged filename. %L, %M, %R can be used as placeholders for left, middle and right filenames respectively. Note that ClearCase suffixes are stripped automatically. -
- -
---- a/src/doc.html -+++ b/src/doc.html -@@ -823,7 +823,7 @@ -
-
-

16   Reporting bugs

--

All bug reports and feature requests should be submitted throught the -+

All bug reports and feature requests should be submitted through the - SourceForge bug tracking system at the following URL - http://sourceforge.net/bugs/?group_id=2198. Please avoid sending the author - email about xxdiff bugs. Please use this bug tracking system, it is extremely ---- a/src/doc.txt -+++ b/src/doc.txt -@@ -979,7 +979,7 @@ - ============== - - --All bug reports and feature requests should be submitted throught the -+All bug reports and feature requests should be submitted through the - SourceForge bug tracking system at the following URL - http://sourceforge.net/bugs/?group_id=2198. Please avoid sending the author - email about xxdiff bugs. Please use this bug tracking system, it is extremely ---- a/src/resParser.cpp -+++ b/src/resParser.cpp -@@ -213,7 +213,7 @@ - - { "MergedFilename", MERGED_FILENAME, - "Default merged filename. %L, %M, %R can be used as placeholders for \ --left, middle and right filenames repectively. Note that ClearCase suffixes \ -+left, middle and right filenames respectively. Note that ClearCase suffixes \ - are stripped automatically." }, - - }; diff -Nru xxdiff-4.0+hg453+dfsg/debian/patches/04_build_setup_paths.patch xxdiff-4.0.1+dfsg/debian/patches/04_build_setup_paths.patch --- xxdiff-4.0+hg453+dfsg/debian/patches/04_build_setup_paths.patch 2015-12-21 19:11:10.000000000 +0000 +++ xxdiff-4.0.1+dfsg/debian/patches/04_build_setup_paths.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,26 +0,0 @@ -Description: qmake is in /usr/bin in Debian not in /usr/qt/3/bin. Add db to - xxdiff python packages alongside scripts and scm. -Author: Y Giridhar Appaji Nag - ---- a/setup.py -+++ b/setup.py -@@ -69,6 +69,7 @@ - package_dir = {'': 'lib/python'}, - packages = ['xxdiff', - join('xxdiff', 'scripts'), -- join('xxdiff', 'scm')], -+ join('xxdiff', 'scm'), -+ join('xxdiff', 'db')], - scripts = allscripts - ) ---- a/src/Makefile.extra -+++ b/src/Makefile.extra -@@ -61,7 +61,7 @@ - - - # Override the qmake we use because the one in the path might be different. --QMAKE = $(QTDIR)/bin/qmake -+QMAKE = qmake - - - # Note: we would need to add this to be correct. Danger! If the Makefile gets diff -Nru xxdiff-4.0+hg453+dfsg/debian/patches/05_417780_gcc4.3_ftbfs.patch xxdiff-4.0.1+dfsg/debian/patches/05_417780_gcc4.3_ftbfs.patch --- xxdiff-4.0+hg453+dfsg/debian/patches/05_417780_gcc4.3_ftbfs.patch 2014-07-21 21:10:21.000000000 +0000 +++ xxdiff-4.0.1+dfsg/debian/patches/05_417780_gcc4.3_ftbfs.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,15 +0,0 @@ -Description: include to prevent FTBFS with GCC 4.3 - based on patch from Martin Michlmayr -Author: Y Giridhar Appaji Nag - ---- a/src/resources.inline.h -+++ b/src/resources.inline.h -@@ -20,6 +20,8 @@ - * - ******************************************************************************/ - -+#include -+ - /*============================================================================== - * EXTERNAL DECLARATIONS - *============================================================================*/ diff -Nru xxdiff-4.0+hg453+dfsg/debian/patches/08_516143_xml_is_text.patch xxdiff-4.0.1+dfsg/debian/patches/08_516143_xml_is_text.patch --- xxdiff-4.0+hg453+dfsg/debian/patches/08_516143_xml_is_text.patch 2014-07-21 21:10:21.000000000 +0000 +++ xxdiff-4.0.1+dfsg/debian/patches/08_516143_xml_is_text.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,24 +0,0 @@ -Description: Don't classify XML files as non-text - thanks "J.P. Delport" for the bug - report #516143 and the patch. -Author: Y Giridhar Appaji Nag - ---- a/lib/python/xxdiff/utils.py -+++ b/lib/python/xxdiff/utils.py -@@ -52,6 +52,7 @@ - # options were taken from Ian F. Darwin's file implementation. - guesscmd = ['file', '-b', '-L'] - text_re = re.compile('\\btext\\b') -+xml_re = re.compile('\\bXML\\b') - empty_re = re.compile('^empty$') - - def istextfile(fn): -@@ -68,7 +69,7 @@ - if p.returncode != 0 or stderr or stdout.startswith('cannot open'): - raise RuntimeError("Error: running 'file' on '%s'." % fn) - -- return bool(text_re.search(stdout) or empty_re.match(stdout)) -+ return bool(text_re.search(stdout) or xml_re.search(stdout) or empty_re.match(stdout)) - - - def makedirs(dirn, error_on_exist=True): diff -Nru xxdiff-4.0+hg453+dfsg/debian/patches/10_fix-privacy-breach.patch xxdiff-4.0.1+dfsg/debian/patches/10_fix-privacy-breach.patch --- xxdiff-4.0+hg453+dfsg/debian/patches/10_fix-privacy-breach.patch 2014-07-21 21:10:21.000000000 +0000 +++ xxdiff-4.0.1+dfsg/debian/patches/10_fix-privacy-breach.patch 2016-08-30 20:15:26.000000000 +0000 @@ -1,5 +1,6 @@ Description: Do not load a logo from an external website when viewing local docs Author: Florian Schlichting +Forwarded: not-needed --- a/doc/xxdiff-integration.html +++ b/doc/xxdiff-integration.html @@ -28,6 +29,6 @@

diff -Nru xxdiff-4.0+hg453+dfsg/debian/patches/11_spelling.patch xxdiff-4.0.1+dfsg/debian/patches/11_spelling.patch --- xxdiff-4.0+hg453+dfsg/debian/patches/11_spelling.patch 2015-12-21 19:24:41.000000000 +0000 +++ xxdiff-4.0.1+dfsg/debian/patches/11_spelling.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,112 +0,0 @@ -Description: fix typos found by lintian -Author: Florian Schlichting - ---- a/doc/xxdiff-doc.html -+++ b/doc/xxdiff-doc.html -@@ -1016,7 +1016,7 @@ -

This view will scroll to match the main display. Unselected regions are shown - in this view with oblique lines ("in construction" style), and merge decisions - are slightly highlighted as well. This output allows you to review the merge --decisions before commiting the file to output.

-+decisions before committing the file to output.

-
- -
-@@ -1137,7 +1137,7 @@ -

Much of the state of xxdiff can be customized through a resource file (actually, - some of the features can only be changed through resource customization). - By default, xxdiff looks for the file .xxdiffrc located in the user's --home directory (this file location can be overriden by setting the environment -+home directory (this file location can be overridden by setting the environment - variable XXDIFFRC), and reads that file for resource definition.

-

The format of the resource file is a fairly simple list of colon-separated - resource name/value pairs, one per line:

-@@ -1148,7 +1148,7 @@ -

Some resources may require string delimiters (double-quotes) around their value - specification, but not all (see below).

-

You can also specify additional resources on the command-line, which take --precendence over the resources specified in the resource file. To get a -+precedence over the resources specified in the resource file. To get a - complete list of the available resources, use the --list-resources - command-line option (see Options section).

-

Trick: you can use different resources files by invoking xxdiff like this in ---- a/src/doc.html -+++ b/src/doc.html -@@ -647,7 +647,7 @@ -

This view will scroll to match the main display. Unselected regions are shown - in this view with oblique lines ("in construction" style), and merge decisions - are slightly highlighted as well. This output allows you to review the merge --decisions before commiting the file to output.

-+decisions before committing the file to output.

-
- -
-@@ -768,7 +768,7 @@ -

Much of the state of xxdiff can be customized through a resource file (actually, - some of the features can only be changed through resource customization). - By default, xxdiff looks for the file .xxdiffrc located in the user's --home directory (this file location can be overriden by setting the environment -+home directory (this file location can be overridden by setting the environment - variable XXDIFFRC), and reads that file for resource definition.

-

The format of the resource file is a fairly simple list of colon-separated - resource name/value pairs, one per line:

-@@ -779,7 +779,7 @@ -

Some resources may require string delimiters (double-quotes) around their value - specification, but not all (see below).

-

You can also specify additional resources on the command-line, which take --precendence over the resources specified in the resource file. To get a -+precedence over the resources specified in the resource file. To get a - complete list of the available resources, use the --list-resources - command-line option (see Options section).

-

Trick: you can use different resources files by invoking xxdiff like this in ---- a/src/doc.txt -+++ b/src/doc.txt -@@ -726,7 +726,7 @@ - This view will scroll to match the main display. Unselected regions are shown - in this view with oblique lines ("in construction" style), and merge decisions - are slightly highlighted as well. This output allows you to review the merge --decisions before commiting the file to output. -+decisions before committing the file to output. - - - -@@ -892,7 +892,7 @@ - Much of the state of xxdiff can be customized through a resource file (actually, - some of the features can only be changed through resource customization). - By default, xxdiff looks for the file ``.xxdiffrc`` located in the user's --home directory (this file location can be overriden by setting the environment -+home directory (this file location can be overridden by setting the environment - variable XXDIFFRC), and reads that file for resource definition. - - -@@ -912,7 +912,7 @@ - - - You can also specify additional resources on the command-line, which take --precendence over the resources specified in the resource file. To get a -+precedence over the resources specified in the resource file. To get a - complete list of the available resources, use the ``--list-resources`` - command-line option (see Options section). - ---- a/doc/xxdiff-scripts.html -+++ b/doc/xxdiff-scripts.html -@@ -30,7 +30,7 @@ -

-

Abstract

-

A description of the Python scripts and infrastructure that is provided around --xxdiff, to faciliate implementing processes requiring display and selection -+xxdiff, to facilitate implementing processes requiring display and selection - of differences.

-
-
---- a/doc/xxdiff-scripts.txt -+++ b/doc/xxdiff-scripts.txt -@@ -7,7 +7,7 @@ - :Abstract: - - A description of the Python scripts and infrastructure that is provided around -- xxdiff, to faciliate implementing processes requiring display and selection -+ xxdiff, to facilitate implementing processes requiring display and selection - of differences. - - .. section-numbering:: diff -Nru xxdiff-4.0+hg453+dfsg/debian/patches/12_hardening.patch xxdiff-4.0.1+dfsg/debian/patches/12_hardening.patch --- xxdiff-4.0+hg453+dfsg/debian/patches/12_hardening.patch 2014-07-21 21:10:21.000000000 +0000 +++ xxdiff-4.0.1+dfsg/debian/patches/12_hardening.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,17 +0,0 @@ -Description: Enable passing of hardening flags -Author: Florian Schlichting - ---- a/src/xxdiff.pro -+++ b/src/xxdiff.pro -@@ -49,6 +49,11 @@ - debug:QMAKE_CFLAGS += -DXX_DEBUG - debug:QMAKE_CXXFLAGS += -DXX_DEBUG - -+# Support Debian hardening flags -+QMAKE_CXXFLAGS += $$(CPPFLAGS) $$(CXXFLAGS) -+QMAKE_CFLAGS += $$(CPPFLAGS) $$(CFLAGS) -+QMAKE_LFLAGS += $$(LDFLAGS) -+ - - # - # Parser/grammar generation. diff -Nru xxdiff-4.0+hg453+dfsg/debian/patches/14_spelling.patch xxdiff-4.0.1+dfsg/debian/patches/14_spelling.patch --- xxdiff-4.0+hg453+dfsg/debian/patches/14_spelling.patch 1970-01-01 00:00:00.000000000 +0000 +++ xxdiff-4.0.1+dfsg/debian/patches/14_spelling.patch 2016-08-30 20:21:36.000000000 +0000 @@ -0,0 +1,69 @@ +Description: fix typos found by lintian +Author: Florian Schlichting + +diff --git a/doc/xxdiff-doc.html b/doc/xxdiff-doc.html +index 1e9af9a..9a04fc4 100644 +--- a/doc/xxdiff-doc.html ++++ b/doc/xxdiff-doc.html +@@ -640,7 +640,7 @@ regions do not necessarily contains the same number of lines, empty alignment + lines are appended to the shorter regions in order to keep the corresponding + lines aligned (this is a simple way of solving the alignment problem; an + alternate solution would have been to implement a smart type of scrolling with +-lines indicating correspondance of regions between them).

++lines indicating correspondence of regions between them).

+

All the colors can be individually configured using the display options dialog + or resources. The display dialog contains a legend of all the colors. Note + that the default colors for different regions are often set to be the same to +@@ -737,7 +737,7 @@ startup):

+
@@ -878,7 +878,7 @@ that directory diff. That functionality is available from the popup menu in the text area (right-click).

You can also copy and remove files from that menu, see -Merging files and resolving conflicts section for details.

+Merging files and resolving conflicts section for details.

@@ -1016,7 +1016,7 @@

This view will scroll to match the main display. Unselected regions are shown in this view with oblique lines ("in construction" style), and merge decisions are slightly highlighted as well. This output allows you to review the merge -decisions before commiting the file to output.

+decisions before committing the file to output.

@@ -1034,13 +1034,13 @@ format specifiers similar to printf for each line to be formatted prior to being put on the clipboard. The following specifiers are allowed:

-
%N
+
%N
file line (0 is leftmost file)
-
%L
+
%L
line number
-
%F
+
%F
filename
-
%s
+
%s
line contents

There is also a "clipboard header format" resource for adding the filename at @@ -1136,8 +1136,8 @@

12   Customization using resource file

Much of the state of xxdiff can be customized through a resource file (actually, some of the features can only be changed through resource customization). -By default, xxdiff looks for the file .xxdiffrc located in the user's -home directory (this file location can be overriden by setting the environment +By default, xxdiff looks for the file .xxdiffrc located in the user's +home directory (this file location can be overridden by setting the environment variable XXDIFFRC), and reads that file for resource definition.

The format of the resource file is a fairly simple list of colon-separated resource name/value pairs, one per line:

@@ -1148,7 +1148,7 @@

Some resources may require string delimiters (double-quotes) around their value specification, but not all (see below).

You can also specify additional resources on the command-line, which take -precendence over the resources specified in the resource file. To get a +precedence over the resources specified in the resource file. To get a complete list of the available resources, use the --list-resources command-line option (see Options section).

Trick: you can use different resources files by invoking xxdiff like this in @@ -1175,7 +1175,7 @@ Preferred geometry upon initialization. Format is the same a X geometry specification, plus you can also use `Maximize' to maximize on startup 

-Style: "SGI"
+Style: "Cleanlooks"
Preferred Qt style, see Qt documentation for more details. The style can otherwise be specified through command-line arguments. @@ -1803,7 +1803,7 @@ Command to use for comparing two directories, recursively. 
-Command.Edit: "emacsclient"
+Command.Edit: "/home/blais/p/conf/bin/e"
Command to use to spawn an editor on a file. @@ -1857,34 +1857,40 @@
Tags used for conditionals used for unselected regions, when that option is used to save files. 
-Tag.Conflict.Separator: ">>>>>>>>>>>>>>>>>>>> File %d"
+Tag.Conflict.Start: "<<<<<<< %L"
-String used to separate chunks when saving with conflicts. +String used to indicate the start of a merged merge conflict when saving with conflicts. Default is the CVS start tag. 
-Tag.Conflict.End: "<<<<<<<<<<<<<<<<<<<<"
+Tag.Conflict.Sep: "======="
-String used to end chunks when saving with conflicts. +String used to separate sides of a merged merge conflict when saving with conflicts. Default is the CVS separator tag. 
-Tag.Conditional.Ifdef: "#if defined( %s )"
+Tag.Conflict.SepExtra: "||||||| %M"
-Ifdef string used when saving with conditionals. +String used to separate sides of a merged 3-way merge conflict when saving with conflicts. Default is the tag generated by GNU diff3. 
-Tag.Conditional.Elseif: "#elif defined( %s )"
+Tag.Conflict.End: ">>>>>>> %R"
-Elseif string used when saving with conditionals. +String used to end a merged merge conflict when saving with conflicts. Default is the CVS end tag. 
-Tag.Conditional.Else: "#else"
+Tag.Conditional.Ifdef: "#if defined( %s )"
-Else string used when saving with conditionals. +Ifdef string used when saving with conditionals. +
+
+Tag.Conditional.Elseif: "#elif defined( %s )"
+
+
+Elseif string used when saving with conditionals. 
 Tag.Conditional.Endif: "#endif"
@@ -1902,7 +1908,7 @@
 Tag.Unmerge.Sep: "^=======\s*$"
-Tag that appears at the beginning of a line in a merged file to separate sides of a merged merge conflict. Default is the CVS start tag. +Tag that appears at the beginning of a line in a merged file to separate sides of a merged merge conflict. Default is the CVS separator tag. 
 Tag.Unmerge.SepExtra: "^\|\|\|\|\|\|\| (.*)$"
@@ -1914,7 +1920,7 @@
 Tag.Unmerge.End: "^>>>>>>> (.*)$"
-Tag that appears at the beginning of a line in a merged file to indicate the end of a merged merge conflict. Default is the CVS start tag. +Tag that appears at the beginning of a line in a merged file to indicate the end of a merged merge conflict. Default is the CVS end tag. 
@@ -1960,7 +1966,7 @@
 MergedFilename: "%L.merge"
-Default merged filename. %L, %M, %R can be used as placeholders for left, middle and right filenames repectively. Note that ClearCase suffixes are stripped automatically. +Default merged filename. %L, %M, %R can be used as placeholders for left, middle and right filenames respectively. Note that ClearCase suffixes are stripped automatically.
@@ -1982,13 +1988,13 @@

15   Author

This program has been written from scratch and is being actively maintained by -Martin Blais (blais@furius.ca).

+Martin Blais (blais@furius.ca).

16   Reporting bugs

-

All bug reports and feature requests should be submitted throught the +

All bug reports and feature requests should be submitted through the SourceForge bug tracking system at the following URL -http://sourceforge.net/bugs/?group_id=2198. Please avoid sending the author +http://sourceforge.net/bugs/?group_id=2198. Please avoid sending the author email about xxdiff bugs. Please use this bug tracking system, it is extremely fast and simple to use.

@@ -2005,12 +2011,12 @@

17.1   Licensing

This program is distributed under the GNU General Public License. See the -GNU project website for full details.

+GNU project website for full details.

17.2   Dependencies

This program depends on the availability of a textual diff program (such as GNU -diff) and the Qt UI toolkit (available at http://trolltech.com).

+diff) and the Qt UI toolkit (available at http://trolltech.com).

17.3   Acknowledgements

diff -Nru xxdiff-4.0+hg453+dfsg/doc/xxdiff-integration.html xxdiff-4.0.1+dfsg/doc/xxdiff-integration.html --- xxdiff-4.0+hg453+dfsg/doc/xxdiff-integration.html 2014-07-21 20:37:25.000000000 +0000 +++ xxdiff-4.0.1+dfsg/doc/xxdiff-integration.html 2016-05-15 22:55:57.000000000 +0000 @@ -3,7 +3,7 @@ - + Integrating xxdiff with scripts @@ -12,8 +12,8 @@
diff -Nru xxdiff-4.0+hg453+dfsg/doc/xxdiff-scripts.html xxdiff-4.0.1+dfsg/doc/xxdiff-scripts.html --- xxdiff-4.0+hg453+dfsg/doc/xxdiff-scripts.html 2014-07-21 20:37:25.000000000 +0000 +++ xxdiff-4.0.1+dfsg/doc/xxdiff-scripts.html 2016-05-15 22:55:57.000000000 +0000 @@ -3,7 +3,7 @@ - + Helper Scripts for xxdiff @@ -12,8 +12,8 @@
@@ -31,7 +31,7 @@

Abstract

A description of the Python scripts and infrastructure that is provided around -xxdiff, to faciliate implementing processes requiring display and selection +xxdiff, to facilitate implementing processes requiring display and selection of differences.

diff -Nru xxdiff-4.0+hg453+dfsg/doc/xxdiff-scripts.txt xxdiff-4.0.1+dfsg/doc/xxdiff-scripts.txt --- xxdiff-4.0+hg453+dfsg/doc/xxdiff-scripts.txt 2014-07-21 20:37:25.000000000 +0000 +++ xxdiff-4.0.1+dfsg/doc/xxdiff-scripts.txt 2016-05-15 22:55:57.000000000 +0000 @@ -7,7 +7,7 @@ :Abstract: A description of the Python scripts and infrastructure that is provided around - xxdiff, to faciliate implementing processes requiring display and selection + xxdiff, to facilitate implementing processes requiring display and selection of differences. .. section-numbering:: diff -Nru xxdiff-4.0+hg453+dfsg/doc/xxdiff-secrets.html xxdiff-4.0.1+dfsg/doc/xxdiff-secrets.html --- xxdiff-4.0+hg453+dfsg/doc/xxdiff-secrets.html 2014-07-21 20:37:25.000000000 +0000 +++ xxdiff-4.0.1+dfsg/doc/xxdiff-secrets.html 2016-05-15 22:55:57.000000000 +0000 @@ -3,7 +3,7 @@ - + The Almost Secret Features of xxdiff @@ -11,8 +11,8 @@
diff -Nru xxdiff-4.0+hg453+dfsg/etc/bashrc xxdiff-4.0.1+dfsg/etc/bashrc --- xxdiff-4.0+hg453+dfsg/etc/bashrc 2014-07-21 20:37:25.000000000 +0000 +++ xxdiff-4.0.1+dfsg/etc/bashrc 2016-05-15 22:55:57.000000000 +0000 @@ -1,14 +1,10 @@ -#!/bin/sh -# -# $Id: bashrc 760 2004-02-09 18:51:12Z blais $ -# $Source$ # # Bash configuration for this project. # # Make bash invoke optcomplete completion for the scripts. # -# This is not necessary for other users, the scripts will work without +# This is not necessary for other users, the scripts will work without # auto-generated programmable completion. complete -F _optcomplete svn-foreign complete -F _optcomplete xx-cond-replace diff -Nru xxdiff-4.0+hg453+dfsg/.hg_archival.txt xxdiff-4.0.1+dfsg/.hg_archival.txt --- xxdiff-4.0+hg453+dfsg/.hg_archival.txt 1970-01-01 00:00:00.000000000 +0000 +++ xxdiff-4.0.1+dfsg/.hg_archival.txt 2016-05-15 22:55:57.000000000 +0000 @@ -0,0 +1,6 @@ +repo: 154177f7265bd40cddcb304bc937b0eed40ec5a5 +node: 689ce10e17721ae7ed4464a3a6df0f1c483a756b +branch: default +latesttag: null +latesttagdistance: 351 +changessincelatesttag: 469 diff -Nru xxdiff-4.0+hg453+dfsg/.hgignore xxdiff-4.0.1+dfsg/.hgignore --- xxdiff-4.0+hg453+dfsg/.hgignore 1970-01-01 00:00:00.000000000 +0000 +++ xxdiff-4.0.1+dfsg/.hgignore 2016-05-15 22:55:57.000000000 +0000 @@ -0,0 +1,24 @@ +syntax: glob +*.o +*.pyc +moc_*.cpp +bin/xxdiff +bin/xxdiff.app +src/Makefile +src/Makefile.qmake +src/doc.h +src/markersWidgetBase.cpp +src/markersWidgetBase.h +src/optionsDialogBase.cpp +src/optionsDialogBase.h +src/resParser_lex.cpp +src/resParser_lex.h +src/resParser_yacc.cpp +src/resParser_yacc.h +src/searchDialogBase.cpp +src/searchDialogBase.h + +src/core +src/ui_markersWidgetBase.h +src/ui_optionsDialogBase.h +src/ui_searchDialogBase.h diff -Nru xxdiff-4.0+hg453+dfsg/lib/python/xxdiff/scripts/encrypted.py xxdiff-4.0.1+dfsg/lib/python/xxdiff/scripts/encrypted.py --- xxdiff-4.0+hg453+dfsg/lib/python/xxdiff/scripts/encrypted.py 2014-07-21 20:37:25.000000000 +0000 +++ xxdiff-4.0.1+dfsg/lib/python/xxdiff/scripts/encrypted.py 2016-05-15 22:55:57.000000000 +0000 @@ -49,6 +49,12 @@ **.asc = xx-encrypted **.gpg = xx-encrypted +Alternatively, you may just use xx-hg-merge which deals with all file types, +encrypted or not: + + [merge-patterns] + ** = xx-hg-merge + """ __moredoc__ = """ @@ -172,7 +178,7 @@ fin.close() encoded_output = fout.read() fout.close() - + # Write out the encoded output file. try: f = open(outmerged, 'w') diff -Nru xxdiff-4.0+hg453+dfsg/lib/python/xxdiff/utils.py xxdiff-4.0.1+dfsg/lib/python/xxdiff/utils.py --- xxdiff-4.0+hg453+dfsg/lib/python/xxdiff/utils.py 2014-07-21 20:37:25.000000000 +0000 +++ xxdiff-4.0.1+dfsg/lib/python/xxdiff/utils.py 2016-05-15 22:55:57.000000000 +0000 @@ -52,6 +52,7 @@ # options were taken from Ian F. Darwin's file implementation. guesscmd = ['file', '-b', '-L'] text_re = re.compile('\\btext\\b') +xml_re = re.compile('\\bXML\\b') empty_re = re.compile('^empty$') def istextfile(fn): @@ -68,7 +69,7 @@ if p.returncode != 0 or stderr or stdout.startswith('cannot open'): raise RuntimeError("Error: running 'file' on '%s'." % fn) - return bool(text_re.search(stdout) or empty_re.match(stdout)) + return bool(text_re.search(stdout) or xml_re.search(stdout) or empty_re.match(stdout)) def makedirs(dirn, error_on_exist=True): diff -Nru xxdiff-4.0+hg453+dfsg/old/art/pixmaps-submission/.cvsignore xxdiff-4.0.1+dfsg/old/art/pixmaps-submission/.cvsignore --- xxdiff-4.0+hg453+dfsg/old/art/pixmaps-submission/.cvsignore 1970-01-01 00:00:00.000000000 +0000 +++ xxdiff-4.0.1+dfsg/old/art/pixmaps-submission/.cvsignore 2016-05-15 22:55:57.000000000 +0000 @@ -0,0 +1 @@ +.xvpics diff -Nru xxdiff-4.0+hg453+dfsg/setup.py xxdiff-4.0.1+dfsg/setup.py --- xxdiff-4.0+hg453+dfsg/setup.py 2015-12-21 18:39:46.000000000 +0000 +++ xxdiff-4.0.1+dfsg/setup.py 2016-05-15 22:55:57.000000000 +0000 @@ -69,6 +69,7 @@ package_dir = {'': 'lib/python'}, packages = ['xxdiff', join('xxdiff', 'scripts'), - join('xxdiff', 'scm')], + join('xxdiff', 'scm'), + join('xxdiff', 'db')], scripts = allscripts ) diff -Nru xxdiff-4.0+hg453+dfsg/src/doc.html xxdiff-4.0.1+dfsg/src/doc.html --- xxdiff-4.0+hg453+dfsg/src/doc.html 2014-07-21 20:37:25.000000000 +0000 +++ xxdiff-4.0.1+dfsg/src/doc.html 2016-05-15 22:55:57.000000000 +0000 @@ -3,7 +3,7 @@ - + xxdiff documentation @@ -647,7 +647,7 @@

This view will scroll to match the main display. Unselected regions are shown in this view with oblique lines ("in construction" style), and merge decisions are slightly highlighted as well. This output allows you to review the merge -decisions before commiting the file to output.

+decisions before committing the file to output.

@@ -768,7 +768,7 @@

Much of the state of xxdiff can be customized through a resource file (actually, some of the features can only be changed through resource customization). By default, xxdiff looks for the file .xxdiffrc located in the user's -home directory (this file location can be overriden by setting the environment +home directory (this file location can be overridden by setting the environment variable XXDIFFRC), and reads that file for resource definition.

The format of the resource file is a fairly simple list of colon-separated resource name/value pairs, one per line:

@@ -779,7 +779,7 @@

Some resources may require string delimiters (double-quotes) around their value specification, but not all (see below).

You can also specify additional resources on the command-line, which take -precendence over the resources specified in the resource file. To get a +precedence over the resources specified in the resource file. To get a complete list of the available resources, use the --list-resources command-line option (see Options section).

Trick: you can use different resources files by invoking xxdiff like this in @@ -823,7 +823,7 @@

16   Reporting bugs

-

All bug reports and feature requests should be submitted throught the +

All bug reports and feature requests should be submitted through the SourceForge bug tracking system at the following URL http://sourceforge.net/bugs/?group_id=2198. Please avoid sending the author email about xxdiff bugs. Please use this bug tracking system, it is extremely diff -Nru xxdiff-4.0+hg453+dfsg/src/doc.txt xxdiff-4.0.1+dfsg/src/doc.txt --- xxdiff-4.0+hg453+dfsg/src/doc.txt 2014-07-21 20:37:25.000000000 +0000 +++ xxdiff-4.0.1+dfsg/src/doc.txt 2016-05-15 22:55:57.000000000 +0000 @@ -726,7 +726,7 @@ This view will scroll to match the main display. Unselected regions are shown in this view with oblique lines ("in construction" style), and merge decisions are slightly highlighted as well. This output allows you to review the merge -decisions before commiting the file to output. +decisions before committing the file to output. @@ -892,7 +892,7 @@ Much of the state of xxdiff can be customized through a resource file (actually, some of the features can only be changed through resource customization). By default, xxdiff looks for the file ``.xxdiffrc`` located in the user's -home directory (this file location can be overriden by setting the environment +home directory (this file location can be overridden by setting the environment variable XXDIFFRC), and reads that file for resource definition. @@ -912,7 +912,7 @@ You can also specify additional resources on the command-line, which take -precendence over the resources specified in the resource file. To get a +precedence over the resources specified in the resource file. To get a complete list of the available resources, use the ``--list-resources`` command-line option (see Options section). @@ -979,7 +979,7 @@ ============== -All bug reports and feature requests should be submitted throught the +All bug reports and feature requests should be submitted through the SourceForge bug tracking system at the following URL http://sourceforge.net/bugs/?group_id=2198. Please avoid sending the author email about xxdiff bugs. Please use this bug tracking system, it is extremely diff -Nru xxdiff-4.0+hg453+dfsg/src/Makefile.extra xxdiff-4.0.1+dfsg/src/Makefile.extra --- xxdiff-4.0+hg453+dfsg/src/Makefile.extra 2015-12-21 18:39:46.000000000 +0000 +++ xxdiff-4.0.1+dfsg/src/Makefile.extra 2016-05-15 22:55:57.000000000 +0000 @@ -61,7 +61,7 @@ # Override the qmake we use because the one in the path might be different. -QMAKE = $(QTDIR)/bin/qmake +QMAKE = qmake # Note: we would need to add this to be correct. Danger! If the Makefile gets diff -Nru xxdiff-4.0+hg453+dfsg/src/resources.inline.h xxdiff-4.0.1+dfsg/src/resources.inline.h --- xxdiff-4.0+hg453+dfsg/src/resources.inline.h 2014-07-21 20:37:25.000000000 +0000 +++ xxdiff-4.0.1+dfsg/src/resources.inline.h 2016-05-15 22:55:57.000000000 +0000 @@ -20,6 +20,8 @@ * ******************************************************************************/ +#include + /*============================================================================== * EXTERNAL DECLARATIONS *============================================================================*/ diff -Nru xxdiff-4.0+hg453+dfsg/src/resParser.cpp xxdiff-4.0.1+dfsg/src/resParser.cpp --- xxdiff-4.0+hg453+dfsg/src/resParser.cpp 2015-12-21 18:39:46.000000000 +0000 +++ xxdiff-4.0.1+dfsg/src/resParser.cpp 2016-05-15 22:55:57.000000000 +0000 @@ -213,7 +213,7 @@ { "MergedFilename", MERGED_FILENAME, "Default merged filename. %L, %M, %R can be used as placeholders for \ -left, middle and right filenames repectively. Note that ClearCase suffixes \ +left, middle and right filenames respectively. Note that ClearCase suffixes \ are stripped automatically." }, }; diff -Nru xxdiff-4.0+hg453+dfsg/src/version.h xxdiff-4.0.1+dfsg/src/version.h --- xxdiff-4.0+hg453+dfsg/src/version.h 2014-07-21 20:37:25.000000000 +0000 +++ xxdiff-4.0.1+dfsg/src/version.h 2016-05-15 22:55:57.000000000 +0000 @@ -1 +1 @@ -#define XX_VERSION "4.0" +#define XX_VERSION "4.0.1" diff -Nru xxdiff-4.0+hg453+dfsg/src/xxdiff.pro xxdiff-4.0.1+dfsg/src/xxdiff.pro --- xxdiff-4.0+hg453+dfsg/src/xxdiff.pro 2015-12-21 18:39:46.000000000 +0000 +++ xxdiff-4.0.1+dfsg/src/xxdiff.pro 2016-05-15 22:55:57.000000000 +0000 @@ -49,6 +49,11 @@ debug:QMAKE_CFLAGS += -DXX_DEBUG debug:QMAKE_CXXFLAGS += -DXX_DEBUG +# Support Debian hardening flags +QMAKE_CXXFLAGS += $$(CPPFLAGS) $$(CXXFLAGS) +QMAKE_CFLAGS += $$(CPPFLAGS) $$(CFLAGS) +QMAKE_LFLAGS += $$(LDFLAGS) + # # Parser/grammar generation. diff -Nru xxdiff-4.0+hg453+dfsg/test/encrypted/.cvsignore xxdiff-4.0.1+dfsg/test/encrypted/.cvsignore --- xxdiff-4.0+hg453+dfsg/test/encrypted/.cvsignore 1970-01-01 00:00:00.000000000 +0000 +++ xxdiff-4.0.1+dfsg/test/encrypted/.cvsignore 2016-05-15 22:55:57.000000000 +0000 @@ -0,0 +1,2 @@ +out.asc +out.gpg diff -Nru xxdiff-4.0+hg453+dfsg/VERSION xxdiff-4.0.1+dfsg/VERSION --- xxdiff-4.0+hg453+dfsg/VERSION 2014-07-21 20:37:25.000000000 +0000 +++ xxdiff-4.0.1+dfsg/VERSION 2016-05-15 22:55:57.000000000 +0000 @@ -1 +1 @@ -4.0 +4.0.1