Imported Debian patch 4.6.2-1~naesten1

contrib/texi2pod.pl

@@ -1,6 +1,6 @@
 #! /usr/bin/perl -w
 
-#   Copyright (C) 1999, 2000, 2001, 2003 Free Software Foundation, Inc.
+#   Copyright (C) 1999, 2000, 2001, 2003, 2010 Free Software Foundation, Inc.
 
 # This file is part of GCC.
 
@@ -213,10 +213,12 @@
 
     # Now the ones that have to be replaced by special escapes
     # (which will be turned back into text by unmunge())
+    # Replace @@ before @{ and @} in order to parse @samp{@@} correctly.
     s/&/&/g;
+    s/\@\@/&at;/g;
     s/\@\{/{/g;
     s/\@\}/}/g;
-    s/\@\@/&at;/g;
+    s/\@`\{(.)\}/&$1grave;/g;
 
     # Inside a verbatim block, handle @var, @samp and @url specially.
     if ($shift ne "") {
@@ -391,9 +393,11 @@ sub postprocess
     s/\@(?:code|kbd)\{([^\}]*)\}/C<$1>/g;
     s/\@(?:samp|strong|key|option|env|command|b)\{([^\}]*)\}/B<$1>/g;
     s/\@sc\{([^\}]*)\}/\U$1/g;
+    s/\@acronym\{([^\}]*)\}/\U$1/g;
     s/\@file\{([^\}]*)\}/F<$1>/g;
     s/\@w\{([^\}]*)\}/S<$1>/g;
     s/\@(?:dmn|math)\{([^\}]*)\}/$1/g;
+    s/\@\///g;
 
     # keep references of the form @ref{...}, print them bold
     s/\@(?:ref)\{([^\}]*)\}/B<$1>/g;
@@ -462,6 +466,7 @@ sub unmunge
     # Replace escaped symbols with their equivalents.
     local $_ = $_[0];
 
+    s/&(.)grave;/E<$1grave>/g;
     s/&lt;/E<lt>/g;
     s/&gt;/E<gt>/g;
     s/&lbrace;/\{/g;

debian/Makefile

@@ -12,8 +12,8 @@ M = $(M1)
 MANS = $(M:%=%-$(VER).1)
 PODS = $(M:%=%.pod)
 
-VER = 4.5
-FULLVER = 4.5.3
+VER = 4.6
+FULLVER = 4.6.2
 
 GCCVERS = gcc/doc/gcc-vers.texi
 

debian/changelog

@@ -1,8 +1,14 @@
+gcc-4.6-doc-non-dfsg (4.6.2-1~naesten1) unstable; urgency=low
+
+  * Packaged documentation files for gcc, gnat and gcj version 4.6.2.
+    Closes: #656044 (RFP for gcc-4.6-doc).
+
+ -- Samuel Bronson <naesten@gmail.com>  Sat, 21 Jan 2012 18:16:21 -0500
+
 gcc-4.5-doc-non-dfsg (4.5.3-1) unstable; urgency=low
 
   * Bump version to a normal Debian version number, on the theory that the
     package is ready for upload.
-  * Closes: #656043 (my ITP for this package).
 
  -- Samuel Bronson <naesten@gmail.com>  Sat, 21 Jan 2012 00:25:13 -0500
 

debian/control

@@ -1,4 +1,4 @@
-Source: gcc-4.5-doc-non-dfsg
+Source: gcc-4.6-doc-non-dfsg
 Section: non-free/doc
 Priority: optional
 Maintainer: Debian GCC Maintainers <debian-gcc@lists.debian.org>
@@ -20,7 +20,7 @@ Description: several GNU manual pages
  which should be available together with gcc man pages to fit
  GNU Free Documentation License requirements.
 
-Package: gcc-4.5-doc
+Package: gcc-4.6-doc
 Architecture: all
 Depends: gcc-doc-base (>= 4.1.1.nf3-1), ${misc:Depends}
 Suggests: doc-base
@@ -34,7 +34,7 @@ Description: documentation for the GNU compilers (gcc, gobjc, g++)
  Documentation License, and contains invariant sections, so it can't be
  part of Debian main.
 
-Package: cpp-4.5-doc
+Package: cpp-4.6-doc
 Architecture: all
 Depends: gcc-doc-base (>= 4.1.1.nf3-1), ${misc:Depends}
 Suggests: doc-base
@@ -46,7 +46,7 @@ Description: documentation for the GNU C preprocessor (cpp)
  Documentation License, and contains invariant sections, so it can't be
  part of Debian main.
 
-Package: gfortran-4.5-doc
+Package: gfortran-4.6-doc
 Architecture: all
 Depends: gcc-doc-base (>= 4.1.1.nf3-1), ${misc:Depends}
 Suggests: doc-base
@@ -58,7 +58,7 @@ Description: documentation for the GNU Fortran Compiler (gfortran)
  Documentation License, and contains invariant sections, so it can't be
  part of Debian main.
 
-Package: gnat-4.5-doc
+Package: gnat-4.6-doc
 Architecture: all
 Depends: gcc-doc-base (>= 4.1.1.nf3-1), ${misc:Depends}
 Suggests: doc-base
@@ -70,11 +70,11 @@ Description: documentation for the GNU Ada 95 Compiler (gnat)
  Documentation License, and contains invariant sections, so it can't be
  part of Debian main.
 
-Package: gcj-4.5-doc
+Package: gcj-4.6-doc
 Architecture: all
 Depends: gcc-doc-base (>= 4.1.1.nf3-1), ${misc:Depends}
 Suggests: doc-base
-Provides: gij-4.5-doc
+Provides: gij-4.6-doc
 Description: documentation for the GNU Java tools (gcj, gij)
  This package contains manual pages and documentation in info and
  html format, for the GNU Java Compiler, the GNU interpreter for Java

debian/convert-debian-gcc-diff_cmdline-4.6.2

@@ -0,0 +1 @@
+perl debian/convert-debian-gcc-diff ~/hacking/debian/gcc-4.6-4.6.2/debian/patches rename-info-files.diff alpha-ieee-doc.diff gcc-multiarch-doc.diff

debian/cpp-4.5-doc.doc-base.cpp → debian/cpp-4.6-doc.doc-base.cpp

@@ -1,5 +1,5 @@
-Document: cpp-4.5
-Title: The GNU C preprocessor, version 4.5
+Document: cpp-4.6
+Title: The GNU C preprocessor, version 4.6
 Author: Various
 Abstract: The C preprocessor is a "macro processor" that is used automatically
  by the C compiler to transform your program before actual compilation.
@@ -8,9 +8,9 @@ Abstract: The C preprocessor is a "macro processor" that is used automatically
 Section: Programming
 
 Format: html
-Index: /usr/share/doc/cpp-4.5-doc/cpp.html
-Files: /usr/share/doc/cpp-4.5-doc/cpp.html
+Index: /usr/share/doc/cpp-4.6-doc/cpp.html
+Files: /usr/share/doc/cpp-4.6-doc/cpp.html
 
 Format: info
-Index: /usr/share/info/cpp-4.5.info.gz
-Files: /usr/share/info/cpp-4.5*
+Index: /usr/share/info/cpp-4.6.info.gz
+Files: /usr/share/info/cpp-4.6*

debian/cpp-4.5-doc.doc-base.cppint → debian/cpp-4.6-doc.doc-base.cppint

@@ -1,5 +1,5 @@
-Document: cppinternals-4.5
-Title: Internals of the GNU C preprocessor, version 4.5
+Document: cppinternals-4.6
+Title: Internals of the GNU C preprocessor, version 4.6
 Author: Various
 Abstract: This brief manual documents the internals of cpplib, and
  explains some of the tricky issues.  It is intended that, along with
@@ -9,9 +9,9 @@ Abstract: This brief manual documents the internals of cpplib, and
 Section: Programming
 
 Format: html
-Index: /usr/share/doc/cpp-4.5-doc/cppinternals.html
-Files: /usr/share/doc/cpp-4.5-doc/cppinternals.html
+Index: /usr/share/doc/cpp-4.6-doc/cppinternals.html
+Files: /usr/share/doc/cpp-4.6-doc/cppinternals.html
 
 Format: info
-Index: /usr/share/info/cppinternals-4.5.info.gz
-Files: /usr/share/info/cppinternals-4.5*
+Index: /usr/share/info/cppinternals-4.6.info.gz
+Files: /usr/share/info/cppinternals-4.6*

debian/cpp-4.6-doc.info

@@ -0,0 +1,2 @@
+cpp-4.6.info
+cppinternals-4.6.info

debian/cpp-4.6-doc.manpages

@@ -0,0 +1 @@
+cpp-4.6.1

debian/gcc-4.6-doc.doc-base.gcc

@@ -0,0 +1,14 @@
+Document: gcc-4.6
+Title: The GNU C and C++ compiler, version 4.6
+Author: Various
+Abstract: This manual documents how to run, install and port the GNU compiler,
+ as well as its new features and incompatibilities, and how to report bugs.
+Section: Programming
+
+Format: html
+Index: /usr/share/doc/gcc-4.6-doc/gcc.html
+Files: /usr/share/doc/gcc-4.6-doc/gcc.html
+
+Format: info
+Index: /usr/share/info/gcc-4.6.info.gz
+Files: /usr/share/info/gcc-4.6*

debian/gcc-4.6-doc.doc-base.gccint

@@ -0,0 +1,17 @@
+Document: gccint-4.6
+Title: Internals of the GNU C compiler, version 4.6
+Author: Various
+Abstract: This manual documents the internals of the GNU compilers,
+ including how to port them to new targets and some information about
+ how to write front ends for new languages.  It corresponds to GCC
+ version 4.6.x.  The use of the GNU compilers is documented in a
+ separate manual.
+Section: Programming
+
+Format: html
+Index: /usr/share/doc/gcc-4.6-doc/gccint.html
+Files: /usr/share/doc/gcc-4.6-doc/gccint.html
+
+Format: info
+Index: /usr/share/info/gccint-4.6.info.gz
+Files: /usr/share/info/gccint-4.6*

debian/gcc-4.6-doc.info

@@ -0,0 +1,3 @@
+gcc-4.6.info
+gccint-4.6.info
+gccinstall-4.6.info

debian/gcc-4.6-doc.links

@@ -0,0 +1 @@
+usr/share/man/man1/gcc-4.6.1.gz usr/share/man/man1/g++-4.6.1.gz

debian/gcc-4.6-doc.manpages

@@ -0,0 +1,2 @@
+gcc-4.6.1
+gcov-4.6.1

debian/gcj-4.5-doc.doc-base → debian/gcj-4.6-doc.doc-base

@@ -1,15 +1,15 @@
-Document: gcj-4.5
-Title: Guide to GNU gcj, version 4.5
+Document: gcj-4.6
+Title: Guide to GNU gcj, version 4.6
 Author: Various
 Abstract: This manual describes how to use gcj, the GNU compiler for the Java
  programming language. gcj can generate both .class files and object files,
  and it can read both Java source code and .class files.
 Section: Programming
 
 Format: html
-Index: /usr/share/doc/gcj-4.5-doc/gcj.html
-Files: /usr/share/doc/gcj-4.5-doc/gcj.html
+Index: /usr/share/doc/gcj-4.6-doc/gcj.html
+Files: /usr/share/doc/gcj-4.6-doc/gcj.html
 
 Format: info
-Index: /usr/share/info/gcj-4.5.info.gz
-Files: /usr/share/info/gcj-4.5*
+Index: /usr/share/info/gcj-4.6.info.gz
+Files: /usr/share/info/gcj-4.6*

debian/gcj-4.6-doc.info

@@ -0,0 +1 @@
+gcj-4.6.info

debian/gcj-4.6-doc.manpages

@@ -0,0 +1,7 @@
+gcj-4.6.1
+gij-4.6.1
+jcf-dump-4.6.1
+jv-convert-4.6.1
+grmic-4.6.1
+gcj-dbtool-4.6.1
+gc-analyse-4.6.1

debian/gfortran-4.6-doc.doc-base

@@ -0,0 +1,14 @@
+Document: gfortran-4.6
+Title: The GNU Fortran Compiler, version 4.6
+Author: Various
+Abstract: This manual documents how to run, install and port `gfortran',
+ as well as its new features and incompatibilities, and how to report bugs.
+Section: Programming
+
+Format: html
+Index: /usr/share/doc/gfortran-4.6-doc/gfortran.html
+Files: /usr/share/doc/gfortran-4.6-doc/gfortran.html
+
+Format: info
+Index: /usr/share/info/gfortran-4.6.info.gz
+Files: /usr/share/info/gfortran-4.6*

