Merge branch 'buttonbox'

Conflicts:
	doc/telemetrum-doc.xsl

Pull the buttbox version of the docs in as it had been updated.

Signed-off-by: Keith Packard <keithp@keithp.com>

diff --git a/ChangeLog b/ChangeLog
index 3cbfd13054e88639f970ca9fcdd2bc9f485641e2..c248fe083cc3bb783fb7184ed3e7eb95c4372b85 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,36 @@
+commit 811ced628d586134224c1b501b40ce9eb435fc7c
+Author: Keith Packard <keithp@keithp.com>
+Date:   Wed Oct 6 16:42:27 2010 -0700
+
+    altosui: Separate out jfreechart and jcommon directories
+    
+    This allows these packages to be referenced separately
+    
+    Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit c2c4d515ef9cc2cae8a8f2803e9498bb0794c4ed
+Author: Keith Packard <keithp@keithp.com>
+Date:   Wed Oct 6 16:25:49 2010 -0700
+
+    altosui: Remove ability to graph data in .csv files
+    
+    There's no reason to support these files when the raw .eeprom or
+    .telem files which generate them should be used instead.
+    
+    Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit d5caf6f2f4d9257e26aa4305b26c02d1b263fa24
+Author: Bdale Garbee <bdale@gag.com>
+Date:   Wed Oct 6 17:14:35 2010 -0600
+
+    remove the csv build dep, as that code will be abandoned
+
+commit 43e23a60780191e3c6f61df44c5dd08cc8604c51
+Author: Bdale Garbee <bdale@gag.com>
+Date:   Wed Oct 6 16:27:57 2010 -0600
+
+    update changelogs for Debian build
+
 commit 8103432bf7adfe6ee5bf3ee42e1672475e6edd5a
 Author: Bdale Garbee <bdale@gag.com>
 Date:   Wed Oct 6 16:26:33 2010 -0600

diff --git a/contrib/arch-linux/PKGBUILD-git.altos b/contrib/arch-linux/PKGBUILD-git.altos
index ff2c66ca1b64d96e4c3b97026b8c375e2a315bb4..0a3ecec5ecfc94ffcf8679012eac3d32c61fdc0d 100644 (file)
--- a/contrib/arch-linux/PKGBUILD-git.altos
+++ b/contrib/arch-linux/PKGBUILD-git.altos
@@ -1,6 +1,6 @@
 # Original contributor: Bob Finch <w9ya@qrpqrci.net>
 pkgname=altos-git
-pkgver=20100518
+pkgver=20101031
 pkgrel=1
 pkgdesc="Software solutions for high powered rocketry avionics"
 arch=('i686' 'x86_64')
@@ -8,57 +8,95 @@ url="http://www.altusmetrum.org/AltOS/"
 license=('GPL')
 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')
+depends=('openssl>=1.0.0' 'libusb1' 'plplot-svn' 'nickle' 'flite' 'kernel26>=2.6.33' 'fop'\
+         'gconf' 'alsa-oss' 'swig' 'libglade' 'freetts' 'jdk>=6u21' 'jfreechart' 'jcommon')
+makedepends=('git' 'docbook-xsl=1.76.0' 'sdcc=2.9.0-2_patched' 'nsis' 'tar' 'gzip' 'zip')
 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')
+options=('docs')
 
 _gitroot="git://git.gag.com/fw/altos"
 _gitname="altos"
