[arch-commits] Commit in deja-dup/trunk (PKGBUILD fix-version-check.patch)

[Balló György]

    Date: Wednesday, April 15, 2015 @ 11:42:17
  Author: bgyorgy
Revision: 131396

upgpkg: deja-dup 34.0-1

Update to version 34.0

Modified:
  deja-dup/trunk/PKGBUILD
Deleted:
  deja-dup/trunk/fix-version-check.patch

-------------------------+
 PKGBUILD                |   16 +++++-----------
 fix-version-check.patch |   25 -------------------------
 2 files changed, 5 insertions(+), 36 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-04-15 08:34:57 UTC (rev 131395)
+++ PKGBUILD	2015-04-15 09:42:17 UTC (rev 131396)
@@ -2,22 +2,20 @@
 # Maintainer: Balló György <ballogyor+arch at gmail dot com>
 
 pkgname=deja-dup
-pkgver=32.0
-pkgrel=3
+pkgver=34.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' 'libpeas' 'libnotify' 'python2-gobject' 'gvfs')
-makedepends=('cmake' 'vala' 'intltool' 'itstool' 'nautilus')
+makedepends=('cmake' 'vala' 'intltool' 'itstool' 'nautilus' 'gobject-introspection')
 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')
+source=(http://launchpad.net/$pkgname/${pkgver%.*}/$pkgver/+download/$pkgname-$pkgver.tar.xz)
+md5sums=('20791d5978f16f3ec456a0e51e6b0564')
 
 prepare() {
   cd $pkgname-$pkgver
@@ -24,10 +22,6 @@
 
   # 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() {

Deleted: fix-version-check.patch
===================================================================
--- fix-version-check.patch	2015-04-15 08:34:57 UTC (rev 131395)
+++ fix-version-check.patch	2015-04-15 09:42:17 UTC (rev 131396)
@@ -1,25 +0,0 @@
-=== 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));
-