diff -u zpspell-0.4.3/debian/control zpspell-0.4.3/debian/control --- zpspell-0.4.3/debian/control +++ zpspell-0.4.3/debian/control @@ -1,9 +1,8 @@ Source: zpspell Section: text Priority: optional -Maintainer: Ubuntu Developers -XSBC-Original-Maintainer: Rail Aliev -Build-Depends: cdbs, debhelper (>= 5), cmake, libdbus-glib-1-dev, xsltproc, docbook-xsl, quilt, pkg-config +Maintainer: Rail Aliev +Build-Depends: cdbs, debhelper (>= 5), cmake, libdbus-glib-1-dev, xsltproc, docbook-xsl, quilt Standards-Version: 3.8.3 Vcs-Bzr: http://bzr.debian.org/users/rail-guest/zpspell/ Vcs-Browser: http://bzr.debian.org/loggerhead/users/rail-guest/zpspell diff -u zpspell-0.4.3/debian/changelog zpspell-0.4.3/debian/changelog --- zpspell-0.4.3/debian/changelog +++ zpspell-0.4.3/debian/changelog @@ -1,9 +1,11 @@ -zpspell (0.4.3-4ubuntu1) natty; urgency=low +zpspell (0.4.3-4.1) unstable; urgency=low - * debian/patches/fix_multiarch_ftbfs.patch: (LP: #756036) - properly use pkg-config to find directories + * Non-maintainer upload. + * FTBFS: CMake Error: The following variables are used in this project, + but they are set to NOTFOUND (Closes: #652208). + - debian/patches/find_path-GLIB_CONFIG_DIR.diff - -- Andreas Moog Wed, 13 Apr 2011 20:42:41 +0200 + -- HIGUCHI Daisuke (VDR dai) Sat, 07 Jan 2012 22:08:43 +0900 zpspell (0.4.3-4) unstable; urgency=low diff -u zpspell-0.4.3/debian/patches/series zpspell-0.4.3/debian/patches/series --- zpspell-0.4.3/debian/patches/series +++ zpspell-0.4.3/debian/patches/series @@ -2 +2 @@ -fix_multiarch_ftbfs.patch +find_path-GLIB_CONFIG_DIR.diff reverted: --- zpspell-0.4.3/debian/patches/fix_multiarch_ftbfs.patch +++ zpspell-0.4.3.orig/debian/patches/fix_multiarch_ftbfs.patch @@ -1,66 +0,0 @@ -Subject: Fix multiarch FTBFS - -* CMakeLists.txt: use pkg-config to find libs - -Bug: http://bugs.pardus.org.tr/show_bug.cgi?id=11566 -Bug-Ubuntu: http://bugs.launchpad.net/bugs/756036 -Author: Andreas Moog - -=== modified file 'CMakeLists.txt' ---- a/CMakeLists.txt 2009-05-18 19:02:27 +0000 -+++ b/CMakeLists.txt 2011-04-13 18:40:39 +0000 -@@ -35,16 +35,15 @@ - ${CMAKE_CURRENT_BINARY_DIR}/config.h) - - -- - # dbus and glib stuff --include(UsePkgConfig) --pkgconfig("dbus-glib-1" _dbusIncDir _dbusLinkDir _dbusLinkFlags _dbusCflags) --pkgconfig("glib-2.0" _glibIncDir _glibLinkDir _glibLinkFlags _glibCflags) -+include(FindPkgConfig) -+pkg_check_modules (GLIB2 glib-2.0) -+pkg_check_modules (DBUS dbug-glib-2) - - # DBUS_INCLUDE_DIR - find_path(DBUS_INCLUDE_DIR dbus/dbus-glib.h -- ${_dbusIncDir} -- ${_dbusIncDir}/dbus-1.0 -+ ${DBUS_INCLUDE_DIRS} -+ ${DBUS_INCLUDE_DIRS}/dbus-1.0 - /usr/include/dbus-1.0 - /usr/include - /usr/local/include/dbus-1.0 -@@ -53,14 +52,14 @@ - # DBUS_LIBRARY - find_library(DBUS_LIBRARY NAMES dbus-1 - PATHS -- ${_dbusLinkDir} -+ ${DBUS_LIBRARY_DIRS} - /usr/lib - /usr/local/lib - ) - - # GLIB2_INCLUDE_DIR - find_path(GLIB2_INCLUDE_DIR glib.h -- ${_glibIncDir} -+ ${GLIB2_INCLUDE_DIRS} - /usr/include - /usr/include/glib-2.0 - /usr/local/include -@@ -68,12 +67,13 @@ - # GLIB2_LIBRARY - find_library(GLIB2_LIBRARY NAMES glib-2.0 - PATHS -- ${_glibLinkDir} -+ ${GLIB2_LIBRARY_DIRS} - /usr/lib - /usr/local/lib - ) - # GLIB_CONFIG - find_path(GLIB_CONFIG_DIR glibconfig.h -+ ${GLIB2_INCLUDE_DIRS} - /usr/lib/glib-2.0/include - /usr/lib/glib-2.0 - /usr/include/glib-2.0 - only in patch2: unchanged: --- zpspell-0.4.3.orig/debian/patches/find_path-GLIB_CONFIG_DIR.diff +++ zpspell-0.4.3/debian/patches/find_path-GLIB_CONFIG_DIR.diff @@ -0,0 +1,19 @@ +Subject: zpspell: FTBFS: CMake Error: The following variables are used + in this project, but they are set to NOTFOUND. + +* CMakeLists.txt: add path to find_path GLIB_CONFIG_DIR + +Bug-Debian: http://bugs.debian.org/652208 +Author: HIGUCHI Daisuke (VDR dai) + +--- zpspell-0.4.3/CMakeLists.txt.orig 2012-01-07 21:49:19.000000000 +0900 ++++ zpspell-0.4.3/CMakeLists.txt 2012-01-07 22:00:41.000000000 +0900 +@@ -74,6 +74,8 @@ find_library(GLIB2_LIBRARY NAMES glib-2. + ) + # GLIB_CONFIG + find_path(GLIB_CONFIG_DIR glibconfig.h ++ ${_glibLinkDir}/glib-2.0/include ++ ${_glibLinkDir}/glib-2.0 + /usr/lib/glib-2.0/include + /usr/lib/glib-2.0 + /usr/include/glib-2.0