+_pkgname="altosui"
+_libname="libaltos"
 
 build() {
   cd "$srcdir"
   msg "Connecting to GIT server...."
-
+  
   if [ -d $_gitname ] ; then
     cd $_gitname && git pull origin
     msg "The local files are updated."
   else
     git clone $_gitroot
   fi
-
+  
   msg "GIT checkout done or server timeout"
   msg "Starting make..."
-
+  
   rm -rf "$srcdir/$_gitname-build"
   git clone "$srcdir/$_gitname" "$srcdir/$_gitname-build"
-  cd "$srcdir/$_gitname-build"
-
+  
   #
   # BUILD HERE
   #
-
-  ./autogen.sh
-  ./configure --prefix=/usr
+  
+  sh /etc/profile.d/jdk.sh
+  
+  cd "$srcdir/$_gitname-build"
+  ./autogen.sh --prefix=/usr --with-jvm=/opt/java/include/\
+   --with-freetts=/usr/share/java/freetts/lib --with-jcommon=/usr/share/java/jcommon/lib\
+   --with-jfreechart=/usr/share/java/jfreechart/lib\
+  # --with-fat-dir=$srcdir
+  # Use this ^ for placing all 3 "fat" packages (linux,mac,windows) into a numbered dir.
+  
+  cd "$srcdir/$_gitname-build/ao-tools/$_pkgname/"
+  sed -i 's:\$(datadir)/java:\$(datadir)/java/altos:' Makefile
+  # This ^ places altosui.jar in an 'altos' subdirectory.
+  sed -i 's:\${exec_prefix}/bin:\${exec_prefix}/share/java/altos:' Makefile
+  # This ^ relocates altosui to allow for an aoss wrapper script.
+  sed -i 's|:/usr/share/java/\*|:/usr/share/java/*:$(JCOMMON)/*:$(JFREECHART)/*|' Makefile
+  # This ^ fixes compilation to include reference to jcommon.jar .
+  sed -i 's:cp -p $(JFREECHART_CLASS):cp -p $(JFREECHART_CLASS) $(JCOMMON_CLASS):' Makefile
+  # This ^ includes jcommon.jar in the macosx fat package.
+  
+  cd "$srcdir/$_gitname-build/ao-tools/$_libname/"
+  sed -i 's:$(JVM_INCLUDE):/opt/java/include\ -I/opt/java/include/linux:' Makefile
+  # This ^ enables both jni.h and jni_md.h to be found as required.
+  
+  cd "$srcdir/$_gitname-build/doc"
+  sed -i 's:stylesheet/docbook-xsl:xsl-stylesheets-1.76.0:' Makefile
+  # This ^ fixes archlinux's use of a specfic reference.
+  
+  cd "$srcdir/$_gitname-build"
   make || return 1
+  
+  cd "$srcdir/$_gitname-build/doc"
+  make all
+  
+  cd "$srcdir/$_gitname-build/ao-tools/altosui"
+  make fat
+}
+
+package() {
+  cd "$srcdir/$_gitname-build"
   make DESTDIR="$pkgdir/" install
   
+  mkdir -p $startdir/pkg/usr/share/altos
+  install -m 644 src/telemetrum-v1.0-* $startdir/pkg/usr/share/altos/
+  install -m 644 src/teledongle-v0.2-* $startdir/pkg/usr/share/altos/
+  
   mkdir -p $startdir/pkg/usr/share/pixmaps
   mkdir -p $startdir/pkg/usr/share/applications
   install -m644 debian/*.xpm $startdir/pkg/usr/share/pixmaps
   install -m644 debian/*.desktop $startdir/pkg/usr/share/applications
   
+  echo "#!/bin/sh" > holding.bin
+  echo ". aoss /usr/share/java/altos/altosui" >> holding.bin
+  install -D -m 755 holding.bin $startdir/pkg/usr/bin/$_pkgname
   
-  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/
-} 
+  mkdir -p $startdir/pkg/usr/share/doc/altos
+  install -m 644 doc/*.html $startdir/pkg/usr/share/doc/altos/
+  install -m 644 doc/*.pdf $startdir/pkg/usr/share/doc/altos/
+}

diff --git a/debian/changelog b/debian/changelog
index beeee17ec170ddb14816a8cd066b252feab7136e..604f7dc707a506ccd2976a7228c8ef4f661950cb 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+altos (0.7.1+36+g811ced6) unstable; urgency=low
+
+  [ Bdale Garbee ]
+  * remove the csv build dep, as that code will be abandoned
+
+  [ Keith Packard ]
+  * altosui: Remove ability to graph data in .csv files
+  * altosui: Separate out jfreechart and jcommon directories
+
+ -- Bdale Garbee <bdale@gag.com>  Wed, 06 Oct 2010 17:47:32 -0600
+
 altos (0.7.1+32+g8103432) unstable; urgency=low
 
   * add build-dep on libcsv-java