Date: Saturday, February 4, 2017 @ 19:23:10
Author: alucryd
Revision: 288045
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
bzr/repos/extra-i686/PKGBUILD
(from rev 288044, bzr/trunk/PKGBUILD)
bzr/repos/extra-i686/bzr-lazy-regex.patch
(from rev 288044, bzr/trunk/bzr-lazy-regex.patch)
bzr/repos/extra-x86_64/PKGBUILD
(from rev 288044, bzr/trunk/PKGBUILD)
bzr/repos/extra-x86_64/bzr-lazy-regex.patch
(from rev 288044, bzr/trunk/bzr-lazy-regex.patch)
Deleted:
bzr/repos/extra-i686/PKGBUILD
bzr/repos/extra-x86_64/PKGBUILD
-----------------------------------+
/PKGBUILD | 90 ++++++++++++++++++++++++++++++++++++
extra-i686/PKGBUILD | 41 ----------------
extra-i686/bzr-lazy-regex.patch | 20 ++++++++
extra-x86_64/PKGBUILD | 41 ----------------
extra-x86_64/bzr-lazy-regex.patch | 20 ++++++++
5 files changed, 130 insertions(+), 82 deletions(-)
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2017-02-04 19:22:53 UTC (rev 288044)
+++ extra-i686/PKGBUILD 2017-02-04 19:23:10 UTC (rev 288045)
@@ -1,41 +0,0 @@
-# $Id$
-# Maintainer : Maxime Gauduin <aluc...@archlinux.org>
-# Contributor: Hugo Doria <h...@archlinux.org>
-
-pkgname=bzr
-pkgver=2.7.0
-pkgrel=1
-pkgdesc='A decentralized revision control system (bazaar)'
-arch=('i686' 'x86_64')
-url='https://bazaar.canonical.com/'
-license=('GPL')
-depends=('python2')
-optdepends=('python2-paramiko: SFTP support')
-source=("https://launchpad.net/bzr/${pkgver%.*}/${pkgver}/+download/bzr-${pkgver}.tar.gz"{,.sig})
-sha256sums=('0d451227b705a0dd21d8408353fe7e44d3a5069e6c4c26e5f146f1314b8fdab3'
- 'SKIP')
-validpgpkeys=('84736900600FF95EF23513F52975A150DEF6218F') # Vincent Ladeuil
-
-prepare() {
- cd bzr-${pkgver}
-
- sed 's|man/man1|share/man/man1|' -i setup.py
- sed 's|/usr/bin/env python|/usr/bin/env python2|' -i
bzrlib/{plugins/bash_completion/bashcomp.py,tests/ssl_certs/create_ssls.py,patiencediff.py,_patiencediff_py.py}
-}
-
-build() {
- cd bzr-${pkgver}
-
- python2 setup.py build
-}
-
-package() {
- cd bzr-${pkgver}
-
- python2 setup.py install --prefix='/usr' --root="${pkgdir}" --optimize='1'
-
- install -dm 755 "${pkgdir}"/usr/share/bash-completion/completions
- install -m 644 contrib/bash/bzr
"${pkgdir}"/usr/share/bash-completion/completions/
-}
-
-# vim: ts=2 sw=2 et:
Copied: bzr/repos/extra-i686/PKGBUILD (from rev 288044, bzr/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2017-02-04 19:23:10 UTC (rev 288045)
@@ -0,0 +1,45 @@
+# $Id$
+# Maintainer : Maxime Gauduin <aluc...@archlinux.org>
+# Contributor: Hugo Doria <h...@archlinux.org>
+
+pkgname=bzr
+pkgver=2.7.0
+pkgrel=2
+pkgdesc='A decentralized revision control system (bazaar)'
+arch=('i686' 'x86_64')
+url='https://bazaar.canonical.com/'
+license=('GPL')
+depends=('python2')
+optdepends=('python2-paramiko: SFTP support')
+source=("https://launchpad.net/bzr/${pkgver%.*}/${pkgver}/+download/bzr-${pkgver}.tar.gz"{,.sig}
+ 'bzr-lazy-regex.patch')
+sha256sums=('0d451227b705a0dd21d8408353fe7e44d3a5069e6c4c26e5f146f1314b8fdab3'
+ 'SKIP'
+ 'b53c3dc8cba6f2c9758b61f0e9f40fc8452304e1fec15345e282dcd9d5657542')
+validpgpkeys=('84736900600FF95EF23513F52975A150DEF6218F') # Vincent Ladeuil
+
+prepare() {
+ cd bzr-${pkgver}
+
+ sed 's|man/man1|share/man/man1|' -i setup.py
+ sed 's|/usr/bin/env python|/usr/bin/env python2|' -i
bzrlib/{plugins/bash_completion/bashcomp.py,tests/ssl_certs/create_ssls.py,patiencediff.py,_patiencediff_py.py}
+
+ patch -Np0 -i ../bzr-lazy-regex.patch
+}
+
+build() {
+ cd bzr-${pkgver}
+
+ python2 setup.py build
+}
+
+package() {
+ cd bzr-${pkgver}
+
+ python2 setup.py install --prefix='/usr' --root="${pkgdir}" --optimize='1'
+
+ install -dm 755 "${pkgdir}"/usr/share/bash-completion/completions
+ install -m 644 contrib/bash/bzr
"${pkgdir}"/usr/share/bash-completion/completions/
+}
+
+# vim: ts=2 sw=2 et:
Copied: bzr/repos/extra-i686/bzr-lazy-regex.patch (from rev 288044,
bzr/trunk/bzr-lazy-regex.patch)
===================================================================
--- extra-i686/bzr-lazy-regex.patch (rev 0)
+++ extra-i686/bzr-lazy-regex.patch 2017-02-04 19:23:10 UTC (rev 288045)
@@ -0,0 +1,20 @@
+diff -u bzrlib/lazy_regex.py bzrlib/lazy_regex.py
+--- bzrlib/lazy_regex.py 2017-01-15 20:36:48 +0000
++++ bzrlib/lazy_regex.py 2017-01-30 09:08:25 +0000
+@@ -1,4 +1,4 @@
+-# Copyright (C) 2006 Canonical Ltd
++# Copyright (C) 2006, 2008-2011, 2017 Canonical Ltd
+ #
+ # This program is free software; you can redistribute it and/or modify
+ # it under the terms of the GNU General Public License as published by
+@@ -133,0 +134,10 @@
++
++
++# Some libraries calls re.finditer which fails it if receives a LazyRegex.
++if getattr(re, 'finditer', False):
++ def finditer_public(pattern, string, flags=0):
++ if isinstance(pattern, LazyRegex):
++ return pattern.finditer(string)
++ else:
++ return _real_re_compile(pattern, flags).finditer(string)
++ re.finditer = finditer_public
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2017-02-04 19:22:53 UTC (rev 288044)
+++ extra-x86_64/PKGBUILD 2017-02-04 19:23:10 UTC (rev 288045)
@@ -1,41 +0,0 @@
-# $Id$
-# Maintainer : Maxime Gauduin <aluc...@archlinux.org>
-# Contributor: Hugo Doria <h...@archlinux.org>
-
-pkgname=bzr
-pkgver=2.7.0
-pkgrel=1
-pkgdesc='A decentralized revision control system (bazaar)'
-arch=('i686' 'x86_64')
-url='https://bazaar.canonical.com/'
-license=('GPL')
-depends=('python2')
-optdepends=('python2-paramiko: SFTP support')
-source=("https://launchpad.net/bzr/${pkgver%.*}/${pkgver}/+download/bzr-${pkgver}.tar.gz"{,.sig})
-sha256sums=('0d451227b705a0dd21d8408353fe7e44d3a5069e6c4c26e5f146f1314b8fdab3'
- 'SKIP')
-validpgpkeys=('84736900600FF95EF23513F52975A150DEF6218F') # Vincent Ladeuil
-
-prepare() {
- cd bzr-${pkgver}
-
- sed 's|man/man1|share/man/man1|' -i setup.py
- sed 's|/usr/bin/env python|/usr/bin/env python2|' -i
bzrlib/{plugins/bash_completion/bashcomp.py,tests/ssl_certs/create_ssls.py,patiencediff.py,_patiencediff_py.py}
-}
-
-build() {
- cd bzr-${pkgver}
-
- python2 setup.py build
-}
-
-package() {
- cd bzr-${pkgver}
-
- python2 setup.py install --prefix='/usr' --root="${pkgdir}" --optimize='1'
-
- install -dm 755 "${pkgdir}"/usr/share/bash-completion/completions
- install -m 644 contrib/bash/bzr
"${pkgdir}"/usr/share/bash-completion/completions/
-}
-
-# vim: ts=2 sw=2 et:
Copied: bzr/repos/extra-x86_64/PKGBUILD (from rev 288044, bzr/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2017-02-04 19:23:10 UTC (rev 288045)
@@ -0,0 +1,45 @@
+# $Id$
+# Maintainer : Maxime Gauduin <aluc...@archlinux.org>
+# Contributor: Hugo Doria <h...@archlinux.org>
+
+pkgname=bzr
+pkgver=2.7.0
+pkgrel=2
+pkgdesc='A decentralized revision control system (bazaar)'
+arch=('i686' 'x86_64')
+url='https://bazaar.canonical.com/'
+license=('GPL')
+depends=('python2')
+optdepends=('python2-paramiko: SFTP support')
+source=("https://launchpad.net/bzr/${pkgver%.*}/${pkgver}/+download/bzr-${pkgver}.tar.gz"{,.sig}
+ 'bzr-lazy-regex.patch')
+sha256sums=('0d451227b705a0dd21d8408353fe7e44d3a5069e6c4c26e5f146f1314b8fdab3'
+ 'SKIP'
+ 'b53c3dc8cba6f2c9758b61f0e9f40fc8452304e1fec15345e282dcd9d5657542')
+validpgpkeys=('84736900600FF95EF23513F52975A150DEF6218F') # Vincent Ladeuil
+
+prepare() {
+ cd bzr-${pkgver}
+
+ sed 's|man/man1|share/man/man1|' -i setup.py
+ sed 's|/usr/bin/env python|/usr/bin/env python2|' -i
bzrlib/{plugins/bash_completion/bashcomp.py,tests/ssl_certs/create_ssls.py,patiencediff.py,_patiencediff_py.py}
+
+ patch -Np0 -i ../bzr-lazy-regex.patch
+}
+
+build() {
+ cd bzr-${pkgver}
+
+ python2 setup.py build
+}
+
+package() {
+ cd bzr-${pkgver}
+
+ python2 setup.py install --prefix='/usr' --root="${pkgdir}" --optimize='1'
+
+ install -dm 755 "${pkgdir}"/usr/share/bash-completion/completions
+ install -m 644 contrib/bash/bzr
"${pkgdir}"/usr/share/bash-completion/completions/
+}
+
+# vim: ts=2 sw=2 et:
Copied: bzr/repos/extra-x86_64/bzr-lazy-regex.patch (from rev 288044,
bzr/trunk/bzr-lazy-regex.patch)
===================================================================
--- extra-x86_64/bzr-lazy-regex.patch (rev 0)
+++ extra-x86_64/bzr-lazy-regex.patch 2017-02-04 19:23:10 UTC (rev 288045)
@@ -0,0 +1,20 @@
+diff -u bzrlib/lazy_regex.py bzrlib/lazy_regex.py
+--- bzrlib/lazy_regex.py 2017-01-15 20:36:48 +0000
++++ bzrlib/lazy_regex.py 2017-01-30 09:08:25 +0000
+@@ -1,4 +1,4 @@
+-# Copyright (C) 2006 Canonical Ltd
++# Copyright (C) 2006, 2008-2011, 2017 Canonical Ltd
+ #
+ # This program is free software; you can redistribute it and/or modify
+ # it under the terms of the GNU General Public License as published by
+@@ -133,0 +134,10 @@
++
++
++# Some libraries calls re.finditer which fails it if receives a LazyRegex.
++if getattr(re, 'finditer', False):
++ def finditer_public(pattern, string, flags=0):
++ if isinstance(pattern, LazyRegex):
++ return pattern.finditer(string)
++ else:
++ return _real_re_compile(pattern, flags).finditer(string)
++ re.finditer = finditer_public
