Permalink
Browse files

Imported Debian patch 4.5.3-1~naesten2

  • Loading branch information...
1 parent efae923 commit 2c89c875e3d888792d458fdcc6e825597ff2a3f0 @SamB committed Jan 18, 2012
View
@@ -1,3 +1,12 @@
+gcc-4.5-doc-non-dfsg (4.5.3-1~naesten2) unstable; urgency=low
+
+ * Converted to "3.0 (quilt)" format.
+ + Updated debian/convert-debian-gcc-diff script accordingly.
+ * Switched to dh(1) based build.
+ * Bumped Standards-Version to 3.9.2.
+
+ -- Samuel Bronson <naesten@gmail.com> Wed, 18 Jan 2012 18:04:12 -0500
+
gcc-4.5-doc-non-dfsg (4.5.3-1~naesten1) unstable; urgency=low
* Packaged documentation for gcc, gnat, and gcj version 4.5.3.
View
@@ -1 +1 @@
-5
+9
View
@@ -3,10 +3,12 @@ Section: non-free/doc
Priority: optional
Maintainer: Debian GCC Maintainers <debian-gcc@lists.debian.org>
Uploaders:
- Nikita V. Youshchenko <yoush@debian.org>
-Build-Depends: debhelper (>> 5), dpatch
+ Nikita V. Youshchenko <yoush@debian.org>,
+ Samuel Bronson <naesten@gmail.com>
+Build-Depends: debhelper (>= 7.0.50~)
Build-Depends-Indep: texinfo, perl
-Standards-Version: 3.8.4
+Standards-Version: 3.9.2
+Homepage: http://gcc.gnu.org/
Package: gcc-doc-base
Architecture: all
@@ -2,30 +2,6 @@
use strict;
-my $code = << 'END';
-dir=
-if [ $# -eq 3 -a "$2" = '-d' ]; then
- pdir="-d $3"
- dir="$3/"
-elif [ $# -ne 1 ]; then
- echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
- exit 1
-fi
-case "$1" in
- -patch)
- patch $pdir -f --no-backup-if-mismatch -p0 < $0
- ;;
- -unpatch)
- patch $pdir -f --no-backup-if-mismatch -R -p0 < $0
- ;;
- *)
- echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
- exit 1
-esac
-exit 0
-
-END
-
sub conv_file($$) {
my $d = shift;
my $f = shift;
@@ -49,9 +25,9 @@ sub conv_file($$) {
$name =~ s/^[^\/]*\/?//;
}
if ($name) {
- $line =~ s/^(---\s*)\S+(.*)$/$1$name$2/;
+ $line =~ s|^(---\s*)\S+(.*)$|$1a/$name$2|;
$res .= $line;
- $nextline =~ s/^(\+\+\+\s*)\S+(.*)$/$1$name$2/;
+ $nextline =~ s|^(\+\+\+\s*)\S+(.*)$|$1b/$name$2|;
$res .= $nextline;
$in_diff = 1;
next;
@@ -69,11 +45,9 @@ sub conv_file($$) {
close F;
if ($res) {
- $res = "#!/bin/sh -e\n" .
- "\n" .
- "# DP: This patch was converted from $f\n" .
+ $res = "# DP: This patch was converted from $f\n" .
"# DP: Original comment:\n" .
- "# DP:\n" . join("", @dp) . "\n" . $code . $res;
+ "# DP:\n" . join("", @dp) . "\n" . $res;
}
return $res;
@@ -96,17 +70,15 @@ for my $file (@ARGV) {
open F, ">$full_converted_name" or die "failed to open $full_converted_name";
print F $converted;
close F;
- chmod 0755, $full_converted_name;
- $converted_name =~ s/[.]dpatch$//;
push @patches, $converted_name;
}
-open F, "debian/patches/00list" or die "failed to open debian/patches/00list";
+open F, "debian/patches/series" or die "failed to open debian/patches/series";
while (<F>) {
chomp;
next if (/^from-debian-gcc-/);
push @patches, $_;
}
close F;
-open F, ">debian/patches/00list" or die "failed to open debian/patches/00list";
+open F, ">debian/patches/series" or die "failed to open debian/patches/series";
print F $_ . "\n" for (@patches);
close F;
@@ -1,35 +1,12 @@
-#!/bin/sh -e
-
# DP: This patch was converted from alpha-ieee-doc.diff
# DP: Original comment:
# DP:
# DP: #212912
# DP: on alpha-linux, make -mieee default and add -mieee-disable switch
# DP: to turn default off (doc patch)
-dir=
-if [ $# -eq 3 -a "$2" = '-d' ]; then
- pdir="-d $3"
- dir="$3/"
-elif [ $# -ne 1 ]; then
- echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
- exit 1
-fi
-case "$1" in
- -patch)
- patch $pdir -f --no-backup-if-mismatch -p0 < $0
- ;;
- -unpatch)
- patch $pdir -f --no-backup-if-mismatch -R -p0 < $0
- ;;
- *)
- echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
- exit 1
-esac
-exit 0
-
---- gcc/doc/invoke.texi
-+++ gcc/doc/invoke.texi
+--- a/gcc/doc/invoke.texi
++++ b/gcc/doc/invoke.texi
@@ -9980,6 +9980,13 @@ able to correctly support denormalized numbers and exceptional IEEE
values such as not-a-number and plus/minus infinity. Other Alpha
compilers call this option @option{-ieee_with_no_inexact}.
@@ -1,33 +1,10 @@
-#!/bin/sh -e
-
# DP: This patch was converted from gcc-plugindir-doc.diff
# DP: Original comment:
# DP:
# DP: Search for plugins in a default plugin dir, backport from the trunk (docs).
-dir=
-if [ $# -eq 3 -a "$2" = '-d' ]; then
- pdir="-d $3"
- dir="$3/"
-elif [ $# -ne 1 ]; then
- echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
- exit 1
-fi
-case "$1" in
- -patch)
- patch $pdir -f --no-backup-if-mismatch -p0 < $0
- ;;
- -unpatch)
- patch $pdir -f --no-backup-if-mismatch -R -p0 < $0
- ;;
- *)
- echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
- exit 1
-esac
-exit 0
-
---- gcc/doc/plugins.texi 2010-04-02 21:54:46.000000000 +0200
-+++ gcc/doc/plugins.texi 2010-05-01 17:46:54.101086672 +0200
+--- a/gcc/doc/plugins.texi 2010-04-02 21:54:46.000000000 +0200
++++ b/gcc/doc/plugins.texi 2010-05-01 17:46:54.101086672 +0200
@@ -22,6 +22,11 @@
plugins as key-value pairs. Multiple plugins can be invoked by
specifying multiple @option{-fplugin} arguments.
@@ -50,8 +27,8 @@ exit 0
The following GNU Makefile excerpt shows how to build a simple plugin:
@smallexample
---- gcc/doc/invoke.texi 2010-05-01 17:43:03.372338550 +0200
-+++ gcc/doc/invoke.texi 2010-05-01 17:46:05.673586259 +0200
+--- a/gcc/doc/invoke.texi 2010-05-01 17:43:03.372338550 +0200
++++ b/gcc/doc/invoke.texi 2010-05-01 17:46:05.673586259 +0200
@@ -425,7 +425,8 @@
@item Directory Options
@@ -1,33 +1,10 @@
-#!/bin/sh -e
-
# DP: This patch was converted from pr40521-sequel-doc.diff
# DP: Original comment:
# DP:
# DP: Sequel to PR40521 -- -g causes GCC to generate .eh_frame (documentation)
-dir=
-if [ $# -eq 3 -a "$2" = '-d' ]; then
- pdir="-d $3"
- dir="$3/"
-elif [ $# -ne 1 ]; then
- echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
- exit 1
-fi
-case "$1" in
- -patch)
- patch $pdir -f --no-backup-if-mismatch -p0 < $0
- ;;
- -unpatch)
- patch $pdir -f --no-backup-if-mismatch -R -p0 < $0
- ;;
- *)
- echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
- exit 1
-esac
-exit 0
-
---- gcc/doc/tm.texi 2010-03-27 11:27:39.000000000 +0100
-+++ gcc/doc/tm.texi 2010-04-18 15:25:47.471085014 +0200
+--- a/gcc/doc/tm.texi 2010-03-27 11:27:39.000000000 +0100
++++ b/gcc/doc/tm.texi 2010-04-18 15:25:47.471085014 +0200
@@ -8663,12 +8663,11 @@
Define this macro to 0 if your target supports DWARF 2 frame unwind
information, but it does not yet work with exception handling.
Oops, something went wrong.

0 comments on commit 2c89c87

Please sign in to comment.