Merge lp:~showard314/arduino/packaging-proposed into lp:~arduino-ubuntu-team/arduino/packaging

[Scott Howard]

[Scott Howard (showard314)]

This might be easier to read:
http://bazaar.launchpad.net/~showard314/arduino/packaging-proposed/revision/3

[Scott Howard (showard314)]

If you try to build this, make sure you change the debian/changelog to "lucid" instead of "unstable"

[Scott Howard (showard314)]

You also need a new orig.tar.gz, use ./debian/rules get-orig-source

For Debian compliance I had to clean out some other files and set some permissions.

Unmerged revisions

3. By Scott Howard on 2010-04-11

Initial release. (Closes: #577249)

=== added directory '.pc'
=== added file '.pc/.version'
--- .pc/.version	1970-01-01 00:00:00 +0000
+++ .pc/.version	2010-04-11 15:27:18 +0000
@@ -0,0 +1,1 @@
+2

=== added file '.pc/applied-patches'
--- .pc/applied-patches	1970-01-01 00:00:00 +0000
+++ .pc/applied-patches	2010-04-11 15:27:18 +0000
@@ -0,0 +1,2 @@
+wrapper_for_deb.patch
+convert_to_debian_oro.patch

=== added directory '.pc/convert_to_debian_oro.patch'
=== added directory '.pc/convert_to_debian_oro.patch/src'
=== added directory '.pc/convert_to_debian_oro.patch/src/processing'
=== added directory '.pc/convert_to_debian_oro.patch/src/processing/app'
=== added directory '.pc/convert_to_debian_oro.patch/src/processing/app/preproc'
=== added file '.pc/convert_to_debian_oro.patch/src/processing/app/preproc/PdePreprocessor.java'
--- .pc/convert_to_debian_oro.patch/src/processing/app/preproc/PdePreprocessor.java	1970-01-01 00:00:00 +0000
+++ .pc/convert_to_debian_oro.patch/src/processing/app/preproc/PdePreprocessor.java	2010-04-11 15:27:18 +0000
@@ -0,0 +1,351 @@
+/* -*- mode: jde; c-basic-offset: 2; indent-tabs-mode: nil -*- */
+
+/*
+  PdePreprocessor - wrapper for default ANTLR-generated parser
+  Part of the Wiring project - http://wiring.org.co
+
+  Copyright (c) 2004-05 Hernando Barragan
+
+  Processing version Copyright (c) 2004-05 Ben Fry and Casey Reas
+  Copyright (c) 2001-04 Massachusetts Institute of Technology
+
+  ANTLR-generated parser and several supporting classes written
+  by Dan Mosedale via funding from the Interaction Institute IVREA.
+
+  This program is free software; you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program; if not, write to the Free Software Foundation,
+  Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+*/
+
+package processing.app.preproc;
+
+import processing.app.*;
+import processing.core.*;
+
+import java.io.*;
+import java.util.*;
+
+import com.oroinc.text.regex.*;
+
+
+/**
+ * Class that orchestrates preprocessing p5 syntax into straight Java.
+ */
+public class PdePreprocessor {
+  // stores number of built user-defined function prototypes
+  public int prototypeCount = 0;
+
+  // stores number of included library headers written
+  // we always write one header: WProgram.h
+  public int headerCount = 1;
+  
+  List prototypes;
+
+
+
+
+  String[] defaultImports;
+
+  // these ones have the .* at the end, since a class name might be at the end
+  // instead of .* which would make trouble other classes using this can lop
+  // off the . and anything after it to produce a package name consistently.
+  //public String extraImports[];
+  ArrayList<String> programImports;
+
+  // imports just from the code folder, treated differently
+  // than the others, since the imports are auto-generated.
+  ArrayList<String> codeFolderImports;
+
+  String indent;
+
+  PrintStream stream;
+  String program;
+  String buildPath;
+  String name;
+
+
+  /**
+   * Setup a new preprocessor.
+   */
+  public PdePreprocessor() { }
+
+  public int writePrefix(String program, String buildPath,
+                         String name, String codeFolderPackages[])
+    throws FileNotFoundException {
+    this.buildPath = buildPath;
+    this.name = name;
+
+    int tabSize = Preferences.getInteger("editor.tabs.size");
+    char[] indentChars = new char[tabSize];
+    Arrays.fill(indentChars, ' ');
+    indent = new String(indentChars);
+
+    // if the program ends with no CR or LF an OutOfMemoryError will happen.
+    // not gonna track down the bug now, so here's a hack for it:
+    // http://dev.processing.org/bugs/show_bug.cgi?id=5
+    program += "\n";
+
+    // if the program ends with an unterminated multi-line comment,
+    // an OutOfMemoryError or NullPointerException will happen.
+    // again, not gonna bother tracking this down, but here's a hack.
+    // http://dev.processing.org/bugs/show_bug.cgi?id=16
+    Sketch.scrubComments(program);
+    // this returns the scrubbed version, but more important for this
+    // function, it'll check to see if there are errors with the comments.
+
+    if (Preferences.getBoolean("preproc.substitute_unicode")) {
+      // check for non-ascii chars (these will be/must be in unicode format)
+      char p[] = program.toCharArray();
+      int unicodeCount = 0;
+      for (int i = 0; i < p.length; i++) {
+        if (p[i] > 127) unicodeCount++;
+      }
+      // if non-ascii chars are in there, convert to unicode escapes
+      if (unicodeCount != 0) {
+        // add unicodeCount * 5.. replacing each unicode char
+        // with six digit uXXXX sequence (xxxx is in hex)
+        // (except for nbsp chars which will be a replaced with a space)
+        int index = 0;
+        char p2[] = new char[p.length + unicodeCount*5];
+        for (int i = 0; i < p.length; i++) {
+          if (p[i] < 128) {
+            p2[index++] = p[i];
+
+          } else if (p[i] == 160) {  // unicode for non-breaking space
+            p2[index++] = ' ';
+
+          } else {
+            int c = p[i];
+            p2[index++] = '\\';
+            p2[index++] = 'u';
+            char str[] = Integer.toHexString(c).toCharArray();
+            // add leading zeros, so that the length is 4
+            //for (int i = 0; i < 4 - str.length; i++) p2[index++] = '0';
+            for (int m = 0; m < 4 - str.length; m++) p2[index++] = '0';
+            System.arraycopy(str, 0, p2, index, str.length);
+            index += str.length;
+          }
+        }
+        program = new String(p2, 0, index);
+      }
+    }
+
+    // These may change in-between (if the prefs panel adds this option)
+    // so grab them here on construction.
+    String prefsLine = Preferences.get("preproc.imports");
+    defaultImports = PApplet.splitTokens(prefsLine, ", ");
+
+    //String importRegexp = "(?:^|\\s|;)(import\\s+)(\\S+)(\\s*;)";
+    String importRegexp = "^\\s*#include\\s+[<\"](\\S+)[\">]";
+    programImports = new ArrayList<String>();
+
+    String[][] pieces = PApplet.matchAll(program, importRegexp);
+
+    if (pieces != null)
+      for (int i = 0; i < pieces.length; i++)
+        programImports.add(pieces[i][1]);  // the package name
+
+    codeFolderImports = new ArrayList<String>();
+//    if (codeFolderPackages != null) {
+//      for (String item : codeFolderPackages) {
+//        codeFolderImports.add(item + ".*");
+//      }
+//    }
+
+    prototypes = new ArrayList();
+    
+    try {
+      prototypes = prototypes(program);
+    } catch (MalformedPatternException e) {
+      System.out.println("Internal error while pre-processing; " +
+        "not generating function prototypes.\n\n" + e);
+    }
+    
+    // store # of prototypes so that line number reporting can be adjusted
+    prototypeCount = prototypes.size();
+  
+    // do this after the program gets re-combobulated
+    this.program = program;
+    
+    // output the code
+    File streamFile = new File(buildPath, name + ".cpp");
+    stream = new PrintStream(new FileOutputStream(streamFile));
+    
+    return headerCount + prototypeCount;
+  }
+
+  /**
+   * preprocesses a pde file and write out a java file
+   * @return the classname of the exported Java
+   */
+  //public String write(String program, String buildPath, String name,
+  //                  String extraImports[]) throws java.lang.Exception {
+  public String write() throws java.lang.Exception {
+    writeProgram(stream, program, prototypes);
+    writeFooter(stream);
+    stream.close();
+    
+    return name;
+  }
+
+  // Write the pde program to the cpp file
+  protected void writeProgram(PrintStream out, String program, List prototypes) {
+    int prototypeInsertionPoint = firstStatement(program);
+  
+    out.print(program.substring(0, prototypeInsertionPoint));
+    out.print("#include \"WProgram.h\"\n");    
+    
+    // print user defined prototypes
+    for (int i = 0; i < prototypes.size(); i++) {
+      out.print(prototypes.get(i) + "\n");
+    }
+    
+    out.print(program.substring(prototypeInsertionPoint));
+  }
+
+
+  /**
+   * Write any necessary closing text.
+   *
+   * @param out         PrintStream to write it to.
+   */
+  protected void writeFooter(PrintStream out) throws java.lang.Exception {}
+
+
+  public ArrayList<String> getExtraImports() {
+    return programImports;
+  }
+
+
+
+
+
+  /**
+   * Returns the index of the first character that's not whitespace, a comment
+   * or a pre-processor directive.
+   */
+  public int firstStatement(String in) {
+    PatternMatcherInput input = new PatternMatcherInput(in);
+    PatternCompiler compiler = new Perl5Compiler();
+    PatternMatcher matcher = new Perl5Matcher();
+    Pattern pattern = null;
+    
+    try {
+      pattern = compiler.compile(
+        // XXX: doesn't properly handle special single-quoted characters
+        // whitespace
+        "\\s+" + "|" +
+        // multi-line comment
+        "(/\\*[^*]*(?:\\*(?!/)[^*]*)*\\*/)" + "|" +
+        // single-line comment
+        "(//.*?$)" + "|" +
+        // pre-processor directive
+        "(#(?:\\\\\\n|.)*)",
+        Perl5Compiler.MULTILINE_MASK);
+    } catch (MalformedPatternException e) {
+      throw new RuntimeException("Internal error in firstStatement()", e);
+    }
+      
+    int i = 0;
+    while (matcher.matchesPrefix(input, pattern)) {
+      i = matcher.getMatch().endOffset(0);
+      input.setCurrentOffset(i);
+    }
+    
+    return i;
+  }
+  
+  /**
+   * Strips comments, pre-processor directives, single- and double-quoted
+   * strings from a string.
+   * @param in the String to strip
+   * @return the stripped String
+   */
+  public String strip(String in) throws MalformedPatternException {
+    PatternCompiler compiler = new Perl5Compiler();
+    PatternMatcher matcher = new Perl5Matcher();
+    Pattern pattern = compiler.compile(
+      // XXX: doesn't properly handle special single-quoted characters
+      // single-quoted character
+      "('.')" + "|" +
+      // double-quoted string
+      "(\"(?:[^\"\\\\]|\\\\.)*\")" + "|" +
+      // multi-line comment
+      "(/\\*[^*]*(?:\\*(?!/)[^*]*)*\\*/)" + "|" +
+      // single-line comment
+      "(//.*?$)" + "|" +
+      // pre-processor directive
+      "(^\\s*#.*?$)",
+      Perl5Compiler.MULTILINE_MASK);
+      
+    while (matcher.contains(in, pattern)) {
+      MatchResult result = matcher.getMatch();
+      // XXX: should preserve newlines in the result so that line numbers of
+      // the stripped string correspond to those in the original source.
+      in = in.substring(0, result.beginOffset(0)) + " " + in.substring(result.endOffset(0));
+    }
+    
+    return in;
+  }
+  
+  /**
+   * Removes the contents of all top-level curly brace pairs {}.
+   * @param in the String to collapse
+   * @return the collapsed String
+   */
+  private String collapseBraces(String in) {
+    StringBuffer buffer = new StringBuffer();
+    int nesting = 0;
+    int start = 0;
+    
+    // XXX: need to keep newlines inside braces so we can determine the line
+    // number of a prototype
+    for (int i = 0; i < in.length(); i++) {
+      if (in.charAt(i) == '{') {
+        if (nesting == 0) {
+          buffer.append(in.substring(start, i + 1));  // include the '{'
+        }
+        nesting++;
+      }
+      if (in.charAt(i) == '}') {
+        nesting--;
+        if (nesting == 0) {
+          start = i; // include the '}'
+        }
+      }
+    }
+    
+    buffer.append(in.substring(start));
+    
+    return buffer.toString();
+  }
+  
+  public List prototypes(String in) throws MalformedPatternException {
+    in = collapseBraces(strip(in));
+    
+    PatternMatcherInput input = new PatternMatcherInput(in);
+    PatternCompiler compiler = new Perl5Compiler();
+    PatternMatcher matcher = new Perl5Matcher();
+    // XXX: doesn't handle ... varargs
+    // XXX: doesn't handle function pointers
+    Pattern pattern = compiler.compile(
+      "[\\w\\[\\]\\*]+\\s+[\\[\\]\\*\\w\\s]+\\([,\\[\\]\\*\\w\\s]*\\)(?=\\s*\\{)");
+    List matches = new ArrayList();
+    
+    while (matcher.contains(input, pattern)) {
+      matches.add(matcher.getMatch().group(0) + ";");
+    }
+    
+    return matches;
+  }
+}

=== added directory '.pc/wrapper_for_deb.patch'
=== added file '.pc/wrapper_for_deb.patch/arduino'
--- .pc/wrapper_for_deb.patch/arduino	1970-01-01 00:00:00 +0000
+++ .pc/wrapper_for_deb.patch/arduino	2010-04-11 15:27:18 +0000
@@ -0,0 +1,22 @@
+#!/bin/sh
+ 
+APPDIR="$(dirname -- "${0}")"
+
+cd $APPDIR
+ 
+for LIB in \
+    java/lib/rt.jar \
+    java/lib/tools.jar \
+    lib/*.jar \
+    ;
+do
+    CLASSPATH="${CLASSPATH}:${APPDIR}/${LIB}"
+done
+export CLASSPATH
+
+LD_LIBRARY_PATH=`pwd`/lib:${LD_LIBRARY_PATH}
+export LD_LIBRARY_PATH
+
+export PATH="${APPDIR}/java/bin:${PATH}"
+
+java -Dswing.defaultlaf=com.sun.java.swing.plaf.gtk.GTKLookAndFeel processing.app.Base

=== added file 'arduino'
--- arduino	1970-01-01 00:00:00 +0000
+++ arduino	2010-04-11 15:27:18 +0000
@@ -0,0 +1,5 @@
+#!/bin/sh
+ 
+cd /usr/share/arduino
+
+java -Dswing.defaultlaf=com.sun.java.swing.plaf.gtk.GTKLookAndFeel -jar /usr/share/java/arduino.jar

=== modified file 'debian/README.source'
--- debian/README.source	2010-02-12 19:25:26 +0000
+++ debian/README.source	2010-04-11 15:27:18 +0000
@@ -1,5 +1,4 @@
-This package uses quilt to manage all modifications to the upstream source.
-Changes are stored in the source package as diffs in debian/patches and
-applied during the build.
-
-See /usr/share/doc/quilt/README.source for a detailed explanation
+This package gets its source from a combination of the upstream SVN and upstream
+released tarball. Both are found at http://arduino.cc/en/Main/Software. This
+package follows what would happen in the make.sh and dist.sh scripts in a debian
+compliant way.

=== added file 'debian/arduino.1'
--- debian/arduino.1	1970-01-01 00:00:00 +0000
+++ debian/arduino.1	2010-04-11 15:27:18 +0000
@@ -0,0 +1,30 @@
+.\"                                      Hey, EMACS: -*- nroff -*-
+.\" First parameter, NAME, should be all caps
+.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
+.\" other parameters are allowed: see man(7), man(1)
+.TH ARDUINO 1 "April 10, 2010"
+.\" Please adjust this date whenever revising the manpage.
+.\"
+.\" Some roff macros, for reference:
+.\" .nh        disable hyphenation
+.\" .hy        enable hyphenation
+.\" .ad l      left justify
+.\" .ad b      justify to both left and right margins
+.\" .nf        disable filling
+.\" .fi        enable filling
+.\" .br        insert line break
+.\" .sp <n>    insert n+1 empty lines
+.\" for manpage-specific macros, see man(7)
+.SH NAME
+arduino \- an IDE and uploader for Arduino development boards.
+.SH SYNOPSIS
+.B arduino
+.SH DESCRIPTION
+This program takes no options and will load the IDE in an X11 window.
+.SH SEE ALSO
+.BR http://www.arduino.cc/
+.SH AUTHOR
+arduino was written by <[e-mail]>.
+.PP
+This manual page was written by Scott Howard <[e-mail]>,
+for the Debian project (and may be used by others).

=== added file 'debian/arduino.desktop'
--- debian/arduino.desktop	1970-01-01 00:00:00 +0000
+++ debian/arduino.desktop	2010-04-11 15:27:18 +0000
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Type=Application
+Name=arduino
+GenericName=Program Atmegas the easy way
+Exec=arduino
+Icon=arduino
+Terminal=false
+Categories=Engineering;Electronics;

=== removed file 'debian/arduino.png.uuencode'
--- debian/arduino.png.uuencode	2010-02-12 19:25:26 +0000
+++ debian/arduino.png.uuencode	1970-01-01 00:00:00 +0000
@@ -1,86 +0,0 @@
-begin-base64 644 arduino.png
-iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAYAAABXAvmHAAAAAXNSR0IArs4c
-6QAAAAZiS0dEAP8A/wD/oL2nkwAAAAlwSFlzAAALEwAACxMBAJqcGAAAAAd0
-SU1FB9oCCRAXGHJwNrMAAAAZdEVYdENvbW1lbnQAQ3JlYXRlZCB3aXRoIEdJ
-TVBXgQ4XAAAOHUlEQVRo3tWaa4wd51nHf887M+fszbtre33bNBeTNL7UMU4D
-CUqhUqOWWlUVUFRKhVpxiUtRAYkKFImkaSgR8AEJqQLRRDVSVZBQQFStACUp
-uUBD0tLc3CTOpbbreBOv7V17be+e3T1n5n3fhw/vO3Nmzm5FQHzpSLNn5uyc
-Oc/l//yf//POEVUVfoy3dL03b7j7ywdQvU3RMbyCDuwAquGwdh4PQMNL+CMD
-/wdF47vS/0x1riASDuOrZO2OtIafePlPDh0ZtFXqGbjhngemQQ9LOzsoadr/
-Yq+od+AVXHBCvYe4q2o81nheHgdPJM1QW4CCL3JQH+4rBhEh3biFYuEcre1X
-Yy/OkYxuAAG7eJ5kwwTF+TNoIpjhsUeyjTsOvXT/nbOlzaYf9QemMfKfycTY
-QTM8hCQJIlJFSTBk27eSbJoEryQTE2Q7dgQjPOCJRgMu7l4x7RFaO64mHZ8i
-ndyCOK3+n41vJZvcgZg24gWTDCGkiGSIaYGXCBKDqOCXLh3M504+s//ew9Nr
-ISR6ONkwek1Im5BdvQ2/uIw9ewF1HhHBjIygDtRaTKuFGRpGFHxeoF7JprZg
-RjeAdcERVeylBbpvHA1Z0pCxdGIryfgmirkZ3Moire070aJA8wItcjTPQQTN
-e2jeQ4xBWm1sZxVdvnRVfuGtw8BHqgzsu/vLB6SVHQRBXUw/JsDZerAO383p
-HXsTO/M2FI5i5jT5sRP4zioUDqwFq4gT8AbUgBNwihYWCosWFnUOdS6871ww
-vMjD3utWDvi8iy96aK8XrvcOzVdQm2MvnTl4w72HD/QzoHqbpGmFay0s+esn
-UedJNk2SjI9TvPk2vrMMzlU1UTqr3qPek5+e6ddD7bWMvvqAtWL+LYq5mVAr
-6kPkbVE544s8lHrew7RGyOdPYRdtQLMBdT38yuJtwJHSgbFQYR6cD4ZZD86h
-vQJWemAtQ7v24BeX6J04HhwtHfYDRY32HSiLuu6EOsrvU1UoCtQ5fG6BBKyn
-WJqntfkaeqdP0N52Pd3Z11B1ICEgvrc6Vs9AxRhE49VZcB43dx5nzyFJhr+8
-FFJvbZ9xvCc1wkduvYGb9+xkqJVGJi0pt067yqnZOb7+b88wc2a+YiNvHWod
-OI/JRikunSWb3EY+d4ps6ko0L0hHNlFcPoMKMbP1Io6QEBXUetQ5zNAwurIa
-MOlC1PxSB0lawcEY3c3jIzx416fYc82Od9x8Dt3xQe750tf4xmPfAVWKi7O0
-p3aSz50knZwm3bCNfH6GbPOV5GffJB3fRHFxDvUaW4WiqqZPo6oVdNQ5JElo
-X3M1rekrQmSsBevQwqNWYxGGYvzT37qDvTunEZF3vLdbGX/2uV9l19XTqHf4
-bofu3AnS8e3kC2+jeU42eSW9uZNkE9Pk82+hhWVo2y5ak+8KNim+1gdK3AfD
-BKGYOY2u5pj2EK3tVwbvnfZrw3mund7Cz+6/Di0LFd7xcZokfOr2DwTse4fv
-LpEvzJCNbaFYPIvrLtHaeBW9uRO0Nu8MjGU9aiN5xHtFCBEiDME741HjUBzp
-xBQiKUl7JBiPhkypct0VUw1o/P2/PsUD//BohW3VegErWzaN849/eS9GQnPc
-tfNdodYIzjl7EbzHDI0jKvTOvE628Qp83kVtwerbL8drXbMGVBXxDlRCdK1D
-Eg/i0dxhF88HXk8CDQZZ4TGqsVuH7fjMLLNn56OU8H2ajE6cPTeHc54kC3HL
-0gS8jbIpFLztXKA9tBG1Bb7ohoBKyDpS6ixXkUPFQoHTYyaMC4VKpNUYeUgA
-FxnKBUdiAIDQD5xF1dWc0H5GoizRmrDzzlXGx7sgrdHguHPgLIhBve2Lwdpx
-n0ZtcECdQ6zHG4fBV6wkmCBg1IK1oZF52zAGdXhXNKJPpFNVj2JqyjMGztuG
-klVVuvPHogMFZmgiBCUGK3jt18uAi/aFDIiLCq0sWnyAmCHe0IL3DQiVGaCC
-Tk25qqKJD7IrfkbRWANNOe4656t7ds+9AdrPtigheM0MEPUGAWtlIRONt0Ug
-LFO28iJmwDch4X3AtO8XceNVBiCk4TPJyBQ+X8Lb1docUfrlK/0kIsFpdYMD
-jYJ1JGOTpGObyc/MRNhY1Oah8xKiTxIzoKGY6xAKX2YjZdaNL2sgGWhpiqRt
-THsUSRLc5U4jGyJCOrwZ9Za8e5ls4ip8sYrtnK1mobSeSnvxPG5hATEpai2q
-eRBZrgg1oBIlja0U4iCEvPdBOdbos6yD8kvrn3G9DpIu4vNOIBJAqnIG25mv
-st27OBMluRvoA6qh26rgix4mGwJJUJUQfWfxCKIgsV60NLIBiVB4peHh/b4i
-FdGB68O9isXZaI/WRs4wXhaduf7Igqu+pwEhkUhnHtTleBEMBtUEtRZvbcCf
-SghmifNBCJUKNbJPWQsluyCDACIWpzZnY5PQ2vRufL6EXTzduL4KFI1GRl/f
-2BzBoGQoNmDaFaiEsQ6VOAuEDNThENmgVsRao1ENE2IDQv2ClPpo7z1adEP9
-ldGOGZJYa2toVIyQjG+lOHcKby1GLErRn6BEQzdWE2nUr2GhijHqUdd+FsIK
-xyALxWtNRjq8Cbsyj3cFvQvHa6sXJYRidQxCCJRkbAK1BWZkEre8hIrFE1Wo
-t4gksYj7Gai4vtZgtBpoaixUpllkDQuVEEpHplBvMUMTuOXzDVDVi1oGHDDl
-Zfn8DD5fpVg4E+YDF42vpLPFe9eAD1ELlXvF0T7OsOVSTOlY2Yzi9VXWVLHL
-86i3uOX5oHXUkbTGopUpko1W4lDX1oDiuh38ygrqlHTTdvL5HyKjLURM31hM
-LGTXiG6ZhRv37ebjv/Dh2mJXczIzxmCMabBQVfDOYZfnmvVkMkQMgokI8JGN
-daAGIIozJZu8ivzCKbIN0/iiR7F0lnTDjuo427AjRDPOt3UI3fHRD3HHRz/0
-v1oarBdkf/wML0XnbJUpKZZrrg3UgMYIJEOTaN4jaW3ArV5GXUEytBG3ehlv
-c9KRzeSXZmodWAdY6P+w1RxQYPOmSX7vs5/mPbt3cfT1N/jSX3+FhYVLFf61
-Fv01Wigd20Jx4TQmHUFMhut2QByStFC/gu8t4bqLTZlQg1DoFe/8WFF8nVHS
-lK//3WF2X38dxhh+7tabef+tt/Dzt3+CoihqfUDXLu6q92ivi2mNgS3oXTpD
-tmF7aOdLs6Sj2+ieP1YVXdnO6xD654cf55n/eq4yri8jwrkxhvs/fxdJYmoQ
-0qoPvP/Wm9m7+3oe+qdv8uzzR/jD3/9d9u6+nvf9zE/x5LefHmyBNQdEqyG9
-nHdRj7ddEEMyPEX3wolKHgfj+yxUbt999gX+5m8fqmWoHFSCE0mS8MW7/4A0
-TSo7pDbMDLVbiAjOOV78/su8+dbbTE1tZqjd7gu89WoApRolS4rUqMGlbCfR
-aPUeSYfwveU1EKpUaOwFqlo1o77WqWet1ieAp57+LucvLPDhD36AT3zsFzHG
-cP7CAk9/53sNfVSu4DdWp8NI6Sq111918xVsVD3J8CbS4S0kw5vXQKicl716
-vPoq8lSizq/DQlrtlxeX+Ngn7+TED99kZWWV7z33Ih//5J1cXrocDe8PSWtX
-pyuDwzJHdS5R4MYG5XtLoILrLa6BkNZgI6XapLmcMiinpREAeOmlo3z6tz/H
-7l3v5o0fHOf06dl1xdyaTlx2ypCJOBJSW8+MnO/zZYql0/hiuYpEP4oR8cqa
-JZV65NZfLwrX/85nfoMXnnmch772FZ5/+jE++5u/3lS5jb5Rr4E4u9YLMLR+
-01/2qA3ror4R3X7rbSrQfsdVMIa1gtpXl1z7Ezv5o8/fxWNP/gfPvXCEn77p
-Ru675y4e/dbjHD9xcp3vKTMgDDwD64+B9b00KB3ZVvFBXQsN3lwiRMrHXaWx
-jeu1v+/ftxdjDI8/+W3+/C/+iif//SmSJGHfe/ZUOrDqzDJYA7XxTxtjYF0C
-l6sMRaMj9rlcw8SmzRVpEQZm55pkKI9FOHYsUPVNNx7gV365w3tv/ElUtRH9
-gZKpNbJ1Il5OYb7okLTHsd2LYfVsZR7w9Ho58+cvVDdbXe32nz3WO75Gx7xy
-/sICWZYBcPHS5cYa0StHX+PBw1/lM4d+jV+643YAHjz8VY6++mrjiaas+5i1
-HPkihSat8YB/20Vtj2R4Ey5fjCsUwbiHv/U4Dz/6WFj4jTUhtUesimLSNsa0
-cL1F1DlueO/7GkUoAwf3fOF+vvHNf2Hv3t28+tobPPf8i6DSHCVUm2ujMtTu
-EJdJbPci2dgO1BXki7Nko9uQpEXROUM2Nk1+6WQ/vNpvUBonpn7njRI6aSMm
-Q5IMtb2B2bE/rNR58tnnX+C5518I94wqrkJaPDHtdqcq4mRy8xNmYoLi0ila
-G6YplmZRV5CNbcd1F1DbpTWxE5O041wQ9nRkK9loeLCRZKOkw1uRpN3QQr53
-Gd9bRF1vkMybgP7RZNZnzlgz6eatpFPTT1QOvHLfoSOtndc9oi6nWDpD0hoP
-lGpXEJMiJiW/eILewrFaUVNbw9HB9hqdLJdOeggSn+Bq3AcoaJ1d0Or68hz1
-DO058MjR++480pASw7v3H8quvW7Gri4gYnDdBSQdRpJh7PI50pGtYWG3pmls
-5yxFZzY+K+5gl8+idmVgAXeA5ZR1ekQT2yX9ap0E4s2G9900M7r/lkPr/9Tg
-jw9Pr77+/cO94z84KHmK6y4iaRuRBJ8vo/hQjHW12egRA7mnWdCD657/0yY1
-SsumtjO058ZHRvffcuiVL/R/aiDr/Vpl3xcPH7AL87dprzvWhKmu7aS6nknK
-/8dWGmbarU46dcUTJWx+5I89fhy3/wa6WiIDIeDekgAAAABJRU5ErkJggg==
-====

=== added file 'debian/arduino.xpm'
--- debian/arduino.xpm	1970-01-01 00:00:00 +0000
+++ debian/arduino.xpm	2010-04-11 15:27:18 +0000
@@ -0,0 +1,691 @@
+/* XPM */
+static char * arduino_xpm[] = {
+"32 32 656 2",
+"  	c None",
+". 	c #2D7E99",
+"+ 	c #2D819C",
+"@ 	c #2D809B",
+"# 	c #2D7D99",
+"$ 	c #2C7B96",
+"% 	c #2C7895",
+"& 	c #2C7693",
+"* 	c #2B7491",
+"= 	c #2B728F",
+"- 	c #2B708D",
+"; 	c #2A6E8C",
+"> 	c #2A6C8A",
+", 	c #2A6A88",
+"' 	c #2A6B8A",
+") 	c #2A6987",
+"! 	c #296886",
+"~ 	c #296482",
+"{ 	c #286381",
+"] 	c #296583",
+"^ 	c #2B6D8C",
+"/ 	c #2B6F8F",
+"( 	c #2B6E8E",
+"_ 	c #2B6F8E",
+": 	c #2B708C",
+"< 	c #28657E",
+"[ 	c #27667D",
+"} 	c #2D829D",
+"| 	c #2F8AA3",
+"1 	c #3093AA",
+"2 	c #2E849F",
+"3 	c #2E809C",
+"4 	c #3193AD",
+"5 	c #2F87A3",
+"6 	c #2F83A0",
+"7 	c #308BA8",
+"8 	c #2B708F",
+"9 	c #2B6D8D",
+"0 	c #2D7697",
+"a 	c #2C7294",
+"b 	c #2C6F91",
+"c 	c #2C7194",
+"d 	c #2D7195",
+"e 	c #2B698B",
+"f 	c #295F80",
+"g 	c #2A6588",
+"h 	c #2C6D93",
+"i 	c #2C6C92",
+"j 	c #2D7096",
+"k 	c #2D6F94",
+"l 	c #2D7093",
+"m 	c #2C6F8F",
+"n 	c #275D76",
+"o 	c #275F76",
+"p 	c #266073",
+"q 	c #2F89A3",
+"r 	c #34A5B9",
+"s 	c #2D7A98",
+"t 	c #2E819E",
+"u 	c #2D7695",
+"v 	c #2E7797",
+"w 	c #2B6889",
+"x 	c #2B6A8B",
+"y 	c #3185AB",
+"z 	c #3181A9",
+"A 	c #3181AB",
+"B 	c #2C698E",
+"C 	c #285A7B",
+"D 	c #275879",
+"E 	c #2A6389",
+"F 	c #2E709B",
+"G 	c #265473",
+"H 	c #2B658A",
+"I 	c #2C688D",
+"J 	c #2B668B",
+"K 	c #2B6789",
+"L 	c #2A6584",
+"M 	c #275D75",
+"N 	c #28637B",
+"O 	c #245868",
+"P 	c #256070",
+"Q 	c #2D809C",
+"R 	c #2E86A0",
+"S 	c #2E829D",
+"T 	c #2D7E9A",
+"U 	c #2F87A4",
+"V 	c #3292AE",
+"W 	c #2E7A9A",
+"X 	c #2D7192",
+"Y 	c #2B6486",
+"Z 	c #2A6184",
+"` 	c #295F81",
+" .	c #285C7E",
+"..	c #285A7C",
+"+.	c #28587A",
+"@.	c #275678",
+"#.	c #275475",
+"$.	c #265273",
+"%.	c #265170",
+"&.	c #254F6D",
+"*.	c #254D6B",
+"=.	c #295D82",
+"-.	c #2A6085",
+";.	c #295E81",
+">.	c #285D7E",
+",.	c #285C7A",
+"'.	c #275D79",
+").	c #234F62",
+"!.	c #235161",
+"~.	c #245A6A",
+"{.	c #2D7D9A",
+"].	c #2C7896",
+"^.	c #2D7594",
+"/.	c #2D7696",
+"(.	c #3184A7",
+"_.	c #307CA0",
+":.	c #2A6284",
+"<.	c #2A5E81",
+"[.	c #2B5D80",
+"}.	c #678AA3",
+"|.	c #85A0B4",
+"1.	c #86A0B4",
+"2.	c #859EB2",
+"3.	c #859DB0",
+"4.	c #859CAE",
+"5.	c #8098AA",
+"6.	c #476881",
+"7.	c #244A67",
+"8.	c #244865",
+"9.	c #28577D",
+"0.	c #295980",
+"a.	c #285A7F",
+"b.	c #28597C",
+"c.	c #28597B",
+"d.	c #296184",
+"e.	c #24516A",
+"f.	c #224B5D",
+"g.	c #235467",
+"h.	c #2C7B97",
+"i.	c #2D7996",
+"j.	c #318AA8",
+"k.	c #2C6E8F",
+"l.	c #2F779C",
+"m.	c #2E739A",
+"n.	c #295C80",
+"o.	c #2D5C80",
+"p.	c #C4D1DB",
+"q.	c #FFFFFF",
+"r.	c #FCFCFD",
+"s.	c #788D9F",
+"t.	c #234561",
+"u.	c #254D6F",
+"v.	c #275277",
+"w.	c #285880",
+"x.	c #275378",
+"y.	c #275579",
+"z.	c #254F6E",
+"A.	c #224760",
+"B.	c #244D66",
+"C.	c #235065",
+"D.	c #2C7894",
+"E.	c #2D7896",
+"F.	c #328DAD",
+"G.	c #2E7598",
+"H.	c #2D6E93",
+"I.	c #2E7199",
+"J.	c #2E6D97",
+"K.	c #28577C",
+"L.	c #7995AC",
+"M.	c #F5F6F7",
+"N.	c #2C4A65",
+"O.	c #21405B",
+"P.	c #244A6B",
+"Q.	c #254D71",
+"R.	c #27537A",
+"S.	c #254E71",
+"T.	c #265175",
+"U.	c #234967",
+"V.	c #224C62",
+"W.	c #2C7492",
+"X.	c #2D7494",
+"Y.	c #307FA2",
+"Z.	c #317DA4",
+"`.	c #3077A1",
+" +	c #2E6B95",
+".+	c #2D6894",
+"++	c #275478",
+"@+	c #9FB2C2",
+"#+	c #F8F9FA",
+"$+	c #3C5B79",
+"%+	c #355572",
+"&+	c #345370",
+"*+	c #34526D",
+"=+	c #33506B",
+"-+	c #7F91A1",
+";+	c #4B6277",
+">+	c #203C56",
+",+	c #203C55",
+"'+	c #254B6F",
+")+	c #244A6D",
+"!+	c #24496A",
+"~+	c #1F3B52",
+"{+	c #1F3B51",
+"]+	c #21495F",
+"^+	c #2B718E",
+"/+	c #2C6E90",
+"(+	c #2F7A9F",
+"_+	c #3076A0",
+":+	c #2D6A94",
+"<+	c #2D6692",
+"[+	c #2C6490",
+"}+	c #264F72",
+"|+	c #A0B0C0",
+"1+	c #F4F6F7",
+"2+	c #234463",
+"3+	c #224260",
+"4+	c #21405D",
+"5+	c #213E5A",
+"6+	c #203D58",
+"7+	c #697C8E",
+"8+	c #4C6175",
+"9+	c #1E3851",
+"0+	c #1E3850",
+"a+	c #224364",
+"b+	c #254D75",
+"c+	c #234465",
+"d+	c #1E364D",
+"e+	c #20455C",
+"f+	c #2A6D8B",
+"g+	c #2A6989",
+"h+	c #2B698C",
+"i+	c #2E749C",
+"j+	c #2E709D",
+"k+	c #2C6591",
+"l+	c #2B618D",
+"m+	c #2B5E8A",
+"n+	c #25496C",
+"o+	c #9FAEBD",
+"p+	c #21405C",
+"q+	c #203D59",
+"r+	c #203C57",
+"s+	c #203B55",
+"t+	c #1F3953",
+"u+	c #68798A",
+"v+	c #4B5E70",
+"w+	c #1D354B",
+"x+	c #1C344A",
+"y+	c #1C354B",
+"z+	c #1F3B56",
+"A+	c #1F3C59",
+"B+	c #254A71",
+"C+	c #1D3348",
+"D+	c #204359",
+"E+	c #296485",
+"F+	c #2A6487",
+"G+	c #2E6E99",
+"H+	c #2E6B9A",
+"I+	c #2B608B",
+"J+	c #2A5C87",
+"K+	c #2A5883",
+"L+	c #244565",
+"M+	c #9EADBA",
+"N+	c #F4F5F7",
+"O+	c #1F3A54",
+"P+	c #1F3851",
+"Q+	c #1E364F",
+"R+	c #1D354D",
+"S+	c #677786",
+"T+	c #4A5B6D",
+"U+	c #1E3853",
+"V+	c #1B3146",
+"W+	c #1B3145",
+"X+	c #1B3045",
+"Y+	c #1C3146",
+"Z+	c #1D364F",
+"`+	c #1C3044",
+" @	c #1F4156",
+".@	c #296684",
+"+@	c #2C6E93",
+"@@	c #2B658B",
+"#@	c #2D6994",
+"$@	c #2C6592",
+"%@	c #2A5A84",
+"&@	c #295680",
+"*@	c #28547D",
+"=@	c #22415F",
+"-@	c #9EABB8",
+";@	c #F4F5F6",
+">@	c #1D344C",
+",@	c #1C334A",
+"'@	c #1C3148",
+")@	c #667483",
+"!@	c #4A5C6E",
+"~@	c #224369",
+"{@	c #1A2E41",
+"]@	c #1D354F",
+"^@	c #213F62",
+"/@	c #1B3044",
+"(@	c #1F3854",
+"_@	c #1E3F53",
+":@	c #28627F",
+"<@	c #285A7D",
+"[@	c #2B638C",
+"}@	c #28557D",
+"|@	c #28527A",
+"1@	c #264F76",
+"2@	c #9DA9B5",
+"3@	c #1C3249",
+"4@	c #1C3147",
+"5@	c #1B3046",
+"6@	c #1B2F44",
+"7@	c #657380",
+"8@	c #485666",
+"9@	c #192B3F",
+"0@	c #192B3E",
+"a@	c #182A3E",
+"b@	c #192B3D",
+"c@	c #192A3D",
+"d@	c #1A2A3C",
+"e@	c #1E3D51",
+"f@	c #285F7C",
+"g@	c #275574",
+"h@	c #275474",
+"i@	c #2A5C84",
+"j@	c #2A5A85",
+"k@	c #275077",
+"l@	c #264D74",
+"m@	c #254A70",
+"n@	c #9DA8B3",
+"o@	c #1A2E43",
+"p@	c #1A2D41",
+"q@	c #192C40",
+"r@	c #64707E",
+"s@	c #465463",
+"t@	c #18293B",
+"u@	c #18293A",
+"v@	c #1D3756",
+"w@	c #1C324C",
+"x@	c #192939",
+"y@	c #1D3C4F",
+"z@	c #275E7A",
+"A@	c #285979",
+"B@	c #254E6C",
+"C@	c #28577E",
+"D@	c #28557F",
+"E@	c #254B70",
+"F@	c #25496F",
+"G@	c #24466B",
+"H@	c #9CA6B1",
+"I@	c #192C41",
+"J@	c #192B40",
+"K@	c #18293C",
+"L@	c #636F7B",
+"M@	c #465360",
+"N@	c #172738",
+"O@	c #192D44",
+"P@	c #18293E",
+"Q@	c #17273A",
+"R@	c #172636",
+"S@	c #182636",
+"T@	c #1C3B4D",
+"U@	c #2A6286",
+"V@	c #244966",
+"W@	c #275278",
+"X@	c #265079",
+"Y@	c #24476C",
+"Z@	c #23456A",
+"`@	c #224366",
+" #	c #1C324A",
+".#	c #9BA5AF",
+"+#	c #17283A",
+"@#	c #172739",
+"##	c #636D79",
+"$#	c #45515D",
+"%#	c #162434",
+"&#	c #1B3352",
+"*#	c #17293D",
+"=#	c #162433",
+"-#	c #172433",
+";#	c #1C394A",
+">#	c #245369",
+",#	c #22455C",
+"'#	c #254E70",
+")#	c #264B73",
+"!#	c #234467",
+"~#	c #224265",
+"{#	c #213F61",
+"]#	c #1B3047",
+"^#	c #9BA4AD",
+"/#	c #F6F7F8",
+"(#	c #515E6D",
+"_#	c #515D6B",
+":#	c #515C6A",
+"<#	c #505C69",
+"[#	c #505B68",
+"}#	c #899099",
+"|#	c #454F5B",
+"1#	c #152231",
+"2#	c #152230",
+"3#	c #192B44",
+"4#	c #172537",
+"5#	c #18283D",
+"6#	c #162230",
+"7#	c #1B3848",
+"8#	c #235066",
+"9#	c #224763",
+"0#	c #234366",
+"a#	c #24466D",
+"b#	c #203E60",
+"c#	c #203C5C",
+"d#	c #1A2D43",
+"e#	c #9AA2AB",
+"f#	c #444E58",
+"g#	c #14212E",
+"h#	c #14212D",
+"i#	c #353F4A",
+"j#	c #1D2935",
+"k#	c #15212D",
+"l#	c #16212D",
+"m#	c #1B3846",
+"n#	c #254D70",
+"o#	c #224267",
+"p#	c #213E60",
+"q#	c #9AA1AA",
+"r#	c #434D56",
+"s#	c #121F2B",
+"t#	c #BDC0C4",
+"u#	c #FDFEFE",
+"v#	c #EAEBEC",
+"w#	c #38414B",
+"x#	c #151F2B",
+"y#	c #1A3645",
+"z#	c #214A5F",
+"A#	c #234768",
+"B#	c #254972",
+"C#	c #203C5D",
+"D#	c #99A0A9",
+"E#	c #F7F7F8",
+"F#	c #57606C",
+"G#	c #56606A",
+"H#	c #565F69",
+"I#	c #565E68",
+"J#	c #555E67",
+"K#	c #8C9298",
+"L#	c #424C55",
+"M#	c #121E2A",
+"N#	c #414B54",
+"O#	c #505861",
+"P#	c #DFE0E2",
+"Q#	c #91969B",
+"R#	c #141E29",
+"S#	c #151E29",
+"T#	c #193544",
+"U#	c #21475D",
+"V#	c #234264",
+"W#	c #24456E",
+"X#	c #1F3958",
+"Y#	c #1E3858",
+"Z#	c #182A3F",
+"`#	c #18283C",
+" $	c #999FA7",
+".$	c #F4F4F5",
+"+$	c #14212F",
+"@$	c #14202D",
+"#$	c #131F2B",
+"$$	c #121E2B",
+"%$	c #5F6770",
+"&$	c #414A53",
+"*$	c #111C27",
+"=$	c #26303A",
+"-$	c #F6F6F7",
+";$	c #C1C3C6",
+">$	c #FEFEFE",
+",$	c #6E747A",
+"'$	c #141D28",
+")$	c #193543",
+"!$	c #20445A",
+"~$	c #223F60",
+"{$	c #23436A",
+"]$	c #1F395A",
+"^$	c #1E3655",
+"/$	c #1D3655",
+"($	c #18293D",
+"_$	c #1C3351",
+":$	c #1B314F",
+"<$	c #999FA6",
+"[$	c #131F2C",
+"}$	c #121D29",
+"|$	c #111D28",
+"1$	c #5F666E",
+"2$	c #414952",
+"3$	c #111B25",
+"4$	c #495159",
+"5$	c #A3A7AB",
+"6$	c #767C81",
+"7$	c #141D27",
+"8$	c #131C26",
+"9$	c #141C26",
+"0$	c #193441",
+"a$	c #204258",
+"b$	c #213C5D",
+"c$	c #224066",
+"d$	c #1F3757",
+"e$	c #1D3552",
+"f$	c #1C3452",
+"g$	c #172639",
+"h$	c #162436",
+"i$	c #999EA5",
+"j$	c #F3F4F5",
+"k$	c #121D2A",
+"l$	c #111B26",
+"m$	c #5F656D",
+"n$	c #414850",
+"o$	c #111A24",
+"p$	c #767B81",
+"q$	c #D7D9DB",
+"r$	c #ABAEB1",
+"s$	c #1D242E",
+"t$	c #131A23",
+"u$	c #193340",
+"v$	c #20395A",
+"w$	c #213E64",
+"x$	c #1E3554",
+"y$	c #1C324F",
+"z$	c #1B324F",
+"A$	c #172538",
+"B$	c #162435",
+"C$	c #162233",
+"D$	c #989EA4",
+"E$	c #111B27",
+"F$	c #111A25",
+"G$	c #5F656C",
+"H$	c #40484F",
+"I$	c #101922",
+"J$	c #313941",
+"K$	c #5E646A",
+"L$	c #C3C5C7",
+"M$	c #818489",
+"N$	c #131922",
+"O$	c #19323F",
+"P$	c #1F4056",
+"Q$	c #203858",
+"R$	c #213D62",
+"S$	c #1E3452",
+"T$	c #1C314E",
+"U$	c #1B304E",
+"V$	c #172536",
+"W$	c #17273D",
+"X$	c #17263A",
+"Y$	c #989DA3",
+"Z$	c #F3F4F4",
+"`$	c #121D28",
+" %	c #5F646B",
+".%	c #40464E",
+"+%	c #101822",
+"@%	c #363C45",
+"#%	c #4C5259",
+"$%	c #BCBEC0",
+"%%	c #86898E",
+"&%	c #19333F",
+"*%	c #1F3F54",
+"=%	c #1F3756",
+"-%	c #213C60",
+";%	c #1E3350",
+">%	c #1D3252",
+",%	c #1B304D",
+"'%	c #162232",
+")%	c #15212F",
+"!%	c #656C75",
+"~%	c #A3A7AC",
+"{%	c #9CA0A5",
+"]%	c #131C27",
+"^%	c #131A26",
+"/%	c #121925",
+"(%	c #121A25",
+"_%	c #111822",
+":%	c #A2A4A8",
+"<%	c #2E343C",
+"[%	c #101721",
+"}%	c #101821",
+"|%	c #888C90",
+"1%	c #BEBFC2",
+"2%	c #232831",
+"3%	c #141922",
+"4%	c #1F3F53",
+"5%	c #1E3352",
+"6%	c #1E3251",
+"7%	c #1B2F4B",
+"8%	c #1B2F4C",
+"9%	c #15202E",
+"0%	c #141D2A",
+"a%	c #141C28",
+"b%	c #131B27",
+"c%	c #131A25",
+"d%	c #121923",
+"e%	c #162134",
+"f%	c #141D2D",
+"g%	c #121822",
+"h%	c #121821",
+"i%	c #121820",
+"j%	c #131820",
+"k%	c #131821",
+"l%	c #141821",
+"m%	c #19313E",
+"n%	c #20475A",
+"o%	c #1D2F47",
+"p%	c #1F3558",
+"q%	c #1D2F4B",
+"r%	c #1D3251",
+"s%	c #1C3050",
+"t%	c #16212F",
+"u%	c #16202D",
+"v%	c #192942",
+"w%	c #162132",
+"x%	c #162337",
+"y%	c #162033",
+"z%	c #131924",
+"A%	c #131823",
+"B%	c #131822",
+"C%	c #12171F",
+"D%	c #13171F",
+"E%	c #14171F",
+"F%	c #1C3C4A",
+"G%	c #1C3646",
+"H%	c #1E314F",
+"I%	c #1D304C",
+"J%	c #1E3252",
+"K%	c #1C2D47",
+"L%	c #182436",
+"M%	c #16212E",
+"N%	c #151F2C",
+"O%	c #162133",
+"P%	c #151D2A",
+"Q%	c #151D2C",
+"R%	c #141B29",
+"S%	c #131923",
+"T%	c #131721",
+"U%	c #131720",
+"V%	c #182833",
+"W%	c #1F4457",
+"X%	c #1F4057",
+"Y%	c #1E3F57",
+"Z%	c #1E3D53",
+"`%	c #1D3D53",
+" &	c #1B3646",
+".&	c #1A3545",
+"+&	c #193443",
+"@&	c #193442",
+"#&	c #193341",
+"$&	c #183240",
+"%&	c #18313F",
+"&&	c #18313E",
+"*&	c #18303D",
+"=&	c #18303C",
+"-&	c #19303C",
+";&	c #1B3C49",
+"                                                                ",
+"      . + @ # $ % & * = - ; > , ' ) ! ~ { ] ^ / ( _ : < [       ",
+"    } | 1 2 3 4 5 6 7 8 9 0 a b c d e f g h i j k l m n o p     ",
+"  . q | r 2 s t s u v w x y z A B C D E F G H I J K L M N O P   ",
+"  Q R S T U V W X w Y Z `  ...+.@.#.$.%.&.*.=.-.;.>.,.'.).!.~.  ",
+"  T S {.].^./.(._.:.<.[.}.|.1.2.3.4.5.6.7.8.9.0.a.b.c.d.e.f.g.  ",
+"  h.{.i.j.k.K l.m.n.o.p.q.q.q.q.q.q.q.r.s.t.u.v.w.x.y.z.A.B.C.  ",
+"  D.E.s F.G.H.I.J.K.L.q.q.q.q.q.q.q.q.q.M.N.O.P.Q.R.S.T.U.y.V.  ",
+"  * W.X.Y.Z.`. +.+++@+q.#+$+%+&+*+=+-+q.q.;+>+,+'+)+)+!+~+{+]+  ",
+"  ^+_ /+(+_+:+<+[+}+|+q.1+2+3+4+5+6+7+q.q.8+9+0+a+b+c+c+d+d+e+  ",
+"  f+g+h+i+j+k+l+m+n+o+q.1+p+q+r+s+t+u+q.q.v+w+x+y+z+A+B+C+C+D+  ",
+"  ) E+F+G+H+I+J+K+L+M+q.N+r+O+P+Q+R+S+q.q.T+U+V+W+X+Y+Z+`+`+ @  ",
+"  .@+@@@#@$@%@&@*@=@-@q.;@9+Q+>@,@'@)@q.q.!@~@V+{@{@]@^@/@(@_@  ",
+"  :@C <@[@I+}@|@1@q+2@q.;@>@3@4@5@6@7@q.q.8@9@0@a@b@c@c@d@d@e@  ",
+"  f@g@h@i@j@k@l@m@O+n@q.;@4@X+o@p@q@r@q.q.s@t@u@u@v@w@x@x@x@y@  ",
+"  z@A@B@C@D@E@F@G@Q+H@q.;@o@I@J@a@K@L@q.q.M@N@O@N@P@Q@R@S@S@T@  ",
+"  :@U@V@W@X@Y@Z@`@ #.#q.;@J@a@t@+#@###q.q.$#%#&#*#=#=#=#-#-#;#  ",
+"  >#,#'#E@)#!#~#{#]#^#q./#(#_#:#<#[#}#q.q.|#1#2#2#2#3#4#5#6#7#  ",
+"  8#9#)+)#0#a#b#c#d#e#q.q.q.q.q.q.q.q.q.q.f#g#h#h#i#j#k#l#l#m#  ",
+"  V.n#Y@0#o#p#^@d#J@q#q.q.q.q.q.q.q.q.q.q.r#s#h#t#u#v#w#x#x#y#  ",
+"  z#A#B#p#p#C#5@J@K@D#q.E#F#G#H#I#J#K#q.q.L#M#N#q.O#P#Q#R#S#T#  ",
+"  U#V#W#C#X#Y#J@Z#`# $q..$+$@$#$$$M#%$q.q.&$*$=$-$;$>$,$'$'$)$  ",
+"  !$~${$]$^$/$($_$:$<$q..$[$$$M#}$|$1$q.q.2$3$3$4$5$6$7$8$9$0$  ",
+"  a$b$c$d$e$f$Q@g$h$i$q.j$$$k$|$*$l$m$q.q.n$o$o$p$q$r$s$t$t$u$  ",
+"   @v$w$x$y$z$A$B$C$D$q.j$}$*$E$F$F$G$q.q.H$I$J$-$K$L$M$N$N$O$  ",
+"  P$Q$R$S$T$U$V$W$X$Y$q.Z$`$E$F$o$o$ %q.q..%+%@%-$#%$%%%N$N$&%  ",
+"  *%=%-%;%>%,%g$'%)%!%~%{%]%^%/%(%_%.%:%:%<%[%}%|%v#1%2%N$3%O$  ",
+"  4%Q$d$5%6%7%8%6#9%x#0%a%b%c%d%e%f%g%h%h%i%i%i%i%i%j%j%k%l%m%  ",
+"  n%o%;%p%q%r%s%t%u%v%w%x%y%z%N$c%A%B%k%j%j%C%C%C%C%D%D%D%E%F%  ",
+"    G%H%I%J%K%L%M%N%O%P%Q%R%S%B%B%T%U%D%C%C%C%C%C%C%D%D%E%V%    ",
+"      W%X%Y%Z%`% &.&+&@&#&$&%&%&&&*&*&=&=&=&=&=&=&=&=&-&;&      ",
+"                                                                "};

=== modified file 'debian/changelog'
--- debian/changelog	2010-02-12 19:25:26 +0000
+++ debian/changelog	2010-04-11 15:27:18 +0000
@@ -1,5 +1,5 @@
-arduino (0018+dfsg-0ubuntu1~ppa6) lucid; urgency=low
-
-  * Initial release. (LP: #230387)
-
- -- Alessio Igor Bogani <[e-mail]>  Fri, 12 Feb 2010 14:25:26 +0100
+arduino (0018+dfsg-1) unstable; urgency=low
+
+  * Initial release. (Closes: #577249)
+
+ -- Scott Howard <[e-mail]>  Sat, 10 Apr 2010 19:43:15 -0400

=== modified file 'debian/control'
--- debian/control	2010-02-12 19:25:26 +0000
+++ debian/control	2010-04-11 15:27:18 +0000
@@ -1,26 +1,25 @@
 Source: arduino
-Section: universe/devel
+Section: electronics
 Priority: optional
-Maintainer: Ubuntu Developers <[e-mail]>
-XSBC-Original-Maintainer: Arduino Ubuntu Team <[e-mail]>
-Build-Depends: debhelper (>= 7), quilt(>= 0.46-7~), sharutils
-Build-Depends-Indep: default-jdk, librxtx-java, subversion, unzip
+Maintainer: Scott Howard <[e-mail]>
+DM-Upload-Allowed: yes
+Build-Depends: debhelper (>= 7.0.50~), javahelper, default-jdk, librxtx-java,
+ liboro-java, libantlr-java, libecj-java, libjna-java, perl
 Standards-Version: 3.8.4
 Homepage: http://www.arduino.cc
 
 Package: arduino
 Architecture: all
-Depends: ${misc:Depends}, gcc-avr, avr-libc, avrdude (>= 5.10-1ubuntu1), default-jre | java6-runtime, librxtx-java (>=2.1.7r2-4ubuntu1)
-Description: The Arduino libraries and the development environment
- Arduino is an open-source electronics prototyping platform based on flexible,
- easy-to-use hardware and software. It's intended for artists, designers,
- hobbyists, and anyone interested in creating interactive objects or 
- environments.
- .
- Arduino can sense the environment by receiving input from a variety of sensors
- and can affect its surroundings by controlling lights, motors, and other
- actuators. The microcontroller on the board is programmed using the Arduino
- programming language (based on Wiring) and the Arduino development environment
- (based on Processing). Arduino projects can be stand-alone or they can
- communicate with software on running on a computer
- (e.g. Flash, Processing, MaxMSP).
+Depends: ${java:Depends}, ${misc:Depends}, gcc-avr, avr-libc, avrdude
+Recommends: extra-xdg-menus
+Description: AVR development board IDE and built-in libraries
+ Arduino is an open-source electronics prototyping platform
+ based on flexible, easy-to-use hardware and software. It's intended for
+ artists, designers, hobbyists, and anyone interested in creating interactive
+ objects or environments.
+ .
+ This pacakge will install the integrated development environment that allows
+ for program writing, code verfication, compiling, and uploading to the Arduino
+ development board. Libraries and example code will also be installed.
+ .
+ For more information, visit www.arduino.cc

=== modified file 'debian/copyright'
--- debian/copyright	2010-02-12 19:25:26 +0000
+++ debian/copyright	2010-04-11 15:27:18 +0000
@@ -1,9 +1,11 @@
 This package was debianized by:
 
-    Arduino Ubuntu Team <[e-mail]> on Wed, 03 Feb 2010 22:28:16 +0100
+    Scott Howard <[e-mail]>
+    based on the work of the Arduino Ubuntu Team <[e-mail]>
 
 This original source for this package was obtained via the upstream
 svn branch at http://arduino.googlecode.com/svn/trunk/
+and .tgz from www.arduino.cc
 
 Files: src/processing/xml/*
 Copyright: 2000-2002, Marc De Scheemaecker
@@ -125,7 +127,7 @@
  redistribute the Software for such purposes.
 
 Files: debian/*
-Copyright: 2010, Arduino Ubuntu Team <[e-mail]>
+Copyright: 2010, Scott Howard <[e-mail]>, Arduino Ubuntu Team <[e-mail]>
 License: GPL-2
 
 Files: src/processing/app/*, src/processing/app/syntax/PdeKeywords.java

=== removed file 'debian/docs'
--- debian/docs	2010-02-12 19:25:26 +0000
+++ debian/docs	1970-01-01 00:00:00 +0000
@@ -1,3 +0,0 @@
-license.txt
-todo.txt
-reference/

=== modified file 'debian/install'
--- debian/install	2010-02-12 19:25:26 +0000
+++ debian/install	2010-04-11 15:27:18 +0000
@@ -1,8 +1,4 @@
-resources/linux/startup/arduino		usr/bin
-resources/icons/arduino.desktop		usr/share/applications
-resources/icons/arduino.xpm			usr/share/pixmaps
-classes/arduino.jar					usr/share/java
-src/*.txt src/theme					usr/share/arduino
-src/about.jpg						usr/share/arduino/theme
-arduino.png							usr/share/pixmaps
-hardware/ libraries/				usr/share/arduino
+arduino		usr/bin
+examples/ hardware/ lib/ libraries/ reference/ tools/			usr/share/arduino
+debian/*.xpm usr/share/pixmaps
+debian/*.desktop usr/share/applications/

=== added file 'debian/javadoc'
--- debian/javadoc	1970-01-01 00:00:00 +0000
+++ debian/javadoc	2010-04-11 15:27:18 +0000
@@ -0,0 +1,1 @@
+debian/_jh_build.javadoc.ext/api/

=== added file 'debian/jlibs'
--- debian/jlibs	1970-01-01 00:00:00 +0000
+++ debian/jlibs	2010-04-11 15:27:18 +0000
@@ -0,0 +1,1 @@
+arduino.jar

=== added file 'debian/links'
--- debian/links	1970-01-01 00:00:00 +0000
+++ debian/links	2010-04-11 15:27:18 +0000
@@ -0,0 +1,2 @@
+/etc/avrdude.conf /usr/share/arduino/hardware/tools/avrdude.conf
+/usr/bin/avrdude /usr/share/arduino/hardware/tools/avrdude

=== added file 'debian/manpages'
--- debian/manpages	1970-01-01 00:00:00 +0000
+++ debian/manpages	2010-04-11 15:27:18 +0000
@@ -0,0 +1,1 @@
+debian/arduino.1

=== added file 'debian/menu'
--- debian/menu	1970-01-01 00:00:00 +0000
+++ debian/menu	2010-04-11 15:27:18 +0000
@@ -0,0 +1,6 @@
+?package(arduino):\
+       needs="X11"\
+       section="Applications/Science/Electronics"\
+       title="Arduino"\
+       command="arduino" \
+       icon="/usr/share/pixmaps/arduino.xpm"

=== removed file 'debian/patches/about-into-themedir.patch'
--- debian/patches/about-into-themedir.patch	2010-02-12 19:25:26 +0000
+++ debian/patches/about-into-themedir.patch	1970-01-01 00:00:00 +0000
@@ -1,14 +0,0 @@
-Moved about.jpg into theme directory
-Index: arduino-0018+dfsg/src/processing/app/Base.java
-===================================================================
---- arduino-0018+dfsg.orig/src/processing/app/Base.java	2010-02-12 14:29:23.691259101 +0100
-+++ arduino-0018+dfsg/src/processing/app/Base.java	2010-02-12 14:29:41.478822760 +0100
-@@ -1254,7 +1254,7 @@
-    * Show the About box.
-    */
-   public void handleAbout() {
--    final Image image = Base.getLibImage("about.jpg", activeEditor);
-+    final Image image = Base.getLibImage("/theme/about.jpg", activeEditor);
-     final Window window = new Window(activeEditor) {
-         public void paint(Graphics g) {
-           g.drawImage(image, 0, 0, null);

=== removed file 'debian/patches/adopt-avrdude-arduino-programmer-type.patch'
--- debian/patches/adopt-avrdude-arduino-programmer-type.patch	2010-02-12 19:25:26 +0000
+++ debian/patches/adopt-avrdude-arduino-programmer-type.patch	1970-01-01 00:00:00 +0000
@@ -1,102 +0,0 @@
-diff -ruNp arduino-0018+dfsg.orig/hardware/arduino/boards.txt arduino-0018+dfsg/hardware/arduino/boards.txt
---- arduino-0018+dfsg.orig/hardware/arduino/boards.txt	2009-12-18 17:05:52.000000000 +0100
-+++ arduino-0018+dfsg/hardware/arduino/boards.txt	2010-03-20 16:39:01.191499017 +0100
-@@ -2,7 +2,7 @@
- 
- atmega328.name=Arduino Duemilanove or Nano w/ ATmega328
- 
--atmega328.upload.protocol=stk500
-+atmega328.upload.protocol=arduino
- atmega328.upload.maximum_size=30720
- atmega328.upload.speed=57600
- 
-@@ -22,7 +22,7 @@ atmega328.build.core=arduino
- 
- diecimila.name=Arduino Diecimila, Duemilanove, or Nano w/ ATmega168
- 
--diecimila.upload.protocol=stk500
-+diecimila.upload.protocol=arduino
- diecimila.upload.maximum_size=14336
- diecimila.upload.speed=19200
- 
-@@ -42,7 +42,7 @@ diecimila.build.core=arduino
- 
- mega.name=Arduino Mega
- 
--mega.upload.protocol=stk500
-+mega.upload.protocol=arduino
- mega.upload.maximum_size=126976
- mega.upload.speed=57600
- 
-@@ -62,7 +62,7 @@ mega.build.core=arduino
- 
- mini.name=Arduino Mini
- 
--mini.upload.protocol=stk500
-+mini.upload.protocol=arduino
- mini.upload.maximum_size=14336
- mini.upload.speed=19200
- 
-@@ -82,7 +82,7 @@ mini.build.core=arduino
- 
- bt.name=Arduino BT
- 
--bt.upload.protocol=stk500
-+bt.upload.protocol=arduino
- bt.upload.maximum_size=14336
- bt.upload.speed=19200
- bt.upload.disable_flushing=true
-@@ -103,7 +103,7 @@ bt.build.core=arduino
- 
- lilypad328.name=LilyPad Arduino w/ ATmega328
- 
--lilypad328.upload.protocol=stk500
-+lilypad328.upload.protocol=arduino
- lilypad328.upload.maximum_size=30720
- lilypad328.upload.speed=57600
- 
-@@ -123,7 +123,7 @@ lilypad328.build.core=arduino
- 
- lilypad.name=LilyPad Arduino w/ ATmega168
- 
--lilypad.upload.protocol=stk500
-+lilypad.upload.protocol=arduino
- lilypad.upload.maximum_size=14336
- lilypad.upload.speed=19200
- 
-@@ -143,7 +143,7 @@ lilypad.build.core=arduino
- 
- pro328.name=Arduino Pro or Pro Mini (3.3V, 8 MHz) w/ ATmega328
- 
--pro328.upload.protocol=stk500
-+pro328.upload.protocol=arduino
- pro328.upload.maximum_size=30720
- pro328.upload.speed=57600
- 
-@@ -163,7 +163,7 @@ pro328.build.core=arduino
- 
- pro.name=Arduino Pro or Pro Mini (3.3V, 8 MHz) w/ ATmega168
- 
--pro.upload.protocol=stk500
-+pro.upload.protocol=arduino
- pro.upload.maximum_size=14336
- pro.upload.speed=19200
- 
-@@ -183,7 +183,7 @@ pro.build.core=arduino
- 
- atmega168.name=Arduino NG or older w/ ATmega168
- 
--atmega168.upload.protocol=stk500
-+atmega168.upload.protocol=arduino
- atmega168.upload.maximum_size=14336
- atmega168.upload.speed=19200
- 
-@@ -203,7 +203,7 @@ atmega168.build.core=arduino
- 
- atmega8.name=Arduino NG or older w/ ATmega8
- 
--atmega8.upload.protocol=stk500
-+atmega8.upload.protocol=arduino
- atmega8.upload.maximum_size=7168
- atmega8.upload.speed=19200
- 

=== removed file 'debian/patches/avrdude-paths.patch'
--- debian/patches/avrdude-paths.patch	2010-02-12 19:25:26 +0000
+++ debian/patches/avrdude-paths.patch	1970-01-01 00:00:00 +0000
@@ -1,27 +0,0 @@
-Fix path for use avr tools
-Index: arduino-0018+dfsg/src/processing/app/debug/Uploader.java
-===================================================================
---- arduino-0018+dfsg.orig/src/processing/app/debug/Uploader.java	2010-02-15 07:55:42.101548187 +0100
-+++ arduino-0018+dfsg/src/processing/app/debug/Uploader.java	2010-02-15 07:57:51.429048221 +0100
-@@ -111,7 +111,7 @@
-       String avrBasePath;
-       
-       if(Base.isLinux()) {
--        avrBasePath = new String(Base.getHardwarePath() + "/tools/"); 
-+        avrBasePath = "";
-       }
-       else {
-         avrBasePath = new String(Base.getHardwarePath() + "/tools/avr/bin/"); 
-Index: arduino-0018+dfsg/src/processing/app/debug/AvrdudeUploader.java
-===================================================================
---- arduino-0018+dfsg.orig/src/processing/app/debug/AvrdudeUploader.java	2010-02-15 07:56:20.661515639 +0100
-+++ arduino-0018+dfsg/src/processing/app/debug/AvrdudeUploader.java	2010-02-15 07:57:18.290832803 +0100
-@@ -172,7 +172,7 @@
-     if (Base.isLinux()) {
-       // ???: is it better to have Linux users install avrdude themselves, in
-       // a way that it can find its own configuration file?
--      commandDownloader.add("-C" + Base.getHardwarePath() + "/tools/avrdude.conf");
-+      // commandDownloader.add("-C" + Base.getHardwarePath() + "/tools/avrdude.conf");
-     } else {
-       commandDownloader.add("-C" + Base.getHardwarePath() + "/tools/avr/etc/avrdude.conf");
-     }

=== added file 'debian/patches/convert_to_debian_oro.patch'
--- debian/patches/convert_to_debian_oro.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/convert_to_debian_oro.patch	2010-04-11 15:27:18 +0000
@@ -0,0 +1,16 @@
+Description: Tells the source code to use Debian's liboro-java
+Author: Scott Howard <[e-mail]>
+
+Index: arduino-0018+dfsg/src/processing/app/preproc/PdePreprocessor.java
+===================================================================
+--- arduino-0018+dfsg.orig/src/processing/app/preproc/PdePreprocessor.java	2010-04-09 23:50:58.588879697 -0400
++++ arduino-0018+dfsg/src/processing/app/preproc/PdePreprocessor.java	2010-04-10 10:48:28.458510257 -0400
+@@ -35,7 +35,7 @@
+ import java.io.*;
+ import java.util.*;
+ 
+-import com.oroinc.text.regex.*;
++import org.apache.oro.text.regex.*;
+ 
+ 
+ /**

=== removed file 'debian/patches/desktop-icon.patch'
--- debian/patches/desktop-icon.patch	2010-02-12 19:25:26 +0000
+++ debian/patches/desktop-icon.patch	1970-01-01 00:00:00 +0000
@@ -1,14 +0,0 @@
-A Desktop Entry for show icon on menu 
-diff -ruNp arduino-0018-orig/resources/icons/arduino.desktop arduino-0018-changed/resources/icons/arduino.desktop
---- arduino-0018-orig/resources/icons/arduino.desktop	1970-01-01 01:00:00.000000000 +0100
-+++ arduino-0018-changed/resources/icons/arduino.desktop	2010-01-15 13:58:01.000000000 +0100
-@@ -0,0 +1,9 @@
-+[Desktop Entry]
-+Type=Application
-+Name=arduino
-+Name[xx]=arduino
-+GenericName=Program Atmegas the easy way
-+Exec=arduino
-+Icon=arduino
-+Terminal=false
-+Categories=Development

=== removed file 'debian/patches/fix-locale.patch'
--- debian/patches/fix-locale.patch	2010-02-12 19:25:26 +0000
+++ debian/patches/fix-locale.patch	1970-01-01 00:00:00 +0000
@@ -1,12 +0,0 @@
-Index: arduino-0018+dfsg/src/processing/app/Base.java
-===================================================================
---- arduino-0018+dfsg.orig/src/processing/app/Base.java	2010-02-18 14:44:18.869024266 +0100
-+++ arduino-0018+dfsg/src/processing/app/Base.java	2010-02-18 14:46:24.509021752 +0100
-@@ -126,6 +126,7 @@
-        The first thing we have to do is to initialze the platform-specific 
-        classes so file lookup is delegated to platform specific code.
-     */
-+    Locale.setDefault(Locale.US);
-     initPlatform();
- 
-     try {

=== removed file 'debian/patches/fix-openfiledialog.patch'
--- debian/patches/fix-openfiledialog.patch	2010-02-12 19:25:26 +0000
+++ debian/patches/fix-openfiledialog.patch	1970-01-01 00:00:00 +0000
@@ -1,66 +0,0 @@
-Index: arduino-0018+dfsg/src/processing/app/Base.java
-===================================================================
---- arduino-0018+dfsg.orig/src/processing/app/Base.java	2010-02-18 14:58:05.819024475 +0100
-+++ arduino-0018+dfsg/src/processing/app/Base.java	2010-02-18 14:58:39.819047033 +0100
-@@ -28,6 +28,7 @@
- import java.util.*;
- 
- import javax.swing.*;
-+import javax.swing.filechooser.FileNameExtensionFilter;
- 
- import processing.app.debug.Compiler;
- import processing.app.debug.Target;
-@@ -641,32 +642,14 @@
-    */
-   public void handleOpenPrompt() {
-     // get the frontmost window frame for placing file dialog
--    FileDialog fd = new FileDialog(activeEditor,
--                                   "Open an Arduino sketch...",
--                                   FileDialog.LOAD);
--    // This was annoying people, so disabled it in 0125.
--    //fd.setDirectory(Preferences.get("sketchbook.path"));
--    //fd.setDirectory(getSketchbookPath());
--
--    // Only show .pde files as eligible bachelors
--    fd.setFilenameFilter(new FilenameFilter() {
--        public boolean accept(File dir, String name) {
--          // TODO this doesn't seem to ever be used. AWESOME.
--          //System.out.println("check filter on " + dir + " " + name);
--          return name.toLowerCase().endsWith(".pde");
--        }
--      });
--
--    fd.setVisible(true);
--
--    String directory = fd.getDirectory();
--    String filename = fd.getFile();
--
--    // User canceled selection
--    if (filename == null) return;
--
--    File inputFile = new File(directory, filename);
--    handleOpen(inputFile.getAbsolutePath());
-+   JFileChooser jfc=new JFileChooser();
-+   FileNameExtensionFilter filter = new FileNameExtensionFilter(
-+       "Arduino Sketches", "pde");
-+   jfc.setFileFilter(filter);
-+   int returnVal = jfc.showOpenDialog(activeEditor);
-+   if(returnVal == JFileChooser.APPROVE_OPTION) {
-+     handleOpen(jfc.getSelectedFile().getAbsolutePath());
-+   }
-   }
- 
- 
-@@ -803,11 +786,11 @@
-       }
- 
-       // This will store the sketch count as zero
--      editors.remove(editor);
-       storeSketches();
- 
-       // Save out the current prefs state
-       Preferences.save();
-+      editors.remove(editor);
- 
-       // Since this wasn't an actual Quit event, call System.exit()
-       System.exit(0);

=== removed file 'debian/patches/fix-savefiledialog.patch'
--- debian/patches/fix-savefiledialog.patch	2010-02-12 19:25:26 +0000
+++ debian/patches/fix-savefiledialog.patch	1970-01-01 00:00:00 +0000
@@ -1,89 +0,0 @@
-Use system look and feel for "save as" file dialog
-Index: arduino-0018+dfsg/src/processing/app/Sketch.java
-===================================================================
---- arduino-0018+dfsg.orig/src/processing/app/Sketch.java	2010-02-18 15:02:19.209029154 +0100
-+++ arduino-0018+dfsg/src/processing/app/Sketch.java	2010-02-18 15:11:50.609021682 +0100
-@@ -728,57 +728,29 @@
-   protected boolean saveAs() throws IOException {
-     String newParentDir = null;
-     String newName = null;
-+    File newFolder = null;
- 
--    /*
--      JFileChooser fc = new JFileChooser();
--      fc.setDialogTitle("Save sketch folder as...");
--      if (isReadOnly() || isUntitled()) {
--        // default to the sketchbook folder
--        fc.setCurrentDirectory(new File(Preferences.get("sketchbook.path")));
--      } else {
--        // default to the parent folder of where this was
--        fc.setCurrentDirectory(folder.getParentFile());
--      }
--      // can't do this, will try to save into itself by default
--      //fc.setSelectedFile(folder);
--      int result = fc.showSaveDialog(editor);
--      if (result == JFileChooser.APPROVE_OPTION) {
--        File selection = fc.getSelectedFile();
--        newParentDir = selection.getParent();
--        newName = selection.getName();
--      }
--    */
--
--    // get new name for folder
--    FileDialog fd = new FileDialog(editor,
--                                   "Save sketch folder as...",
--                                   FileDialog.SAVE);
-+    JFileChooser fc = new JFileChooser();
-+    fc.setDialogTitle("Save sketch folder as...");
-     if (isReadOnly() || isUntitled()) {
--      // default to the sketchbook folder
--      fd.setDirectory(Preferences.get("sketchbook.path"));
-+        // default to the sketchbook folder
-+      fc.setCurrentDirectory(new File(Preferences.get("sketchbook.path")));
-     } else {
-       // default to the parent folder of where this was
--      fd.setDirectory(folder.getParent());
-+      fc.setCurrentDirectory(folder.getParentFile());
-     }
--    String oldName = folder.getName();
--    fd.setFile(oldName);
--
--    fd.setVisible(true);
--    newParentDir = fd.getDirectory();
--    newName = fd.getFile();
--
--    // user canceled selection
--    if (newName == null) return false;
--    newName = Sketch.checkName(newName);
--
--    File newFolder = new File(newParentDir, newName);
--//    String newPath = newFolder.getAbsolutePath();
--//    String oldPath = folder.getAbsolutePath();
--
--//    if (newPath.equals(oldPath)) {
--//      return false;  // Can't save a sketch over itself
--//    }
--
-+    // can't do this, will try to save into itself by default
-+    //fc.setSelectedFile(folder);
-+    int result = fc.showSaveDialog(editor);
-+    if (result == JFileChooser.APPROVE_OPTION) {
-+      File selection = fc.getSelectedFile();
-+
-+      newParentDir = selection.getParent();
-+      newName = selection.getName();
-+      if(newName==null)
-+        return false;
-+      newName = Sketch.checkName(newName);
-+      newFolder = new File(newParentDir, newName);
-     // make sure there doesn't exist a .cpp file with that name already
-     // but ignore this situation for the first tab, since it's probably being
-     // resaved (with the same name) to another location/folder.
-@@ -874,6 +846,7 @@
-     setUntitled(false);
- 
-     // let Editor know that the save was successful
-+	}
-     return true;
-   }
- 

=== removed file 'debian/patches/launcher.patch'
--- debian/patches/launcher.patch	2010-02-12 19:25:26 +0000
+++ debian/patches/launcher.patch	1970-01-01 00:00:00 +0000
@@ -1,7 +0,0 @@
-Launcher script wrapper
-diff -ruNp arduino-0018-orig/resources/linux/startup/arduino arduino-0018-changed/resources/linux/startup/arduino
---- arduino-0018-orig/resources/linux/startup/arduino	1970-01-01 01:00:00.000000000 +0100
-+++ arduino-0018-changed/resources/linux/startup/arduino	2010-01-13 09:55:02.000000000 +0100
-@@ -0,0 +1,2 @@
-+#!/bin/sh
-+java -Dswing.defaultlaf=com.sun.java.swing.plaf.gtk.GTKLookAndFeel -jar /usr/share/java/arduino.jar

=== removed file 'debian/patches/linux.Platform.diff'
--- debian/patches/linux.Platform.diff	2010-02-12 19:25:26 +0000
+++ debian/patches/linux.Platform.diff	1970-01-01 00:00:00 +0000
@@ -1,134 +0,0 @@
-Fix some hardcoded paths
---- arduino-0018+dfsg/src/processing/app/linux/Platform.java	2009-08-12 01:05:18.000000000 +0200
-+++ ubuntu-0018/src/processing/app/linux/Platform.java	2010-02-08 11:33:33.000000000 +0100
-@@ -22,36 +22,72 @@
- 
- package processing.app.linux;
- 
--import java.io.File;
-+import java.io.*;
- 
- import javax.swing.UIManager;
- 
- import processing.app.Preferences;
- 
-+import java.util.*;
-+import java.net.*;
-+import java.security.*;
-+
- 
- /**
-- * Used by Base for platform-specific tweaking, for instance finding the
-- * sketchbook location using the Windows registry, or OS X event handling.
-+ * Used by Base for platform-specific tweaking. 
-  */
- public class Platform extends processing.app.Platform {
-+  /** 
-+   * If we are run from an archive the is the absolute path of the
-+   * jar-file from which we are loaded.
-+   */
-+  private File archiveRoot=null;
-+  /** The type of distribution we are run from */
-+  private String distribution;
-+  /** A directory lookup-table for the (distribution-specific) directrories */ 
-+  private Hashtable<String,File> pathTable=new Hashtable<String,File>();
-+  
-+  /**
-+   * Iniatializes the Linux Platform.
-+   * @throws Exception If we were unable to detect the distribution
-+   * type or filesystem staructrue on which we are run. If we get an 
-+   * Exception here we are unabvle to contine. The IDE should throw
-+   * an error and die.
-+   */
-+  public Platform() throws Exception {
-+    /* get the absolute pathn to our application jar-file */
-+    URL jarURL=getClass().getProtectionDomain().getCodeSource().getLocation();
-+    File jarFile=new File(jarURL.toURI());
-+    archiveRoot=jarFile.getParentFile().getParentFile();
-+    /* Check the distributuion type for which we a where packaged */
-+    InputStream is=this.getClass().getResourceAsStream("/resources/linux/linux.properties");
-+    Properties p=new Properties();
-+    p.load(is);
-+    distribution=p.getProperty("linux.distribution");
-+    if(distribution.equals("archive")) {
-+      //we are run from an archive
-+      pathTable.put("examples",new File(archiveRoot,"examples"));
-+      pathTable.put("hardware",new File(archiveRoot,"hardware"));
-+      pathTable.put("lib",new File(archiveRoot,"lib"));
-+      pathTable.put("libraries",new File(archiveRoot,"libraries"));
-+      pathTable.put("reference",new File(archiveRoot,"reference"));
-+      pathTable.put("tools",new File(archiveRoot,"hardware/tools"));
-+    }
-+    else if(distribution.equals("ubuntu") 
-+            || distribution.equals("debian")) {
-+      //this is an Ubuntu/Debian package
-+      pathTable.put("examples",new File("/usr/share/doc/arduino/examples"));
-+      pathTable.put("hardware",new File("/usr/share/arduino/hardware"));
-+      pathTable.put("lib",new File("/usr/share/arduino"));
-+      pathTable.put("libraries",new File("/usr/share/arduino/libraries"));
-+      pathTable.put("reference",new File("/usr/share/doc/arduino/reference"));
-+      pathTable.put("tools",new File("/usr/share/arduino/tools"));
-+    }
-+  }
- 
--  // TODO Need to be smarter here since KDE people ain't gonna like that GTK.
--  //      It may even throw a weird exception at 'em for their trouble.
-   public void setLookAndFeel() throws Exception {
--    // Linux is by default even uglier than metal (Motif?).
--    // Actually, i'm using native menus, so they're even uglier
--    // and Motif-looking (Lesstif?). Ick. Need to fix this.
--    //String lfname = UIManager.getCrossPlatformLookAndFeelClassName();
--    //UIManager.setLookAndFeel(lfname);
--
--    // For 0120, trying out the gtk+ look and feel as the default.
--    // This is available in Java 1.4.2 and later, and it can't possibly
--    // be any worse than Metal. (Ocean might also work, but that's for
--    // Java 1.5, and we aren't going there yet)
--    //UIManager.setLookAndFeel("com.sun.java.swing.plaf.gtk.GTKLookAndFeel");
-   }
- 
--
-   public void openURL(String url) throws Exception {
-     if (openFolderAvailable()) {
-       String launcher = Preferences.get("launcher");
-@@ -61,7 +97,6 @@
-     }
-   }
- 
--
-   public boolean openFolderAvailable() {
-     if (Preferences.get("launcher") != null) {
-       return true;
-@@ -103,4 +138,32 @@
-       System.out.println("not available");
-     }
-   }
-+
-+  /**
-+   * Returns a File-object for a path to something in this distribution.
-+   * This method implements File/Path lookup for a linux distribution.
-+   * @param name this can be the name of a file, directory 
-+   * or the latter part of a path 
-+   * @return File a File object for the path starting at the 
-+   * users work-dir ending with name. The method does not 
-+   * check wether the file or path exists.
-+   */ 
-+  public File getContentFile(String name) {
-+    if(distribution==null) {
-+      //property wasn't set, we use the default settings 
-+      return super.getContentFile(name);
-+    }
-+    /*
-+      check wether the request is only for a root-dir or 
-+      a file.
-+    */
-+    String [] path=name.split("/",2);
-+    if(path.length==1) {
-+      //this is a request for a simple root-directory
-+      return pathTable.get(path[0]);
-+    }
-+    //this is a request for a root-diretory plus a filename
-+    return new File(pathTable.get(path[0]),path[1]);
-+  }
-+  
- }

=== removed file 'debian/patches/logo.patch'
--- debian/patches/logo.patch	2010-02-12 19:25:26 +0000
+++ debian/patches/logo.patch	1970-01-01 00:00:00 +0000
@@ -1,696 +0,0 @@
-Arduino logo in xpm format
-diff -ruNp arduino-0018-orig/resources/icons/arduino.png arduino-0018-changed/resources/icons/arduino.xpm
---- arduino-0018-orig/resources/icons/arduino.xpm	2010-02-13 13:09:00.888604994 +0100
-+++ arduino-0018-changed/resources/icons/arduino.xpm	2010-02-09 17:22:41.000000000 +0100
-@@ -0,0 +1,691 @@
-+/* XPM */
-+static char * arduino_xpm[] = {
-+"32 32 656 2",
-+"  	c None",
-+". 	c #2D7E99",
-+"+ 	c #2D819C",
-+"@ 	c #2D809B",
-+"# 	c #2D7D99",
-+"$ 	c #2C7B96",
-+"% 	c #2C7895",
-+"& 	c #2C7693",
-+"* 	c #2B7491",
-+"= 	c #2B728F",
-+"- 	c #2B708D",
-+"; 	c #2A6E8C",
-+"> 	c #2A6C8A",
-+", 	c #2A6A88",
-+"' 	c #2A6B8A",
-+") 	c #2A6987",
-+"! 	c #296886",
-+"~ 	c #296482",
-+"{ 	c #286381",
-+"] 	c #296583",
-+"^ 	c #2B6D8C",
-+"/ 	c #2B6F8F",
-+"( 	c #2B6E8E",
-+"_ 	c #2B6F8E",
-+": 	c #2B708C",
-+"< 	c #28657E",
-+"[ 	c #27667D",
-+"} 	c #2D829D",
-+"| 	c #2F8AA3",
-+"1 	c #3093AA",
-+"2 	c #2E849F",
-+"3 	c #2E809C",
-+"4 	c #3193AD",
-+"5 	c #2F87A3",
-+"6 	c #2F83A0",
-+"7 	c #308BA8",
-+"8 	c #2B708F",
-+"9 	c #2B6D8D",
-+"0 	c #2D7697",
-+"a 	c #2C7294",
-+"b 	c #2C6F91",
-+"c 	c #2C7194",
-+"d 	c #2D7195",
-+"e 	c #2B698B",
-+"f 	c #295F80",
-+"g 	c #2A6588",
-+"h 	c #2C6D93",
-+"i 	c #2C6C92",
-+"j 	c #2D7096",
-+"k 	c #2D6F94",
-+"l 	c #2D7093",
-+"m 	c #2C6F8F",
-+"n 	c #275D76",
-+"o 	c #275F76",
-+"p 	c #266073",
-+"q 	c #2F89A3",
-+"r 	c #34A5B9",
-+"s 	c #2D7A98",
-+"t 	c #2E819E",
-+"u 	c #2D7695",
-+"v 	c #2E7797",
-+"w 	c #2B6889",
-+"x 	c #2B6A8B",
-+"y 	c #3185AB",
-+"z 	c #3181A9",
-+"A 	c #3181AB",
-+"B 	c #2C698E",
-+"C 	c #285A7B",
-+"D 	c #275879",
-+"E 	c #2A6389",
-+"F 	c #2E709B",
-+"G 	c #265473",
-+"H 	c #2B658A",
-+"I 	c #2C688D",
-+"J 	c #2B668B",
-+"K 	c #2B6789",
-+"L 	c #2A6584",
-+"M 	c #275D75",
-+"N 	c #28637B",
-+"O 	c #245868",
-+"P 	c #256070",
-+"Q 	c #2D809C",
-+"R 	c #2E86A0",
-+"S 	c #2E829D",
-+"T 	c #2D7E9A",
-+"U 	c #2F87A4",
-+"V 	c #3292AE",
-+"W 	c #2E7A9A",
-+"X 	c #2D7192",
-+"Y 	c #2B6486",
-+"Z 	c #2A6184",
-+"` 	c #295F81",
-+" .	c #285C7E",
-+"..	c #285A7C",
-+"+.	c #28587A",
-+"@.	c #275678",
-+"#.	c #275475",
-+"$.	c #265273",
-+"%.	c #265170",
-+"&.	c #254F6D",
-+"*.	c #254D6B",
-+"=.	c #295D82",
-+"-.	c #2A6085",
-+";.	c #295E81",
-+">.	c #285D7E",
-+",.	c #285C7A",
-+"'.	c #275D79",
-+").	c #234F62",
-+"!.	c #235161",
-+"~.	c #245A6A",
-+"{.	c #2D7D9A",
-+"].	c #2C7896",
-+"^.	c #2D7594",
-+"/.	c #2D7696",
-+"(.	c #3184A7",
-+"_.	c #307CA0",
-+":.	c #2A6284",
-+"<.	c #2A5E81",
-+"[.	c #2B5D80",
-+"}.	c #678AA3",
-+"|.	c #85A0B4",
-+"1.	c #86A0B4",
-+"2.	c #859EB2",
-+"3.	c #859DB0",
-+"4.	c #859CAE",
-+"5.	c #8098AA",
-+"6.	c #476881",
-+"7.	c #244A67",
-+"8.	c #244865",
-+"9.	c #28577D",
-+"0.	c #295980",
-+"a.	c #285A7F",
-+"b.	c #28597C",
-+"c.	c #28597B",
-+"d.	c #296184",
-+"e.	c #24516A",
-+"f.	c #224B5D",
-+"g.	c #235467",
-+"h.	c #2C7B97",
-+"i.	c #2D7996",
-+"j.	c #318AA8",
-+"k.	c #2C6E8F",
-+"l.	c #2F779C",
-+"m.	c #2E739A",
-+"n.	c #295C80",
-+"o.	c #2D5C80",
-+"p.	c #C4D1DB",
-+"q.	c #FFFFFF",
-+"r.	c #FCFCFD",
-+"s.	c #788D9F",
-+"t.	c #234561",
-+"u.	c #254D6F",
-+"v.	c #275277",
-+"w.	c #285880",
-+"x.	c #275378",
-+"y.	c #275579",
-+"z.	c #254F6E",
-+"A.	c #224760",
-+"B.	c #244D66",
-+"C.	c #235065",
-+"D.	c #2C7894",
-+"E.	c #2D7896",
-+"F.	c #328DAD",
-+"G.	c #2E7598",
-+"H.	c #2D6E93",
-+"I.	c #2E7199",
-+"J.	c #2E6D97",
-+"K.	c #28577C",
-+"L.	c #7995AC",
-+"M.	c #F5F6F7",
-+"N.	c #2C4A65",
-+"O.	c #21405B",
-+"P.	c #244A6B",
-+"Q.	c #254D71",
-+"R.	c #27537A",
-+"S.	c #254E71",
-+"T.	c #265175",
-+"U.	c #234967",
-+"V.	c #224C62",
-+"W.	c #2C7492",
-+"X.	c #2D7494",
-+"Y.	c #307FA2",
-+"Z.	c #317DA4",
-+"`.	c #3077A1",
-+" +	c #2E6B95",
-+".+	c #2D6894",
-+"++	c #275478",
-+"@+	c #9FB2C2",
-+"#+	c #F8F9FA",
-+"$+	c #3C5B79",
-+"%+	c #355572",
-+"&+	c #345370",
-+"*+	c #34526D",
-+"=+	c #33506B",
-+"-+	c #7F91A1",
-+";+	c #4B6277",
-+">+	c #203C56",
-+",+	c #203C55",
-+"'+	c #254B6F",
-+")+	c #244A6D",
-+"!+	c #24496A",
-+"~+	c #1F3B52",
-+"{+	c #1F3B51",
-+"]+	c #21495F",
-+"^+	c #2B718E",
-+"/+	c #2C6E90",
-+"(+	c #2F7A9F",
-+"_+	c #3076A0",
-+":+	c #2D6A94",
-+"<+	c #2D6692",
-+"[+	c #2C6490",
-+"}+	c #264F72",
-+"|+	c #A0B0C0",
-+"1+	c #F4F6F7",
-+"2+	c #234463",
-+"3+	c #224260",
-+"4+	c #21405D",
-+"5+	c #213E5A",
-+"6+	c #203D58",
-+"7+	c #697C8E",
-+"8+	c #4C6175",
-+"9+	c #1E3851",
-+"0+	c #1E3850",
-+"a+	c #224364",
-+"b+	c #254D75",
-+"c+	c #234465",
-+"d+	c #1E364D",
-+"e+	c #20455C",
-+"f+	c #2A6D8B",
-+"g+	c #2A6989",
-+"h+	c #2B698C",
-+"i+	c #2E749C",
-+"j+	c #2E709D",
-+"k+	c #2C6591",
-+"l+	c #2B618D",
-+"m+	c #2B5E8A",
-+"n+	c #25496C",
-+"o+	c #9FAEBD",
-+"p+	c #21405C",
-+"q+	c #203D59",
-+"r+	c #203C57",
-+"s+	c #203B55",
-+"t+	c #1F3953",
-+"u+	c #68798A",
-+"v+	c #4B5E70",
-+"w+	c #1D354B",
-+"x+	c #1C344A",
-+"y+	c #1C354B",
-+"z+	c #1F3B56",
-+"A+	c #1F3C59",
-+"B+	c #254A71",
-+"C+	c #1D3348",
-+"D+	c #204359",
-+"E+	c #296485",
-+"F+	c #2A6487",
-+"G+	c #2E6E99",
-+"H+	c #2E6B9A",
-+"I+	c #2B608B",
-+"J+	c #2A5C87",
-+"K+	c #2A5883",
-+"L+	c #244565",
-+"M+	c #9EADBA",
-+"N+	c #F4F5F7",
-+"O+	c #1F3A54",
-+"P+	c #1F3851",
-+"Q+	c #1E364F",
-+"R+	c #1D354D",
-+"S+	c #677786",
-+"T+	c #4A5B6D",
-+"U+	c #1E3853",
-+"V+	c #1B3146",
-+"W+	c #1B3145",
-+"X+	c #1B3045",
-+"Y+	c #1C3146",
-+"Z+	c #1D364F",
-+"`+	c #1C3044",
-+" @	c #1F4156",
-+".@	c #296684",
-+"+@	c #2C6E93",
-+"@@	c #2B658B",
-+"#@	c #2D6994",
-+"$@	c #2C6592",
-+"%@	c #2A5A84",
-+"&@	c #295680",
-+"*@	c #28547D",
-+"=@	c #22415F",
-+"-@	c #9EABB8",
-+";@	c #F4F5F6",
-+">@	c #1D344C",
-+",@	c #1C334A",
-+"'@	c #1C3148",
-+")@	c #667483",
-+"!@	c #4A5C6E",
-+"~@	c #224369",
-+"{@	c #1A2E41",
-+"]@	c #1D354F",
-+"^@	c #213F62",
-+"/@	c #1B3044",
-+"(@	c #1F3854",
-+"_@	c #1E3F53",
-+":@	c #28627F",
-+"<@	c #285A7D",
-+"[@	c #2B638C",
-+"}@	c #28557D",
-+"|@	c #28527A",
-+"1@	c #264F76",
-+"2@	c #9DA9B5",
-+"3@	c #1C3249",
-+"4@	c #1C3147",
-+"5@	c #1B3046",
-+"6@	c #1B2F44",
-+"7@	c #657380",
-+"8@	c #485666",
-+"9@	c #192B3F",
-+"0@	c #192B3E",
-+"a@	c #182A3E",
-+"b@	c #192B3D",
-+"c@	c #192A3D",
-+"d@	c #1A2A3C",
-+"e@	c #1E3D51",
-+"f@	c #285F7C",
-+"g@	c #275574",
-+"h@	c #275474",
-+"i@	c #2A5C84",
-+"j@	c #2A5A85",
-+"k@	c #275077",
-+"l@	c #264D74",
-+"m@	c #254A70",
-+"n@	c #9DA8B3",
-+"o@	c #1A2E43",
-+"p@	c #1A2D41",
-+"q@	c #192C40",
-+"r@	c #64707E",
-+"s@	c #465463",
-+"t@	c #18293B",
-+"u@	c #18293A",
-+"v@	c #1D3756",
-+"w@	c #1C324C",
-+"x@	c #192939",
-+"y@	c #1D3C4F",
-+"z@	c #275E7A",
-+"A@	c #285979",
-+"B@	c #254E6C",
-+"C@	c #28577E",
-+"D@	c #28557F",
-+"E@	c #254B70",
-+"F@	c #25496F",
-+"G@	c #24466B",
-+"H@	c #9CA6B1",
-+"I@	c #192C41",
-+"J@	c #192B40",
-+"K@	c #18293C",
-+"L@	c #636F7B",
-+"M@	c #465360",
-+"N@	c #172738",
-+"O@	c #192D44",
-+"P@	c #18293E",
-+"Q@	c #17273A",
-+"R@	c #172636",
-+"S@	c #182636",
-+"T@	c #1C3B4D",
-+"U@	c #2A6286",
-+"V@	c #244966",
-+"W@	c #275278",
-+"X@	c #265079",
-+"Y@	c #24476C",
-+"Z@	c #23456A",
-+"`@	c #224366",
-+" #	c #1C324A",
-+".#	c #9BA5AF",
-+"+#	c #17283A",
-+"@#	c #172739",
-+"##	c #636D79",
-+"$#	c #45515D",
-+"%#	c #162434",
-+"&#	c #1B3352",
-+"*#	c #17293D",
-+"=#	c #162433",
-+"-#	c #172433",
-+";#	c #1C394A",
-+">#	c #245369",
-+",#	c #22455C",
-+"'#	c #254E70",
-+")#	c #264B73",
-+"!#	c #234467",
-+"~#	c #224265",
-+"{#	c #213F61",
-+"]#	c #1B3047",
-+"^#	c #9BA4AD",
-+"/#	c #F6F7F8",
-+"(#	c #515E6D",
-+"_#	c #515D6B",
-+":#	c #515C6A",
-+"<#	c #505C69",
-+"[#	c #505B68",
-+"}#	c #899099",
-+"|#	c #454F5B",
-+"1#	c #152231",
-+"2#	c #152230",
-+"3#	c #192B44",
-+"4#	c #172537",
-+"5#	c #18283D",
-+"6#	c #162230",
-+"7#	c #1B3848",
-+"8#	c #235066",
-+"9#	c #224763",
-+"0#	c #234366",
-+"a#	c #24466D",
-+"b#	c #203E60",
-+"c#	c #203C5C",
-+"d#	c #1A2D43",
-+"e#	c #9AA2AB",
-+"f#	c #444E58",
-+"g#	c #14212E",
-+"h#	c #14212D",
-+"i#	c #353F4A",
-+"j#	c #1D2935",
-+"k#	c #15212D",
-+"l#	c #16212D",
-+"m#	c #1B3846",
-+"n#	c #254D70",
-+"o#	c #224267",
-+"p#	c #213E60",
-+"q#	c #9AA1AA",
-+"r#	c #434D56",
-+"s#	c #121F2B",
-+"t#	c #BDC0C4",
-+"u#	c #FDFEFE",
-+"v#	c #EAEBEC",
-+"w#	c #38414B",
-+"x#	c #151F2B",
-+"y#	c #1A3645",
-+"z#	c #214A5F",
-+"A#	c #234768",
-+"B#	c #254972",
-+"C#	c #203C5D",
-+"D#	c #99A0A9",
-+"E#	c #F7F7F8",
-+"F#	c #57606C",
-+"G#	c #56606A",
-+"H#	c #565F69",
-+"I#	c #565E68",
-+"J#	c #555E67",
-+"K#	c #8C9298",
-+"L#	c #424C55",
-+"M#	c #121E2A",
-+"N#	c #414B54",
-+"O#	c #505861",
-+"P#	c #DFE0E2",
-+"Q#	c #91969B",
-+"R#	c #141E29",
-+"S#	c #151E29",
-+"T#	c #193544",
-+"U#	c #21475D",
-+"V#	c #234264",
-+"W#	c #24456E",
-+"X#	c #1F3958",
-+"Y#	c #1E3858",
-+"Z#	c #182A3F",
-+"`#	c #18283C",
-+" $	c #999FA7",
-+".$	c #F4F4F5",
-+"+$	c #14212F",
-+"@$	c #14202D",
-+"#$	c #131F2B",
-+"$$	c #121E2B",
-+"%$	c #5F6770",
-+"&$	c #414A53",
-+"*$	c #111C27",
-+"=$	c #26303A",
-+"-$	c #F6F6F7",
-+";$	c #C1C3C6",
-+">$	c #FEFEFE",
-+",$	c #6E747A",
-+"'$	c #141D28",
-+")$	c #193543",
-+"!$	c #20445A",
-+"~$	c #223F60",
-+"{$	c #23436A",
-+"]$	c #1F395A",
-+"^$	c #1E3655",
-+"/$	c #1D3655",
-+"($	c #18293D",
-+"_$	c #1C3351",
-+":$	c #1B314F",
-+"<$	c #999FA6",
-+"[$	c #131F2C",
-+"}$	c #121D29",
-+"|$	c #111D28",
-+"1$	c #5F666E",
-+"2$	c #414952",
-+"3$	c #111B25",
-+"4$	c #495159",
-+"5$	c #A3A7AB",
-+"6$	c #767C81",
-+"7$	c #141D27",
-+"8$	c #131C26",
-+"9$	c #141C26",
-+"0$	c #193441",
-+"a$	c #204258",
-+"b$	c #213C5D",
-+"c$	c #224066",
-+"d$	c #1F3757",
-+"e$	c #1D3552",
-+"f$	c #1C3452",
-+"g$	c #172639",
-+"h$	c #162436",
-+"i$	c #999EA5",
-+"j$	c #F3F4F5",
-+"k$	c #121D2A",
-+"l$	c #111B26",
-+"m$	c #5F656D",
-+"n$	c #414850",
-+"o$	c #111A24",
-+"p$	c #767B81",
-+"q$	c #D7D9DB",
-+"r$	c #ABAEB1",
-+"s$	c #1D242E",
-+"t$	c #131A23",
-+"u$	c #193340",
-+"v$	c #20395A",
-+"w$	c #213E64",
-+"x$	c #1E3554",
-+"y$	c #1C324F",
-+"z$	c #1B324F",
-+"A$	c #172538",
-+"B$	c #162435",
-+"C$	c #162233",
-+"D$	c #989EA4",
-+"E$	c #111B27",
-+"F$	c #111A25",
-+"G$	c #5F656C",
-+"H$	c #40484F",
-+"I$	c #101922",
-+"J$	c #313941",
-+"K$	c #5E646A",
-+"L$	c #C3C5C7",
-+"M$	c #818489",
-+"N$	c #131922",
-+"O$	c #19323F",
-+"P$	c #1F4056",
-+"Q$	c #203858",
-+"R$	c #213D62",
-+"S$	c #1E3452",
-+"T$	c #1C314E",
-+"U$	c #1B304E",
-+"V$	c #172536",
-+"W$	c #17273D",
-+"X$	c #17263A",
-+"Y$	c #989DA3",
-+"Z$	c #F3F4F4",
-+"`$	c #121D28",
-+" %	c #5F646B",
-+".%	c #40464E",
-+"+%	c #101822",
-+"@%	c #363C45",
-+"#%	c #4C5259",
-+"$%	c #BCBEC0",
-+"%%	c #86898E",
-+"&%	c #19333F",
-+"*%	c #1F3F54",
-+"=%	c #1F3756",
-+"-%	c #213C60",
-+";%	c #1E3350",
-+">%	c #1D3252",
-+",%	c #1B304D",
-+"'%	c #162232",
-+")%	c #15212F",
-+"!%	c #656C75",
-+"~%	c #A3A7AC",
-+"{%	c #9CA0A5",
-+"]%	c #131C27",
-+"^%	c #131A26",
-+"/%	c #121925",
-+"(%	c #121A25",
-+"_%	c #111822",
-+":%	c #A2A4A8",
-+"<%	c #2E343C",
-+"[%	c #101721",
-+"}%	c #101821",
-+"|%	c #888C90",
-+"1%	c #BEBFC2",
-+"2%	c #232831",
-+"3%	c #141922",
-+"4%	c #1F3F53",
-+"5%	c #1E3352",
-+"6%	c #1E3251",
-+"7%	c #1B2F4B",
-+"8%	c #1B2F4C",
-+"9%	c #15202E",
-+"0%	c #141D2A",
-+"a%	c #141C28",
-+"b%	c #131B27",
-+"c%	c #131A25",
-+"d%	c #121923",
-+"e%	c #162134",
-+"f%	c #141D2D",
-+"g%	c #121822",
-+"h%	c #121821",
-+"i%	c #121820",
-+"j%	c #131820",
-+"k%	c #131821",
-+"l%	c #141821",
-+"m%	c #19313E",
-+"n%	c #20475A",
-+"o%	c #1D2F47",
-+"p%	c #1F3558",
-+"q%	c #1D2F4B",
-+"r%	c #1D3251",
-+"s%	c #1C3050",
-+"t%	c #16212F",
-+"u%	c #16202D",
-+"v%	c #192942",
-+"w%	c #162132",
-+"x%	c #162337",
-+"y%	c #162033",
-+"z%	c #131924",
-+"A%	c #131823",
-+"B%	c #131822",
-+"C%	c #12171F",
-+"D%	c #13171F",
-+"E%	c #14171F",
-+"F%	c #1C3C4A",
-+"G%	c #1C3646",
-+"H%	c #1E314F",
-+"I%	c #1D304C",
-+"J%	c #1E3252",
-+"K%	c #1C2D47",
-+"L%	c #182436",
-+"M%	c #16212E",
-+"N%	c #151F2C",
-+"O%	c #162133",
-+"P%	c #151D2A",
-+"Q%	c #151D2C",
-+"R%	c #141B29",
-+"S%	c #131923",
-+"T%	c #131721",
-+"U%	c #131720",
-+"V%	c #182833",
-+"W%	c #1F4457",
-+"X%	c #1F4057",
-+"Y%	c #1E3F57",
-+"Z%	c #1E3D53",
-+"`%	c #1D3D53",
-+" &	c #1B3646",
-+".&	c #1A3545",
-+"+&	c #193443",
-+"@&	c #193442",
-+"#&	c #193341",
-+"$&	c #183240",
-+"%&	c #18313F",
-+"&&	c #18313E",
-+"*&	c #18303D",
-+"=&	c #18303C",
-+"-&	c #19303C",
-+";&	c #1B3C49",
-+"                                                                ",
-+"      . + @ # $ % & * = - ; > , ' ) ! ~ { ] ^ / ( _ : < [       ",
-+"    } | 1 2 3 4 5 6 7 8 9 0 a b c d e f g h i j k l m n o p     ",
-+"  . q | r 2 s t s u v w x y z A B C D E F G H I J K L M N O P   ",
-+"  Q R S T U V W X w Y Z `  ...+.@.#.$.%.&.*.=.-.;.>.,.'.).!.~.  ",
-+"  T S {.].^./.(._.:.<.[.}.|.1.2.3.4.5.6.7.8.9.0.a.b.c.d.e.f.g.  ",
-+"  h.{.i.j.k.K l.m.n.o.p.q.q.q.q.q.q.q.r.s.t.u.v.w.x.y.z.A.B.C.  ",
-+"  D.E.s F.G.H.I.J.K.L.q.q.q.q.q.q.q.q.q.M.N.O.P.Q.R.S.T.U.y.V.  ",
-+"  * W.X.Y.Z.`. +.+++@+q.#+$+%+&+*+=+-+q.q.;+>+,+'+)+)+!+~+{+]+  ",
-+"  ^+_ /+(+_+:+<+[+}+|+q.1+2+3+4+5+6+7+q.q.8+9+0+a+b+c+c+d+d+e+  ",
-+"  f+g+h+i+j+k+l+m+n+o+q.1+p+q+r+s+t+u+q.q.v+w+x+y+z+A+B+C+C+D+  ",
-+"  ) E+F+G+H+I+J+K+L+M+q.N+r+O+P+Q+R+S+q.q.T+U+V+W+X+Y+Z+`+`+ @  ",
-+"  .@+@@@#@$@%@&@*@=@-@q.;@9+Q+>@,@'@)@q.q.!@~@V+{@{@]@^@/@(@_@  ",
-+"  :@C <@[@I+}@|@1@q+2@q.;@>@3@4@5@6@7@q.q.8@9@0@a@b@c@c@d@d@e@  ",
-+"  f@g@h@i@j@k@l@m@O+n@q.;@4@X+o@p@q@r@q.q.s@t@u@u@v@w@x@x@x@y@  ",
-+"  z@A@B@C@D@E@F@G@Q+H@q.;@o@I@J@a@K@L@q.q.M@N@O@N@P@Q@R@S@S@T@  ",
-+"  :@U@V@W@X@Y@Z@`@ #.#q.;@J@a@t@+#@###q.q.$#%#&#*#=#=#=#-#-#;#  ",
-+"  >#,#'#E@)#!#~#{#]#^#q./#(#_#:#<#[#}#q.q.|#1#2#2#2#3#4#5#6#7#  ",
-+"  8#9#)+)#0#a#b#c#d#e#q.q.q.q.q.q.q.q.q.q.f#g#h#h#i#j#k#l#l#m#  ",
-+"  V.n#Y@0#o#p#^@d#J@q#q.q.q.q.q.q.q.q.q.q.r#s#h#t#u#v#w#x#x#y#  ",
-+"  z#A#B#p#p#C#5@J@K@D#q.E#F#G#H#I#J#K#q.q.L#M#N#q.O#P#Q#R#S#T#  ",
-+"  U#V#W#C#X#Y#J@Z#`# $q..$+$@$#$$$M#%$q.q.&$*$=$-$;$>$,$'$'$)$  ",
-+"  !$~${$]$^$/$($_$:$<$q..$[$$$M#}$|$1$q.q.2$3$3$4$5$6$7$8$9$0$  ",
-+"  a$b$c$d$e$f$Q@g$h$i$q.j$$$k$|$*$l$m$q.q.n$o$o$p$q$r$s$t$t$u$  ",
-+"   @v$w$x$y$z$A$B$C$D$q.j$}$*$E$F$F$G$q.q.H$I$J$-$K$L$M$N$N$O$  ",
-+"  P$Q$R$S$T$U$V$W$X$Y$q.Z$`$E$F$o$o$ %q.q..%+%@%-$#%$%%%N$N$&%  ",
-+"  *%=%-%;%>%,%g$'%)%!%~%{%]%^%/%(%_%.%:%:%<%[%}%|%v#1%2%N$3%O$  ",
-+"  4%Q$d$5%6%7%8%6#9%x#0%a%b%c%d%e%f%g%h%h%i%i%i%i%i%j%j%k%l%m%  ",
-+"  n%o%;%p%q%r%s%t%u%v%w%x%y%z%N$c%A%B%k%j%j%C%C%C%C%D%D%D%E%F%  ",
-+"    G%H%I%J%K%L%M%N%O%P%Q%R%S%B%B%T%U%D%C%C%C%C%C%C%D%D%E%V%    ",
-+"      W%X%Y%Z%`% &.&+&@&#&$&%&%&&&*&*&=&=&=&=&=&=&=&=&-&;&      ",
-+"                                                                "};

=== modified file 'debian/patches/series'
--- debian/patches/series	2010-02-12 19:25:26 +0000
+++ debian/patches/series	2010-04-11 15:27:18 +0000
@@ -1,11 +1,2 @@
-launcher.patch
-desktop-icon.patch
-logo.patch
-about-into-themedir.patch
-update-regex-library.patch
-linux.Platform.diff
-avrdude-paths.patch
-fix-locale.patch
-fix-openfiledialog.patch
-fix-savefiledialog.patch
-adopt-avrdude-arduino-programmer-type.patch
+wrapper_for_deb.patch
+convert_to_debian_oro.patch

=== removed file 'debian/patches/update-regex-library.patch'
--- debian/patches/update-regex-library.patch	2010-02-12 19:25:26 +0000
+++ debian/patches/update-regex-library.patch	1970-01-01 00:00:00 +0000
@@ -1,806 +0,0 @@
---- 0018/app/src/processing/app/preproc/PdePreprocessor.java	2010-02-04 12:22:52.000000000 +0100
-+++ ubuntu-0018/src/processing/app/preproc/PdePreprocessor.java	2010-02-14 12:15:55.000000000 +0100
-@@ -1,8 +1,7 @@
--/* -*- mode: jde; c-basic-offset: 2; indent-tabs-mode: nil -*- */
--
- /*
--  PdePreprocessor - wrapper for default ANTLR-generated parser
--  Part of the Wiring project - http://wiring.org.co
-+  PdePreprocessor - Generate C++ code from Arduino Sketches
-+
-+  Copyright (c) 2010 Eberhard Fahle <[e-mail]>
- 
-   Copyright (c) 2004-05 Hernando Barragan
- 
-@@ -35,317 +34,443 @@
- import java.io.*;
- import java.util.*;
- 
--import com.oroinc.text.regex.*;
--
-+import java.util.regex.*;
- 
- /**
-- * Class that orchestrates preprocessing p5 syntax into straight Java.
-+ * Class that generates valid C++ code from an Arduino Sketch file.
-+ * This is rewrite of the original code imported from wiring/processing
-+ * that is not using the oro.jar any more.
-  */
- public class PdePreprocessor {
--  // stores number of built user-defined function prototypes
--  public int prototypeCount = 0;
--
--  // stores number of included library headers written
--  // we always write one header: WProgram.h
--  public int headerCount = 1;
--  
--  List prototypes;
--
--
--
--
--  String[] defaultImports;
--
--  // these ones have the .* at the end, since a class name might be at the end
--  // instead of .* which would make trouble other classes using this can lop
--  // off the . and anything after it to produce a package name consistently.
--  //public String extraImports[];
--  ArrayList<String> programImports;
--
--  // imports just from the code folder, treated differently
--  // than the others, since the imports are auto-generated.
--  ArrayList<String> codeFolderImports;
--
--  String indent;
--
--  PrintStream stream;
--  String program;
--  String buildPath;
--  String name;
--
--
--  /**
--   * Setup a new preprocessor.
--   */
--  public PdePreprocessor() { }
--
--  public int writePrefix(String program, String buildPath,
--                         String name, String codeFolderPackages[])
--    throws FileNotFoundException {
--    this.buildPath = buildPath;
--    this.name = name;
--
--    int tabSize = Preferences.getInteger("editor.tabs.size");
--    char[] indentChars = new char[tabSize];
--    Arrays.fill(indentChars, ' ');
--    indent = new String(indentChars);
--
--    // if the program ends with no CR or LF an OutOfMemoryError will happen.
--    // not gonna track down the bug now, so here's a hack for it:
--    // http://dev.processing.org/bugs/show_bug.cgi?id=5
--    program += "\n";
--
--    // if the program ends with an unterminated multi-line comment,
--    // an OutOfMemoryError or NullPointerException will happen.
--    // again, not gonna bother tracking this down, but here's a hack.
--    // http://dev.processing.org/bugs/show_bug.cgi?id=16
--    Sketch.scrubComments(program);
--    // this returns the scrubbed version, but more important for this
--    // function, it'll check to see if there are errors with the comments.
-+    // stores number of built user-defined function prototypes
-+    public int prototypeCount = 0;
- 
--    if (Preferences.getBoolean("preproc.substitute_unicode")) {
--      // check for non-ascii chars (these will be/must be in unicode format)
--      char p[] = program.toCharArray();
--      int unicodeCount = 0;
--      for (int i = 0; i < p.length; i++) {
--        if (p[i] > 127) unicodeCount++;
--      }
--      // if non-ascii chars are in there, convert to unicode escapes
--      if (unicodeCount != 0) {
--        // add unicodeCount * 5.. replacing each unicode char
--        // with six digit uXXXX sequence (xxxx is in hex)
--        // (except for nbsp chars which will be a replaced with a space)
--        int index = 0;
--        char p2[] = new char[p.length + unicodeCount*5];
--        for (int i = 0; i < p.length; i++) {
--          if (p[i] < 128) {
--            p2[index++] = p[i];
-+    // stores number of included library headers written
-+    // we always write one header: WProgram.h
-+    public int headerCount = 1;
-+    //the prototypes tha are generated by the preprocessor
-+    ArrayList<String> prototypes;
- 
--          } else if (p[i] == 160) {  // unicode for non-breaking space
--            p2[index++] = ' ';
-+    // these ones have the .* at the end, since a class name might be at the end
-+    // instead of .* which would make trouble other classes using this can lop
-+    // off the . and anything after it to produce a package name consistently.
-+    //public String extraImports[];
-+    ArrayList<String> programImports;
- 
--          } else {
--            int c = p[i];
--            p2[index++] = '\\';
--            p2[index++] = 'u';
--            char str[] = Integer.toHexString(c).toCharArray();
--            // add leading zeros, so that the length is 4
--            //for (int i = 0; i < 4 - str.length; i++) p2[index++] = '0';
--            for (int m = 0; m < 4 - str.length; m++) p2[index++] = '0';
--            System.arraycopy(str, 0, p2, index, str.length);
--            index += str.length;
--          }
--        }
--        program = new String(p2, 0, index);
--      }
--    }
-+    PrintStream stream;
-+    String program;
-+    String buildPath;
-+    String name;
- 
--    // These may change in-between (if the prefs panel adds this option)
--    // so grab them here on construction.
--    String prefsLine = Preferences.get("preproc.imports");
--    defaultImports = PApplet.splitTokens(prefsLine, ", ");
- 
--    //String importRegexp = "(?:^|\\s|;)(import\\s+)(\\S+)(\\s*;)";
--    String importRegexp = "^\\s*#include\\s+[<\"](\\S+)[\">]";
--    programImports = new ArrayList<String>();
-+    /**
-+     * Setup a new preprocessor.
-+     */
-+    public PdePreprocessor() { }
- 
--    String[][] pieces = PApplet.matchAll(program, importRegexp);
-+    /**
-+     * Writes out the head of the c++ code generated for a sketch. 
-+     * Called from processing.app.Sketch.
-+     * @param program the concatenated code from all tabs containing pde-files
-+     * @param buildPath the path into which the processed pde-code is to be written
-+     * @param name the name of the sketch 
-+     * @param codeFolderPackages unused param (leftover from processing)
-+     */
-+    public int writePrefix(String program, String buildPath,
-+			   String name, String codeFolderPackages[])
-+	throws FileNotFoundException {
-+	this.buildPath = buildPath;
-+	this.name = name;
- 
--    if (pieces != null)
--      for (int i = 0; i < pieces.length; i++)
--        programImports.add(pieces[i][1]);  // the package name
-+	// if the program ends with no CR or LF an OutOfMemoryError will happen.
-+	// not gonna track down the bug now, so here's a hack for it:
-+	// http://dev.processing.org/bugs/show_bug.cgi?id=5
-+	program += "\n";
- 
--    codeFolderImports = new ArrayList<String>();
--//    if (codeFolderPackages != null) {
--//      for (String item : codeFolderPackages) {
--//        codeFolderImports.add(item + ".*");
--//      }
--//    }
-+	// if the program ends with an unterminated multi-line comment,
-+	// an OutOfMemoryError or NullPointerException will happen.
-+	// again, not gonna bother tracking this down, but here's a hack.
-+	// http://dev.processing.org/bugs/show_bug.cgi?id=16
-+	/*
-+	  FIXME : The major fix for this bug is to move this method 
-+	  from the Sketch class into this one here, since PdePreprocessor
-+	  is the only user of the method.
-+	  And while we are at it, we can fix the bug mentioned here as well   
-+	*/  
-+	/*
-+	  This will not actually scrub the comments from the program
-+	  code as you might expect, it will simply check if the comments 
-+	  are syntactically intakt. If not scrubComments will fire an
-+	  IllegalArgumentException which is propagated up to the top level.
-+	*/
-+	scrubComments(program);
-+	if (Preferences.getBoolean("preproc.substitute_unicode")) {
-+	    // check for non-ascii chars (these will be/must be in unicode format)
-+	    program=replaceUnicode(program);
-+	}
-+	programImports=getIncludes(program);
- 
--    prototypes = new ArrayList();
--    
--    try {
--      prototypes = prototypes(program);
--    } catch (MalformedPatternException e) {
--      System.out.println("Internal error while pre-processing; " +
--        "not generating function prototypes.\n\n" + e);
--    }
--    
--    // store # of prototypes so that line number reporting can be adjusted
--    prototypeCount = prototypes.size();
-+	try {
-+	    prototypes = prototypes(program);
-+	} catch (PatternSyntaxException e) {
-+	    System.out.println("Internal error while pre-processing; " +
-+			       "not generating function prototypes.\n\n" + e);
-+	}
-+	// store # of prototypes so that line number reporting can be adjusted
-+	prototypeCount = prototypes.size();
-   
--    // do this after the program gets re-combobulated
--    this.program = program;
--    
--    // output the code
--    File streamFile = new File(buildPath, name + ".cpp");
--    stream = new PrintStream(new FileOutputStream(streamFile));
-+	// do this after the program gets re-combobulated
-+	this.program = program;
-     
--    return headerCount + prototypeCount;
--  }
-+	// output the code
-+	File streamFile = new File(buildPath, name + ".cpp");
-+	stream = new PrintStream(new FileOutputStream(streamFile));
-+	return headerCount + prototypeCount;
-+    }
- 
--  /**
--   * preprocesses a pde file and write out a java file
--   * @return the classname of the exported Java
--   */
--  //public String write(String program, String buildPath, String name,
--  //                  String extraImports[]) throws java.lang.Exception {
--  public String write() throws java.lang.Exception {
--    writeProgram(stream, program, prototypes);
--    writeFooter(stream);
--    stream.close();
-+    /**
-+     * Write the preprocessed pde file to disk.
-+     * Somewhat stupid to do it that way :
-+     * Open the printstream  in preprocess and colse it in here??
-+     * But we want to keep the original signatures for the methods,
-+     * so what the hack...
-+     * @return the classname of the exported sketch
-+     */
-+    public String write() throws java.lang.Exception {
-+	writeProgram(stream, program, prototypes);
-+	writeFooter(stream);
-+	stream.close();
-     
--    return name;
--  }
-+	return name;
-+    }
- 
--  // Write the pde program to the cpp file
--  protected void writeProgram(PrintStream out, String program, List prototypes) {
--    int prototypeInsertionPoint = firstStatement(program);
--  
--    out.print(program.substring(0, prototypeInsertionPoint));
--    out.print("#include \"WProgram.h\"\n");    
-+    // Write the pde program to the cpp file
-+    protected void writeProgram(PrintStream out, String program, List prototypes) {
-+	int prototypeInsertionPoint=getPrototypeLocation(program);
-+	out.print(program.substring(0, prototypeInsertionPoint));
-+	out.print("#include \"WProgram.h\"\n");    
-     
--    // print user defined prototypes
--    for (int i = 0; i < prototypes.size(); i++) {
--      out.print(prototypes.get(i) + "\n");
-+	// print user defined prototypes
-+	for (int i = 0; i < prototypes.size(); i++) {
-+	    out.print(prototypes.get(i) + "\n");
-+	}
-+	out.print(program.substring(prototypeInsertionPoint));
-     }
--    
--    out.print(program.substring(prototypeInsertionPoint));
--  }
--
--
--  /**
--   * Write any necessary closing text.
--   *
--   * @param out         PrintStream to write it to.
--   */
--  protected void writeFooter(PrintStream out) throws java.lang.Exception {}
--
--
--  public ArrayList<String> getExtraImports() {
--    return programImports;
--  }
- 
- 
-+    /**
-+     * Write any necessary closing text.
-+     * @param out PrintStream to write it to.
-+     */
-+    protected void writeFooter(PrintStream out) throws java.lang.Exception {}
- 
- 
-+    public ArrayList<String> getExtraImports() {
-+	return programImports;
-+    }
- 
--  /**
--   * Returns the index of the first character that's not whitespace, a comment
--   * or a pre-processor directive.
--   */
--  public int firstStatement(String in) {
--    PatternMatcherInput input = new PatternMatcherInput(in);
--    PatternCompiler compiler = new Perl5Compiler();
--    PatternMatcher matcher = new Perl5Matcher();
--    Pattern pattern = null;
-+    /**
-+     * Returns the index of the first character that is not a whitespace char
-+     * or a pre-processor directive.
-+     * @param in the String to be processed
-+     * @return int the postion where the prototypes need to be filled in
-+     */
-+    private int getPrototypeLocation(String in) {
-+	Pattern pattern = null;
-+	Matcher matcher =null;
-     
--    try {
--      pattern = compiler.compile(
--        // XXX: doesn't properly handle special single-quoted characters
--        // whitespace
--        "\\s+" + "|" +
--        // multi-line comment
--        "(/\\*[^*]*(?:\\*(?!/)[^*]*)*\\*/)" + "|" +
--        // single-line comment
--        "(//.*?$)" + "|" +
--        // pre-processor directive
--        "(#(?:\\\\\\n|.)*)",
--        Perl5Compiler.MULTILINE_MASK);
--    } catch (MalformedPatternException e) {
--      throw new RuntimeException("Internal error in firstStatement()", e);
--    }
-+	try {
-+	    /* Define a pattern that returns the index of the the first character that
-+	       is not 
-+	       - Whitespace
-+	       - A preprocessor directive (i.e. a line  starting with #)
-+	    */
-+	    String whiteSpacePattern="(\\G\\s+)";
-+	    String preProcessorDirective="(\\G#(?:\\\\\\n|.)*)";
-+	    String patternString=whiteSpacePattern+"|"+preProcessorDirective;
-+	    pattern=Pattern.compile(patternString,Pattern.MULTILINE);
-       
--    int i = 0;
--    while (matcher.matchesPrefix(input, pattern)) {
--      i = matcher.getMatch().endOffset(0);
--      input.setCurrentOffset(i);
-+	} catch (PatternSyntaxException pse) {
-+	    throw new RuntimeException("Internal error in firstStatement()", pse);
-+	}
-+	//create a matcher for our input 
-+	matcher=pattern.matcher(in);
-+	int position=0; 
-+	while(matcher.find()) {
-+	    //rest of input started with a match 
-+	    //postion  is now behind the last char matched so far
-+	    position=matcher.end();
-+	}
-+	return position;
-     }
--    
--    return i;
--  }
-   
--  /**
--   * Strips comments, pre-processor directives, single- and double-quoted
--   * strings from a string.
--   * @param in the String to strip
--   * @return the stripped String
--   */
--  public String strip(String in) throws MalformedPatternException {
--    PatternCompiler compiler = new Perl5Compiler();
--    PatternMatcher matcher = new Perl5Matcher();
--    Pattern pattern = compiler.compile(
--      // XXX: doesn't properly handle special single-quoted characters
--      // single-quoted character
--      "('.')" + "|" +
--      // double-quoted string
--      "(\"(?:[^\"\\\\]|\\\\.)*\")" + "|" +
--      // multi-line comment
--      "(/\\*[^*]*(?:\\*(?!/)[^*]*)*\\*/)" + "|" +
--      // single-line comment
--      "(//.*?$)" + "|" +
--      // pre-processor directive
--      "(^\\s*#.*?$)",
--      Perl5Compiler.MULTILINE_MASK);
--      
--    while (matcher.contains(in, pattern)) {
--      MatchResult result = matcher.getMatch();
--      // XXX: should preserve newlines in the result so that line numbers of
--      // the stripped string correspond to those in the original source.
--      in = in.substring(0, result.beginOffset(0)) + " " + in.substring(result.endOffset(0));
-+    /**
-+     * Strips pre-processor directives, single- and double-quoted
-+     * strings from static strings and comments from the input.
-+     * @param in the String to be processed
-+     * @return the stripped String
-+     */
-+    public String strip(String in) {
-+	//define the parts to be stripped
-+	String quotedChar="('.')";
-+	String quotedString="(\"(?:[^\"\\\\]|\\\\.)*\")";
-+	String emptyComments="(//\\s*?$)|(/\\*\\s*?\\*/)";
-+	String preProcessorDirective="(^\\s*#.*?$)";
-+	String patternString=quotedChar+"|"+
-+	    quotedString+"|"+
-+	    emptyComments+"|"+
-+	    preProcessorDirective;
-+	Pattern pattern=Pattern.compile(patternString,Pattern.MULTILINE);
-+	//Remove all content from the comments leaving the empty tags 
-+	Matcher matcher=pattern.matcher(scrubComments(in));
-+	return matcher.replaceAll(" ");
-     }
-+
-+    /**
-+     * Removes the contents of all top-level curly brace pairs {}.
-+     * @param in the String to collapse
-+     * @return the collapsed String
-+     */
-+    private String collapseBraces(String in) {
-+	StringBuffer buffer = new StringBuffer();
-+	int nesting = 0;
-+	int start = 0;
-     
--    return in;
--  }
--  
--  /**
--   * Removes the contents of all top-level curly brace pairs {}.
--   * @param in the String to collapse
--   * @return the collapsed String
--   */
--  private String collapseBraces(String in) {
--    StringBuffer buffer = new StringBuffer();
--    int nesting = 0;
--    int start = 0;
-+	// XXX: need to keep newlines inside braces so we can determine the line
-+	// number of a prototype
-+	for (int i = 0; i < in.length(); i++) {
-+	    if (in.charAt(i) == '{') {
-+		if (nesting == 0) {
-+		    buffer.append(in.substring(start, i + 1));  // include the '{'
-+		}
-+		nesting++;
-+	    }
-+	    if (in.charAt(i) == '}') {
-+		nesting--;
-+		if (nesting == 0) {
-+		    start = i; // include the '}'
-+		}
-+	    }
-+	}
-+	buffer.append(in.substring(start));
-     
--    // XXX: need to keep newlines inside braces so we can determine the line
--    // number of a prototype
--    for (int i = 0; i < in.length(); i++) {
--      if (in.charAt(i) == '{') {
--        if (nesting == 0) {
--          buffer.append(in.substring(start, i + 1));  // include the '{'
--        }
--        nesting++;
--      }
--      if (in.charAt(i) == '}') {
--        nesting--;
--        if (nesting == 0) {
--          start = i; // include the '}'
--        }
--      }
-+	return buffer.toString();
-     }
-+  
-+    /**
-+     * Searches for function definitions in the pde-code and
-+     * generates a prototype for it.
-+     * @param in the code to be scanned
-+     * @return ArrayList<String> a list of the prototypes for the functions.
-+     */
-+    public ArrayList<String> prototypes(String in) throws PatternSyntaxException {
-+	in = collapseBraces(strip(in));
-     
--    buffer.append(in.substring(start));
-+	// XXX: doesn't handle ... varargs
-+	// XXX: doesn't handle function pointers
-+	Pattern pattern = 
-+	    Pattern.compile("[\\w\\[\\]\\*]+"+
-+			    "\\s+"+
-+			    "[&\\[\\]\\*\\w\\s]+"+
-+			    "\\([&,\\[\\]\\*\\w\\s]*\\)"+
-+			    "(?=\\s*\\{)");
-+	ArrayList<String>matches = new ArrayList<String>();
-+	Matcher matcher=pattern.matcher(in);
-+	while(matcher.find()) {
-+	    matches.add(matcher.group(0)+";");
-+	}    
-+	return matches;
-+    }
-+ 
-+    /**
-+     * Replaces all (character-)content of code comments in a source
-+     * with space chars. This method serves two purposes:</br>
-+     * It checks wether all multiline-comments are syntactically 
-+     * correct. (Opening and closing tags match)</br>
-+     * It removes all the content so the preprocessor can use less 
-+     * complex regex expressions when generating C++ code. 
-+     * This method used to be a public static member of class Sketch, but 
-+     * since only the PdePreprocessor uses this method this 
-+     * really doesn't make sense. I made this a private function in here.   
-+     * @param source the String for which the comments
-+     * are to be replaced
-+     * @return String the code but with the all 
-+     * code coments replaced by space chars
-+     * @throws IllegalArgumentException if there are 
-+     * underterminated commments in the String.
-+     */
-+    private String scrubComments(String source) 
-+      throws IllegalArgumentException {
-+	StringBuilder sb=new StringBuilder(source.length());
-+    	/* 
-+	   we will replace a few chars with unicode code points 
-+	   from the private use section since it makes 
-+	   parsing the source sooo much easier 
-+	*/
-+	String escapedQuote="\uE000";
-+	String escapedSCStart="\uE001";
-+	String escapedMCStart="\uE002";
-+	String escapedMCEnd="\uE003";
-+ 	String escapedDoubleBackSlash="\uE004";
-+	//replace all double backslashs '\\'
-+	source=source.replaceAll("\\\\\\\\",escapedDoubleBackSlash);
-+	//replace all escaped double-quotes '\"'
-+	source=source.replaceAll("\\\\\"",escapedQuote);
-+	//replace single line comment start '//' 
-+	source=source.replaceAll("//",escapedSCStart);
-+	//replace multiline line comment start '/*' 
-+	source=source.replaceAll("/\\*",escapedMCStart);
-+	//replace multiline line comment end '*/' 
-+	source=source.replaceAll("\\*/",escapedMCEnd);
-     
--    return buffer.toString();
--  }
-+	//true when we are inside a static String definition
-+	boolean quoted=false;
-+	//true when inside a singleline comment
-+	boolean sc=false;
-+	//true when inside a multiline comment
-+	boolean mc=false;
-+	int len=source.length();
-+	int srcIndex=0;
-+	char c;
-+	while(srcIndex<len) {
-+	    c=source.charAt(srcIndex);
-+	    if(sc) {
-+		//we are in a single line comment
-+ 		if(c!='\n') {
-+		    //its not the end of the comment yet
-+		    sb.append(' ');
-+		}
-+		else {
-+		    //we reached the end of the comment
-+		    sc=false;
-+		    sb.append('\n');
-+		}
-+	    }
-+	    else if(mc) {
-+		//we are inside a multiline comment ...
-+		if(c=='\uE003') {
-+		    //... and found the end of it
-+		    sb.append("*/");
-+		    mc=false;
-+		}
-+		else if(c!='\n') {
-+		    //just a char in a comment
-+		    sb.append(' ');
-+		}
-+		else {
-+		    //we have to keep the newlines
-+		    sb.append("\n");
-+		}
-+	    }
-+	    else if(quoted) {
-+		if(c=='"') {
-+		    //This is the end of the quote
-+		    quoted=false;
-+		    sb.append("\"");
-+		}
-+		else {
-+		    /* We are in a quote and dont care what we find.
-+		       It could be a static string with a comment
-+		       in it them. 
-+		    */
-+		    sb.append(c);
-+		}
-+	    }
-+	    else if(c=='"') {
-+		//This is the beginning of a quote
-+		quoted=true;
-+		sb.append("\"");
-+	    }
-+	    else if(c=='\uE001') {
-+		//found the start of a single line comment
-+		sc=true;
-+		sb.append("//");
-+	    }
-+	    else if(c=='\uE002') {
-+		//found the start of multiline comment
-+		mc=true;
-+		sb.append("/*");
-+	    }
-+	    else if(c=='\uE003' && !mc) {
-+		/*
-+		  We found the end of multiline comment
-+		  but never saw the start (/*) for it
-+		*/
-+		throw new RuntimeException("Found end tag \"*/\" for multi-line comment"+
-+					   " without start tag \"/*\"");
-+	    }
-+	    else {
-+		//this just a character on its own
-+		sb.append(c);
-+	    }
-+	    srcIndex++;
-+   	}
-+	if(mc) {
-+	    throw new RuntimeException("File ends before multi-line comment"
-+				       +" is terminated with end tag \"*/\" ");
-+	}
-+ 	String retval=sb.toString();
-+	/* 
-+	   Undo the replacement of the double backslashs 
-+	   and the escaped double quotes 
-+	*/
-+	//	System.out.println(retval);
-+	retval=retval.replaceAll(escapedQuote,"\\\\\"");
-+	retval=retval.replaceAll(escapedDoubleBackSlash,"\\\\\\\\");
-+	return retval;
-+    }
-+
-+    /**
-+     * Searches for non ascii-chars and replaces
-+     * them with unicode constants.
-+     * @param source the contents of the pde source
-+     * @return String the content with non-ascii chars turned into unicode
-+     */
-+    private String replaceUnicode(String source) {
-+	StringBuilder sb=new StringBuilder();
-+	int len=source.length();
-+	int srcIndex=0;
-+	char c;
-+	while(srcIndex<len) {
-+	    c=source.charAt(srcIndex);
-+	    if(c>127) {
-+		//we have some unicode here
-+		StringBuilder us=new StringBuilder("\\u0000");
-+		String hex=Integer.toString((int)c,16);
-+		for(int i=hex.length()-1;i>=0;i--) {
-+		    us.setCharAt(us.length()-1-i,hex.charAt(i));
-+		}
-+		sb.append(us);
-+	    }
-+	    else {
-+		sb.append(c);
-+	    }
-+	    srcIndex++;
-+	}
-+	return sb.toString();
-+    }
-   
--  public List prototypes(String in) throws MalformedPatternException {
--    in = collapseBraces(strip(in));
-+    /**
-+     * Find all the lines in a source that are c-style includes
-+     * @param source the String to be scanned for include-statements
-+     * @return ArrayList<String> an ArrayList withe the names of include-statements
-+     */
-+    private ArrayList<String> getIncludes(String source) {
-+	Pattern pattern=null;
-+	Matcher matcher=null;
-+	ArrayList<String> includes=new ArrayList<String>();
-     
--    PatternMatcherInput input = new PatternMatcherInput(in);
--    PatternCompiler compiler = new Perl5Compiler();
--    PatternMatcher matcher = new Perl5Matcher();
--    // XXX: doesn't handle ... varargs
--    // XXX: doesn't handle function pointers
--    Pattern pattern = compiler.compile(
--      "[\\w\\[\\]\\*]+\\s+[\\[\\]\\*\\w\\s]+\\([,\\[\\]\\*\\w\\s]*\\)(?=\\s*\\{)");
--    List matches = new ArrayList();
-+	String incPattern="^\\s*#include\\s+[<\"](\\S+)[\">]";
-+	pattern=Pattern.compile(incPattern,Pattern.MULTILINE);
-+	matcher=pattern.matcher(source);
-     
--    while (matcher.contains(input, pattern)) {
--      matches.add(matcher.getMatch().group(0) + ";");
--    }
-     
--    return matches;
--  }
-+	while(matcher.find()) {
-+	    includes.add(matcher.group(1));
-+	}    
-+	return includes;
-+    }
-+
-+  
- }
-+
---- arduino-0018+dfsg/src/processing/app/Platform.java	2009-06-01 10:32:11.000000000 +0200
-+++ ubuntu-0018/src/processing/app/Platform.java	2010-02-08 10:10:13.000000000 +0100
-@@ -124,7 +124,25 @@
-       showLauncherWarning();
-     }
-   }
--  
-+
-+  /**
-+   * Returns a File-object for a path to something in this distribution.
-+   * This method used to be a member of class Base. But as more platforms 
-+   * are supported this has to be moved to the platform-specific 
-+   * classes that extend processing.app.Platform.
-+   * This class provides is the default implementation where the
-+   * path is resolved against the users working directory.
-+   * @param name this can be the name of a file, directory 
-+   * or the latter part of a path 
-+   * @return File a File object for the path starting at the 
-+   * users work-dir ending with name. The method does not 
-+   * check wether the file or path exists.
-+   */ 
-+  public File getContentFile(String name) {
-+    String path = System.getProperty("user.dir");
-+    File working = new File(path);
-+    return new File(working, name);
-+  }
-   
-   // . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .  
-   
---- arduino-0018+dfsg/src/processing/app/Base.java	2009-12-26 16:42:30.000000000 +0100
-+++ ubuntu-0018/src/processing/app/Base.java	2010-02-08 11:28:46.000000000 +0100
-@@ -121,6 +121,12 @@
- //    CLibrary clib = CLibrary.INSTANCE;
- //    clib.setenv("DYLD_LIBRARY_PATH", "/Users/fry/coconut/sketchbook/libraries/gsvideo/library", 1);
- //    System.out.println("env is now " + clib.getenv("DYLD_LIBRARY_PATH"));
-+    
-+    /* 
-+       The first thing we have to do is to initialze the platform-specific 
-+       classes so file lookup is delegated to platform specific code.
-+    */
-+    initPlatform();
- 
-     try {
-       File versionFile = getContentFile("lib/version.txt");
-@@ -156,7 +162,6 @@
-     }
-     */
- 
--    initPlatform();
- 
- //    // Set the look and feel before opening the window
- //    try {
-@@ -1873,6 +1878,10 @@
-   }
-   */
- 
-+  /**
-+   * This method should be removed and replaced
-+   * by calling Platform.getContentFile(String) instead.
-+   */
-   static public File getContentFile(String name) {
-     String path = System.getProperty("user.dir");
- 
-@@ -1885,6 +1894,10 @@
-         path = javaroot;
-       }
-     }
-+    else if(Base.isLinux()) {
-+      //on Linux the path depends on the distribution style
-+      return platform.getContentFile(name);
-+    }
-     File working = new File(path);
-     return new File(working, name);
-   }

=== added file 'debian/patches/wrapper_for_deb.patch'
--- debian/patches/wrapper_for_deb.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/wrapper_for_deb.patch	2010-04-11 15:27:18 +0000
@@ -0,0 +1,32 @@
+Description: Simple wrapper since classpath and LD library are already properly
+ assigned at build time. Must be exucted in /usr/share/arduino
+Author: Scott Howard <[e-mail]>
+Index: arduino-0018+dfsg/arduino
+===================================================================
+--- arduino-0018+dfsg.orig/arduino	2010-04-10 10:49:20.048511096 -0400
++++ arduino-0018+dfsg/arduino	2010-04-10 10:49:43.908511616 -0400
+@@ -1,22 +1,5 @@
+ #!/bin/sh
+  
+-APPDIR="$(dirname -- "${0}")"
++cd /usr/share/arduino
+ 
+-cd $APPDIR
+- 
+-for LIB in \
+-    java/lib/rt.jar \
+-    java/lib/tools.jar \
+-    lib/*.jar \
+-    ;
+-do
+-    CLASSPATH="${CLASSPATH}:${APPDIR}/${LIB}"
+-done
+-export CLASSPATH
+-
+-LD_LIBRARY_PATH=`pwd`/lib:${LD_LIBRARY_PATH}
+-export LD_LIBRARY_PATH
+-
+-export PATH="${APPDIR}/java/bin:${PATH}"
+-
+-java -Dswing.defaultlaf=com.sun.java.swing.plaf.gtk.GTKLookAndFeel processing.app.Base
++java -Dswing.defaultlaf=com.sun.java.swing.plaf.gtk.GTKLookAndFeel -jar /usr/share/java/arduino.jar

=== modified file 'debian/rules'
--- debian/rules	2010-02-12 19:25:26 +0000
+++ debian/rules	2010-04-11 15:27:18 +0000
@@ -3,96 +3,56 @@
 # Uncomment this to turn on verbose mode.
 # export DH_VERBOSE=1
 
-SVNTAG=$(shell dpkg-parsechangelog | grep Version | cut -f2 -d" " | sed 's/\([0-9].*\)+dfsg-[0-9]ubuntu[0-9]/\1/')
+export JAVA_HOME=/usr/lib/jvm/default-java
+export CLASSPATH=/usr/share/java/RXTXcomm.jar:/usr/lib/jvm/default-java/lib/tools.jar:/usr/lib/jvm/default-java/lib/rt.jar:/usr/share/java/oro.jar:/usr/share/java/antlr.jar:/usr/share/java/ecj.jar:/usr/share/java/jna.jar
+
+%:
+	dh $@ --with javahelper
+
+override_jh_build:
+	perl preproc.pl
+	jh_build --main=processing.app.Base arduino.jar src/processing/core/*.java src/processing/xml/*.java src/processing/app/*.java src/processing/app/debug/*.java src/processing/app/linux/*.java src/processing/app/preproc/*.java src/processing/app/syntax/*.java src/processing/app/tools/*.java
+
+
+override_dh_installchangelogs:
+	dh_installchangelogs -k readme.txt
+
+override_dh_compress:
+	dh_compress -X.pde
+
+
+
+SVNTAG=$(shell dpkg-parsechangelog | grep Version | cut -f2 -d" " | sed 's/\([0-9].*\)+dfsg-[0-9]/\1/')
 DESTDIR=$(CURDIR)/debian/arduino-$(SVNTAG)+dfsg
 TARFILE=arduino_$(SVNTAG)+dfsg.orig.tar.gz
 
 get-orig-source:
-	svn export http://arduino.googlecode.com/svn/tags/$(SVNTAG) $(DESTDIR)
-	# Extract documentation
-	unzip -q -d $(DESTDIR) $(DESTDIR)/build/shared/reference.zip
-	# Grab useful bits
-	mv $(DESTDIR)/app/src/ $(DESTDIR)
-	mv $(DESTDIR)/core/src/processing/* $(DESTDIR)/src/processing
-	mv $(DESTDIR)/build/shared/examples $(DESTDIR)
-	cp -a $(DESTDIR)/libraries/* $(DESTDIR)/examples
-	find $(DESTDIR)/libraries -type d -iname examples | xargs -n1 rm -fr 
-	find $(DESTDIR)/examples -type f -iname *.c -or -iname *.cpp -or -iname *.h | xargs -n1 rm -f 
-	mv $(DESTDIR)/build/shared/lib/about.jpg $(DESTDIR)/src
-	mv $(DESTDIR)/build/shared/lib/keywords.txt $(DESTDIR)/src
-	mv $(DESTDIR)/build/shared/lib/preferences.txt $(DESTDIR)/src
-	mv $(DESTDIR)/build/shared/lib/theme/ $(DESTDIR)/src/
-	# Remove unnecessary files
-	rm -fr $(DESTDIR)/app/
-	rm -fr $(DESTDIR)/core/
-	# Remove still present Java precompiled libraries
-	rm -f $(DESTDIR)/src/processing/app/tools/format/tool/*.jar
-	# Remove shipped jre.tgz, Processing stuff, Reference zip file,
-	# stuff related to differ OS from Linux and unnecessary Linux binaries
-	rm -fr $(DESTDIR)/build/
-	rm -fr $(DESTDIR)/src/antlr
-	rm -fr $(DESTDIR)/src/processing/app/macosx
-	rm -fr $(DESTDIR)/src/processing/app/windows
-	# Remove junk
+	wget http://arduino.googlecode.com/files/arduino-$(SVNTAG).tgz
+	tar -xf arduino-$(SVNTAG).tgz
+	cp -a arduino-$(SVNTAG) $(DESTDIR)
+	rm -rf arduino-$(SVNTAG).tgz arduino-$(SVNTAG)
+	
+	svn export http://arduino.googlecode.com/svn/tags/$(SVNTAG)/app $(DESTDIR)-app/
+	svn export http://arduino.googlecode.com/svn/tags/$(SVNTAG)/core $(DESTDIR)-core/
+	
+	mkdir -p $(DESTDIR)/src/processing/
+	cp -a $(DESTDIR)-app/src/processing/* $(DESTDIR)/src/processing/
+	cp -a $(DESTDIR)-core/src/processing/* $(DESTDIR)/src/processing/
+	mv $(DESTDIR)-core/preproc.pl $(DESTDIR)
+	#remove junk
+	find $(DESTDIR) -type f -iname *.jar -or -iname *.tgz -or -iname *.so -or -iname license.txt | xargs -n1 rm -f
+	find $(DESTDIR) -type d -empty -delete
 	rm -f $(DESTDIR)/src/processing/app/preproc/.cvsignore
 	rm -f $(DESTDIR)/.project
 	rm -fr $(DESTDIR)/.[a-z]*
 	rm -fr $(DESTDIR)/app/.[a-z]*
-	# Fix some permissions
-	find $(DESTDIR)/libraries $(DESTDIR)/hardware $(DESTDIR)/src $(DESTDIR)/examples \
-		-type f -exec chmod -x {} \;
-	# Create tarball and remove temporary directory
+	rm -fr $(DESTDIR)/hardware/tools
+	#upstream set a bunch of files as execultable that should not be. remove the -x bit
+	find $(DESTDIR) -type f -iname *.jpg -or -iname *.java -or -iname *.pde -or -iname *.h -or -iname *.cpp -or -iname *.c -or -iname *.txt -or -iname makefile -or -iname key*.txt -or -iname pref*.txt | xargs chmod -x
+
 	tar zcf $(CURDIR)/../$(TARFILE) -C $(CURDIR)/debian arduino-$(SVNTAG)+dfsg
-	rm -fr $(DESTDIR)
-
-
-build: build-stamp
-
-build-stamp:
-	dh_testdir
-	dh_quilt_patch
-	mkdir classes/
-	javac -d classes -classpath classes/core.jar:/usr/share/java/RXTXcomm.jar:/usr/lib/jvm/default-java/lib/tools.jar \
-		src/processing/core/*.java src/processing/xml/*.java \
-		src/processing/app/*.java src/processing/app/debug/*.java src/processing/app/linux/*.java \
-		src/processing/app/preproc/*.java src/processing/app/syntax/*.java src/processing/app/tools/*.java
-	echo "Class-path: /usr/share/java/RXTXcomm.jar" > classes/manifest
-	mkdir -p classes/resources/linux/; echo "linux.distribution=ubuntu" > classes/resources/linux/linux.properties
-	cd classes/; jar -cfme arduino.jar manifest processing.app.Base  processing/app processing/core processing/xml resources/; jar -i arduino.jar
-	touch $@
-
-clean: 
-	dh_testdir
-	dh_testroot
-	dh_quilt_unpatch
-	rm -f arduino.png
-	rm -f build-stamp
-	rm -fr classes/ resources/
-	dh_clean 
-
-install: build
-	dh_testdir
-	dh_testroot
-	uudecode debian/arduino.png.uuencode
-	dh_prep  
-	dh_install
-
-binary-arch:
-
-# Build architecture-independent files here.
-binary-indep: install
-	dh_testdir
-	dh_testroot
-	dh_installchangelogs -k readme.txt
-	dh_installdocs
-	dh_installexamples examples/*
-	dh_link
-	dh_compress -X.pde
-	dh_fixperms
-	dh_installdeb
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-binary: binary-indep binary-arch
+	rm -fr $(DESTDIR) $(DESTDIR)-app $(DESTDIR)-core
+
+
+
 PHONY: build clean binary-indep binary install get-orig-source

=== added directory 'debian/source'
=== added file 'debian/source/format'
--- debian/source/format	1970-01-01 00:00:00 +0000
+++ debian/source/format	2010-04-11 15:27:18 +0000
@@ -0,0 +1,1 @@
+3.0 (quilt)

=== modified file 'debian/watch'
--- debian/watch	2010-02-12 19:25:26 +0000
+++ debian/watch	2010-04-11 15:27:18 +0000
@@ -1,2 +1,4 @@
-# The Arduino project don't release source tarballs at all
-# so the watch file is useless
+version=3
+opts=dversionmangle=s/\.dfsg// \
+http://code.google.com/p/arduino/downloads/list \
+http://arduino.googlecode.com/files/arduino-(.*)\.zip

=== added file 'examples/Digital/toneKeyboard/pitches.h'
--- examples/Digital/toneKeyboard/pitches.h	1970-01-01 00:00:00 +0000
+++ examples/Digital/toneKeyboard/pitches.h	2010-04-11 15:27:18 +0000
@@ -0,0 +1,95 @@
+/*************************************************
+ * Public Constants
+ *************************************************/
+
+#define NOTE_B0  31
+#define NOTE_C1  33
+#define NOTE_CS1 35
+#define NOTE_D1  37
+#define NOTE_DS1 39
+#define NOTE_E1  41
+#define NOTE_F1  44
+#define NOTE_FS1 46
+#define NOTE_G1  49
+#define NOTE_GS1 52
+#define NOTE_A1  55
+#define NOTE_AS1 58
+#define NOTE_B1  62
+#define NOTE_C2  65
+#define NOTE_CS2 69
+#define NOTE_D2  73
+#define NOTE_DS2 78
+#define NOTE_E2  82
+#define NOTE_F2  87
+#define NOTE_FS2 93
+#define NOTE_G2  98
+#define NOTE_GS2 104
+#define NOTE_A2  110
+#define NOTE_AS2 117
+#define NOTE_B2  123
+#define NOTE_C3  131
+#define NOTE_CS3 139
+#define NOTE_D3  147
+#define NOTE_DS3 156
+#define NOTE_E3  165
+#define NOTE_F3  175
+#define NOTE_FS3 185
+#define NOTE_G3  196
+#define NOTE_GS3 208
+#define NOTE_A3  220
+#define NOTE_AS3 233
+#define NOTE_B3  247
+#define NOTE_C4  262
+#define NOTE_CS4 277
+#define NOTE_D4  294
+#define NOTE_DS4 311
+#define NOTE_E4  330
+#define NOTE_F4  349
+#define NOTE_FS4 370
+#define NOTE_G4  392
+#define NOTE_GS4 415
+#define NOTE_A4  440
+#define NOTE_AS4 466
+#define NOTE_B4  494
+#define NOTE_C5  523
+#define NOTE_CS5 554
+#define NOTE_D5  587
+#define NOTE_DS5 622
+#define NOTE_E5  659
+#define NOTE_F5  698
+#define NOTE_FS5 740
+#define NOTE_G5  784
+#define NOTE_GS5 831
+#define NOTE_A5  880
+#define NOTE_AS5 932
+#define NOTE_B5  988
+#define NOTE_C6  1047
+#define NOTE_CS6 1109
+#define NOTE_D6  1175
+#define NOTE_DS6 1245
+#define NOTE_E6  1319
+#define NOTE_F6  1397
+#define NOTE_FS6 1480
+#define NOTE_G6  1568
+#define NOTE_GS6 1661
+#define NOTE_A6  1760
+#define NOTE_AS6 1865
+#define NOTE_B6  1976
+#define NOTE_C7  2093
+#define NOTE_CS7 2217
+#define NOTE_D7  2349
+#define NOTE_DS7 2489
+#define NOTE_E7  2637
+#define NOTE_F7  2794
+#define NOTE_FS7 2960
+#define NOTE_G7  3136
+#define NOTE_GS7 3322
+#define NOTE_A7  3520
+#define NOTE_AS7 3729
+#define NOTE_B7  3951
+#define NOTE_C8  4186
+#define NOTE_CS8 4435
+#define NOTE_D8  4699
+#define NOTE_DS8 4978
+
+

=== added file 'examples/Digital/toneMelody/pitches.h'
--- examples/Digital/toneMelody/pitches.h	1970-01-01 00:00:00 +0000
+++ examples/Digital/toneMelody/pitches.h	2010-04-11 15:27:18 +0000
@@ -0,0 +1,95 @@
+/*************************************************
+ * Public Constants
+ *************************************************/
+
+#define NOTE_B0  31
+#define NOTE_C1  33
+#define NOTE_CS1 35
+#define NOTE_D1  37
+#define NOTE_DS1 39
+#define NOTE_E1  41
+#define NOTE_F1  44
+#define NOTE_FS1 46
+#define NOTE_G1  49
+#define NOTE_GS1 52
+#define NOTE_A1  55
+#define NOTE_AS1 58
+#define NOTE_B1  62
+#define NOTE_C2  65
+#define NOTE_CS2 69
+#define NOTE_D2  73
+#define NOTE_DS2 78
+#define NOTE_E2  82
+#define NOTE_F2  87
+#define NOTE_FS2 93
+#define NOTE_G2  98
+#define NOTE_GS2 104
+#define NOTE_A2  110
+#define NOTE_AS2 117
+#define NOTE_B2  123
+#define NOTE_C3  131
+#define NOTE_CS3 139
+#define NOTE_D3  147
+#define NOTE_DS3 156
+#define NOTE_E3  165
+#define NOTE_F3  175
+#define NOTE_FS3 185
+#define NOTE_G3  196
+#define NOTE_GS3 208
+#define NOTE_A3  220
+#define NOTE_AS3 233
+#define NOTE_B3  247
+#define NOTE_C4  262
+#define NOTE_CS4 277
+#define NOTE_D4  294
+#define NOTE_DS4 311
+#define NOTE_E4  330
+#define NOTE_F4  349
+#define NOTE_FS4 370
+#define NOTE_G4  392
+#define NOTE_GS4 415
+#define NOTE_A4  440
+#define NOTE_AS4 466
+#define NOTE_B4  494
+#define NOTE_C5  523
+#define NOTE_CS5 554
+#define NOTE_D5  587
+#define NOTE_DS5 622
+#define NOTE_E5  659
+#define NOTE_F5  698
+#define NOTE_FS5 740
+#define NOTE_G5  784
+#define NOTE_GS5 831
+#define NOTE_A5  880
+#define NOTE_AS5 932
+#define NOTE_B5  988
+#define NOTE_C6  1047
+#define NOTE_CS6 1109
+#define NOTE_D6  1175
+#define NOTE_DS6 1245
+#define NOTE_E6  1319
+#define NOTE_F6  1397
+#define NOTE_FS6 1480
+#define NOTE_G6  1568
+#define NOTE_GS6 1661
+#define NOTE_A6  1760
+#define NOTE_AS6 1865
+#define NOTE_B6  1976
+#define NOTE_C7  2093
+#define NOTE_CS7 2217
+#define NOTE_D7  2349
+#define NOTE_DS7 2489
+#define NOTE_E7  2637
+#define NOTE_F7  2794
+#define NOTE_FS7 2960
+#define NOTE_G7  3136
+#define NOTE_GS7 3322
+#define NOTE_A7  3520
+#define NOTE_AS7 3729
+#define NOTE_B7  3951
+#define NOTE_C8  4186
+#define NOTE_CS8 4435
+#define NOTE_D8  4699
+#define NOTE_DS8 4978
+
+

=== removed directory 'examples/EEPROM'
=== removed directory 'examples/EEPROM/examples'
=== removed directory 'examples/EEPROM/examples/eeprom_clear'
=== removed file 'examples/EEPROM/examples/eeprom_clear/eeprom_clear.pde'
--- examples/EEPROM/examples/eeprom_clear/eeprom_clear.pde	2010-02-12 19:25:26 +0000
+++ examples/EEPROM/examples/eeprom_clear/eeprom_clear.pde	1970-01-01 00:00:00 +0000
@@ -1,21 +0,0 @@
-/*
- * EEPROM Clear
- *
- * Sets all of the bytes of the EEPROM to 0.
- */
-
-#include <EEPROM.h>
-
-void setup()
-{
-  // write a 0 to all 512 bytes of the EEPROM
-  for (int i = 0; i < 512; i++)
-    EEPROM.write(i, 0);
-    
-  // turn the LED on when we're done
-  digitalWrite(13, HIGH);
-}
-
-void loop()
-{
-}

=== removed directory 'examples/EEPROM/examples/eeprom_read'
=== removed file 'examples/EEPROM/examples/eeprom_read/eeprom_read.pde'
--- examples/EEPROM/examples/eeprom_read/eeprom_read.pde	2010-02-12 19:25:26 +0000
+++ examples/EEPROM/examples/eeprom_read/eeprom_read.pde	1970-01-01 00:00:00 +0000
@@ -1,38 +0,0 @@
-/*
- * EEPROM Read
- *
- * Reads the value of each byte of the EEPROM and prints it 
- * to the computer.
- */
-
-#include <EEPROM.h>
-
-// start reading from the first byte (address 0) of the EEPROM
-int address = 0;
-byte value;
-
-void setup()
-{
-  Serial.begin(9600);
-}
-
-void loop()
-{
-  // read a byte from the current address of the EEPROM
-  value = EEPROM.read(address);
-  
-  Serial.print(address);
-  Serial.print("\t");
-  Serial.print(value, DEC);
-  Serial.println();
-  
-  // advance to the next address of the EEPROM
-  address = address + 1;
-  
-  // there are only 512 bytes of EEPROM, from 0 to 511, so if we're
-  // on address 512, wrap around to address 0
-  if (address == 512)
-    address = 0;
-    
-  delay(500);
-}

=== removed directory 'examples/EEPROM/examples/eeprom_write'
=== removed file 'examples/EEPROM/examples/eeprom_write/eeprom_write.pde'
--- examples/EEPROM/examples/eeprom_write/eeprom_write.pde	2010-02-12 19:25:26 +0000
+++ examples/EEPROM/examples/eeprom_write/eeprom_write.pde	1970-01-01 00:00:00 +0000
@@ -1,38 +0,0 @@
-/*
- * EEPROM Write
- *
- * Stores values read from analog input 0 into the EEPROM.
- * These values will stay in the EEPROM when the board is
- * turned off and may be retrieved later by another sketch.
- */
-
-#include <EEPROM.h>
-
-// the current address in the EEPROM (i.e. which byte
-// we're going to write to next)
-int addr = 0;
-
-void setup()
-{
-}
-
-void loop()
-{
-  // need to divide by 4 because analog inputs range from
-  // 0 to 1023 and each byte of the EEPROM can only hold a
-  // value from 0 to 255.
-  int val = analogRead(0) / 4;
-  
-  // write the value to the appropriate byte of the EEPROM.
-  // these values will remain there when the board is
-  // turned off.
-  EEPROM.write(addr, val);
-  
-  // advance to the next address.  there are 512 bytes in 
-  // the EEPROM, so go back to 0 when we hit 512.
-  addr = addr + 1;
-  if (addr == 512)
-    addr = 0;
-  
-  delay(100);
-}

=== removed file 'examples/EEPROM/keywords.txt'
--- examples/EEPROM/keywords.txt	2010-02-12 19:25:26 +0000
+++ examples/EEPROM/keywords.txt	1970-01-01 00:00:00 +0000
@@ -1,18 +0,0 @@
-#######################################
-# Syntax Coloring Map For Ultrasound
-#######################################
-
-#######################################
-# Datatypes (KEYWORD1)
-#######################################
-
-EEPROM	KEYWORD1
-
-#######################################
-# Methods and Functions (KEYWORD2)
-#######################################
-
-#######################################
-# Constants (LITERAL1)
-#######################################
-

=== removed directory 'examples/Ethernet'
=== removed directory 'examples/Ethernet/examples'
=== removed directory 'examples/Ethernet/examples/ChatServer'
=== removed file 'examples/Ethernet/examples/ChatServer/ChatServer.pde'
--- examples/Ethernet/examples/ChatServer/ChatServer.pde	2010-02-12 19:25:26 +0000
+++ examples/Ethernet/examples/ChatServer/ChatServer.pde	1970-01-01 00:00:00 +0000
@@ -1,34 +0,0 @@
-/*
- * Chat Server
- *
- * A simple server that distributes any incoming messages to all
- * connected clients.  To use telnet to 10.0.0.177 and type!
- */
-
-#include <Ethernet.h>
-
-// network configuration.  gateway and subnet are optional.
-byte mac[] = { 0xDE, 0xAD, 0xBE, 0xEF, 0xFE, 0xED };
-byte ip[] = { 10, 0, 0, 177 };
-byte gateway[] = { 10, 0, 0, 1 };
-byte subnet[] = { 255, 255, 0, 0 };
-
-// telnet defaults to port 23
-Server server(23);
-
-void setup()
-{
-  // initialize the ethernet device
-  Ethernet.begin(mac, ip, gateway, subnet);
-  
-  // start listening for clients
-  server.begin();
-}
-
-void loop()
-{
-  Client client = server.available();
-  if (client) {
-    server.write(client.read());
-  }
-}

=== removed directory 'examples/Ethernet/examples/WebClient'
=== removed file 'examples/Ethernet/examples/WebClient/WebClient.pde'
--- examples/Ethernet/examples/WebClient/WebClient.pde	2010-02-12 19:25:26 +0000
+++ examples/Ethernet/examples/WebClient/WebClient.pde	1970-01-01 00:00:00 +0000
@@ -1,41 +0,0 @@
-#include <Ethernet.h>
-
-byte mac[] = { 0xDE, 0xAD, 0xBE, 0xEF, 0xFE, 0xED };
-byte ip[] = { 10, 0, 0, 177 };
-byte server[] = { 64, 233, 187, 99 }; // Google
-
-Client client(server, 80);
-
-void setup()
-{
-  Ethernet.begin(mac, ip);
-  Serial.begin(9600);
-  
-  delay(1000);
-  
-  Serial.println("connecting...");
-  
-  if (client.connect()) {
-    Serial.println("connected");
-    client.println("GET /search?q=arduino HTTP/1.0");
-    client.println();
-  } else {
-    Serial.println("connection failed");
-  }
-}
-
-void loop()
-{
-  if (client.available()) {
-    char c = client.read();
-    Serial.print(c);
-  }
-  
-  if (!client.connected()) {
-    Serial.println();
-    Serial.println("disconnecting.");
-    client.stop();
-    for(;;)
-      ;
-  }
-}

=== removed directory 'examples/Ethernet/examples/WebServer'
=== removed file 'examples/Ethernet/examples/WebServer/WebServer.pde'
--- examples/Ethernet/examples/WebServer/WebServer.pde	2010-02-12 19:25:26 +0000
+++ examples/Ethernet/examples/WebServer/WebServer.pde	1970-01-01 00:00:00 +0000
@@ -1,61 +0,0 @@
-/*
- * Web Server
- *
- * A simple web server that shows the value of the analog input pins.
- */
-
-#include <Ethernet.h>
-
-byte mac[] = { 0xDE, 0xAD, 0xBE, 0xEF, 0xFE, 0xED };
-byte ip[] = { 10, 0, 0, 177 };
-
-Server server(80);
-
-void setup()
-{
-  Ethernet.begin(mac, ip);
-  server.begin();
-}
-
-void loop()
-{
-  Client client = server.available();
-  if (client) {
-    // an http request ends with a blank line
-    boolean current_line_is_blank = true;
-    while (client.connected()) {
-      if (client.available()) {
-        char c = client.read();
-        // if we've gotten to the end of the line (received a newline
-        // character) and the line is blank, the http request has ended,
-        // so we can send a reply
-        if (c == '\n' && current_line_is_blank) {
-          // send a standard http response header
-          client.println("HTTP/1.1 200 OK");
-          client.println("Content-Type: text/html");
-          client.println();
-          
-          // output the value of each analog input pin
-          for (int i = 0; i < 6; i++) {
-            client.print("analog input ");
-            client.print(i);
-            client.print(" is ");
-            client.print(analogRead(i));
-            client.println("<br />");
-          }
-          break;
-        }
-        if (c == '\n') {
-          // we're starting a new line
-          current_line_is_blank = true;
-        } else if (c != '\r') {
-          // we've gotten a character on the current line
-          current_line_is_blank = false;
-        }
-      }
-    }
-    // give the web browser time to receive the data
-    delay(1);
-    client.stop();
-  }
-}

=== removed file 'examples/Ethernet/keywords.txt'
--- examples/Ethernet/keywords.txt	2010-02-12 19:25:26 +0000
+++ examples/Ethernet/keywords.txt	1970-01-01 00:00:00 +0000
@@ -1,30 +0,0 @@
-#######################################
-# Syntax Coloring Map For Ethernet
-#######################################
-
-#######################################
-# Datatypes (KEYWORD1)
-#######################################
-
-Ethernet	KEYWORD1
-Client	KEYWORD1
-Server	KEYWORD1
-
-#######################################
-# Methods and Functions (KEYWORD2)
-#######################################
-
-status	KEYWORD2
-connect	KEYWORD2
-write	KEYWORD2
-available	KEYWORD2
-read	KEYWORD2
-flush	KEYWORD2
-stop	KEYWORD2
-connected	KEYWORD2
-begin	KEYWORD2
-
-#######################################
-# Constants (LITERAL1)
-#######################################
-

=== removed directory 'examples/Ethernet/utility'
=== removed directory 'examples/Firmata'
=== removed file 'examples/Firmata/LICENSE.txt'
--- examples/Firmata/LICENSE.txt	2010-02-12 19:25:26 +0000
+++ examples/Firmata/LICENSE.txt	1970-01-01 00:00:00 +0000
@@ -1,458 +0,0 @@
-
-		  GNU LESSER GENERAL PUBLIC LICENSE
-		       Version 2.1, February 1999
-
- Copyright (C) 1991, 1999 Free Software Foundation, Inc.
- 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-[This is the first released version of the Lesser GPL.  It also counts
- as the successor of the GNU Library Public License, version 2, hence
- the version number 2.1.]
-
-			    Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-Licenses are intended to guarantee your freedom to share and change
-free software--to make sure the software is free for all its users.
-
-  This license, the Lesser General Public License, applies to some
-specially designated software packages--typically libraries--of the
-Free Software Foundation and other authors who decide to use it.  You
-can use it too, but we suggest you first think carefully about whether
-this license or the ordinary General Public License is the better
-strategy to use in any particular case, based on the explanations below.
-
-  When we speak of free software, we are referring to freedom of use,
-not price.  Our General Public Licenses are designed to make sure that
-you have the freedom to distribute copies of free software (and charge
-for this service if you wish); that you receive source code or can get
-it if you want it; that you can change the software and use pieces of
-it in new free programs; and that you are informed that you can do
-these things.
-
-  To protect your rights, we need to make restrictions that forbid
-distributors to deny you these rights or to ask you to surrender these
-rights.  These restrictions translate to certain responsibilities for
-you if you distribute copies of the library or if you modify it.
-
-  For example, if you distribute copies of the library, whether gratis
-or for a fee, you must give the recipients all the rights that we gave
-you.  You must make sure that they, too, receive or can get the source
-code.  If you link other code with the library, you must provide
-complete object files to the recipients, so that they can relink them
-with the library after making changes to the library and recompiling
-it.  And you must show them these terms so they know their rights.
-
-  We protect your rights with a two-step method: (1) we copyright the
-library, and (2) we offer you this license, which gives you legal
-permission to copy, distribute and/or modify the library.
-
-  To protect each distributor, we want to make it very clear that
-there is no warranty for the free library.  Also, if the library is
-modified by someone else and passed on, the recipients should know
-that what they have is not the original version, so that the original
-author's reputation will not be affected by problems that might be
-introduced by others.
-

-  Finally, software patents pose a constant threat to the existence of
-any free program.  We wish to make sure that a company cannot
-effectively restrict the users of a free program by obtaining a
-restrictive license from a patent holder.  Therefore, we insist that
-any patent license obtained for a version of the library must be
-consistent with the full freedom of use specified in this license.
-
-  Most GNU software, including some libraries, is covered by the
-ordinary GNU General Public License.  This license, the GNU Lesser
-General Public License, applies to certain designated libraries, and
-is quite different from the ordinary General Public License.  We use
-this license for certain libraries in order to permit linking those
-libraries into non-free programs.
-
-  When a program is linked with a library, whether statically or using
-a shared library, the combination of the two is legally speaking a
-combined work, a derivative of the original library.  The ordinary
-General Public License therefore permits such linking only if the
-entire combination fits its criteria of freedom.  The Lesser General
-Public License permits more lax criteria for linking other code with
-the library.
-
-  We call this license the "Lesser" General Public License because it
-does Less to protect the user's freedom than the ordinary General
-Public License.  It also provides other free software developers Less
-of an advantage over competing non-free programs.  These disadvantages
-are the reason we use the ordinary General Public License for many
-libraries.  However, the Lesser license provides advantages in certain
-special circumstances.
-
-  For example, on rare occasions, there may be a special need to
-encourage the widest possible use of a certain library, so that it becomes
-a de-facto standard.  To achieve this, non-free programs must be
-allowed to use the library.  A more frequent case is that a free
-library does the same job as widely used non-free libraries.  In this
-case, there is little to gain by limiting the free library to free
-software only, so we use the Lesser General Public License.
-
-  In other cases, permission to use a particular library in non-free
-programs enables a greater number of people to use a large body of
-free software.  For example, permission to use the GNU C Library in
-non-free programs enables many more people to use the whole GNU
-operating system, as well as its variant, the GNU/Linux operating
-system.
-
-  Although the Lesser General Public License is Less protective of the
-users' freedom, it does ensure that the user of a program that is
-linked with the Library has the freedom and the wherewithal to run
-that program using a modified version of the Library.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.  Pay close attention to the difference between a
-"work based on the library" and a "work that uses the library".  The
-former contains code derived from the library, whereas the latter must
-be combined with the library in order to run.
-

-		  GNU LESSER GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License Agreement applies to any software library or other
-program which contains a notice placed by the copyright holder or
-other authorized party saying it may be distributed under the terms of
-this Lesser General Public License (also called "this License").
-Each licensee is addressed as "you".
-
-  A "library" means a collection of software functions and/or data
-prepared so as to be conveniently linked with application programs
-(which use some of those functions and data) to form executables.
-
-  The "Library", below, refers to any such software library or work
-which has been distributed under these terms.  A "work based on the
-Library" means either the Library or any derivative work under
-copyright law: that is to say, a work containing the Library or a
-portion of it, either verbatim or with modifications and/or translated
-straightforwardly into another language.  (Hereinafter, translation is
-included without limitation in the term "modification".)
-
-  "Source code" for a work means the preferred form of the work for
-making modifications to it.  For a library, complete source code means
-all the source code for all modules it contains, plus any associated
-interface definition files, plus the scripts used to control compilation
-and installation of the library.
-
-  Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running a program using the Library is not restricted, and output from
-such a program is covered only if its contents constitute a work based
-on the Library (independent of the use of the Library in a tool for
-writing it).  Whether that is true depends on what the Library does
-and what the program that uses the Library does.
-  
-  1. You may copy and distribute verbatim copies of the Library's
-complete source code as you receive it, in any medium, provided that
-you conspicuously and appropriately publish on each copy an
-appropriate copyright notice and disclaimer of warranty; keep intact
-all the notices that refer to this License and to the absence of any
-warranty; and distribute a copy of this License along with the
-Library.
-
-  You may charge a fee for the physical act of transferring a copy,
-and you may at your option offer warranty protection in exchange for a
-fee.
-

-  2. You may modify your copy or copies of the Library or any portion
-of it, thus forming a work based on the Library, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) The modified work must itself be a software library.
-
-    b) You must cause the files modified to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    c) You must cause the whole of the work to be licensed at no
-    charge to all third parties under the terms of this License.
-
-    d) If a facility in the modified Library refers to a function or a
-    table of data to be supplied by an application program that uses
-    the facility, other than as an argument passed when the facility
-    is invoked, then you must make a good faith effort to ensure that,
-    in the event an application does not supply such function or
-    table, the facility still operates, and performs whatever part of
-    its purpose remains meaningful.
-
-    (For example, a function in a library to compute square roots has
-    a purpose that is entirely well-defined independent of the
-    application.  Therefore, Subsection 2d requires that any
-    application-supplied function or table used by this function must
-    be optional: if the application does not supply it, the square
-    root function must still compute square roots.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Library,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Library, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote
-it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Library.
-
-In addition, mere aggregation of another work not based on the Library
-with the Library (or with a work based on the Library) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may opt to apply the terms of the ordinary GNU General Public
-License instead of this License to a given copy of the Library.  To do
-this, you must alter all the notices that refer to this License, so
-that they refer to the ordinary GNU General Public License, version 2,
-instead of to this License.  (If a newer version than version 2 of the
-ordinary GNU General Public License has appeared, then you can specify
-that version instead if you wish.)  Do not make any other change in
-these notices.
-

-  Once this change is made in a given copy, it is irreversible for
-that copy, so the ordinary GNU General Public License applies to all
-subsequent copies and derivative works made from that copy.
-
-  This option is useful when you wish to copy part of the code of
-the Library into a program that is not a library.
-
-  4. You may copy and distribute the Library (or a portion or
-derivative of it, under Section 2) in object code or executable form
-under the terms of Sections 1 and 2 above provided that you accompany
-it with the complete corresponding machine-readable source code, which
-must be distributed under the terms of Sections 1 and 2 above on a
-medium customarily used for software interchange.
-
-  If distribution of object code is made by offering access to copy
-from a designated place, then offering equivalent access to copy the
-source code from the same place satisfies the requirement to
-distribute the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  5. A program that contains no derivative of any portion of the
-Library, but is designed to work with the Library by being compiled or
-linked with it, is called a "work that uses the Library".  Such a
-work, in isolation, is not a derivative work of the Library, and
-therefore falls outside the scope of this License.
-
-  However, linking a "work that uses the Library" with the Library
-creates an executable that is a derivative of the Library (because it
-contains portions of the Library), rather than a "work that uses the
-library".  The executable is therefore covered by this License.
-Section 6 states terms for distribution of such executables.
-
-  When a "work that uses the Library" uses material from a header file
-that is part of the Library, the object code for the work may be a
-derivative work of the Library even though the source code is not.
-Whether this is true is especially significant if the work can be
-linked without the Library, or if the work is itself a library.  The
-threshold for this to be true is not precisely defined by law.
-
-  If such an object file uses only numerical parameters, data
-structure layouts and accessors, and small macros and small inline
-functions (ten lines or less in length), then the use of the object
-file is unrestricted, regardless of whether it is legally a derivative
-work.  (Executables containing this object code plus portions of the
-Library will still fall under Section 6.)
-
-  Otherwise, if the work is a derivative of the Library, you may
-distribute the object code for the work under the terms of Section 6.
-Any executables containing that work also fall under Section 6,
-whether or not they are linked directly with the Library itself.
-

-  6. As an exception to the Sections above, you may also combine or
-link a "work that uses the Library" with the Library to produce a
-work containing portions of the Library, and distribute that work
-under terms of your choice, provided that the terms permit
-modification of the work for the customer's own use and reverse
-engineering for debugging such modifications.
-
-  You must give prominent notice with each copy of the work that the
-Library is used in it and that the Library and its use are covered by
-this License.  You must supply a copy of this License.  If the work
-during execution displays copyright notices, you must include the
-copyright notice for the Library among them, as well as a reference
-directing the user to the copy of this License.  Also, you must do one
-of these things:
-
-    a) Accompany the work with the complete corresponding
-    machine-readable source code for the Library including whatever
-    changes were used in the work (which must be distributed under
-    Sections 1 and 2 above); and, if the work is an executable linked
-    with the Library, with the complete machine-readable "work that
-    uses the Library", as object code and/or source code, so that the
-    user can modify the Library and then relink to produce a modified
-    executable containing the modified Library.  (It is understood
-    that the user who changes the contents of definitions files in the
-    Library will not necessarily be able to recompile the application
-    to use the modified definitions.)
-
-    b) Use a suitable shared library mechanism for linking with the
-    Library.  A suitable mechanism is one that (1) uses at run time a
-    copy of the library already present on the user's computer system,
-    rather than copying library functions into the executable, and (2)
-    will operate properly with a modified version of the library, if
-    the user installs one, as long as the modified version is
-    interface-compatible with the version that the work was made with.
-
-    c) Accompany the work with a written offer, valid for at
-    least three years, to give the same user the materials
-    specified in Subsection 6a, above, for a charge no more
-    than the cost of performing this distribution.
-
-    d) If distribution of the work is made by offering access to copy
-    from a designated place, offer equivalent access to copy the above
-    specified materials from the same place.
-
-    e) Verify that the user has already received a copy of these
-    materials or that you have already sent this user a copy.
-
-  For an executable, the required form of the "work that uses the
-Library" must include any data and utility programs needed for
-reproducing the executable from it.  However, as a special exception,
-the materials to be distributed need not include anything that is
-normally distributed (in either source or binary form) with the major
-components (compiler, kernel, and so on) of the operating system on
-which the executable runs, unless that component itself accompanies
-the executable.
-
-  It may happen that this requirement contradicts the license
-restrictions of other proprietary libraries that do not normally
-accompany the operating system.  Such a contradiction means you cannot
-use both them and the Library together in an executable that you
-distribute.
-

