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

[François Charette]

    Date: Tuesday, December 2, 2008 @ 04:50:27
  Author: francois
Revision: 20296

Merged revisions 4704,20295 via svnmerge from 
svn+ssh://archlinux.org/srv/svn-packages/jhead/trunk

........
  r4704 | eric | 2008-07-09 03:31:16 +0200 (Wed, 09 Jul 2008) | 2 lines
  
  upgpkg: jhead 2.82-1
      Added license, FSH man pages
........
  r20295 | francois | 2008-12-02 10:50:08 +0100 (Tue, 02 Dec 2008) | 1 line
  
  upgpkg: jhead 2.84-1
........

Added:
  jhead/repos/extra-i686/LICENSE
    (from rev 20295, jhead/trunk/LICENSE)
Modified:
  jhead/repos/extra-i686/	(properties)
  jhead/repos/extra-i686/PKGBUILD

----------+
 LICENSE  |   12 ++++++++++++
 PKGBUILD |   21 +++++++++------------
 2 files changed, 21 insertions(+), 12 deletions(-)


Property changes on: jhead/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /jhead/trunk:1-4681
   + /jhead/trunk:1-20295

Copied: jhead/repos/extra-i686/LICENSE (from rev 20295, jhead/trunk/LICENSE)
===================================================================
--- extra-i686/LICENSE	                        (rev 0)
+++ extra-i686/LICENSE	2008-12-02 09:50:27 UTC (rev 20296)
@@ -0,0 +1,12 @@
+License:
+
+    Jhead is public domain software - that is, you can do whatever you want
+    with it, and include it software that is licensesed under the GNU or the 
+    BSD license, or whatever other licence you chose, including proprietary
+    closed source licenses.  Although not part of the liscense, I do expect
+    common courtesy, please.
+
+    If you do integrate the code into some software of yours, I'd appreciate
+    knowing about it though. 
+
+Matthias Wandel

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2008-12-02 09:50:08 UTC (rev 20295)
+++ extra-i686/PKGBUILD	2008-12-02 09:50:27 UTC (rev 20296)
@@ -1,25 +1,22 @@
 # Contributor: Damir Perisa <damir.perisa at bluewin.ch>
 # $Id$
-# Maintainer: Jason Chu <jason at archlinux.org>
+# Maintainer: François Charette <francois ατ archlinux δοτ org>
 pkgname=jhead
-pkgver=2.82
+pkgver=2.84
 pkgrel=1
 pkgdesc="EXIF JPEG info parser and thumbnail remover"
 url="http://www.sentex.net/~mwandel/jhead/"
 arch=('i686' 'x86_64')
+license=('custom')
 depends=(glibc)
-conflicts=()
-backup=()
-install=
-source=($url/$pkgname-$pkgver.tar.gz)
-md5sums=('ef2f3233e22ba054c90ba33068cb0a70')
+source=($url/$pkgname-$pkgver.tar.gz LICENSE)
+md5sums=('3e009f8e8a6a077d4a966d14b8797038'
+         '1f0db611d2642a981719f45252762a45')
 
 build() {
   cd $startdir/src/$pkgname-$pkgver
-  mkdir -p $startdir/pkg/usr/bin
-  mkdir -p $startdir/pkg/usr/man/man1
   make || return 1
-  cp $pkgname $startdir/pkg/usr/bin
-  cp $pkgname.1.gz $startdir/pkg/usr/man/man1
-
+  install -D -m755 $pkgname $startdir/pkg/usr/bin/$pkgname
+  install -D -m644 $pkgname.1.gz $startdir/pkg/usr/share/man/man1/$pkgname.1.gz
+  install -D -m644 ../LICENSE $startdir/pkg/usr/share/licenses/$pkgname/LICENSE
 }