--- PKGBUILD.old        2012-05-28 09:13:26.576786096 +0000
+++ PKGBUILD    2012-05-28 09:13:07.813162255 +0000
@@ -2,13 +2,13 @@
 # Maintainer: Artyom Olshevskiy <siasia@siasia>
 pkgname=java-service-wrapper
 pkgver=3.5.14
-pkgrel=2
+pkgrel=3
 pkgdesc="Enables a Java Application to be run as a Windows Service or Unix Daemon"
 url="http://wrapper.tanukisoftware.com/"
 arch=('i686' 'x86_64')
 license=('GPL')
 depends=(java-runtime)
-makedepends=(apache-ant)
+makedepends=(apache-ant junit)
 conflicts=()
 replaces=()
 backup=()
@@ -20,12 +20,14 @@
        cd $srcdir/wrapper_${pkgver}_src
        [ "$CARCH" = "i686" ] && ./build32.sh
        [ "$CARCH" = "x86_64" ] && ./build64.sh
-}
-package() {
-       mkdir -p $pkgdir/usr/share/java/servicewrapper
-       cd $pkgdir/usr/share/java/servicewrapper
-       cp $srcdir/wrapper_${pkgver}_src/src/bin/sh.script.in .
-       cp $srcdir/wrapper_${pkgver}_src/bin/wrapper .
-       cp $srcdir/wrapper_${pkgver}_src/lib/wrapper.jar .
-       cp $srcdir/wrapper_${pkgver}_src/lib/libwrapper.so .
+       install -d $pkgdir/usr/share/doc/java-service-wrapper
+       install -Dm644 $srcdir/wrapper_${pkgver}_src/README* $pkgdir/usr/share/doc/java-service-wrapper
+       install -Dm644 $srcdir/wrapper_${pkgver}_src/conf/wrapper.conf $pkgdir/usr/share/doc/java-service-wrapper
+       install -Dm644 $srcdir/wrapper_${pkgver}_src/doc/index.html $pkgdir/usr/share/doc/java-service-wrapper
+       install -Dm644 $srcdir/wrapper_${pkgver}_src/doc/revisions.txt $pkgdir/usr/share/doc/java-service-wrapper/changelog
+       install -m644 $srcdir/wrapper_${pkgver}_src/doc/wrapper-community-license-1.1.txt $pkgdir/usr/share/doc/java-service-wrapper/LICENSE
+       install -m644 $srcdir/wrapper_${pkgver}_src/src/bin/sh.script.in $pkgdir/usr/share/doc/java-service-wrapper
+       install -Dm755 $srcdir/wrapper_${pkgver}_src/bin/wrapper $pkgdir/usr/sbin/wrapper
+       install -Dm644 $srcdir/wrapper_${pkgver}_src/lib/wrapper.jar $pkgdir/usr/share/java/wrapper.jar
+       install -Dm644 $srcdir/wrapper_${pkgver}_src/lib/libwrapper.so $pkgdir/usr/lib/libwrapper.so
 }