[arch-commits] Commit in kdeedu-ktouch (11 files)

Andrea Scarpino andrea at nymeria.archlinux.org
Fri Mar 14 08:20:40 UTC 2014 

    Date: Friday, March 14, 2014 @ 09:20:40
  Author: andrea
Revision: 207746

archrelease: copy trunk to extra-i686, extra-x86_64

Added:
  kdeedu-ktouch/repos/extra-i686/PKGBUILD
    (from rev 207745, kdeedu-ktouch/trunk/PKGBUILD)
  kdeedu-ktouch/repos/extra-i686/kdeedu-ktouch.install
    (from rev 207745, kdeedu-ktouch/trunk/kdeedu-ktouch.install)
  kdeedu-ktouch/repos/extra-i686/slovenian.patch
    (from rev 207745, kdeedu-ktouch/trunk/slovenian.patch)
  kdeedu-ktouch/repos/extra-x86_64/PKGBUILD
    (from rev 207745, kdeedu-ktouch/trunk/PKGBUILD)
  kdeedu-ktouch/repos/extra-x86_64/kdeedu-ktouch.install
    (from rev 207745, kdeedu-ktouch/trunk/kdeedu-ktouch.install)
  kdeedu-ktouch/repos/extra-x86_64/slovenian.patch
    (from rev 207745, kdeedu-ktouch/trunk/slovenian.patch)
Modified:
  kdeedu-ktouch/kde-unstable/PKGBUILD
Deleted:
  kdeedu-ktouch/repos/extra-i686/PKGBUILD
  kdeedu-ktouch/repos/extra-i686/kdeedu-ktouch.install
  kdeedu-ktouch/repos/extra-x86_64/PKGBUILD
  kdeedu-ktouch/repos/extra-x86_64/kdeedu-ktouch.install

------------------------------------------+
 /extra-i686/PKGBUILD                     |   39 +++++++++++++++++++++++++++++
 /extra-i686/kdeedu-ktouch.install        |   11 ++++++++
 /extra-x86_64/PKGBUILD                   |   39 +++++++++++++++++++++++++++++
 /extra-x86_64/kdeedu-ktouch.install      |   11 ++++++++
 kde-unstable/PKGBUILD                    |    4 +-
 repos/extra-i686/PKGBUILD                |   32 -----------------------
 repos/extra-i686/kdeedu-ktouch.install   |   11 --------
 repos/extra-i686/slovenian.patch         |   22 ++++++++++++++++
 repos/extra-x86_64/PKGBUILD              |   32 -----------------------
 repos/extra-x86_64/kdeedu-ktouch.install |   11 --------
 repos/extra-x86_64/slovenian.patch       |   22 ++++++++++++++++
 11 files changed, 146 insertions(+), 88 deletions(-)

Modified: kde-unstable/PKGBUILD
===================================================================
--- kde-unstable/PKGBUILD	2014-03-14 08:20:31 UTC (rev 207745)
+++ kde-unstable/PKGBUILD	2014-03-14 08:20:40 UTC (rev 207746)
@@ -2,7 +2,7 @@
 # Maintainer: Andrea Scarpino <andrea at archlinux.org>
 
 pkgname=kdeedu-ktouch
-pkgver=4.12.80
+pkgver=4.12.90
 pkgrel=1
 pkgdesc="Touch Typing Tutor"
 url="http://kde.org/applications/education/ktouch/"
@@ -13,7 +13,7 @@
 makedepends=('cmake' 'automoc4' 'mesa')
 install=${pkgname}.install
 source=("http://download.kde.org/unstable/${pkgver}/src/ktouch-${pkgver}.tar.xz")
-sha1sums=('a9829272b5023cd0989a9b61611eb24593f1ba04')
+sha1sums=('23653578a2c8c840cb29318412b4becd1b30c969')
 
 build() {
   cd "${srcdir}"

Deleted: repos/extra-i686/PKGBUILD
===================================================================
--- repos/extra-i686/PKGBUILD	2014-03-14 08:20:31 UTC (rev 207745)
+++ repos/extra-i686/PKGBUILD	2014-03-14 08:20:40 UTC (rev 207746)
@@ -1,32 +0,0 @@
-# $Id$
-# Maintainer: Andrea Scarpino <andrea at archlinux.org>
-
-pkgname=kdeedu-ktouch
-pkgver=4.12.3
-pkgrel=1
-pkgdesc="Touch Typing Tutor"
-url="http://kde.org/applications/education/ktouch/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdeedu')
-depends=('kdebase-runtime')
-makedepends=('cmake' 'automoc4' 'mesa')
-install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/ktouch-${pkgver}.tar.xz")
-sha1sums=('1fa7b166fe47d9895758417e717859625a043f0f')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../ktouch-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DKDE4_BUILD_TESTS=OFF \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}

