commit 228b15131a37e31ba0bff74c5a0cf4b79de0eff0 Author: Thomas Penteker <tek@serverop.de> Date: Fri Oct 3 14:34:40 2014 +0200 mercurial: 3.0.1 -> 3.1.2 (cherry picked from commit 2332da147b68f5a757281a8adb41f735c29ad261) Conflicts: mercurial/.footprint mercurial/.md5sum mercurial/Pkgfile diff --git a/mercurial/.footprint b/mercurial/.footprint index c73b639..595f7c0 100644 --- a/mercurial/.footprint +++ b/mercurial/.footprint @@ -135,7 +135,7 @@ drwxr-xr-x root/root usr/lib/python2.7/site-packages/hgext/zeroconf/ -rw-r--r-- root/root usr/lib/python2.7/site-packages/hgext/zeroconf/Zeroconf.pyc -rw-r--r-- root/root usr/lib/python2.7/site-packages/hgext/zeroconf/__init__.py -rw-r--r-- root/root usr/lib/python2.7/site-packages/hgext/zeroconf/__init__.pyc --rw-r--r-- root/root usr/lib/python2.7/site-packages/mercurial-3.1.1-py2.7.egg-info +-rw-r--r-- root/root usr/lib/python2.7/site-packages/mercurial-3.1.2-py2.7.egg-info drwxr-xr-x root/root usr/lib/python2.7/site-packages/mercurial/ -rw-r--r-- root/root usr/lib/python2.7/site-packages/mercurial/__init__.py (EMPTY) -rw-r--r-- root/root usr/lib/python2.7/site-packages/mercurial/__init__.pyc diff --git a/mercurial/.md5sum b/mercurial/.md5sum index 144a4dd..3902507 100644 --- a/mercurial/.md5sum +++ b/mercurial/.md5sum @@ -1 +1 @@ -5a530bb472b3cb306b757c8f5df91358 mercurial-3.1.1.tar.gz +72a79798de828d6d6fb055273f91201a mercurial-3.1.2.tar.gz diff --git a/mercurial/Pkgfile b/mercurial/Pkgfile index 888a705..58d8d7c 100644 --- a/mercurial/Pkgfile +++ b/mercurial/Pkgfile @@ -5,7 +5,7 @@ # Depends on: python name=mercurial -version=3.1.1 +version=3.1.2 release=1 source=(http://www.selenic.com/$name/release/$name-$version.tar.gz)