-  7. You may place library facilities that are a work based on the
-Library side-by-side in a single library together with other library
-facilities not covered by this License, and distribute such a combined
-library, provided that the separate distribution of the work based on
-the Library and of the other library facilities is otherwise
-permitted, and provided that you do these two things:
-
-    a) Accompany the combined library with a copy of the same work
-    based on the Library, uncombined with any other library
-    facilities.  This must be distributed under the terms of the
-    Sections above.
-
-    b) Give prominent notice with the combined library of the fact
-    that part of it is a work based on the Library, and explaining
-    where to find the accompanying uncombined form of the same work.
-
-  8. You may not copy, modify, sublicense, link with, or distribute
-the Library except as expressly provided under this License.  Any
-attempt otherwise to copy, modify, sublicense, link with, or
-distribute the Library is void, and will automatically terminate your
-rights under this License.  However, parties who have received copies,
-or rights, from you under this License will not have their licenses
-terminated so long as such parties remain in full compliance.
-
-  9. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Library or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Library (or any work based on the
-Library), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Library or works based on it.
-
-  10. Each time you redistribute the Library (or any work based on the
-Library), the recipient automatically receives a license from the
-original licensor to copy, distribute, link with or modify the Library
-subject to these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties with
-this License.
-

-  11. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Library at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Library by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Library.
-
-If any portion of this section is held invalid or unenforceable under any
-particular circumstance, the balance of the section is intended to apply,
-and the section as a whole is intended to apply in other circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  12. If the distribution and/or use of the Library is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Library under this License may add
-an explicit geographical distribution limitation excluding those countries,
-so that distribution is permitted only in or among countries not thus
-excluded.  In such case, this License incorporates the limitation as if
-written in the body of this License.
-
-  13. The Free Software Foundation may publish revised and/or new
-versions of the Lesser General Public License from time to time.
-Such new versions will be similar in spirit to the present version,
-but may differ in detail to address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Library
-specifies a version number of this License which applies to it and
-"any later version", you have the option of following the terms and
-conditions either of that version or of any later version published by
-the Free Software Foundation.  If the Library does not specify a
-license version number, you may choose any version ever published by
-the Free Software Foundation.
-