Copied: kdeedu-ktouch/repos/extra-i686/PKGBUILD (from rev 207745, kdeedu-ktouch/trunk/PKGBUILD)
===================================================================
--- repos/extra-i686/PKGBUILD	                        (rev 0)
+++ repos/extra-i686/PKGBUILD	2014-03-14 08:20:40 UTC (rev 207746)
@@ -0,0 +1,39 @@
+# $Id$
+# Maintainer: Andrea Scarpino <andrea at archlinux.org>
+
+pkgname=kdeedu-ktouch
+pkgver=4.12.3
+pkgrel=2
+pkgdesc="Touch Typing Tutor"
+url="http://kde.org/applications/education/ktouch/"
+arch=('i686' 'x86_64')
+license=('GPL' 'LGPL' 'FDL')
+groups=('kde' 'kdeedu')
+depends=('kdebase-runtime')
+makedepends=('cmake' 'automoc4' 'mesa')
+install=${pkgname}.install
+source=("http://download.kde.org/stable/${pkgver}/src/ktouch-${pkgver}.tar.xz"
+        'slovenian.patch')
+sha1sums=('1fa7b166fe47d9895758417e717859625a043f0f'
+          '8bc82fae5ae871253bc11c4778884966d6d4b58a')
+
+prepare() {
+  mkdir build
+
+  cd ktouch-${pkgver}
+  patch -p1 -i "${srcdir}"/slovenian.patch
+}
+
+build() {
+  cd build
+  cmake ../ktouch-${pkgver} \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DKDE4_BUILD_TESTS=OFF \
+    -DCMAKE_INSTALL_PREFIX=/usr
+  make
+}
+
+package() {
+  cd build
+  make DESTDIR="${pkgdir}" install
+}

Deleted: repos/extra-i686/kdeedu-ktouch.install
===================================================================
--- repos/extra-i686/kdeedu-ktouch.install	2014-03-14 08:20:31 UTC (rev 207745)
+++ repos/extra-i686/kdeedu-ktouch.install	2014-03-14 08:20:40 UTC (rev 207746)
@@ -1,11 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}

Copied: kdeedu-ktouch/repos/extra-i686/kdeedu-ktouch.install (from rev 207745, kdeedu-ktouch/trunk/kdeedu-ktouch.install)
===================================================================
--- repos/extra-i686/kdeedu-ktouch.install	                        (rev 0)
+++ repos/extra-i686/kdeedu-ktouch.install	2014-03-14 08:20:40 UTC (rev 207746)
@@ -0,0 +1,11 @@
+post_install() {
+	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+}
+
+post_upgrade() {
+	post_install
+}
+
+post_remove() {
+	post_install
+}

Copied: kdeedu-ktouch/repos/extra-i686/slovenian.patch (from rev 207745, kdeedu-ktouch/trunk/slovenian.patch)
===================================================================
--- repos/extra-i686/slovenian.patch	                        (rev 0)
+++ repos/extra-i686/slovenian.patch	2014-03-14 08:20:40 UTC (rev 207746)
@@ -0,0 +1,22 @@
+commit e787d72ada78a1dac1654c4d3d530f50334e7846
+Author: Sebastian Gottfried <sebastiangottfried at web.de>
+Date:   Mon Mar 10 11:51:31 2014 +0100
+
+    data: remove an untypable charaber from the Slovanian course
+    
+    BUG: 331945
+    FIXED-IN: 4.12.4
+
+diff --git a/data/courses/si.xml b/data/courses/si.xml
+index fc5f3c2..07feeb1 100644
+--- a/data/courses/si.xml
++++ b/data/courses/si.xml
+@@ -201,7 +201,7 @@ odejo ne&#x10D;kinjin na&#x10D;&#x10D;ajo oljili oskalek
+ naslednika na&#x10D;njajo&#x10D; noska oson&#x10D;a neodlo&#x10D;i&#x10D;ne
+ nalijejo neolikank nanos oslinjeni ni&#x10D;li
+ ojekleni nenadni ondi nadela neonkine okajen
+-ni&#x10D;a nasekala naslada one&#x10D;dena neonka neidili&#xFFFD;n
++ni&#x10D;a nasekala naslada one&#x10D;dena neonka neidilin
+ nasi&#x10D;nje na&#x10D;ne odsko&#x10D;le na&#x10D;kana osedlalo
+ naslonijo oken&#x10D;a naslonilo okisalo odnosni
+ naseljenkina odlo&#x10D;la nasilnik nedojena nenaklonjeni

Deleted: repos/extra-x86_64/PKGBUILD
===================================================================
--- repos/extra-x86_64/PKGBUILD	2014-03-14 08:20:31 UTC (rev 207745)
+++ repos/extra-x86_64/PKGBUILD	2014-03-14 08:20:40 UTC (rev 207746)
@@ -1,32 +0,0 @@
-# $Id$
-# Maintainer: Andrea Scarpino <andrea at archlinux.org>
-
-pkgname=kdeedu-ktouch
-pkgver=4.12.3
-pkgrel=1
-pkgdesc="Touch Typing Tutor"
-url="http://kde.org/applications/education/ktouch/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdeedu')
-depends=('kdebase-runtime')
-makedepends=('cmake' 'automoc4' 'mesa')
-install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/ktouch-${pkgver}.tar.xz")
-sha1sums=('1fa7b166fe47d9895758417e717859625a043f0f')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../ktouch-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DKDE4_BUILD_TESTS=OFF \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}

