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

[Aaron Griffin]

    Date: Sunday, October 5, 2008 @ 20:38:53
  Author: aaron
Revision: 14372

Merged revisions 356,2304,14371 via svnmerge from 
svn+ssh://archlinux.org/home/svn-packages/bootchart/trunk

........
  r356 | aaron | 2008-04-18 17:56:27 -0500 (Fri, 18 Apr 2008) | 1 line
  
  Added svn:keywords to all PKGBUILDs
........
  r2304 | paul | 2008-05-31 00:00:40 -0500 (Sat, 31 May 2008) | 2 lines
  
  Added licenses for 64 packages.
........
  r14371 | aaron | 2008-10-05 19:38:01 -0500 (Sun, 05 Oct 2008) | 1 line
  
  upgpkg: bootchart 0.9-4
........

Added:
  bootchart/repos/extra-i686/fix-inittab-regex.patch
    (from rev 14371, bootchart/trunk/fix-inittab-regex.patch)
Modified:
  bootchart/repos/extra-i686/	(properties)
  bootchart/repos/extra-i686/PKGBUILD

-------------------------+
 PKGBUILD                |   17 +++++++++++++----
 fix-inittab-regex.patch |   11 +++++++++++
 2 files changed, 24 insertions(+), 4 deletions(-)


Property changes on: bootchart/repos/extra-i686
___________________________________________________________________
Name: svnmerge-integrated
   - /bootchart/trunk:1
   + /bootchart/trunk:1-14371

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2008-10-06 00:38:01 UTC (rev 14371)
+++ extra-i686/PKGBUILD	2008-10-06 00:38:53 UTC (rev 14372)
@@ -1,19 +1,28 @@
-#Maintainer : Aaron Griffin <aaron at archlinux.org>
+# $Id$
+# Maintainer : Aaron Griffin <aaron at archlinux.org>
 
 pkgname=bootchart
 pkgver=0.9
-pkgrel=3
+pkgrel=4
 pkgdesc="Boot Process Performance Visualization"
 url="http://www.bootchart.org/"
+arch=('i686' 'x86_64')
+license=('GPL2')
 depends=('j2re' 'acct')
 makedepends=('apache-ant')
 install=bootchart.install
-source=(http://dl.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.bz2 bootchart-render)
-md5sums=('4be91177d19069e21beeb106f2f77dff' 'f02888cda23a5b1c9b931140f6fdbb71')
+source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.bz2
+        bootchart-render
+        #FS#8438 - fix the regex used to scan inittab for archlinux
+        fix-inittab-regex.patch)
+md5sums=('4be91177d19069e21beeb106f2f77dff'
+         'f02888cda23a5b1c9b931140f6fdbb71'
+         'c8a70f1f763a2632dc7759a6387f865f')
 
 build()
 {
   cd $startdir/src/$pkgname-$pkgver
+  patch -up1 < $startdir/src/fix-inittab-regex.patch
   ant
   sed -i "s#ROOT=/#ROOT=$startdir/pkg#" install.sh
 

Copied: bootchart/repos/extra-i686/fix-inittab-regex.patch (from rev 14371, bootchart/trunk/fix-inittab-regex.patch)
===================================================================
--- extra-i686/fix-inittab-regex.patch	                        (rev 0)
+++ extra-i686/fix-inittab-regex.patch	2008-10-06 00:38:53 UTC (rev 14372)
@@ -0,0 +1,11 @@
+--- a/script/bootchartd	2007-10-27 17:47:04.000000000 +0200
++++ b/script/bootchartd	2007-10-27 18:45:10.000000000 +0200
+@@ -114,7 +114,7 @@
+ # Wait for the boot process to end.
+ wait_boot()
+ {
+-	local runlevel=$( sed -n 's/.*:\(.*\):initdefault:.*/\1/gp' /etc/inittab )
++	local runlevel=$( sed -n -e 's/#.*//g' -e 's/.*:\(.*\):initdefault:.*/\1/gp' /etc/inittab )
+ 
+ 	# The processes we have to wait for
+ 	local exit_proc="gdmgreeter gdm-binary kdm_greet kdm"