On Sat, Sep 10, 2011 at 04:12:42PM +0200, Philipp Kern wrote: > On Mon, Aug 29, 2011 at 09:01:12PM +0800, Daniel Hartwig wrote: > > On 29 August 2011 01:36, Daniel Hartwig <mand...@gmail.com> wrote: > > > tags 634413 + patch > > > quit > > > > > > Re: #634413 aptitude: FTBFS: ld: cannot find -lgmock > > ... > > > > Nevermind, I have just seen that this was already fixed in git on 23/7 > > > > Should have checked ;) > can we have the fix in unstable, please? :)
I just uploaded the attached NMU to DELAYED/0-days. (And mailed a git commit to dburrows for inclusion into the aptitude repository because there's a bug in the recent gmock fix.) Kind regards Philipp Kern
diff -Nru aptitude-0.6.4/debian/changelog aptitude-0.6.4/debian/changelog
--- aptitude-0.6.4/debian/changelog 2011-05-16 18:05:00.000000000 +0200
+++ aptitude-0.6.4/debian/changelog 2011-10-16 22:30:18.000000000 +0200
@@ -1,3 +1,10 @@
+aptitude (0.6.4-1.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Fix FTBFS due to changes in google-mock. (Closes: #634413)
+
+ -- Philipp Kern <pk...@debian.org> Sun, 16 Oct 2011 22:29:57 +0200
+
aptitude (0.6.4-1) unstable; urgency=low
* New upstream release.
diff -Nru
aptitude-0.6.4/debian/patches/0001-Modify-autoconf-automake-scripts-to-handle-gmock-cha.patch
aptitude-0.6.4/debian/patches/0001-Modify-autoconf-automake-scripts-to-handle-gmock-cha.patch
---
aptitude-0.6.4/debian/patches/0001-Modify-autoconf-automake-scripts-to-handle-gmock-cha.patch
1970-01-01 01:00:00.000000000 +0100
+++
aptitude-0.6.4/debian/patches/0001-Modify-autoconf-automake-scripts-to-handle-gmock-cha.patch
2011-10-16 22:29:46.000000000 +0200
@@ -0,0 +1,113 @@
+From 942616a01dfdebe8e040ce459f07d7527220ed9b Mon Sep 17 00:00:00 2001
+From: Daniel Burrows <dburr...@debian.org>
+Date: Sat, 23 Jul 2011 15:51:23 -0700
+Subject: [PATCH 1/2] Modify autoconf/automake scripts to handle gmock
+ changes.
+
+---
+ configure.ac | 51 +++++++++++++++++++++++++++++++++++++++++++++++++--
+ tests/Makefile.am | 12 +++++++++++-
+ 2 files changed, 60 insertions(+), 3 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index c0a6862..b0ef2a3 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -23,8 +23,7 @@ ac_cv_c_const=yes
+ ac_cv_c_inline=yes
+
+ dnl Checks for libraries.
+-AC_CHECK_LIB(ncursesw, initscr, ,
+- [AC_MSG_ERROR([Can't find libncursesw -- please install
libncursesw5-dev])])
++AC_CHECK_LIB(ncursesw, initscr, , [AC_MSG_ERROR([Can't find libncursesw --
please install libncursesw5-dev])])
+ AC_CHECK_LIB(apt-pkg, main, , [AC_MSG_ERROR([Can't find the APT libraries --
please install libapt-pkg-dev])])
+
+ AC_MSG_CHECKING([whether apt includes the automatic dependency removal patch
(required)])
+@@ -482,6 +481,54 @@ AC_SUBST(BOOST_UNIT_TEST_LIBS)
+
+ ##### End Boost.Test check #####
+
++##### Check for Google Mock #####
++
++dnl Google Mock's developers do not support prebuilt libraries (e.g.,
++dnl they pay no attention to ABI compatibility) and as a result have
++dnl asked Debian not to ship prebuilt libraries. So, if we are
++dnl running on a system where gmock isn't available in $LIBDIR, we
++dnl guess that maybe there's source available that we can compile
++dnl during our own build process.
++
++AC_MSG_CHECKING([how to link gmock])
++
++BUILD_LOCAL_GMOCK=0
++
++OLD_LIBS="$LIBS"
++LIBS="$LIBS -lgmock"
++
++AC_LINK_IFELSE([AC_LANG_SOURCE([
++#include <gmock/gmock.h>
++
++int main(int argc, char **argv)
++{
++ return 0;
++}])],
++ [AC_MSG_RESULT([gmock is in in library path])]
++ ,
++ dnl Ok, check whether we can link it if we include the gmock
++ dnl source code. Note that it will require both pthreads and
++ dnl gtest; no way around that.
++ [LIBS="$OLD_LIBS -lpthread -lgtest"
++ OLD_CPPFLAGS="$CPPFLAGS"
++ CPPFLAGS="$CPPFLAGS -I/usr/src/gmock"
++ AC_LINK_IFELSE([AC_LANG_SOURCE([
++#include <src/gmock-all.cc>
++
++int main(int argc, char **argv)
++{
++ return 0;
++}])],
++ [AC_MSG_RESULT([source is in /usr/src/gmock])
++ BUILD_LOCAL_GMOCK=1],
++ [AC_MSG_ERROR([Can't figure out where Google Mock lives; either
install the google-mock package or place the library in the link path])])
++ CPPFLAGS="$OLD_CPPFLAGS"
++ LIBS="$OLD_LIBS"])
++
++AM_CONDITIONAL([BUILD_LOCAL_GMOCK], [test x$BUILD_LOCAL_GMOCK = x1])
++
++##### End Google Mock check #####
++
+ PKG_CHECK_MODULES(SQLITE3, sqlite3)
+
+ HAVE_GTK=1
+diff --git a/tests/Makefile.am b/tests/Makefile.am
+index 5234d43..2ec9ec0 100644
+--- a/tests/Makefile.am
++++ b/tests/Makefile.am
+@@ -2,7 +2,6 @@ MAINTAINERCLEANFILES = Makefile.in
+
+ INCLUDES = -I$(top_builddir) -I$(top_srcdir) -I$(top_srcdir)/src -I$(srcdir)
+ BOOST_TEST_LDFLAGS = @BOOST_UNIT_TEST_LIBS@
+-GMOCK_LDFLAGS = -lgmock -lgtest
+ AM_CPPFLAGS = -DBOOST_TEST_DYN_LINK -DSRCDIR=\"$(srcdir)\"
+ LDADD = $(top_builddir)/src/loggers.o \
+ $(top_builddir)/src/generic/apt/matching/libgeneric-matching.a \
+@@ -33,6 +32,17 @@ interactive_set_test_SOURCES = interactive_set_test.cc
+ test_choice.o test_choice_set.o test_resolver.o:
$(top_srcdir)/src/generic/problemresolver/*.h
+ test_promotion_set.o test_resolver_costs.o test_resolver_hints.o:
$(top_srcdir)/src/generic/problemresolver/*.h
+
++# Build a local copy of gmock if necessary.
++if BUILD_LOCAL_GMOCK
++noinst_LIBRARIES = libgmock.a
++
++GMOCK_LDFLAGS = $(srcdir)/libgmock.a -lgtest
++libgmock_a_SOURCES = /usr/src/gmock/src/gmock-all.cc
++libgmock_a_CPPFLAGS = -I/usr/src/gmock
++else
++GMOCK_LDFLAGS = -lgmock -lgtest
++endif
++
+ # Note: test_apt_universe is not built by default because it takes way
+ # too long. Of course, ideally this would be done in a less ad-hoc
+ # way...
+--
+1.7.6.3
+
diff -Nru aptitude-0.6.4/debian/patches/autoreconf-for-gmock.patch
aptitude-0.6.4/debian/patches/autoreconf-for-gmock.patch
--- aptitude-0.6.4/debian/patches/autoreconf-for-gmock.patch 1970-01-01
01:00:00.000000000 +0100
+++ aptitude-0.6.4/debian/patches/autoreconf-for-gmock.patch 2011-10-16
23:02:02.000000000 +0200
@@ -0,0 +1,625 @@
+Description: Re-autotooling for the gmock changes.
+ The gmock FTBFS patch needs autoreconf to be run for the changes to
+ be applied. To avoid to add new build-deps on autotools, let's
+ pre-generate the changes.
+ .
+ aptitude (0.6.4-1.1) unstable; urgency=low
+ .
+ * Non-maintainer upload.
+ * Fix FTBFS due to changes in google-mock. (Closes: #634413)
+Author: Philipp Kern <pk...@debian.org>
+Bug-Debian: http://bugs.debian.org/634413
+Forwarded: not-needed
+
+--- aptitude-0.6.4.orig/configure
++++ aptitude-0.6.4/configure
+@@ -625,6 +625,8 @@ GLIBMM_LIBS
+ GLIBMM_CFLAGS
+ SQLITE3_LIBS
+ SQLITE3_CFLAGS
++BUILD_LOCAL_GMOCK_FALSE
++BUILD_LOCAL_GMOCK_TRUE
+ BOOST_UNIT_TEST_LIBS
+ BOOST_IOSTREAMS_LIB
+ BOOST_LDFLAGS
+@@ -6385,6 +6387,7 @@ $as_echo "#define HAVE_DCGETTEXT 1" >>co
+
+
+
++
+ if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
+ if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a
program name with args.
+@@ -6513,6 +6516,7 @@ if test -n "$ept_CFLAGS"; then
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_ept_CFLAGS=`$PKG_CONFIG --cflags "libept" 2>/dev/null`
++ test "x$?" != "x0" && pkg_failed=yes
+ else
+ pkg_failed=yes
+ fi
+@@ -6529,6 +6533,7 @@ if test -n "$ept_LIBS"; then
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_ept_LIBS=`$PKG_CONFIG --libs "libept" 2>/dev/null`
++ test "x$?" != "x0" && pkg_failed=yes
+ else
+ pkg_failed=yes
+ fi
+@@ -6548,9 +6553,9 @@ else
+ _pkg_short_errors_supported=no
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+- ept_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors
"libept" 2>&1`
++ ept_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors
--cflags --libs "libept" 2>&1`
+ else
+- ept_PKG_ERRORS=`$PKG_CONFIG --print-errors "libept" 2>&1`
++ ept_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs
"libept" 2>&1`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$ept_PKG_ERRORS" >&5
+@@ -6956,6 +6961,7 @@ if test -n "$SIGC_CFLAGS"; then
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_SIGC_CFLAGS=`$PKG_CONFIG --cflags "sigc++-2.0" 2>/dev/null`
++ test "x$?" != "x0" && pkg_failed=yes
+ else
+ pkg_failed=yes
+ fi
+@@ -6972,6 +6978,7 @@ if test -n "$SIGC_LIBS"; then
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_SIGC_LIBS=`$PKG_CONFIG --libs "sigc++-2.0" 2>/dev/null`
++ test "x$?" != "x0" && pkg_failed=yes
+ else
+ pkg_failed=yes
+ fi
+@@ -6991,9 +6998,9 @@ else
+ _pkg_short_errors_supported=no
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+- SIGC_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors
"sigc++-2.0" 2>&1`
++ SIGC_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors
--cflags --libs "sigc++-2.0" 2>&1`
+ else
+- SIGC_PKG_ERRORS=`$PKG_CONFIG --print-errors "sigc++-2.0" 2>&1`
++ SIGC_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs
"sigc++-2.0" 2>&1`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$SIGC_PKG_ERRORS" >&5
+@@ -7046,6 +7053,7 @@ if test -n "$CWIDGET_CFLAGS"; then
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_CWIDGET_CFLAGS=`$PKG_CONFIG --cflags "cwidget" 2>/dev/null`
++ test "x$?" != "x0" && pkg_failed=yes
+ else
+ pkg_failed=yes
+ fi
+@@ -7062,6 +7070,7 @@ if test -n "$CWIDGET_LIBS"; then
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_CWIDGET_LIBS=`$PKG_CONFIG --libs "cwidget" 2>/dev/null`
++ test "x$?" != "x0" && pkg_failed=yes
+ else
+ pkg_failed=yes
+ fi
+@@ -7081,9 +7090,9 @@ else
+ _pkg_short_errors_supported=no
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+- CWIDGET_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors
"cwidget" 2>&1`
++ CWIDGET_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors
--cflags --libs "cwidget" 2>&1`
+ else
+- CWIDGET_PKG_ERRORS=`$PKG_CONFIG --print-errors "cwidget" 2>&1`
++ CWIDGET_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs
"cwidget" 2>&1`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$CWIDGET_PKG_ERRORS" >&5
+@@ -7136,6 +7145,7 @@ if test -n "$VTE_CFLAGS"; then
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_VTE_CFLAGS=`$PKG_CONFIG --cflags "vte" 2>/dev/null`
++ test "x$?" != "x0" && pkg_failed=yes
+ else
+ pkg_failed=yes
+ fi
+@@ -7152,6 +7162,7 @@ if test -n "$VTE_LIBS"; then
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_VTE_LIBS=`$PKG_CONFIG --libs "vte" 2>/dev/null`
++ test "x$?" != "x0" && pkg_failed=yes
+ else
+ pkg_failed=yes
+ fi
+@@ -7171,9 +7182,9 @@ else
+ _pkg_short_errors_supported=no
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+- VTE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "vte"
2>&1`
++ VTE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors
--cflags --libs "vte" 2>&1`
+ else
+- VTE_PKG_ERRORS=`$PKG_CONFIG --print-errors "vte" 2>&1`
++ VTE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs
"vte" 2>&1`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$VTE_PKG_ERRORS" >&5
+@@ -8160,6 +8171,71 @@ fi
+
+ ##### End Boost.Test check #####
+
++##### Check for Google Mock #####
++
++
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to link gmock" >&5
++$as_echo_n "checking how to link gmock... " >&6; }
++
++BUILD_LOCAL_GMOCK=0
++
++OLD_LIBS="$LIBS"
++LIBS="$LIBS -lgmock"
++
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h. */
++
++#include <gmock/gmock.h>
++
++int main(int argc, char **argv)
++{
++ return 0;
++}
++_ACEOF
++if ac_fn_cxx_try_link "$LINENO"; then :
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: gmock is in in library
path" >&5
++$as_echo "gmock is in in library path" >&6; }
++
++else
++ LIBS="$OLD_LIBS -lpthread -lgtest"
++ OLD_CPPFLAGS="$CPPFLAGS"
++ CPPFLAGS="$CPPFLAGS -I/usr/src/gmock"
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h. */
++
++#include <src/gmock-all.cc>
++
++int main(int argc, char **argv)
++{
++ return 0;
++}
++_ACEOF
++if ac_fn_cxx_try_link "$LINENO"; then :
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: source is in
/usr/src/gmock" >&5
++$as_echo "source is in /usr/src/gmock" >&6; }
++ BUILD_LOCAL_GMOCK=1
++else
++ as_fn_error $? "Can't figure out where Google Mock lives; either install
the google-mock package or place the library in the link path" "$LINENO" 5
++fi
++rm -f core conftest.err conftest.$ac_objext \
++ conftest$ac_exeext conftest.$ac_ext
++ CPPFLAGS="$OLD_CPPFLAGS"
++ LIBS="$OLD_LIBS"
++fi
++rm -f core conftest.err conftest.$ac_objext \
++ conftest$ac_exeext conftest.$ac_ext
++
++ if test x$BUILD_LOCAL_GMOCK = x1; then
++ BUILD_LOCAL_GMOCK_TRUE=
++ BUILD_LOCAL_GMOCK_FALSE='#'
++else
++ BUILD_LOCAL_GMOCK_TRUE='#'
++ BUILD_LOCAL_GMOCK_FALSE=
++fi
++
++
++##### End Google Mock check #####
++
+
+ pkg_failed=no
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SQLITE3" >&5
+@@ -8175,6 +8251,7 @@ if test -n "$SQLITE3_CFLAGS"; then
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_SQLITE3_CFLAGS=`$PKG_CONFIG --cflags "sqlite3" 2>/dev/null`
++ test "x$?" != "x0" && pkg_failed=yes
+ else
+ pkg_failed=yes
+ fi
+@@ -8191,6 +8268,7 @@ if test -n "$SQLITE3_LIBS"; then
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_SQLITE3_LIBS=`$PKG_CONFIG --libs "sqlite3" 2>/dev/null`
++ test "x$?" != "x0" && pkg_failed=yes
+ else
+ pkg_failed=yes
+ fi
+@@ -8210,9 +8288,9 @@ else
+ _pkg_short_errors_supported=no
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+- SQLITE3_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors
"sqlite3" 2>&1`
++ SQLITE3_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors
--cflags --libs "sqlite3" 2>&1`
+ else
+- SQLITE3_PKG_ERRORS=`$PKG_CONFIG --print-errors "sqlite3" 2>&1`
++ SQLITE3_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs
"sqlite3" 2>&1`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$SQLITE3_PKG_ERRORS" >&5
+@@ -8284,6 +8362,7 @@ if test -n "$GLIBMM_CFLAGS"; then
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_GLIBMM_CFLAGS=`$PKG_CONFIG --cflags "glibmm-2.4" 2>/dev/null`
++ test "x$?" != "x0" && pkg_failed=yes
+ else
+ pkg_failed=yes
+ fi
+@@ -8300,6 +8379,7 @@ if test -n "$GLIBMM_LIBS"; then
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_GLIBMM_LIBS=`$PKG_CONFIG --libs "glibmm-2.4" 2>/dev/null`
++ test "x$?" != "x0" && pkg_failed=yes
+ else
+ pkg_failed=yes
+ fi
+@@ -8319,9 +8399,9 @@ else
+ _pkg_short_errors_supported=no
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+- GLIBMM_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors
"glibmm-2.4" 2>&1`
++ GLIBMM_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors
--cflags --libs "glibmm-2.4" 2>&1`
+ else
+- GLIBMM_PKG_ERRORS=`$PKG_CONFIG --print-errors "glibmm-2.4" 2>&1`
++ GLIBMM_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs
"glibmm-2.4" 2>&1`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$GLIBMM_PKG_ERRORS" >&5
+@@ -8353,6 +8433,7 @@ if test -n "$GTHREAD_CFLAGS"; then
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_GTHREAD_CFLAGS=`$PKG_CONFIG --cflags "gthread-2.0" 2>/dev/null`
++ test "x$?" != "x0" && pkg_failed=yes
+ else
+ pkg_failed=yes
+ fi
+@@ -8369,6 +8450,7 @@ if test -n "$GTHREAD_LIBS"; then
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_GTHREAD_LIBS=`$PKG_CONFIG --libs "gthread-2.0" 2>/dev/null`
++ test "x$?" != "x0" && pkg_failed=yes
+ else
+ pkg_failed=yes
+ fi
+@@ -8388,9 +8470,9 @@ else
+ _pkg_short_errors_supported=no
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+- GTHREAD_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors
"gthread-2.0" 2>&1`
++ GTHREAD_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors
--cflags --libs "gthread-2.0" 2>&1`
+ else
+- GTHREAD_PKG_ERRORS=`$PKG_CONFIG --print-errors "gthread-2.0"
2>&1`
++ GTHREAD_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs
"gthread-2.0" 2>&1`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$GTHREAD_PKG_ERRORS" >&5
+@@ -8422,6 +8504,7 @@ if test -n "$GTKMM_CFLAGS"; then
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_GTKMM_CFLAGS=`$PKG_CONFIG --cflags "gtkmm-2.4" 2>/dev/null`
++ test "x$?" != "x0" && pkg_failed=yes
+ else
+ pkg_failed=yes
+ fi
+@@ -8438,6 +8521,7 @@ if test -n "$GTKMM_LIBS"; then
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_GTKMM_LIBS=`$PKG_CONFIG --libs "gtkmm-2.4" 2>/dev/null`
++ test "x$?" != "x0" && pkg_failed=yes
+ else
+ pkg_failed=yes
+ fi
+@@ -8457,9 +8541,9 @@ else
+ _pkg_short_errors_supported=no
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+- GTKMM_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors
"gtkmm-2.4" 2>&1`
++ GTKMM_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors
--cflags --libs "gtkmm-2.4" 2>&1`
+ else
+- GTKMM_PKG_ERRORS=`$PKG_CONFIG --print-errors "gtkmm-2.4" 2>&1`
++ GTKMM_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs
"gtkmm-2.4" 2>&1`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$GTKMM_PKG_ERRORS" >&5
+@@ -8491,6 +8575,7 @@ if test -n "$LIBGLADEMM_CFLAGS"; then
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_LIBGLADEMM_CFLAGS=`$PKG_CONFIG --cflags "libglademm-2.4" 2>/dev/null`
++ test "x$?" != "x0" && pkg_failed=yes
+ else
+ pkg_failed=yes
+ fi
+@@ -8507,6 +8592,7 @@ if test -n "$LIBGLADEMM_LIBS"; then
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_LIBGLADEMM_LIBS=`$PKG_CONFIG --libs "libglademm-2.4" 2>/dev/null`
++ test "x$?" != "x0" && pkg_failed=yes
+ else
+ pkg_failed=yes
+ fi
+@@ -8526,9 +8612,9 @@ else
+ _pkg_short_errors_supported=no
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+- LIBGLADEMM_PKG_ERRORS=`$PKG_CONFIG --short-errors
--print-errors "libglademm-2.4" 2>&1`
++ LIBGLADEMM_PKG_ERRORS=`$PKG_CONFIG --short-errors
--print-errors --cflags --libs "libglademm-2.4" 2>&1`
+ else
+- LIBGLADEMM_PKG_ERRORS=`$PKG_CONFIG --print-errors
"libglademm-2.4" 2>&1`
++ LIBGLADEMM_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags
--libs "libglademm-2.4" 2>&1`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$LIBGLADEMM_PKG_ERRORS" >&5
+@@ -8635,6 +8721,7 @@ if test -n "$QtCore_CFLAGS"; then
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_QtCore_CFLAGS=`$PKG_CONFIG --cflags "QtCore >= $QTCORE_REQUIRED"
2>/dev/null`
++ test "x$?" != "x0" && pkg_failed=yes
+ else
+ pkg_failed=yes
+ fi
+@@ -8651,6 +8738,7 @@ if test -n "$QtCore_LIBS"; then
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_QtCore_LIBS=`$PKG_CONFIG --libs "QtCore >= $QTCORE_REQUIRED"
2>/dev/null`
++ test "x$?" != "x0" && pkg_failed=yes
+ else
+ pkg_failed=yes
+ fi
+@@ -8670,9 +8758,9 @@ else
+ _pkg_short_errors_supported=no
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+- QtCore_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors
"QtCore >= $QTCORE_REQUIRED" 2>&1`
++ QtCore_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors
--cflags --libs "QtCore >= $QTCORE_REQUIRED" 2>&1`
+ else
+- QtCore_PKG_ERRORS=`$PKG_CONFIG --print-errors "QtCore >=
$QTCORE_REQUIRED" 2>&1`
++ QtCore_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs
"QtCore >= $QTCORE_REQUIRED" 2>&1`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$QtCore_PKG_ERRORS" >&5
+@@ -8704,6 +8792,7 @@ if test -n "$QtGui_CFLAGS"; then
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_QtGui_CFLAGS=`$PKG_CONFIG --cflags "QtGui >= $QTGUI_REQUIRED"
2>/dev/null`
++ test "x$?" != "x0" && pkg_failed=yes
+ else
+ pkg_failed=yes
+ fi
+@@ -8720,6 +8809,7 @@ if test -n "$QtGui_LIBS"; then
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_QtGui_LIBS=`$PKG_CONFIG --libs "QtGui >= $QTGUI_REQUIRED"
2>/dev/null`
++ test "x$?" != "x0" && pkg_failed=yes
+ else
+ pkg_failed=yes
+ fi
+@@ -8739,9 +8829,9 @@ else
+ _pkg_short_errors_supported=no
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+- QtGui_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors
"QtGui >= $QTGUI_REQUIRED" 2>&1`
++ QtGui_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors
--cflags --libs "QtGui >= $QTGUI_REQUIRED" 2>&1`
+ else
+- QtGui_PKG_ERRORS=`$PKG_CONFIG --print-errors "QtGui >=
$QTGUI_REQUIRED" 2>&1`
++ QtGui_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs
"QtGui >= $QTGUI_REQUIRED" 2>&1`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$QtGui_PKG_ERRORS" >&5
+@@ -9565,6 +9655,10 @@ if test -z "${am__fastdepCC_TRUE}" && te
+ as_fn_error $? "conditional \"am__fastdepCC\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
++if test -z "${BUILD_LOCAL_GMOCK_TRUE}" && test -z
"${BUILD_LOCAL_GMOCK_FALSE}"; then
++ as_fn_error $? "conditional \"BUILD_LOCAL_GMOCK\" was never defined.
++Usually this means the macro was only invoked conditionally." "$LINENO" 5
++fi
+ if test -z "${BUILD_GTK_TRUE}" && test -z "${BUILD_GTK_FALSE}"; then
+ as_fn_error $? "conditional \"BUILD_GTK\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+--- aptitude-0.6.4.orig/tests/Makefile.in
++++ aptitude-0.6.4/tests/Makefile.in
+@@ -15,6 +15,7 @@
+
+ @SET_MAKE@
+
++
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+@@ -55,6 +56,15 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/m
+ CONFIG_HEADER = $(top_builddir)/config.h
+ CONFIG_CLEAN_FILES =
+ CONFIG_CLEAN_VPATH_FILES =
++LIBRARIES = $(noinst_LIBRARIES)
++AR = ar
++ARFLAGS = cru
++libgmock_a_AR = $(AR) $(ARFLAGS)
++libgmock_a_LIBADD =
++am__libgmock_a_SOURCES_DIST = /usr/src/gmock/src/gmock-all.cc
++@BUILD_LOCAL_GMOCK_TRUE@am_libgmock_a_OBJECTS = \
++@BUILD_LOCAL_GMOCK_TRUE@ libgmock_a-gmock-all.$(OBJEXT)
++libgmock_a_OBJECTS = $(am_libgmock_a_OBJECTS)
+ PROGRAMS = $(noinst_PROGRAMS)
+ am_boost_test_OBJECTS = boost_test_main.$(OBJEXT) \
+ test_dynamic_list.$(OBJEXT) test_dynamic_set.$(OBJEXT) \
+@@ -64,6 +74,7 @@ am_boost_test_OBJECTS = boost_test_main.
+ boost_test_OBJECTS = $(am_boost_test_OBJECTS)
+ boost_test_LDADD = $(LDADD)
+ am__DEPENDENCIES_1 =
++@BUILD_LOCAL_GMOCK_TRUE@am__DEPENDENCIES_2 = $(srcdir)/libgmock.a
+ boost_test_DEPENDENCIES = $(top_builddir)/src/loggers.o \
+ $(top_builddir)/src/generic/apt/matching/libgeneric-matching.a \
+ $(top_builddir)/src/cmdline/libcmdline.a \
+@@ -77,7 +88,7 @@ boost_test_DEPENDENCIES = $(top_builddir
+ $(top_builddir)/src/generic/util/libgeneric-util.a \
+ $(top_builddir)/src/generic/views/libgeneric-views.a \
+ $(top_builddir)/src/generic/views/mocks/libgeneric-views-mocks.a \
+- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
++ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2)
+ am_cppunit_test_OBJECTS = cppunit_test_main.$(OBJEXT) \
+ test_choice.$(OBJEXT) test_choice_set.$(OBJEXT) \
+ test_config_pusher.$(OBJEXT) test_dense_setset.$(OBJEXT) \
+@@ -102,7 +113,7 @@ cppunit_test_DEPENDENCIES = $(top_buildd
+ $(top_builddir)/src/generic/util/libgeneric-util.a \
+ $(top_builddir)/src/generic/views/libgeneric-views.a \
+ $(top_builddir)/src/generic/views/mocks/libgeneric-views-mocks.a \
+- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
++ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2)
+ am_gtest_test_OBJECTS = gtest_test_main.$(OBJEXT) \
+ test_cmdline_download_progress_display.$(OBJEXT) \
+ test_cmdline_download_status_display.$(OBJEXT) \
+@@ -125,7 +136,7 @@ gtest_test_DEPENDENCIES = $(top_builddir
+ $(top_builddir)/src/generic/util/libgeneric-util.a \
+ $(top_builddir)/src/generic/views/libgeneric-views.a \
+ $(top_builddir)/src/generic/views/mocks/libgeneric-views-mocks.a \
+- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
++ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2)
+ am_interactive_set_test_OBJECTS = interactive_set_test.$(OBJEXT)
+ interactive_set_test_OBJECTS = $(am_interactive_set_test_OBJECTS)
+ interactive_set_test_LDADD = $(LDADD)
+@@ -142,7 +153,7 @@ interactive_set_test_DEPENDENCIES = $(to
+ $(top_builddir)/src/generic/util/libgeneric-util.a \
+ $(top_builddir)/src/generic/views/libgeneric-views.a \
+ $(top_builddir)/src/generic/views/mocks/libgeneric-views-mocks.a \
+- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
++ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2)
+ DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
+ depcomp = $(SHELL) $(top_srcdir)/depcomp
+ am__depfiles_maybe = depfiles
+@@ -152,10 +163,12 @@ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_IN
+ CXXLD = $(CXX)
+ CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
+ -o $@
+-SOURCES = $(boost_test_SOURCES) $(cppunit_test_SOURCES) \
+- $(gtest_test_SOURCES) $(interactive_set_test_SOURCES)
+-DIST_SOURCES = $(boost_test_SOURCES) $(cppunit_test_SOURCES) \
+- $(gtest_test_SOURCES) $(interactive_set_test_SOURCES)
++SOURCES = $(libgmock_a_SOURCES) $(boost_test_SOURCES) \
++ $(cppunit_test_SOURCES) $(gtest_test_SOURCES) \
++ $(interactive_set_test_SOURCES)
++DIST_SOURCES = $(am__libgmock_a_SOURCES_DIST) $(boost_test_SOURCES) \
++ $(cppunit_test_SOURCES) $(gtest_test_SOURCES) \
++ $(interactive_set_test_SOURCES)
+ ETAGS = etags
+ CTAGS = ctags
+ am__tty_colors = \
+@@ -310,7 +323,6 @@ top_srcdir = @top_srcdir@
+ MAINTAINERCLEANFILES = Makefile.in
+ INCLUDES = -I$(top_builddir) -I$(top_srcdir) -I$(top_srcdir)/src -I$(srcdir)
+ BOOST_TEST_LDFLAGS = @BOOST_UNIT_TEST_LIBS@
+-GMOCK_LDFLAGS = -lgmock -lgtest
+ AM_CPPFLAGS = -DBOOST_TEST_DYN_LINK -DSRCDIR=\"$(srcdir)\"
+ LDADD = $(top_builddir)/src/loggers.o \
+ $(top_builddir)/src/generic/apt/matching/libgeneric-matching.a \
+@@ -331,6 +343,13 @@ $(BOOST_TEST_LDFLAGS) $(GMOCK_LDFLAGS)
+ EXTRA_DIST = file_caches
+ interactive_set_test_SOURCES = interactive_set_test.cc
+
++# Build a local copy of gmock if necessary.
++@BUILD_LOCAL_GMOCK_TRUE@noinst_LIBRARIES = libgmock.a
++@BUILD_LOCAL_GMOCK_FALSE@GMOCK_LDFLAGS = -lgmock -lgtest
++@BUILD_LOCAL_GMOCK_TRUE@GMOCK_LDFLAGS = $(srcdir)/libgmock.a -lgtest
++@BUILD_LOCAL_GMOCK_TRUE@libgmock_a_SOURCES = /usr/src/gmock/src/gmock-all.cc
++@BUILD_LOCAL_GMOCK_TRUE@libgmock_a_CPPFLAGS = -I/usr/src/gmock
++
+ # Note: test_apt_universe is not built by default because it takes way
+ # too long. Of course, ideally this would be done in a less ad-hoc
+ # way...
+@@ -409,6 +428,13 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ $(am__aclocal_m4_deps):
+
++clean-noinstLIBRARIES:
++ -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
++libgmock.a: $(libgmock_a_OBJECTS) $(libgmock_a_DEPENDENCIES)
++ -rm -f libgmock.a
++ $(libgmock_a_AR) libgmock.a $(libgmock_a_OBJECTS) $(libgmock_a_LIBADD)
++ $(RANLIB) libgmock.a
++
+ clean-checkPROGRAMS:
+ -test -z "$(check_PROGRAMS)" || rm -f $(check_PROGRAMS)
+
+@@ -437,6 +463,7 @@ distclean-compile:
+ @AMDEP_TRUE@@am__include@
@am__quote@./$(DEPDIR)/cppunit_test_main.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gtest_test_main.Po@am__quote@
+ @AMDEP_TRUE@@am__include@
@am__quote@./$(DEPDIR)/interactive_set_test.Po@am__quote@
++@AMDEP_TRUE@@am__include@
@am__quote@./$(DEPDIR)/libgmock_a-gmock-all.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_choice.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_choice_set.Po@am__quote@
+ @AMDEP_TRUE@@am__include@
@am__quote@./$(DEPDIR)/test_cmdline_download_progress_display.Po@am__quote@
+@@ -482,6 +509,20 @@ distclean-compile:
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE)
$(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
++libgmock_a-gmock-all.o: /usr/src/gmock/src/gmock-all.cc
++@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(libgmock_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT
libgmock_a-gmock-all.o -MD -MP -MF $(DEPDIR)/libgmock_a-gmock-all.Tpo -c -o
libgmock_a-gmock-all.o `test -f '/usr/src/gmock/src/gmock-all.cc' || echo
'$(srcdir)/'`/usr/src/gmock/src/gmock-all.cc
++@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libgmock_a-gmock-all.Tpo
$(DEPDIR)/libgmock_a-gmock-all.Po
++@AMDEP_TRUE@@am__fastdepCXX_FALSE@
source='/usr/src/gmock/src/gmock-all.cc' object='libgmock_a-gmock-all.o'
libtool=no @AMDEPBACKSLASH@
++@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE)
$(depcomp) @AMDEPBACKSLASH@
++@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(libgmock_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o
libgmock_a-gmock-all.o `test -f '/usr/src/gmock/src/gmock-all.cc' || echo
'$(srcdir)/'`/usr/src/gmock/src/gmock-all.cc
++
++libgmock_a-gmock-all.obj: /usr/src/gmock/src/gmock-all.cc
++@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(libgmock_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT
libgmock_a-gmock-all.obj -MD -MP -MF $(DEPDIR)/libgmock_a-gmock-all.Tpo -c -o
libgmock_a-gmock-all.obj `if test -f '/usr/src/gmock/src/gmock-all.cc'; then
$(CYGPATH_W) '/usr/src/gmock/src/gmock-all.cc'; else $(CYGPATH_W)
'$(srcdir)//usr/src/gmock/src/gmock-all.cc'; fi`
++@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libgmock_a-gmock-all.Tpo
$(DEPDIR)/libgmock_a-gmock-all.Po
++@AMDEP_TRUE@@am__fastdepCXX_FALSE@
source='/usr/src/gmock/src/gmock-all.cc' object='libgmock_a-gmock-all.obj'
libtool=no @AMDEPBACKSLASH@
++@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE)
$(depcomp) @AMDEPBACKSLASH@
++@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(libgmock_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o
libgmock_a-gmock-all.obj `if test -f '/usr/src/gmock/src/gmock-all.cc'; then
$(CYGPATH_W) '/usr/src/gmock/src/gmock-all.cc'; else $(CYGPATH_W)
'$(srcdir)//usr/src/gmock/src/gmock-all.cc'; fi`
++
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+@@ -660,7 +701,7 @@ check-am: all-am
+ $(MAKE) $(AM_MAKEFLAGS) $(check_PROGRAMS)
+ $(MAKE) $(AM_MAKEFLAGS) check-TESTS
+ check: check-am
+-all-am: Makefile $(PROGRAMS)
++all-am: Makefile $(LIBRARIES) $(PROGRAMS)
+ installdirs:
+ install: install-am
+ install-exec: install-exec-am
+@@ -690,8 +731,8 @@ maintainer-clean-generic:
+ -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
+ clean: clean-am
+
+-clean-am: clean-checkPROGRAMS clean-generic clean-noinstPROGRAMS \
+- mostlyclean-am
++clean-am: clean-checkPROGRAMS clean-generic clean-noinstLIBRARIES \
++ clean-noinstPROGRAMS mostlyclean-am
+
+ distclean: distclean-am
+ -rm -rf ./$(DEPDIR)
+@@ -761,17 +802,18 @@ uninstall-am:
+ .MAKE: check-am install-am install-strip
+
+ .PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \
+- clean-checkPROGRAMS clean-generic clean-noinstPROGRAMS ctags \
+- distclean distclean-compile distclean-generic distclean-tags \
+- distdir dvi dvi-am html html-am info info-am install \
+- install-am install-data install-data-am install-dvi \
+- install-dvi-am install-exec install-exec-am install-html \
+- install-html-am install-info install-info-am install-man \
+- install-pdf install-pdf-am install-ps install-ps-am \
+- install-strip installcheck installcheck-am installdirs \
+- maintainer-clean maintainer-clean-generic mostlyclean \
+- mostlyclean-compile mostlyclean-generic pdf pdf-am ps ps-am \
+- tags uninstall uninstall-am
++ clean-checkPROGRAMS clean-generic clean-noinstLIBRARIES \
++ clean-noinstPROGRAMS ctags distclean distclean-compile \
++ distclean-generic distclean-tags distdir dvi dvi-am html \
++ html-am info info-am install install-am install-data \
++ install-data-am install-dvi install-dvi-am install-exec \
++ install-exec-am install-html install-html-am install-info \
++ install-info-am install-man install-pdf install-pdf-am \
++ install-ps install-ps-am install-strip installcheck \
++ installcheck-am installdirs maintainer-clean \
++ maintainer-clean-generic mostlyclean mostlyclean-compile \
++ mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \
++ uninstall-am
+
+
+ test_choice.o test_choice_set.o test_resolver.o:
$(top_srcdir)/src/generic/problemresolver/*.h
diff -Nru aptitude-0.6.4/debian/patches/gmock-correct-directory.patch
aptitude-0.6.4/debian/patches/gmock-correct-directory.patch
--- aptitude-0.6.4/debian/patches/gmock-correct-directory.patch 1970-01-01
01:00:00.000000000 +0100
+++ aptitude-0.6.4/debian/patches/gmock-correct-directory.patch 2011-10-16
23:20:47.000000000 +0200
@@ -0,0 +1,44 @@
+Description: gmock: correct library location
+ The library is actually built in build-$flavour/tests, not in the
+ srcdir. So everything works when you try it in the development
+ repository, but not if you're building the Debian package.
+ .
+ aptitude (0.6.4-1.1) unstable; urgency=low
+ .
+ * Non-maintainer upload.
+ * Fix FTBFS due to changes in google-mock. (Closes: #634413)
+Author: Philipp Kern <pk...@debian.org>
+Bug-Debian: http://bugs.debian.org/634413
+Forwarded: no
+
+--- aptitude-0.6.4.orig/tests/Makefile.am
++++ aptitude-0.6.4/tests/Makefile.am
+@@ -36,7 +36,7 @@ test_promotion_set.o test_resolver_costs
+ if BUILD_LOCAL_GMOCK
+ noinst_LIBRARIES = libgmock.a
+
+-GMOCK_LDFLAGS = $(srcdir)/libgmock.a -lgtest
++GMOCK_LDFLAGS = $(builddir)/libgmock.a -lgtest
+ libgmock_a_SOURCES = /usr/src/gmock/src/gmock-all.cc
+ libgmock_a_CPPFLAGS = -I/usr/src/gmock
+ else
+--- aptitude-0.6.4.orig/tests/Makefile.in
++++ aptitude-0.6.4/tests/Makefile.in
+@@ -74,7 +74,7 @@ am_boost_test_OBJECTS = boost_test_main.
+ boost_test_OBJECTS = $(am_boost_test_OBJECTS)
+ boost_test_LDADD = $(LDADD)
+ am__DEPENDENCIES_1 =
+-@BUILD_LOCAL_GMOCK_TRUE@am__DEPENDENCIES_2 = $(srcdir)/libgmock.a
++@BUILD_LOCAL_GMOCK_TRUE@am__DEPENDENCIES_2 = $(builddir)/libgmock.a
+ boost_test_DEPENDENCIES = $(top_builddir)/src/loggers.o \
+ $(top_builddir)/src/generic/apt/matching/libgeneric-matching.a \
+ $(top_builddir)/src/cmdline/libcmdline.a \
+@@ -346,7 +346,7 @@ interactive_set_test_SOURCES = interacti
+ # Build a local copy of gmock if necessary.
+ @BUILD_LOCAL_GMOCK_TRUE@noinst_LIBRARIES = libgmock.a
+ @BUILD_LOCAL_GMOCK_FALSE@GMOCK_LDFLAGS = -lgmock -lgtest
+-@BUILD_LOCAL_GMOCK_TRUE@GMOCK_LDFLAGS = $(srcdir)/libgmock.a -lgtest
++@BUILD_LOCAL_GMOCK_TRUE@GMOCK_LDFLAGS = $(builddir)/libgmock.a -lgtest
+ @BUILD_LOCAL_GMOCK_TRUE@libgmock_a_SOURCES = /usr/src/gmock/src/gmock-all.cc
+ @BUILD_LOCAL_GMOCK_TRUE@libgmock_a_CPPFLAGS = -I/usr/src/gmock
+
diff -Nru aptitude-0.6.4/debian/patches/series
aptitude-0.6.4/debian/patches/series
--- aptitude-0.6.4/debian/patches/series 1970-01-01 01:00:00.000000000
+0100
+++ aptitude-0.6.4/debian/patches/series 2011-10-16 23:20:54.000000000
+0200
@@ -0,0 +1,3 @@
+0001-Modify-autoconf-automake-scripts-to-handle-gmock-cha.patch
+autoreconf-for-gmock.patch
+gmock-correct-directory.patch
signature.asc
Description: Digital signature