Copied: kdeedu-ktouch/repos/extra-x86_64/PKGBUILD (from rev 207745, kdeedu-ktouch/trunk/PKGBUILD)
===================================================================
--- repos/extra-x86_64/PKGBUILD	                        (rev 0)
+++ repos/extra-x86_64/PKGBUILD	2014-03-14 08:20:40 UTC (rev 207746)
@@ -0,0 +1,39 @@
+# $Id$
+# Maintainer: Andrea Scarpino <andrea at archlinux.org>
+
+pkgname=kdeedu-ktouch
+pkgver=4.12.3
+pkgrel=2
+pkgdesc="Touch Typing Tutor"
+url="http://kde.org/applications/education/ktouch/"
+arch=('i686' 'x86_64')
+license=('GPL' 'LGPL' 'FDL')
+groups=('kde' 'kdeedu')
+depends=('kdebase-runtime')
+makedepends=('cmake' 'automoc4' 'mesa')
+install=${pkgname}.install
+source=("http://download.kde.org/stable/${pkgver}/src/ktouch-${pkgver}.tar.xz"
+        'slovenian.patch')
+sha1sums=('1fa7b166fe47d9895758417e717859625a043f0f'
+          '8bc82fae5ae871253bc11c4778884966d6d4b58a')
+
+prepare() {
+  mkdir build
+
+  cd ktouch-${pkgver}
+  patch -p1 -i "${srcdir}"/slovenian.patch
+}
+
+build() {
+  cd build
+  cmake ../ktouch-${pkgver} \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DKDE4_BUILD_TESTS=OFF \
+    -DCMAKE_INSTALL_PREFIX=/usr
+  make
+}
+
+package() {
+  cd build
+  make DESTDIR="${pkgdir}" install
+}

Deleted: repos/extra-x86_64/kdeedu-ktouch.install
===================================================================
--- repos/extra-x86_64/kdeedu-ktouch.install	2014-03-14 08:20:31 UTC (rev 207745)
+++ repos/extra-x86_64/kdeedu-ktouch.install	2014-03-14 08:20:40 UTC (rev 207746)
@@ -1,11 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}

Copied: kdeedu-ktouch/repos/extra-x86_64/kdeedu-ktouch.install (from rev 207745, kdeedu-ktouch/trunk/kdeedu-ktouch.install)
===================================================================
--- repos/extra-x86_64/kdeedu-ktouch.install	                        (rev 0)
+++ repos/extra-x86_64/kdeedu-ktouch.install	2014-03-14 08:20:40 UTC (rev 207746)
@@ -0,0 +1,11 @@
+post_install() {
+	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+}
+
+post_upgrade() {
+	post_install
+}
+
+post_remove() {
+	post_install
+}

Copied: kdeedu-ktouch/repos/extra-x86_64/slovenian.patch (from rev 207745, kdeedu-ktouch/trunk/slovenian.patch)
===================================================================
--- repos/extra-x86_64/slovenian.patch	                        (rev 0)
+++ repos/extra-x86_64/slovenian.patch	2014-03-14 08:20:40 UTC (rev 207746)
@@ -0,0 +1,22 @@
+commit e787d72ada78a1dac1654c4d3d530f50334e7846
+Author: Sebastian Gottfried <sebastiangottfried at web.de>
+Date:   Mon Mar 10 11:51:31 2014 +0100
+
+    data: remove an untypable charaber from the Slovanian course
+    
+    BUG: 331945
+    FIXED-IN: 4.12.4
+
+diff --git a/data/courses/si.xml b/data/courses/si.xml
+index fc5f3c2..07feeb1 100644
+--- a/data/courses/si.xml
++++ b/data/courses/si.xml
+@@ -201,7 +201,7 @@ odejo ne&#x10D;kinjin na&#x10D;&#x10D;ajo oljili oskalek
+ naslednika na&#x10D;njajo&#x10D; noska oson&#x10D;a neodlo&#x10D;i&#x10D;ne
+ nalijejo neolikank nanos oslinjeni ni&#x10D;li
+ ojekleni nenadni ondi nadela neonkine okajen
+-ni&#x10D;a nasekala naslada one&#x10D;dena neonka neidili&#xFFFD;n
++ni&#x10D;a nasekala naslada one&#x10D;dena neonka neidilin
+ nasi&#x10D;nje na&#x10D;ne odsko&#x10D;le na&#x10D;kana osedlalo
+ naslonijo oken&#x10D;a naslonilo okisalo odnosni
+ naseljenkina odlo&#x10D;la nasilnik nedojena nenaklonjeni

More information about the arch-commits mailing list