diff -u gpstrans-0.41/debian/changelog gpstrans-0.41/debian/changelog --- gpstrans-0.41/debian/changelog +++ gpstrans-0.41/debian/changelog @@ -1,3 +1,13 @@ +gpstrans (0.41-2ubuntu1) lucid; urgency=low + + * Change applied inline to all instances of getline to get_line in + src/getline/{getline}.c,.h, src/prefs.c Fix FTBFS Closes: #552864 + LP: #509719 + * Build with -fno-strict-aliasing to silence dereferencing pointer does + break strict-aliasing rules during build. + + -- Bhavani Shankar Tue, 19 Jan 2010 22:26:41 +0530 + gpstrans (0.41-2) unstable; urgency=low * suggest setserial (thanks to Joerg Schuetter , diff -u gpstrans-0.41/debian/control gpstrans-0.41/debian/control --- gpstrans-0.41/debian/control +++ gpstrans-0.41/debian/control @@ -1,7 +1,8 @@ Source: gpstrans Section: misc Priority: extra -Maintainer: James R. Van Zandt +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: James R. Van Zandt Build-Depends: debhelper (>> 5.0) Standards-Version: 3.8.0 diff -u gpstrans-0.41/debian/rules gpstrans-0.41/debian/rules --- gpstrans-0.41/debian/rules +++ gpstrans-0.41/debian/rules @@ -5,7 +5,8 @@ # Uncomment this to turn on verbose mode. export DH_VERBOSE=1 -CFLAGS = -Wall -g -DPOSIX -Dunix +export CXXFLAGS = -fno-strict-aliasing +CFLAGS = -Wall -g -DPOSIX -Dunix -fno-strict-aliasing INSTALL = install INSTALL_FILE = $(INSTALL) -p -o root -g root -m 644 only in patch2: unchanged: --- gpstrans-0.41.orig/src/prefs.c +++ gpstrans-0.41/src/prefs.c @@ -268,7 +268,7 @@ do { - p = getline ("Please select datum: "); + p = get_line ("Please select datum: "); sscanf (p, "%d", &value); printf ("\n"); } @@ -288,7 +288,7 @@ do { - p = getline ("Please select format: "); + p = get_line ("Please select format: "); sscanf (p, "%d", &value); printf ("\n"); } @@ -298,7 +298,7 @@ printf ("\n"); do { - p = getline ("Please select time offset (-12 to +12): "); + p = get_line ("Please select time offset (-12 to +12): "); sscanf (p, "%f", &floatval); printf ("\n"); } @@ -308,7 +308,7 @@ printf ("\n"); do { - p = getline ("Please enter serial device name: "); + p = get_line ("Please enter serial device name: "); sprintf (gPrefs.Device, "%s", p); printf ("\n"); } @@ -317,7 +317,7 @@ printf ("\n"); do { - p = getline ("Is your model etrex (or other similar model) (y/n)?"); + p = get_line ("Is your model etrex (or other similar model) (y/n)?"); /* Add support to several models.Thats why we put the y as char */ /* In practical terms,answer means BYTE not model. */ only in patch2: unchanged: --- gpstrans-0.41.orig/src/getline/getline.h +++ gpstrans-0.41/src/getline/getline.h @@ -10,8 +10,8 @@ typedef size_t (*gl_strwidth_proc) (char *); -char *getline (char *); /* read a line of input */ -char *getlinenoecho (char *); /* read a line of input */ +char *get_line (char *); /* read a line of input */ +char *get_linenoecho (char *); /* read a line of input */ void gl_setwidth (int); /* specify width of screen */ void gl_histadd (char *); /* adds entries to hist */ void gl_strwidth (gl_strwidth_proc); /* to bind gl_strlen */ @@ -22,8 +22,8 @@ #else /* not __STDC__ */ -char *getline (); -char *getlinenoecho (); +char *get_line (); +char *get_linenoecho (); void gl_setwidth (); void gl_histadd (); void gl_strwidth (); only in patch2: unchanged: --- gpstrans-0.41.orig/src/getline/getline.c +++ gpstrans-0.41/src/getline/getline.c @@ -37,7 +37,7 @@ /********************* exported interface ********************************/ -char *getline (); /* read a line of input */ +char *get_line (); /* read a line of input */ void gl_setwidth (); /* specify width of screen */ void gl_histadd (); /* adds entries to hist */ void gl_strwidth (); /* to bind gl_strlen */ @@ -422,7 +422,7 @@ } char * -getline (prompt) +get_line (prompt) char *prompt; { int c, loc, tmp; @@ -717,7 +717,7 @@ int loc = gl_width - 5; /* shifts line back to start position */ if (gl_cnt >= BUF_SIZE - 1) - gl_error ("\n*** Error: getline(): input buffer overflow\n"); + gl_error ("\n*** Error: get_line(): input buffer overflow\n"); if (gl_out_hook) { change = gl_out_hook (gl_buf); @@ -1310,13 +1310,13 @@ char * -getlinenoecho (prompt) +get_linenoecho (prompt) char *prompt; { char *p; echo = (1 == 0); - p = getline (prompt); + p = get_line (prompt); echo = (1 == 1); return p;