[gnome-software/wip/ubuntu-xenial: 5/5] Merge branch 'gnome-3-20' into wip/ubuntu-xenial
- From: Robert Ancell <rancell src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-software/wip/ubuntu-xenial: 5/5] Merge branch 'gnome-3-20' into wip/ubuntu-xenial
- Date: Fri, 23 Sep 2016 04:02:14 +0000 (UTC)
commit 9fed8079b87b55114f8d554c64f7037f8b29025e
Merge: 78089f4 769b92a
Author: Robert Ancell <robert ancell canonical com>
Date: Fri Sep 23 16:01:45 2016 +1200
Merge branch 'gnome-3-20' into wip/ubuntu-xenial
configure.ac | 1 +
po/el.po | 434 ++++++++++++++++++++++++++++++++-------------------------
src/gs-app.c | 22 +++
src/gs-app.h | 2 +-
src/gs-page.c | 2 +-
5 files changed, 268 insertions(+), 193 deletions(-)
---
diff --cc configure.ac
index 9631149,db190a2..2da35b1
--- a/configure.ac
+++ b/configure.ac
@@@ -68,9 -67,8 +68,10 @@@ PKG_CHECK_MODULES(JSON_GLIB, json-glib-
PKG_CHECK_MODULES(SQLITE, sqlite3)
PKG_CHECK_MODULES(SOUP, libsoup-2.4 >= 2.51.92)
PKG_CHECK_MODULES(GSETTINGS_DESKTOP_SCHEMAS, gsettings-desktop-schemas >= 3.11.5)
+ PKG_CHECK_MODULES(LIBSECRET, libsecret-1)
PKG_CHECK_MODULES(GNOME_DESKTOP, gnome-desktop-3.0 >= 3.17.92)
+PKG_CHECK_MODULES(OAUTH, oauth)
+PKG_CHECK_MODULES(LIBSECRET, libsecret-1)
AC_PATH_PROG(APPSTREAM_UTIL, [appstream-util], [unfound])
AC_ARG_ENABLE(man,
[AS_HELP_STRING([--enable-man],
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]