-  14. If you wish to incorporate parts of the Library into other free
-programs whose distribution conditions are incompatible with these,
-write to the author to ask for permission.  For software which is
-copyrighted by the Free Software Foundation, write to the Free
-Software Foundation; we sometimes make exceptions for this.  Our
-decision will be guided by the two goals of preserving the free status
-of all derivatives of our free software and of promoting the sharing
-and reuse of software generally.
-
-			    NO WARRANTY
-
-  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
-WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
-EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
-OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
-KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
-LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
-THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
-WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
-AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
-FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
-CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
-LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
-RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
-FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
-SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGES.
-

=== removed file 'examples/Firmata/TODO.txt'
--- examples/Firmata/TODO.txt	2010-02-12 19:25:26 +0000
+++ examples/Firmata/TODO.txt	1970-01-01 00:00:00 +0000
@@ -1,14 +0,0 @@
-
-- make Firmata a subclass of HardwareSerial
-
-- per-pin digital callback, since the per-port callback is a bit complicated
-  for beginners (maybe Firmata is not for beginners...)
-
-- simplify SimpleDigitalFirmata, take out the code that checks to see if the
-  data has changed, since it is a bit complicated for this example.  Ideally
-  this example would be based on a call
-
-- turn current SimpleDigitalFirmata into DigitalPortFirmata for a more complex
-  example using the code which checks for changes before doing anything
-
-- test integration with Wiring

