[arch-commits] Commit in libgnomekbd/repos (3 files)

[Jan de Groot]

    Date: Saturday, August 2, 2008 @ 17:59:01
  Author: jgc
Revision: 7552

Merged revisions 2-7551 via svnmerge from 
svn+ssh://svn.archlinux.org/home/svn-packages/libgnomekbd/trunk

........
  r356 | aaron | 2008-04-18 22:56:27 +0000 (Fri, 18 Apr 2008) | 1 line
  
  Added svn:keywords to all PKGBUILDs
........
  r7551 | jgc | 2008-08-02 21:58:50 +0000 (Sat, 02 Aug 2008) | 2 lines
  
  upgpkg: libgnomekbd 2.22.0-2
      Remove call to gtk-update-icon-cache
........

Modified:
  libgnomekbd/repos/extra-i686/	(properties)
  libgnomekbd/repos/extra-i686/PKGBUILD
  libgnomekbd/repos/extra-i686/libgnomekbd.install

---------------------+
 PKGBUILD            |    7 ++-----
 libgnomekbd.install |    5 -----
 2 files changed, 2 insertions(+), 10 deletions(-)


Property changes on: libgnomekbd/repos/extra-i686
___________________________________________________________________
Name: svnmerge-integrated
   - /libgnomekbd/trunk:1
   + /libgnomekbd/trunk:1-7551

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2008-08-02 21:58:50 UTC (rev 7551)
+++ extra-i686/PKGBUILD	2008-08-02 21:59:01 UTC (rev 7552)
@@ -3,12 +3,12 @@
 
 pkgname=libgnomekbd
 pkgver=2.22.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Gnome keyboard library"
 url="http://gswitchit.sourceforge.net"
 arch=(i686 x86_64)
 license=('LGPL')
-depends=('libxklavier>=3.5' 'libgnomeui>=2.22.01')
+depends=('libxklavier>=3.6' 'libgnomeui>=2.22.1')
 makedepends=('perlxml' 'pkgconfig')
 options=('!libtool' '!emptydirs')
 install=libgnomekbd.install
@@ -22,9 +22,6 @@
   make || return 1
   make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR=${startdir}/pkg install || return 1
 
-  # broken makefiles...
-  #rm -f ${startdir}/pkg/usr/lib/*.a
-
   mkdir -p ${startdir}/pkg/usr/share/gconf/schemas
   gconf-merge-schema ${startdir}/pkg/usr/share/gconf/schemas/${pkgname}.schemas ${startdir}/pkg/etc/gconf/schemas/*.schemas || return 1
   rm -f ${startdir}/pkg/etc/gconf/schemas/*.schemas

Modified: extra-i686/libgnomekbd.install
===================================================================
--- extra-i686/libgnomekbd.install	2008-08-02 21:58:50 UTC (rev 7551)
+++ extra-i686/libgnomekbd.install	2008-08-02 21:59:01 UTC (rev 7552)
@@ -2,7 +2,6 @@
 
 post_install() {
   usr/sbin/gconfpkg --install ${pkgname}
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
 }
 
 pre_upgrade() {
@@ -16,7 +15,3 @@
 pre_remove() {
   usr/sbin/gconfpkg --uninstall ${pkgname}
 }
-
-post_remove() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}