Merge lp:~mardy/gnome-control-center-signon/lp1257505 into lp:~robert-ancell/gnome-control-center-signon/unity-control-center

Proposed by Alberto Mardegan
Status: Merged
Merged at revision: 174
Proposed branch: lp:~mardy/gnome-control-center-signon/lp1257505
Merge into: lp:~robert-ancell/gnome-control-center-signon/unity-control-center
Diff against target: 93 lines (+11/-12)
6 files modified
README (+4/-5)
configure.ac (+2/-2)
debian/control (+1/-1)
debian/copyright (+2/-2)
src/cc-credentials-application.vala (+1/-1)
src/cc-credentials-preferences.vala (+1/-1)
To merge this branch: bzr merge lp:~mardy/gnome-control-center-signon/lp1257505
Reviewer Review Type Date Requested Status
Robert Ancell Approve
Review via email: mp+201000@code.launchpad.net

Commit message

Update README file and project links

Description of the change

Update README file and project links

To post a comment you must log in.
Revision history for this message
Robert Ancell (robert-ancell) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'README'
--- README 2012-10-25 13:36:35 +0000
+++ README 2014-01-09 12:13:43 +0000
@@ -2,10 +2,9 @@
2------------------------------------------2------------------------------------------
33
4This project is a configuration interface for the Online Accounts framework in4This project is a configuration interface for the Online Accounts framework in
5Ubuntu. It uses the patched GNOME Control Center in Ubuntu, with support for5Ubuntu. Under Unity, it appears as a panel in the Unity Control Center.
6external configuration panels, to show Online Accounts settings in the Control6Alternatively, a standalone credentials-preferences binary can be built, which
7Center. Alternatively, a standalone credentials-preferences binary can be7allows distributions without the Unity Control Center to use the
8built, which allows distributions without the patched Control Center to use the
9configuration UI.8configuration UI.
109
11libaccount-plugin10libaccount-plugin
@@ -34,4 +33,4 @@
34Resources33Resources
35---------34---------
3635
37https://launchpad.net/online-accounts-gnome-control-center36https://launchpad.net/gnome-control-center-signon
3837
=== modified file 'configure.ac'
--- configure.ac 2013-12-02 04:05:17 +0000
+++ configure.ac 2014-01-09 12:13:43 +0000
@@ -1,8 +1,8 @@
1AC_INIT([Credentials Control Center],1AC_INIT([Credentials Control Center],
2 [0.1.7],2 [0.1.7],
3 [https://bugs.launchpad.net/online-accounts-gnome-control-center],3 [https://bugs.launchpad.net/gnome-control-center-signon],
4 [credentials-control-center],4 [credentials-control-center],
5 [https://launchpad.net/online-accounts-gnome-control-center])5 [https://launchpad.net/gnome-control-center-signon])
66
7AC_CONFIG_AUX_DIR([build-aux])7AC_CONFIG_AUX_DIR([build-aux])
8AC_CONFIG_SRCDIR([src/cc-credentials-panel.c])8AC_CONFIG_SRCDIR([src/cc-credentials-panel.c])
99
=== modified file 'debian/control'
--- debian/control 2013-12-02 04:05:17 +0000
+++ debian/control 2014-01-09 12:13:43 +0000
@@ -13,9 +13,9 @@
13 gtk-doc-tools,13 gtk-doc-tools,
14 libaccounts-glib-dev (>= 1.10),14 libaccounts-glib-dev (>= 1.10),
15 libgirepository1.0-dev (>= 0.10),15 libgirepository1.0-dev (>= 0.10),
16 libunity-control-center-dev,
17 libgtk-3-dev,16 libgtk-3-dev,
18 libsignon-glib-dev (>= 1.8),17 libsignon-glib-dev (>= 1.8),
18 libunity-control-center-dev,
19 pkg-config,19 pkg-config,
20 python,20 python,
21 python-distutils-extra,21 python-distutils-extra,
2222
=== modified file 'debian/copyright'
--- debian/copyright 2012-11-14 16:12:55 +0000
+++ debian/copyright 2014-01-09 12:13:43 +0000
@@ -1,7 +1,7 @@
1Format: http://dep.debian.net/deps/dep51Format: http://dep.debian.net/deps/dep5
2Upstream-Name: online-accounts-gnome-control-center2Upstream-Name: gnome-control-center-signon
3Upstream-Contact: Alberto Mardegan <alberto.mardegan@canonical.com>3Upstream-Contact: Alberto Mardegan <alberto.mardegan@canonical.com>
4Source: https://launchpad.net/online-accounts-gnome-control-center4Source: https://launchpad.net/gnome-control-center-signon
55
6Files: *6Files: *
7Copyright: 2012 Canonical Ltd.7Copyright: 2012 Canonical Ltd.
88
=== modified file 'src/cc-credentials-application.vala'
--- src/cc-credentials-application.vala 2012-09-06 09:39:45 +0000
+++ src/cc-credentials-application.vala 2014-01-09 12:13:43 +0000
@@ -19,7 +19,7 @@
1919
20/**20/**
21 * Standalone application for configuring web credentials accounts outside of21 * Standalone application for configuring web credentials accounts outside of
22 * GNOME Control Center.22 * Unity Control Center.
23 */23 */
24public class Cc.Credentials.Application : Gtk.Application24public class Cc.Credentials.Application : Gtk.Application
25{25{
2626
=== modified file 'src/cc-credentials-preferences.vala'
--- src/cc-credentials-preferences.vala 2012-08-31 12:39:57 +0000
+++ src/cc-credentials-preferences.vala 2014-01-09 12:13:43 +0000
@@ -18,7 +18,7 @@
18 */18 */
1919
20/**20/**
21 * Web credentials preferences widget. This can be packed into the GNOME21 * Web credentials preferences widget. This can be packed into the Unity
22 * Control Center or used in a standalone application.22 * Control Center or used in a standalone application.
23 */23 */
24public class Cc.Credentials.Preferences : Gtk.Notebook24public class Cc.Credentials.Preferences : Gtk.Notebook

Subscribers

People subscribed via source and target branches