rev 19708 - in kde-extras/kmymoney2/trunk/debian: . patches

[Mark Purcell]

Author: msp
Date: 2013-10-12 05:39:07 +0000 (Sat, 12 Oct 2013)
New Revision: 19708

Added:
   kde-extras/kmymoney2/trunk/debian/patches/
   kde-extras/kmymoney2/trunk/debian/patches/reviewboard11672.diff
   kde-extras/kmymoney2/trunk/debian/patches/series
Removed:
   kde-extras/kmymoney2/trunk/debian/patches/
Modified:
   kde-extras/kmymoney2/trunk/debian/changelog
   kde-extras/kmymoney2/trunk/debian/watch
Log:
* New upstream release
* Drop gmp5.patch - included upstream
* Update debian/watch .xz
* Fix linking problems with Gwenhywfar version >= 4.6.0 
  - Add reviewboard11672.diff (Closes: #713555)

Modified: kde-extras/kmymoney2/trunk/debian/changelog
===================================================================
--- kde-extras/kmymoney2/trunk/debian/changelog	2013-10-12 05:17:13 UTC (rev 19707)
+++ kde-extras/kmymoney2/trunk/debian/changelog	2013-10-12 05:39:07 UTC (rev 19708)
@@ -1,3 +1,13 @@
+kmymoney (4.6.4-1) unstable; urgency=low
+
+  * New upstream release
+  * Drop gmp5.patch - included upstream
+  * Update debian/watch .xz
+  * Fix linking problems with Gwenhywfar version >= 4.6.0 
+    - Add reviewboard11672.diff (Closes: #713555)
+
+ -- Mark Purcell <msp at debian.org>  Sat, 12 Oct 2013 16:35:49 +1100
+
 kmymoney (4.6.3-2) unstable; urgency=low
 
   * Upload to unstable 

Added: kde-extras/kmymoney2/trunk/debian/patches/reviewboard11672.diff
===================================================================
--- kde-extras/kmymoney2/trunk/debian/patches/reviewboard11672.diff	                        (rev 0)
+++ kde-extras/kmymoney2/trunk/debian/patches/reviewboard11672.diff	2013-10-12 05:39:07 UTC (rev 19708)
@@ -0,0 +1,66 @@
+Description: Fix linking problems with Gwenhywfar version >= 4.6.0
+Origin: https://git.reviewboard.kde.org/r/111672/
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=713555
+
+diff --git a/cmake/modules/FindGwenhywfar.cmake b/cmake/modules/FindGwenhywfar.cmake
+index 41961e6..526c041 100644
+--- a/cmake/modules/FindGwenhywfar.cmake
++++ b/cmake/modules/FindGwenhywfar.cmake
+@@ -5,6 +5,8 @@
+ #  GWENHYWFAR_LIBRARIES - The libraries needed to use Gwenhywfar
+ #  GWENHYWFAR_VERSION = The version of Gwenhywfar as defined in version.h
+ 
++find_package(PkgConfig)
++
+ set(GWENHYWFAR_FOUND FALSE)
+ 
+ if(NOT GWENHYWFAR_MIN_VERSION)
+@@ -16,26 +18,27 @@ if(GWENHYWFAR_INCLUDE_DIRS AND GWENHYWFAR_LIBRARIES)
+   set(GWENHYWFAR_FIND_QUIETLY TRUE)
+ endif(GWENHYWFAR_INCLUDE_DIRS AND GWENHYWFAR_LIBRARIES)
+ 
+-PKG_CHECK_MODULES(GWENHYWFAR gwenhywfar>=${GWENHYWFAR_MIN_VERSION})
+-
+-if(${GWENHYWFAR_FOUND})
+-  PKG_CHECK_MODULES(QT4GUI gwengui-qt4)
+-  if (NOT ${QT4GUI_FOUND})
+-    set(GWENHYWFAR_FOUND FALSE)
+-    unset(GWENHYWFAR_INCLUDE_DIRS)
+-    unset(GWENHYWFAR_LIBRARIES)
+-    unset(GWENHYWFAR_VERSION)
+-    message(STATUS "Gwenhywfar does not have the Q4Banking frontend enabled")
+-  endif (NOT ${QT4GUI_FOUND})
+-
+-  if(${GWENHYWFAR_FOUND})
+-    find_library(GWENHYWFAR_GUI_LIBRARY NAMES gwengui-qt4 libgwengui-qt4
+-      HINTS ${GWENHYWFAR_LIBRARY_DIRS})
+-    if(GWENHYWFAR_GUI_LIBRARY STREQUAL "GWENHYWFAR_GUI_LIBRARY-NOTFOUND")
+-      set(GWENHYWFAR_GUI_LIBRARY "")
+-    endif(GWENHYWFAR_GUI_LIBRARY STREQUAL "GWENHYWFAR_GUI_LIBRARY-NOTFOUND")
+-    set(GWENHYWFAR_LIBRARIES ${GWENHYWFAR_GUI_LIBRARY} ${GWENHYWFAR_LIBRARIES})
+-  endif(${GWENHYWFAR_FOUND})
+-endif(${GWENHYWFAR_FOUND})
++PKG_CHECK_MODULES(GWENHYWFAR_CORE gwenhywfar>=${GWENHYWFAR_MIN_VERSION})
++PKG_CHECK_MODULES(GWENHYWFAR_QT4GUI gwengui-qt4>=${GWENHYWFAR_MIN_VERSION})
++
++if (${GWENHYWFAR_CORE_FOUND} AND ${GWENHYWFAR_QT4GUI_FOUND})
++  set(GWENHYWFAR_FOUND TRUE)
++  set(GWENHYWFAR_INCLUDE_DIRS ${GWENHYWFAR_CORE_INCLUDE_DIRS})
++  set(GWENHYWFAR_LIBRARIES ${GWENHYWFAR_QT4GUI_LIBRARIES} ${GWENHYWFAR_CORE_LIBRARIES})
++  set(GWENHYWFAR_VERSION ${GWENHYWFAR_CORE_VERSION})
++else (${GWENHYWFAR_CORE_FOUND} AND ${GWENHYWFAR_QT4GUI_FOUND})
++  set(GWENHYWFAR_FOUND FALSE)
++  unset(GWENHYWFAR_INCLUDE_DIRS)
++  unset(GWENHYWFAR_LIBRARIES)
++  unset(GWENHYWFAR_VERSION)
++endif (${GWENHYWFAR_CORE_FOUND} AND ${GWENHYWFAR_QT4GUI_FOUND})
++
++if (NOT ${GWENHYWFAR_QT4GUI_FOUND})
++  message(WARNING "Gwenhywfar does not have the Qt4Banking frontend enabled")
++endif (NOT ${GWENHYWFAR_QT4GUI_FOUND})
++
++if (NOT ${GWENHYWFAR_CORE_VERSION} VERSION_EQUAL ${GWENHYWFAR_QT4GUI_VERSION})
++  message(WARNING "Gwenhywfar libraries versions mismatch")
++endif (NOT ${GWENHYWFAR_CORE_VERSION} VERSION_EQUAL ${GWENHYWFAR_QT4GUI_VERSION})
+ 
+ mark_as_advanced(GWENHYWFAR_INCLUDE_DIRS GWENHYWFAR_LIBRARIES)

Added: kde-extras/kmymoney2/trunk/debian/patches/series
===================================================================
--- kde-extras/kmymoney2/trunk/debian/patches/series	                        (rev 0)
+++ kde-extras/kmymoney2/trunk/debian/patches/series	2013-10-12 05:39:07 UTC (rev 19708)
@@ -0,0 +1 @@
+reviewboard11672.diff

Modified: kde-extras/kmymoney2/trunk/debian/watch
===================================================================
--- kde-extras/kmymoney2/trunk/debian/watch	2013-10-12 05:17:13 UTC (rev 19707)
+++ kde-extras/kmymoney2/trunk/debian/watch	2013-10-12 05:39:07 UTC (rev 19708)
@@ -1,2 +1,2 @@
 version=3
-http://sf.net/kmymoney2/kmymoney-(.*)\.tar\.bz2 debian svn-upgrade
+http://sf.net/kmymoney2/kmymoney-(.*)\.tar\.xz debian svn-upgrade