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

[Eric Belanger]

    Date: Wednesday, July 9, 2008 @ 01:43:25
  Author: eric
Revision: 4719

fixing svn conflict

Added:
  fvwm-crystal/repos/unstable-x86_64/ChangeLog
    (from rev 4718, fvwm-crystal/trunk/ChangeLog)
Modified:
  fvwm-crystal/repos/unstable-x86_64/	(properties)
  fvwm-crystal/repos/unstable-x86_64/PKGBUILD
  fvwm-crystal/repos/unstable-x86_64/fvwm-crystal.install

----------------------+
 ChangeLog            |    8 ++++++++
 PKGBUILD             |   31 ++++++++++++++++++++-----------
 fvwm-crystal.install |   19 -------------------
 3 files changed, 28 insertions(+), 30 deletions(-)


Property changes on: fvwm-crystal/repos/unstable-x86_64
___________________________________________________________________
Name: svnmerge-integrated
   - /fvwm-crystal/trunk:1
   + /fvwm-crystal/trunk:1-4718

Copied: fvwm-crystal/repos/unstable-x86_64/ChangeLog (from rev 4718, fvwm-crystal/trunk/ChangeLog)
===================================================================
--- unstable-x86_64/ChangeLog	                        (rev 0)
+++ unstable-x86_64/ChangeLog	2008-07-09 05:43:25 UTC (rev 4719)
@@ -0,0 +1,8 @@
+2008-07-08  Eric Belanger  <eric at archlinux.org>
+
+	* fvwm-crystal 3.0.6-1
+	* Upstream update
+	* Added arch field
+	* Cleaned up install scriptlet
+	* Removed from the package unneeded files coming from the svn tree 
+	* Added ChangeLog

Modified: unstable-x86_64/PKGBUILD
===================================================================
--- unstable-x86_64/PKGBUILD	2008-07-09 05:42:24 UTC (rev 4718)
+++ unstable-x86_64/PKGBUILD	2008-07-09 05:43:25 UTC (rev 4719)
@@ -1,23 +1,32 @@
 # $Id$
-# Maintainer: Simo Leone <simo at archlinux.org>
+# Maintainer: Eric Belanger <eric at archlinux.org>
+# Contributor: Simo Leone <simo at archlinux.org>
+
 pkgname=fvwm-crystal
-pkgver=3.0.4
+pkgver=3.0.6
 pkgrel=1
 pkgdesc="Transparent Themes for fvwm"
 arch=('i686' 'x86_64')
 url="http://fvwm-crystal.org"
-license="GPL"
+license=('GPL')
 depends=('fvwm-devel' 'imagemagick' 'python' 'habak' 'trayer')
-makedepends=()
 install=fvwm-crystal.install
-source=("http://download.gna.org/fvwm-crystal/$pkgver/$pkgname-$pkgver.tar.gz")
-md5sums=('21baa93802dc8a6827508c32efbfa3ed')
+source=(http://download.gna.org/fvwm-crystal/${pkgver}/${pkgname}-${pkgver}.tar.gz)
+md5sums=('82e2800882abb2c822519f1aa4dc0c72')
+sha1sums=('965e521f64b8a89994f5afee25c8b1c88239bff0')
 
 build() {
-  cd $startdir/src/$pkgname-$pkgver
-  make || return 1
-  make prefix=$startdir/pkg/usr install
+  cd ${srcdir}/${pkgname}-${pkgver}
+  make prefix=${pkgdir}/usr install || return 1
 
-  #make gdm work
-  install -D -m644 addons/fvwm-crystal.desktop $startdir/pkg/etc/X11/sessions/fvwm-crystal.desktop
+  # make gdm work
+  install -D -m644 addons/fvwm-crystal.desktop ${pkgdir}/etc/X11/sessions/fvwm-crystal.desktop || return 1
+
+  # Cleaning up files from svn tree
+  cd ${pkgdir}/usr/share/fvwm-crystal/fvwm/
+  rm -r */.svn
+  rm -r */*/.svn
+  rm -r */*/*/.svn
+  rm -r */*/*/*/.svn
+  rm -r */*/*/*/*/.svn
 }

Modified: unstable-x86_64/fvwm-crystal.install
===================================================================
--- unstable-x86_64/fvwm-crystal.install	2008-07-09 05:42:24 UTC (rev 4718)
+++ unstable-x86_64/fvwm-crystal.install	2008-07-09 05:43:25 UTC (rev 4719)
@@ -1,4 +1,3 @@
-# arg 1:  the new package version
 post_install() {
   echo -e "->  Use \"exec fvwm-crystal\" in ~/.xinitrc to start with startx"
   echo -e "->  fvwm-crystal should also appear in gdm/kdm"
@@ -8,26 +7,8 @@
   echo -e "->    file managers:   rox-filer, nautilus"
   echo -e "->    reboot/shutdown: sudo"
   echo -e "->    screensaver:     xscreensaver"
-  /bin/true
 }
 
-# arg 1:  the new package version
-# arg 2:  the old package version
 post_upgrade() {
   post_install
-  /bin/true
 }
-
-# arg 1:  the old package version
-pre_remove() {
-  /bin/true
-}
-
-# arg 1:  the old package version
-post_remove() {
-  /bin/true
-}
-
-op=$1
-shift
-$op $*