[arch-commits] Commit in e2fsprogs/repos (4 files)

[Ronald van Haren]

    Date: Sunday, April 26, 2009 @ 16:30:21
  Author: ronald
Revision: 36649

Merged revisions 36533,36648 via svnmerge from 
svn+ssh://archlinux.org/srv/svn-packages/e2fsprogs/trunk

........
  r36533 | ronald | 2009-04-24 13:48:12 +0200 (Fri, 24 Apr 2009) | 1 line
  
  add MIT license to svn
........
  r36648 | ronald | 2009-04-26 22:29:20 +0200 (Sun, 26 Apr 2009) | 2 lines
  
  upgpkg: e2fsprogs 1.41.5-2
      check for texinfo in install scriplet
........

Added:
  e2fsprogs/repos/testing-x86_64/MIT-LICENSE
    (from rev 36648, e2fsprogs/trunk/MIT-LICENSE)
Modified:
  e2fsprogs/repos/testing-x86_64/	(properties)
  e2fsprogs/repos/testing-x86_64/PKGBUILD
  e2fsprogs/repos/testing-x86_64/e2fsprogs.install

-------------------+
 MIT-LICENSE       |   25 +++++++++++++++++++++++++
 PKGBUILD          |    2 +-
 e2fsprogs.install |   23 +++++++++++------------
 3 files changed, 37 insertions(+), 13 deletions(-)


Property changes on: e2fsprogs/repos/testing-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /e2fsprogs/trunk:1-36530
   + /e2fsprogs/trunk:1-36648

Copied: e2fsprogs/repos/testing-x86_64/MIT-LICENSE (from rev 36648, e2fsprogs/trunk/MIT-LICENSE)
===================================================================
--- testing-x86_64/MIT-LICENSE	                        (rev 0)
+++ testing-x86_64/MIT-LICENSE	2009-04-26 20:30:21 UTC (rev 36649)
@@ -0,0 +1,25 @@
+Copyright (c) 2003-2007 Theodore Ts'o <tytso at mit.edu>
+Copyright (c) 1997-2003 Yann Dirson <dirson at debian.org>
+Copyright (c) 2001 Alcove <http://www.alcove.com/>
+Copyright (c) 1997 Klee Dienes
+Copyright (c) 1995-1996 Michael Nonweiler <mrn20 at cam.ac.uk>
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject
+to the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
+KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR
+IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

Modified: testing-x86_64/PKGBUILD
===================================================================
--- testing-x86_64/PKGBUILD	2009-04-26 20:29:20 UTC (rev 36648)
+++ testing-x86_64/PKGBUILD	2009-04-26 20:30:21 UTC (rev 36649)
@@ -4,7 +4,7 @@
 
 pkgname=e2fsprogs
 pkgver=1.41.5
-pkgrel=1
+pkgrel=2
 pkgdesc="Ext2/3/4 filesystem utilities"
 arch=('i686' 'x86_64')
 license=('GPL' 'LGPL' 'MIT' 'BSD')

Modified: testing-x86_64/e2fsprogs.install
===================================================================
--- testing-x86_64/e2fsprogs.install	2009-04-26 20:29:20 UTC (rev 36648)
+++ testing-x86_64/e2fsprogs.install	2009-04-26 20:30:21 UTC (rev 36649)
@@ -1,21 +1,20 @@
- infodir=/usr/share/info
-  filelist=(libext2fs.info.gz)
+infodir=/usr/share/info
+filelist=(libext2fs.info.gz)
 
-  post_install() {
+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
+}
 
-  post_upgrade() {
-    post_install $1
-  }
-
-  pre_remove() {
+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
-
-  }
-
+}