debian/gfortran-4.6-doc.info

@@ -0,0 +1 @@
+gfortran-4.6.info

debian/gfortran-4.6-doc.manpages

@@ -0,0 +1 @@
+gfortran-4.6.1

debian/gnat-4.5-doc.doc-base.rm → debian/gnat-4.6-doc.doc-base.rm

@@ -1,5 +1,5 @@
-Document: gnat-rm-4.5
-Title: GNAT Reference Manual, version 4.5
+Document: gnat-rm-4.6
+Title: GNAT Reference Manual, version 4.6
 Author: Various
 Abstract: This manual contains useful information in writing programs using
  the GNAT compiler. It includes information on implementation dependent
@@ -8,9 +8,9 @@ Abstract: This manual contains useful information in writing programs using
 Section: Programming
 
 Format: html
-Index: /usr/share/doc/gnat-4.5-doc/gnat_rm.html
-Files: /usr/share/doc/gnat-4.5-doc/gnat_rm.html
+Index: /usr/share/doc/gnat-4.6-doc/gnat_rm.html
+Files: /usr/share/doc/gnat-4.6-doc/gnat_rm.html
 
 Format: info
-Index: /usr/share/info/gnat_rm-4.5.info.gz
-Files: /usr/share/info/gnat_rm-4.5.info.gz
+Index: /usr/share/info/gnat_rm-4.6.info.gz
+Files: /usr/share/info/gnat_rm-4.6.info.gz