Merge lp:~abogani/ubuntu/lucid/avrdude/avrdude.fix-529444 into lp:ubuntu/lucid/avrdude

[Alessio Igor Bogani]

Test build available in my PPA:
https://launchpad.net/~abogani/+archive/broken

Fix is backported from upstream development version. It also affect only code relevant for feature that fix (so low probability of regression).

User report that it really fix the bug:
https://bugs.launchpad.net/arduino/+bug/529444/comments/16

[Alessio Igor Bogani (abogani)]

Now all bug affected users confirm that fix works:
https://bugs.launchpad.net/arduino/+bug/529444/comments/19

[James Westby (james-w)]

Uploaded, thanks.

James

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2010-01-19 18:57:14 +0000
+++ debian/changelog	2010-03-18 14:06:21 +0000
@@ -1,3 +1,14 @@
+avrdude (5.10-1ubuntu1) lucid; urgency=low
+
+  * Backport of fix for arduino programmer type 
+    Source code changes have been backported from development version in svn
+    tree http://svn.savannah.gnu.org/viewvc?view=rev&root=avrdude&revision=940
+    These changes are related to Arduino's auto-reset after programming feature 
+    fixed with this patch in ser_posix.c file.
+    - LP: #529444
+
+ -- Alessio Igor Bogani <[e-mail]>  Tue, 16 Mar 2010 22:42:23 +0100
+
 avrdude (5.10-1) unstable; urgency=low
 
   * New upstream release.

=== modified file 'debian/control'
--- debian/control	2009-09-23 15:10:47 +0000
+++ debian/control	2010-03-18 14:06:21 +0000
@@ -1,7 +1,8 @@
 Source: avrdude
 Section: electronics
 Priority: extra
-Maintainer: Michael Biebl <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Michael Biebl <[e-mail]>
 Build-Depends: cdbs,
  debhelper (>= 7),
  autotools-dev,

=== modified file 'ser_posix.c'
--- ser_posix.c	2010-01-17 14:19:31 +0000
+++ ser_posix.c	2010-03-18 14:06:21 +0000
@@ -230,13 +230,13 @@
   }
 
   if (is_on) {
+    /* Set DTR and RTS */
+    ctl |= (TIOCM_DTR | TIOCM_RTS);
+  }
+  else {
     /* Clear DTR and RTS */
     ctl &= ~(TIOCM_DTR | TIOCM_RTS);
   }
-  else {
-    /* Set DTR and RTS */
-    ctl |= (TIOCM_DTR | TIOCM_RTS);
-  }
 
   r = ioctl(fdp->ifd, TIOCMSET, &ctl);
   if (r < 0) {