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

[Eric Bélanger]

    Date: Saturday, November 7, 2009 @ 01:10:24
  Author: eric
Revision: 58349

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

........
  r58348 | eric | 2009-11-07 01:10:07 -0500 (Sat, 07 Nov 2009) | 2 lines
  
  upgpkg: monotone 0.45-1
      Upstream update, moved boost to makedepends (close FS#14595), cleaned up makedepends, updated post-upgrade message, added info file handling in install script
........

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

------------------+
 PKGBUILD         |   28 +++++++++++-----------------
 monotone.install |   30 +++++++++++++++++++++++-------
 2 files changed, 34 insertions(+), 24 deletions(-)


Property changes on: monotone/repos/extra-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /monotone/trunk:1-48438
   + /monotone/trunk:1-58348

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2009-11-07 06:10:07 UTC (rev 58348)
+++ extra-x86_64/PKGBUILD	2009-11-07 06:10:24 UTC (rev 58349)
@@ -4,31 +4,25 @@
 # Contributor: Dan McGee <dpmcgee at gmail.com>
 
 pkgname=monotone
-pkgver=0.44
+pkgver=0.45
 pkgrel=1
 pkgdesc="A modern distributed version control system, like hg, darcs, or git"
+arch=('i686' 'x86_64')
 url="http://www.monotone.ca"
 license=("GPL")
-arch=(i686 x86_64)
-depends=('boost' 'botan' 'pcre' 'lua' 'sqlite3' 'libidn')
-makedepends=('zlib' 'gcc-libs')
+depends=('botan' 'pcre' 'lua' 'sqlite3' 'libidn' 'zlib')
+makedepends=('boost')
 install=monotone.install
 source=(http://www.monotone.ca/downloads/$pkgver/$pkgname-$pkgver.tar.gz)
+md5sums=('bd37c3d75e3fd1974a17f556499b42ab')
+sha1sums=('84bd7ab5f7b1bfe98028f5105e3dbcd82c809e51')
 
 build() {
-  cd $startdir/src/$pkgname-$pkgver
-  
-  ./configure --prefix=/usr --sysconfdir=/etc
+  cd "$srcdir/$pkgname-$pkgver"
+  ./configure --prefix=/usr --sysconfdir=/etc || return 1
   make || return 1
-  make DESTDIR=$startdir/pkg install
+  make DESTDIR="$pkgdir" install || return 1
 
-  # removing info dir
-  rm -rf $startdir/pkg/usr/share/info
-
-  # install completion scripts
-  mkdir -p $startdir/pkg/etc/bash_completion.d
-  mkdir -p $startdir/pkg/usr/share/zsh/site-functions/
-  install -m644 contrib/monotone.bash_completion $startdir/pkg/etc/bash_completion.d/monotone
-  install -m644 contrib/monotone.zsh_completion $startdir/pkg/usr/share/zsh/site-functions/monotone
+  install -D -m644 contrib/monotone.bash_completion "$pkgdir/etc/bash_completion.d/monotone"
+  install -D -m644 contrib/monotone.zsh_completion "$pkgdir/usr/share/zsh/site-functions/monotone"
 }
-md5sums=('6cc1f5f31df2e41bdfe502310463924a')

Modified: extra-x86_64/monotone.install
===================================================================
--- extra-x86_64/monotone.install	2009-11-07 06:10:07 UTC (rev 58348)
+++ extra-x86_64/monotone.install	2009-11-07 06:10:24 UTC (rev 58349)
@@ -1,13 +1,29 @@
+infodir=/usr/share/info
+filelist=(monotone.info.gz)
+
+post_install() {
+  [ -x usr/bin/install-info ] || return 0
+  for file in ${filelist[@]}; do
+    install-info $infodir/$file $infodir/dir 2> /dev/null
+  done
+}
+
+post_upgrade() {
+  post_install $1
+
 # arg 1:  the new package version
 # arg 2:  the old package version
-post_upgrade() {
-  if [ "$(vercmp $2 0.33)" -lt 0 ]; then
+  if [ "$(vercmp $2 0.45)" -lt 0 ]; then
     echo ">>> Your monotone databases will need updating for an internal format"
-    echo ">>> change. Please run the following command on your databases:"
+    echo ">>> change. Please run the following command on each of your databases"
+    echo ">>> (after remembering to take a backup copy):"
     echo ">>>    $ mtn -d dbname.mtn db migrate"
   fi
-  }
+}
 
-op=$1
-shift
-$op $*
+pre_remove() {
+  [ -x usr/bin/install-info ] || return 0
+  for file in ${filelist[@]}; do
+    install-info --delete $infodir/$file $infodir/dir 2> /dev/null
+  done
+}