Merge lp:~ubuntu-branches/ubuntu/quantal/avarice/quantal-201210070312 into lp:ubuntu/quantal/avarice

[Ubuntu Package Importer]

The package importer has detected a possible inconsistency between the package history in the archive and the history in bzr. As the archive is authoritative the importer has made lp:ubuntu/quantal/avarice reflect what is in the archive and the old bzr branch has been pushed to lp:~ubuntu-branches/ubuntu/quantal/avarice/quantal-201210070312. This merge proposal was created so that an Ubuntu developer can review the situations and perform a merge/upload if necessary. There are three typical cases where this can happen.
  1. Where someone pushes a change to bzr and someone else uploads the package without that change. This is the reason that this check is done by the importer. If this appears to be the case then a merge/upload should be done if the changes that were in bzr are still desirable.
  2. The importer incorrectly detected the above situation when someone made a change in bzr and then uploaded it.
  3. The importer incorrectly detected the above situation when someone just uploaded a package and didn't touch bzr.

If this case doesn't appear to be the first situation then set the status of the merge proposal to "Rejected" and help avoid the problem in future by filing a bug at https://bugs.launchpad.net/udd linking to this merge proposal.

(this is an automatically generated message)

Unmerged revisions

11. By Andrew Starr-Bochicchio on 2012-10-07

