[arch-commits] Commit in deja-dup/trunk (4 files)
Balló György
bgyorgy at nymeria.archlinux.org
Sat Mar 30 14:36:20 UTC 2013
Date: Saturday, March 30, 2013 @ 15:36:20
Author: bgyorgy
Revision: 87384
upgpkg: deja-dup 26.0-1
Update to version 26.0
Added:
deja-dup/trunk/libsecret-1.vapi
Modified:
deja-dup/trunk/PKGBUILD
Deleted:
deja-dup/trunk/new-u1backend-support.patch
deja-dup/trunk/update-u1-pythonchecker.patch
-------------------------------+
PKGBUILD | 23 +++++------
libsecret-1.vapi | 79 ++++++++++++++++++++++++++++++++++++++++
new-u1backend-support.patch | 50 -------------------------
update-u1-pythonchecker.patch | 13 ------
4 files changed, 89 insertions(+), 76 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2013-03-30 13:01:13 UTC (rev 87383)
+++ PKGBUILD 2013-03-30 14:36:20 UTC (rev 87384)
@@ -2,13 +2,13 @@
# Maintainer: Balló György <ballogyor+arch at gmail dot com>
pkgname=deja-dup
-pkgver=24.0
-pkgrel=3
+pkgver=26.0
+pkgrel=1
pkgdesc="Simple backup tool, that hides the complexity of backing up the Right Way and uses duplicity as the backend"
arch=('i686' 'x86_64')
url="https://launchpad.net/deja-dup"
license=('GPL')
-depends=('duplicity' 'libgnome-keyring' 'libpeas' 'libnotify' 'python2-gobject' 'gvfs' 'dconf' 'xdg-utils')
+depends=('duplicity' 'libpeas' 'libnotify' 'python2-gobject' 'gvfs' 'xdg-utils')
makedepends=('vala' 'intltool' 'itstool' 'nautilus')
optdepends=('nautilus: backup extension'
'python2-boto: Amazon S3 backend'
@@ -17,22 +17,19 @@
options=('!libtool')
install=$pkgname.install
source=(http://launchpad.net/$pkgname/${pkgver%.*}/$pkgver/+download/$pkgname-$pkgver.tar.xz
- new-u1backend-support.patch
- update-u1-pythonchecker.patch)
-md5sums=('335131d1f3c85615339fa8b212db50ae'
- '944a4c62f042b240feba98f8d9a893b2'
- 'd0893c17e3e61c3ada065a002a9ab419')
+ libsecret-1.vapi)
+md5sums=('0430bbf03deac852651599a979a4cc32'
+ '27ca0a3c9efbe93e86ef563c77f6ddf3')
build() {
cd "$srcdir/$pkgname-$pkgver"
+
+ # Python2 fix
sed -i 's/\"python\", \"-c\"/\"python2\", \"-c\"/' common/PythonChecker.vala
- # Add support for the new Ubuntu One backend
- patch -Np0 -i "$srcdir/new-u1backend-support.patch"
+ # Add missing Vala API file
+ cp "$srcdir/libsecret-1.vapi" "vapi/libsecret-1.vapi"
- # And update the PythonChecker check for the new U1 backend too
- patch -Np0 -i "$srcdir/update-u1-pythonchecker.patch"
-
./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libexecdir=/usr/lib/$pkgname \
--disable-static --disable-schemas-compile --without-unity
make
Added: libsecret-1.vapi
===================================================================
--- libsecret-1.vapi (rev 0)
+++ libsecret-1.vapi 2013-03-30 14:36:20 UTC (rev 87384)
@@ -0,0 +1,79 @@
+/* libsecret-1.vapi generated by vapigen-0.20, do not modify. */
+
+[CCode (cprefix = "Secret", gir_namespace = "Secret", gir_version = "1", lower_case_cprefix = "secret_")]
+namespace Secret {
+ [CCode (cheader_filename = "libsecret/secret.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "secret_schema_get_type ()")]
+ [Compact]
+ public class Schema {
+ [CCode (array_length = false, array_null_terminated = true)]
+ public weak Secret.SchemaAttribute[] attributes;
+ public Secret.SchemaFlags flags;
+ public weak string name;
+ [CCode (has_construct_function = false)]
+ public Schema (string name, Secret.SchemaFlags flags, ...);
+ [CCode (cname = "secret_schema_newv", has_construct_function = false)]
+ public Schema.newv (string name, Secret.SchemaFlags flags, GLib.HashTable<string,Secret.SchemaAttributeType> attribute_names_and_types);
+ public Secret.Schema @ref ();
+ public void unref ();
+ }
+ [CCode (cheader_filename = "libsecret/secret.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "secret_schema_attribute_get_type ()")]
+ [Compact]
+ public class SchemaAttribute {
+ public weak string name;
+ public Secret.SchemaAttributeType type;
+ }
+ [CCode (cheader_filename = "libsecret/secret.h", cprefix = "SECRET_ERROR_", has_type_id = false)]
+ public enum Error {
+ PROTOCOL,
+ IS_LOCKED,
+ NO_SUCH_OBJECT,
+ ALREADY_EXISTS;
+ public static GLib.Quark get_quark ();
+ }
+ [CCode (cheader_filename = "libsecret/secret.h", cprefix = "SECRET_SCHEMA_ATTRIBUTE_", has_type_id = false)]
+ public enum SchemaAttributeType {
+ STRING,
+ INTEGER,
+ BOOLEAN
+ }
+ [CCode (cheader_filename = "libsecret/secret.h", cprefix = "SECRET_SCHEMA_", has_type_id = false)]
+ [Flags]
+ public enum SchemaFlags {
+ NONE,
+ DONT_MATCH_NAME
+ }
+ [CCode (cheader_filename = "libsecret/secret.h", cname = "SECRET_COLLECTION_DEFAULT")]
+ public const string COLLECTION_DEFAULT;
+ [CCode (cheader_filename = "libsecret/secret.h", cname = "SECRET_COLLECTION_SESSION")]
+ public const string COLLECTION_SESSION;
+ [CCode (cheader_filename = "libsecret/secret.h")]
+ public static GLib.HashTable<string,string> attributes_build (Secret.Schema schema, ...);
+ [CCode (cheader_filename = "libsecret/secret.h")]
+ public static GLib.HashTable<string,string> attributes_buildv (Secret.Schema schema, va_list va);
+ [CCode (cheader_filename = "libsecret/secret.h")]
+ public static async bool password_clear (Secret.Schema schema, GLib.Cancellable? cancellable, ...) throws GLib.Error;
+ [CCode (cheader_filename = "libsecret/secret.h")]
+ public static bool password_clear_sync (Secret.Schema schema, GLib.Cancellable? cancellable = null, ...) throws GLib.Error;
+ [CCode (cheader_filename = "libsecret/secret.h", finish_name = "secret_password_clear_finish")]
+ public static async bool password_clearv (Secret.Schema schema, GLib.HashTable<string,string> attributes, GLib.Cancellable? cancellable) throws GLib.Error;
+ [CCode (cheader_filename = "libsecret/secret.h")]
+ public static bool password_clearv_sync (Secret.Schema schema, GLib.HashTable<string,string> attributes, GLib.Cancellable? cancellable = null) throws GLib.Error;
+ [CCode (cheader_filename = "libsecret/secret.h")]
+ public static async string password_lookup (Secret.Schema schema, GLib.Cancellable? cancellable, ...) throws GLib.Error;
+ [CCode (cheader_filename = "libsecret/secret.h")]
+ public static string password_lookup_sync (Secret.Schema schema, GLib.Cancellable? cancellable = null, ...) throws GLib.Error;
+ [CCode (cheader_filename = "libsecret/secret.h", finish_name = "secret_password_lookup_finish")]
+ public static async string password_lookupv (Secret.Schema schema, GLib.HashTable<string,string> attributes, GLib.Cancellable? cancellable) throws GLib.Error;
+ [CCode (cheader_filename = "libsecret/secret.h")]
+ public static string password_lookupv_sync (Secret.Schema schema, GLib.HashTable<string,string> attributes, GLib.Cancellable? cancellable = null) throws GLib.Error;
+ [CCode (cheader_filename = "libsecret/secret.h")]
+ public static async bool password_store (Secret.Schema schema, string? collection, string label, string password, GLib.Cancellable? cancellable, ...) throws GLib.Error;
+ [CCode (cheader_filename = "libsecret/secret.h")]
+ public static bool password_store_sync (Secret.Schema schema, string? collection, string label, string password, GLib.Cancellable? cancellable = null, ...) throws GLib.Error;
+ [CCode (cheader_filename = "libsecret/secret.h", finish_name = "secret_password_store_finish")]
+ public static async bool password_storev (Secret.Schema schema, GLib.HashTable<string,string> attributes, string? collection, string label, string password, GLib.Cancellable? cancellable) throws GLib.Error;
+ [CCode (cheader_filename = "libsecret/secret.h")]
+ public static bool password_storev_sync (Secret.Schema schema, GLib.HashTable<string,string> attributes, string? collection, string label, string password, GLib.Cancellable? cancellable = null) throws GLib.Error;
+ [CCode (cheader_filename = "libsecret/secret.h")]
+ public static void password_wipe (string? password);
+}
Deleted: new-u1backend-support.patch
===================================================================
--- new-u1backend-support.patch 2013-03-30 13:01:13 UTC (rev 87383)
+++ new-u1backend-support.patch 2013-03-30 14:36:20 UTC (rev 87384)
@@ -1,50 +0,0 @@
-=== modified file 'common/BackendU1.vala'
---- common/BackendU1.vala 2012-08-06 22:41:13 +0000
-+++ common/BackendU1.vala 2012-11-03 21:35:53 +0000
-@@ -212,21 +212,41 @@
-
- public override async void get_envp() throws Error
- {
-- bool found = false;
- var obj = get_creds_proxy();
- if (obj.get_name_owner() == null) {
- ask_password();
- return;
- }
-
-+ var found = false;
-+ var envp = new List<string>();
- var listener = new Listener(obj, "find_credentials", null, (name, args) => {
-- if (name == "CredentialsFound")
-- found = true;
-+ if (name == "CredentialsFound") {
-+ VariantIter iter;
-+ args.get("(a{ss})", out iter);
-+ string key, val;
-+ string consumer_key = null, consumer_secret = null, token = null, token_secret = null;
-+ while (iter.next("{ss}", out key, out val)) {
-+ if (key == "consumer_key")
-+ consumer_key = val;
-+ else if (key == "consumer_secret")
-+ consumer_secret = val;
-+ else if (key == "token")
-+ token = val;
-+ else if (key == "token_secret")
-+ token_secret = val;
-+ }
-+ if (consumer_key != null && consumer_secret != null && token != null && token_secret != null) {
-+ warning("appending: %s", "FTP_PASSWORD=%s:%s:%s:%s".printf(consumer_key, consumer_secret, token, token_secret));
-+ envp.append("FTP_PASSWORD=%s:%s:%s:%s".printf(consumer_key, consumer_secret, token, token_secret));
-+ found = true;
-+ }
-+ }
- });
- listener.run();
-
- if (found)
-- envp_ready(true, null);
-+ envp_ready(true, envp);
- else
- ask_password();
- }
-
Deleted: update-u1-pythonchecker.patch
===================================================================
--- update-u1-pythonchecker.patch 2013-03-30 13:01:13 UTC (rev 87383)
+++ update-u1-pythonchecker.patch 2013-03-30 14:36:20 UTC (rev 87384)
@@ -1,13 +0,0 @@
-=== modified file 'common/BackendU1.vala'
---- common/BackendU1.vala 2012-11-05 15:10:54 +0000
-+++ common/BackendU1.vala 2012-11-05 15:17:28 +0000
-@@ -94,7 +94,7 @@
- // A bit of abstraction leakage here; we have to keep these imports in
- // line with what duplicity uses. Maybe we should add to duplicity a way
- // to ask 'can I use this backend?'
-- pyu1 = PythonChecker.get_checker("ubuntuone.platform.credentials, ubuntuone.couch.auth");
-+ pyu1 = PythonChecker.get_checker("oauthlib, httplib2");
- if (pyu1.complete) {
- available = pyu1.available;
- complete = pyu1.complete;
-
More information about the arch-commits
mailing list