summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO10
-rw-r--r--PKGBUILD10
2 files changed, 12 insertions, 8 deletions
diff --git a/.SRCINFO b/.SRCINFO
index a426b4443e5f..ccc544f47e20 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,21 +1,21 @@
# Generated by mksrcinfo v8
-# Tue Oct 4 07:27:00 UTC 2016
+# Thu Nov 3 17:25:32 UTC 2016
pkgbase = tortoisehg
pkgdesc = Graphical tools for Mercurial
- pkgver = 3.9.2
+ pkgver = 4.0
pkgrel = 1
url = http://tortoisehg.bitbucket.org/
arch = any
license = GPL
depends = python2
- depends = mercurial>=3.7
+ depends = mercurial>=3.8
depends = python2-pyqt4>=4.10
depends = python2-qscintilla
depends = python2-iniparse
optdepends = python2-pygments: syntax highlighting
optdepends = python2-nautilus: Python binding for Nautilus components
- source = http://bitbucket.org/tortoisehg/targz/downloads/tortoisehg-3.9.2.tar.gz
- sha256sums = 02ba49f5c724557b89b7a1d3a2abd1aaee5da4564ff98dd859b69d1f92d38c9f
+ source = http://bitbucket.org/tortoisehg/targz/downloads/tortoisehg-4.0.tar.gz
+ sha256sums = 791ffa4270cb2f49454290a30da2a915b31a91b94ebc5546289a125e962f7910
pkgname = tortoisehg
diff --git a/PKGBUILD b/PKGBUILD
index 1b5096c3cdb7..66ec32df50ab 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,12 +5,12 @@
# AUR Category: devel
pkgname=tortoisehg
-pkgver=3.9.2
+pkgver=4.0
pkgrel=1
pkgdesc="Graphical tools for Mercurial"
url="http://tortoisehg.bitbucket.org/"
license=("GPL")
-depends=('python2' 'mercurial>=3.7' 'python2-pyqt4>=4.10' 'python2-qscintilla' 'python2-iniparse')
+depends=('python2' 'mercurial>=3.8' 'python2-pyqt4>=4.10' 'python2-qscintilla' 'python2-iniparse')
builddepends=(python2)
arch=('any')
optdepends=('python2-pygments: syntax highlighting'
@@ -24,6 +24,10 @@ package() {
install -Dm 644 "contrib/mergetools.rc" "${pkgdir}/etc/mercurial/hgrc.d/thgmergetools.rc"
install -Dm 644 "contrib/thg.desktop" "${pkgdir}/usr/share/applications/thg.desktop"
install -Dm 644 "icons/svg/thg_logo.svg" "${pkgdir}/usr/share/pixmaps/thg_logo.svg"
+
+ # already provided by hg 4.0
+ rm "${pkgdir}/usr/lib/python2.7/site-packages/hgext3rd/__init__.py"
+ rm "${pkgdir}/usr/lib/python2.7/site-packages/hgext3rd/__init__.pyc"
}
-sha256sums=('02ba49f5c724557b89b7a1d3a2abd1aaee5da4564ff98dd859b69d1f92d38c9f')
+sha256sums=('791ffa4270cb2f49454290a30da2a915b31a91b94ebc5546289a125e962f7910')