diff -u unity-lens-applications-7.1.0+15.10.20151002/debian/changelog unity-lens-applications-7.1.0+15.10.20151002/debian/changelog
--- unity-lens-applications-7.1.0+15.10.20151002/debian/changelog
+++ unity-lens-applications-7.1.0+15.10.20151002/debian/changelog
@@ -1,3 +1,9 @@
+unity-lens-applications (7.1.0+15.10.20151002-0ubuntu2) xenial; urgency=medium
+
+  * Build using libgee-0.8-dev instead of libgee-dev.
+
+ -- Matthias Klose <doko@ubuntu.com>  Fri, 12 Feb 2016 17:53:12 +0100
+
 unity-lens-applications (7.1.0+15.10.20151002-0ubuntu1) wily; urgency=medium
 
   [ Sebastien Bacher ]
diff -u unity-lens-applications-7.1.0+15.10.20151002/debian/control unity-lens-applications-7.1.0+15.10.20151002/debian/control
--- unity-lens-applications-7.1.0+15.10.20151002/debian/control
+++ unity-lens-applications-7.1.0+15.10.20151002/debian/control
@@ -8,7 +8,7 @@
                pkg-config,
                valac (>= 0.18.0),
                libglib2.0-dev (>= 2.27),
-               libgee-dev,
+               libgee-0.8-dev,
                libdee-dev (>= 0.5.16),
                libzeitgeist-dev (>= 0.3.8),
                libunity-dev (>= 7.1.1),
