Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Imported Debian patch 4.5.3-1~naesten2

  • Loading branch information...
commit 2c89c875e3d888792d458fdcc6e825597ff2a3f0 1 parent efae923
@SamB authored
View
9 debian/changelog
@@ -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
2  debian/compat
@@ -1 +1 @@
-5
+9
View
8 debian/control
@@ -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
View
40 debian/convert-debian-gcc-diff
@@ -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;
View
27 debian/patches/from-debian-gcc-alpha-ieee-doc.diff
@@ -1,5 +1,3 @@
-#!/bin/sh -e
-
# DP: This patch was converted from alpha-ieee-doc.diff
# DP: Original comment:
# DP:
@@ -7,29 +5,8 @@
# 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}.
View
31 debian/patches/from-debian-gcc-gcc-plugindir-doc.diff
@@ -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
View
27 debian/patches/from-debian-gcc-pr40521-sequel-doc.diff
@@ -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.
View
83 debian/patches/from-debian-gcc-rename-info-files.diff
@@ -1,34 +1,11 @@
-#!/bin/sh -e
-
# DP: This patch was converted from rename-info-files.diff
# DP: Original comment:
# DP:
# DP: Allow transformations on info file names. Reference the
# DP: transformed info file names in the texinfo files.
-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/gcc.texi 2009-07-18
-+++ gcc/doc/gcc.texi 2009-12-20
+--- a/gcc/doc/gcc.texi 2009-07-18
++++ b/gcc/doc/gcc.texi 2009-12-20
@@ -65,8 +65,8 @@
@ifnottex
@dircategory Software development
@@ -49,8 +26,8 @@ exit 0
@menu
* G++ and GCC:: You can compile C or C++ programs.
---- gcc/doc/install.texi 2009-12-16
-+++ gcc/doc/install.texi 2009-12-20
+--- a/gcc/doc/install.texi 2009-12-16
++++ b/gcc/doc/install.texi 2009-12-20
@@ -97,7 +97,7 @@
@end ifinfo
@dircategory Software development
@@ -60,8 +37,8 @@ exit 0
@end direntry
@c Part 3 Titlepage and Copyright
---- gcc/doc/gccint.texi 2009-05-23
-+++ gcc/doc/gccint.texi 2009-12-20
+--- a/gcc/doc/gccint.texi 2009-05-23
++++ b/gcc/doc/gccint.texi 2009-12-20
@@ -51,7 +51,7 @@
@ifnottex
@dircategory Software development
@@ -80,8 +57,8 @@ exit 0
Compiler Collection (GCC)}.
This manual is mainly a reference manual rather than a tutorial. It
---- gcc/doc/cpp.texi 2009-11-16
-+++ gcc/doc/cpp.texi 2009-12-20
+--- a/gcc/doc/cpp.texi 2009-11-16
++++ b/gcc/doc/cpp.texi 2009-12-20
@@ -53,7 +53,7 @@
@ifinfo
@dircategory Software development
@@ -91,8 +68,8 @@ exit 0
@end direntry
@end ifinfo
---- gcc/doc/extend.texi 2009-12-16
-+++ gcc/doc/extend.texi 2009-12-20
+--- a/gcc/doc/extend.texi 2009-12-16
++++ b/gcc/doc/extend.texi 2009-12-20
@@ -13048,7 +13048,7 @@
test for the GNU compiler the same way as for C programs: check for a
predefined macro @code{__GNUC__}. You can also use @code{__GNUG__} to
@@ -102,8 +79,8 @@ exit 0
@menu
* Volatiles:: What constitutes an access to a volatile object.
---- gcc/doc/standards.texi 2009-09-22
-+++ gcc/doc/standards.texi 2009-12-20
+--- a/gcc/doc/standards.texi 2009-09-22
++++ b/gcc/doc/standards.texi 2009-12-20
@@ -223,8 +223,8 @@
GNAT Reference Manual}, for information on standard
conformance and compatibility of the Ada compiler.
@@ -115,8 +92,8 @@ exit 0
-@xref{Compatibility,,Compatibility with the Java Platform, gcj, GNU gcj},
+@xref{Compatibility,,Compatibility with the Java Platform, @value{fngcj}, GNU gcj},
for details of compatibility between @command{gcj} and the Java Platform.
---- gcc/doc/cppinternals.texi 2008-07-21
-+++ gcc/doc/cppinternals.texi 2009-12-20
+--- a/gcc/doc/cppinternals.texi 2008-07-21
++++ b/gcc/doc/cppinternals.texi 2009-12-20
@@ -7,7 +7,7 @@
@ifinfo
@dircategory Software development
@@ -126,8 +103,8 @@ exit 0
@end direntry
@end ifinfo
---- gcc/doc/makefile.texi 2009-02-21
-+++ gcc/doc/makefile.texi 2009-12-20
+--- a/gcc/doc/makefile.texi 2009-02-21
++++ b/gcc/doc/makefile.texi 2009-12-20
@@ -140,7 +140,7 @@
@item profiledbootstrap
Builds a compiler with profiling feedback information. For more
@@ -137,8 +114,8 @@ exit 0
@item restrap
Restart a bootstrap, so that everything that was not built with
---- gcc/doc/libgcc.texi 2008-07-21
-+++ gcc/doc/libgcc.texi 2009-12-20
+--- a/gcc/doc/libgcc.texi 2008-07-21
++++ b/gcc/doc/libgcc.texi 2009-12-20
@@ -24,7 +24,7 @@
GCC will also generate calls to C library routines, such as
@code{memcpy} and @code{memset}, in some cases. The set of routines
@@ -148,8 +125,8 @@ exit 0
These routines take arguments and return values of a specific machine
mode, not a specific C type. @xref{Machine Modes}, for an explanation
---- gcc/doc/invoke.texi 2009-12-17
-+++ gcc/doc/invoke.texi 2009-12-20
+--- a/gcc/doc/invoke.texi 2009-12-17
++++ b/gcc/doc/invoke.texi 2009-12-20
@@ -8644,7 +8644,7 @@
@option{-nodefaultlibs} is @file{libgcc.a}, a library of internal subroutines
that GCC uses to overcome shortcomings of particular machines, or special
@@ -186,8 +163,8 @@ exit 0
compiler looks for a precompiled header in each directory just before it
looks for the include file in that directory. The name searched for is
the name specified in the @code{#include} with @samp{.gch} appended. If
---- gcc/doc/passes.texi 2009-11-30
-+++ gcc/doc/passes.texi 2009-12-20
+--- a/gcc/doc/passes.texi 2009-11-30
++++ b/gcc/doc/passes.texi 2009-12-20
@@ -201,7 +201,7 @@
@item Mudflap declaration registration
@@ -197,8 +174,8 @@ exit 0
enabled, we generate code to register some variable declarations with
the mudflap runtime. Specifically, the runtime tracks the lifetimes of
those variable declarations that have their addresses taken, or whose
---- gcc/ada/gnat_rm.texi 2009-11-30
-+++ gcc/ada/gnat_rm.texi 2009-12-20
+--- a/gcc/ada/gnat_rm.texi 2009-11-30
++++ b/gcc/ada/gnat_rm.texi 2009-12-20
@@ -38,7 +38,7 @@
@dircategory GNU Ada tools
@@ -208,8 +185,8 @@ exit 0
@end direntry
@titlepage
---- gcc/ada/gnat-style.texi 2009-02-21
-+++ gcc/ada/gnat-style.texi 2009-12-20
+--- a/gcc/ada/gnat-style.texi 2009-02-21
++++ b/gcc/ada/gnat-style.texi 2009-12-20
@@ -31,7 +31,7 @@
@dircategory Software development
@@ -219,8 +196,8 @@ exit 0
@end direntry
@macro syntax{element}
---- gcc/java/gcj.texi 2009-08-13
-+++ gcc/java/gcj.texi 2009-12-20
+--- a/gcc/java/gcj.texi 2009-08-13
++++ b/gcc/java/gcj.texi 2009-12-20
@@ -55,25 +55,25 @@
@format
@dircategory Software development
@@ -265,8 +242,8 @@ exit 0
options specific to @command{gcj}.
@c man end
---- gcc/fortran/gfortran.texi 2009-12-17
-+++ gcc/fortran/gfortran.texi 2009-12-20
+--- a/gcc/fortran/gfortran.texi 2009-12-17
++++ b/gcc/fortran/gfortran.texi 2009-12-20
@@ -101,7 +101,7 @@
@ifinfo
@dircategory Software development
View
0  debian/patches/00list → debian/patches/series
File renamed without changes
View
106 debian/rules
@@ -1,50 +1,78 @@
#!/usr/bin/make -f
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+#export DH_OPTIONS=-v
ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
MAKEFLAGS += -j$(NUMJOBS)
endif
-build: build-stamp
-build-stamp: patch-stamp
- dh_testdir
- $(MAKE) -f debian/Makefile
- touch build-stamp
+%:
+ dh $@
-install: build
- dh_testdir
- dh_testroot
- dh_clean -k
- dh_installdirs -i
+override_dh_auto_build-indep:
+ $(MAKE) -f debian/Makefile
-clean:
- dh_testdir
- dh_testroot
- rm -f build-stamp
+override_dh_auto_clean:
$(MAKE) -f debian/Makefile clean
- debian/rules unpatch
- dh_clean
-
-
-binary-indep: build install
- dh_testdir
- dh_testroot
- dh_installdocs -i
- dh_installchangelogs -i
- dh_installman -i
- dh_installinfo -i
- dh_link -i
- dh_compress -i
- dh_fixperms -i
- dh_installdeb -i
- dh_gencontrol -i
- dh_md5sums -i
- dh_builddeb -i
-
-binary-arch: build install
-
-binary: binary-indep binary-arch
-
-.PHONY: build install clean binary-indep binary-arch binary
-include /usr/share/dpatch/dpatch.make
+# Use override_dh_* targets to customize this.
+# ---------------------------------------------------
+# Followings are the old debian/rules
+#
+# #!/usr/bin/make -f
+#
+# ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
+# NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
+# MAKEFLAGS += -j$(NUMJOBS)
+# endif
+#
+# build: build-indep
+#
+# build-arch:
+#
+# build-indep: build-stamp
+#
+# build-stamp: patch-stamp
+# dh_testdir
+# $(MAKE) -f debian/Makefile
+# touch build-stamp
+#
+# install-indep: build-indep
+# dh_testdir
+# dh_testroot
+# dh_clean -k
+# dh_installdirs -i
+#
+# clean:
+# dh_testdir
+# dh_testroot
+# rm -f build-stamp
+# $(MAKE) -f debian/Makefile clean
+# debian/rules unpatch
+# dh_clean
+#
+#
+# binary-indep: build-indep install-indep
+# dh_testdir
+# dh_testroot
+# dh_installdocs -i
+# dh_installchangelogs -i
+# dh_installman -i
+# dh_installinfo -i
+# dh_link -i
+# dh_compress -i
+# dh_fixperms -i
+# dh_installdeb -i
+# dh_gencontrol -i
+# dh_md5sums -i
+# dh_builddeb -i
+#
+# binary-arch: build-arch
+#
+# binary: binary-indep binary-arch
+#
+# .PHONY: build build-arch build-indep install clean binary-indep binary-arch binary
+#
+# include /usr/share/dpatch/dpatch.make
View
2  debian/source/format
@@ -1 +1 @@
-1.0
+3.0 (quilt)
Please sign in to comment.
Something went wrong with that request. Please try again.