--- kdiff3-0.9.95.orig/debian/TODO
+++ kdiff3-0.9.95/debian/TODO
@@ -0,0 +1,2 @@
+* solve link problems resulting in dpkg-shlibdeps warnings like:
+ "dependency on libX could be avoided if [...] were not uselessly linked against it (they use none of its symbols)."
--- kdiff3-0.9.95.orig/debian/kdiff3-doc.doc-base
+++ kdiff3-0.9.95/debian/kdiff3-doc.doc-base
@@ -0,0 +1,13 @@
+Document: kdiff3
+Title: KDiff3 Handbook
+Author: Joachim Eibl <joachim.eibl@gmx.de>
+Abstract: The manual for KDiff3. KDiff3 compares two or three input files
+ and shows the differences line by line and character by character.
+ It provides an automatic merge facility and an integrated editor for
+ comfortable solving of merge conflicts. KDiff3 allows recursive directory
+ comparison and merging as well.
+Section: Programming
+
+Format: HTML
+Index: /usr/share/doc/kdiff3-doc/html/index.html
+Files: /usr/share/doc/kdiff3-doc/html/*.html
--- kdiff3-0.9.95.orig/debian/control
+++ kdiff3-0.9.95/debian/control
@@ -0,0 +1,55 @@
+Source: kdiff3
+Priority: optional
+Section: kde
+Maintainer: Eike Sauer <eike@debian.org>
+Build-Depends: cdbs, debhelper (>= 7), cmake, kdelibs5-dev (>= 4:4.4.4), libkonq5-dev, docbook-to-man, qt3-dev-tools-compat
+Standards-Version: 3.8.4
+Homepage: http://kdiff3.sourceforge.net
+Vcs-Svn: https://kdiff3.svn.sourceforge.net/svnroot/kdiff3/trunk/
+Vcs-Browser: http://kdiff3.svn.sourceforge.net/viewvc/kdiff3/trunk/
+
+Package: kdiff3
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Recommends: kdiff3-doc
+Conflicts: kdiff3-qt
+Description: compares and merges 2 or 3 files or directories
+ KDiff3 compares two or three input files and shows the differences
+ line by line and character by character. It provides an automatic
+ merge facility and an integrated editor for comfortable solving of
+ merge conflicts. KDiff3 allows recursive directory comparison and
+ merging as well.
+ .
+ This is the standard version of KDiff3, highly integrated into KDE.
+ It has got KIO support (allowing for remote access of files and
+ direct access to files in compressed archives) and integration into
+ konqueror's context menu. There's also a stripped-down version called
+ kdiff3-qt not depending on the KDE libraries.
+
+Package: kdiff3-qt
+Architecture: any
+Section: devel
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Recommends: kdiff3-doc
+Conflicts: kdiff3
+Description: compares and merges 2 or 3 files or directories - Qt version
+ KDiff3 compares two or three input files and shows the differences
+ line by line and character by character. It provides an automatic
+ merge facility and an integrated editor for comfortable solving of
+ merge conflicts. KDiff3 allows recursive directory comparison and
+ merging as well.
+ .
+ This version of KDiff3 is stripped-down so that it doesn't depend
+ on the KDE libraries. The package "kdiff3" contains the full-featured
+ version of the program.
+
+Package: kdiff3-doc
+Architecture: all
+Section: doc
+Depends: ${misc:Depends}
+Recommends: kdiff3 | kdiff3-qt
+Conflicts: kdiff3 (<= 0.9.92-1)
+Description: documentation for kdiff3
+ KDiff3 compares two or three input files and shows the differences
+ line by line and character by character. This package contains the
+ HTML documentation.
--- kdiff3-0.9.95.orig/debian/changelog
+++ kdiff3-0.9.95/debian/changelog
@@ -0,0 +1,252 @@
+kdiff3 (0.9.95-6) unstable; urgency=low
+
+ * Documentation was automatically compressed and therefore unusably
+ (what a strange default...), thanks to Filipus Klutiero for pointing
+ out and svuorela for his fixing help (closes: #585949)
+ * "Qt" instead of "QT" in short description, thanks to Filipus Klutiero
+ Two consecutive bug numbers by different people - cool :o)
+ (closes: #585948)
+ * Added categories to .desktop file (thanks to svuorela for pointing out)
+ * Standards version now 3.8.4 (no changes)
+
+ -- Eike Sauer <eike@debian.org> Tue, 15 Jun 2010 22:00:00 +0200
+
+kdiff3 (0.9.95-5) unstable; urgency=low
+
+ * KDE changed its doc path, so I had to do the same (closes: #584155)
+
+ -- Eike Sauer <eike@debian.org> Tue, 03 Jun 2010 20:15:00 +0200
+
+kdiff3 (0.9.95-4) unstable; urgency=low
+
+ * New year's edition, now really incorporating Jordi Pujol's
+ bug fix for the konqueror context menu
+
+ -- Eike Sauer <eike@debian.org> Tue, 01 Jan 2010 18:00:00 +0100
+
+kdiff3 (0.9.95-3) unstable; urgency=low
+
+ * Call dh_icons for our gnome users (thanks to Ori Avtalion for the hint)
+ * Let's make lintian at least as happy as Ubuntu. ;o)
+ Fixed Source section, misc:depends, typos.
+ * Context menu call to kdiff3 doesn't block konqueror anymore,
+ thanks to Jordi Pujol (closes: #562185)
+ * Standards version now 3.8.3 (no changes)
+
+ -- Eike Sauer <eike@debian.org> Tue, 29 Dec 2009 14:00:00 +0100
+
+kdiff3 (0.9.95-2) unstable; urgency=low
+
+ * KDE 4 goes to unstable - KDiff3 goes along
+ * Standards version now 3.8.1 (no changes)
+
+ -- Eike Sauer <eike@debian.org> Mon, 06 Apr 2009 20:00:00 +0200
+
+kdiff3 (0.9.95-1) experimental; urgency=low
+
+ * New upstream release
+ - Upstream included my changes for the QT version
+ and provided a script to generate QT language packs.
+
+ -- Eike Sauer <eike@debian.org> Sat, 07 Mar 2009 14:16:09 +0100
+
+kdiff3 (0.9.94-3) experimental; urgency=low
+
+ * Improved package descriptions
+
+ -- Eike Sauer <eike@debian.org> Tue, 28 Feb 2009 22:00:00 +0100
+
+kdiff3 (0.9.94-2) experimental; urgency=low
+
+ * Build QT version as well, resulting in an alternative package
+ not depending on KDE
+
+ -- Eike Sauer <eike@debian.org> Tue, 21 Feb 2009 20:00:00 +0100
+
+kdiff3 (0.9.94-1) experimental; urgency=low
+
+ * New upstream release
+
+ -- Eike Sauer <eike@debian.org> Tue, 20 Jan 2009 23:26:09 +0100
+
+kdiff3 (0.9.93-3-1) experimental; urgency=low
+
+ * New upstream release
+ - Initial release for KDE 4. (Closes: #479316)
+ - Thanks to Fathi Boudra for providing a first functional version
+ and calling my attention to cdbs!
+ * Changed build from pure debhelper to cdbs,
+ resulting in a much cleaner debian/rules file.
+ * Debhelper compatibility level changed from 4 to 7,
+ but just to make it find my files automatically.
+
+ -- Eike Sauer <eike@debian.org> Tue, 14 Jan 2009 20:00:00 +0100
+
+kdiff3 (0.9.92-3) unstable; urgency=low
+
+ * Standards version now 3.8.0
+ * Fixed kdiff3-doc section
+ * Removed empty directory /usr/share/applnk
+ * Removed extra leading whitespace from doc-base
+ * Fixed doc-base section
+
+ -- Eike Sauer <eike@debian.org> Tue, 18 Dec 2008 20:00:00 +0100
+
+kdiff3 (0.9.92-2) unstable; urgency=low
+
+ * Include konqueror plugin in package (closes Ubuntu bug no. 145026)
+ * Split package into kdiff3 and kdiff3-doc
+
+ -- Eike Sauer <eike@debian.org> Tue, 11 Nov 2007 20:00:00 +0100
+
+kdiff3 (0.9.92-1) unstable; urgency=low
+
+ * New upstream release
+ - now distinguishes between empty and non-existent files in "full analysis"
+ mode (closes: #417086)
+ - fixed includes for gcc 4.3, thanks to Martin Michlmayr (closes: #417312)
+ Thanks to upstream for the Debian bug handling! :o)
+
+ -- Eike Sauer <eike@debian.org> Tue, 17 Apr 2007 16:18:32 +0200
+
+kdiff3 (0.9.91-1) unstable; urgency=low
+
+ * New upstream release
+ * The I'm-a-DD-release...!
+
+ -- Eike Sauer <eike@debian.org> Sun, 18 Mar 2007 23:33:56 +0100
+
+kdiff3 (0.9.90-5) unstable; urgency=low
+
+ * Changed, moved and registered .desktop file (closes: #396790)
+
+ -- Eike Sauer <eikes@cs.tu-berlin.de> Tue, 30 Nov 2006 20:15:00 +0200
+
+kdiff3 (0.9.90-4) unstable; urgency=low
+
+ * Added AM_MAINTAINER_MODE
+
+ -- Eike Sauer <eikes@cs.tu-berlin.de> Tue, 12 Oct 2006 14:00:00 +0200
+
+kdiff3 (0.9.90-3) unstable; urgency=low
+
+ * More autotooling stuff...
+
+ -- Eike Sauer <eikes@cs.tu-berlin.de> Tue, 02 Oct 2006 16:30:00 +0200
+
+kdiff3 (0.9.90-2) unstable; urgency=low
+
+ * Really reduced dependencies (as promised in 0.9.89-1) this time...
+ * manpage updated
+
+ -- Eike Sauer <eikes@cs.tu-berlin.de> Tue, 27 Sep 2006 17:40:00 +0200
+
+kdiff3 (0.9.90-1) unstable; urgency=low
+
+ * New upstream release
+ * Standards version now 3.7.2
+
+ -- Eike Sauer <eikes@cs.tu-berlin.de> Tue, 30 May 2006 10:16:35 +0200
+
+kdiff3 (0.9.89-1) unstable; urgency=low
+
+ * New upstream release
+ * Reduced dependencies from 27 to 5 packages...
+ (see http://lists.debian.org/debian-devel-announce/2005/11/msg00016.html)
+
+ -- Eike Sauer <eikes@cs.tu-berlin.de> Wed, 12 Apr 2006 00:28:33 +0200
+
+kdiff3 (0.9.88-5) unstable; urgency=low
+
+ * corrections to German po file, thanks to Jens Seidel (closes: #314016)
+ * mention GNU diff in copyright file (hint by Florian Ernst)
+ * making manual known to doc-base, so obeying to Debian Policy 3.6.2
+ * ABI transition to GCC 4.0 (closes #327048)
+
+ -- Eike Sauer <eikes@cs.tu-berlin.de> Fri, 7 Sep 2005 15:15:00 +0100
+
+kdiff3 (0.9.88-4) unstable; urgency=low
+
+ * HTML help goes to /usr/share/doc/kdiff3/html
+
+ -- Eike Sauer <eikes@cs.tu-berlin.de> Fri, 15 Apr 2005 00:15:00 +0100
+
+kdiff3 (0.9.88-3) unstable; urgency=low
+
+ * symlinked all those documentation images between the different
+ languages (they where the same anyway) - which halves the size
+ of the package...
+
+ -- Eike Sauer <eikes@cs.tu-berlin.de> Sun, 10 Apr 2005 22:14:00 +0100
+
+kdiff3 (0.9.88-2) unstable; urgency=low
+
+ * Don't use makefile in clean rule when it doesn't yet exist
+
+ -- Eike Sauer <eikes@cs.tu-berlin.de> Sun, 10 Apr 2005 22:14:00 +0100
+
+kdiff3 (0.9.88-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Eike Sauer <eikes@cs.tu-berlin.de> Sat, 26 Feb 2005 18:07:03 +0100
+
+kdiff3 (0.9.87-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Eike Sauer <eikes@cs.tu-berlin.de> Sun, 30 Jan 2005 19:08:52 +0100
+
+kdiff3 (0.9.86-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Eike Sauer <eikes@cs.tu-berlin.de> Tue, 15 Jun 2004 11:28:59 +0200
+
+kdiff3 (0.9.84-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Eike Sauer <eikes@cs.tu-berlin.de> Mon, 31 May 2004 22:43:32 +0200
+
+kdiff3 (0.9.83-2) unstable; urgency=medium
+
+ * First upload of 0.9.83 (closes: #250486)
+ * Casual crashes due to race condition (hopefully) fixed
+
+ -- Eike Sauer <eikes@cs.tu-berlin.de> Wed, 4 Feb 2004 15:09:12 +0100
+
+kdiff3 (0.9.83-1) unstable; urgency=low
+
+ * New upstream release
+ - now builds on 64 bit architectures (closes: #238221)
+ * We don't need docbook-to-man in Build-Depends anymore
+ * Cleaned up debian/rules.
+
+ -- Eike Sauer <eikes@cs.tu-berlin.de> Sun, 7 Mar 2004 00:00:32 +0100
+
+kdiff3 (0.9.81-2) unstable; urgency=medium
+
+ * Possible data loss situation fixed by upstream
+
+ -- Eike Sauer <eikes@cs.tu-berlin.de> Wed, 4 Feb 2004 15:09:12 +0100
+
+kdiff3 (0.9.81-1) unstable; urgency=low
+
+ * New upstream release
+ * Debian manpage accepted by upstream
+
+ -- Eike Sauer <eikes@cs.tu-berlin.de> Mon, 12 Jan 2004 02:11:51 +0100
+
+kdiff3 (0.9.80-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Eike Sauer <eikes@cs.tu-berlin.de> Mon, 8 Dec 2003 22:45:16 +0100
+
+kdiff3 (0.9.71-1) unstable; urgency=low
+
+ * Initial Release.
+ * Wrote a short man page to satisfy Debian Policy.
+
+ -- Eike Sauer <eikes@cs.tu-berlin.de> Wed, 5 Nov 2003 00:25:06 +0100
--- kdiff3-0.9.95.orig/debian/kdiff3.install
+++ kdiff3-0.9.95/debian/kdiff3.install
@@ -0,0 +1,8 @@
+usr/bin
+usr/lib
+usr/share/icons
+usr/share/locale
+usr/share/applications
+usr/share/man
+usr/share/kde4/apps
+usr/share/kde4/services
--- kdiff3-0.9.95.orig/debian/copyright
+++ kdiff3-0.9.95/debian/copyright
@@ -0,0 +1,26 @@
+This package was debianized by Eike Sauer <eikes@cs.tu-berlin.de> on
+Tue, 21 Oct 2003 14:42:39 +0200.
+
+It was downloaded from http://kdiff3.sourceforge.net
+
+Upstream Author: Joachim Eibl <joachim.eibl@gmx.de>
+
+Copyright: (C) 2002-2009 by Joachim Eibl
+
+Parts of this software are derived from GNU diffutils
+by Haertel, Hayes, Stallman, Tower, Eggert et al.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License with
+the Debian GNU/Linux distribution in file /usr/share/common-licenses/GPL-2;
+if not, write to the Free Software Foundation, Inc., 51 Franklin St,
+Fifth Floor, Boston, MA 02110-1301, USA.
--- kdiff3-0.9.95.orig/debian/kdiff3-doc.install
+++ kdiff3-0.9.95/debian/kdiff3-doc.install
@@ -0,0 +1,2 @@
+usr/share/doc/kde
+usr/share/doc/kdiff3-doc/html
--- kdiff3-0.9.95.orig/debian/kdiff3.sgml
+++ kdiff3-0.9.95/debian/kdiff3.sgml
@@ -0,0 +1,258 @@
+<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
+
+<!-- Process this file with docbook-to-man to generate an nroff manual
+ page: `docbook-to-man manpage.sgml > manpage.1'. You may view
+ the manual page with: `docbook-to-man kdiff3.sgml | nroff -man | less'.
+ A typical entry in a Makefile or Makefile.am is:
+
+manpage.1: manpage.sgml
+ docbook-to-man $< > $@
+
+
+ The docbook-to-man binary is found in the docbook-to-man package.
+ Please remember that if you create the nroff version in one of the
+ debian/rules file targets (such as build), you will need to include
+ docbook-to-man in your Build-Depends control field.
+
+ -->
+
+ <!-- Fill in your name for FIRSTNAME and SURNAME. -->
+ <!ENTITY dhfirstname "<firstname>EIKE</firstname>">
+ <!ENTITY dhsurname "<surname>SAUER</surname>">
+ <!-- Please adjust the date whenever revising the manpage. -->
+ <!ENTITY dhdate "<date>Oktober 2, 2006</date>">
+ <!-- SECTION should be 1-8, maybe w/ subsection other parameters are
+ allowed: see man(7), man(1). -->
+ <!ENTITY dhsection "<manvolnum>1</manvolnum>">
+ <!ENTITY dhemail "<<email>eikes@cs.tu-berlin.de</email>>">
+ <!ENTITY dhusername "Eike Sauer">
+ <!ENTITY dhucpackage "<refentrytitle>KDIFF3</refentrytitle>">
+ <!ENTITY dhpackage "KDiff3">
+
+ <!ENTITY debian "<productname>Debian</productname>">
+ <!ENTITY gnu "<acronym>GNU</acronym>">
+ <!ENTITY gpl "&gnu; <acronym>GPL</acronym>">
+]>
+
+<refentry>
+ <refentryinfo>
+ <address>
+ &dhemail;
+ </address>
+ <author>
+ &dhfirstname;
+ &dhsurname;
+ </author>
+ <copyright>
+ <year>2003, 2006</year>
+ <holder>&dhusername;</holder>
+ </copyright>
+ &dhdate;
+ </refentryinfo>
+ <refmeta>
+ &dhucpackage;
+
+ &dhsection;
+ </refmeta>
+ <refnamediv>
+ <refname>&dhpackage;</refname>
+
+ <refpurpose>compares two or three input files or directories</refpurpose>
+ </refnamediv>
+ <refsynopsisdiv>
+ <cmdsynopsis>
+ <command>&dhpackage;</command>
+
+ <arg><option>QT options</option></arg>
+ <arg><option>KDE options</option></arg>
+ <arg><option>KDiff3 options</option></arg>
+ <arg><option><replaceable>File1/base</replaceable></option></arg>
+ <arg><option><replaceable>File2</replaceable></option></arg>
+ <arg><option><replaceable>File3</replaceable></option></arg>
+
+ </cmdsynopsis>
+ </refsynopsisdiv>
+ <refsect1>
+ <title>DESCRIPTION</title>
+
+ <para>This manual page documents briefly the
+ <command>&dhpackage;</command> tool.</para>
+
+ <para>This manual page was written for the &debian; distribution
+ because the original program does not have a manual page.
+ For comprehensive help, please see <command>khelpcenter help:/kdiff3</command>.
+ </para>
+
+ <para><command>&dhpackage;</command> is a program that
+ <ItemizedList SPACING="compact">
+ <ListItem><para>compares or merges two or three text input files or directories</para></ListItem>
+ <ListItem><para>shows the differences line by line and character by character</para></ListItem>
+ <ListItem><para>provides an automatic merge-facility and</para></ListItem>
+ <ListItem><para>an integrated editor for comfortable solving of merge-conflicts</para></ListItem>
+ <ListItem><para>supports Unicode, UTF-8 and other codecs</para></ListItem>
+ <ListItem><para>supports KIO on KDE (allows accessing ftp, sftp, fish, smb etc.)</para></ListItem>
+ <ListItem><para>Printing of differences</para></ListItem>
+ <ListItem><para>Manual alignment of lines</para></ListItem>
+ <ListItem><para>Automatic merging of version control history ($Log$)</para></ListItem>
+ </ItemizedList>
+ </para>
+
+ </refsect1>
+ <refsect1>
+ <title>OPTIONS</title>
+
+ <para>This program follows the usual &gnu; command line syntax,
+ with long options starting with two dashes (`-'). A summary of
+ options is included below. For a full summary of options, run
+ <command>&dhpackage; --help</command>.
+ </para>
+
+ <variablelist>
+ <varlistentry>
+ <term><option>-m, --merge</option>
+ </term>
+ <listitem>
+ <para>Merge the input.</para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><option>-b, --base file</option>
+ </term>
+ <listitem>
+ <para>Explicit base file. For compatibility with certain tools.</para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><option>-o, --output file</option>
+ </term>
+ <listitem>
+ <para>Output file. Implies -m. E.g.: -o newfile.txt</para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><option>--out file</option>
+ </term>
+ <listitem>
+ <para>Output file, again. (For compatibility with certain tools.)</para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><option>--auto</option>
+ </term>
+ <listitem>
+ <para>No GUI if all conflicts are auto-solvable. (Needs -o file)</para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><option>--qall</option>
+ </term>
+ <listitem>
+ <para>Don't solve conflicts automatically. (For compatibility...)</para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><option>-L1 alias</option>
+ </term>
+ <listitem>
+ <para>Visible name replacement for first file/base file.</para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><option>-L2 alias</option>
+ </term>
+ <listitem>
+ <para>Visible name replacement for second file.</para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><option>-L3 alias</option>
+ </term>
+ <listitem>
+ <para>Visible name replacement for third file.</para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><option>-L, --fname alias</option>
+ </term>
+ <listitem>
+ <para>Visible name replacement. May by supplied for each input.</para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><option>--cs string</option>
+ </term>
+ <listitem>
+ <para>Change a setting, e. g. --cs "AutoAdvance=1".</para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><option>--confighelp</option>
+ </term>
+ <listitem>
+ <para>Show a list of all settings and their values.</para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><option>--config file </option>
+ </term>
+ <listitem>
+ <para>Use a different settings file.</para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><option>--author</option>
+ </term>
+ <listitem>
+ <para>Show author of program.</para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><option>-v, --version</option>
+ </term>
+ <listitem>
+ <para>Show version of program.</para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><option>--license</option>
+ </term>
+ <listitem>
+ <para>Show license of program.</para>
+ </listitem>
+ </varlistentry>
+ </variablelist>
+ </refsect1>
+ <refsect1>
+ <title>AUTHOR</title>
+
+ <para>This manual page was written by &dhusername; &dhemail; for
+ the &debian; system (but may be used by others). Permission is
+ granted to copy, distribute and/or modify this document under
+ the terms of the &gnu; General Public License, Version 2
+ (or, at your option, any later version published by the Free
+ Software Foundation).
+ </para>
+ <para>
+ On Debian systems, the complete text of the GNU General Public
+ License can be found in /usr/share/common-licenses/GPL.
+ </para>
+
+ </refsect1>
+</refentry>
+
+<!-- Keep this comment at the end of the file
+Local variables:
+mode: sgml
+sgml-omittag:t
+sgml-shorttag:t
+sgml-minimize-attributes:nil
+sgml-always-quote-attributes:t
+sgml-indent-step:2
+sgml-indent-data:t
+sgml-parent-document:nil
+sgml-default-dtd-file:nil
+sgml-exposed-tags:nil
+sgml-local-catalogs:nil
+sgml-local-ecat-files:nil
+End:
+-->
--- kdiff3-0.9.95.orig/debian/compat
+++ kdiff3-0.9.95/debian/compat
@@ -0,0 +1 @@
+7
--- kdiff3-0.9.95.orig/debian/kdiff3-qt.install
+++ kdiff3-0.9.95/debian/kdiff3-qt.install
@@ -0,0 +1,2 @@
+usr/share/icons
+usr/share/man
--- kdiff3-0.9.95.orig/debian/watch
+++ kdiff3-0.9.95/debian/watch
@@ -0,0 +1,8 @@
+# As version numbering of KDiff3 has changed from 0.93, 0.931, ... to 0.9.50, 0.9.60,
+# we have to dump the former ones. They would be considered to have a higher version
+# number by uscan. Addition: Ignore a x.y.zz-QT version as well.
+# Yet another version numbering change: We've got 0.9.93-3 now... But "-QT" versions
+# are automatically ignored now.
+
+version=3
+http://sf.net/kdiff3/kdiff3-(.\..\..*)\.tar.gz debian uupdate
--- kdiff3-0.9.95.orig/debian/rules
+++ kdiff3-0.9.95/debian/rules
@@ -0,0 +1,43 @@
+#!/usr/bin/make -f
+
+DEB_COMPRESS_EXCLUDE := ".docbook"
+
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/cmake.mk
+include /usr/share/cdbs/1/rules/simple-patchsys.mk
+
+
+clean::
+ # TODO if makefile...
+ # clean QT version
+ qmake-qt4 -nocache src-QT4/kdiff3.pro -o src-QT4/Makefile
+ make -C src-QT4 distclean
+ # remove generated man page
+ rm -f debian/kdiff3.1
+
+build/kdiff3::
+ # generate man page
+ /usr/bin/docbook-to-man debian/kdiff3.sgml > debian/kdiff3.1
+
+build/kdiff3-qt::
+ qmake-qt4 -nocache src-QT4/kdiff3.pro -o src-QT4/Makefile
+ make -C src-QT4 prefix=$(CURDIR)/debian/kdiff3-qt
+
+install/kdiff3::
+ # install man page
+ mkdir --parents $(DEB_DESTDIR)usr/share/man/man1
+ cp debian/kdiff3.1 $(DEB_DESTDIR)usr/share/man/man1/kdiff3.1
+ # update gnome's icon cache
+ dh_icons --package kdiff3 --tmpdir=debian/tmp
+
+install/kdiff3-qt::
+ mkdir --parents $(CURDIR)/debian/kdiff3-qt
+ make INSTALL_ROOT=$(CURDIR)/debian/kdiff3-qt install -C src-QT4 prefix=$(CURDIR)/debian/kdiff3-qt
+ cd po && export INSTALL_ROOT=$(CURDIR)/debian/kdiff3-qt && /bin/sh create_qm_files install
+ # update gnome's icon cache
+ dh_icons --package kdiff3-qt --tmpdir=debian/tmp
+
+install/kdiff3-doc::
+ # install HTML help
+ mkdir --parents $(DEB_DESTDIR)usr/share/doc/kdiff3-doc/html/
+ cp doc/en/*.html $(DEB_DESTDIR)usr/share/doc/kdiff3-doc/html/
--- kdiff3-0.9.95.orig/debian/kdiff3-doc.links
+++ kdiff3-0.9.95/debian/kdiff3-doc.links
@@ -0,0 +1,12 @@
+usr/share/doc/kde/HTML/en/common usr/share/doc/kdiff3-doc/html/common
+usr/share/doc/kde/HTML/en/kdiff3/dirbrowser.png usr/share/doc/kdiff3-doc/html/dirbrowser.png
+usr/share/doc/kde/HTML/en/kdiff3/dirmergebig.png usr/share/doc/kdiff3-doc/html/dirmergebig.png
+usr/share/doc/kde/HTML/en/kdiff3/iteminfo.png usr/share/doc/kdiff3-doc/html/iteminfo.png
+usr/share/doc/kde/HTML/en/kdiff3/letter_by_letter.png usr/share/doc/kdiff3-doc/html/letter_by_letter.png
+usr/share/doc/kde/HTML/en/kdiff3/merge_current.png usr/share/doc/kdiff3-doc/html/merge_current.png
+usr/share/doc/kde/HTML/en/kdiff3/new.png usr/share/doc/kdiff3-doc/html/new.png
+usr/share/doc/kde/HTML/en/kdiff3/open_dialog.png usr/share/doc/kdiff3-doc/html/open_dialog.png
+usr/share/doc/kde/HTML/en/kdiff3/screenshot_diff.png usr/share/doc/kdiff3-doc/html/screenshot_diff.png
+usr/share/doc/kde/HTML/en/kdiff3/screenshot_merge.png usr/share/doc/kdiff3-doc/html/screenshot_merge.png
+usr/share/doc/kde/HTML/en/kdiff3/triple_diff.png usr/share/doc/kdiff3-doc/html/triple_diff.png
+usr/share/doc/kde/HTML/en/kdiff3/white_space.png usr/share/doc/kdiff3-doc/html/white_space.png
--- kdiff3-0.9.95.orig/debian/docs
+++ kdiff3-0.9.95/debian/docs
@@ -0,0 +1,3 @@
+NEWS
+README
+TODO
--- kdiff3-0.9.95.orig/debian/patches/typos.patch
+++ kdiff3-0.9.95/debian/patches/typos.patch
@@ -0,0 +1,515 @@
+diff -r --unified kdiff3-0.9.95/doc/en/dothemerge.html kdiff3-0.9.95.neu/doc/en/dothemerge.html
+--- kdiff3-0.9.95/doc/en/dothemerge.html 2009-01-01 21:57:07.000000000 +0100
++++ kdiff3-0.9.95.neu/doc/en/dothemerge.html 2009-12-29 13:41:54.000000000 +0100
+@@ -3,7 +3,7 @@
+ When you have made all your operation choices (in all subdirectories too)
+ then you can start the merge.
+ </p><p>
+- Be aware that if you didn't specify a destination directory explicitely,
++ Be aware that if you didn't specify a destination directory explicitly,
+ then the destination will be "C" in three directory mode, "B" in two directory
+ merge mode, and in sync-mode it will be "A" or/and "B".
+ </p><p>
+diff -r --unified kdiff3-0.9.95/doc/en/index.docbook kdiff3-0.9.95.neu/doc/en/index.docbook
+--- kdiff3-0.9.95/doc/en/index.docbook 2007-04-01 11:44:37.000000000 +0200
++++ kdiff3-0.9.95.neu/doc/en/index.docbook 2009-12-29 13:41:54.000000000 +0100
+@@ -722,7 +722,7 @@
+ </para><para>
+ To copy to the clipboard you must press the "Copy"-button (Ctrl-C or Ctrl-Insert).
+ But there exists an option "Auto Copy Selection". If this is enabled,
+- then whatever you select is copied immediately and you don't need to explicitely
++ then whatever you select is copied immediately and you don't need to explicitly
+ copy. But pay attention when using this because the contents of the clipboard
+ might then be destroyed accidentally.
+ </para><para>
+@@ -857,7 +857,7 @@
+ <varlistentry><term><emphasis> Auto indentation:</emphasis></term><listitem><para> When pressing Enter or Return the indentation
+ of the previous line is used for the new line. </para></listitem></varlistentry>
+ <varlistentry><term><emphasis> Auto copy selection:</emphasis></term><listitem><para> Every selection is immediately copied
+- to the clipboard when active and you needn't explicitely copy it. </para></listitem></varlistentry>
++ to the clipboard when active and you needn't explicitly copy it. </para></listitem></varlistentry>
+ <varlistentry><term><emphasis> Line end style:</emphasis></term><listitem><para> When saving you can select what line
+ end style you prefer. The default setting is the common choice for the used operating system. </para></listitem></varlistentry>
+ </variablelist>
+@@ -1594,7 +1594,7 @@
+ When you have made all your operation choices (in all subdirectories too)
+ then you can start the merge.
+ </para><para>
+- Be aware that if you didn't specify a destination directory explicitely,
++ Be aware that if you didn't specify a destination directory explicitly,
+ then the destination will be "C" in three directory mode, "B" in two directory
+ merge mode, and in sync-mode it will be "A" or/and "B".
+ </para><para>
+diff -r --unified kdiff3-0.9.95/doc/en/options.html kdiff3-0.9.95.neu/doc/en/options.html
+--- kdiff3-0.9.95/doc/en/options.html 2009-01-01 21:57:07.000000000 +0100
++++ kdiff3-0.9.95.neu/doc/en/options.html 2009-12-29 13:41:54.000000000 +0100
+@@ -15,7 +15,7 @@
+ tabulator key, a tab-character is inserted, otherwise the appropriate
+ amount of characters is inserted.</p></dd><dt><span class="term"><span class="emphasis"><em> Tab size:</em></span></span></dt><dd><p> Can be adjusted for your specific needs. Default is 8. </p></dd><dt><span class="term"><span class="emphasis"><em> Auto indentation:</em></span></span></dt><dd><p> When pressing Enter or Return the indentation
+ of the previous line is used for the new line. </p></dd><dt><span class="term"><span class="emphasis"><em> Auto copy selection:</em></span></span></dt><dd><p> Every selection is immediately copied
+- to the clipboard when active and you needn't explicitely copy it. </p></dd><dt><span class="term"><span class="emphasis"><em> Line end style:</em></span></span></dt><dd><p> When saving you can select what line
++ to the clipboard when active and you needn't explicitly copy it. </p></dd><dt><span class="term"><span class="emphasis"><em> Line end style:</em></span></span></dt><dd><p> When saving you can select what line
+ end style you prefer. The default setting is the common choice for the used operating system. </p></dd></dl></div></div><div class="sect2" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="diffoptions"></a>Diff Settings</h3></div></div></div><p>
+ When comparing files, <span class="application">KDiff3</span> first it tries to match lines that are equal
+ in all input files. Only during this step it might ignore white space. The
+diff -r --unified kdiff3-0.9.95/doc/en/selections.html kdiff3-0.9.95.neu/doc/en/selections.html
+--- kdiff3-0.9.95/doc/en/selections.html 2009-01-01 21:57:07.000000000 +0100
++++ kdiff3-0.9.95.neu/doc/en/selections.html 2009-12-29 13:41:54.000000000 +0100
+@@ -17,7 +17,7 @@
+ </p><p>
+ To copy to the clipboard you must press the "Copy"-button (Ctrl-C or Ctrl-Insert).
+ But there exists an option "Auto Copy Selection". If this is enabled,
+- then whatever you select is copied immediately and you don't need to explicitely
++ then whatever you select is copied immediately and you don't need to explicitly
+ copy. But pay attention when using this because the contents of the clipboard
+ might then be destroyed accidentally.
+ </p><p>
+diff -r --unified kdiff3-0.9.95/po/ar/kdiff3.po kdiff3-0.9.95.neu/po/ar/kdiff3.po
+--- kdiff3-0.9.95/po/ar/kdiff3.po 2009-02-01 13:57:53.000000000 +0100
++++ kdiff3-0.9.95.neu/po/ar/kdiff3.po 2009-12-29 13:41:10.000000000 +0100
+@@ -925,7 +925,7 @@
+ #: optiondialog.cpp:757
+ msgid ""
+ "On: Any selection is immediately written to the clipboard.\n"
+-"Off: You must explicitely copy e.g. via Ctrl-C."
++"Off: You must explicitly copy e.g. via Ctrl-C."
+ msgstr ""
+
+ #: optiondialog.cpp:762 mergeresultwindow.cpp:3135
+diff -r --unified kdiff3-0.9.95/po/bg/kdiff3.po kdiff3-0.9.95.neu/po/bg/kdiff3.po
+--- kdiff3-0.9.95/po/bg/kdiff3.po 2009-02-01 13:57:57.000000000 +0100
++++ kdiff3-0.9.95.neu/po/bg/kdiff3.po 2009-12-29 13:41:10.000000000 +0100
+@@ -990,7 +990,7 @@
+ #: optiondialog.cpp:757
+ msgid ""
+ "On: Any selection is immediately written to the clipboard.\n"
+-"Off: You must explicitely copy e.g. via Ctrl-C."
++"Off: You must explicitly copy e.g. via Ctrl-C."
+ msgstr ""
+ "Включено: Всичко маркирано се записва веднага в системния буфер.\n"
+ "Изключено: Трябва изрично да копирате, например с Ctrl-C."
+diff -r --unified kdiff3-0.9.95/po/br/kdiff3.po kdiff3-0.9.95.neu/po/br/kdiff3.po
+--- kdiff3-0.9.95/po/br/kdiff3.po 2009-02-01 13:58:01.000000000 +0100
++++ kdiff3-0.9.95.neu/po/br/kdiff3.po 2009-12-29 13:41:10.000000000 +0100
+@@ -923,7 +923,7 @@
+ #: optiondialog.cpp:757
+ msgid ""
+ "On: Any selection is immediately written to the clipboard.\n"
+-"Off: You must explicitely copy e.g. via Ctrl-C."
++"Off: You must explicitly copy e.g. via Ctrl-C."
+ msgstr ""
+
+ #: optiondialog.cpp:762 mergeresultwindow.cpp:3135
+diff -r --unified kdiff3-0.9.95/po/cs/kdiff3.po kdiff3-0.9.95.neu/po/cs/kdiff3.po
+--- kdiff3-0.9.95/po/cs/kdiff3.po 2009-02-01 13:58:04.000000000 +0100
++++ kdiff3-0.9.95.neu/po/cs/kdiff3.po 2009-12-29 13:41:10.000000000 +0100
+@@ -935,7 +935,7 @@
+ #: optiondialog.cpp:757
+ msgid ""
+ "On: Any selection is immediately written to the clipboard.\n"
+-"Off: You must explicitely copy e.g. via Ctrl-C."
++"Off: You must explicitly copy e.g. via Ctrl-C."
+ msgstr ""
+
+ #: optiondialog.cpp:762 mergeresultwindow.cpp:3135
+diff -r --unified kdiff3-0.9.95/po/cy/kdiff3.po kdiff3-0.9.95.neu/po/cy/kdiff3.po
+--- kdiff3-0.9.95/po/cy/kdiff3.po 2009-02-01 13:58:08.000000000 +0100
++++ kdiff3-0.9.95.neu/po/cy/kdiff3.po 2009-12-29 13:41:10.000000000 +0100
+@@ -925,7 +925,7 @@
+ #: optiondialog.cpp:757
+ msgid ""
+ "On: Any selection is immediately written to the clipboard.\n"
+-"Off: You must explicitely copy e.g. via Ctrl-C."
++"Off: You must explicitly copy e.g. via Ctrl-C."
+ msgstr ""
+
+ #: optiondialog.cpp:762 mergeresultwindow.cpp:3135
+diff -r --unified kdiff3-0.9.95/po/da/kdiff3.po kdiff3-0.9.95.neu/po/da/kdiff3.po
+--- kdiff3-0.9.95/po/da/kdiff3.po 2009-02-01 13:58:12.000000000 +0100
++++ kdiff3-0.9.95.neu/po/da/kdiff3.po 2009-12-29 13:41:10.000000000 +0100
+@@ -985,7 +985,7 @@
+ #: optiondialog.cpp:757
+ msgid ""
+ "On: Any selection is immediately written to the clipboard.\n"
+-"Off: You must explicitely copy e.g. via Ctrl-C."
++"Off: You must explicitly copy e.g. via Ctrl-C."
+ msgstr ""
+ "Til: Enhver markering bliver umiddelbart skrevet til klippebordet.\n"
+ "Fra: Du skal eksplicit kopiere f.eks. via Ctrl-C."
+diff -r --unified kdiff3-0.9.95/po/de/kdiff3.po kdiff3-0.9.95.neu/po/de/kdiff3.po
+--- kdiff3-0.9.95/po/de/kdiff3.po 2009-02-01 13:58:16.000000000 +0100
++++ kdiff3-0.9.95.neu/po/de/kdiff3.po 2009-12-29 13:41:10.000000000 +0100
+@@ -996,7 +996,7 @@
+ #: optiondialog.cpp:757
+ msgid ""
+ "On: Any selection is immediately written to the clipboard.\n"
+-"Off: You must explicitely copy e.g. via Ctrl-C."
++"Off: You must explicitly copy e.g. via Ctrl-C."
+ msgstr ""
+ "Falls aktiv, wird die Auswahl automatisch sofort in die Zwischenablage "
+ "kopiert.\n"
+diff -r --unified kdiff3-0.9.95/po/el/kdiff3.po kdiff3-0.9.95.neu/po/el/kdiff3.po
+--- kdiff3-0.9.95/po/el/kdiff3.po 2009-02-01 13:58:20.000000000 +0100
++++ kdiff3-0.9.95.neu/po/el/kdiff3.po 2009-12-29 13:41:10.000000000 +0100
+@@ -999,7 +999,7 @@
+ #: optiondialog.cpp:757
+ msgid ""
+ "On: Any selection is immediately written to the clipboard.\n"
+-"Off: You must explicitely copy e.g. via Ctrl-C."
++"Off: You must explicitly copy e.g. via Ctrl-C."
+ msgstr ""
+ "Ενεργοποιημένο: Οποιαδήποτε επιλογή γράφεται άμεσα στο πρόχειρο. "
+ "Απενεργοποιημένο: Θα πρέπει να την αντιγράψετε εσείς π.χ. μέσω του Ctrl-C."
+diff -r --unified kdiff3-0.9.95/po/en_GB/kdiff3.po kdiff3-0.9.95.neu/po/en_GB/kdiff3.po
+--- kdiff3-0.9.95/po/en_GB/kdiff3.po 2009-02-01 13:58:24.000000000 +0100
++++ kdiff3-0.9.95.neu/po/en_GB/kdiff3.po 2009-12-29 13:41:10.000000000 +0100
+@@ -981,10 +981,10 @@
+ #: optiondialog.cpp:757
+ msgid ""
+ "On: Any selection is immediately written to the clipboard.\n"
+-"Off: You must explicitely copy e.g. via Ctrl-C."
++"Off: You must explicitly copy e.g. via Ctrl-C."
+ msgstr ""
+ "On: Any selection is immediately written to the clipboard.\n"
+-"Off: You must explicitely copy e.g. via Ctrl-C."
++"Off: You must explicitly copy e.g. via Ctrl-C."
+
+ #: optiondialog.cpp:762 mergeresultwindow.cpp:3135
+ msgid "Line end style:"
+diff -r --unified kdiff3-0.9.95/po/es/kdiff3.po kdiff3-0.9.95.neu/po/es/kdiff3.po
+--- kdiff3-0.9.95/po/es/kdiff3.po 2009-02-01 13:58:28.000000000 +0100
++++ kdiff3-0.9.95.neu/po/es/kdiff3.po 2009-12-29 13:41:10.000000000 +0100
+@@ -1012,7 +1012,7 @@
+ #: optiondialog.cpp:757
+ msgid ""
+ "On: Any selection is immediately written to the clipboard.\n"
+-"Off: You must explicitely copy e.g. via Ctrl-C."
++"Off: You must explicitly copy e.g. via Ctrl-C."
+ msgstr ""
+ "On: Se copiará inmediátamente cualquier selección al portapapeles.\n"
+ "Off: Debe copiar explícitamente p.e. via Ctrl-C."
+diff -r --unified kdiff3-0.9.95/po/et/kdiff3.po kdiff3-0.9.95.neu/po/et/kdiff3.po
+--- kdiff3-0.9.95/po/et/kdiff3.po 2009-02-01 13:58:32.000000000 +0100
++++ kdiff3-0.9.95.neu/po/et/kdiff3.po 2009-12-29 13:41:10.000000000 +0100
+@@ -979,7 +979,7 @@
+ #: optiondialog.cpp:757
+ msgid ""
+ "On: Any selection is immediately written to the clipboard.\n"
+-"Off: You must explicitely copy e.g. via Ctrl-C."
++"Off: You must explicitly copy e.g. via Ctrl-C."
+ msgstr ""
+ "Sees: iga valik asetatakse otsekohe lõikepuhvrisse.\n"
+ "Väljas: kopeerimiseks tuleb anda selge käsk, nt. CTRL+C."
+diff -r --unified kdiff3-0.9.95/po/fr/kdiff3.po kdiff3-0.9.95.neu/po/fr/kdiff3.po
+--- kdiff3-0.9.95/po/fr/kdiff3.po 2009-02-01 13:58:36.000000000 +0100
++++ kdiff3-0.9.95.neu/po/fr/kdiff3.po 2009-12-29 13:41:10.000000000 +0100
+@@ -1011,7 +1011,7 @@
+ #: optiondialog.cpp:757
+ msgid ""
+ "On: Any selection is immediately written to the clipboard.\n"
+-"Off: You must explicitely copy e.g. via Ctrl-C."
++"Off: You must explicitly copy e.g. via Ctrl-C."
+ msgstr ""
+ "Activé : toute sélection est immédiatement copiée dans le presse-papiers.\n"
+ "Désactivé : vous devrez effectuer la copie explicitement (par ex. via Ctrl"
+diff -r --unified kdiff3-0.9.95/po/ga/kdiff3.po kdiff3-0.9.95.neu/po/ga/kdiff3.po
+--- kdiff3-0.9.95/po/ga/kdiff3.po 2009-02-01 13:58:40.000000000 +0100
++++ kdiff3-0.9.95.neu/po/ga/kdiff3.po 2009-12-29 13:41:10.000000000 +0100
+@@ -910,7 +910,7 @@
+ #: optiondialog.cpp:757
+ msgid ""
+ "On: Any selection is immediately written to the clipboard.\n"
+-"Off: You must explicitely copy e.g. via Ctrl-C."
++"Off: You must explicitly copy e.g. via Ctrl-C."
+ msgstr ""
+
+ #: optiondialog.cpp:762 mergeresultwindow.cpp:3135
+diff -r --unified kdiff3-0.9.95/po/gl/kdiff3.po kdiff3-0.9.95.neu/po/gl/kdiff3.po
+--- kdiff3-0.9.95/po/gl/kdiff3.po 2009-02-01 13:58:44.000000000 +0100
++++ kdiff3-0.9.95.neu/po/gl/kdiff3.po 2009-12-29 13:41:10.000000000 +0100
+@@ -983,7 +983,7 @@
+ #: optiondialog.cpp:757
+ msgid ""
+ "On: Any selection is immediately written to the clipboard.\n"
+-"Off: You must explicitely copy e.g. via Ctrl-C."
++"Off: You must explicitly copy e.g. via Ctrl-C."
+ msgstr ""
+ "Sinalado: calquera selección é posta automaticamente no portarretallos.\n"
+ "Non sinalado: Terá que copiar explicitamente, p.ex., con Ctrl+C."
+diff -r --unified kdiff3-0.9.95/po/hi/kdiff3.po kdiff3-0.9.95.neu/po/hi/kdiff3.po
+--- kdiff3-0.9.95/po/hi/kdiff3.po 2009-02-01 13:58:48.000000000 +0100
++++ kdiff3-0.9.95.neu/po/hi/kdiff3.po 2009-12-29 13:41:10.000000000 +0100
+@@ -942,7 +942,7 @@
+ #: optiondialog.cpp:757
+ msgid ""
+ "On: Any selection is immediately written to the clipboard.\n"
+-"Off: You must explicitely copy e.g. via Ctrl-C."
++"Off: You must explicitly copy e.g. via Ctrl-C."
+ msgstr ""
+
+ #: optiondialog.cpp:762 mergeresultwindow.cpp:3135
+diff -r --unified kdiff3-0.9.95/po/hu/kdiff3.po kdiff3-0.9.95.neu/po/hu/kdiff3.po
+--- kdiff3-0.9.95/po/hu/kdiff3.po 2009-02-01 13:58:52.000000000 +0100
++++ kdiff3-0.9.95.neu/po/hu/kdiff3.po 2009-12-29 13:41:10.000000000 +0100
+@@ -987,7 +987,7 @@
+ #: optiondialog.cpp:757
+ msgid ""
+ "On: Any selection is immediately written to the clipboard.\n"
+-"Off: You must explicitely copy e.g. via Ctrl-C."
++"Off: You must explicitly copy e.g. via Ctrl-C."
+ msgstr ""
+ "Ha be van jelölve: a kijelölt adatok másolata mindig automatikusan a "
+ "vágólapra kerül.\n"
+diff -r --unified kdiff3-0.9.95/po/it/kdiff3.po kdiff3-0.9.95.neu/po/it/kdiff3.po
+--- kdiff3-0.9.95/po/it/kdiff3.po 2009-02-01 13:58:56.000000000 +0100
++++ kdiff3-0.9.95.neu/po/it/kdiff3.po 2009-12-29 13:41:10.000000000 +0100
+@@ -991,7 +991,7 @@
+ #: optiondialog.cpp:757
+ msgid ""
+ "On: Any selection is immediately written to the clipboard.\n"
+-"Off: You must explicitely copy e.g. via Ctrl-C."
++"Off: You must explicitly copy e.g. via Ctrl-C."
+ msgstr ""
+ "Attivo: ogni selezione è immediatamente copiata negli appunti.\n"
+ "Non attivo: devi esplicitamente copiarla, per esempio con Ctrl-C."
+diff -r --unified kdiff3-0.9.95/po/ja/kdiff3.po kdiff3-0.9.95.neu/po/ja/kdiff3.po
+--- kdiff3-0.9.95/po/ja/kdiff3.po 2009-02-01 13:59:00.000000000 +0100
++++ kdiff3-0.9.95.neu/po/ja/kdiff3.po 2009-12-29 13:41:10.000000000 +0100
+@@ -971,7 +971,7 @@
+ #: optiondialog.cpp:757
+ msgid ""
+ "On: Any selection is immediately written to the clipboard.\n"
+-"Off: You must explicitely copy e.g. via Ctrl-C."
++"Off: You must explicitly copy e.g. via Ctrl-C."
+ msgstr ""
+ "オン: すべての選択は直ちにクリップボードに格納されます。\n"
+ "オフ: Ctrl+C などで明示的にコピーする必要があります。"
+diff -r --unified kdiff3-0.9.95/po/ka/kdiff3.po kdiff3-0.9.95.neu/po/ka/kdiff3.po
+--- kdiff3-0.9.95/po/ka/kdiff3.po 2009-02-01 13:59:03.000000000 +0100
++++ kdiff3-0.9.95.neu/po/ka/kdiff3.po 2009-12-29 13:41:10.000000000 +0100
+@@ -980,7 +980,7 @@
+ #: optiondialog.cpp:757
+ msgid ""
+ "On: Any selection is immediately written to the clipboard.\n"
+-"Off: You must explicitely copy e.g. via Ctrl-C."
++"Off: You must explicitly copy e.g. via Ctrl-C."
+ msgstr ""
+ "ჩართულია: ნებისმიერი მონიშვნა ჯდება გაცვლის ბუფერში.\n"
+ "გამორთულია: თქვენ ასლი უნდა გააკეთოთ მაგ. Ctrl-C."
+diff -r --unified kdiff3-0.9.95/po/kdiff3.pot kdiff3-0.9.95.neu/po/kdiff3.pot
+--- kdiff3-0.9.95/po/kdiff3.pot 2009-01-02 13:47:43.000000000 +0100
++++ kdiff3-0.9.95.neu/po/kdiff3.pot 2009-12-29 13:41:10.000000000 +0100
+@@ -894,7 +894,7 @@
+ #: optiondialog.cpp:757
+ msgid ""
+ "On: Any selection is immediately written to the clipboard.\n"
+-"Off: You must explicitely copy e.g. via Ctrl-C."
++"Off: You must explicitly copy e.g. via Ctrl-C."
+ msgstr ""
+
+ #: optiondialog.cpp:762
+diff -r --unified kdiff3-0.9.95/po/lt/kdiff3.po kdiff3-0.9.95.neu/po/lt/kdiff3.po
+--- kdiff3-0.9.95/po/lt/kdiff3.po 2009-02-01 13:59:08.000000000 +0100
++++ kdiff3-0.9.95.neu/po/lt/kdiff3.po 2009-12-29 13:41:10.000000000 +0100
+@@ -1021,7 +1021,7 @@
+ #: optiondialog.cpp:757
+ msgid ""
+ "On: Any selection is immediately written to the clipboard.\n"
+-"Off: You must explicitely copy e.g. via Ctrl-C."
++"Off: You must explicitly copy e.g. via Ctrl-C."
+ msgstr ""
+
+ #: optiondialog.cpp:762 mergeresultwindow.cpp:3135
+diff -r --unified kdiff3-0.9.95/po/nb/kdiff3.po kdiff3-0.9.95.neu/po/nb/kdiff3.po
+--- kdiff3-0.9.95/po/nb/kdiff3.po 2009-02-01 13:59:14.000000000 +0100
++++ kdiff3-0.9.95.neu/po/nb/kdiff3.po 2009-12-29 13:41:10.000000000 +0100
+@@ -982,7 +982,7 @@
+ #: optiondialog.cpp:757
+ msgid ""
+ "On: Any selection is immediately written to the clipboard.\n"
+-"Off: You must explicitely copy e.g. via Ctrl-C."
++"Off: You must explicitly copy e.g. via Ctrl-C."
+ msgstr ""
+ "På: Alt som markeres skrives straks til utklippstavla.\n"
+ "Av: Du må uttrykkelig kopiere, f.eks. med Ctrl-C."
+diff -r --unified kdiff3-0.9.95/po/nds/kdiff3.po kdiff3-0.9.95.neu/po/nds/kdiff3.po
+--- kdiff3-0.9.95/po/nds/kdiff3.po 2009-02-01 13:59:17.000000000 +0100
++++ kdiff3-0.9.95.neu/po/nds/kdiff3.po 2009-12-29 13:41:10.000000000 +0100
+@@ -980,7 +980,7 @@
+ #: optiondialog.cpp:757
+ msgid ""
+ "On: Any selection is immediately written to the clipboard.\n"
+-"Off: You must explicitely copy e.g. via Ctrl-C."
++"Off: You must explicitly copy e.g. via Ctrl-C."
+ msgstr ""
+ "An: All Kören warrt fuurts na de Twischenaflaag kopeert.\n"
+ "Ut: Du muttst dat Koperen sülven maken, a.B. mit Strg+C."
+diff -r --unified kdiff3-0.9.95/po/nl/kdiff3.po kdiff3-0.9.95.neu/po/nl/kdiff3.po
+--- kdiff3-0.9.95/po/nl/kdiff3.po 2009-02-01 13:59:21.000000000 +0100
++++ kdiff3-0.9.95.neu/po/nl/kdiff3.po 2009-12-29 13:41:10.000000000 +0100
+@@ -1003,7 +1003,7 @@
+ #: optiondialog.cpp:757
+ msgid ""
+ "On: Any selection is immediately written to the clipboard.\n"
+-"Off: You must explicitely copy e.g. via Ctrl-C."
++"Off: You must explicitly copy e.g. via Ctrl-C."
+ msgstr ""
+ "Aan: elke selectie zal onmiddellijk op het klembord geplaatst worden.\n"
+ "Uit: kopiëren gebeurt expliciet, bijvoorbeeld via Ctrl-C."
+diff -r --unified kdiff3-0.9.95/po/pl/kdiff3.po kdiff3-0.9.95.neu/po/pl/kdiff3.po
+--- kdiff3-0.9.95/po/pl/kdiff3.po 2009-02-01 13:59:28.000000000 +0100
++++ kdiff3-0.9.95.neu/po/pl/kdiff3.po 2009-12-29 13:41:10.000000000 +0100
+@@ -994,7 +994,7 @@
+ #: optiondialog.cpp:757
+ msgid ""
+ "On: Any selection is immediately written to the clipboard.\n"
+-"Off: You must explicitely copy e.g. via Ctrl-C."
++"Off: You must explicitly copy e.g. via Ctrl-C."
+ msgstr ""
+ "Włą: Jakiekolwiek zaznaczenie powoduje natychmiastowy zapis do schowka.\n"
+ "Wył: Musisz jawnie skopiować np. poprzez Ctrl-C."
+diff -r --unified kdiff3-0.9.95/po/pt/kdiff3.po kdiff3-0.9.95.neu/po/pt/kdiff3.po
+--- kdiff3-0.9.95/po/pt/kdiff3.po 2009-02-01 13:59:32.000000000 +0100
++++ kdiff3-0.9.95.neu/po/pt/kdiff3.po 2009-12-29 13:41:10.000000000 +0100
+@@ -1002,7 +1002,7 @@
+ #: optiondialog.cpp:757
+ msgid ""
+ "On: Any selection is immediately written to the clipboard.\n"
+-"Off: You must explicitely copy e.g. via Ctrl-C."
++"Off: You must explicitly copy e.g. via Ctrl-C."
+ msgstr ""
+ "Ligado: Qualquer selecção é posta automaticamente na área de transferência.\n"
+ "Desligado: Você tem de copiar explicitamente, p.ex., com o Ctrl-C."
+diff -r --unified kdiff3-0.9.95/po/pt_BR/kdiff3.po kdiff3-0.9.95.neu/po/pt_BR/kdiff3.po
+--- kdiff3-0.9.95/po/pt_BR/kdiff3.po 2009-02-01 13:59:35.000000000 +0100
++++ kdiff3-0.9.95.neu/po/pt_BR/kdiff3.po 2009-12-29 13:41:10.000000000 +0100
+@@ -1004,7 +1004,7 @@
+ #: optiondialog.cpp:757
+ msgid ""
+ "On: Any selection is immediately written to the clipboard.\n"
+-"Off: You must explicitely copy e.g. via Ctrl-C."
++"Off: You must explicitly copy e.g. via Ctrl-C."
+ msgstr ""
+ "Ligado: Qualquer seleção é imediatamente enviada para a Área de "
+ "Transferência.\n"
+diff -r --unified kdiff3-0.9.95/po/ro/kdiff3.po kdiff3-0.9.95.neu/po/ro/kdiff3.po
+--- kdiff3-0.9.95/po/ro/kdiff3.po 2009-02-01 13:59:38.000000000 +0100
++++ kdiff3-0.9.95.neu/po/ro/kdiff3.po 2009-12-29 13:41:10.000000000 +0100
+@@ -921,7 +921,7 @@
+ #: optiondialog.cpp:757
+ msgid ""
+ "On: Any selection is immediately written to the clipboard.\n"
+-"Off: You must explicitely copy e.g. via Ctrl-C."
++"Off: You must explicitly copy e.g. via Ctrl-C."
+ msgstr ""
+
+ #: optiondialog.cpp:762 mergeresultwindow.cpp:3135
+diff -r --unified kdiff3-0.9.95/po/ru/kdiff3.po kdiff3-0.9.95.neu/po/ru/kdiff3.po
+--- kdiff3-0.9.95/po/ru/kdiff3.po 2009-02-01 13:59:42.000000000 +0100
++++ kdiff3-0.9.95.neu/po/ru/kdiff3.po 2009-12-29 13:41:10.000000000 +0100
+@@ -957,7 +957,7 @@
+ #: optiondialog.cpp:757
+ msgid ""
+ "On: Any selection is immediately written to the clipboard.\n"
+-"Off: You must explicitely copy e.g. via Ctrl-C."
++"Off: You must explicitly copy e.g. via Ctrl-C."
+ msgstr ""
+
+ #: optiondialog.cpp:762 mergeresultwindow.cpp:3135
+diff -r --unified kdiff3-0.9.95/po/rw/kdiff3.po kdiff3-0.9.95.neu/po/rw/kdiff3.po
+--- kdiff3-0.9.95/po/rw/kdiff3.po 2009-02-01 13:59:45.000000000 +0100
++++ kdiff3-0.9.95.neu/po/rw/kdiff3.po 2009-12-29 13:41:10.000000000 +0100
+@@ -1075,7 +1075,7 @@
+ #, fuzzy
+ msgid ""
+ "On: Any selection is immediately written to the clipboard.\n"
+-"Off: You must explicitely copy e.g. via Ctrl-C."
++"Off: You must explicitly copy e.g. via Ctrl-C."
+ msgstr "G."
+
+ #: optiondialog.cpp:762 mergeresultwindow.cpp:3135
+diff -r --unified kdiff3-0.9.95/po/sv/kdiff3.po kdiff3-0.9.95.neu/po/sv/kdiff3.po
+--- kdiff3-0.9.95/po/sv/kdiff3.po 2009-02-01 13:59:52.000000000 +0100
++++ kdiff3-0.9.95.neu/po/sv/kdiff3.po 2009-12-29 13:41:10.000000000 +0100
+@@ -984,7 +984,7 @@
+ #: optiondialog.cpp:757
+ msgid ""
+ "On: Any selection is immediately written to the clipboard.\n"
+-"Off: You must explicitely copy e.g. via Ctrl-C."
++"Off: You must explicitly copy e.g. via Ctrl-C."
+ msgstr ""
+ "På: Alla markeringar skrivs omedelbart till klippbordet.\n"
+ "Av: Du måste kopiera explicit, t.ex. via Ctrl-C."
+diff -r --unified kdiff3-0.9.95/po/ta/kdiff3.po kdiff3-0.9.95.neu/po/ta/kdiff3.po
+--- kdiff3-0.9.95/po/ta/kdiff3.po 2009-02-01 13:59:55.000000000 +0100
++++ kdiff3-0.9.95.neu/po/ta/kdiff3.po 2009-12-29 13:41:10.000000000 +0100
+@@ -1003,7 +1003,7 @@
+ #: optiondialog.cpp:757
+ msgid ""
+ "On: Any selection is immediately written to the clipboard.\n"
+-"Off: You must explicitely copy e.g. via Ctrl-C."
++"Off: You must explicitly copy e.g. via Ctrl-C."
+ msgstr ""
+ "எந்த ஒரு தேர்வையும் உடனடியாக கிளிப் போர்டுக்கு எழுதவும்.\n"
+ "நீங்கள் வெளிப்படையாக படிவு செய்"
+diff -r --unified kdiff3-0.9.95/po/tg/kdiff3.po kdiff3-0.9.95.neu/po/tg/kdiff3.po
+--- kdiff3-0.9.95/po/tg/kdiff3.po 2009-02-01 14:00:00.000000000 +0100
++++ kdiff3-0.9.95.neu/po/tg/kdiff3.po 2009-12-29 13:41:10.000000000 +0100
+@@ -986,7 +986,7 @@
+ #: optiondialog.cpp:757
+ msgid ""
+ "On: Any selection is immediately written to the clipboard.\n"
+-"Off: You must explicitely copy e.g. via Ctrl-C."
++"Off: You must explicitly copy e.g. via Ctrl-C."
+ msgstr ""
+
+ #: optiondialog.cpp:762 mergeresultwindow.cpp:3135
+diff -r --unified kdiff3-0.9.95/po/tr/kdiff3.po kdiff3-0.9.95.neu/po/tr/kdiff3.po
+--- kdiff3-0.9.95/po/tr/kdiff3.po 2009-02-01 14:00:04.000000000 +0100
++++ kdiff3-0.9.95.neu/po/tr/kdiff3.po 2009-12-29 13:41:10.000000000 +0100
+@@ -966,7 +966,7 @@
+ #: optiondialog.cpp:757
+ msgid ""
+ "On: Any selection is immediately written to the clipboard.\n"
+-"Off: You must explicitely copy e.g. via Ctrl-C."
++"Off: You must explicitly copy e.g. via Ctrl-C."
+ msgstr ""
+
+ #: optiondialog.cpp:762 mergeresultwindow.cpp:3135
+diff -r --unified kdiff3-0.9.95/po/uk/kdiff3.po kdiff3-0.9.95.neu/po/uk/kdiff3.po
+--- kdiff3-0.9.95/po/uk/kdiff3.po 2009-02-01 14:00:08.000000000 +0100
++++ kdiff3-0.9.95.neu/po/uk/kdiff3.po 2009-12-29 13:41:10.000000000 +0100
+@@ -993,7 +993,7 @@
+ #: optiondialog.cpp:757
+ msgid ""
+ "On: Any selection is immediately written to the clipboard.\n"
+-"Off: You must explicitely copy e.g. via Ctrl-C."
++"Off: You must explicitly copy e.g. via Ctrl-C."
+ msgstr ""
+ "Увімкнено: Будь-яка вибрана область копіюється до кишені.\n"
+ "Вимкнено: Явне проведення копіювання, наприклад, за допомогою Ctrl-C."
+diff -r --unified kdiff3-0.9.95/po/zh_CN/kdiff3.po kdiff3-0.9.95.neu/po/zh_CN/kdiff3.po
+--- kdiff3-0.9.95/po/zh_CN/kdiff3.po 2009-02-01 14:00:14.000000000 +0100
++++ kdiff3-0.9.95.neu/po/zh_CN/kdiff3.po 2009-12-29 13:41:10.000000000 +0100
+@@ -972,7 +972,7 @@
+ #: optiondialog.cpp:757
+ msgid ""
+ "On: Any selection is immediately written to the clipboard.\n"
+-"Off: You must explicitely copy e.g. via Ctrl-C."
++"Off: You must explicitly copy e.g. via Ctrl-C."
+ msgstr ""
+ "打开：任何选择将被自动写入剪贴板。\n"
+ "关闭：您必须明确复制内容，如通过 Ctrl-C。"
+Nur in kdiff3-0.9.95.neu/src-QT4: kdiff3.gch.
+diff -r --unified kdiff3-0.9.95/src-QT4/optiondialog.cpp kdiff3-0.9.95.neu/src-QT4/optiondialog.cpp
+--- kdiff3-0.9.95/src-QT4/optiondialog.cpp 2009-03-03 22:51:08.000000000 +0100
++++ kdiff3-0.9.95.neu/src-QT4/optiondialog.cpp 2009-12-29 13:42:11.000000000 +0100
+@@ -755,7 +755,7 @@
+ gbox->addWidget( pAutoCopySelection, line, 0, 1, 2 );
+ pAutoCopySelection->setToolTip( i18n(
+ "On: Any selection is immediately written to the clipboard.\n"
+- "Off: You must explicitely copy e.g. via Ctrl-C."
++ "Off: You must explicitly copy e.g. via Ctrl-C."
+ ));
+ ++line;
+
--- kdiff3-0.9.95.orig/debian/patches/create_qm_files.patch
+++ kdiff3-0.9.95/debian/patches/create_qm_files.patch
@@ -0,0 +1,12 @@
+--- po/create_qm_files.orig 2009-03-03 22:18:54.000000000 +0100
++++ po/create_qm_files 2009-03-07 15:26:40.000000000 +0100
+@@ -35,7 +35,8 @@
+ if [ -s $i/kdiff3.po ]; then
+ # (msg2qm is from "qt3-devel-tools"-package.)
+ echo Installing /usr/share/locale/$i/LC_MESSAGES/kdiff3.qm
+- sudo /usr/lib/qt3/bin/msg2qm $i/kdiff3.po /usr/share/locale/$i/LC_MESSAGES/kdiff3.qm
++ mkdir --parents $INSTALL_ROOT/usr/share/locale/$i/LC_MESSAGES/
++ msg2qm $i/kdiff3.po $INSTALL_ROOT/usr/share/locale/$i/LC_MESSAGES/kdiff3.qm
+ fi
+ done
+ else
--- kdiff3-0.9.95.orig/debian/patches/kdiff3.pro.patch
+++ kdiff3-0.9.95/debian/patches/kdiff3.pro.patch
@@ -0,0 +1,17 @@
+--- kdiff3-0.9.94.orig/src-QT4/kdiff3.pro
++++ kdiff3-0.9.94/src-QT4/kdiff3.pro
+@@ -56,11 +56,11 @@
+
+
+ unix {
+- documentation.path = /usr/local/share/doc/kdiff3
+- documentation.files = ../doc/*
++ documentation.path = /usr/share/doc/kdiff3
++# documentation.files = ../doc/*
+
+ INSTALLS += documentation
+
+- target.path = /usr/local/bin
++ target.path = /usr/bin
+ INSTALLS += target
+ }
--- kdiff3-0.9.95.orig/debian/patches/detached-process.patch
+++ kdiff3-0.9.95/debian/patches/detached-process.patch
@@ -0,0 +1,56 @@
+--- kdiff3-0.9.95/kdiff3plugin-QT4/kdiff3plugin.cpp 2008-10-26 22:55:20.000000000 +0100
++++ kdiff3-0.9.95-lnet1/kdiff3plugin-QT4/kdiff3plugin.cpp 2009-12-23 15:59:37.000000000 +0100
+@@ -184,7 +184,7 @@
+ QStringList args;
+ args << s_pHistory->front();
+ args << m_list.front();
+- KProcess::execute("kdiff3", args);
++ KProcess::startDetached("kdiff3", args);
+ }
+ }
+
+@@ -196,7 +196,7 @@
+ QStringList args;
+ args << pAction->text();
+ args << m_list.front();
+- KProcess::execute ("kdiff3", args);
++ KProcess::startDetached ("kdiff3", args);
+ }
+ }
+
+@@ -207,7 +207,7 @@
+ QStringList args;
+ args << m_list.front();
+ args << m_list.back();
+- KProcess::execute ("kdiff3", args);
++ KProcess::startDetached ("kdiff3", args);
+ }
+ }
+
+@@ -219,7 +219,7 @@
+ args << m_list[0];
+ args << m_list[1];
+ args << m_list[2];
+- KProcess::execute ("kdiff3", args);
++ KProcess::startDetached ("kdiff3", args);
+ }
+ }
+
+@@ -231,7 +231,7 @@
+ args << s_pHistory->front();
+ args << m_list.front();
+ args << ( "-o" + m_list.front() );
+- KProcess::execute ("kdiff3", args);
++ KProcess::startDetached ("kdiff3", args);
+ }
+ }
+
+@@ -244,7 +244,7 @@
+ args << (*s_pHistory)[0];
+ args << m_list.front();
+ args << ("-o" + m_list.front());
+- KProcess::execute ("kdiff3", args);
++ KProcess::startDetached ("kdiff3", args);
+ }
+ }
+
![[patchlogo]](http://patch-tracker.debian.org/static/img/swirlpatch.png)