only in patch2:
unchanged:
--- unity-lens-applications-7.1.0+15.10.20151002.orig/.pc/.quilt_patches
+++ unity-lens-applications-7.1.0+15.10.20151002/.pc/.quilt_patches
@@ -0,0 +1 @@
+debian/patches
only in patch2:
unchanged:
--- unity-lens-applications-7.1.0+15.10.20151002.orig/.pc/.quilt_series
+++ unity-lens-applications-7.1.0+15.10.20151002/.pc/.quilt_series
@@ -0,0 +1 @@
+series
only in patch2:
unchanged:
--- unity-lens-applications-7.1.0+15.10.20151002.orig/.pc/.version
+++ unity-lens-applications-7.1.0+15.10.20151002/.pc/.version
@@ -0,0 +1 @@
+2
only in patch2:
unchanged:
--- unity-lens-applications-7.1.0+15.10.20151002.orig/.pc/applied-patches
+++ unity-lens-applications-7.1.0+15.10.20151002/.pc/applied-patches
@@ -0,0 +1 @@
+libgee-0.8.diff
only in patch2:
unchanged:
--- unity-lens-applications-7.1.0+15.10.20151002.orig/.pc/libgee-0.8.diff/configure.ac
+++ unity-lens-applications-7.1.0+15.10.20151002/.pc/libgee-0.8.diff/configure.ac
@@ -0,0 +1,199 @@
+AC_INIT(unity-lens-applications, 7.1.0, https://launchpad.net/unity-lens-applications)
+AC_COPYRIGHT([Copyright 2010-2012 Canonical])
+AM_INIT_AUTOMAKE([1.11])
+
+LT_INIT
+
+#############################################
+# Silent build rules
+#############################################
+m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
+
+AC_PREREQ(2.59)
+
+AC_CONFIG_HEADERS([config.h])
+
+#############################################
+# Init the other things we depend on
+#############################################
+AM_MAINTAINER_MODE([enable])
+AM_PROG_VALAC([0.18.0])
+AS_IF([test -z "$VALAC"], [AC_MSG_ERROR(["No valac compiler found."])])
+AC_PROG_CC
+AC_PROG_CXX
+AM_PROG_CC_C_O
+AC_HEADER_STDC
+AC_LANG([C++])
+
+LT_INIT
+AC_CONFIG_MACRO_DIR([m4])
+
+#############################################
+# Gettext
+#############################################
+GETTEXT_PACKAGE="$PACKAGE"
+AC_SUBST(GETTEXT_PACKAGE)
+AC_SUBST([CONFIG_STATUS_DEPENDENCIES],['$(top_srcdir)/po/LINGUAS'])
+AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [gettext domain])
+AM_GLIB_GNU_GETTEXT
+
+# AM_GNOME_GETTEXT above substs $DATADIRNAME
+# this is the directory where the *.{mo,gmo} files are installed
+localedir='${prefix}/${DATADIRNAME}/locale'
+AC_SUBST(localedir)
+
+IT_PROG_INTLTOOL([0.40.0])
+
+AC_DEFINE_UNQUOTED(LOCALE_DIR, "${PREFIX}/${DATADIRNAME}/locale",[Locale directory])
+AC_DEFINE_UNQUOTED(DATADIR, "${PREFIX}/${DATADIRNAME}",[Data directory])
+AC_DEFINE_UNQUOTED(PREFIXDIR, "${PREFIX}",[Prefix directory])
+
+######################################################
+# intltool rule for generating translated .scope file
+######################################################
+INTLTOOL_SCOPE_RULE='%.scope: %.scope.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
+AC_SUBST(INTLTOOL_SCOPE_RULE)
+
+###########################
+# gcov coverage reporting
+###########################
+m4_include([m4/gcov.m4])
+AC_TDD_GCOV
+AM_CONDITIONAL([HAVE_GCOV], [test "x$ac_cv_check_gcov" = xyes])
+AM_CONDITIONAL([HAVE_LCOV], [test "x$ac_cv_check_lcov" = xyes])
+AM_CONDITIONAL([HAVE_GCOVR], [test "x$ac_cv_check_gcovr" = xyes])
+AC_SUBST(COVERAGE_CFLAGS)
+AC_SUBST(COVERAGE_LDFLAGS)
+
+#############################################
+# Check for module and library dependancies
+#############################################
+GLIB_REQUIRED=2.27
+PKG_CHECK_MODULES(LENS_DAEMON,
+                  glib-2.0 >= $GLIB_REQUIRED
+                  gobject-2.0 >= $GLIB_REQUIRED
+                  gio-2.0 >= $GLIB_REQUIRED
+                  gio-unix-2.0 >= $GLIB_REQUIRED
+                  gee-1.0
+                  dee-1.0 >= 0.5.16
+                  zeitgeist-1.0 >= 0.3.8
+                  libcolumbus >= 1.0.0
+                  unity >= 7.1.1
+                  unity-protocol-private
+                  libgnome-menu-3.0 >= 3.6.0)
+
+AC_SUBST(LENS_DAEMON_CFLAGS)
+AC_SUBST(LENS_DAEMON_LIBS)
+
+AC_CHECK_HEADER(db.h, [],
+                AC_MSG_FAILURE([Unable to find db.h. Please install the package libdb-dev]))
+
+AC_CHECK_HEADER(xapian.h, [],
+                AC_MSG_FAILURE([Unable to find xapian.h. Please install the package libxapian-dev]))
+
+
+####################################################################
+# Headless tests
+####################################################################
+AC_ARG_ENABLE([headless-tests],
+              AS_HELP_STRING([--enable-headless-tests=@<:@no/yes@:>@],[enable headless test suite (requires Xvfb) @<:@default=no@:>@]),,
+              [enable_headless_tests=no])
+
+AM_CONDITIONAL([ENABLE_HEADLESS_TESTS],[test "x$enable_headless_tests" != "xno"])
+
+if test "x$enable_headless_tests" = "xyes"; then
+  AC_PATH_PROG([XVFB],[Xvfb])
+  AC_PATH_PROG([DBUS_LAUNCH],[dbus-launch])
+fi
+
+####################################################################
+# C compiler warnings
+####################################################################
+AC_ARG_ENABLE([c-warnings],
+              AC_HELP_STRING([--enable-c-warnings=@<:@no/yes@:>@], [show warnings from the C compiler @<:@default=no@:>@]),,
+              [enable_c_warnings=no])
+
+if test "x$enable_c_warnings" = "xyes"; then
+	AC_DEFINE(ENABLE_C_WARNINGS, 1, [show warnings from the C compiler])
+fi
+
+AM_CONDITIONAL(ENABLE_C_WARNINGS, test "$enable_c_warnings" = "yes")
+
+
+#############################################
+# local install for distcheck and stand-alone running
+#############################################
+with_localinstall="no"
+AC_ARG_ENABLE(localinstall,
+              AS_HELP_STRING([--enable-localinstall],
+                             [Install all of the files locally instead of in system directories (for distcheck)]),
+              with_localinstall=$enableval,
+              with_localinstall=no)
+
+AM_CONDITIONAL([HAVE_LOCALINSTALL], [test "x$with_localinstall" = "xyes"])
+
+#############################################
+# Expand variables needed for config.vala
+#############################################
+AS_AC_EXPAND(PREFIX, $prefix)
+AC_SUBST(PREFIX)
+
+AS_AC_EXPAND(DATADIR, $datarootdir)
+AC_SUBST(DATADIR)
+
+#####################################################
+# Look for protocol-private lib dir
+#####################################################
+PROTOCOLPRIVATELIBDIR="`$PKG_CONFIG --variable=libdir unity-protocol-private`/libunity"
+AC_SUBST(PROTOCOLPRIVATELIBDIR)
+
+#############################################
+# look for dbus service dir
+#############################################
+if test "x$with_localinstall" = "xyes"; then
+        DBUSSERVICEDIR="${datadir}/dbus-1/services/"
+else
+        DBUSSERVICEDIR=`$PKG_CONFIG --variable=session_bus_services_dir dbus-1`
+fi
+AC_SUBST(DBUSSERVICEDIR)
+
+#############################################
+# GSettings macros
+#############################################
+
+GLIB_GSETTINGS
+
+#############################################
+# Create the Makefiles
+#############################################
+AC_CONFIG_FILES([
+  Makefile
+  data/com.canonical.Unity.AppsLens.gschema.xml.in
+  data/Makefile
+  data/X-Unity-All-Applications.directory
+  data/unity-lens-applications.menu
+  src/Makefile
+  src/config.vala
+  po/Makefile.in
+  tests/unit/Makefile
+])
+AC_OUTPUT
+
+dnl Output the results
+AC_MSG_NOTICE([
+
+  Unity Applications Lens Daemon $VERSION
+  ------------------------------------
+
+  Prefix         : ${prefix}
+  Sysconfdir     : ${sysconfdir}
+
+  Local install  : ${with_localinstall}
+
+  Extra CFlags   : ${CPPFLAGS} $MAINTAINER_CFLAGS
+  Extra ValaFlags: ${CPPFLAGS} $MAINTAINER_VALAFLAGS
+
+  Testing
+    Headless tests     : ${enable_headless_tests}
+    Coverage reporting : ${use_gcov}
+])
only in patch2:
unchanged:
--- unity-lens-applications-7.1.0+15.10.20151002.orig/.pc/libgee-0.8.diff/src/Makefile.am
+++ unity-lens-applications-7.1.0+15.10.20151002/.pc/libgee-0.8.diff/src/Makefile.am
@@ -0,0 +1,140 @@
+NULL =
+BUILT_SOURCES =
+CLEANFILES =
+EXTRA_DIST =
+
+DATADIR = $(datadir)
+
+unitylibdir = $(libdir)/unity
+unitylib_LTLIBRARIES = unity-scope-applications.la unity-scope-runningapps.la
+
+AM_CPPFLAGS = \
+  -DDATADIR=\"$(DATADIR)\" \
+  -DPKGDATADIR=\"$(PKGDATADIR)\" \
+  -DGETTEXT_PACKAGE=\"$(GETTEXT_PACKAGE)\" \
+  -DG_LOG_DOMAIN=\"unity-applications-daemon\" \
+  -DGMENU_I_KNOW_THIS_IS_UNSTABLE \
+  $(LENS_DAEMON_CFLAGS) \
+  $(MAINTAINER_CFLAGS) \
+  -I$(srcdir) \
+  $(COVERAGE_CFLAGS) \
+  -g
+
+if !ENABLE_C_WARNINGS
+  AM_CPPFLAGS += -w
+endif
+
+AM_CXXFLAGS = --std=c++11
+
+# Note that we require glib 2.26 because libzeitgeist
+# expects us to use g_ptr_array_unref instead of g_ptr_array_free.
+AM_VALAFLAGS = \
+  -C \
+  --vapidir=$(top_srcdir)/vapi \
+  --pkg posix \
+  --pkg gio-2.0 \
+  --pkg gio-unix-2.0 \
+  --pkg dee-1.0 \
+  --pkg zeitgeist-1.0 \
+  --pkg unity \
+  --pkg unity-protocol \
+  --pkg gee-1.0 \
+  --pkg libgnome-menu-3.0 \
+  --pkg unity-package-search \
+  --pkg unity-ratings-db \
+  --target-glib=2.26 \
+  $(MAINTAINER_VALAFLAGS)
+
+unity_package_search_libs = -lxapian -lstdc++
+
+unity_ratings_db_libs = -ldb
+
+unity_scope_applications_la_LIBADD = \
+  $(LENS_DAEMON_LIBS) \
+  $(unity_package_search_libs) \
+  $(unity_ratings_db_libs) \
+  $(NULL)
+
+unity_scope_runningapps_la_LIBADD = \
+$(LENS_DAEMON_LIBS) \
+$(NULL)
+
+unity_scope_applications_la_LDFLAGS = \
+  -module -shared -avoid-version \
+  -R $(PROTOCOLPRIVATELIBDIR) $(COVERAGE_LDFLAGS)
+
+unity_scope_runningapps_la_LDFLAGS = \
+-module -shared -avoid-version \
+-R $(PROTOCOLPRIVATELIBDIR) $(COVERAGE_LDFLAGS)
+
+unity_scope_applications_la_VALASOURCES = \
+  app-watcher.vala \
+  config.vala \
+  daemon.vala \
+  launcher-client.vala \
+  main.vala \
+  commands-scope.vala \
+  scopes-scope.vala \
+  schemas.vala \
+  utils.vala \
+  aptd-client.vala \
+  purchase-info-helper.vala \
+  software-center-data-provider.vala \
+  software-center-data-cache.vala \
+  software-center-app-details.vala \
+  software-center-utils.vala \
+  xapian-utils.vala \
+  $(NULL)
+
+unity_scope_runningapps_la_VALASOURCES = \
+  running-apps-scope.vala \
+  running-apps-search.vala \
+  winstack-client.vala \
+  windows-stack.vala \
+  schemas.vala \
+  config.vala \
+  $(NULL)
+
+unity_scope_applications_la_SOURCES = \
+  $(unity_scope_applications_la_VALASOURCES:.vala=.c) \
+  unity-package-search.cc \
+  unity-package-search.h \
+  unity-ratings-db.c \
+  unity-ratings-db.h \
+  $(NULL)
+
+unity_scope_runningapps_la_SOURCES = \
+  $(unity_scope_runningapps_la_VALASOURCES:.vala=.c) \
+  $(NULL)
+
+BUILT_SOURCES += \
+  unity-scope-applications.vala.stamp \
+  unity-scope-runningapps.vala.stamp \
+  $(NULL)
+
+EXTRA_DIST += \
+  unity-scope-applications.vala.stamp \
+  unity-scope-runningapps.vala.stamp \
+  $(unity_scope_applications_la_VALASOURCES) \
+  $(unity_scope_runningapps_la_VALASOURCES) \
+  unity-package-search.cc \
+  unity-package-search.h \
+  unity-ratings-db.c \
+  unity-ratings-db.h \
+  $(NULL)
+
+unity-scope-applications.vala.stamp: $(unity_scope_applications_la_VALASOURCES)
+	$(AM_V_GEN) $(VALAC) $(AM_VALAFLAGS) $^
+	@touch $@
+
+unity-scope-runningapps.vala.stamp: $(unity_scope_runningapps_la_VALASOURCES)
+	$(AM_V_GEN) $(VALAC) $(AM_VALAFLAGS) $^
+	@touch $@
+
+CLEANFILES += \
+  *.stamp \
+  *.vapi \
+  $(unity_scope_applications_la_VALASOURCES:.vala=.c) \
+  $(unity_scope_runningapps_la_VALASOURCES:.vala=.c) \
+  unity-package-search.h.gch \
+  $(NULL)
only in patch2:
unchanged:
--- unity-lens-applications-7.1.0+15.10.20151002.orig/.pc/libgee-0.8.diff/tests/unit/Makefile.am
+++ unity-lens-applications-7.1.0+15.10.20151002/.pc/libgee-0.8.diff/tests/unit/Makefile.am
@@ -0,0 +1,179 @@
+include $(top_srcdir)/Makefile.decl
+
+check_PROGRAMS = \
+	test-software-center-data-cache \
+	test-purchase-info-helper \
+	test-software-center-utils \
+	test-software-center-details \
+	test-xapian-utils \
+	test-utils
+
+TEST_PROGS += $(check_PROGRAMS)
+
+AM_VALAFLAGS = \
+	--vapidir $(top_srcdir)/vapi \
+	--pkg glib-2.0 \
+	--pkg posix \
+	--pkg dee-1.0 \
+	--pkg gio-2.0 \
+	--pkg gee-1.0 \
+	--pkg gio-unix-2.0 \
+	--pkg unity-package-search \
+	--pkg unity \
+	--target-glib=2.26 \
+	$(MAINTAINER_VALAFLAGS) \
+	$(NULL)
+
+UNITY_PACKAGE_SEARCH_LIBS = -lxapian -lstdc++
+
+LDADD = $(LENS_DAEMON_LIBS) \
+	$(test_libs) \
+	$(UNITY_PACKAGE_SEARCH_LIBS)
+
+LDFLAGS += -rpath $(PROTOCOLPRIVATELIBDIR)
+
+AM_CPPFLAGS = \
+  $(LENS_DAEMON_CFLAGS) \
+  -I$(srcdir) \
+  -I$(top_srcdir)/src \
+  -DGETTEXT_PACKAGE=\"$(GETTEXT_PACKAGE)\" \
+  -DGMENU_I_KNOW_THIS_IS_UNSTABLE \
+  $(COVERAGE_CFLAGS) \
+  $(NULL)
+
+if !ENABLE_C_WARNINGS
+  AM_CPPFLAGS += -w
+endif
+
+AM_LDFLAGS = $(COVERAGE_LDFLAGS)
+
+test_software_center_data_cache_VALASOURCES = \
+	test-software-center-data-cache.vala \
+	$(top_srcdir)/src/software-center-data-cache.vala \
+	$(top_srcdir)/src/software-center-app-details.vala \
+	software-center-data-provider-mock.vala \
+	$(NULL)
+
+nodist_test_software_center_data_cache_SOURCES = $(test_software_center_data_cache_VALASOURCES:.vala=.c)
+
+test_purchase_info_helper_VALASOURCES = \
+	test-purchase-info-helper.vala \
+	$(top_srcdir)/src/purchase-info-helper.vala \
+	$(top_srcdir)/src/software-center-app-details.vala \
+	$(top_srcdir)/src/utils.vala \
+	$(NULL)
+
+nodist_test_purchase_info_helper_SOURCES = $(test_purchase_info_helper_VALASOURCES:.vala=.c)
+
+test_purchase_info_helper_LDADD = \
+	$(LDADD) \
+	unity-package-search.o \
+	unity-ratings-db.o \
+	-ldb
+
+test_software_center_utils_VALASOURCES = \
+	test-software-center-utils.vala \
+	$(top_srcdir)/src/software-center-utils.vala \
+	$(NULL)
+
+nodist_test_software_center_utils_SOURCES = $(test_software_center_utils_VALASOURCES:.vala=.c)
+
+test_xapian_utils_VALASOURCES = \
+	test-xapian-utils.vala \
+	$(top_srcdir)/src/xapian-utils.vala \
+	$(top_srcdir)/src/utils.vala \
+	$(NULL)
+
+nodist_test_xapian_utils_SOURCES = $(test_xapian_utils_VALASOURCES:.vala=.c)
+
+
+# Also includes source files that don't have proper tests
+# so they show up in coverage reports.
+test_utils_VALASOURCES = \
+	test-utils.vala \
+	$(top_srcdir)/src/utils.vala \
+	$(top_srcdir)/src/app-watcher.vala \
+	$(top_srcdir)/src/aptd-client.vala \
+	$(top_srcdir)/src/schemas.vala \
+	$(top_srcdir)/src/xapian-utils.vala \
+	$(NULL)
+
+nodist_test_utils_SOURCES = $(test_utils_VALASOURCES:.vala=.c)
+
+test_software_center_details_VALASOURCES = \
+	test-software-center-app-details.vala \
+	$(top_srcdir)/src/software-center-app-details.vala \
+	$(NULL)
+
+nodist_test_software_center_details_SOURCES = $(test_software_center_details_VALASOURCES:.vala=.c)
+
+unity-package-search.o : $(top_srcdir)/src/unity-package-search.cc $(top_srcdir)/src/unity-package-search.h
+	$(AM_V_GEN)$(CXX) --std=c++11 -g $(COVERAGE_CFLAGS) $(UNITY_PACKAGE_SEARCH_LIBS) -DGMENU_I_KNOW_THIS_IS_UNSTABLE `pkg-config --cflags --libs glib-2.0 libgnome-menu-3.0 unity gee-1.0 libcolumbus` -c $(top_srcdir)/src/unity-package-search.cc
+unity-ratings-db.o : $(top_srcdir)/src/unity-ratings-db.c $(top_srcdir)/src/unity-ratings-db.h
+	$(AM_V_CC)$(CC) -g $(COVERAGE_CFLAGS) $(unity_ratings_db_libs) `pkg-config --cflags --libs glib-2.0` -c $(top_srcdir)/src/unity-ratings-db.c
+
+CLEANFILES = *.stamp \
+	  $(test_software_center_data_cache_VALASOURCES:.vala=.c) \
+	  $(test_purchase_info_helper_VALASOURCES:.vala=.c) \
+	  $(test_software_center_utils_VALASOURCES:.vala=.c) \
+	  $(test_xapian_utils_VALASOURCES:.vala=.c) \
+	  $(test_utils_VALASOURCES:.vala=.c) \
+	  $(test_software_center_details_VALASOURCES:.vala=.c) \
+	  $(NULL)
+
+BUILT_SOURCES = \
+	  test-software-center-data-cache.vala.stamp \
+	  test-purchase-info-helper.vala.stamp \
+	  test-software-center-utils.vala.stamp \
+	  test-software-center-details.vala.stamp \
+	  test-xapian-utils.vala.stamp \
+	  test-utils.vala.stamp \
+	  $(NULL)
+
+test-software-center-data-cache.vala.stamp: $(test_software_center_data_cache_VALASOURCES)
+	$(AM_V_GEN)$(VALAC) -C $(AM_VALAFLAGS) $(VALAFLAGS) $^
+	@touch $@
+
+test-purchase-info-helper.vala.stamp: $(test_purchase_info_helper_VALASOURCES)
+	$(AM_V_GEN)$(VALAC) -C $(AM_VALAFLAGS) $(VALAFLAGS) $^
+	@touch $@
+
+test-software-center-utils.vala.stamp: $(test_software_center_utils_VALASOURCES)
+	$(AM_V_GEN)$(VALAC) -C $(AM_VALAFLAGS) $(VALAFLAGS) $^
+	@touch $@
+
+test-software-center-details.vala.stamp: $(test_software_center_details_VALASOURCES)
+	$(AM_V_GEN)$(VALAC) -C $(AM_VALAFLAGS) $(VALAFLAGS) $^
+	@touch $@
+
+test-xapian-utils.vala.stamp: $(test_xapian_utils_VALASOURCES)
+	$(AM_V_GEN)$(VALAC) -C $(AM_VALAFLAGS) $(VALAFLAGS) $^
+	@touch $@
+
+test-utils.vala.stamp: $(test_utils_VALASOURCES)
+	$(AM_V_GEN)$(VALAC) -C $(AM_VALAFLAGS) $(VALAFLAGS) $^
+	@touch $@
+
+# START HEADLESS TESTS
+if ENABLE_HEADLESS_TESTS
+DISPLAY = :27
+LOG_PATH = headless-logs
+test-headless:
+	set -e; \
+	export DISPLAY=$(DISPLAY); \
+	rm -rf $(LOG_PATH); \
+	mkdir $(LOG_PATH); \
+	$(XVFB) $(DISPLAY) -screen 0 1024x768x8 > $(LOG_PATH)/Xvfb.out 2>&1 & \
+	sleep 1; \
+	\
+	$(DBUS_LAUNCH) > $(LOG_PATH)/sessionbus.sh; \
+	source $(LOG_PATH)/sessionbus.sh; \
+	sleep 1; \
+	\
+	make test; \
+	sleep 1; \
+	\
+	kill `grep DBUS_SESSION_BUS_PID $(LOG_PATH)/sessionbus.sh | grep -oE '[0-9]+'`; \
+	pkill Xvfb;
+endif
+# END HEADLESS TESTS
only in patch2:
unchanged:
--- unity-lens-applications-7.1.0+15.10.20151002.orig/configure.ac
+++ unity-lens-applications-7.1.0+15.10.20151002/configure.ac
@@ -74,7 +74,7 @@
                   gobject-2.0 >= $GLIB_REQUIRED
                   gio-2.0 >= $GLIB_REQUIRED
                   gio-unix-2.0 >= $GLIB_REQUIRED
