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

[Eric Bélanger]

    Date: Wednesday, July 29, 2009 @ 15:31:47
  Author: eric
Revision: 47942

Merged revisions 356,47935 via svnmerge from 
svn+ssh://svn.archlinux.org/srv/svn-packages/bluefish/trunk

........
  r356 | aaron | 2008-04-18 18:56:27 -0400 (Fri, 18 Apr 2008) | 1 line
  
  Added svn:keywords to all PKGBUILDs
........
  r47935 | eric | 2009-07-29 14:51:43 -0400 (Wed, 29 Jul 2009) | 2 lines
  
  upgpkg: bluefish 1.0.7-4
      FHS man pages, Added ChangeLog
........

Added:
  bluefish/repos/extra-i686/ChangeLog
    (from rev 47935, bluefish/trunk/ChangeLog)
Modified:
  bluefish/repos/extra-i686/	(properties)
  bluefish/repos/extra-i686/PKGBUILD
  bluefish/repos/extra-i686/bluefish.install

------------------+
 ChangeLog        |    5 +++++
 PKGBUILD         |   10 +++++-----
 bluefish.install |    5 -----
 3 files changed, 10 insertions(+), 10 deletions(-)


Property changes on: bluefish/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /bluefish/trunk:1
   + /bluefish/trunk:1-47941

Copied: bluefish/repos/extra-i686/ChangeLog (from rev 47935, bluefish/trunk/ChangeLog)
===================================================================
--- extra-i686/ChangeLog	                        (rev 0)
+++ extra-i686/ChangeLog	2009-07-29 19:31:47 UTC (rev 47942)
@@ -0,0 +1,5 @@
+2009-07-29  Eric Belanger  <eric at archlinux.org>
+
+	* bluefish 1.0.7-4
+	* FHS man pages
+	* Added ChangeLog

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2009-07-29 19:28:24 UTC (rev 47941)
+++ extra-i686/PKGBUILD	2009-07-29 19:31:47 UTC (rev 47942)
@@ -4,7 +4,7 @@
 
 pkgname=bluefish
 pkgver=1.0.7
-pkgrel=3
+pkgrel=4
 pkgdesc="Programmer's HTML editor written using GTK"
 arch=('i686' 'x86_64')
 url="http://bluefish.openoffice.nl/"
@@ -17,7 +17,7 @@
 sha1sums=('c61d6271c49e9fa8c728724e6aadde33a227bdea')
 
 build() {
-  cd ${startdir}/src/${pkgname}-${pkgver}
+  cd "${srcdir}/${pkgname}-${pkgver}"
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
     --with-freedesktop_org-menu=/usr/share/applications \
     --with-freedesktop_org-mime=/usr/share/mime \
@@ -25,8 +25,8 @@
     --without-gnome2_4-appreg \
     --with-icon-path=/usr/share/pixmaps \
     --disable-update-databases \
-    --without-libgnomeui
+    --without-libgnomeui || return 1
   make || return 1
-  make DESTDIR=${startdir}/pkg install
-  install -m644 ${startdir}/src/${pkgname}-${pkgver}/data/bluefish.desktop ${startdir}/pkg/usr/share/applications/bluefish.desktop
+  make DESTDIR="${pkgdir}" install || return 1
+  install -m644 data/bluefish.desktop "${pkgdir}/usr/share/applications/bluefish.desktop" || return 1
 }

Modified: extra-i686/bluefish.install
===================================================================
--- extra-i686/bluefish.install	2009-07-29 19:28:24 UTC (rev 47941)
+++ extra-i686/bluefish.install	2009-07-29 19:31:47 UTC (rev 47942)
@@ -10,8 +10,3 @@
 post_remove() {
   post_install
 }
-
-op=$1
-shift
-
-$op $*