[arch-commits] Commit in sbackup/repos (3 files)

[Eric Belanger]

    Date: Tuesday, July 15, 2008 @ 21:03:35
  Author: eric
Revision: 5433

fixing svn conflict

Modified:
  sbackup/repos/extra-x86_64/	(properties)
  sbackup/repos/extra-x86_64/PKGBUILD
  sbackup/repos/extra-x86_64/makefile.patch

----------------+
 PKGBUILD       |   15 ++++++++-------
 makefile.patch |    6 +++---
 2 files changed, 11 insertions(+), 10 deletions(-)


Property changes on: sbackup/repos/extra-x86_64
___________________________________________________________________
Name: svnmerge-integrated
   - /sbackup/trunk:1
   + /sbackup/trunk:1-5432

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2008-07-16 00:58:28 UTC (rev 5432)
+++ extra-x86_64/PKGBUILD	2008-07-16 01:03:35 UTC (rev 5433)
@@ -3,16 +3,17 @@
 # Contributor: William Rea <sillywilly at gmail.com>
 
 pkgname=sbackup
-pkgver=0.10.4
-pkgrel=2
+pkgver=0.10.5
+pkgrel=1
 pkgdesc="A simple backup solution intended for desktop use"
 arch=('i686' 'x86_64')
-url="http://sbackup.sourceforge.net"
+url="http://sbackup.wiki.sourceforge.net/"
 license=('GPL')
 depends=('gksu' 'gnome-python-extras')
 backup=('etc/sbackup.conf')
-source=(http://dl.sourceforge.net/$pkgname/${pkgname}_${pkgver}.tar.gz makefile.patch)
-md5sums=('d93422c486cbbfcce82251828f688c74' 'cdd036668cd917dbc9550bae6684f5ce')
+source=(http://downloads.sourceforge.net/$pkgname/${pkgname}_${pkgver}.tar.gz makefile.patch)
+md5sums=('0d754b72da3b5cadf6de203cdf7afe13'
+         '7aab11e4490ba3ef3df2f6e1e386d25e')
 
 build() {
   export MAKEFLAGS="-j1"
@@ -20,10 +21,10 @@
 
   patch -Np1 -i $startdir/src/makefile.patch
   sed -i -e "s/dpkg --get-selections/pacman -Q/" sbackupd.py
-  sed -i -e "s/gksudo/gksu/" sbackup.desktop
+  sed -i -e "s/su-to-root -X -c/gksu/" sbackup.desktop
+  sed -i -e "s/su-to-root -X -c/gksu/" srestore.desktop
 
   install -dm0755 $startdir/pkg/{usr/share/applications,etc}
 
   make PREFIX=/usr DESTDIR=$startdir/pkg install
 }
-

Modified: extra-x86_64/makefile.patch
===================================================================
--- extra-x86_64/makefile.patch	2008-07-16 00:58:28 UTC (rev 5432)
+++ extra-x86_64/makefile.patch	2008-07-16 01:03:35 UTC (rev 5433)
@@ -1,6 +1,6 @@
-diff -Naur sbackup-0.10.4-orig/Makefile sbackup-0.10.4/Makefile
---- sbackup-0.10.4-orig/Makefile	2007-06-04 02:20:44.000000000 -0400
-+++ sbackup-0.10.4/Makefile	2007-06-04 02:23:39.000000000 -0400
+diff -Naur sbackup-0.10.5-orig/Makefile sbackup-0.10.4/Makefile
+--- sbackup-0.10.5-orig/Makefile	2007-06-04 02:20:44.000000000 -0400
++++ sbackup-0.10.5/Makefile	2007-06-04 02:23:39.000000000 -0400
 @@ -1,21 +1,18 @@
  PO = pt_BR lv nl es sv fr