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

[Giovanni Scafora]

    Date: Sunday, December 14, 2008 @ 21:22:39
  Author: giovanni
Revision: 21696

Merged revisions 5295,19478 via svnmerge from 
svn+ssh://archlinux.org/srv/svn-packages/jabberd/trunk

........
  r5295 | eric | 2008-07-14 17:52:03 -0700 (lun, 14 lug 2008) | 2 lines
  
  upgpkg: jabberd 2.0s11-7
      rebuilt against correct db version - 4.7 (close FS#10909), added license, FSH man pages
........
  r19478 | simo | 2008-11-23 19:48:14 -0800 (dom, 23 nov 2008) | 1 line
  
  FS#12220 - fix from ghost1227
........

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

-----------------+
 PKGBUILD        |    7 ++++---
 jabberd.install |   16 ++++++++--------
 2 files changed, 12 insertions(+), 11 deletions(-)


Property changes on: jabberd/repos/extra-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /jabberd/trunk:1-3854
   + /jabberd/trunk:1-21695

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2008-12-15 02:17:02 UTC (rev 21695)
+++ extra-x86_64/PKGBUILD	2008-12-15 02:22:39 UTC (rev 21696)
@@ -4,10 +4,11 @@
 
 pkgname=jabberd
 pkgver=2.0s11
-pkgrel=6
+pkgrel=7
 pkgdesc="Jabber protocol server."
 arch=(i686 x86_64)
 url="http://jabberd.jabberstudio.org"
+license=('GPL')
 depends=('openssl' 'pam>=1.0.1-2' 'db>=4.7' 'perl' 'libidn' 'bash' 'mysql' 'libmysqlclient')
 backup=(etc/jabberd/c2s.xml etc/jabberd/jabberd.cfg etc/jabberd/resolver.xml \
         etc/jabberd/router-users.xml etc/jabberd/router.xml \
@@ -30,7 +31,7 @@
   # DESTDIR doesn't work - do it the hard way
   #
   /bin/mkdir -p $startdir/pkg/etc/jabberd $startdir/pkg/usr/bin \
-      $startdir/pkg/usr/man/man8 $startdir/pkg/etc/rc.d \
+      $startdir/pkg/usr/share/man/man8 $startdir/pkg/etc/rc.d \
       $startdir/pkg/var/run $startdir/pkg/var/lib
   /bin/install -o17 -g17 -m4755 sm/sm $startdir/pkg/usr/bin/sm
   /bin/install -o17 -g17 -m4755 s2s/s2s $startdir/pkg/usr/bin/s2s
@@ -64,7 +65,7 @@
   /bin/rm $startdir/pkg/var/lib/jabberd/db/jabberd
   /bin/rm $startdir/pkg/var/run/jabberd/jabberd
 
-  /bin/cp man/*.8 $startdir/pkg/usr/man/man8
+  /bin/cp man/*.8 $startdir/pkg/usr/share/man/man8
   /bin/install -m0755 $startdir/src/jabberd $startdir/pkg/etc/rc.d/jabberd
 
   # fix pid paths

Modified: extra-x86_64/jabberd.install
===================================================================
--- extra-x86_64/jabberd.install	2008-12-15 02:17:02 UTC (rev 21695)
+++ extra-x86_64/jabberd.install	2008-12-15 02:22:39 UTC (rev 21696)
@@ -1,12 +1,12 @@
 post_install() {
-  echo "/*************************************************\\"
-  echo " *                                               *"
-  echo " * SECURITY WARNING:  Please review the Jabberd2 *"
-  echo " * documentation on-line at,                     *"
-  echo " *       http://www.jabberdoc.org/AdminGuide     *"
-  echo " * before enabling Jabber on a public network.   *"
-  echo " *                                               *"
-  echo "\\*************************************************/"
+  echo "/****************************************************\\"
+  echo " *                                                   *"
+  echo " * SECURITY WARNING:  Please review the Jabberd2     *"
+  echo " * documentation on-line at,                         *"
+  echo " *  http://jabberd2.xiaoka.com/wiki/InstallGuide     *"
+  echo " * before enabling Jabber on a public network.       *"
+  echo " *                                                   *"
+  echo "\\***************************************************/"
   if [ ! `grep jabber /etc/group` ]; then
     groupadd -g 17 jabber &>/dev/null;
   fi