From: Pino Toscano Date: Tue, 28 Jun 2022 05:56:45 +0000 (+0100) Subject: kdiff3 (1.9.6-1) unstable; urgency=medium X-Git-Tag: archive/raspbian/1.10.0-1+rpi1~1^2~1 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=cc660da78df8e9d7cc10104c2f336ed8905d99a2;p=kdiff3.git kdiff3 (1.9.6-1) unstable; urgency=medium * New upstream release. * Bump Standards-Version to 4.6.1, no changes required. [dgit import unpatched kdiff3 1.9.6-1] --- cc660da78df8e9d7cc10104c2f336ed8905d99a2 diff --cc debian/changelog index 0000000,0000000..4bf8cf6 new file mode 100644 --- /dev/null +++ b/debian/changelog @@@ -1,0 -1,0 +1,544 @@@ ++kdiff3 (1.9.6-1) unstable; urgency=medium ++ ++ * New upstream release. ++ * Bump Standards-Version to 4.6.1, no changes required. ++ ++ -- Pino Toscano Tue, 28 Jun 2022 07:56:45 +0200 ++ ++kdiff3 (1.9.5-1) unstable; urgency=medium ++ ++ * New upstream release. ++ ++ -- Pino Toscano Fri, 04 Mar 2022 21:45:46 +0100 ++ ++kdiff3 (1.9.4-1) unstable; urgency=medium ++ ++ * New upstream release. ++ * Mark the xauth, and xvfb build dependencies as nocheck, as they are needed ++ only by dh_auto_test. ++ ++ -- Pino Toscano Mon, 22 Nov 2021 23:41:34 +0100 ++ ++kdiff3 (1.9.3-1) unstable; urgency=medium ++ ++ * New upstream release. ++ * Bump Standards-Version to 4.6.0, no changes required. ++ ++ -- Pino Toscano Sat, 21 Aug 2021 07:38:38 +0200 ++ ++kdiff3 (1.9.2-2) unstable; urgency=medium ++ ++ * Replace patch libatomic.diff by specifying -latomic instead via ++ dpkg-buildflags, making sure it cannot be left out by as-needed; ++ for now this is done on: armel m68k mipsel powerpc sh4. ++ Hopefully, this should fix linking the atomic functions. ++ ++ -- Pino Toscano Mon, 16 Aug 2021 06:31:39 +0200 ++ ++kdiff3 (1.9.2-1) unstable; urgency=medium ++ ++ * New upstream release. ++ * Update the build dependencies according to the upstream build system: ++ - bump cmake to 3.8 ++ - bump the Qt packages to 5.8.0 ++ - bump the KF packages to 5.37.0 ++ - add libboost-dev ++ - drop libkf5iconthemes-dev ++ * Update the patches: ++ - libatomic.diff: refresh/update ++ * There are unit tests that require a display, so: ++ - add the xauth, and xvfb build dependencies ++ - run dh_auto_test with xvfb-run ++ * Update install files. ++ ++ -- Pino Toscano Sun, 15 Aug 2021 17:31:23 +0200 ++ ++kdiff3 (1.8.5-1) unstable; urgency=medium ++ ++ * New upstream release. ++ * Set upstream metadata fields: Repository, Repository-Browse. ++ * Bump Standards-Version to 4.5.1, no changes required. ++ * Use execute_after_dh_auto_install to avoid invoking dh_auto_install ++ manually. ++ ++ -- Pino Toscano Thu, 21 Jan 2021 11:40:18 +0100 ++ ++kdiff3 (1.8.4-1) unstable; urgency=medium ++ ++ [ Debian Janitor ] ++ * Fix day-of-week for changelog entries 0.9.97-2, 0.9.96-4, 0.9.95-5, ++ 0.9.95-4, 0.9.94-3, 0.9.94-2, 0.9.93-3-1, 0.9.92-3, 0.9.92-2, 0.9.90-5, ++ 0.9.90-4, 0.9.90-3, 0.9.90-2, 0.9.88-5. ++ ++ [ Pino Toscano ] ++ * New upstream release. ++ * Bump the debhelper compatibility to 13: ++ - switch the debhelper-compat build dependency to 13 ++ * Change the kdiff3 recommend in kdiff3-qt to a dependency, to make sure ++ that the transitional package actually works as such. ++ * Switch Source in copyright to https://invent.kde.org/sdk/kdiff3. ++ * Remove the explicit as-needed linking, as it is done by binutils now. ++ ++ -- Pino Toscano Fri, 04 Sep 2020 11:55:08 +0200 ++ ++kdiff3 (1.8.3-1) unstable; urgency=medium ++ ++ * New upstream release: ++ - fixes handling of the -L command line option (Closes: #939017) ++ - fixes missing menu items (Closes: #962960) ++ * Update the build dependencies according to the upstream build system: ++ - bump the KF packages to 5.27.0 ++ * Update the patches: ++ - upstream_Don-t-try-to-set-value-unless-scrollbar-exists.patch: drop, ++ backported from upstream ++ - libatomic.diff: refresh ++ * Add the upstream signing key. ++ * Do not ship the diff_ext.mo translations, as they are for a component ++ specific for Windows. ++ ++ -- Pino Toscano Sun, 05 Jul 2020 08:17:21 +0200 ++ ++kdiff3 (1.8.01-2) unstable; urgency=medium ++ ++ * Switch the maintainer to Debian KDE Extras Team, as agreed with Eike; ++ keep him as Uploader, and add myself too. ++ * Drop the local man page, since upstream already provides one, so our ++ version overwrites it: ++ - remove kdiff3.sgml ++ - remove the docbook-to-man build dependency ++ * Do not use dh_icons anymore, as there are already file triggers to update ++ the icon theme caches. ++ * Add Vcs-* fields. ++ * Stop generating the HTML documentation, as it is generally not shipped ++ for KDE applications: (Closes: #924187) ++ - drop kdiff3-doc.doc-base, and kdiff3-doc.links ++ * Do not try to ship README.Debian, and README.source as documentation for ++ kdiff3-docs, as these files do not exist ++ - drop kdiff3-docs.docs ++ * Stop installing the NEWS file as documentation for kdiff3, as this file ++ only points to ChangeLog. ++ * Add the configuration for the CI on salsa. ++ * Sort, and clean the install files. ++ * Update the build dependencies according to the upstream build system: ++ - add the version required for cmake, extra-cmake-modules, Qt5, and the ++ KF5 packages ++ - explicitly add gettext, libkf5config-dev, libkf5kio-dev, and ++ libkf5widgetsaddons-dev ++ * Switch from cdbs to the dh sequencer with the kf5 dh addon ++ - replace the cdbs build dependency with pkg-kde-tools ++ * Bump the debhelper compatibility to 12: ++ - switch the debhelper build dependency to debhelper-compat 12 ++ - remove debian/compat ++ * Rename debian/docs to debian/kdiff3.docs, to make to explicit which package ++ it refers to. ++ * Add Rules-Requires-Root: no. ++ * Remove unused lintian override. ++ * Remove the trailing whitespaces in changelog, and control. ++ * Ship also the translations. (Closes: #932887) ++ * Use https for Format in copyright. ++ * Bump Standards-Version to 4.5.0, no changes required. ++ * Add a watch file. ++ * Replace the patch fix-crash.patch with the upstream commit ++ 6fd52582694f5616df3ec135fe22f21fc281036d; patch ++ upstream_Don-t-try-to-set-value-unless-scrollbar-exists.patch. ++ * Slightly rework the descriptions. ++ ++ -- Pino Toscano Tue, 30 Jun 2020 07:07:37 +0200 ++ ++kdiff3 (1.8.01-1) unstable; urgency=low ++ ++ * New upstream release (this time a real tagged release) ++ * Upstream fixed directory handling (closes: #920976) ++ * Applied patch versus crash by Bernhard Übelacker (closes: #926408) ++ * Updated control homepage field (closes: #927966) ++ ++ -- Eike Sauer Sat, 06 Jul 2019 13:10:00 +0200 ++ ++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 Fri, 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 Mon, 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 Thu, 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 Fri, 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 Sat, 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 Sat, 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 Wed, 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 Thu, 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 Sun, 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 Thu, 30 Nov 2006 20:15:00 +0200 ++ ++kdiff3 (0.9.90-4) unstable; urgency=low ++ ++ * Added AM_MAINTAINER_MODE ++ ++ -- Eike Sauer Thu, 12 Oct 2006 14:00:00 +0200 ++ ++kdiff3 (0.9.90-3) unstable; urgency=low ++ ++ * More autotooling stuff... ++ ++ -- Eike Sauer Mon, 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 Wed, 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 Wed, 07 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/control index 0000000,0000000..f897659 new file mode 100644 --- /dev/null +++ b/debian/control @@@ -1,0 -1,0 +1,67 @@@ ++Source: kdiff3 ++Maintainer: Debian KDE Extras Team ++Uploaders: Eike Sauer , ++ Pino Toscano , ++Section: kde ++Priority: optional ++Build-Depends: debhelper-compat (= 13), ++ pkg-kde-tools, ++ gettext, ++ cmake (>= 3.8~), ++ extra-cmake-modules (>= 5.10.0~), ++ qtbase5-dev (>= 5.8.0~), ++ libkf5config-dev (>= 5.37.0~), ++ libkf5coreaddons-dev (>= 5.37.0~), ++ libkf5crash-dev (>= 5.37.0~), ++ libkf5doctools-dev (>= 5.37.0~), ++ libkf5i18n-dev (>= 5.37.0~), ++ libkf5kio-dev (>= 5.37.0~), ++ libkf5parts-dev (>= 5.37.0~), ++ libkf5widgetsaddons-dev (>= 5.37.0~), ++ libboost-dev (>= 1.66.0~), ++ xauth , ++ xvfb , ++Standards-Version: 4.6.1 ++Rules-Requires-Root: no ++Homepage: https://kde.org/applications/development/kdiff3 ++Vcs-Browser: https://salsa.debian.org/qt-kde-team/extras/kdiff3 ++Vcs-Git: https://salsa.debian.org/qt-kde-team/extras/kdiff3.git ++ ++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. KDiff3 also has KIO support, so it can access to ++ remote files and compressed archives. ++ ++Package: kdiff3-qt ++Architecture: all ++Multi-Arch: foreign ++Depends: kdiff3 (>= ${source:Version}), ${misc:Depends}, ++Section: oldlibs ++Description: transistional package for kdiff3 ++ This is a transitional package. It can safely be removed. ++ . ++ This version of KDiff3 is not developed anymore, replaced by 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 documentation. diff --cc debian/copyright index 0000000,0000000..81f32a8 new file mode 100644 --- /dev/null +++ b/debian/copyright @@@ -1,0 -1,0 +1,25 @@@ ++Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ ++Upstream-Name: kdiff3 ++Upstream-Contact: Michael Reeves ++Source: https://invent.kde.org/sdk/kdiff3 ++ ++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/kdiff3-doc.install index 0000000,0000000..8ec5678 new file mode 100644 --- /dev/null +++ b/debian/kdiff3-doc.install @@@ -1,0 -1,0 +1,1 @@@ ++usr/share/doc/ diff --cc debian/kdiff3.docs index 0000000,0000000..e845566 new file mode 100644 --- /dev/null +++ b/debian/kdiff3.docs @@@ -1,0 -1,0 +1,1 @@@ ++README diff --cc debian/kdiff3.install index 0000000,0000000..003d239 new file mode 100644 --- /dev/null +++ b/debian/kdiff3.install @@@ -1,0 -1,0 +1,8 @@@ ++usr/bin/ ++usr/lib/ ++usr/share/applications/ ++usr/share/icons/ ++usr/share/kxmlgui5/ ++usr/share/locale/ ++usr/share/man/ ++usr/share/metainfo/ diff --cc debian/rules index 0000000,0000000..4ab1f08 new file mode 100755 --- /dev/null +++ b/debian/rules @@@ -1,0 -1,0 +1,18 @@@ ++#!/usr/bin/make -f ++# Uncomment this to turn on verbose mode. ++#export DH_VERBOSE=1 ++ ++archs_that_need_atomic = armel m68k mipsel powerpc sh4 ++ifeq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH), $(archs_that_need_atomic))) ++export DEB_LDFLAGS_MAINT_APPEND = -Wl,--no-as-needed -latomic -Wl,--as-needed ++endif ++ ++%: ++ dh $@ --with kf5 ++ ++override_dh_auto_test: ++ xvfb-run -a dh_auto_test ++ ++execute_after_dh_auto_install: ++ # drop translations of Windows-only component ++ rm debian/tmp/usr/share/locale/*/LC_MESSAGES/diff_ext.mo diff --cc debian/salsa-ci.yml index 0000000,0000000..31e31c9 new file mode 100644 --- /dev/null +++ b/debian/salsa-ci.yml @@@ -1,0 -1,0 +1,6 @@@ ++include: ++ - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/salsa-ci.yml ++ - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/pipeline-jobs.yml ++variables: ++ SALSA_CI_DISABLE_MISSING_BREAKS: 'no' ++ SALSA_CI_DISABLE_RC_BUGS: 'no' 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/upstream/metadata index 0000000,0000000..da38453 new file mode 100644 --- /dev/null +++ b/debian/upstream/metadata @@@ -1,0 -1,0 +1,3 @@@ ++--- ++Repository: https://invent.kde.org/sdk/kdiff3.git ++Repository-Browse: https://invent.kde.org/sdk/kdiff3 diff --cc debian/upstream/signing-key.asc index 0000000,0000000..43fa8dd new file mode 100644 --- /dev/null +++ b/debian/upstream/signing-key.asc @@@ -1,0 -1,0 +1,28 @@@ ++-----BEGIN PGP PUBLIC KEY BLOCK----- ++ ++mQINBE0iloUBEAC02n3+spjRz+9/qiKHuOojr0Gli9IYGdtz+uE2WE8iy/vlNJcg ++9ai3baaERzekbs3G59d5QswPpWDdpnxJ9i8W/pucCzZ8tCk2Squ8QWeEne30M2BQ ++mGBfjUVx/z/giTpShuWTzi4LHYfZa6Hl5HmmhN73YfvvsADLWZbH5YaZttyz6kir ++t2olMlirNUi8m77DsK6T+6KMuBTkFjvKj1acJovyPLuH0PvJ568c6g7sVOe2K+MO ++ANsBvU+3zssE5dJfS2QNZNT4venpv7m3hTij2BEsVGl2D5VxuGZusygDpL6Liao9 ++S7TF0DXMaY/89h1H/DFR7ewJcdFIeOaQBg2SydczqOnoJJmfPJnx6hoTaQ8HqAvk ++owNz2o2kZvWddD9kX63iEZmqWo6XVEpQSRa9nwEIcsuGbGakjiT7XGJLme/ROkYi ++xdpQbQHJ7YWxK/Q2qC5H69xaPGpgZIz7gFCHlwNfFI1Ykn1UgJ2gNomj4u2040gk ++wTq3XtTsA4y1YOUPXCR1G+vx/qzEehjV6GGhQtmiFp+7/kpKVfca+QrxwKszBHAP ++O7yEwwZmVYdqL39mu7yrBPeqQdp/mJgrB1NsGQO7sHyQ8JTXqnYKsXBC5O800duV ++uYEubi+Ws5SzuXpBOm726o89eFtAVhteri6PSTecavScaT9G+IISzVnAxwARAQAB ++tCRNaWNoYWVsIFJlZXZlcyA8cmVldmVzLjg3QGdtYWlsLmNvbT6JAjgEEwECACIF ++Ak0iloUCGy8GCwkIBwMCBhUIAgkKCwQWAgMBAh4BAheAAAoJEPRCs21hSwa821kP ++/jFIuCoWt837PjeZ8POz6K7SAcbpEsxMc/MYZcB1Z71nHrcnUuIRs+1Suwifb9Eb ++7dZF6X3H5HLMgvCH30iB+kG5jVAr0mNlHMFa/s0nwom4hq/jCzrdg0kzNLwP+4cg ++bR45zjq8lugtQQ1KloxXRAG6g26cv6DpHQQcOJGCQhbVIimDsxgfJEJld8iJKail ++59XDqVZG4rvAtmdApreZYzqhgY09RCAP37zmjbTQYyNvhyrVVQQKT9MibM2zJ75W ++A98vNzDvwDKxGX5JZpElnVbTOrr58U8OAIjXx9yXywa96uXrhTxNea36Ntp2b9Tr ++dYMuK3GjK2EEf1dkH8L+ntUtjnfdgHCZeDFqVUgmHkNoBBVupEgXIzEwRqghvmxG ++ykgVxaCW3ycsSQVUqrE+1eU89bRfjnBzQ+NZewceah0cv3m3Y5HAiyYd9uSlSPdT ++HVllFW1jXlE5BqbV1/PbMQP54qjAa9vPrI+xn/NwWJTwKz3AH838URY0ZNfgRL09 ++1cNLN72p59LLBsr0YZYFsMKcxoVFdx6SEe0Gaozs8Y+T6LCLaNgWUFVGuuZzQSIo ++IjSWk8/33lOqBvnUD0h6KK/PAO9C4GyqrgZHci3N/TwkDpJgQMwUiRgqNGrPmxRt ++uPG4qtMgBkSlt5hk39yPcsgkkiVSneKMire8gbdQ7+zH ++=nhS5 ++-----END PGP PUBLIC KEY BLOCK----- diff --cc debian/watch index 0000000,0000000..b50e23d new file mode 100644 --- /dev/null +++ b/debian/watch @@@ -1,0 -1,0 +1,2 @@@ ++version=4 ++opts=pgpsigurlmangle=s/$/.sig/ https://download.kde.org/stable/kdiff3/kdiff3-([\d\.]+)\.tar\.xz