diff -Nru kdiff3-0.9.98/debian/changelog kdiff3-0.9.98/debian/changelog --- kdiff3-0.9.98/debian/changelog 2014-08-03 14:56:59.000000000 +0000 +++ kdiff3-0.9.98/debian/changelog 2015-07-26 11:42:30.000000000 +0000 @@ -1,3 +1,13 @@ +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 diff -Nru kdiff3-0.9.98/debian/control kdiff3-0.9.98/debian/control --- kdiff3-0.9.98/debian/control 2014-08-01 15:45:10.000000000 +0000 +++ kdiff3-0.9.98/debian/control 2015-07-26 11:42:29.000000000 +0000 @@ -3,7 +3,7 @@ Section: kde Maintainer: Eike Sauer Build-Depends: cdbs, debhelper (>= 7.0.50~), dpkg-dev (>= 1.16.2), cmake, kdelibs5-dev (>= 4:4.4.4), libkonq5-dev, qt4-dev-tools, libicu-dev -Standards-Version: 3.9.4 +Standards-Version: 3.9.6 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/ diff -Nru kdiff3-0.9.98/debian/copyright kdiff3-0.9.98/debian/copyright --- kdiff3-0.9.98/debian/copyright 2014-08-03 12:37:32.000000000 +0000 +++ kdiff3-0.9.98/debian/copyright 2015-07-26 11:16:06.000000000 +0000 @@ -25,7 +25,7 @@ Fifth Floor, Boston, MA 02110-1301, USA. Files: debian/* -Copyright: 2003-2014 Eike Sauer +Copyright: 2003-2015 Eike Sauer License: GPL-2+ 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 diff -Nru kdiff3-0.9.98/debian/patches/crash-and-status-line.patch kdiff3-0.9.98/debian/patches/crash-and-status-line.patch --- kdiff3-0.9.98/debian/patches/crash-and-status-line.patch 1970-01-01 00:00:00.000000000 +0000 +++ kdiff3-0.9.98/debian/patches/crash-and-status-line.patch 2015-07-26 10:40:44.000000000 +0000 @@ -0,0 +1,55 @@ +Description: Workaround for differences not showing in status bar (#757206) and fixes crash I had when testing this +Origin: eike@debian.org + +--- kdiff3-0.9.98-debian-orig/src-QT4/mergeresultwindow.h 2015-07-11 18:57:03.684903892 +0200 ++++ kdiff3-0.9.98/src-QT4/mergeresultwindow.h 2015-07-11 18:42:48.543305303 +0200 +@@ -119,6 +119,7 @@ public: + int getNrOfUnsolvedConflicts(int* pNrOfWhiteSpaceConflicts=0); + void choose(int selector); + void chooseGlobal(int selector, bool bConflictsOnly, bool bWhiteSpaceOnly ); ++ void updateStatusBar(); + + int getMaxTextWidth(); // width of longest text line + int getNofLines(); +--- kdiff3-0.9.98-debian-orig/src-QT4/mergeresultwindow.cpp 2015-07-11 18:57:03.680903904 +0200 ++++ kdiff3-0.9.98/src-QT4/mergeresultwindow.cpp 2015-07-11 18:43:31.000000000 +0200 +@@ -145,14 +145,18 @@ void MergeResultWindow::init( + g_bAutoSolve = true; + update(); + updateSourceMask(); ++ updateStatusBar(); ++} + ++void MergeResultWindow::updateStatusBar() ++{ + int wsc; + int nofUnsolved = getNrOfUnsolvedConflicts(&wsc); + if (m_pStatusBar) + m_pStatusBar->showMessage( i18n("Number of remaining unsolved conflicts: %1 (of which %2 are whitespace)" + ,nofUnsolved,wsc) ); + } +- ++ + void MergeResultWindow::reset() + { + m_pDiff3LineList = 0; +--- kdiff3-0.9.98-debian-orig/src-QT4/pdiff.cpp 2015-07-11 18:57:03.680903904 +0200 ++++ kdiff3-0.9.98/src-QT4/pdiff.cpp 2015-07-11 18:53:04.845613274 +0200 +@@ -1732,7 +1732,7 @@ void KDiff3App::slotFinishRecalcWordWrap + m_pOverview->slotRedraw(); + if (m_pDiffVScrollBar) + m_pDiffVScrollBar->setRange(0, max2(0, m_neededLines + 1 - m_DTWHeight)); +- if (m_pDiffTextWindow1) ++ if (m_pDiffTextWindow1 && m_firstD3LIdx >= 0) + { + m_pDiffVScrollBar->setValue(m_pDiffTextWindow1->convertDiff3LineIdxToLine(m_firstD3LIdx)); + +@@ -1749,6 +1749,8 @@ void KDiff3App::slotFinishRecalcWordWrap + } + if (m_pEventLoopForPrinting) + m_pEventLoopForPrinting->quit(); ++ ++ m_pMergeResultWindow->updateStatusBar(); + } + + void KDiff3App::slotShowWhiteSpaceToggled() diff -Nru kdiff3-0.9.98/debian/patches/kdiff3-qt-hardening.patch kdiff3-0.9.98/debian/patches/kdiff3-qt-hardening.patch --- kdiff3-0.9.98/debian/patches/kdiff3-qt-hardening.patch 1970-01-01 00:00:00.000000000 +0000 +++ kdiff3-0.9.98/debian/patches/kdiff3-qt-hardening.patch 2015-07-26 11:26:50.000000000 +0000 @@ -0,0 +1,16 @@ +Description: Hardening flags for kdiff3-qt +Author: eike@debian.org +--- a/src-QT4/kdiff3.pro ++++ b/src-QT4/kdiff3.pro +@@ -66,6 +66,11 @@ os2 { + } + + unix { ++ QMAKE_CPPFLAGS *= $(shell dpkg-buildflags --get CPPFLAGS) ++ QMAKE_CFLAGS *= $(shell dpkg-buildflags --get CFLAGS) ++ QMAKE_CXXFLAGS *= $(shell dpkg-buildflags --get CXXFLAGS) ++ QMAKE_LFLAGS *= $(shell dpkg-buildflags --get LDFLAGS) ++ + documentation.path = /usr/share/doc/kdiff3 + # documentation.files = ../doc/* + diff -Nru kdiff3-0.9.98/debian/patches/series kdiff3-0.9.98/debian/patches/series --- kdiff3-0.9.98/debian/patches/series 2014-08-03 11:42:54.000000000 +0000 +++ kdiff3-0.9.98/debian/patches/series 2015-07-26 11:23:31.000000000 +0000 @@ -3,3 +3,5 @@ typos.patch mail-address.patch kdiff3-qt-doc-placement.diff +kdiff3-qt-hardening.patch +crash-and-status-line.patch