[arch-commits] Commit in bittorrent/trunk (3 files)
Allan McRae
allan at archlinux.org
Sat Jan 31 09:36:24 UTC 2009
Date: Saturday, January 31, 2009 @ 04:36:24
Author: allan
Revision: 25859
upgpkg: bittorrent 5.2.2-1
Modified:
bittorrent/trunk/PKGBUILD
bittorrent/trunk/bittorrent.install
Deleted:
bittorrent/trunk/bittorrent-arch.patch
-----------------------+
PKGBUILD | 28 +++++++++--------
bittorrent-arch.patch | 76 ------------------------------------------------
bittorrent.install | 16 +++-------
3 files changed, 20 insertions(+), 100 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2009-01-31 05:38:39 UTC (rev 25858)
+++ PKGBUILD 2009-01-31 09:36:24 UTC (rev 25859)
@@ -2,25 +2,27 @@
# Mantainer: Juergen Hoetzel <juergen at archlinux.org>
pkgname=bittorrent
-pkgver=5.0.6
-pkgrel=2
+pkgver=5.2.2
+pkgrel=1
pkgdesc="BitTorrent is a tool for copying files from one machine to another."
-arch=(i686 x86_64)
+arch=('i686' 'x86_64')
url="http://www.bittorrent.com"
install=bittorrent.install
-depends=("twisted" "pycrypto")
+depends=('twisted' 'pycrypto')
source=(http://download.bittorrent.com/dl/BitTorrent-${pkgver}.tar.gz)
license=('custom')
-md5sums=('c1ac5f78aebc444899aaf20d06dd62b5')
+md5sums=('d8891cfa4c6bb796c8e948eace7694bc')
build() {
- cd $startdir/src/BitTorrent-$pkgver
- # patch -p1 -i $startdir/src/bittorrent-arch.patch || return 1
- sed -i -e "s|ip = os.path.join('share', 'pixmaps', appdir)|ip = os.path.join('share', 'bittorrent', 'pixmaps')|" BitTorrent/platform.py || return 1
- sed -i -e "s|dp = os.path.join('share', 'doc' , appdir)|dp = os.path.join('share', 'bittorrent', 'doc')|" BitTorrent/platform.py || return 1
- python ./setup.py install --root=$startdir/pkg
+ cd $srcdir/BitTorrent-$pkgver
+ python ./setup.py install --root=$pkgdir
-# install custom license
-install -Dm644 $srcdir/BitTorrent-$pkgver/LICENSE.txt \
- $pkgdir/usr/share/licenses/$pkgname/LICENSE
+ # remove broken wx interface
+ rm $pkgdir/usr/bin/{bittorrent,maketorrent}
+ rm -rf $pkgdir/usr/lib/python2.6/site-packages/BitTorrent/GUI_wx
+ rm -rf $pkgdir/usr/share/pixmaps
+
+ # install custom license
+ install -Dm644 $srcdir/BitTorrent-$pkgver/LICENSE.txt \
+ $pkgdir/usr/share/licenses/$pkgname/LICENSE
}
Deleted: bittorrent-arch.patch
===================================================================
--- bittorrent-arch.patch 2009-01-31 05:38:39 UTC (rev 25858)
+++ bittorrent-arch.patch 2009-01-31 09:36:24 UTC (rev 25859)
@@ -1,76 +0,0 @@
-diff -urN BitTorrent-5.0.0/bittorrent-curses.py BitTorrent-5.0.0.new/bittorrent-curses.py
---- BitTorrent-5.0.0/bittorrent-curses.py 2006-10-26 23:42:56.000000000 +0200
-+++ BitTorrent-5.0.0.new/bittorrent-curses.py 2006-11-07 23:44:19.000000000 +0100
-@@ -42,7 +42,7 @@
- from BitTorrent import BTFailure, UserFailure
- from BitTorrent import version
- from BTL import GetTorrent
--from BitTorrent.RawServer_twisted import RawServer, task
-+from BitTorrent.RawServer_twisted import RawServer
- from BTL.ConvertedMetainfo import ConvertedMetainfo
- from BTL.yielddefer import launch_coroutine, _wrap_task
- from BitTorrent import inject_main_logfile
-@@ -498,12 +498,12 @@
- if config['save_in']:
- raise BTFailure(_("You cannot specify both --save_as and "
- "--save_in."))
-- saveas,bad = platform.encode_for_filesystem(config['save_as'])
-+ saveas,bad = encode_for_filesystem(config['save_as'])
- if bad:
- raise BTFailure(_("Invalid path encoding."))
- savein = os.path.dirname(os.path.abspath(saveas))
- elif config['save_in']:
-- savein,bad = platform.encode_for_filesystem(config['save_in'])
-+ savein,bad = encode_for_filesystem(config['save_in'])
- if bad:
- raise BTFailure(_("Invalid path encoding."))
- saveas = os.path.join(savein,torrent_name)
-@@ -511,14 +511,14 @@
- saveas = torrent_name
- if config['save_incomplete_in']:
- save_incomplete_in,bad = \
-- platform.encode_for_filesystem(config['save_incomplete_in'])
-+ encode_for_filesystem(config['save_incomplete_in'])
- if bad:
- raise BTFailure(_("Invalid path encoding."))
- save_incomplete_as = os.path.join(save_incomplete_in,torrent_name)
- else:
- save_incomplete_as = os.path.join(savein,torrent_name)
-
-- data_dir,bad = platform.encode_for_filesystem(config['data_dir'])
-+ data_dir,bad = encode_for_filesystem(config['data_dir'])
- if bad:
- raise BTFailure(_("Invalid path encoding."))
-
-diff -urN BitTorrent-5.0.0/launchmany-console.py BitTorrent-5.0.0.new/launchmany-console.py
---- BitTorrent-5.0.0/launchmany-console.py 2006-10-26 23:44:14.000000000 +0200
-+++ BitTorrent-5.0.0.new/launchmany-console.py 2006-11-07 23:44:19.000000000 +0100
-@@ -80,10 +80,10 @@
- if args:
- torrent_dir = args[0]
- config['torrent_dir'] = \
-- platform.decode_from_filesystem(torrent_dir)
-+ decode_from_filesystem(torrent_dir)
- else:
- torrent_dir = config['torrent_dir']
-- torrent_dir,bad = platform.encode_for_filesystem(torrent_dir)
-+ torrent_dir,bad = encode_for_filesystem(torrent_dir)
- if bad:
- raise BTFailure(_("Warning: ")+config['torrent_dir']+
- _(" is not a directory"))
-diff -urN BitTorrent-5.0.0/launchmany-curses.py BitTorrent-5.0.0.new/launchmany-curses.py
---- BitTorrent-5.0.0/launchmany-curses.py 2006-10-26 23:44:14.000000000 +0200
-+++ BitTorrent-5.0.0.new/launchmany-curses.py 2006-11-07 23:44:19.000000000 +0100
-@@ -316,10 +316,10 @@
- if args:
- torrent_dir = args[0]
- config['torrent_dir'] = \
-- platform.decode_from_filesystem(torrent_dir)
-+ decode_from_filesystem(torrent_dir)
- else:
- torrent_dir = config['torrent_dir']
-- torrent_dir,bad = platform.encode_for_filesystem(torrent_dir)
-+ torrent_dir,bad = encode_for_filesystem(torrent_dir)
- if bad:
- raise BTFailure(_("Warning: ")+config['torrent_dir']+
- _(" is not a directory"))
Modified: bittorrent.install
===================================================================
--- bittorrent.install 2009-01-31 05:38:39 UTC (rev 25858)
+++ bittorrent.install 2009-01-31 09:36:24 UTC (rev 25859)
@@ -1,15 +1,9 @@
-# arg 1: the new package version
post_install() {
- echo "Optional dependencies:"
- echo "wxpython - for graphical frontend \"bittorrent\""
- /bin/true
+ echo " The \"bittorrent\" packages no longer includes the GUI interface"
+ echo " due to not being updated for wx-2.8 after two years."
+ echo " Forward complaints upstream."
}
-# arg 1: the new package version
-# arg 2: the old package version
+
post_upgrade() {
- post_install $*
+ post_install $1
}
-
-op=$1
-shift
-$op $*
More information about the arch-commits
mailing list