Dear release team,The document packages for gcc stayed at 4.4 version for long, and should be updated to 4.7/4.6 for wheezy. I packaged two new package: gcc-4.6-doc, gcc-4.7-doc, and updated gcc-doc-defaults and gcc-4.4-doc-non-dfsg.[1] (The old -non-dfsg suffix was dropped for it's unnecessary. [2]) These are based on Nikita V. Youshchenko and Samuel Bronson's previous work. I've also CC'ed Steffen, who will sponsor these packages.
The reason for uploading many packages at the same time is for keeping sync, as explained by Nikita. [3]
I'm attaching debdiffs for gcc-doc-defaults and gcc-4.4-doc-non-dfsg, as the other two are new.
list of package versions
gcc-doc-defaults 5:4
gcc-4.4-doc-non-dfsg 4.4.7-1
gcc-4.6-doc 4.6.3-1
gcc-4.7-doc 4.7.2-1
[1] git repo and mentors links
http://anonscm.debian.org/gitweb/?p=users/yixuan-guest/gcc-doc.git
http://anonscm.debian.org/gitweb/?p=users/yixuan-guest/gcc-doc-defaults.git
http://mentors.debian.net/package/gcc-4.4-doc-non-dfsg
http://mentors.debian.net/package/gcc-4.6-doc
http://mentors.debian.net/package/gcc-4.7-doc
http://mentors.debian.net/package/gcc-doc-defaults
[2] http://lists.debian.org/debian-mentors/2012/01/msg00540.html
[3] http://lists.debian.org/debian-mentors/2012/02/msg00090.html
Regards,
Guo Yixuan
Below is gcc-doc-defaults.diff, gcc-4.4-doc-non-dfsg.diff was gzipped
for its size.
diff -Nru gcc-doc-defaults-3/debian/changelog gcc-doc-defaults-4/debian/changelog
--- gcc-doc-defaults-3/debian/changelog 2010-05-03 04:47:22.000000000 +0800 +++ gcc-doc-defaults-4/debian/changelog 2012-10-02 15:01:19.000000000 +0800 @@ -1,3 +1,19 @@ +gcc-doc-defaults (5:4) unstable; urgency=low + + * Updated defaults to 4.6 and 4.7 versions. (Closes: #618351, + #651290, #684082) + * debian/rules: + - choose default version based on symlinks provided by gcc-defaults. + * debian/control: + - Bumped policy version to 3.9.4. + - Added myself to uploaders. + - Added git repo urls in Vcs-*. + - Build-dep on cpp, gcc, gfortran, gnat, gcj-jdk for getting default + versions at build-time. + * Use "set -e" in *.preinst scripts. + + -- Guo Yixuan <culu.gyx@gmail.com> Tue, 02 Oct 2012 15:01:17 +0800 + gcc-doc-defaults (5:3) unstable; urgency=low * Make all symlinks to point to 4.4 versions.diff -Nru gcc-doc-defaults-3/debian/control gcc-doc-defaults-4/debian/control
--- gcc-doc-defaults-3/debian/control 2010-05-03 04:45:04.000000000 +0800 +++ gcc-doc-defaults-4/debian/control 2012-10-02 15:01:03.000000000 +0800 @@ -3,13 +3,17 @@ Priority: optional Maintainer: Debian GCC Maintainers <debian-gcc@lists.debian.org> Uploaders: - Nikita V. Youshchenko <yoush@debian.org> -Build-Depends: debhelper (>> 5) -Standards-Version: 3.7.3 + Nikita V. Youshchenko <yoush@debian.org>, + Guo Yixuan <culu.gyx@gmail.com> +Build-Depends: debhelper (>> 5), + cpp, gcc, gfortran, gnat, gcj-jdk +Standards-Version: 3.9.4+Vcs-Browser: http://git.debian.org/?p=users/yixuan-guest/gcc-doc-defaults.git
+Vcs-Git: git://git.debian.org/users/yixuan-guest/gcc-doc-defaults.git
Package: gcc-doc
Architecture: any
-Depends: gcc-4.4-doc (>= 4.4.4.nf1-1), ${misc:Depends}
+Depends: gcc-4.7-doc (>= 4.7.2-1), ${misc:Depends}
Conflicts: gcc (<< 4:4.1.1-7), g++ (<< 4:4.1.1-7)
Description: documentation for the GNU compilers (gcc, gobjc, g++)
This is the dependency package that should install manual pages
@@ -19,7 +23,7 @@
Package: cpp-doc
Architecture: any
-Depends: cpp-4.4-doc (>= 4.4.4.nf1-1), ${misc:Depends}
+Depends: cpp-4.7-doc (>= 4.7.2-1), ${misc:Depends}
Conflicts: cpp (<< 4:4.1.1-7)
Description: documentation for the GNU C preprocessor (cpp)
This is the dependency package that should install manual page
@@ -29,7 +33,7 @@
Package: gfortran-doc
Architecture: any
-Depends: gfortran-4.4-doc (>= 4.4.4.nf1-1), ${misc:Depends}
+Depends: gfortran-4.7-doc (>= 4.7.2-1), ${misc:Depends}
Conflicts: gfortran (<< 4:4.1.1-7)
Description: documentation for the GNU Fortran Compiler (gfortran)
This is the dependency package that should install manual page
@@ -39,7 +43,7 @@
Package: gnat-doc
Architecture: any
-Depends: gnat-4.4-doc (>= 4.4.4.nf1-1), ${misc:Depends}
+Depends: gnat-4.6-doc (>= 4.6.3-1), ${misc:Depends}
Description: documentation for the GNU Ada Compiler (gnat)
This is the dependency package that should install documentation
for Debian default version of GNU Ada compiler.
@@ -48,7 +52,7 @@
Package: gcj-doc
Architecture: any
-Depends: gcj-4.4-doc (>= 4.4.4.nf1-1), ${misc:Depends}
+Depends: gcj-4.7-doc (>= 4.7.2-1), ${misc:Depends}
Replaces: gcj (<< 4:4.3.1-2)
Description: documentation for the GNU Java tools (gcj, gij)
This is the dependency package that should install documentation
diff -Nru gcc-doc-defaults-3/debian/control.in
gcc-doc-defaults-4/debian/control.in
--- gcc-doc-defaults-3/debian/control.in 2008-06-30 00:07:44.000000000 +0800 +++ gcc-doc-defaults-4/debian/control.in 2012-10-02 15:00:27.000000000 +0800 @@ -3,13 +3,17 @@ Priority: optional Maintainer: Debian GCC Maintainers <debian-gcc@lists.debian.org> Uploaders: - Nikita V. Youshchenko <yoush@debian.org> -Build-Depends: debhelper (>> 5) -Standards-Version: 3.7.3 + Nikita V. Youshchenko <yoush@debian.org>, + Guo Yixuan <culu.gyx@gmail.com> +Build-Depends: debhelper (>> 5), + cpp, gcc, gfortran, gnat, gcj-jdk +Standards-Version: 3.9.4+Vcs-Browser: http://git.debian.org/?p=users/yixuan-guest/gcc-doc-defaults.git
+Vcs-Git: git://git.debian.org/users/yixuan-guest/gcc-doc-defaults.git
Package: gcc-doc
Architecture: any
-Depends: %GCC_DEP_VER%
+Depends: %GCC_DEP_VER%, ${misc:Depends}
Conflicts: gcc (<< 4:4.1.1-7), g++ (<< 4:4.1.1-7)
Description: documentation for the GNU compilers (gcc, gobjc, g++)
This is the dependency package that should install manual pages
@@ -19,7 +23,7 @@
Package: cpp-doc
Architecture: any
-Depends: %CPP_DEP_VER%
+Depends: %CPP_DEP_VER%, ${misc:Depends}
Conflicts: cpp (<< 4:4.1.1-7)
Description: documentation for the GNU C preprocessor (cpp)
This is the dependency package that should install manual page
@@ -29,7 +33,7 @@
Package: gfortran-doc
Architecture: any
-Depends: %GFORTRAN_DEP_VER%
+Depends: %GFORTRAN_DEP_VER%, ${misc:Depends}
Conflicts: gfortran (<< 4:4.1.1-7)
Description: documentation for the GNU Fortran Compiler (gfortran)
This is the dependency package that should install manual page
@@ -39,7 +43,7 @@
Package: gnat-doc
Architecture: any
-Depends: %GNAT_DEP_VER%
+Depends: %GNAT_DEP_VER%, ${misc:Depends}
Description: documentation for the GNU Ada Compiler (gnat)
This is the dependency package that should install documentation
for Debian default version of GNU Ada compiler.
@@ -48,7 +52,7 @@
Package: gcj-doc
Architecture: any
-Depends: %GCJ_DEP_VER%
+Depends: %GCJ_DEP_VER%, ${misc:Depends}
Replaces: gcj (<< 4:4.3.1-2)
Description: documentation for the GNU Java tools (gcj, gij)
This is the dependency package that should install documentation
diff -Nru gcc-doc-defaults-3/debian/cpp-doc.preinst
gcc-doc-defaults-4/debian/cpp-doc.preinst
--- gcc-doc-defaults-3/debian/cpp-doc.preinst 2006-09-29
19:22:02.000000000 +0800
+++ gcc-doc-defaults-4/debian/cpp-doc.preinst 2012-10-02
14:03:58.000000000 +0800
@@ -1,4 +1,5 @@
-#! /bin/sh -e
+#!/bin/sh
+set -e
if [ -L /usr/share/doc/cpp-doc ]; then
echo "Removing old /usr/share/doc/cpp-doc symlink."
diff -Nru gcc-doc-defaults-3/debian/gcc-doc.preinst
gcc-doc-defaults-4/debian/gcc-doc.preinst
--- gcc-doc-defaults-3/debian/gcc-doc.preinst 2006-09-29
19:22:13.000000000 +0800
+++ gcc-doc-defaults-4/debian/gcc-doc.preinst 2012-10-02
14:03:58.000000000 +0800
@@ -1,4 +1,5 @@
-#! /bin/sh -e
+#!/bin/sh
+set -e
if [ -L /usr/share/doc/gcc-doc ]; then
echo "Removing old /usr/share/doc/gcc-doc symlink."
diff -Nru gcc-doc-defaults-3/debian/gcj-doc.preinst
gcc-doc-defaults-4/debian/gcj-doc.preinst
--- gcc-doc-defaults-3/debian/gcj-doc.preinst 2008-06-04
04:15:58.000000000 +0800
+++ gcc-doc-defaults-4/debian/gcj-doc.preinst 2012-10-02
14:03:58.000000000 +0800
@@ -1,4 +1,5 @@
-#! /bin/sh -e
+#!/bin/sh
+set -e
if [ -L /usr/share/doc/gcj-doc ]; then
echo "Removing old /usr/share/doc/gcj-doc symlink."
diff -Nru gcc-doc-defaults-3/debian/gfortran-doc.preinst
gcc-doc-defaults-4/debian/gfortran-doc.preinst
--- gcc-doc-defaults-3/debian/gfortran-doc.preinst 2006-09-29
19:22:19.000000000 +0800
+++ gcc-doc-defaults-4/debian/gfortran-doc.preinst 2012-10-02
14:03:58.000000000 +0800
@@ -1,4 +1,5 @@
-#! /bin/sh -e
+#!/bin/sh
+set -e
if [ -L /usr/share/doc/gfortran-doc ]; then
echo "Removing old /usr/share/doc/gfortran-doc symlink."
diff -Nru gcc-doc-defaults-3/debian/gnat-doc.preinst
gcc-doc-defaults-4/debian/gnat-doc.preinst
--- gcc-doc-defaults-3/debian/gnat-doc.preinst 2008-06-04
04:13:09.000000000 +0800
+++ gcc-doc-defaults-4/debian/gnat-doc.preinst 2012-10-02
14:03:58.000000000 +0800
@@ -1,4 +1,5 @@
-#! /bin/sh -e
+#!/bin/sh
+set -e
if [ -L /usr/share/doc/gnat-doc ]; then
echo "Removing old /usr/share/doc/gnat-doc symlink."
diff -Nru gcc-doc-defaults-3/debian/rules gcc-doc-defaults-4/debian/rules
--- gcc-doc-defaults-3/debian/rules 2010-05-03 04:39:07.000000000 +0800
+++ gcc-doc-defaults-4/debian/rules 2012-10-02 14:58:08.000000000 +0800
@@ -1,15 +1,20 @@
#!/usr/bin/make -f
-DOC_VER_4.4 := 4.4.4.nf1-1
+DOC_VER_4.4 := 4.4.7-1
+DOC_VER_4.6 := 4.6.3-1
+DOC_VER_4.7 := 4.7.2-1
BASES := cpp gcc gfortran gnat gcj
GENFILES := $(patsubst %,debian/%-doc.links, $(BASES))
-CPP_VER := 4.4
-GCC_VER := 4.4
-GFORTRAN_VER := 4.4
-GNAT_VER := 4.4
-GCJ_VER := 4.4
+get_default_version = $(shell bash -c 'readlink `type -P $(1)`|perl -pe
"s/^.*-//"')
+ +# default versions depend on arch +CPP_VER := $(call get_default_version,cpp) +GCC_VER := $(call get_default_version,gcc) +GFORTRAN_VER := $(call get_default_version,gfortran) +GNAT_VER := $(call get_default_version,gnatgcc) +GCJ_VER := $(call get_default_version,gcj) CPP_DEP_VER := cpp-$(CPP_VER)-doc (>= $(DOC_VER_$(CPP_VER))) GCC_DEP_VER := gcc-$(GCC_VER)-doc (>= $(DOC_VER_$(GCC_VER)))
Attachment:
gcc-4.4-doc-non-dfsg.diff.gz
Description: GNU Zip compressed data