From e8f0376a693837e3ec5da3c82610cebc1fc7e9a0 Mon Sep 17 00:00:00 2001 From: Adam Blackburn Date: Thu, 4 Jun 2009 21:39:36 +0800 Subject: [PATCH 1/2] updated CHANGES, setup.py version, and NEWS --- CHANGES | 28 ++++++++++++++++++++++++++++ NEWS | 2 +- setup.py | 2 +- 3 files changed, 30 insertions(+), 2 deletions(-) diff --git a/CHANGES b/CHANGES index aa96b08..8517745 100644 --- a/CHANGES +++ b/CHANGES @@ -1,4 +1,32 @@ ------------------------------------------------------------ +revno: 406 +committer: Andrew Psaltis +branch nick: 1.6 +timestamp: Sat 2009-05-30 23:18:22 -0400 +message: + Merge r342 of experimental-nacl. + ------------------------------------------------------------ + revno: 202.2.51 + committer: Andrew Psaltis + branch nick: experimental-nacl + timestamp: Sat 2009-05-30 23:12:53 -0400 + message: + Increased time between wireless scans to 2 seconds. + ------------------------------------------------------------ + revno: 202.2.50 + committer: Andrew Psaltis + branch nick: experimental-nacl + timestamp: Sat 2009-05-30 23:11:37 -0400 + message: + Merged with r405 of mainline 1.6 +------------------------------------------------------------ +revno: 405 +committer: Adam Blackburn +branch nick: 1.6 +timestamp: Thu 2009-05-28 11:10:10 +0800 +message: + updated CHANGES and setup.py version +------------------------------------------------------------ revno: 404 committer: Dan O'Reilly branch nick: 1.6 diff --git a/NEWS b/NEWS index 719fb92..701ff67 100644 --- a/NEWS +++ b/NEWS @@ -17,7 +17,7 @@ Minor Changes and Other Enhancements: - Better autoconnection behavior - Tray/GUI will survive the daemon being killed - Reasons for connection failures will now bubble back to the GUI -- Add/Remove wired profile system is now more user-friendly +- Add/remove wired profile system is now more user-friendly - Support for using resolvconf instead of directly editing /etc/resolv.conf - Wicd won't blindly kill dhcp clients / wpa_supplicant any more - Added an option to automatically switch from a wireless network to a wired diff --git a/setup.py b/setup.py index 14650f3..dbae429 100755 --- a/setup.py +++ b/setup.py @@ -25,7 +25,7 @@ import subprocess # Be sure to keep this updated! # VERSIONNUMBER -VERSION_NUM = '1.6.0b3' +VERSION_NUM = '1.6.0' # REVISION_NUM is automatically updated REVISION_NUM = 'unknown' CURSES_REVNO = 'uimod' From b10c959e9a78103aa5599310a0d9879fe270bd2f Mon Sep 17 00:00:00 2001 From: Adam Blackburn Date: Thu, 4 Jun 2009 22:24:14 +0800 Subject: [PATCH 2/2] add .sourceforge.net to the URLs in the translator --- setup.py | 33 ++++++++++++++++----------------- 1 file changed, 16 insertions(+), 17 deletions(-) diff --git a/setup.py b/setup.py index dbae429..c2f67cc 100755 --- a/setup.py +++ b/setup.py @@ -20,6 +20,7 @@ from distutils.core import setup, Command from distutils.extension import Extension import os +import sys import shutil import subprocess @@ -411,28 +412,26 @@ class get_translations(Command): import urllib, shutil shutil.rmtree('translations/') os.makedirs('translations') - filename, headers = urllib.urlretrieve('http://wicd.net/translator/idlist') + filename, headers = urllib.urlretrieve('http://wicd.sourceforge.net/translator/idlist/') id_file = open(filename, 'r') lines = id_file.readlines() # remove the \n from the end of lines, and remove blank entries lines = [ x.strip() for x in lines if not x.strip() is '' ] for id in lines: - # http://wicd.net/translator/download_po.php?language=11 - pofile, poheaders = urllib.urlretrieve('http://wicd.net/translator/download/'+str(id)) - #for i in `cat ids`; do - #wget "http://wicd.sourceforge.net/translator/download_po.php?language=$i&version=$1" -O "language_$i" - #iden=`python -c "import sys; print open('language_$i','r').readlines()[1].strip()[2:]"` - #mv "language_$i" po/$iden.po - #mkdir -p $iden/LC_MESSAGES/ - #msgfmt --output-file=$iden/LC_MESSAGES/wicd.mo po/$iden.po - lang_identifier = open(pofile,'r').readlines()[0].strip() - lang_identifier = lang_identifier[lang_identifier.rindex('(')+1:lang_identifier.rindex(')')] - shutil.move(pofile, lang_identifier+'.po') - print 'Got',lang_identifier - os.makedirs('translations/'+lang_identifier+'/LC_MESSAGES') - os.system('msgfmt --output-file=translations/' + lang_identifier + - '/LC_MESSAGES/wicd.mo ' + lang_identifier + '.po') - os.remove(lang_identifier+'.po') + pofile, poheaders = urllib.urlretrieve('http://wicd.sourceforge.net/translator/download/'+str(id)+'/') + try: + lang_identifier = open(pofile,'r').readlines()[0].strip() + first_line = lang_identifier + lang_identifier = lang_identifier[lang_identifier.rindex('(')+1:lang_identifier.rindex(')')] + print first_line + except: + print >> sys.stderr, 'error downloading language %s' % id + else: + shutil.move(pofile, lang_identifier+'.po') + os.makedirs('translations/'+lang_identifier+'/LC_MESSAGES') + os.system('msgfmt --output-file=translations/' + lang_identifier + + '/LC_MESSAGES/wicd.mo ' + lang_identifier + '.po') + os.remove(lang_identifier+'.po') class uninstall(Command):