Imported Debian patch 0.3-2debian/0.3-2

4 files changed, 115 insertions, 5 deletions

diff --git a/debian/changelog b/debian/changelog
index d7a61e1..a0c37d2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,28 @@
+modemmanager (0.3-2) unstable; urgency=low
+
+  [ Alexander Sack ]
+  * also bump debhelper build-depends to >= 7
+    - update debian/control
+  * recommend usb-modeswitch
+    - update debian/control
+  * fix lintian warning about empty quilt series file; add
+    a single line comment
+    - update debian/patches/series
+  * add Michael Biebl <biebl@debian.org> to Uploaders
+    - update debian/control
+  * use asac@ubuntu.com as maintainer as the mailing list
+    bounces bug mail (Closes: #566833)
+    - update debian/control
+
+  [ Michael Biebl ]
+  * Bump Standards-Version to 3.8.4. No further changes.
+    - update debian/control
+  * Fix FTBFS on alpha by using the POSIX.1 struct termios interface instead
+    of the obsolete struct termio ioctl interface. (Closes: #570661)
+    - add debian/patches/01-termios.patch
+
+ -- Michael Biebl <biebl@debian.org>  Mon, 01 Mar 2010 18:07:54 +0100
+
 modemmanager (0.3-1) unstable; urgency=low
 
   * initial upload to debian (Closes: #546587)
@@ -211,7 +236,7 @@ modemmanager (0.2.git.20090806t105932.354a4cb-0ubuntu1) karmic; urgency=low
     - update debian/copyright
 
   [ Alexander Sack <asac@ubuntu.com> ]
-  * Initial release. (Closes: #XXXXXX)
+  * Initial release.
   * replace hal with gudev build dependency
     - update debian/control
   * signal.h is not implicitly included by hardy glib.h; add patch to
diff --git a/debian/control b/debian/control
index 5429ac6..4751436 100644
--- a/debian/control
+++ b/debian/control
@@ -1,9 +1,9 @@
 Source: modemmanager
 Section: net
 Priority: optional
-Maintainer: Ubuntu Network Manager Team <ubuntu-devel-discuss@lists.ubuntu.com>
-Uploaders: Alexander Sack <asac@debian.org>
-Build-Depends: debhelper (>= 5.0.0),
+Maintainer: Alexander Sack <asac@ubuntu.com>
+Uploaders: Alexander Sack <asac@debian.org>, Michael Biebl <biebl@debian.org>
+Build-Depends: debhelper (>= 7),
 	automake (>= 1:1.10), automake (<< 1:1.12),
 	cdbs,
 	quilt,
@@ -12,13 +12,14 @@ Build-Depends: debhelper (>= 5.0.0),
 	libglib2.0-dev (>= 2.18),
 	libgudev-1.0-dev,
 	xsltproc
-Standards-Version: 3.8.3
+Standards-Version: 3.8.4
 Vcs-Bzr: https://code.launchpad.net/~modemmanager/modemmanager/ubuntu
 
 Package: modemmanager
 Architecture: any
 Depends: ${shlibs:Depends},
 	${misc:Depends}
+Recommends: usb-modeswitch
 Description: D-Bus service for managing modems
  Provides a D-Bus interface to communicate with mobile broadband (GSM, CDMA,
  UMTS, ...) cards. Implements a loadable plugin interface to add work-arounds
diff --git a/debian/patches/01-termios.patch b/debian/patches/01-termios.patch
new file mode 100644
index 0000000..f4ee4eb
--- /dev/null
+++ b/debian/patches/01-termios.patch
@@ -0,0 +1,82 @@
+Description: Fix FTBFS on alpha by using the POSIX.1 struct termios interface
+ instead of the obsolete struct termio ioctl interface.
+Author: Michael Biebl <biebl@debian.org>
+Debian-Bug: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=570661
+Index: modemmanager-0.3/src/mm-serial-port.c
+===================================================================
+--- modemmanager-0.3.orig/src/mm-serial-port.c	2010-01-02 03:51:21.000000000 +0100
++++ modemmanager-0.3/src/mm-serial-port.c	2010-03-01 17:59:27.457439379 +0100
+@@ -18,7 +18,7 @@
+ 
+ #include <stdio.h>
+ #include <stdlib.h>
+-#include <termio.h>
++#include <termios.h>
+ #include <unistd.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
+@@ -148,12 +148,12 @@
+ mm_serial_port_print_config (MMSerialPort *port, const char *detail)
+ {
+     MMSerialPortPrivate *priv = MM_SERIAL_PORT_GET_PRIVATE (port);
+-    struct termio stbuf;
++    struct termios stbuf;
+     int err;
+ 
+-    err = ioctl (priv->fd, TCGETA, &stbuf);
++    err = tcgetattr (priv->fd, &stbuf);
+     if (err) {
+-        g_warning ("*** %s (%s): (%s) TCGETA error %d",
++        g_warning ("*** %s (%s): (%s) tcgetattr() error %d",
+                    __func__, detail, mm_port_get_device (MM_PORT (port)), errno);
+         return;
+     }
+@@ -330,7 +330,7 @@
+ config_fd (MMSerialPort *self, GError **error)
+ {
+     MMSerialPortPrivate *priv = MM_SERIAL_PORT_GET_PRIVATE (self);
+-    struct termio stbuf;
++    struct termios stbuf;
+     int speed;
+     int bits;
+     int parity;
+@@ -341,9 +341,9 @@
+     parity = parse_parity (priv->parity);
+     stopbits = parse_stopbits (priv->stopbits);
+ 
+-    memset (&stbuf, 0, sizeof (struct termio));
+-    if (ioctl (priv->fd, TCGETA, &stbuf) != 0) {
+-        g_warning ("%s (%s): TCGETA error: %d",
++    memset (&stbuf, 0, sizeof (struct termios));
++    if (tcgetattr (priv->fd, &stbuf) != 0) {
++        g_warning ("%s (%s): tcgetattr() error: %d",
+                    __func__,
+                    mm_port_get_device (MM_PORT (self)),
+                    errno);
+@@ -360,7 +360,7 @@
+     stbuf.c_cflag &= ~(CBAUD | CSIZE | CSTOPB | CLOCAL | PARENB);
+     stbuf.c_cflag |= (speed | bits | CREAD | 0 | parity | stopbits);
+ 
+-    if (ioctl (priv->fd, TCSETA, &stbuf) < 0) {
++    if (tcsetattr (priv->fd, TCSANOW, &stbuf) < 0) {
+         g_set_error (error,
+                      MM_MODEM_ERROR,
+                      MM_MODEM_ERROR_GENERAL,
+@@ -825,7 +825,7 @@
+         return FALSE;
+     }
+ 
+-    if (ioctl (priv->fd, TCGETA, &priv->old_t) < 0) {
++    if (tcgetattr (priv->fd, &priv->old_t) < 0) {
+         g_set_error (error, MM_SERIAL_ERROR, MM_SERIAL_OPEN_FAILED,
+                      "Could not open serial device %s: %s", device, strerror (errno));
+         close (priv->fd);
+@@ -883,7 +883,7 @@
+             priv->flash_id = 0;
+         }
+ 
+-        ioctl (priv->fd, TCSETA, &priv->old_t);
++        tcsetattr (priv->fd, TCSANOW, &priv->old_t);
+         close (priv->fd);
+         priv->fd = -1;
+     }
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..e004a69
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+# patches for modemmanager
+01-termios.patch