[arch-commits] Commit in translate-toolkit/repos/extra-any (4 files)

[Andrea Scarpino]

    Date: Thursday, January 12, 2012 @ 16:06:39
  Author: andrea
Revision: 146543

archrelease: copy trunk to extra-any

Added:
  translate-toolkit/repos/extra-any/PKGBUILD
    (from rev 146542, translate-toolkit/trunk/PKGBUILD)
  translate-toolkit/repos/extra-any/fix-locale.patch
    (from rev 146542, translate-toolkit/trunk/fix-locale.patch)
Deleted:
  translate-toolkit/repos/extra-any/PKGBUILD
  translate-toolkit/repos/extra-any/fix-locale.patch

------------------+
 PKGBUILD         |   59 +++++++++++++++++++++++++++--------------------------
 fix-locale.patch |   56 +++++++++++++++++++++++++-------------------------
 2 files changed, 59 insertions(+), 56 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2012-01-12 21:06:24 UTC (rev 146542)
+++ PKGBUILD	2012-01-12 21:06:39 UTC (rev 146543)
@@ -1,28 +0,0 @@
-# $Id$
-# Maintainer: Andrea Scarpino <andrea at archlinux.org>
-# Contributor: Jaroslav Lichtblau <dragonlord at aur.archlinux.org>
-# Contributor: Hugo Doria <hugodoria at gmail.com>
-
-pkgname=translate-toolkit
-pkgver=1.9.0
-pkgrel=2
-pkgdesc="A toolkit to convert between various different translation formats, help process and validate localisations"
-arch=('any')
-url="http://translate.sourceforge.net/wiki/toolkit/index"
-license=('GPL')
-depends=('bash' 'python-lxml')
-optdepends=('python2-iniparse: to use ini2po script')
-source=("http://downloads.sourceforge.net/translate/${pkgname}-${pkgver}.tar.bz2"
-        'fix-locale.patch')
-md5sums=('6106bb27887a77c056bfa7d2fd89204d'
-         'dc40fb26dd7905800abafad9041d98f3')
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  sed -i -e "s|#![ ]*/usr/bin/python$|#!/usr/bin/python2|" \
-    -e "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" \
-    $(find . -name '*.py')
-
-  python2 setup.py install --root="${pkgdir}" --optimize=1
-}

Copied: translate-toolkit/repos/extra-any/PKGBUILD (from rev 146542, translate-toolkit/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2012-01-12 21:06:39 UTC (rev 146543)
@@ -0,0 +1,31 @@
+# $Id$
+# Maintainer: Andrea Scarpino <andrea at archlinux.org>
+# Contributor: Jaroslav Lichtblau <dragonlord at aur.archlinux.org>
+# Contributor: Hugo Doria <hugodoria at gmail.com>
+
+pkgname=translate-toolkit
+pkgver=1.9.0
+pkgrel=3
+pkgdesc="A toolkit to convert between various different translation formats, help process and validate localisations"
+arch=('any')
+url="http://translate.sourceforge.net/wiki/toolkit/index"
+license=('GPL')
+depends=('bash' 'python-lxml')
+optdepends=('python2-iniparse: to use ini2po script')
+source=("http://downloads.sourceforge.net/translate/${pkgname}-${pkgver}.tar.bz2"
+        'fix-locale.patch')
+md5sums=('6106bb27887a77c056bfa7d2fd89204d'
+         'dc40fb26dd7905800abafad9041d98f3')
+
+package() {
+  # FS#27907
+  cd "${srcdir}/${pkgname}-${pkgver}"/translate
+  patch -p0 -i "${srcdir}"/fix-locale.patch
+
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  sed -i -e "s|#![ ]*/usr/bin/python$|#!/usr/bin/python2|" \
+    -e "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" \
+    $(find . -name '*.py')
+
+  python2 setup.py install --root="${pkgdir}" --optimize=1
+}

Deleted: fix-locale.patch
===================================================================
--- fix-locale.patch	2012-01-12 21:06:24 UTC (rev 146542)
+++ fix-locale.patch	2012-01-12 21:06:39 UTC (rev 146543)
@@ -1,28 +0,0 @@
-Index: storage/statsdb.py
-===================================================================
---- storage/statsdb.py	(revision 17950)
-+++ storage/statsdb.py	(working copy)
-@@ -468,9 +468,10 @@
-         unconditionally."""
-         self.cur.execute("""DELETE FROM files WHERE
-             path=?;""", (realpath,))
--        self.cur.execute("""INSERT INTO files
-+        self.cur.execute("""iNSERT INTO files
-             (fileid, path, st_mtime, st_size, toolkitbuild) values (NULL, ?, ?, ?, ?);""",
-             (realpath, mod_info[0], mod_info[1], toolkitversion.build))
-+        # Unusual capitalisation intended. See bug 2073.
-         fileid = self.cur.lastrowid
-         self.cur.execute("""DELETE FROM units WHERE
-             fileid=?""", (fileid,))
-@@ -628,9 +629,10 @@
-         configid = self._getstoredcheckerconfig(checker)
-         if configid:
-             return configid
--        self.cur.execute("""INSERT INTO checkerconfigs
-+        self.cur.execute("""iNSERT INTO checkerconfigs
-             (configid, config) values (NULL, ?);""",
-             (str(checker.config.__dict__),))
-+        # Unusual capitalisation intended. See bug 2073.
-         return self.cur.lastrowid
- 
-     def filechecks(self, filename, checker, store=None):

Copied: translate-toolkit/repos/extra-any/fix-locale.patch (from rev 146542, translate-toolkit/trunk/fix-locale.patch)
===================================================================
--- fix-locale.patch	                        (rev 0)
+++ fix-locale.patch	2012-01-12 21:06:39 UTC (rev 146543)
@@ -0,0 +1,28 @@
+Index: storage/statsdb.py
+===================================================================
+--- storage/statsdb.py	(revision 17950)
++++ storage/statsdb.py	(working copy)
+@@ -468,9 +468,10 @@
+         unconditionally."""
+         self.cur.execute("""DELETE FROM files WHERE
+             path=?;""", (realpath,))
+-        self.cur.execute("""INSERT INTO files
++        self.cur.execute("""iNSERT INTO files
+             (fileid, path, st_mtime, st_size, toolkitbuild) values (NULL, ?, ?, ?, ?);""",
+             (realpath, mod_info[0], mod_info[1], toolkitversion.build))
++        # Unusual capitalisation intended. See bug 2073.
+         fileid = self.cur.lastrowid
+         self.cur.execute("""DELETE FROM units WHERE
+             fileid=?""", (fileid,))
+@@ -628,9 +629,10 @@
+         configid = self._getstoredcheckerconfig(checker)
+         if configid:
+             return configid
+-        self.cur.execute("""INSERT INTO checkerconfigs
++        self.cur.execute("""iNSERT INTO checkerconfigs
+             (configid, config) values (NULL, ?);""",
+             (str(checker.config.__dict__),))
++        # Unusual capitalisation intended. See bug 2073.
+         return self.cur.lastrowid
+ 
+     def filechecks(self, filename, checker, store=None):