From 28d9710a010850638c3c867cd43b3732bbc6269f Mon Sep 17 00:00:00 2001
From: Robert Schuster <rschus@tarub.tarent.buero>
Date: Sat, 12 Mar 2011 09:23:07 +0100
Subject: [PATCH] avrdude 5.10: Added patches from Debian.

---
 .../avrdude/avrdude-5.10/02-manpage_fix.patch | 35 +++++++++++++++++++
 .../avrdude-5.10/03-fix_auto_reset.patch      | 29 +++++++++++++++
 recipes/avrdude/avrdude_5.10.bb               |  9 ++++-
 3 files changed, 72 insertions(+), 1 deletion(-)
 create mode 100644 recipes/avrdude/avrdude-5.10/02-manpage_fix.patch
 create mode 100644 recipes/avrdude/avrdude-5.10/03-fix_auto_reset.patch

diff --git a/recipes/avrdude/avrdude-5.10/02-manpage_fix.patch b/recipes/avrdude/avrdude-5.10/02-manpage_fix.patch
new file mode 100644
index 0000000000..f8c9262079
--- /dev/null
+++ b/recipes/avrdude/avrdude-5.10/02-manpage_fix.patch
@@ -0,0 +1,35 @@
+Description: Fix paths in the man page
+ Update the man page to point to the correct location of the documentation
+ and config file when installed on a Debian system.
+Author: Michael Biebl <biebl@debian.org>
+Index: avrdude/avrdude.1
+===================================================================
+--- avrdude.orig/avrdude.1	2010-01-17 02:31:26.738486618 +0100
++++ avrdude/avrdude.1	2010-01-17 02:33:50.154482626 +0100
+@@ -343,7 +343,7 @@
+ does not know about, you can add it to the config file (be sure and
+ submit a patch back to the author so that it can be incorporated for
+ the next version).  See the config file, located at
+-.Pa ${PREFIX}/etc/avrdude.conf ,
++.Pa /etc/avrdude.conf ,
+ which contains a description of the format.
+ .It Fl D
+ Disable auto erase for flash.  When the
+@@ -964,7 +964,7 @@
+ .It Pa /dev/ppi0
+ default device to be used for communication with the programming
+ hardware
+-.It Pa ${PREFIX}/etc/avrdude.conf
++.It Pa /etc/avrdude.conf
+ programmer and parts configuration file
+ .It Pa ${HOME}/.avrduderc
+ programmer and parts configuration file (per-user overrides)
+@@ -972,7 +972,7 @@
+ Initialization file for the
+ .Xr readline 3
+ library
+-.It Pa ${PREFIX}/share/doc/avrdude/avrdude.pdf
++.It Pa /usr/share/doc/avrdude-doc/avrdude.pdf
+ Schematic of programming hardware
+ .El
+ .\" .Sh EXAMPLES
diff --git a/recipes/avrdude/avrdude-5.10/03-fix_auto_reset.patch b/recipes/avrdude/avrdude-5.10/03-fix_auto_reset.patch
new file mode 100644
index 0000000000..71b29451d5
--- /dev/null
+++ b/recipes/avrdude/avrdude-5.10/03-fix_auto_reset.patch
@@ -0,0 +1,29 @@
+Author: Michal Ludvig <mludvig@logix.net.nz>
+Description: Fixed DTR on/off to make Arduino auto-reset work.
+Origin: http://svn.savannah.gnu.org/viewvc?view=rev&root=avrdude&revision=940
+Bug: http://savannah.nongnu.org/bugs/?29108
+Bug-Ubuntu: https://bugs.launchpad.net/arduino/+bug/529444
+
+=== modified file 'ser_posix.c'
+Index: avrdude/ser_posix.c
+===================================================================
+--- avrdude.orig/ser_posix.c	2010-03-22 17:28:07.000000000 -0400
++++ avrdude/ser_posix.c	2010-03-22 17:28:42.000000000 -0400
+@@ -230,13 +230,13 @@
+   }
+ 
+   if (is_on) {
+-    /* Clear DTR and RTS */
+-    ctl &= ~(TIOCM_DTR | TIOCM_RTS);
+-  }
+-  else {
+     /* Set DTR and RTS */
+     ctl |= (TIOCM_DTR | TIOCM_RTS);
+   }
++  else {
++    /* Clear DTR and RTS */
++    ctl &= ~(TIOCM_DTR | TIOCM_RTS);
++  }
+ 
+   r = ioctl(fdp->ifd, TIOCMSET, &ctl);
+   if (r < 0) {
diff --git a/recipes/avrdude/avrdude_5.10.bb b/recipes/avrdude/avrdude_5.10.bb
index e033a11001..eac8137886 100644
--- a/recipes/avrdude/avrdude_5.10.bb
+++ b/recipes/avrdude/avrdude_5.10.bb
@@ -1,5 +1,12 @@
 require avrdude.inc
-PR = "r1"
+
+# Patches courtesy of Debian/Ubuntu
+SRC_URI += "\
+	file://02-manpage_fix.patch \
+	file://03-fix_auto_reset.patch \
+"
+
+PR = "r2"
 
 SRC_URI[md5sum] = "69b082683047e054348088fd63bad2ff"
 SRC_URI[sha256sum] = "81501b63d5b8699874d00c9eca42837b85695bc0820ba9843b17f573ce38be5e"
-- 
2.39.5