* Fix FTBFS (LP: #1058667)
  - debian/patches/01_support_bfd_include_guard.patch
    include autoconf.h before bfd.h to support new binutils
* Replace SYSFS with ATTRS in avarice.udev from Debian: #603630
* Switch to dpkg-source 3.0 (quilt) format
  - 00_debian_origin.patch
    split already applied patch to upstream source by debian package

=== modified file 'configure'
--- configure	2010-02-06 12:35:01 +0000
+++ configure	2012-10-07 03:21:21 +0000
@@ -4834,78 +4834,6 @@
 
 fi
 
-## New bfd requires libz
-
-{ echo "$as_me:$LINENO: checking for deflate in -lz" >&5
-echo $ECHO_N "checking for deflate in -lz... $ECHO_C" >&6; }
-if test "${ac_cv_lib_z_deflate+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lz  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char deflate ();
-int
-main ()
-{
-return deflate ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
-  ac_cv_lib_z_deflate=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_z_deflate=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_z_deflate" >&5
-echo "${ECHO_T}$ac_cv_lib_z_deflate" >&6; }
-if test $ac_cv_lib_z_deflate = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBZ 1
-_ACEOF
-
-  LIBS="-lz $LIBS"
-
-fi
-
 
 if test "x$ac_found_bfd" = "xno"; then
   { { $as_echo "$as_me:$LINENO: error: You need to install libbfd.a from binutils." >&5

=== modified file 'configure.ac'
--- configure.ac	2010-02-06 12:35:01 +0000
+++ configure.ac	2012-10-07 03:21:21 +0000
@@ -66,8 +66,6 @@
 AC_CHECK_LIB([iberty], [xmalloc])
 AC_CHECK_LIB([bfd], [bfd_init], , [ac_found_bfd=no])
 AC_CHECK_LIB([usb], [usb_get_string_simple])
-## New bfd requires libz
-AC_CHECK_LIB([z], [deflate])
 
 if test "x$ac_found_bfd" = "xno"; then
   AC_MSG_ERROR([You need to install libbfd.a from binutils.])

=== added directory 'debian/patches'
=== renamed directory 'debian/patches' => 'debian/patches.moved'
=== added file 'debian/patches/00_debian_origin.patch'
--- debian/patches/00_debian_origin.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/00_debian_origin.patch	2012-10-07 03:21:21 +0000
@@ -0,0 +1,160 @@
+Index: avarice/configure
+===================================================================
+--- avarice.orig/configure	2012-09-30 18:15:11.625148244 +0900
++++ avarice/configure	2012-09-30 18:15:50.725149730 +0900
+@@ -4834,6 +4834,78 @@
+ 
+ fi
+ 
++## New bfd requires libz
++
++{ echo "$as_me:$LINENO: checking for deflate in -lz" >&5
++echo $ECHO_N "checking for deflate in -lz... $ECHO_C" >&6; }
++if test "${ac_cv_lib_z_deflate+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-lz  $LIBS"
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++char deflate ();
++int
++main ()
++{
++return deflate ();
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
++  ac_cv_lib_z_deflate=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++	ac_cv_lib_z_deflate=no
++fi
++
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
++      conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
++fi
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_z_deflate" >&5
++echo "${ECHO_T}$ac_cv_lib_z_deflate" >&6; }
++if test $ac_cv_lib_z_deflate = yes; then
++  cat >>confdefs.h <<_ACEOF
++#define HAVE_LIBZ 1
++_ACEOF
++
++  LIBS="-lz $LIBS"
++
++fi
++
+ 
+ if test "x$ac_found_bfd" = "xno"; then
+   { { $as_echo "$as_me:$LINENO: error: You need to install libbfd.a from binutils." >&5
+Index: avarice/configure.ac
+===================================================================
+--- avarice.orig/configure.ac	2012-09-30 18:15:11.557148242 +0900
++++ avarice/configure.ac	2012-09-30 18:15:50.721149730 +0900
+@@ -66,6 +66,8 @@
+ AC_CHECK_LIB([iberty], [xmalloc])
+ AC_CHECK_LIB([bfd], [bfd_init], , [ac_found_bfd=no])
+ AC_CHECK_LIB([usb], [usb_get_string_simple])
++## New bfd requires libz
++AC_CHECK_LIB([z], [deflate])
+ 
+ if test "x$ac_found_bfd" = "xno"; then
+   AC_MSG_ERROR([You need to install libbfd.a from binutils.])
+Index: avarice/doc/avarice.1
+===================================================================
+--- avarice.orig/doc/avarice.1	2012-09-30 18:15:11.609148243 +0900
++++ avarice/doc/avarice.1	2012-09-30 18:15:50.729149731 +0900
+@@ -23,7 +23,6 @@
+ 
+ ..
+ .TH avarice 1 "September 29, 2008"
+-.LO 1
+ .SH NAME
+ avarice \- Provides an interface from avr-gdb to Atmel's JTAGICE box.
+ .SH SYNOPSIS
+Index: avarice/src/Makefile.in
+===================================================================
+--- avarice.orig/src/Makefile.in	2012-09-30 18:15:11.573148242 +0900
++++ avarice/src/Makefile.in	2012-09-30 18:15:50.725149730 +0900
+@@ -101,7 +101,7 @@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ LDFLAGS = @LDFLAGS@
+ LIBOBJS = @LIBOBJS@
+-LIBS = @LIBS@
++LIBS = -lusb /usr/lib/libbfd.a -lz -liberty -ldl
+ LTLIBOBJS = @LTLIBOBJS@
+ MAKEINFO = @MAKEINFO@
+ MKDIR_P = @MKDIR_P@
+Index: avarice/src/jtag2usb.cc
+===================================================================
+--- avarice.orig/src/jtag2usb.cc	2012-09-30 18:15:11.593148243 +0900
++++ avarice/src/jtag2usb.cc	2012-09-30 18:15:50.725149730 +0900
+@@ -40,6 +40,7 @@
+ #include <signal.h>
+ #include <string.h>
+ #include <errno.h>
++#include <assert.h>
+ 
+ #include <usb.h>
+ 
+@@ -71,6 +72,7 @@
+   struct usb_device *dev;
+   usb_dev_handle *udev;
+   char *serno, *cp2;
++  char *s;
+   u_int16_t pid;
+   size_t x;
+ 
+@@ -95,7 +97,9 @@
+    * right-to-left, so only the least significant nibbles need to be
+    * specified.
+    */
+-  if ((serno = strchr(jtagDeviceName, ':')) != NULL)
++  s = strdup(jtagDeviceName);
++  assert(s !=  NULL);
++  if ((serno = strchr(s, ':')) != NULL)
+     {
+       /* first, drop all colons there if any */
+       cp2 = ++serno;
+@@ -109,6 +113,7 @@
+ 
+       unixCheck(strlen(serno) <= 12, "invalid serial number \"%s\"", serno);
+     }
++  free(s);
+ 
+   usb_init();
+ 

=== added file 'debian/patches/01_support_bfd_include_guard.patch'
--- debian/patches/01_support_bfd_include_guard.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/01_support_bfd_include_guard.patch	2012-10-07 03:21:21 +0000
@@ -0,0 +1,31 @@
+Support new bfd.h of binutils which depends to include autoconf.h.
+
+For more information please see:
+http://sourceware.org/bugzilla/show_bug.cgi?id=14072
+http://sourceware.org/bugzilla/show_bug.cgi?id=14243
+Index: avarice/src/jtag2prog.cc
+===================================================================
+--- avarice.orig/src/jtag2prog.cc	2012-09-29 23:35:33.105618000 +0900
++++ avarice/src/jtag2prog.cc	2012-09-30 00:03:43.606657880 +0900
+@@ -27,6 +27,8 @@
+  */
+ 
+ 
++#include "autoconf.h"
++
+ #include <stdarg.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+Index: avarice/src/jtagprog.cc
+===================================================================
+--- avarice.orig/src/jtagprog.cc	2012-09-29 23:35:33.105618000 +0900
++++ avarice/src/jtagprog.cc	2012-09-30 00:02:50.994655881 +0900
+@@ -26,6 +26,8 @@
+  */
+ 
+ 
++#include "autoconf.h"
++
+ #include <stdarg.h>
+ #include <stdio.h>
+ #include <stdlib.h>

=== added file 'debian/patches/series'
--- debian/patches/series	1970-01-01 00:00:00 +0000
+++ debian/patches/series	2012-10-07 03:21:21 +0000
@@ -0,0 +1,2 @@
+00_debian_origin.patch
+01_support_bfd_include_guard.patch

=== added directory 'debian/source'
=== renamed directory 'debian/source' => 'debian/source.moved'
=== added file 'debian/source/format'
--- debian/source/format	1970-01-01 00:00:00 +0000
+++ debian/source/format	2012-10-07 03:21:21 +0000
@@ -0,0 +1,1 @@
+3.0 (quilt)

=== modified file 'doc/avarice.1'
--- doc/avarice.1	2010-01-24 11:21:12 +0000
+++ doc/avarice.1	2012-10-07 03:21:21 +0000
@@ -23,6 +23,7 @@
 
 ..
 .TH avarice 1 "September 29, 2008"
+.LO 1
 .SH NAME
 avarice \- Provides an interface from avr-gdb to Atmel's JTAGICE box.
 .SH SYNOPSIS

=== modified file 'src/Makefile.in'
--- src/Makefile.in	2010-02-06 12:35:01 +0000
+++ src/Makefile.in	2012-10-07 03:21:21 +0000
@@ -101,7 +101,7 @@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
-LIBS = -lusb /usr/lib/libbfd.a -lz -liberty -ldl
+LIBS = @LIBS@
 LTLIBOBJS = @LTLIBOBJS@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@

=== modified file 'src/jtag2usb.cc'
--- src/jtag2usb.cc	2010-02-06 12:35:01 +0000
+++ src/jtag2usb.cc	2012-10-07 03:21:21 +0000
@@ -40,7 +40,6 @@
 #include <signal.h>
 #include <string.h>
 #include <errno.h>
-#include <assert.h>
 
 #include <usb.h>
 
@@ -72,7 +71,6 @@
   struct usb_device *dev;
   usb_dev_handle *udev;
   char *serno, *cp2;
-  char *s;
   u_int16_t pid;
   size_t x;
 
@@ -97,9 +95,7 @@
    * right-to-left, so only the least significant nibbles need to be
    * specified.
    */
-  s = strdup(jtagDeviceName);
-  assert(s !=  NULL);
-  if ((serno = strchr(s, ':')) != NULL)
+  if ((serno = strchr(jtagDeviceName, ':')) != NULL)
     {
       /* first, drop all colons there if any */
       cp2 = ++serno;
@@ -113,7 +109,6 @@
 
       unixCheck(strlen(serno) <= 12, "invalid serial number \"%s\"", serno);
     }
-  free(s);
 
   usb_init();