aboutsummaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorchriseth <chris@ethereum.org>2016-08-11 03:07:15 +0800
committerGitHub <noreply@github.com>2016-08-11 03:07:15 +0800
commit988fe5e5aa271d89e0700d36ef0f210ca50051e3 (patch)
treea93f34ee497d32888f53cbc2cec007f167826e3f /scripts
parent3fc68da5cfdd9a621688cf5929cb8a7a85f09813 (diff)
parentba4cfdac5e72c831caaac9010481135436487919 (diff)
downloaddexon-solidity-988fe5e5aa271d89e0700d36ef0f210ca50051e3.tar
dexon-solidity-988fe5e5aa271d89e0700d36ef0f210ca50051e3.tar.gz
dexon-solidity-988fe5e5aa271d89e0700d36ef0f210ca50051e3.tar.bz2
dexon-solidity-988fe5e5aa271d89e0700d36ef0f210ca50051e3.tar.lz
dexon-solidity-988fe5e5aa271d89e0700d36ef0f210ca50051e3.tar.xz
dexon-solidity-988fe5e5aa271d89e0700d36ef0f210ca50051e3.tar.zst
dexon-solidity-988fe5e5aa271d89e0700d36ef0f210ca50051e3.zip
Merge pull request #859 from chriseth/fixppa
Fix ppa script
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/release_ppa.sh9
1 files changed, 6 insertions, 3 deletions
diff --git a/scripts/release_ppa.sh b/scripts/release_ppa.sh
index 68ee7cdc..2fd286fd 100755
--- a/scripts/release_ppa.sh
+++ b/scripts/release_ppa.sh
@@ -27,6 +27,7 @@ else
fi
if [ "$branch" = develop ]
+then
pparepo=ethereum/ethereum-dev
ppafilesurl=https://launchpad.net/~ethereum/+archive/ubuntu/ethereum-dev/+files
else
@@ -57,7 +58,7 @@ commitdate=`git show --format=%ci HEAD | head -n 1 | cut - -b1-10`
# TODO store the commit hash in a file so that the build info mechanism can pick it up even without git
-if [ $branch = develop]
+if [ $branch = develop ]
then
debversion="$version-nightly-$commitdate-$commithash"
else
@@ -67,7 +68,7 @@ fi
# gzip will create different tars all the time and we are not allowed
# to upload the same file twice with different contents, so we only
# create it once.
-if [ -n -e /tmp/${packagename}_${debversion}.orig.tar.gz ]
+if [ ! -e /tmp/${packagename}_${debversion}.orig.tar.gz ]
then
tar --exclude .git -czf /tmp/${packagename}_${debversion}.orig.tar.gz .
fi
@@ -117,6 +118,8 @@ Package: solc
Architecture: any-i386 any-amd64
Multi-Arch: same
Depends: \${shlibs:Depends}, \${misc:Depends}, $jsoncpplib
+Replaces: lllc (<< 1:0.3.6)
+Conflicts: libethereum (<= 1.2.9)
Description: Solidity compiler.
The commandline interface to the Solidity smart contract compiler.
EOF
@@ -194,7 +197,7 @@ mkdir debian/source
echo "3.0 (quilt)" > debian/source/format
chmod +x debian/rules
-versionsuffix=0ubuntu4~${distribution}
+versionsuffix=0ubuntu1~${distribution}
# bump version / add entry to changelog
EMAIL="$email" dch -v 1:${debversion}-${versionsuffix} "git build of ${commithash}"