[arch-commits] Commit in ntp/repos (extra-x86_64 extra-x86_64/PKGBUILD)

[Eric Bélanger]

    Date: Sunday, December 13, 2009 @ 21:08:09
  Author: eric
Revision: 61256

Merged revisions 61254 via svnmerge from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/ntp/trunk

........
  r61254 | eric | 2009-12-13 21:07:12 -0500 (Sun, 13 Dec 2009) | 2 lines
  
  upgpkg: ntp 4.2.6-2
      fixed man page conflict (close FS#17485)
........

Modified:
  ntp/repos/extra-x86_64/	(properties)
  ntp/repos/extra-x86_64/PKGBUILD

----------+
 PKGBUILD |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)


Property changes on: ntp/repos/extra-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /ntp/trunk:1-61220
   + /ntp/trunk:1-61255

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2009-12-14 02:07:32 UTC (rev 61255)
+++ extra-x86_64/PKGBUILD	2009-12-14 02:08:09 UTC (rev 61256)
@@ -2,7 +2,7 @@
 # Maintainer: dorphell <dorphell at archlinux.org>
 pkgname=ntp
 pkgver=4.2.6
-pkgrel=1
+pkgrel=2
 pkgdesc="NTP (Network Time Protocol) tries to keep servers in sync"
 arch=(i686 x86_64)
 license=('custom')
@@ -60,6 +60,7 @@
   install -d "$pkgdir"/usr/share/man/man{5,8}
   install -m644 man/man5/* "$pkgdir/usr/share/man/man5/" || return 1
   install -m644 man/man8/* "$pkgdir/usr/share/man/man8/" || return 1
+  mv "$pkgdir/usr/share/man/man8/ntpd.8" "$pkgdir/usr/share/man/man8/ntp-ntpd.8" || return 1
   cd ..
 
   # install sample configs