Date: Wednesday, October 22, 2014 @ 23:55:41
Author: bgyorgy
Revision: 121250
archrelease: copy trunk to community-i686, community-x86_64
Added:
deja-dup/repos/community-i686/PKGBUILD
(from rev 121249, deja-dup/trunk/PKGBUILD)
deja-dup/repos/community-i686/deja-dup.install
(from rev 121249, deja-dup/trunk/deja-dup.install)
deja-dup/repos/community-i686/remove-version-check.patch
(from rev 121249, deja-dup/trunk/remove-version-check.patch)
deja-dup/repos/community-x86_64/PKGBUILD
(from rev 121249, deja-dup/trunk/PKGBUILD)
deja-dup/repos/community-x86_64/deja-dup.install
(from rev 121249, deja-dup/trunk/deja-dup.install)
deja-dup/repos/community-x86_64/remove-version-check.patch
(from rev 121249, deja-dup/trunk/remove-version-check.patch)
Deleted:
deja-dup/repos/community-i686/PKGBUILD
deja-dup/repos/community-i686/deja-dup.install
deja-dup/repos/community-x86_64/PKGBUILD
deja-dup/repos/community-x86_64/deja-dup.install
---------------------------------------------+
/PKGBUILD | 96 ++++++++++++++++++++++++++
/deja-dup.install | 24 ++++++
community-i686/PKGBUILD | 42 -----------
community-i686/deja-dup.install | 12 ---
community-i686/remove-version-check.patch | 11 ++
community-x86_64/PKGBUILD | 42 -----------
community-x86_64/deja-dup.install | 12 ---
community-x86_64/remove-version-check.patch | 11 ++
8 files changed, 142 insertions(+), 108 deletions(-)
Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD 2014-10-22 21:55:15 UTC (rev 121249)
+++ community-i686/PKGBUILD 2014-10-22 21:55:41 UTC (rev 121250)
@@ -1,42 +0,0 @@
-# $Id$
-# Maintainer: Balló György <ballogyor+arch at gmail dot com>
-
-pkgname=deja-dup
-pkgver=32.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'
'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)
-md5sums=('83e693cfebe397be0c67d3d362ae92c9')
-
-prepare() {
- cd "$srcdir/$pkgname-$pkgver"
-
- # Python2 fix
- sed -i 's/\"python\", \"-c\"/\"python2\", \"-c\"/' libdeja/PythonChecker.vala
-}
-
-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 121249,
deja-dup/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD (rev 0)
+++ community-i686/PKGBUILD 2014-10-22 21:55:41 UTC (rev 121250)
@@ -0,0 +1,48 @@
+# $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
+}
Deleted: community-i686/deja-dup.install
===================================================================
--- community-i686/deja-dup.install 2014-10-22 21:55:15 UTC (rev 121249)
+++ community-i686/deja-dup.install 2014-10-22 21:55:41 UTC (rev 121250)
@@ -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 121249,
deja-dup/trunk/deja-dup.install)
===================================================================
--- community-i686/deja-dup.install (rev 0)
+++ community-i686/deja-dup.install 2014-10-22 21:55:41 UTC (rev 121250)
@@ -0,0 +1,12 @@
+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/remove-version-check.patch (from rev
121249, deja-dup/trunk/remove-version-check.patch)
===================================================================
--- community-i686/remove-version-check.patch (rev 0)
+++ community-i686/remove-version-check.patch 2014-10-22 21:55:41 UTC (rev
121250)
@@ -0,0 +1,11 @@
+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-10-22 21:55:15 UTC (rev 121249)
+++ community-x86_64/PKGBUILD 2014-10-22 21:55:41 UTC (rev 121250)
@@ -1,42 +0,0 @@
-# $Id$
-# Maintainer: Balló György <ballogyor+arch at gmail dot com>
-
-pkgname=deja-dup
-pkgver=32.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'
'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)
-md5sums=('83e693cfebe397be0c67d3d362ae92c9')
-
-prepare() {
- cd "$srcdir/$pkgname-$pkgver"
-
- # Python2 fix
- sed -i 's/\"python\", \"-c\"/\"python2\", \"-c\"/' libdeja/PythonChecker.vala
-}
-
-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 121249,
deja-dup/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD (rev 0)
+++ community-x86_64/PKGBUILD 2014-10-22 21:55:41 UTC (rev 121250)
@@ -0,0 +1,48 @@
+# $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
+}
Deleted: community-x86_64/deja-dup.install
===================================================================
--- community-x86_64/deja-dup.install 2014-10-22 21:55:15 UTC (rev 121249)
+++ community-x86_64/deja-dup.install 2014-10-22 21:55:41 UTC (rev 121250)
@@ -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 121249,
deja-dup/trunk/deja-dup.install)
===================================================================
--- community-x86_64/deja-dup.install (rev 0)
+++ community-x86_64/deja-dup.install 2014-10-22 21:55:41 UTC (rev 121250)
@@ -0,0 +1,12 @@
+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/remove-version-check.patch (from rev
121249, deja-dup/trunk/remove-version-check.patch)
===================================================================
--- community-x86_64/remove-version-check.patch (rev 0)
+++ community-x86_64/remove-version-check.patch 2014-10-22 21:55:41 UTC (rev
121250)
@@ -0,0 +1,11 @@
+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();
