diff -u evolution-scalix-10.0.1.1/debian/rules evolution-scalix-10.0.1.1/debian/rules --- evolution-scalix-10.0.1.1/debian/rules +++ evolution-scalix-10.0.1.1/debian/rules @@ -2,7 +2,7 @@ include /usr/share/cdbs/1/class/gnome.mk include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/rules/simple-patchsys.mk +include /usr/share/cdbs/1/rules/patchsys-quilt.mk DEB_CONFIGURE_EXTRA_FLAGS := --with-libdb=/usr/include diff -u evolution-scalix-10.0.1.1/debian/changelog evolution-scalix-10.0.1.1/debian/changelog --- evolution-scalix-10.0.1.1/debian/changelog +++ evolution-scalix-10.0.1.1/debian/changelog @@ -1,3 +1,13 @@ +evolution-scalix (10.0.1.1-0ubuntu3) UNRELEASED; urgency=low + + * debian/control, debian/rules: build-depend on quilt. + * debian/patches/evolution-shell-modversion: new patch to fix build + failure with evolution 2.21.91, which uses an unversioned + evolution-shell.pc. + * debian/patches/autoconf: separate patch for autogenerated files + + -- Steve Langasek Wed, 20 Feb 2008 18:47:40 +0000 + evolution-scalix (10.0.1.1-0ubuntu2) hardy; urgency=low * No-change rebuild against libcamel1.2-11. diff -u evolution-scalix-10.0.1.1/debian/control evolution-scalix-10.0.1.1/debian/control --- evolution-scalix-10.0.1.1/debian/control +++ evolution-scalix-10.0.1.1/debian/control @@ -2,7 +2,7 @@ Section: gnome Priority: optional Maintainer: Daniel Holbach -Build-Depends: cdbs, debhelper (>= 5), evolution-dev (>= 2.9), libedataserverui1.2-dev, libedata-book1.2-dev, libedata-cal1.2-dev, evolution-data-server-dev (>= 1.9.4), libglib2.0-dev, libgconf2-dev, libcamel1.2-dev, libxml2-dev, libxml-parser-perl, libdb4.4-dev +Build-Depends: cdbs, debhelper (>= 5), evolution-dev (>= 2.9), libedataserverui1.2-dev, libedata-book1.2-dev, libedata-cal1.2-dev, evolution-data-server-dev (>= 1.9.4), libglib2.0-dev, libgconf2-dev, libcamel1.2-dev, libxml2-dev, libxml-parser-perl, libdb4.4-dev, quilt Standards-Version: 3.7.2 Package: evolution-scalix only in patch2: unchanged: --- evolution-scalix-10.0.1.1.orig/debian/patches/series +++ evolution-scalix-10.0.1.1/debian/patches/series @@ -0,0 +1,2 @@ +evolution-shell-modversion +autoconf only in patch2: unchanged: --- evolution-scalix-10.0.1.1.orig/debian/patches/evolution-shell-modversion +++ evolution-scalix-10.0.1.1/debian/patches/evolution-shell-modversion @@ -0,0 +1,75 @@ +Index: evolution-scalix-10.0.1.1/configure.in +=================================================================== +--- evolution-scalix-10.0.1.1.orig/configure.in ++++ evolution-scalix-10.0.1.1/configure.in +@@ -29,19 +29,28 @@ + + AC_DEFINE_UNQUOTED(SERVER_VERSION_REQ, "$SERVER_REQ", [Minimal server version required]) + +-for version in 2.10 2.8 2.6 2.4; do ++AC_MSG_CHECKING([Evolution]) ++EVOLUTION_VERSION=`pkg-config --modversion evolution-shell 2>/dev/null` + +- AC_MSG_CHECKING([Checking for Evolution version $version]) +- EVOLUTION_VERSION=`pkg-config --modversion evolution-shell-$version 2>/dev/null` ++if test -n "$EVOLUTION_VERSION"; then ++ version=2.22 ++ AC_MSG_RESULT([found ($EVOLUTION_VERSION)]) ++else ++ AC_MSG_RESULT([not found]) ++ for version in 2.10 2.8 2.6 2.4; do ++ ++ AC_MSG_CHECKING([Evolution version $version]) ++ EVOLUTION_VERSION=`pkg-config --modversion evolution-shell-$version 2>/dev/null` + +- if test -z "$EVOLUTION_VERSION"; then +- AC_MSG_RESULT([not found]) +- else +- AC_MSG_RESULT([found ($EVOLUTION_VERSION)]) +- break; +- fi ++ if test -z "$EVOLUTION_VERSION"; then ++ AC_MSG_RESULT([not found]) ++ else ++ AC_MSG_RESULT([found ($EVOLUTION_VERSION)]) ++ break; ++ fi + +-done ++ done ++fi + + if test -z "$EVOLUTION_VERSION"; then + AC_MSG_ERROR([No compatible Evolution version found or missing development headers]) +@@ -80,7 +89,12 @@ + EDS_API_VERSION=1.2 + ;; + +- ++ 2.22) ++ EAPI_MAJOR_VERSION=2 ++ EAPI_MINOR_VERSION=22 ++ CAMEL_API_VERSION=1.2 ++ EDS_API_VERSION=1.2 ++ ;; + esac + + AC_SUBST(EVOLUTION_VERSION) +@@ -143,14 +157,14 @@ + AC_SUBST(GTK_LIBS) + + dnl === evolution-plugin ============== +-PKG_CHECK_MODULES(EPLUGIN, evolution-plugin-$EVOLUTION_API_VERSION) ++PKG_CHECK_MODULES(EPLUGIN, evolution-plugin${EVOLUTION_API_VERSION:+-$EVOLUTION_API_VERSION}) + AC_SUBST(EPLUGIN_CFLAGS) + AC_SUBST(EPLUGIN_LIBS) + +-eplugindir=`pkg-config --variable=plugindir evolution-plugin-$EVOLUTION_API_VERSION` ++eplugindir=`pkg-config --variable=plugindir evolution-plugin${EVOLUTION_API_VERSION:+-$EVOLUTION_API_VERSION}` + AC_SUBST(eplugindir) + +-eerrordir=`pkg-config --variable=errordir evolution-plugin-$EVOLUTION_API_VERSION` ++eerrordir=`pkg-config --variable=errordir evolution-plugin${EVOLUTION_API_VERSION:+-$EVOLUTION_API_VERSION}` + AC_SUBST(eerrordir) + + EPLUGIN_RULE=$srcdir/eplugin.mk only in patch2: unchanged: --- evolution-scalix-10.0.1.1.orig/debian/patches/autoconf +++ evolution-scalix-10.0.1.1/debian/patches/autoconf @@ -0,0 +1,136 @@ +Index: evolution-scalix-10.0.1.1/configure +=================================================================== +--- evolution-scalix-10.0.1.1.orig/configure ++++ evolution-scalix-10.0.1.1/configure +@@ -20149,22 +20149,34 @@ + _ACEOF + + +-for version in 2.10 2.8 2.6 2.4; do ++{ echo "$as_me:$LINENO: checking Evolution" >&5 ++echo $ECHO_N "checking Evolution... $ECHO_C" >&6; } ++EVOLUTION_VERSION=`pkg-config --modversion evolution-shell 2>/dev/null` ++ ++if test -n "$EVOLUTION_VERSION"; then ++ version=2.22 ++ { echo "$as_me:$LINENO: result: found ($EVOLUTION_VERSION)" >&5 ++echo "${ECHO_T}found ($EVOLUTION_VERSION)" >&6; } ++else ++ { echo "$as_me:$LINENO: result: not found" >&5 ++echo "${ECHO_T}not found" >&6; } ++ for version in 2.10 2.8 2.6 2.4; do + +- { echo "$as_me:$LINENO: checking Checking for Evolution version $version" >&5 +-echo $ECHO_N "checking Checking for Evolution version $version... $ECHO_C" >&6; } +- EVOLUTION_VERSION=`pkg-config --modversion evolution-shell-$version 2>/dev/null` ++ { echo "$as_me:$LINENO: checking Evolution version $version" >&5 ++echo $ECHO_N "checking Evolution version $version... $ECHO_C" >&6; } ++ EVOLUTION_VERSION=`pkg-config --modversion evolution-shell-$version 2>/dev/null` + +- if test -z "$EVOLUTION_VERSION"; then +- { echo "$as_me:$LINENO: result: not found" >&5 ++ if test -z "$EVOLUTION_VERSION"; then ++ { echo "$as_me:$LINENO: result: not found" >&5 + echo "${ECHO_T}not found" >&6; } +- else +- { echo "$as_me:$LINENO: result: found ($EVOLUTION_VERSION)" >&5 ++ else ++ { echo "$as_me:$LINENO: result: found ($EVOLUTION_VERSION)" >&5 + echo "${ECHO_T}found ($EVOLUTION_VERSION)" >&6; } +- break; +- fi ++ break; ++ fi + +-done ++ done ++fi + + if test -z "$EVOLUTION_VERSION"; then + { { echo "$as_me:$LINENO: error: No compatible Evolution version found or missing development headers" >&5 +@@ -20205,7 +20217,12 @@ + EDS_API_VERSION=1.2 + ;; + +- ++ 2.22) ++ EAPI_MAJOR_VERSION=2 ++ EAPI_MINOR_VERSION=22 ++ CAMEL_API_VERSION=1.2 ++ EDS_API_VERSION=1.2 ++ ;; + esac + + +@@ -22560,12 +22577,12 @@ + pkg_cv_EPLUGIN_CFLAGS="$EPLUGIN_CFLAGS" + else + if test -n "$PKG_CONFIG" && \ +- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"evolution-plugin-\$EVOLUTION_API_VERSION\"") >&5 +- ($PKG_CONFIG --exists --print-errors "evolution-plugin-$EVOLUTION_API_VERSION") 2>&5 ++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"evolution-plugin\${EVOLUTION_API_VERSION:+-\$EVOLUTION_API_VERSION}\"") >&5 ++ ($PKG_CONFIG --exists --print-errors "evolution-plugin${EVOLUTION_API_VERSION:+-$EVOLUTION_API_VERSION}") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then +- pkg_cv_EPLUGIN_CFLAGS=`$PKG_CONFIG --cflags "evolution-plugin-$EVOLUTION_API_VERSION" 2>/dev/null` ++ pkg_cv_EPLUGIN_CFLAGS=`$PKG_CONFIG --cflags "evolution-plugin${EVOLUTION_API_VERSION:+-$EVOLUTION_API_VERSION}" 2>/dev/null` + else + pkg_failed=yes + fi +@@ -22578,12 +22595,12 @@ + pkg_cv_EPLUGIN_LIBS="$EPLUGIN_LIBS" + else + if test -n "$PKG_CONFIG" && \ +- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"evolution-plugin-\$EVOLUTION_API_VERSION\"") >&5 +- ($PKG_CONFIG --exists --print-errors "evolution-plugin-$EVOLUTION_API_VERSION") 2>&5 ++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"evolution-plugin\${EVOLUTION_API_VERSION:+-\$EVOLUTION_API_VERSION}\"") >&5 ++ ($PKG_CONFIG --exists --print-errors "evolution-plugin${EVOLUTION_API_VERSION:+-$EVOLUTION_API_VERSION}") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then +- pkg_cv_EPLUGIN_LIBS=`$PKG_CONFIG --libs "evolution-plugin-$EVOLUTION_API_VERSION" 2>/dev/null` ++ pkg_cv_EPLUGIN_LIBS=`$PKG_CONFIG --libs "evolution-plugin${EVOLUTION_API_VERSION:+-$EVOLUTION_API_VERSION}" 2>/dev/null` + else + pkg_failed=yes + fi +@@ -22602,14 +22619,14 @@ + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- EPLUGIN_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "evolution-plugin-$EVOLUTION_API_VERSION"` ++ EPLUGIN_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "evolution-plugin${EVOLUTION_API_VERSION:+-$EVOLUTION_API_VERSION}"` + else +- EPLUGIN_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "evolution-plugin-$EVOLUTION_API_VERSION"` ++ EPLUGIN_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "evolution-plugin${EVOLUTION_API_VERSION:+-$EVOLUTION_API_VERSION}"` + fi + # Put the nasty error message in config.log where it belongs + echo "$EPLUGIN_PKG_ERRORS" >&5 + +- { { echo "$as_me:$LINENO: error: Package requirements (evolution-plugin-$EVOLUTION_API_VERSION) were not met: ++ { { echo "$as_me:$LINENO: error: Package requirements (evolution-plugin${EVOLUTION_API_VERSION:+-$EVOLUTION_API_VERSION}) were not met: + + $EPLUGIN_PKG_ERRORS + +@@ -22620,7 +22637,7 @@ + and EPLUGIN_LIBS to avoid the need to call pkg-config. + See the pkg-config man page for more details. + " >&5 +-echo "$as_me: error: Package requirements (evolution-plugin-$EVOLUTION_API_VERSION) were not met: ++echo "$as_me: error: Package requirements (evolution-plugin${EVOLUTION_API_VERSION:+-$EVOLUTION_API_VERSION}) were not met: + + $EPLUGIN_PKG_ERRORS + +@@ -22664,10 +22681,10 @@ + + + +-eplugindir=`pkg-config --variable=plugindir evolution-plugin-$EVOLUTION_API_VERSION` ++eplugindir=`pkg-config --variable=plugindir evolution-plugin${EVOLUTION_API_VERSION:+-$EVOLUTION_API_VERSION}` + + +-eerrordir=`pkg-config --variable=errordir evolution-plugin-$EVOLUTION_API_VERSION` ++eerrordir=`pkg-config --variable=errordir evolution-plugin${EVOLUTION_API_VERSION:+-$EVOLUTION_API_VERSION}` + + + EPLUGIN_RULE=$srcdir/eplugin.mk