[arch-commits] Commit in keytouch/repos (5 files)

[Eric Belanger]

    Date: Sunday, July 20, 2008 @ 22:28:00
  Author: eric
Revision: 5811

Merged revisions 3502-5810 via svnmerge from 
svn+ssh://svn.archlinux.org/home/svn-packages/keytouch/trunk

........
  r3504 | eric | 2008-06-23 00:29:57 -0400 (Mon, 23 Jun 2008) | 1 line
  
  adding Id tag
........
  r5810 | eric | 2008-07-20 22:27:46 -0400 (Sun, 20 Jul 2008) | 2 lines
  
  upgpkg: keytouch 2.4.1-1
      upstream update, removed old patch
........

Modified:
  keytouch/repos/extra-x86_64/	(properties)
  keytouch/repos/extra-x86_64/ChangeLog
  keytouch/repos/extra-x86_64/PKGBUILD
  keytouch/repos/extra-x86_64/keytouch.install
Deleted:
  keytouch/repos/extra-x86_64/keytouch-2.4.0-glibc28.patch

------------------------------+
 ChangeLog                    |    6 +++++
 PKGBUILD                     |   16 +++++---------
 keytouch-2.4.0-glibc28.patch |   44 -----------------------------------------
 keytouch.install             |    4 ---
 4 files changed, 12 insertions(+), 58 deletions(-)


Property changes on: keytouch/repos/extra-x86_64
___________________________________________________________________
Name: svnmerge-integrated
   - /keytouch/trunk:1-3501
   + /keytouch/trunk:1-5810

Modified: extra-x86_64/ChangeLog
===================================================================
--- extra-x86_64/ChangeLog	2008-07-21 02:27:46 UTC (rev 5810)
+++ extra-x86_64/ChangeLog	2008-07-21 02:28:00 UTC (rev 5811)
@@ -1,3 +1,9 @@
+2008-07-20  Eric Belanger  <eric at archlinux.org>
+
+	* keytouch 2.4.1-1
+	* Upstream update
+	* Removed unnecessary post-upgrade message
+	
 2008-06-16  Eric Belanger  <eric at archlinux.org>
 
 	* keytouch 2.4.0-1

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2008-07-21 02:27:46 UTC (rev 5810)
+++ extra-x86_64/PKGBUILD	2008-07-21 02:28:00 UTC (rev 5811)
@@ -3,7 +3,7 @@
 # Contributor: mouse256 & AndyRTR
 
 pkgname=keytouch
-pkgver=2.4.0
+pkgver=2.4.1
 pkgrel=1
 pkgdesc="A program which allows you to easily configure the extra function keys of your keyboard"
 arch=('i686' 'x86_64')
@@ -14,20 +14,16 @@
 options=('!makeflags')
 install=keytouch.install
 source=(http://downloads.sourceforge.net/sourceforge/keytouch/${pkgname}-${pkgver}.tar.gz \
-        keytouch.daemon keytouch.desktop Xsession keytouch-2.4.0-glibc28.patch)
-md5sums=('e5e93f94f74469d1a6dc37548ec15eba' '80dbcf0dfb9d4d4d2c2d7932ca551040'\
-         'c5ffe28988dc74fae812ffe204f8883b' '795430001f4fdb6691d0e93b09a241a9'\
-         '7153d15b684d2f56e9f7f732a6f40498')
-sha1sums=('6b9aaa6cd60ff0ba42c39d325f2d80e51bc1e968'
+        keytouch.daemon keytouch.desktop Xsession)
+md5sums=('c3a917ae9666c9649d43d9aa09ecc96a' '80dbcf0dfb9d4d4d2c2d7932ca551040'\
+         'c5ffe28988dc74fae812ffe204f8883b' '795430001f4fdb6691d0e93b09a241a9')
+sha1sums=('f1f26dc95c21afd404aebe2b1066e75c8313ca80'
           'cd87632574349bd7c9ac00b7b8a8711000d43569'
           '5bac2f62f1ac26caa32da02a8075dc090d981cfb'
-          '960b2fa51cfdeb2bc3fa7e086dc9f3a3be483dff'
-          'ea66f7c2517d8c4d309c08bd8d036c591df708bc')
+          '960b2fa51cfdeb2bc3fa7e086dc9f3a3be483dff')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
-  patch -p0 < ../keytouch-2.4.0-glibc28.patch || return 1
-  autoreconf
   ./configure --prefix=/usr --sysconfdir=/etc || return 1
   make  || return 1
   install -d ${pkgdir}/etc/{rc.d,X11/Xsession.d} || return 1

Deleted: extra-x86_64/keytouch-2.4.0-glibc28.patch
===================================================================
--- extra-x86_64/keytouch-2.4.0-glibc28.patch	2008-07-21 02:27:46 UTC (rev 5810)
+++ extra-x86_64/keytouch-2.4.0-glibc28.patch	2008-07-21 02:28:00 UTC (rev 5811)
@@ -1,44 +0,0 @@
---- keytouch-acpid/Makefile.am
-+++ keytouch-acpid/Makefile.am
-@@ -3,7 +3,8 @@
- 
- AM_CPPFLAGS =	-I. -I../string_to_keycode/ -I../mxml \
- 		-DSYSCONF_DIR=\""$(sysconfdir)"\" \
--		-DPACKAGE_DATA_DIR=\""$(datadir)"\"
-+		-DPACKAGE_DATA_DIR=\""$(datadir)"\" \
-+		-D_GNU_SOURCE # struct ucred
- 
- AM_CFLAGS=@CFLAGS@ @X_CFLAGS@ -Wall
- 
---- keytouch-keyboard/src/check_syntax.c
-+++ keytouch-keyboard/src/check_syntax.c
-@@ -29,10 +29,10 @@
-     You can contact me at: marvinr(at)users(dot)sf(dot)net
-     (replace (at) by @ and (dot) by .)
- -----------------------------------------------------------------------------------*/
-+#define _XOPEN_SOURCE /* strptime */
- #include <stdlib.h>
- #include <stdio.h>
- #include <string.h>
--#define _XOPEN_SOURCE /* glibc2 needs this */
- #include <time.h>
- 
- #include <mxml.h>
---- keytouch-keyboard/src/config.c
-+++ keytouch-keyboard/src/config.c
-@@ -37,6 +37,7 @@
-     You can contact me at: marvinr(at)users(dot)sf(dot)net
-     (replace (at) by @ and (dot) by .)
- -----------------------------------------------------------------------------------*/
-+#define _GNU_SOURCE /* strptime, scandir */
- #include <stdlib.h>
- #include <dirent.h>
- #include <dlfcn.h>
-@@ -45,7 +46,6 @@
- #include <unistd.h>
- #include <string.h>
- #include <stdio.h>
--#define _GNU_SOURCE /* glibc2 needs this */
- #include <time.h>
- 
- #include <mxml.h>

Modified: extra-x86_64/keytouch.install
===================================================================
--- extra-x86_64/keytouch.install	2008-07-21 02:27:46 UTC (rev 5810)
+++ extra-x86_64/keytouch.install	2008-07-21 02:28:00 UTC (rev 5811)
@@ -12,7 +12,3 @@
   or install keytouch-editor to make your custom keyboard file.
 EOF
 }
-
-post_upgrade() {
-  post_install $1
-}