From 30e98dc7056ff83abb802d57facc216c1d96e6fb Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Sun, 21 Dec 2008 21:04:23 -0800 Subject: [PATCH] Fix #1419 (sudo calibre_postinstall error) and include ImageMagick in linux binary installer --- installer/linux/freeze.py | 8 +++++--- upload.py | 4 ++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/installer/linux/freeze.py b/installer/linux/freeze.py index 4fdeb69c37..32581abee2 100644 --- a/installer/linux/freeze.py +++ b/installer/linux/freeze.py @@ -36,7 +36,9 @@ def freeze(): '/usr/lib/libpoppler.so.4', '/usr/lib/libxml2.so.2', '/usr/lib/libxslt.so.1', - '/usr/lib/libxslt.so.1' + '/usr/lib/libxslt.so.1', + '/usr/lib/libMagickWand.so', + '/usr/lib/libMagickCore.so', ] binary_includes += [os.path.join(QTDIR, 'lib%s.so.4'%x) for x in QTDLLS] @@ -158,8 +160,8 @@ def freeze(): dest = os.path.join(dest_dir, os.path.basename(src)) if not os.path.exists(dest_dir): os.makedirs(dest_dir) - shutil.copyfile(src, dest) - shutil.copymode(src, dest) + shutil.copyfile(os.path.realpath(src), dest) + shutil.copymode(os.path.realpath(src), dest) for f in binary_includes: copy_binary(f, FREEZE_DIR) diff --git a/upload.py b/upload.py index 4dc7d92d6b..2784a6b36f 100644 --- a/upload.py +++ b/upload.py @@ -235,10 +235,10 @@ def stage_three(): print 'Uploading to PyPI...' check_call('rm -f dist/*') check_call('python setup.py register') - check_call('sudo rm -rf build') + check_call('sudo rm -rf build src/calibre/plugins/*') os.mkdir('build') check_call('python2.5 setup.py bdist_egg --exclude-source-files upload') - shutil.rmtree('build') + check_call('sudo rm -rf build src/calibre/plugins/*') os.mkdir('build') check_call('python setup.py bdist_egg --exclude-source-files upload') check_call('python setup.py sdist upload')