merged in the debian patches and removed trailing whitespace

most of the debian patches are just cosmetic (space/comments) so
easier to just merge upstream

arduino-mk/Arduino.mk

@@ -53,7 +53,7 @@
 # On Linux, you might prefer:
 #
 #   ARDUINO_DIR   = /usr/share/arduino
-#   ARDMK_DIR     = /usr/local
+#   ARDMK_DIR     = /usr
 #   AVR_TOOLS_DIR = /usr
 #
 # You can either set these up in the Makefile, or put them in your
@@ -89,7 +89,7 @@
 #       BOARD_TAG    = uno
 #       ARDUINO_PORT = /dev/cu.usb*
 #
-#       include /usr/local/share/Arduino.mk
+#       include /usr/share/arduino/Arduino.mk
 #
 # Hopefully these will be self-explanatory but in case they're not:
 #
@@ -887,10 +887,10 @@ reset:
 # least. Perhaps it would be better to just do it in perl ?
 reset_stty:
 		for STTYF in 'stty -F' 'stty --file' 'stty -f' 'stty <' ; \
-		  do $$STTYF /dev/tty >/dev/null 2>/dev/null && break ; \
+		  do $$STTYF /dev/tty >/dev/null 2>&1 && break ; \
 		done ; \
 		$$STTYF $(call get_arduino_port)  hupcl ; \
-		(sleep 0.1 || sleep 1)     ;\
+		(sleep 0.1 2>/dev/null || sleep 1) ; \
 		$$STTYF $(call get_arduino_port) -hupcl
 
 ispload:	$(TARGET_EEP) $(TARGET_HEX) verify_size

bin/ard-parse-boards

@@ -12,7 +12,7 @@ use YAML;
 # More discussion at https://github.com/sudar/Arduino-Makefile/issues/50
 my %Opt =
    (
-    boards_txt => '/Applications/Arduino.app/Contents/Resources/Java/hardware/arduino/boards.txt',
+    boards_txt => '/usr/share/arduino/hardware/arduino/boards.txt',
    );
 
 # if the ARDUINO_DIR is defined, then use it