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

Proposed by dann frazier on 2013-08-17
Status: Merged
Merge reported by: Adam Conrad
Merged at revision: not available
Proposed branch: lp:~dannf/ubuntu/saucy/screen/lp1213278-from-debian
Merge into: lp:ubuntu/saucy/screen
Diff against target: 43 lines (+13/-7)
3 files modified
debian/changelog (+11/-0)
debian/info (+1/-6)
debian/patches/13split_info_files.dpatch (+1/-1)
To merge this branch: bzr merge lp:~dannf/ubuntu/saucy/screen/lp1213278-from-debian
Reviewer Review Type Date Requested Status
Ubuntu branches 2013-08-17 Pending
Review via email: mp+180693@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2012-10-08 16:50:54 +0000
3+++ debian/changelog 2013-08-17 15:09:36 +0000
4@@ -1,3 +1,14 @@
5+screen (4.0.3-14ubuntu10) UNRELEASED; urgency=low
6+
7+ * Cherry pick two changes from Debian to fix FTBFS (LP: #1213278):
8+ [ Axel Beckert ]
9+ - Update debian/patches/13split_info_files.(d)patch to change now ambiguous
10+ makeinfo option --split to --split-size. Fixes FTBFS with texinfo 5.x.
11+ - Use doc/screen.info* instead of listing every file indiviually in
12+ debian/info.
13+
14+ -- dann frazier <dann.frazier@canonical.com> Sat, 17 Aug 2013 09:06:00 -0600
15+
16 screen (4.0.3-14ubuntu9) quantal; urgency=low
17
18 * Rebuild for new armel compiler default of ARMv5t.
19
20=== modified file 'debian/info'
21--- debian/info 2007-05-24 13:51:02 +0000
22+++ debian/info 2013-08-17 15:09:36 +0000
23@@ -1,6 +1,1 @@
24-doc/screen.info
25-doc/screen.info-1
26-doc/screen.info-2
27-doc/screen.info-3
28-doc/screen.info-4
29-doc/screen.info-5
30+doc/screen.info*
31
32=== modified file 'debian/patches/13split_info_files.dpatch'
33--- debian/patches/13split_info_files.dpatch 2008-06-02 19:16:16 +0000
34+++ debian/patches/13split_info_files.dpatch 2013-08-17 15:09:36 +0000
35@@ -13,7 +13,7 @@
36 info screen.info: screen.texinfo
37 @rm -f screen.info*
38 - $(MAKEINFO) $(srcdir)/screen.texinfo -o screen.info
39-+ $(MAKEINFO) --split 50000 $(srcdir)/screen.texinfo -o screen.info
40++ $(MAKEINFO) --split-size=50000 $(srcdir)/screen.texinfo -o screen.info
41
42 install: installdirs
43 $(INSTALL_DATA) $(srcdir)/screen.1 $(DESTDIR)$(mandir)/man1/screen.1

Subscribers

People subscribed via source and target branches

to all changes: