← Back to branch summary

~peter-pearse/ubuntu/natty/guile-1.8/prop001

« back to all changes in this revision

Viewing changes to debian/patches/version-info-pages.diff

  • Committer: Bazaar Package Importer
  • Author(s): Steve Langasek
  • Date: 2009-06-04 19:01:38 UTC
  • mfrom: (8.1.1 sid)
  • Revision ID: james.westby@ubuntu.com-20090604190138-1ao3t6sj31cqvcfe
Tags: 1.8.6+1-1ubuntu1
* Merge from Debian unstable, remaining changes:
  - Build with -Wno-error.
  - Build with thread support. Some guile-using programs like autogen need it.
  - Add debian/guile-1.8-libs.shlibs: Thread support breaks ABI, bump the soname.
* Dropped changes:
  - libltdl3-dev -> libltdl7-dev: current libltdl-dev Provides: both.
  - debian/patches/libtool-ftbfs.diff: integrated upstream.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/version-info-pages.diff
1
1
Index: sid/doc/tutorial/Makefile.am
2
2
===================================================================
3
 
--- sid.orig/doc/tutorial/Makefile.am   2006-10-08 19:50:49.000000000 -0700
4
 
+++ sid/doc/tutorial/Makefile.am        2006-10-08 19:50:59.000000000 -0700
 
3
--- sid.orig/doc/tutorial/Makefile.am
 
4
+++ sid/doc/tutorial/Makefile.am
5
5
@@ -21,6 +21,6 @@
6
6
 
7
7
 AUTOMAKE_OPTIONS = gnu
9
9
-info_TEXINFOS = guile-tut.texi
10
10
+info_TEXINFOS = guile-tut-1.8.texi
11
11
 
12
 
 TEXINFO_TEX = ../ref/texinfo.tex
 
12
 EXTRA_DIST = ChangeLog-2008
13
13
Index: sid/doc/tutorial/guile-tut.texi
14
14
===================================================================
15
 
--- sid.orig/doc/tutorial/guile-tut.texi        2006-10-08 19:50:49.000000000 -0700
16
 
+++ sid/doc/tutorial/guile-tut.texi     2006-10-08 19:59:08.000000000 -0700
 
15
--- sid.orig/doc/tutorial/guile-tut.texi
 
16
+++ sid/doc/tutorial/guile-tut.texi
17
17
@@ -1,6 +1,6 @@
18
18
 \input texinfo @c -*-texinfo-*-
19
19
 @c %**start of header