=== removed directory 'examples/Firmata/examples'
=== removed directory 'examples/Firmata/examples/AllInputsFirmata'
=== removed file 'examples/Firmata/examples/AllInputsFirmata/AllInputsFirmata.pde'
--- examples/Firmata/examples/AllInputsFirmata/AllInputsFirmata.pde	2010-02-12 19:25:26 +0000
+++ examples/Firmata/examples/AllInputsFirmata/AllInputsFirmata.pde	1970-01-01 00:00:00 +0000
@@ -1,71 +0,0 @@
-/* 
- * This firmware reads all inputs and sends them as fast as it can.  It was
- * inspired by the ease-of-use of the Arduino2Max program.
- *
- * This example code is in the public domain.
- */
-#include <Firmata.h>
-
-byte pin;
-
-int analogValue;
-int previousAnalogValues[TOTAL_ANALOG_PINS];
-
-byte portStatus[TOTAL_PORTS];
-byte previousPINs[TOTAL_PORTS];
-
-/* timer variables */
-unsigned long currentMillis;     // store the current value from millis()
-unsigned long nextExecuteMillis; // for comparison with currentMillis
-/* make sure that the FTDI buffer doesn't go over 60 bytes, otherwise you
-   get long, random delays.  So only read analogs every 20ms or so */
-int samplingInterval = 19;      // how often to run the main loop (in ms)
-
-void sendPort(byte portNumber, byte portValue)
-{
-  portValue = portValue &~ portStatus[portNumber];
-  if(previousPINs[portNumber] != portValue) {
-    Firmata.sendDigitalPort(portNumber, portValue);
-    previousPINs[portNumber] = portValue;
-  }
-}
-
-void setup()
-{
-  Firmata.setFirmwareVersion(0, 1);
-
-  for(pin = 0; pin < TOTAL_DIGITAL_PINS; pin++) {
-    pinMode(pin, INPUT);
-  }
-
-  portStatus[0] = B00000011;  // ignore Tx/RX pins
-  portStatus[1] = B11000000;  // ignore 14/15 pins 
-  portStatus[2] = B00000000;
-
-  Firmata.begin(57600);
-}
-
-void loop()
-{
-  sendPort(0, PIND);
-  sendPort(1, PINB);
-  sendPort(2, PINC);
-  /* make sure that the FTDI buffer doesn't go over 60 bytes, otherwise you
-     get long, random delays.  So only read analogs every 20ms or so */
-  currentMillis = millis();
-  if(currentMillis > nextExecuteMillis) {  
-    nextExecuteMillis = currentMillis + samplingInterval;
-    while(Firmata.available()) {
-      Firmata.processInput();
-    }
-    for(pin = 0; pin < TOTAL_ANALOG_PINS; pin++) {
-      analogValue = analogRead(pin);
-      if(analogValue != previousAnalogValues[pin]) {
-        Firmata.sendAnalog(pin, analogValue); 
-        previousAnalogValues[pin] = analogValue;
-      }
-    }
-  }
-}
-
-

