diff -u kerry-0.2.1/debian/changelog kerry-0.2.1/debian/changelog --- kerry-0.2.1/debian/changelog +++ kerry-0.2.1/debian/changelog @@ -1,3 +1,12 @@ +kerry (1:0.2.1-0ubuntu5) hardy; urgency=low + + * Add patch kubuntu_08_libbeagle1_transition.patch to make configure + use libbeagle1, so binary objects are built. (LP: #211591). + * debian/control: set minimum version of libbeagle-dev to 0.3.0 in + build-depends. + + -- Albert Damen Sun, 06 Apr 2008 17:41:07 +0200 + kerry (1:0.2.1-0ubuntu4) hardy; urgency=low * Rebuild for libbeagle0 -> libbeagle1 transition (LP: #192262). diff -u kerry-0.2.1/debian/control kerry-0.2.1/debian/control --- kerry-0.2.1/debian/control +++ kerry-0.2.1/debian/control @@ -2,7 +2,7 @@ Section: kde Priority: optional Maintainer: Jonathan Patrick Davies -Build-Depends: debhelper (>= 5.0.0), cdbs, kdelibs4-dev, libkonq4-dev, libqt3-mt-dev, autoconf, automake1.9, libbeagle-dev, docbook2x +Build-Depends: debhelper (>= 5.0.0), cdbs, kdelibs4-dev, libkonq4-dev, libqt3-mt-dev, autoconf, automake1.9, libbeagle-dev (>= 0.3.0), docbook2x Standards-Version: 3.6.2 Package: kerry only in patch2: unchanged: --- kerry-0.2.1.orig/debian/patches/kubuntu_08_libbeagle1_transition.patch +++ kerry-0.2.1/debian/patches/kubuntu_08_libbeagle1_transition.patch @@ -0,0 +1,50 @@ +diff -Nur -x '*.orig' -x '*~' kerry-0.2.1/configure kerry-0.2.1.new/configure +--- kerry-0.2.1/configure 2006-12-04 14:36:37.000000000 +0100 ++++ kerry-0.2.1.new/configure 2008-04-04 12:39:45.000000000 +0200 +@@ -37562,10 +37562,10 @@ + # LIBBEAGLE_LIBADD: libbeagle libraries (-l options) + # LIBBEAGLE_LDFLAGS: flags containing path to libbeagle libraries (-L options) + +-LIBBEAGLE_PACKAGES="libbeagle-0.0" +-LIBBEAGLE_VERSION="0.2.5" +-{ echo "$as_me:$LINENO: checking for libbeagle-0.2.5 (at least $LIBBEAGLE_VERSION)" >&5 +-echo $ECHO_N "checking for libbeagle-0.2.5 (at least $LIBBEAGLE_VERSION)... $ECHO_C" >&6; } ++LIBBEAGLE_PACKAGES="libbeagle-1.0" ++LIBBEAGLE_VERSION="0.3.0" ++{ echo "$as_me:$LINENO: checking for libbeagle-0.3.0 (at least $LIBBEAGLE_VERSION)" >&5 ++echo $ECHO_N "checking for libbeagle-0.3.0 (at least $LIBBEAGLE_VERSION)... $ECHO_C" >&6; } + + if $PKG_CONFIG --atleast-pkgconfig-version 0.15 ; then + if $PKG_CONFIG --atleast-version $LIBBEAGLE_VERSION $LIBBEAGLE_PACKAGES >/dev/null 2>&1 ; then +diff -Nur -x '*.orig' -x '*~' kerry-0.2.1/configure.in kerry-0.2.1.new/configure.in +--- kerry-0.2.1/configure.in 2006-12-04 14:36:27.000000000 +0100 ++++ kerry-0.2.1.new/configure.in 2008-04-04 12:40:07.000000000 +0200 +@@ -134,9 +134,9 @@ + # LIBBEAGLE_LIBADD: libbeagle libraries (-l options) + # LIBBEAGLE_LDFLAGS: flags containing path to libbeagle libraries (-L options) + +-LIBBEAGLE_PACKAGES="libbeagle-0.0" +-LIBBEAGLE_VERSION="0.2.5" +-AC_MSG_CHECKING(for libbeagle-0.2.5 (at least $LIBBEAGLE_VERSION)) ++LIBBEAGLE_PACKAGES="libbeagle-1.0" ++LIBBEAGLE_VERSION="0.3.0" ++AC_MSG_CHECKING(for libbeagle-0.3.0 (at least $LIBBEAGLE_VERSION)) + + if $PKG_CONFIG --atleast-pkgconfig-version 0.15 ; then + if $PKG_CONFIG --atleast-version $LIBBEAGLE_VERSION $LIBBEAGLE_PACKAGES >/dev/null 2>&1 ; then +diff -Nur -x '*.orig' -x '*~' kerry-0.2.1/kerry/configure.in.in kerry-0.2.1.new/kerry/configure.in.in +--- kerry-0.2.1/kerry/configure.in.in 2006-12-04 14:35:38.000000000 +0100 ++++ kerry-0.2.1.new/kerry/configure.in.in 2008-04-04 12:40:28.000000000 +0200 +@@ -57,9 +57,9 @@ + # LIBBEAGLE_LIBADD: libbeagle libraries (-l options) + # LIBBEAGLE_LDFLAGS: flags containing path to libbeagle libraries (-L options) + +-LIBBEAGLE_PACKAGES="libbeagle-0.0" +-LIBBEAGLE_VERSION="0.2.5" +-AC_MSG_CHECKING(for libbeagle-0.2.5 (at least $LIBBEAGLE_VERSION)) ++LIBBEAGLE_PACKAGES="libbeagle-1.0" ++LIBBEAGLE_VERSION="0.3.0" ++AC_MSG_CHECKING(for libbeagle-0.3.0 (at least $LIBBEAGLE_VERSION)) + + if $PKG_CONFIG --atleast-pkgconfig-version 0.15 ; then + if $PKG_CONFIG --atleast-version $LIBBEAGLE_VERSION $LIBBEAGLE_PACKAGES >/dev/null 2>&1 ; then