summarylogtreecommitdiffstats
path: root/PKGBUILD
diff options
context:
space:
mode:
authorAnshuman Bhaduri2016-11-24 18:27:45 +1300
committerAnshuman Bhaduri2016-11-24 18:27:45 +1300
commit362035879e0dcdad35ae9cf8a74129463f59595c (patch)
tree2ce0932a357aaa84fd914e50d44ff0ceea6d85b9 /PKGBUILD
parent54d50d51cf5321ab7fd594a13701181479dba07f (diff)
downloadaur-362035879e0dcdad35ae9cf8a74129463f59595c.tar.gz
Updates for Mercurial and TortoiseHg 4.0.
Adds workaround for https://bitbucket.org/tortoisehg/thg/issues/4629/: TortoiseHg's hgext3rd/__init__.py* were conflicting with Mercurial's.
Diffstat (limited to 'PKGBUILD')
-rw-r--r--PKGBUILD8
1 files changed, 7 insertions, 1 deletions
diff --git a/PKGBUILD b/PKGBUILD
index aef2767d08e4..663a3c7ee87d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,7 +7,7 @@
_pkgname=thg
pkgname=tortoisehg-hg
-pkgver=3.9.18102
+pkgver=4.0.18125
pkgrel=1
pkgdesc="Mercurial GUI front end"
arch=('i686' 'x86_64')
@@ -47,6 +47,12 @@ package() {
install -Dm 644 "icons/svg/thg_logo.svg" \
"${pkgdir}/usr/share/pixmaps/thg_logo.svg"
+ # Remove files conflicting with Mercurial.
+ # https://bitbucket.org/tortoisehg/thg/issues/4629/
+ rm -f "${pkgdir}/usr/lib/python2.7/site-packages/hgext3rd/__init__.py" \
+ "${pkgdir}/usr/lib/python2.7/site-packages/hgext3rd/__init__.pyc" \
+ "${pkgdir}/usr/lib/python2.7/site-packages/hgext3rd/__init__.pyo"
+
# Remove VCS leftovers.
find "${pkgdir}" -type d -name .hg -exec rm -r '{}' +
}