=== removed directory 'examples/Firmata/examples/AnalogFirmata'
=== removed file 'examples/Firmata/examples/AnalogFirmata/AnalogFirmata.pde'
--- examples/Firmata/examples/AnalogFirmata/AnalogFirmata.pde	2010-02-12 19:25:26 +0000
+++ examples/Firmata/examples/AnalogFirmata/AnalogFirmata.pde	1970-01-01 00:00:00 +0000
@@ -1,83 +0,0 @@
-/* This firmware supports as many analog ports as possible, all analog inputs,
- * four PWM outputs, and two with servo support.
- *
- * This example code is in the public domain.
- */
-#include <Firmata.h>
-#include <Servo.h>
-
-/*==============================================================================
- * GLOBAL VARIABLES
- *============================================================================*/
-
-/* servos */
-Servo servo9, servo10; // one instance per pin
-/* analog inputs */
-int analogInputsToReport = 0; // bitwise array to store pin reporting
-int analogPin = 0; // counter for reading analog pins
-/* timer variables */
-unsigned long currentMillis;     // store the current value from millis()
-unsigned long nextExecuteMillis; // for comparison with currentMillis
-
-
-/*==============================================================================
- * FUNCTIONS                                                                
- *============================================================================*/
-
-void analogWriteCallback(byte pin, int value)
-{
-    switch(pin) {
-    case 9: servo9.write(value); break;
-    case 10: servo10.write(value); break;
-    case 3: 
-    case 5: 
-    case 6: 
-    case 11: // PWM pins
-        analogWrite(pin, value); 
-        break;
-    }
-}
-// -----------------------------------------------------------------------------
-// sets bits in a bit array (int) to toggle the reporting of the analogIns
-void reportAnalogCallback(byte pin, int value)
-{
-    if(value == 0) {
-        analogInputsToReport = analogInputsToReport &~ (1 << pin);
-    }
-    else { // everything but 0 enables reporting of that pin
-        analogInputsToReport = analogInputsToReport | (1 << pin);
-    }
-    // TODO: save status to EEPROM here, if changed
-}
-
-/*==============================================================================
- * SETUP()
- *============================================================================*/
-void setup() 
-{
-    Firmata.setFirmwareVersion(0, 2);
-    Firmata.attach(ANALOG_MESSAGE, analogWriteCallback);
-    Firmata.attach(REPORT_ANALOG, reportAnalogCallback);
-
-    servo9.attach(9);
-    servo10.attach(10);
-    Firmata.begin(57600);
-}
-
-/*==============================================================================
- * LOOP()
- *============================================================================*/
-void loop() 
-{
-    while(Firmata.available())
-        Firmata.processInput();
-    currentMillis = millis();
-    if(currentMillis > nextExecuteMillis) {  
-        nextExecuteMillis = currentMillis + 19; // run this every 20ms
-        for(analogPin=0;analogPin<TOTAL_ANALOG_PINS;analogPin++) {
-            if( analogInputsToReport & (1 << analogPin) ) 
-                Firmata.sendAnalog(analogPin, analogRead(analogPin));
-        }
-    }
-}
-

