From: Eike Sauer Date: Wed, 23 Jan 2019 19:25:00 +0000 (+0000) Subject: kdiff3 (1.7.90-3) unstable; urgency=low X-Git-Tag: archive/raspbian/1.10.0-1+rpi1~1^2^2^2~3 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=000cf72835e898c5116c7fa1b2c6f0ab7799992b;p=kdiff3.git kdiff3 (1.7.90-3) unstable; urgency=low * Hopefully did fix lib atomic problem now. [dgit import unpatched kdiff3 1.7.90-3] --- 000cf72835e898c5116c7fa1b2c6f0ab7799992b diff --cc debian/changelog index 0000000,0000000..856f03e new file mode 100644 --- /dev/null +++ b/debian/changelog @@@ -1,0 -1,0 +1,388 @@@ ++kdiff3 (1.7.90-3) unstable; urgency=low ++ ++ * Hopefully did fix lib atomic problem now. ++ ++ -- Eike Sauer Wed, 23 Jan 2019 20:25:00 +0100 ++ ++kdiff3 (1.7.90-2) unstable; urgency=low ++ ++ * Fixed file conflict between kdiff3 and kdiff3-doc - sorry! ++ (Closes: #919310) ++ * Fixed various warnings (lintian, multi-arch, watch file) ++ * Trying to link with lib atomic for some 32 bit architectures. ++ Not yet closing bug #919406 as I'm not sure it will work. ++ ++ -- Eike Sauer Sat, 19 Jan 2019 12:12:00 +0100 ++ ++kdiff3 (1.7.90-1) unstable; urgency=low ++ ++ * KDiff3 has been orphaned by Joachim Eibl - thanks for writing ++ this great program and maintaining it for over a decade! ++ * It has been adopted by KDE, in particular Michael Reeves ++ - thanks for keeping KDiff3 alive! ++ * ported to KDE 5/QT5 by Michael Reeves (closes: #874949) ++ * The QT only version has been "lost in translation". ++ * works now in KDE 5 dolphin (closes: #801680) ++ ++ -- Eike Sauer Tue, 08 Jan 2019 11:17:00 +0100 ++ ++kdiff3 (0.9.98-4) unstable; urgency=low ++ ++ * Removed vcs-* info from debian/control. ++ It didn't point to package source. ++ * Removed libkonq5-dev from Build-Depends (closes: #887478) ++ * Fixed minor stuff reported by cme ++ * kdiff3-doc marked as Multi-Arch: foreign ++ ++ -- Eike Sauer Thu, 25 Jan 2018 17:28:00 +0100 ++ ++kdiff3 (0.9.98-3) unstable; urgency=low ++ ++ * Removed usage of MAX_PATH which doesn't exist on hurd (closes: #823042) ++ * Fixed lintian waring dep5-copyright-license-name-not-unique ++ * Use UTF-8 for documentation generation, no matter the system's locale. ++ Improvement in reproducible builds. ++ * Updated standard version to 3.9.8. No changes needed. ++ ++ -- Eike Sauer Sat, 07 May 2016 17:42:00 +0200 ++ ++kdiff3 (0.9.98-2) unstable; urgency=low ++ ++ * Workaround for differences not showing in status bar after ++ start (closes: #757206). ++ * Fixed crash I was getting by comparing two completely different files ++ * Finally got rid of the lintian hardening warning for kdiff3-qt ++ * Updated standard version to 3.9.6. No changes needed. ++ ++ -- Eike Sauer Sun, 26 Jul 2015 12:31:00 +0200 ++ ++kdiff3 (0.9.98-1) unstable; urgency=low ++ ++ * New upstream release ++ * Got rid of many unnecessary depends thanks to patch from ++ Pino Toscano (closes: #749460). ++ * Included patch from Pino Toscano to enable parallel build ++ (closes: #749459). ++ * We need to build or html doc files on our own now. ++ ++ -- Eike Sauer Sun, 03 Aug 2014 17:37:00 +0200 ++ ++kdiff3 (0.9.97-3) unstable; urgency=low ++ ++ * Included upstream fix for merge saving bug (closes: #703174). ++ * No more using docbook-to-man, which has been orphaned years ago. ++ ++ -- Eike Sauer Sun, 16 Jun 2013 13:05:00 +0200 ++ ++kdiff3 (0.9.97-2) unstable; urgency=low ++ ++ * Path to help file in kdiff3-qt fixed (closes: #700424) ++ (doesn't look beautiful, but at least there's some text...) ++ * Updated standard version to 3.9.4. No changes needed. ++ ++ -- Eike Sauer Sun, 01 Mar 2013 11:42:00 +0100 ++ ++kdiff3 (0.9.97-1) unstable; urgency=low ++ ++ * New upstream release ++ * Upstream has accepted and improved my find dialog patch ++ ++ -- Eike Sauer Sat, 26 Jan 2013 11:54:44 +0100 ++ ++kdiff3 (0.9.96-4) unstable; urgency=low ++ ++ * Fixed lintian sutff: ++ - lintian override about versioned dependency for debhelper ++ - build dependency for dpkg-dev ++ - additional (redundant) licence paragraph ++ * Preset text selected when reentering find dialog ++ ++ -- Eike Sauer Sat, 28 May 2012 20:00:00 +0200 ++ ++kdiff3 (0.9.96-3) unstable; urgency=low ++ ++ * Dropped dependency on qt3-dev-tools-compat (closes: #673455) ++ * Standards version now 3.9.3 ++ * Machine readable debian/copyright file ++ * Hardening flags (AFAICT, the lintian warnings on this are wrong) ++ ++ -- Eike Sauer Sat, 19 May 2012 15:00:00 +0200 ++ ++kdiff3 (0.9.96-2) unstable; urgency=low ++ ++ * Renamed "debian" patch (closes: #643175) ++ * Standards version now 3.9.2 (no changes) ++ * My old mail address is gone (after 17 years *sigh*), ++ replaced it where appropriate ++ ++ -- Eike Sauer Tue, 27 Sep 2011 20:00:00 +0200 ++ ++kdiff3 (0.9.96-1) unstable; urgency=low ++ ++ * New upstream release (closes: #620050, #614834) ++ Several patches have been taken by upstream ++ ++ -- Eike Sauer Mon, 05 Sep 2011 20:07:54 +0200 ++ ++kdiff3 (0.9.95-7) unstable; urgency=low ++ ++ * I officially do declare that Filipus Klutiero and Filipus Klutiero ++ are _not_ different people (see last changelog entry). ++ * Made compilable for KDE 4.5, thanks to Adrian von Bidder (closes: #599806) ++ * Standards version now 3.9.1 (no changes) ++ * Doc package Replaces/Breaks old kdiff3 version instead of "Conflicts". ++ ++ -- Eike Sauer Tue, 12 Oct 2010 00:05:00 +0200 ++ ++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 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 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 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 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 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 Sat, 07 Mar 2009 14:16:09 +0100 ++ ++kdiff3 (0.9.94-3) experimental; urgency=low ++ ++ * Improved package descriptions ++ ++ -- Eike Sauer 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 Tue, 21 Feb 2009 20:00:00 +0100 ++ ++kdiff3 (0.9.94-1) experimental; urgency=low ++ ++ * New upstream release ++ ++ -- Eike Sauer 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 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 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 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 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 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 Tue, 30 Nov 2006 20:15:00 +0200 ++ ++kdiff3 (0.9.90-4) unstable; urgency=low ++ ++ * Added AM_MAINTAINER_MODE ++ ++ -- Eike Sauer Tue, 12 Oct 2006 14:00:00 +0200 ++ ++kdiff3 (0.9.90-3) unstable; urgency=low ++ ++ * More autotooling stuff... ++ ++ -- Eike Sauer 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 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 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 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 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 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 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 Sun, 10 Apr 2005 22:14:00 +0100 ++ ++kdiff3 (0.9.88-1) unstable; urgency=low ++ ++ * New upstream release ++ ++ -- Eike Sauer Sat, 26 Feb 2005 18:07:03 +0100 ++ ++kdiff3 (0.9.87-1) unstable; urgency=low ++ ++ * New upstream release ++ ++ -- Eike Sauer Sun, 30 Jan 2005 19:08:52 +0100 ++ ++kdiff3 (0.9.86-1) unstable; urgency=low ++ ++ * New upstream release ++ ++ -- Eike Sauer Tue, 15 Jun 2004 11:28:59 +0200 ++ ++kdiff3 (0.9.84-1) unstable; urgency=low ++ ++ * New upstream release ++ ++ -- Eike Sauer 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 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 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 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 Mon, 12 Jan 2004 02:11:51 +0100 ++ ++kdiff3 (0.9.80-1) unstable; urgency=low ++ ++ * New upstream release ++ ++ -- Eike Sauer 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 Wed, 5 Nov 2003 00:25:06 +0100 diff --cc debian/compat index 0000000,0000000..ec63514 new file mode 100644 --- /dev/null +++ b/debian/compat @@@ -1,0 -1,0 +1,1 @@@ ++9 diff --cc debian/control index 0000000,0000000..a13f778 new file mode 100644 --- /dev/null +++ b/debian/control @@@ -1,0 -1,0 +1,53 @@@ ++Source: kdiff3 ++Maintainer: Eike Sauer ++Section: kde ++Priority: optional ++Build-Depends: cdbs, debhelper, docbook-to-man, cmake, extra-cmake-modules, qtbase5-dev, libkf5coreaddons-dev, libkf5crash-dev, libkf5doctools-dev, libkf5iconthemes-dev, libkf5i18n-dev, libkf5parts-dev ++Standards-Version: 3.9.8 ++Homepage: http://kdiff3.sourceforge.net ++ ++Package: kdiff3 ++Architecture: any ++Depends: ${shlibs:Depends}, ++ ${misc:Depends} ++Recommends: kdiff3-doc ++Breaks: kdiff3-qt (<<1.0) ++Replaces: kdiff3-qt (<<1.0) ++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: all ++Multi-Arch: foreign ++Depends: ${misc:Depends} ++Section: oldlibs ++Recommends: kdiff3 (>=1.7.90-2) ++Description: transistional package - QT version is replaced by KDE version 'kdiff3' ++ This is a transitional package. It can safely be removed. ++ . ++ This version of KDiff3 was stripped-down so it didn't depend on the KDE ++ libraries. It is replaced by the full-featured version of the program, ++ "kdiff3". ++ ++Package: kdiff3-doc ++Architecture: all ++Multi-Arch: foreign ++Section: doc ++Depends: ${misc:Depends} ++Recommends: kdiff3 ++Breaks: kdiff3 (<= 1.7.90-1) ++Replaces: kdiff3 (<= 1.7.90-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. diff --cc debian/copyright index 0000000,0000000..ec2e4d8 new file mode 100644 --- /dev/null +++ b/debian/copyright @@@ -1,0 -1,0 +1,25 @@@ ++Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ ++Upstream-Name: kdiff3 ++Upstream-Contact: Michael Reeves ++Source: https://cgit.kde.org/kdiff3.git ++ ++Files: * ++Copyright: 2002-2014 by Joachim Eibl, 2018-2019 Michael Reeves ++License: GPL-2+ ++ 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. diff --cc debian/docs index 0000000,0000000..50bd824 new file mode 100644 --- /dev/null +++ b/debian/docs @@@ -1,0 -1,0 +1,2 @@@ ++NEWS ++README diff --cc debian/kdiff3-doc.doc-base index 0000000,0000000..73d3cdc new file mode 100644 --- /dev/null +++ b/debian/kdiff3-doc.doc-base @@@ -1,0 -1,0 +1,13 @@@ ++Document: kdiff3 ++Title: KDiff3 Handbook ++Author: Joachim Eibl ++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 diff --cc debian/kdiff3-doc.install index 0000000,0000000..3f5cadd new file mode 100644 --- /dev/null +++ b/debian/kdiff3-doc.install @@@ -1,0 -1,0 +1,2 @@@ ++usr/share/doc/ ++# usr/share/doc/kdiff3-doc/html diff --cc debian/kdiff3-doc.links index 0000000,0000000..36f18e4 new file mode 100644 --- /dev/null +++ b/debian/kdiff3-doc.links @@@ -1,0 -1,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 diff --cc debian/kdiff3-docs.docs index 0000000,0000000..efea0a6 new file mode 100644 --- /dev/null +++ b/debian/kdiff3-docs.docs @@@ -1,0 -1,0 +1,2 @@@ ++README.Debian ++README.source diff --cc debian/kdiff3.install index 0000000,0000000..72cbc22 new file mode 100644 --- /dev/null +++ b/debian/kdiff3.install @@@ -1,0 -1,0 +1,8 @@@ ++usr/bin ++usr/lib ++usr/share/metainfo ++usr/share/applications ++usr/share/icons ++usr/share/kservices5 ++usr/share/kxmlgui5 ++usr/share/man diff --cc debian/kdiff3.sgml index 0000000,0000000..4a3a81e new file mode 100644 --- /dev/null +++ b/debian/kdiff3.sgml @@@ -1,0 -1,0 +1,258 @@@ ++ 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. ++ ++ --> ++ ++ ++ EIKE"> ++ SAUER"> ++ ++ Oktober 2, 2006"> ++ ++ 1"> ++ eike@debian.org>"> ++ ++ KDIFF3"> ++ ++ ++ Debian"> ++ GNU"> ++ GPL"> ++]> ++ ++ ++ ++
++ &dhemail; ++
++ ++ &dhfirstname; ++ &dhsurname; ++ ++ ++ 2003, 2006 ++ &dhusername; ++ ++ &dhdate; ++ ++ ++ &dhucpackage; ++ ++ &dhsection; ++ ++ ++ &dhpackage; ++ ++ compares two or three input files or directories ++ ++ ++ ++ &dhpackage; ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ DESCRIPTION ++ ++ This manual page documents briefly the ++ &dhpackage; tool. ++ ++ This manual page was written for the &debian; distribution ++ because the original program does not have a manual page. ++ For comprehensive help, please see khelpcenter help:/kdiff3. ++ ++ ++ &dhpackage; is a program that ++ ++ compares or merges two or three text input files or directories ++ shows the differences line by line and character by character ++ provides an automatic merge-facility and ++ an integrated editor for comfortable solving of merge-conflicts ++ supports Unicode, UTF-8 and other codecs ++ supports KIO on KDE (allows accessing ftp, sftp, fish, smb etc.) ++ Printing of differences ++ Manual alignment of lines ++ Automatic merging of version control history ($Log$) ++ ++ ++ ++ ++ ++ OPTIONS ++ ++ 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 ++ &dhpackage; --help. ++ ++ ++ ++ ++ ++ ++ ++ Merge the input. ++ ++ ++ ++ ++ ++ ++ Explicit base file. For compatibility with certain tools. ++ ++ ++ ++ ++ ++ ++ Output file. Implies -m. E.g.: -o newfile.txt ++ ++ ++ ++ ++ ++ ++ Output file, again. (For compatibility with certain tools.) ++ ++ ++ ++ ++ ++ ++ No GUI if all conflicts are auto-solvable. (Needs -o file) ++ ++ ++ ++ ++ ++ ++ Don't solve conflicts automatically. (For compatibility...) ++ ++ ++ ++ ++ ++ ++ Visible name replacement for first file/base file. ++ ++ ++ ++ ++ ++ ++ Visible name replacement for second file. ++ ++ ++ ++ ++ ++ ++ Visible name replacement for third file. ++ ++ ++ ++ ++ ++ ++ Visible name replacement. May by supplied for each input. ++ ++ ++ ++ ++ ++ ++ Change a setting, e. g. --cs "AutoAdvance=1". ++ ++ ++ ++ ++ ++ ++ Show a list of all settings and their values. ++ ++ ++ ++ ++ ++ ++ Use a different settings file. ++ ++ ++ ++ ++ ++ ++ Show author of program. ++ ++ ++ ++ ++ ++ ++ Show version of program. ++ ++ ++ ++ ++ ++ ++ Show license of program. ++ ++ ++ ++ ++ ++ AUTHOR ++ ++ 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). ++ ++ ++ On Debian systems, the complete text of the GNU General Public ++ License can be found in /usr/share/common-licenses/GPL. ++ ++ ++ ++ ++ ++ diff --cc debian/patches/appstream-metainfo.diff index 0000000,0000000..51f6e66 new file mode 100644 --- /dev/null +++ b/debian/patches/appstream-metainfo.diff @@@ -1,0 -1,0 +1,14 @@@ ++Description: AppStream metadata moved ++Author: ++--- ++This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ ++--- a/src/CMakeLists.txt +++++ b/src/CMakeLists.txt ++@@ -59,6 +59,6 @@ install( FILES kdiff3_part.rc DESTINATI ++ install( FILES kdiff3_shell.rc DESTINATION ${KDE_INSTALL_KXMLGUI5DIR}/kdiff3 ) ++ #install( PROGRAMS kdiff3.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} ) ++ install( PROGRAMS org.kde.kdiff3.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} ) ++-install( FILES org.kde.kdiff3.appdata.xml DESTINATION ${SHARE_INSTALL_PREFIX}/appdata ) +++install( FILES org.kde.kdiff3.appdata.xml DESTINATION ${SHARE_INSTALL_PREFIX}/metainfo ) ++ ++ add_subdirectory(icons) diff --cc debian/patches/libatomic.diff index 0000000,0000000..2e962dd new file mode 100644 --- /dev/null +++ b/debian/patches/libatomic.diff @@@ -1,0 -1,0 +1,13 @@@ ++Description: Adding libatomic for some 32 bit targets ++Author: eike@debian.org ++--- a/CMakeLists.txt +++++ b/CMakeLists.txt ++@@ -51,7 +51,7 @@ find_package( ++ ) ++ ++ ++-set(KDiff3_LIBRARIES ${Qt5PrintSupport_LIBRARIES} KF5::I18n KF5::CoreAddons KF5::Crash KF5::IconThemes ) +++set(KDiff3_LIBRARIES ${Qt5PrintSupport_LIBRARIES} KF5::I18n KF5::CoreAddons KF5::Crash KF5::IconThemes atomic ) ++ ++ if (CMAKE_CXX_COMPILER_ID MATCHES "Clang") ++ #Adjust clang specific warnings diff --cc debian/patches/series index 0000000,0000000..dcdd898 new file mode 100644 --- /dev/null +++ b/debian/patches/series @@@ -1,0 -1,0 +1,2 @@@ ++appstream-metainfo.diff ++libatomic.diff diff --cc debian/rules index 0000000,0000000..0d10aa8 new file mode 100755 --- /dev/null +++ b/debian/rules @@@ -1,0 -1,0 +1,34 @@@ ++#!/usr/bin/make -f ++# Uncomment this to turn on verbose mode. ++#export DH_VERBOSE=1 ++#export DH_OPTIONS=-v ++ ++#%: ++# dh $@ ++ ++# Use override_dh_* targets to customize this. ++# --------------------------------------------------- ++ ++DEB_COMPRESS_EXCLUDE := ".docbook" ++DEB_BUILD_PARALLEL = 1 ++export DEB_LDFLAGS_MAINT_APPEND := -Wl,--as-needed ++ ++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 ++DPKG_EXPORT_BUILDFLAGS = 1 ++include /usr/share/dpkg/buildflags.mk ++ ++install/kdiff3:: ++ # install man page ++ mkdir --parents $(DEB_DESTDIR)usr/share/man/man1 ++ docbook-to-man debian/kdiff3.sgml > $(DEB_DESTDIR)usr/share/man/man1/kdiff3.1 ++ # update gnome's icon cache ++ dh_icons --package kdiff3 --tmpdir=debian/tmp ++ ++install/kdiff3-doc:: ++ # generate HTML help ++ mkdir --parents $(DEB_DESTDIR)usr/share/doc/kdiff3-doc/html/ ++ cp doc/en/index.docbook $(DEB_DESTDIR)usr/share/doc/kdiff3-doc/html/ ++ # use UTF-8 for documentation generation, no matter the system's locale ++ cd $(DEB_DESTDIR)usr/share/doc/kdiff3-doc/html/ && LC_ALL=C.UTF-8 meinproc5 index.docbook diff --cc debian/source/format index 0000000,0000000..163aaf8 new file mode 100644 --- /dev/null +++ b/debian/source/format @@@ -1,0 -1,0 +1,1 @@@ ++3.0 (quilt) diff --cc debian/source/lintian-overrides index 0000000,0000000..e061568 new file mode 100644 --- /dev/null +++ b/debian/source/lintian-overrides @@@ -1,0 -1,0 +1,2 @@@ ++# see http://lintian.debian.org/tags/package-needs-versioned-debhelper-build-depends.html ++kdiff3 source: package-needs-versioned-debhelper-build-depends