Attachment 118403 Details for Bug 160639 – file.diff

[patch] file.diff

file.diff (text/plain), 2.64 KB, created by Marco Bröder on 2011-09-10 19:20:08 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Marco Bröder

Created: 2011-09-10 19:20:08 UTC

Size: 2.64 KB

patch

obsolete

>diff --git a/devel/hg-git/Makefile b/devel/hg-git/Makefile
>index ece5c8b..ba21727 100644
>--- a/devel/hg-git/Makefile
>+++ b/devel/hg-git/Makefile
>@@ -6,7 +6,7 @@
> #
> 
> PORTNAME=	hg-git
>-PORTVERSION=	0.2.6
>+PORTVERSION=	0.3.0
> CATEGORIES=	devel python
> MASTER_SITES=	CHEESESHOP
> PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
>@@ -14,11 +14,11 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
> MAINTAINER=	marco.broeder@gmx.eu
> COMMENT=	Mercurial extension to pull from or push to a Git repository
> 
>-RUN_DEPENDS=	${PKGNAMEPREFIX}dulwich>=0.7.0:${PORTSDIR}/devel/dulwich \
>-		mercurial>=1.7.5:${PORTSDIR}/devel/mercurial
>-
> LICENSE=	GPLv2
> 
>+RUN_DEPENDS=	${PKGNAMEPREFIX}dulwich>=0.8.0:${PORTSDIR}/devel/dulwich \
>+		mercurial>=1.9.0:${PORTSDIR}/devel/mercurial
>+
> MAKE_JOBS_SAFE=	yes
> 
> USE_PYTHON=	yes
>diff --git a/devel/hg-git/distinfo b/devel/hg-git/distinfo
>index bb37bfc..df93152 100644
>--- a/devel/hg-git/distinfo
>+++ b/devel/hg-git/distinfo
>@@ -1,2 +1,2 @@
>-SHA256 (hg-git-0.2.6.tar.gz) = 31b3b01632f090cde2fbc421b2d0e0b04c8e078595c314f5a0d90d8187a70d2d
>-SIZE (hg-git-0.2.6.tar.gz) = 12710
>+SHA256 (hg-git-0.3.0.tar.gz) = f42b04f38fa0a0f91ab4a436731afcea992a390184e2714240baed3074372fa4
>+SIZE (hg-git-0.3.0.tar.gz) = 16362
>diff --git a/devel/hg-git/files/patch-hg_git.egg-info__requires.txt b/devel/hg-git/files/patch-hg_git.egg-info__requires.txt
>new file mode 100644
>index 0000000..c164f94
>--- /dev/null
>+++ b/devel/hg-git/files/patch-hg_git.egg-info__requires.txt
>@@ -0,0 +1,6 @@
>+--- ./hg_git.egg-info/requires.txt.orig	2011-09-09 23:24:16.000000000 +0200
>++++ ./hg_git.egg-info/requires.txt	2011-09-10 19:25:14.233169708 +0200
>+@@ -1 +1 @@
>+-dulwich>=0.8.1
>+\ No newline at end of file
>++dulwich>=0.8.0
>diff --git a/devel/hg-git/files/patch-setup.py b/devel/hg-git/files/patch-setup.py
>new file mode 100644
>index 0000000..680c77b
>--- /dev/null
>+++ b/devel/hg-git/files/patch-setup.py
>@@ -0,0 +1,9 @@
>+--- ./setup.py.orig	2011-09-09 23:17:19.000000000 +0200
>++++ ./setup.py	2011-09-10 19:25:26.255646380 +0200
>+@@ -19,5 +19,5 @@
>+     keywords='hg git mercurial',
>+     license='GPLv2',
>+     packages=['hggit'],
>+-    install_requires=['dulwich>=0.8.1'],
>++    install_requires=['dulwich>=0.8.0'],
>+ )
>diff --git a/devel/hg-git/pkg-message b/devel/hg-git/pkg-message
>index 693fb47..72cba35 100644
>--- a/devel/hg-git/pkg-message
>+++ b/devel/hg-git/pkg-message
>@@ -10,7 +10,7 @@ Mercurial global configuration file '~/.hgrc':
> bookmarks =
> hggit =
> 
>-The bookmarks section is not compulsory, but it makes some things a bit nicer.
>-Bookmarks will be translated to git heads when pushing.
>+The bookmarks section is only required prior to hg 1.7. Bookmarks will be
>+translated to git heads when pushing.
> 
> ====

Actions: View | Diff

Attachments on bug 160639: 118403 | 118404 | 118405 | 118406 | 118407