=== removed file 'examples/Firmata/examples/AnalogFirmata/Makefile'
--- examples/Firmata/examples/AnalogFirmata/Makefile	2010-02-12 19:25:26 +0000
+++ examples/Firmata/examples/AnalogFirmata/Makefile	1970-01-01 00:00:00 +0000
@@ -1,263 +0,0 @@
-# Arduino makefile
-#
-# This makefile allows you to build sketches from the command line
-# without the Arduino environment (or Java).
-#
-# The Arduino environment does preliminary processing on a sketch before
-# compiling it.  If you're using this makefile instead, you'll need to do
-# a few things differently:
-#
-#   - Give your program's file a .cpp extension (e.g. foo.cpp).
-#
-#   - Put this line at top of your code: #include <WProgram.h>
-#
-#   - Write prototypes for all your functions (or define them before you
-#     call them).  A prototype declares the types of parameters a
-#     function will take and what type of value it will return.  This
-#     means that you can have a call to a function before the definition
-#     of the function.  A function prototype looks like the first line of
-#     the function, with a semi-colon at the end.  For example:
-#     int digitalRead(int pin);
-#
-# Instructions for using the makefile:
-#
-#  1. Copy this file into the folder with your sketch.
-#
-#  2. Below, modify the line containing "TARGET" to refer to the name of
-#     of your program's file without an extension (e.g. TARGET = foo).
-#
-#  3. Modify the line containg "ARDUINO" to point the directory that
-#     contains the Arduino core (for normal Arduino installations, this
-#     is the hardware/cores/arduino sub-directory).
-#
-#  4. Modify the line containing "PORT" to refer to the filename
-#     representing the USB or serial connection to your Arduino board
-#     (e.g. PORT = /dev/tty.USB0).  If the exact name of this file
-#     changes, you can use * as a wildcard (e.g. PORT = /dev/tty.USB*).
-#
-#  5. At the command line, change to the directory containing your
-#     program's file and the makefile.
-#
-#  6. Type "make" and press enter to compile/verify your program.
-#
-#  7. Type "make upload", reset your Arduino board, and press enter  to
-#     upload your program to the Arduino board.
-#
-# $Id: Makefile,v 1.7 2007/04/13 05:28:23 eighthave Exp $
-
-PORT = /dev/tty.usbserial-*
-TARGET := $(shell pwd | sed 's|.*/\(.*\)|\1|')
-ARDUINO = /Applications/arduino
-ARDUINO_SRC = $(ARDUINO)/hardware/cores/arduino
-ARDUINO_LIB_SRC = $(ARDUINO)/hardware/libraries
-INCLUDE = -I$(ARDUINO_SRC) -I$(ARDUINO)/hardware/tools/avr/avr/include \
-	-I$(ARDUINO_LIB_SRC)/EEPROM \
-	-I$(ARDUINO_LIB_SRC)/Firmata \
-	-I$(ARDUINO_LIB_SRC)/Servo \
-	-I$(ARDUINO_LIB_SRC)
-SRC = $(wildcard $(ARDUINO_SRC)/*.c)
-CXXSRC = applet/$(TARGET).cpp $(ARDUINO_SRC)/HardwareSerial.cpp \
-	$(ARDUINO_LIB_SRC)/EEPROM/EEPROM.cpp \
-	$(ARDUINO_LIB_SRC)/Firmata/Firmata.cpp \
-	$(ARDUINO_LIB_SRC)/Servo/Servo.cpp \
-	$(ARDUINO_SRC)/WMath.cpp
-HEADERS = $(wildcard $(ARDUINO_SRC)/*.h) $(wildcard $(ARDUINO_LIB_SRC)/*/*.h)
-
-MCU = atmega168
-#MCU = atmega8
-F_CPU = 16000000
-FORMAT = ihex
-UPLOAD_RATE = 19200
-
-# Name of this Makefile (used for "make depend").
-MAKEFILE = Makefile
-
-# Debugging format.
-# Native formats for AVR-GCC's -g are stabs [default], or dwarf-2.
-# AVR (extended) COFF requires stabs, plus an avr-objcopy run.
-DEBUG = stabs
-
-OPT = s
-
-# Place -D or -U options here
-CDEFS = -DF_CPU=$(F_CPU)
-CXXDEFS = -DF_CPU=$(F_CPU)
-
-# Compiler flag to set the C Standard level.
-# c89   - "ANSI" C
-# gnu89 - c89 plus GCC extensions
-# c99   - ISO C99 standard (not yet fully implemented)
-# gnu99 - c99 plus GCC extensions
-CSTANDARD = -std=gnu99
-CDEBUG = -g$(DEBUG)
-CWARN = -Wall -Wstrict-prototypes
-CTUNING = -funsigned-char -funsigned-bitfields -fpack-struct -fshort-enums
-#CEXTRA = -Wa,-adhlns=$(<:.c=.lst)
-
-CFLAGS = $(CDEBUG) $(CDEFS) $(INCLUDE) -O$(OPT) $(CWARN) $(CSTANDARD) $(CEXTRA)
-CXXFLAGS = $(CDEFS) $(INCLUDE) -O$(OPT)
-#ASFLAGS = -Wa,-adhlns=$(<:.S=.lst),-gstabs 
-LDFLAGS = 
-
-
-# Programming support using avrdude. Settings and variables.
-AVRDUDE_PROGRAMMER = stk500
-AVRDUDE_PORT = $(PORT)
-AVRDUDE_WRITE_FLASH = -U flash:w:applet/$(TARGET).hex
-AVRDUDE_FLAGS = -F -p $(MCU) -P $(AVRDUDE_PORT) -c $(AVRDUDE_PROGRAMMER) \
-  -b $(UPLOAD_RATE) -q -V
-
-# Program settings
-CC = avr-gcc
-CXX = avr-g++
-OBJCOPY = avr-objcopy
-OBJDUMP = avr-objdump
-SIZE = avr-size
-NM = avr-nm
-AVRDUDE = avrdude
-REMOVE = rm -f
-MV = mv -f
-
-# Define all object files.
-OBJ = $(SRC:.c=.o) $(CXXSRC:.cpp=.o) $(ASRC:.S=.o)
-
-# Define all listing files.
-LST = $(ASRC:.S=.lst) $(CXXSRC:.cpp=.lst) $(SRC:.c=.lst)
-
-# Combine all necessary flags and optional flags.
-# Add target processor to flags.
-ALL_CFLAGS = -mmcu=$(MCU) -I. $(CFLAGS)
-ALL_CXXFLAGS = -mmcu=$(MCU) -I. $(CXXFLAGS)
-ALL_ASFLAGS = -mmcu=$(MCU) -I. -x assembler-with-cpp $(ASFLAGS)
-
-