-                  gee-1.0
+                  gee-0.8
                   dee-1.0 >= 0.5.16
                   zeitgeist-1.0 >= 0.3.8
                   libcolumbus >= 1.0.0
only in patch2:
unchanged:
--- unity-lens-applications-7.1.0+15.10.20151002.orig/debian/patches/libgee-0.8.diff
+++ unity-lens-applications-7.1.0+15.10.20151002/debian/patches/libgee-0.8.diff
@@ -0,0 +1,48 @@
+Index: b/configure.ac
+===================================================================
+--- a/configure.ac
++++ b/configure.ac
+@@ -74,7 +74,7 @@ PKG_CHECK_MODULES(LENS_DAEMON,
+                   gobject-2.0 >= $GLIB_REQUIRED
+                   gio-2.0 >= $GLIB_REQUIRED
+                   gio-unix-2.0 >= $GLIB_REQUIRED
+-                  gee-1.0
++                  gee-0.8
+                   dee-1.0 >= 0.5.16
+                   zeitgeist-1.0 >= 0.3.8
+                   libcolumbus >= 1.0.0
+Index: b/src/Makefile.am
+===================================================================
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -38,7 +38,7 @@ AM_VALAFLAGS = \
+   --pkg zeitgeist-1.0 \
+   --pkg unity \
+   --pkg unity-protocol \
+-  --pkg gee-1.0 \
++  --pkg gee-0.8 \
+   --pkg libgnome-menu-3.0 \
+   --pkg unity-package-search \
+   --pkg unity-ratings-db \
+Index: b/tests/unit/Makefile.am
+===================================================================
+--- a/tests/unit/Makefile.am
++++ b/tests/unit/Makefile.am
+@@ -16,7 +16,7 @@ AM_VALAFLAGS = \
+ 	--pkg posix \
+ 	--pkg dee-1.0 \
+ 	--pkg gio-2.0 \
+-	--pkg gee-1.0 \
++	--pkg gee-0.8 \
+ 	--pkg gio-unix-2.0 \
+ 	--pkg unity-package-search \
+ 	--pkg unity \
+@@ -108,7 +108,7 @@ test_software_center_details_VALASOURCES
+ nodist_test_software_center_details_SOURCES = $(test_software_center_details_VALASOURCES:.vala=.c)
+ 
+ unity-package-search.o : $(top_srcdir)/src/unity-package-search.cc $(top_srcdir)/src/unity-package-search.h
+-	$(AM_V_GEN)$(CXX) --std=c++11 -g $(COVERAGE_CFLAGS) $(UNITY_PACKAGE_SEARCH_LIBS) -DGMENU_I_KNOW_THIS_IS_UNSTABLE `pkg-config --cflags --libs glib-2.0 libgnome-menu-3.0 unity gee-1.0 libcolumbus` -c $(top_srcdir)/src/unity-package-search.cc
++	$(AM_V_GEN)$(CXX) --std=c++11 -g $(COVERAGE_CFLAGS) $(UNITY_PACKAGE_SEARCH_LIBS) -DGMENU_I_KNOW_THIS_IS_UNSTABLE `pkg-config --cflags --libs glib-2.0 libgnome-menu-3.0 unity gee-0.8 libcolumbus` -c $(top_srcdir)/src/unity-package-search.cc
+ unity-ratings-db.o : $(top_srcdir)/src/unity-ratings-db.c $(top_srcdir)/src/unity-ratings-db.h
+ 	$(AM_V_CC)$(CC) -g $(COVERAGE_CFLAGS) $(unity_ratings_db_libs) `pkg-config --cflags --libs glib-2.0` -c $(top_srcdir)/src/unity-ratings-db.c
+ 
only in patch2:
unchanged:
--- unity-lens-applications-7.1.0+15.10.20151002.orig/debian/patches/series
+++ unity-lens-applications-7.1.0+15.10.20151002/debian/patches/series
@@ -0,0 +1 @@
+libgee-0.8.diff
only in patch2:
unchanged:
--- unity-lens-applications-7.1.0+15.10.20151002.orig/src/Makefile.am
+++ unity-lens-applications-7.1.0+15.10.20151002/src/Makefile.am
@@ -38,7 +38,7 @@
   --pkg zeitgeist-1.0 \
   --pkg unity \
   --pkg unity-protocol \
-  --pkg gee-1.0 \
+  --pkg gee-0.8 \
   --pkg libgnome-menu-3.0 \
   --pkg unity-package-search \
   --pkg unity-ratings-db \
only in patch2:
unchanged:
--- unity-lens-applications-7.1.0+15.10.20151002.orig/tests/unit/Makefile.am
+++ unity-lens-applications-7.1.0+15.10.20151002/tests/unit/Makefile.am
@@ -16,7 +16,7 @@
 	--pkg posix \
 	--pkg dee-1.0 \
 	--pkg gio-2.0 \
-	--pkg gee-1.0 \
+	--pkg gee-0.8 \
 	--pkg gio-unix-2.0 \
 	--pkg unity-package-search \
 	--pkg unity \
@@ -108,7 +108,7 @@
 nodist_test_software_center_details_SOURCES = $(test_software_center_details_VALASOURCES:.vala=.c)
 
 unity-package-search.o : $(top_srcdir)/src/unity-package-search.cc $(top_srcdir)/src/unity-package-search.h
-	$(AM_V_GEN)$(CXX) --std=c++11 -g $(COVERAGE_CFLAGS) $(UNITY_PACKAGE_SEARCH_LIBS) -DGMENU_I_KNOW_THIS_IS_UNSTABLE `pkg-config --cflags --libs glib-2.0 libgnome-menu-3.0 unity gee-1.0 libcolumbus` -c $(top_srcdir)/src/unity-package-search.cc
+	$(AM_V_GEN)$(CXX) --std=c++11 -g $(COVERAGE_CFLAGS) $(UNITY_PACKAGE_SEARCH_LIBS) -DGMENU_I_KNOW_THIS_IS_UNSTABLE `pkg-config --cflags --libs glib-2.0 libgnome-menu-3.0 unity gee-0.8 libcolumbus` -c $(top_srcdir)/src/unity-package-search.cc
 unity-ratings-db.o : $(top_srcdir)/src/unity-ratings-db.c $(top_srcdir)/src/unity-ratings-db.h
 	$(AM_V_CC)$(CC) -g $(COVERAGE_CFLAGS) $(unity_ratings_db_libs) `pkg-config --cflags --libs glib-2.0` -c $(top_srcdir)/src/unity-ratings-db.c