updates from Bob

diff --git a/contrib/arch-linux/PKGBUILD-git.altos b/contrib/arch-linux/PKGBUILD-git.altos
index 6fa82a3649e53ec8f7a432fb0de33a337062f71f..ff2c66ca1b64d96e4c3b97026b8c375e2a315bb4 100644 (file)
--- a/contrib/arch-linux/PKGBUILD-git.altos
+++ b/contrib/arch-linux/PKGBUILD-git.altos
@@ -1,35 +1,37 @@
-# Contributor: Bob Finch <w9ya@qrpqrci.net>
+# Original contributor: Bob Finch <w9ya@qrpqrci.net>
 pkgname=altos-git
-pkgver=20100507
+pkgver=20100518
 pkgrel=1
 pkgdesc="Software solutions for high powered rocketry avionics"
 arch=('i686' 'x86_64')
 url="http://www.altusmetrum.org/AltOS/"
 license=('GPL')
-depends=('openssl>=1.0.0' 'libusb-BETA' 'plplot-svn' 'sdcc' 'nickle' 'flite' 'kernel26>=2.6.33')
+provides=('altos')
+conflicts=('altos')
+depends=('openssl>=1.0.0' 'libusb-beta' 'plplot-svn' 'sdcc' 'nickle'\
+         'flite' 'kernel26>=2.6.33' 'gconf' 'alsa-lib' 'libglade'\
+         'docbook-xsl' 'fop')
 makedepends=('git')
-optdepends=('uucp: cu is included and is a bare boned terminal to serial program'
+optdepends=('uucp: cu is included & is a bare boned terminal 2 serial program'
             'cutemon: gui-based minimal terminal to serial program'
-            'google-earth: useful for viewing the kml files of the flight path'
-            'docbook-xsl: for making an html doc file from the xsl source'
-            'fop: for making a pdf doc file from the xsl source')
+            'google-earth: useful for viewing the kml files of the flight path')
 
 _gitroot="git://git.gag.com/fw/altos"
 _gitname="altos"
 
 build() {
   cd "$srcdir"
-#  msg "Connecting to GIT server...."
+  msg "Connecting to GIT server...."
 
   if [ -d $_gitname ] ; then
     cd $_gitname && git pull origin
-#    msg "The local files are updated."
+    msg "The local files are updated."
   else
     git clone $_gitroot
   fi
 
-#  msg "GIT checkout done or server timeout"
-#  msg "Starting make..."
+  msg "GIT checkout done or server timeout"
+  msg "Starting make..."
 
   rm -rf "$srcdir/$_gitname-build"
   git clone "$srcdir/$_gitname" "$srcdir/$_gitname-build"
@@ -49,17 +51,14 @@ build() {
   install -m644 debian/*.xpm $startdir/pkg/usr/share/pixmaps
   install -m644 debian/*.desktop $startdir/pkg/usr/share/applications
   
-  #
-  # OPTIONAL DOC BUILD - *** UNCOMMENT TO INSTALL DOCUMENTATION
-  #
   
-#  xsltproc -o telemetrum.html /usr/share/xml/docbook/xsl-stylesheets-1.74.0/html/docbook.xsl\
-#       doc/telemetrum.xml
-#  xsltproc -o telemetrum.fo /usr/share/xml/docbook/xsl-stylesheets-1.74.0/fo/docbook.xsl\
-#       doc/telemetrum.xml
-#  fop -fo telemetrum.fo -pdf telemetrum.pdf
-#  
-#  mkdir -p $startdir/pkg/usr/share/altos/doc
-#  install -m 644 *.html $startdir/pkg/usr/share/altos/doc/
-#  install -m 644 *.pdf $startdir/pkg/usr/share/altos/doc/
+  xsltproc -o telemetrum.html /usr/share/xml/docbook/xsl-stylesheets-1.74.0/html/docbook.xsl\
+       doc/telemetrum.xsl
+  xsltproc -o telemetrum.fo /usr/share/xml/docbook/xsl-stylesheets-1.74.0/fo/docbook.xsl\
+       doc/telemetrum.xsl
+  fop -fo telemetrum.fo -pdf telemetrum.pdf
+  
+  mkdir -p $startdir/pkg/usr/share/altos/doc
+  install -m 644 *.html $startdir/pkg/usr/share/altos/doc/
+  install -m 644 *.pdf $startdir/pkg/usr/share/altos/doc/
 } 

diff --git a/contrib/arch-linux/PKGBUILD-git.nickle b/contrib/arch-linux/PKGBUILD-git.nickle
index 9ed6546613f774a46ee67b940b7f0795e1253959..fe6c2a76f05ef83c5cb1e893e4199cb30209f568 100644 (file)
--- a/contrib/arch-linux/PKGBUILD-git.nickle
+++ b/contrib/arch-linux/PKGBUILD-git.nickle
@@ -1,11 +1,14 @@
-# Contributor: Bob Finch <w9ya@qrpqrci.net>
+# Original contributor: Bob Finch <w9ya@qrpqrci.net>
 pkgname=nickle-git
-pkgver=20100507
+pkgver=20100518
 pkgrel=1
 pkgdesc="A desk calculator language with powerful programming and scripting capabilities."
 arch=('i686' 'x86_64')
 url="http://keithp.com/git-repository/"
 license=('custom')
+provides=('nickle')
+conflicts=('nickle')
+depends=('readline')
 makedepends=('git')
 
 _gitroot="git://keithp.com/git/nickle"
@@ -13,17 +16,17 @@ _gitname="nickle"
 
 build() {
   cd "$srcdir"
-#  msg "Connecting to GIT server...."
+  msg "Connecting to GIT server...."
 
   if [ -d $_gitname ] ; then
     cd $_gitname && git pull origin
-#    msg "The local files are updated."
+    msg "The local files are updated."
   else
     git clone $_gitroot
   fi
 
-#  msg "GIT checkout done or server timeout"
-#  msg "Starting make..."
+  msg "GIT checkout done or server timeout"
+  msg "Starting make..."
 
   rm -rf "$srcdir/$_gitname-build"
   git clone "$srcdir/$_gitname" "$srcdir/$_gitname-build"
@@ -39,5 +42,5 @@ build() {
   make DESTDIR="$pkgdir/" install
   
   install -D -m 644 COPYING\
-     $startdir/pkg/usr/share/licenses/nickle/COPYING.txt
+     $startdir/pkg/usr/share/licenses/$_gitname/COPYING.txt
 }