~ubuntu-branches/ubuntu/precise/avrdude/precise

« back to all changes in this revision

Viewing changes to debian/patches/03-freebsd-serial-device.patch

  • Committer: Bazaar Package Importer
  • Author(s): Michael Biebl
  • Date: 2010-01-19 18:57:14 UTC
  • mfrom: (1.1.9 upstream)
  • Revision ID: james.westby@ubuntu.com-20100119185714-z5y9ealegt5gcfbm
Tags: 5.10-1
* New upstream release.
* Removed patches:
  - debian/patches/01-kfreebsd.patch (merged upstream)
  - debian/patches/03-freebsd-serial-device.patch (merged upstream)
  - debian/patches/04-am_maintainer_mode.patch (obsolete)
  - debian/patches/99-autoreconf.patch (obsolete)

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
 
The name of the serial device has changed since FreeBSD 6.0
2
 
http://lists.freebsd.org/pipermail/freebsd-questions/2006-September/132027.html
3
 
http://www.freebsd.org/doc/en/books/faq/serial.html
4
 
Index: avrdude/configure.ac
5
 
===================================================================
6
 
--- avrdude.orig/configure.ac   2010-01-17 13:14:31.330413278 +0100
7
 
+++ avrdude/configure.ac        2010-01-17 13:15:03.213498373 +0100
8
 
@@ -198,11 +198,11 @@
9
 
                ;;
10
 
        i[[3456]]86-*-*freebsd*|amd64-*-*freebsd*)
11
 
                DEFAULT_PAR_PORT="/dev/ppi0"
12
 
-               DEFAULT_SER_PORT="/dev/cuaa0"
13
 
+               DEFAULT_SER_PORT="/dev/cuad0"
14
 
                ;;
15
 
        *-*-*freebsd*)
16
 
                DEFAULT_PAR_PORT="unknown"
17
 
-               DEFAULT_SER_PORT="/dev/cuaa0"
18
 
+               DEFAULT_SER_PORT="/dev/cuad0"
19
 
                ;;
20
 
        *-*-solaris*)
21
 
                DEFAULT_PAR_PORT="/dev/printers/0"
22
 
Index: avrdude/doc/avrdude.info
23
 
===================================================================
24
 
--- avrdude.orig/doc/avrdude.info       2010-01-17 13:14:31.385497113 +0100
25
 
+++ avrdude/doc/avrdude.info    2010-01-17 13:15:12.293492927 +0100
26
 
@@ -1714,7 +1714,7 @@
27
 
 
28
 
 *System*               *Default Parallel      *Default Serial Port*
29
 
                        Port*                  
30
 
-FreeBSD                `/dev/ppi0'            `/dev/cuaa0'
31
 
+FreeBSD                `/dev/ppi0'            `/dev/cuad0'
32
 
 Linux                  `/dev/parport0'        `/dev/ttyS0'
33
 
 Solaris                `/dev/printers/0'      `/dev/term/a'
34
 
 
35
 
Index: avrdude/doc/avrdude.texi
36
 
===================================================================
37
 
--- avrdude.orig/doc/avrdude.texi       2010-01-17 13:14:31.425497182 +0100
38
 
+++ avrdude/doc/avrdude.texi    2010-01-17 13:15:18.193502809 +0100
39
 
@@ -1904,7 +1904,7 @@
40
 
   @tab @strong{Default Serial Port}
41
 
 @item FreeBSD
42
 
   @tab @code{/dev/ppi0}
43
 
-  @tab @code{/dev/cuaa0}
44
 
+  @tab @code{/dev/cuad0}
45
 
 @item Linux
46
 
   @tab @code{/dev/parport0}
47
 
   @tab @code{/dev/ttyS0}