Date: Wednesday, November 23, 2022 @ 15:42:54
Author: alucryd
Revision: 462302
archrelease: copy trunk to extra-any
Added:
python-merge3/repos/extra-any/PKGBUILD
(from rev 462301, python-merge3/trunk/PKGBUILD)
python-merge3/repos/extra-any/keys/
Deleted:
python-merge3/repos/extra-any/PKGBUILD
python-merge3/repos/extra-any/keys/
----------+
PKGBUILD | 86 ++++++++++++++++++++++++++++++-------------------------------
1 file changed, 43 insertions(+), 43 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2022-11-23 15:42:44 UTC (rev 462301)
+++ PKGBUILD 2022-11-23 15:42:54 UTC (rev 462302)
@@ -1,43 +0,0 @@
-# Maintainer: Maxime Gauduin <[email protected]>
-# Contributor: Luis Martinez <[email protected]>
-# Contributor: Mark Wagie <[email protected]>
-
-pkgname=python-merge3
-pkgver=0.0.10
-pkgrel=1
-pkgdesc='Python implementation of 3-way merge'
-arch=(any)
-url=https://github.com/breezy-team/merge3
-license=(GPL2)
-depends=(python)
-makedepends=(
- git
- python-setuptools
-)
-_tag=c5922a23c7d6f1cdc1ee2c7b61b5e9455e24099e
-#source=(git+https://github.com/breezy-team/merge3.git?signed#tag=${_tag})
-source=(git+https://github.com/breezy-team/merge3.git#tag=${_tag})
-b2sums=(SKIP)
-validpgpkeys=(DC837EE14A7E37347E87061700806F2BD729A457) # Jelmer Vernooij
<[email protected]>
-
-pkgver() {
- cd merge3
- git describe --tags | sed 's/^v//'
-}
-
-build() {
- cd merge3
- python setup.py build
-}
-
-check() {
- cd merge3
- python -m unittest discover
-}
-
-package() {
- cd merge3
- python setup.py install --root="${pkgdir}" --optimize=1 --skip-build
-}
-
-# vim: ts=2 sw=2 et:
Copied: python-merge3/repos/extra-any/PKGBUILD (from rev 462301,
python-merge3/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2022-11-23 15:42:54 UTC (rev 462302)
@@ -0,0 +1,43 @@
+# Maintainer: Maxime Gauduin <[email protected]>
+# Contributor: Luis Martinez <[email protected]>
+# Contributor: Mark Wagie <[email protected]>
+
+pkgname=python-merge3
+pkgver=0.0.12
+pkgrel=1
+pkgdesc='Python implementation of 3-way merge'
+arch=(any)
+url=https://github.com/breezy-team/merge3
+license=(GPL2)
+depends=(python)
+makedepends=(
+ git
+ python-setuptools
+)
+_tag=685b23b38d911630fcb824739938f401a7d9291c
+#source=(git+https://github.com/breezy-team/merge3.git?signed#tag=${_tag})
+source=(git+https://github.com/breezy-team/merge3.git#tag=${_tag})
+b2sums=(SKIP)
+validpgpkeys=(DC837EE14A7E37347E87061700806F2BD729A457) # Jelmer Vernooij
<[email protected]>
+
+pkgver() {
+ cd merge3
+ git describe --tags | sed 's/^v//'
+}
+
+build() {
+ cd merge3
+ python setup.py build
+}
+
+check() {
+ cd merge3
+ python -m unittest discover
+}
+
+package() {
+ cd merge3
+ python setup.py install --root="${pkgdir}" --optimize=1 --skip-build
+}
+
+# vim: ts=2 sw=2 et:
