[arch-commits] Commit in deja-dup/repos (12 files)
Balló György
bgyorgy at archlinux.org
Sat Dec 20 20:48:59 UTC 2014
Date: Saturday, December 20, 2014 @ 21:48:59
Author: bgyorgy
Revision: 124214
archrelease: copy trunk to community-i686, community-x86_64
Added:
deja-dup/repos/community-i686/PKGBUILD
(from rev 124213, deja-dup/trunk/PKGBUILD)
deja-dup/repos/community-i686/deja-dup.install
(from rev 124213, deja-dup/trunk/deja-dup.install)
deja-dup/repos/community-i686/fix-version-check.patch
(from rev 124213, deja-dup/trunk/fix-version-check.patch)
deja-dup/repos/community-x86_64/PKGBUILD
(from rev 124213, deja-dup/trunk/PKGBUILD)
deja-dup/repos/community-x86_64/deja-dup.install
(from rev 124213, deja-dup/trunk/deja-dup.install)
deja-dup/repos/community-x86_64/fix-version-check.patch
(from rev 124213, deja-dup/trunk/fix-version-check.patch)
Deleted:
deja-dup/repos/community-i686/PKGBUILD
deja-dup/repos/community-i686/deja-dup.install
deja-dup/repos/community-i686/remove-version-check.patch
deja-dup/repos/community-x86_64/PKGBUILD
deja-dup/repos/community-x86_64/deja-dup.install
deja-dup/repos/community-x86_64/remove-version-check.patch
---------------------------------------------+
/PKGBUILD | 96 ++++++++++++++++++++++++++
/deja-dup.install | 24 ++++++
community-i686/PKGBUILD | 48 -------------
community-i686/deja-dup.install | 12 ---
community-i686/fix-version-check.patch | 25 ++++++
community-i686/remove-version-check.patch | 11 --
community-x86_64/PKGBUILD | 48 -------------
community-x86_64/deja-dup.install | 12 ---
community-x86_64/fix-version-check.patch | 25 ++++++
community-x86_64/remove-version-check.patch | 11 --
10 files changed, 170 insertions(+), 142 deletions(-)
Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD 2014-12-20 20:48:28 UTC (rev 124213)
+++ community-i686/PKGBUILD 2014-12-20 20:48:59 UTC (rev 124214)
@@ -1,48 +0,0 @@
-# $Id$
-# Maintainer: Balló György <ballogyor+arch at gmail dot com>
-
-pkgname=deja-dup
-pkgver=32.0
-pkgrel=2
-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' 'libpeas' 'libnotify' 'python2-gobject' 'gvfs' 'xdg-utils')
-makedepends=('cmake' 'vala' 'intltool' 'itstool' 'nautilus')
-optdepends=('gnome-keyring: save passwords'
- 'nautilus: backup extension'
- 'python2-boto: Amazon S3 backend')
-install=$pkgname.install
-source=(http://launchpad.net/$pkgname/${pkgver%.*}/$pkgver/+download/$pkgname-$pkgver.tar.xz
- remove-version-check.patch)
-md5sums=('83e693cfebe397be0c67d3d362ae92c9'
- '8b40ac591d2b294b589e474138a0c36f')
-
-prepare() {
- cd "$srcdir/$pkgname-$pkgver"
-
- # Python2 fix
- sed -i 's/\"python\", \"-c\"/\"python2\", \"-c\"/' libdeja/PythonChecker.vala
-
- # Temporarily disable version check
- # https://bugs.launchpad.net/deja-dup/+bug/1384136
- patch -Np1 -i ../remove-version-check.patch
-}
-
-build() {
- cd "$srcdir/$pkgname-$pkgver"
-
- cmake . -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DCMAKE_INSTALL_SYSCONFDIR=/etc \
- -DCMAKE_INSTALL_LIBDIR=/usr/lib \
- -DCMAKE_INSTALL_LIBEXECDIR=/usr/lib/$pkgname
- make
-}
-
-package() {
- cd "$srcdir/$pkgname-$pkgver"
-
- make DESTDIR="$pkgdir/" install
-}
Copied: deja-dup/repos/community-i686/PKGBUILD (from rev 124213, deja-dup/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD (rev 0)
+++ community-i686/PKGBUILD 2014-12-20 20:48:59 UTC (rev 124214)
@@ -0,0 +1,48 @@
+# $Id$
+# Maintainer: Balló György <ballogyor+arch at gmail dot com>
+
+pkgname=deja-dup
+pkgver=32.0
+pkgrel=3
+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' 'libpeas' 'libnotify' 'python2-gobject' 'gvfs')
+makedepends=('cmake' 'vala' 'intltool' 'itstool' 'nautilus')
+optdepends=('gnome-keyring: save passwords'
+ 'nautilus: backup extension'
+ 'python2-boto: Amazon S3 backend')
+install=$pkgname.install
+source=(http://launchpad.net/$pkgname/${pkgver%.*}/$pkgver/+download/$pkgname-$pkgver.tar.xz
+ fix-version-check.patch)
+md5sums=('83e693cfebe397be0c67d3d362ae92c9'
+ 'f3f49f8de6f6ac98a6484506addfb630')
+
+prepare() {
+ cd $pkgname-$pkgver
+
+ # Python2 fix
+ sed -i 's/\"python\", \"-c\"/\"python2\", \"-c\"/' libdeja/PythonChecker.vala
+
+ # Fix version check for duplicity
+ # https://bugs.launchpad.net/deja-dup/+bug/1384136
+ patch -Np0 -i ../fix-version-check.patch
+}
+
+build() {
+ cd $pkgname-$pkgver
+
+ cmake . -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DCMAKE_INSTALL_SYSCONFDIR=/etc \
+ -DCMAKE_INSTALL_LIBDIR=/usr/lib \
+ -DCMAKE_INSTALL_LIBEXECDIR=/usr/lib/$pkgname
+ make
+}
+
+package() {
+ cd $pkgname-$pkgver
+
+ make DESTDIR="$pkgdir" install
+}
Deleted: community-i686/deja-dup.install
===================================================================
--- community-i686/deja-dup.install 2014-12-20 20:48:28 UTC (rev 124213)
+++ community-i686/deja-dup.install 2014-12-20 20:48:59 UTC (rev 124214)
@@ -1,12 +0,0 @@
-post_install() {
- glib-compile-schemas usr/share/glib-2.0/schemas
- xdg-icon-resource forceupdate
-}
-
-post_upgrade() {
- post_install $1
-}
-
-post_remove() {
- post_install $1
-}
Copied: deja-dup/repos/community-i686/deja-dup.install (from rev 124213, deja-dup/trunk/deja-dup.install)
===================================================================
--- community-i686/deja-dup.install (rev 0)
+++ community-i686/deja-dup.install 2014-12-20 20:48:59 UTC (rev 124214)
@@ -0,0 +1,12 @@
+post_install() {
+ glib-compile-schemas usr/share/glib-2.0/schemas
+ gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+}
+
+post_upgrade() {
+ post_install $1
+}
+
+post_remove() {
+ post_install $1
+}
Copied: deja-dup/repos/community-i686/fix-version-check.patch (from rev 124213, deja-dup/trunk/fix-version-check.patch)
===================================================================
--- community-i686/fix-version-check.patch (rev 0)
+++ community-i686/fix-version-check.patch 2014-12-20 20:48:59 UTC (rev 124214)
@@ -0,0 +1,25 @@
+=== modified file 'libdeja/tools/duplicity/DuplicityPlugin.vala'
+--- libdeja/tools/duplicity/DuplicityPlugin.vala 2014-01-24 16:07:59 +0000
++++ libdeja/tools/duplicity/DuplicityPlugin.vala 2014-10-25 13:52:17 +0000
+@@ -36,12 +36,16 @@
+ string output;
+ Process.spawn_command_line_sync("duplicity --version", out output, null, null);
+
+- var tokens = output.split(" ", 2);
+- if (tokens == null || tokens[0] == null || tokens[1] == null)
++ var tokens = output.split(" ");
++ if (tokens == null || tokens.length < 2 )
+ throw new SpawnError.FAILED(_("Could not understand duplicity version."));
+
+- // First token is 'duplicity' and is ignorable. Second looks like '0.5.03'
+- var version_string = tokens[1].strip();
++ // In version 0.6.25, the output from duplicity --version changed and the
++ // string "duplicity major.minor.micro" is now preceded by a deprecation
++ // warning. As a consequence, the substring "major.minor.micro" is now
++ // always the penultimate token (the last one always being null).
++ var version_string = tokens[tokens.length - 1].strip();
++
+ int major, minor, micro;
+ if (!DejaDup.parse_version(version_string, out major, out minor, out micro))
+ throw new SpawnError.FAILED(_("Could not understand duplicity version ‘%s’.").printf(version_string));
+
Deleted: community-i686/remove-version-check.patch
===================================================================
--- community-i686/remove-version-check.patch 2014-12-20 20:48:28 UTC (rev 124213)
+++ community-i686/remove-version-check.patch 2014-12-20 20:48:59 UTC (rev 124214)
@@ -1,11 +0,0 @@
-diff -Naur deja-dup-32.0.orig/libdeja/tools/duplicity/DuplicityPlugin.vala deja-dup-32.0/libdeja/tools/duplicity/DuplicityPlugin.vala
---- deja-dup-32.0.orig/libdeja/tools/duplicity/DuplicityPlugin.vala 2014-01-24 17:07:35.000000000 +0100
-+++ deja-dup-32.0/libdeja/tools/duplicity/DuplicityPlugin.vala 2014-10-22 23:47:37.406082239 +0200
-@@ -53,7 +53,6 @@
- public override DejaDup.ToolJob create_job () throws Error
- {
- if (!has_been_setup) {
-- do_initial_setup();
- has_been_setup = true;
- }
- return new DuplicityJob();
Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD 2014-12-20 20:48:28 UTC (rev 124213)
+++ community-x86_64/PKGBUILD 2014-12-20 20:48:59 UTC (rev 124214)
@@ -1,48 +0,0 @@
-# $Id$
-# Maintainer: Balló György <ballogyor+arch at gmail dot com>
-
-pkgname=deja-dup
-pkgver=32.0
-pkgrel=2
-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' 'libpeas' 'libnotify' 'python2-gobject' 'gvfs' 'xdg-utils')
-makedepends=('cmake' 'vala' 'intltool' 'itstool' 'nautilus')
-optdepends=('gnome-keyring: save passwords'
- 'nautilus: backup extension'
- 'python2-boto: Amazon S3 backend')
-install=$pkgname.install
-source=(http://launchpad.net/$pkgname/${pkgver%.*}/$pkgver/+download/$pkgname-$pkgver.tar.xz
- remove-version-check.patch)
-md5sums=('83e693cfebe397be0c67d3d362ae92c9'
- '8b40ac591d2b294b589e474138a0c36f')
-
-prepare() {
- cd "$srcdir/$pkgname-$pkgver"
-
- # Python2 fix
- sed -i 's/\"python\", \"-c\"/\"python2\", \"-c\"/' libdeja/PythonChecker.vala
-
- # Temporarily disable version check
- # https://bugs.launchpad.net/deja-dup/+bug/1384136
- patch -Np1 -i ../remove-version-check.patch
-}
-
-build() {
- cd "$srcdir/$pkgname-$pkgver"
-
- cmake . -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DCMAKE_INSTALL_SYSCONFDIR=/etc \
- -DCMAKE_INSTALL_LIBDIR=/usr/lib \
- -DCMAKE_INSTALL_LIBEXECDIR=/usr/lib/$pkgname
- make
-}
-
-package() {
- cd "$srcdir/$pkgname-$pkgver"
-
- make DESTDIR="$pkgdir/" install
-}
Copied: deja-dup/repos/community-x86_64/PKGBUILD (from rev 124213, deja-dup/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD (rev 0)
+++ community-x86_64/PKGBUILD 2014-12-20 20:48:59 UTC (rev 124214)
@@ -0,0 +1,48 @@
+# $Id$
+# Maintainer: Balló György <ballogyor+arch at gmail dot com>
+
+pkgname=deja-dup
+pkgver=32.0
+pkgrel=3
+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' 'libpeas' 'libnotify' 'python2-gobject' 'gvfs')
+makedepends=('cmake' 'vala' 'intltool' 'itstool' 'nautilus')
+optdepends=('gnome-keyring: save passwords'
+ 'nautilus: backup extension'
+ 'python2-boto: Amazon S3 backend')
+install=$pkgname.install
+source=(http://launchpad.net/$pkgname/${pkgver%.*}/$pkgver/+download/$pkgname-$pkgver.tar.xz
+ fix-version-check.patch)
+md5sums=('83e693cfebe397be0c67d3d362ae92c9'
+ 'f3f49f8de6f6ac98a6484506addfb630')
+
+prepare() {
+ cd $pkgname-$pkgver
+
+ # Python2 fix
+ sed -i 's/\"python\", \"-c\"/\"python2\", \"-c\"/' libdeja/PythonChecker.vala
+
+ # Fix version check for duplicity
+ # https://bugs.launchpad.net/deja-dup/+bug/1384136
+ patch -Np0 -i ../fix-version-check.patch
+}
+
+build() {
+ cd $pkgname-$pkgver
+
+ cmake . -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DCMAKE_INSTALL_SYSCONFDIR=/etc \
+ -DCMAKE_INSTALL_LIBDIR=/usr/lib \
+ -DCMAKE_INSTALL_LIBEXECDIR=/usr/lib/$pkgname
+ make
+}
+
+package() {
+ cd $pkgname-$pkgver
+
+ make DESTDIR="$pkgdir" install
+}
Deleted: community-x86_64/deja-dup.install
===================================================================
--- community-x86_64/deja-dup.install 2014-12-20 20:48:28 UTC (rev 124213)
+++ community-x86_64/deja-dup.install 2014-12-20 20:48:59 UTC (rev 124214)
@@ -1,12 +0,0 @@
-post_install() {
- glib-compile-schemas usr/share/glib-2.0/schemas
- xdg-icon-resource forceupdate
-}
-
-post_upgrade() {
- post_install $1
-}
-
-post_remove() {
- post_install $1
-}
Copied: deja-dup/repos/community-x86_64/deja-dup.install (from rev 124213, deja-dup/trunk/deja-dup.install)
===================================================================
--- community-x86_64/deja-dup.install (rev 0)
+++ community-x86_64/deja-dup.install 2014-12-20 20:48:59 UTC (rev 124214)
@@ -0,0 +1,12 @@
+post_install() {
+ glib-compile-schemas usr/share/glib-2.0/schemas
+ gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+}
+
+post_upgrade() {
+ post_install $1
+}
+
+post_remove() {
+ post_install $1
+}
Copied: deja-dup/repos/community-x86_64/fix-version-check.patch (from rev 124213, deja-dup/trunk/fix-version-check.patch)
===================================================================
--- community-x86_64/fix-version-check.patch (rev 0)
+++ community-x86_64/fix-version-check.patch 2014-12-20 20:48:59 UTC (rev 124214)
@@ -0,0 +1,25 @@
+=== modified file 'libdeja/tools/duplicity/DuplicityPlugin.vala'
+--- libdeja/tools/duplicity/DuplicityPlugin.vala 2014-01-24 16:07:59 +0000
++++ libdeja/tools/duplicity/DuplicityPlugin.vala 2014-10-25 13:52:17 +0000
+@@ -36,12 +36,16 @@
+ string output;
+ Process.spawn_command_line_sync("duplicity --version", out output, null, null);
+
+- var tokens = output.split(" ", 2);
+- if (tokens == null || tokens[0] == null || tokens[1] == null)
++ var tokens = output.split(" ");
++ if (tokens == null || tokens.length < 2 )
+ throw new SpawnError.FAILED(_("Could not understand duplicity version."));
+
+- // First token is 'duplicity' and is ignorable. Second looks like '0.5.03'
+- var version_string = tokens[1].strip();
++ // In version 0.6.25, the output from duplicity --version changed and the
++ // string "duplicity major.minor.micro" is now preceded by a deprecation
++ // warning. As a consequence, the substring "major.minor.micro" is now
++ // always the penultimate token (the last one always being null).
++ var version_string = tokens[tokens.length - 1].strip();
++
+ int major, minor, micro;
+ if (!DejaDup.parse_version(version_string, out major, out minor, out micro))
+ throw new SpawnError.FAILED(_("Could not understand duplicity version ‘%s’.").printf(version_string));
+
Deleted: community-x86_64/remove-version-check.patch
===================================================================
--- community-x86_64/remove-version-check.patch 2014-12-20 20:48:28 UTC (rev 124213)
+++ community-x86_64/remove-version-check.patch 2014-12-20 20:48:59 UTC (rev 124214)
@@ -1,11 +0,0 @@
-diff -Naur deja-dup-32.0.orig/libdeja/tools/duplicity/DuplicityPlugin.vala deja-dup-32.0/libdeja/tools/duplicity/DuplicityPlugin.vala
---- deja-dup-32.0.orig/libdeja/tools/duplicity/DuplicityPlugin.vala 2014-01-24 17:07:35.000000000 +0100
-+++ deja-dup-32.0/libdeja/tools/duplicity/DuplicityPlugin.vala 2014-10-22 23:47:37.406082239 +0200
-@@ -53,7 +53,6 @@
- public override DejaDup.ToolJob create_job () throws Error
- {
- if (!has_been_setup) {
-- do_initial_setup();
- has_been_setup = true;
- }
- return new DuplicityJob();
More information about the arch-commits
mailing list