Commit 671c0266 authored by Nicolas Bruguier's avatar Nicolas Bruguier

* debian/patches/fix-duplicate-entry-in-makefile.patch:

* debian/patches/fix-gprint-format.patch:
  - remove and use elementary patches instead
* debian/patches/ftbfs.patch:
* debian/patches/pantheon.patch:
  - patches from elementary
* debian/docs:
  - README -> README.md
parent 0809e6ec
Description: Fix duplicate entry in Makefile.am
Fix duplicate entry com.google.code.AccountsSSO.gSingleSignOn.service
in src/daemon/Makefile.am.
.
Author: gandalfn <gandalfn@club-internet.fr>
---
The information above should follow the Patch Tagging Guidelines, please
checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
are templates for supplementary fields that you might want to add:
Origin: <vendor|upstream|other>, <url of original patch>
Bug: <url in upstream bugtracker>
Bug-Debian: https://bugs.debian.org/<bugnumber>
Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
Forwarded: <no|not-needed|url proving that it has been forwarded>
Reviewed-By: <name and email of someone who approved the patch>
Last-Update: <YYYY-MM-DD>
--- gsignond-1.0.1+bzr466.orig/src/daemon/dbus/Makefile.am
+++ gsignond-1.0.1+bzr466/src/daemon/dbus/Makefile.am
@@ -102,8 +102,8 @@ nodist_libgsignond_dbus_la_SOURCES = \
dbusservicedir = $(DBUS_SERVICES_DIR)
dbusservice_DATA = \
$(SERVICES_DIR)/com.google.code.AccountsSSO.gSingleSignOn.service
-nodist_dbusservice_DATA = \
- $(SERVICES_DIR)/com.google.code.AccountsSSO.gSingleSignOn.service
+#nodist_dbusservice_DATA = \
+# $(SERVICES_DIR)/com.google.code.AccountsSSO.gSingleSignOn.service
dbusinterfacesdir = $(DBUS_INTERFACES_DIR)
dbusinterfaces_DATA = \
Description: Fix g_print format
Fix g_print format.
.
Author: gandalfn <gandalfn@club-internet.fr>
---
The information above should follow the Patch Tagging Guidelines, please
checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
are templates for supplementary fields that you might want to add:
Origin: <vendor|upstream|other>, <url of original patch>
Bug: <url in upstream bugtracker>
Bug-Debian: https://bugs.debian.org/<bugnumber>
Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
Forwarded: <no|not-needed|url proving that it has been forwarded>
Reviewed-By: <name and email of someone who approved the patch>
Last-Update: <YYYY-MM-DD>
--- gsignond-1.0.1+bzr466.orig/src/gplugind/main.c
+++ gsignond-1.0.1+bzr466/src/gplugind/main.c
@@ -126,7 +126,7 @@ static void _list_plugins()
static void _list_watch_path()
{
- g_print(_plugin_path());
+ g_print("%s\n", _plugin_path());
}
int main (int argc, char **argv)
=== modified file 'src/daemon/dbus/Makefile.am'
--- a/src/daemon/dbus/Makefile.am 2015-02-13 14:27:42 +0000
+++ b/src/daemon/dbus/Makefile.am 2015-03-27 13:07:49 +0000
@@ -100,8 +100,6 @@
$(NULL)
dbusservicedir = $(DBUS_SERVICES_DIR)
-dbusservice_DATA = \
- $(SERVICES_DIR)/com.google.code.AccountsSSO.gSingleSignOn.service
nodist_dbusservice_DATA = \
$(SERVICES_DIR)/com.google.code.AccountsSSO.gSingleSignOn.service
=== modified file 'src/gplugind/main.c'
--- a/src/gplugind/main.c 2015-02-16 15:35:04 +0000
+++ b/src/gplugind/main.c 2015-03-27 12:41:18 +0000
@@ -126,7 +126,7 @@
static void _list_watch_path()
{
- g_print(_plugin_path());
+ g_print("%s", _plugin_path());
}
int main (int argc, char **argv)
Index: gsignond.conf.in
===================================================================
--- a/gsignond.conf.in 2013-10-24 11:50:05.510126880 +0200
+++ b/gsignond.conf.in 2013-10-24 16:14:34.583555094 +0200
@@ -10,7 +10,7 @@
# Define extension / platform adaptation module to use.
# 'default' is a dummy one with no encrypted storage, but with basic Unix
# discretionary access control.
-#Extension = default
+Extension = pantheon
#
# Base path where user specific database directories will be located.
@BASE_STORAGE_DIR@
fix-gprint-format.patch
fix-duplicate-entry-in-makefile.patch
ftbfs.patch
pantheon.patch
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment