Merge lp:~dannf/ubuntu/saucy/screen/lp1213278-from-debian into lp:ubuntu/saucy/screen

[dann frazier]

=== modified file 'debian/changelog'
--- debian/changelog	2012-10-08 16:50:54 +0000
+++ debian/changelog	2013-08-17 15:09:36 +0000
@@ -1,3 +1,14 @@
+screen (4.0.3-14ubuntu10) UNRELEASED; urgency=low
+
+  * Cherry pick two changes from Debian to fix FTBFS (LP: #1213278):
+    [ Axel Beckert ]
+    - Update debian/patches/13split_info_files.(d)patch to change now ambiguous
+      makeinfo option --split to --split-size. Fixes FTBFS with texinfo 5.x.
+    - Use doc/screen.info* instead of listing every file indiviually in
+      debian/info.
+
+ -- dann frazier <[e-mail]>  Sat, 17 Aug 2013 09:06:00 -0600
+
 screen (4.0.3-14ubuntu9) quantal; urgency=low
 
   * Rebuild for new armel compiler default of ARMv5t.

=== modified file 'debian/info'
--- debian/info	2007-05-24 13:51:02 +0000
+++ debian/info	2013-08-17 15:09:36 +0000
@@ -1,6 +1,1 @@
-doc/screen.info
-doc/screen.info-1
-doc/screen.info-2
-doc/screen.info-3
-doc/screen.info-4
-doc/screen.info-5
+doc/screen.info*

=== modified file 'debian/patches/13split_info_files.dpatch'
--- debian/patches/13split_info_files.dpatch	2008-06-02 19:16:16 +0000
+++ debian/patches/13split_info_files.dpatch	2013-08-17 15:09:36 +0000
@@ -13,7 +13,7 @@
  info screen.info: screen.texinfo
  	@rm -f screen.info*
 -	$(MAKEINFO) $(srcdir)/screen.texinfo -o screen.info
-+	$(MAKEINFO) --split 50000 $(srcdir)/screen.texinfo -o screen.info
++	$(MAKEINFO) --split-size=50000 $(srcdir)/screen.texinfo -o screen.info
  
  install: installdirs
  	$(INSTALL_DATA) $(srcdir)/screen.1 $(DESTDIR)$(mandir)/man1/screen.1