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

[Jan de Groot]

    Date: Sunday, June 1, 2008 @ 15:57:57
  Author: jgc
Revision: 2403

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

........
  r356 | aaron | 2008-04-18 22:56:27 +0000 (Fri, 18 Apr 2008) | 1 line
  
  Added svn:keywords to all PKGBUILDs
........
  r2402 | jgc | 2008-06-01 19:57:44 +0000 (Sun, 01 Jun 2008) | 1 line
  
  upgpkg: devhelp 0.19.1-1
........

Modified:
  devhelp/repos/extra-x86_64/	(properties)
  devhelp/repos/extra-x86_64/PKGBUILD
  devhelp/repos/extra-x86_64/devhelp.install

-----------------+
 PKGBUILD        |   25 +++++++++++--------------
 devhelp.install |    5 -----
 2 files changed, 11 insertions(+), 19 deletions(-)


Property changes on: devhelp/repos/extra-x86_64
___________________________________________________________________
Name: svnmerge-integrated
   - /devhelp/trunk:1
   + /devhelp/trunk:1-2402

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2008-06-01 19:57:44 UTC (rev 2402)
+++ extra-x86_64/PKGBUILD	2008-06-01 19:57:57 UTC (rev 2403)
@@ -3,32 +3,29 @@
 # Contributor: Link Dupont <link at subpop.net>
 
 pkgname=devhelp
-pkgver=0.18
-pkgrel=2
+pkgver=0.19.1
+pkgrel=1
 pkgdesc="API documentation browser for GNOME"
 arch=(i686 x86_64)
 license=('GPL')
 url="http://www.imendio.com/projects/devhelp/"
-depends=('gconf>=2.20.1' 'libglade>=2.6.2' 'libwnck>=2.20.3' 'xulrunner>=1.8.1.11' 'desktop-file-utils>=0.14-1')
-makedepends=('perlxml>=2.36-1' 'pkgconfig')
+depends=('gconf>=2.20.1' 'libglade>=2.6.2' 'libwnck>=2.22.1' 'xulrunner>=1.8.1.12' 'desktop-file-utils')
+makedepends=('perlxml' 'pkgconfig')
 options=('!libtool' '!emptydirs')
 install="devhelp.install"
-source=(http://ftp.gnome.org/pub/GNOME/sources/devhelp/0.18/devhelp-${pkgver}.tar.bz2)
-md5sums=('004e038092d39ddb0abb748d89b7ecf6')
+source=(http://ftp.gnome.org/pub/GNOME/sources/devhelp/0.19/devhelp-${pkgver}.tar.bz2)
+md5sums=('6c12a272a94ac9cfc1dc6234590b46d8')
 
 build() {
   [ -z "${MOZ_PLUGIN_PATH}" ] && . /etc/profile.d/mozilla-common.sh
 
   cd ${startdir}/src/devhelp-${pkgver}
-  #aclocal -I ./m4
-  #autoconf
-  #automake
   ./configure --prefix=/usr --sysconfdir=/etc \
-              --localstatedir=/var --disable-static
-  make LDFLAGS+="-R /opt/mozilla/lib/xulrunner" || return 1
-  make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR=${startdir}/pkg install
+              --localstatedir=/var --disable-static || return 1
+  make LDFLAGS+="-R /usr/lib/xulrunner" || return 1
+  make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR=${startdir}/pkg install || return 1
 
-  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
+  install -m755 -d ${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-x86_64/devhelp.install
===================================================================
--- extra-x86_64/devhelp.install	2008-06-01 19:57:44 UTC (rev 2402)
+++ extra-x86_64/devhelp.install	2008-06-01 19:57:57 UTC (rev 2403)
@@ -22,8 +22,3 @@
   update-desktop-database -q
   gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
 }
-
-op=$1
-shift
-
-$op $*