[gnome-software/wip/rancell/apt: 30/30] Merge branch 'master' into wip/rancell/apt
- From: Robert Ancell <rancell src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-software/wip/rancell/apt: 30/30] Merge branch 'master' into wip/rancell/apt
- Date: Wed, 10 Feb 2016 21:21:37 +0000 (UTC)
commit 7cd1941c086ab47af6caae2d097073f2e57556cb
Merge: 9ba091a e8cfba4
Author: Robert Ancell <robert ancell canonical com>
Date: Thu Feb 11 10:21:20 2016 +1300
Merge branch 'master' into wip/rancell/apt
configure.ac | 2 +-
contrib/gnome-software.spec.in | 1 +
data/org.gnome.software.gschema.xml | 9 +
po/hu.po | 230 +++++---
po/pt_BR.po | 228 +++++---
po/sk.po | 222 +++++---
src/gs-app.c | 10 +
src/gs-app.h | 2 +
src/gs-application.c | 5 +-
src/gs-plugin-loader.c | 10 +-
src/gs-review-dialog.c | 11 +-
src/gs-review-dialog.ui | 1 +
src/gs-review-histogram.c | 18 +-
src/gs-review-row.c | 2 +-
src/gs-review-row.ui | 1 +
src/gs-review.c | 48 +-
src/gs-review.h | 18 +-
src/gs-shell-details.c | 15 +-
src/gs-shell-updates.c | 5 +-
src/gs-shell.c | 5 +-
src/plugins/Makefile.am | 7 +
src/plugins/gs-plugin-dummy.c | 8 +-
src/plugins/gs-plugin-xdg-app-reviews.c | 979 +++++++++++++++++++++++++++++++
src/plugins/gs-plugin-xdg-app.c | 142 +++--
24 files changed, 1662 insertions(+), 317 deletions(-)
---
diff --cc src/plugins/Makefile.am
index 76c1042,ed90743..7fc06bd
--- a/src/plugins/Makefile.am
+++ b/src/plugins/Makefile.am
@@@ -125,13 -126,13 +127,18 @@@ libgs_plugin_xdg_app_la_SOURCES = gs-pl
libgs_plugin_xdg_app_la_LIBADD = $(GS_PLUGIN_LIBS) $(XDG_APP_LIBS)
libgs_plugin_xdg_app_la_LDFLAGS = -module -avoid-version
libgs_plugin_xdg_app_la_CFLAGS = $(GS_PLUGIN_CFLAGS) $(WARN_CFLAGS)
+
+ libgs_plugin_xdg_app_reviews_la_SOURCES = gs-plugin-xdg-app-reviews.c
+ libgs_plugin_xdg_app_reviews_la_LIBADD = $(GS_PLUGIN_LIBS) $(JSON_GLIB_LIBS)
+ libgs_plugin_xdg_app_reviews_la_LDFLAGS = -module -avoid-version
+ libgs_plugin_xdg_app_reviews_la_CFLAGS = $(GS_PLUGIN_CFLAGS) $(WARN_CFLAGS)
endif
+libgs_plugin_apt_la_SOURCES = gs-plugin-apt.c
+libgs_plugin_apt_la_LIBADD = $(GS_PLUGIN_LIBS)
+libgs_plugin_apt_la_LDFLAGS = -module -avoid-version
+libgs_plugin_apt_la_CFLAGS = $(GS_PLUGIN_CFLAGS) $(WARN_CFLAGS)
+
libgs_plugin_moduleset_la_SOURCES = \
gs-moduleset.c \
gs-moduleset.h \
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]