diff options
| author | Treeve Jelbert | 2014-03-26 10:12:11 +0100 |
|---|---|---|
| committer | Treeve Jelbert | 2014-03-26 10:12:11 +0100 |
| commit | 31f6811c5753da3852c5c7d919a48d9a7f9d7387 (patch) | |
| tree | ab5d9bbc35c4cb1b35ad143157946aa90cd5cb8a /devel | |
| parent | 2dd888923aa690d75909aa01781c13dded33f3bf (diff) | |
| parent | 9c7fea4039102b3d93f95ebda5a349ba7c044989 (diff) | |
Merge remote-tracking branch 'origin/master' into devel-xorg-modular
Conflicts:
ChangeLog
Diffstat (limited to 'devel')
| -rwxr-xr-x | devel/binutils/BUILD | 6 | ||||
| -rw-r--r-- | devel/binutils/HISTORY | 3 | ||||
| -rwxr-xr-x | devel/git-cola/DETAILS | 4 | ||||
| -rw-r--r-- | devel/git-cola/HISTORY | 3 |
4 files changed, 8 insertions, 8 deletions
diff --git a/devel/binutils/BUILD b/devel/binutils/BUILD index 3846090b62..ba993e6b05 100755 --- a/devel/binutils/BUILD +++ b/devel/binutils/BUILD @@ -1,9 +1,3 @@ -# Temporary fix to solve texinfo errors -sed -i -e '325 s/@colophon/@&/' bfd/doc/bfd.texinfo && -sed -i -e '336 s/@cygnus/@&/' bfd/doc/bfd.texinfo && -sed -i -e '7866 s/@colophon/@&/' ld/ld.texinfo && -sed -i -e '7877 s/@cygnus/@&/' ld/ld.texinfo && - mkdir buildit && cd buildit && diff --git a/devel/binutils/HISTORY b/devel/binutils/HISTORY index 0b0a684c27..c2362b1fef 100644 --- a/devel/binutils/HISTORY +++ b/devel/binutils/HISTORY @@ -1,3 +1,6 @@ +2014-03-21 Remko van der Vossen <wich@sourcemage.org> + * BUILD: remove temporary workaround, 2.24 fixed the build failure + 2013-12-03 Treeve Jelbert <treeve@sourcemage.org> * DETAILS: 2.24 diff --git a/devel/git-cola/DETAILS b/devel/git-cola/DETAILS index b6fab6946b..e8485857e9 100755 --- a/devel/git-cola/DETAILS +++ b/devel/git-cola/DETAILS @@ -1,8 +1,8 @@ SPELL=git-cola - VERSION=2.0.0 + VERSION=2.0.1 SOURCE="${SPELL}-${VERSION}.tar.gz" SOURCE_URL[0]=http://github.com/${SPELL}/${SPELL}/archive/v${VERSION}.tar.gz - SOURCE_HASH=sha512:356c157f2e19f166beb7273555a65e8132aad2c588cc4f89eeb83df2462a417068a3ba33b3b958e465e921b0a79d9e6912447ff630af2ff34aea87634fc3065a + SOURCE_HASH=sha512:dfbc0e0646afd7982c7b4ee05fde92a358d25b0e7824b9fa8fb1353b776876dd3338188fc29694650a9a45aff03a7b89749a3909ada937c3fc808f53b686f1cc SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}" WEB_SITE="http://git-cola.github.com/" LICENSE[0]=GPL diff --git a/devel/git-cola/HISTORY b/devel/git-cola/HISTORY index 4d3c34ef59..8626ce3dc0 100644 --- a/devel/git-cola/HISTORY +++ b/devel/git-cola/HISTORY @@ -1,3 +1,6 @@ +2014-03-20 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de> + * DETAILS: version 2.0.1 + 2014-02-25 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de> * DETAILS: version 2.0.0 |