Merge lp:~vibhavp/ubuntu/raring/guile-2.0/gnulib-gets into lp:ubuntu/raring/guile-2.0

[Vibhav Pant]

[Daniel Hartwig (wigs)]

This patch is no longer needed since it is included in upstream 2.0.7 recently uploaded to raring.

[Dimitri John Ledkov (xnox)]

Not needed any more.

review: Disapprove

Unmerged revisions

8. By Vibhav Pant on 2013-02-28

Avoid assuming that gets is declared. Fixes FTBFS.

=== modified file '.pc/applied-patches'
--- .pc/applied-patches	2013-02-27 11:52:16 +0000
+++ .pc/applied-patches	2013-03-02 03:48:22 +0000
@@ -1,2 +1,3 @@
 0001-Change-guile-to-guile-X.Y-for-info-pages.patch
 0003-Mark-mutex-with-owner-not-retained-threads-test-as-u.patch
+gnulib-gets

=== modified file 'debian/changelog'
--- debian/changelog	2013-02-28 07:53:18 +0000
+++ debian/changelog	2013-03-02 03:48:22 +0000
@@ -1,3 +1,4 @@
+<<<<<<< TREE
 guile-2.0 (2.0.7-0ubuntu2) raring; urgency=low
 
   * Don't append the package version to the upstream version, breaking
@@ -12,6 +13,14 @@
 
  -- Matthias Klose <[e-mail]>  Wed, 27 Feb 2013 11:52:16 +0100
 
+=======
+guile-2.0 (2.0.5+1-3ubuntu1) raring; urgency=low
+
+  * Avoid assuming that gets is declared. Fixes FTBFS.
+
+ -- Vibhav Pant <[e-mail]>  Thu, 28 Feb 2013 11:18:44 +0530
+
+>>>>>>> MERGE-SOURCE
 guile-2.0 (2.0.5+1-3) unstable; urgency=low
 
   * Add 0003-Mark-mutex-with-owner-not-retained-threads-test-as-u.patch.

=== modified file 'debian/control'
--- debian/control	2012-01-29 15:03:18 +0000
+++ debian/control	2013-03-02 03:48:22 +0000
@@ -1,7 +1,8 @@
 Source: guile-2.0
 Section: interpreters
 Priority: optional
-Maintainer: Rob Browning <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Rob Browning <[e-mail]>
 Build-Depends: libtool, debhelper (>= 8), autoconf, automake, dh-autoreconf,
  libncurses5-dev, libreadline6-dev, libltdl-dev, libgmp-dev, texinfo, flex, libunistring-dev, libgc-dev, libffi-dev, pkg-config
 Standards-Version: 3.7.2

=== modified file 'debian/patches/series'
--- debian/patches/series	2013-02-27 11:52:16 +0000
+++ debian/patches/series	2013-03-02 03:48:22 +0000
@@ -1,3 +1,4 @@
 0001-Change-guile-to-guile-X.Y-for-info-pages.patch
 #0002-Mark-Unused-modules-are-removed-gc-test-as-unresolve.patch
 0003-Mark-mutex-with-owner-not-retained-threads-test-as-u.patch
+0004-gnulib-gets.patch

=== modified file 'lib/stdio.in.h'
--- lib/stdio.in.h	2013-02-27 11:52:16 +0000
+++ lib/stdio.in.h	2013-03-02 03:48:22 +0000
@@ -700,13 +700,20 @@
 #endif
 
 /* It is very rare that the developer ever has full control of stdin,
+<<<<<<< TREE
    so any use of gets warrants an unconditional warning; besides, C11
    removed it.  */
 #undef gets
 #if HAVE_RAW_DECL_GETS
+=======
+   so any use of it warrants an unconditional warning; besides C11 had
+   deprecated gets.
+ */
+#if HAVE_RAW_DECL_GETS
+>>>>>>> MERGE-SOURCE
 _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
 #endif
-
+#endif
 
 #if @GNULIB_OBSTACK_PRINTF@ || @GNULIB_OBSTACK_PRINTF_POSIX@
 struct obstack;

=== modified file 'm4/stdio_h.m4'