rev 13592 - in branches/kde4.2/packages/kdeedu/debian: . patches

[Pino Toscano]

Author: pino-guest
Date: 2009-01-26 22:22:07 +0000 (Mon, 26 Jan 2009)
New Revision: 13592

Added:
   branches/kde4.2/packages/kdeedu/debian/patches/01_r917115_cmake_findopenbabel2.diff
Modified:
   branches/kde4.2/packages/kdeedu/debian/changelog
   branches/kde4.2/packages/kdeedu/debian/patches/series
Log:
add patch 01_r917115_cmake_findopenbabel2.diff from upstream r917115 to fix openbabel2 detection
won't be needed with kde >= 4.2.1


Modified: branches/kde4.2/packages/kdeedu/debian/changelog
===================================================================
--- branches/kde4.2/packages/kdeedu/debian/changelog	2009-01-26 22:13:43 UTC (rev 13591)
+++ branches/kde4.2/packages/kdeedu/debian/changelog	2009-01-26 22:22:07 UTC (rev 13592)
@@ -45,8 +45,13 @@
     Sorry Annma it took so long.
   * Update copyright file.
 
- -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 24 Jan 2009 03:39:12 +0200
+  +++ Changes by Pino Toscano:
 
+  * Add patch 01_r917115_cmake_findopenbabel2.diff from upstream SVN r917115
+    to fix the OpenBabel2 detection.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Mon, 26 Jan 2009 23:18:12 +0200
+
 kdeedu (4:4.1.3-1) experimental; urgency=low
 
   * New upstream release

Added: branches/kde4.2/packages/kdeedu/debian/patches/01_r917115_cmake_findopenbabel2.diff
===================================================================
--- branches/kde4.2/packages/kdeedu/debian/patches/01_r917115_cmake_findopenbabel2.diff	                        (rev 0)
+++ branches/kde4.2/packages/kdeedu/debian/patches/01_r917115_cmake_findopenbabel2.diff	2009-01-26 22:22:07 UTC (rev 13592)
@@ -0,0 +1,68 @@
+Index: kdeedu/cmake/modules/FindOpenBabel2.cmake
+===================================================================
+--- kdeedu/cmake/modules/FindOpenBabel2.cmake	(revision 917114)
++++ kdeedu/cmake/modules/FindOpenBabel2.cmake	(revision 917115)
+@@ -4,6 +4,7 @@
+ #  OPENBABEL2_FOUND - system has OpenBabel2
+ #  OPENBABEL2_INCLUDE_DIR - the OpenBabel2 include directory
+ #  OPENBABEL2_LIBRARIES - Link these to use OpenBabel2
++# Copyright (C) 2006, 2009 Pino Toscano, <pino at kde.org>
+ # Copyright (c) 2006, 2007 Carsten Niehaus, <cniehaus at gmx.de>
+ # Copyright (C) 2008 Marcus D. Hanwell <marcus at cryos.org>
+ # Redistribution and use is allowed according to the terms of the BSD license.
+@@ -18,13 +19,11 @@
+ 
+     # Use the newer PkgConfig stuff
+     find_package(PkgConfig REQUIRED)
+-    pkg_check_modules(OPENBABEL2 openbabel-2.0>=2.2.0)
++    pkg_check_modules(PC_OPENBABEL2 openbabel-2.0>=2.2.0)
+ 
+-    # Maintain backwards compatibility with previous version of module
+-    if(OPENBABEL2_FOUND STREQUAL "1")
++    if(PC_OPENBABEL2_FOUND)
+       set(OPENBABEL2_VERSION_MET TRUE)
+-      set(OPENBABEL2_INCLUDE_DIR ${OPENBABEL2_INCLUDE_DIRS})
+-    endif(OPENBABEL2_FOUND STREQUAL "1")
++    endif(PC_OPENBABEL2_FOUND)
+ 
+   else(NOT WIN32)
+     set(OPENBABEL2_VERSION_MET TRUE)
+@@ -32,28 +31,19 @@
+ 
+   if(OPENBABEL2_VERSION_MET)
+ 
+-   # find_path(OPENBABEL2_INCLUDE_DIR openbabel/obconversion.h
+-   #   PATHS
+-   #   ${_obIncDir}
+-   #   ${GNUWIN32_DIR}/include
+-   #   $ENV{OPENBABEL2_INCLUDE_DIR}
+-   # )
++    find_path(OPENBABEL2_INCLUDE_DIR openbabel/obconversion.h
++      PATHS
++      ${PC_OPENBABEL2_INCLUDEDIR}
++      ${PC_OPENBABEL2_INCLUDE_DIRS}
++      ${GNUWIN32_DIR}/include
++      $ENV{OPENBABEL2_INCLUDE_DIR}
++      PATH_SUFFIXES openbabel-2.0
++    )
+ 
+-    if(WIN32)
+-      if(NOT OPENBABEL2_INCLUDE_DIR)
+-        find_path(OPENBABEL2_INCLUDE_DIR openbabel/obconversion.h
+-          PATHS
+-          ${_obIncDir}
+-          ${GNUWIN32_DIR}/include
+-          $ENV{OPENBABEL2_INCLUDE_DIR}
+-          PATH_SUFFIXES openbabel-2.0
+-        )
+-      endif(NOT OPENBABEL2_INCLUDE_DIR)
+-    endif(WIN32)
+-
+     find_library(OPENBABEL2_LIBRARIES NAMES openbabel openbabel-2
+       PATHS
+-      ${_obLinkDir}
++      ${PC_OPENBABEL2_LIBDIR}
++      ${PC_OPENBABEL2_LIBRARY_DIRS}
+       ${GNUWIN32_DIR}/lib
+       $ENV{OPENBABEL2_LIBRARIES}
+     )

Modified: branches/kde4.2/packages/kdeedu/debian/patches/series
===================================================================
--- branches/kde4.2/packages/kdeedu/debian/patches/series	2009-01-26 22:13:43 UTC (rev 13591)
+++ branches/kde4.2/packages/kdeedu/debian/patches/series	2009-01-26 22:22:07 UTC (rev 13592)
@@ -0,0 +1 @@
+01_r917115_cmake_findopenbabel2.diff