Package: release.debian.org Severity: normal User: release.debian....@packages.debian.org Usertags: unblock
Dear Release Team, Please unblock package gcc-doc-defaults GCC's documents need an update, as we have gcc-4.6/4.7 as default version (depends on arch). This upload update manpage/info symlinks from gcc-4.4 to gcc-4.6/4.7, and also fixed some lintian warnings. gcc-4.6-doc and gcc-4.7-doc need to be unblocked before this package.[1][2] [1] http://bugs.debian.org/689726 [2] http://bugs.debian.org/689727 debdiff between 5:3 and 5:4 attached at the end. unblock gcc-doc-defaults/5:4 Regards, Guo Yixuan 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-06 05:04:51.000000000 +0800 @@ -1,3 +1,30 @@ +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. + - added targets: build-arch, build-dep. + * debian/control(.in): + - Bumped policy version to 3.9.4. + - Added myself to uploaders. + - Added git repo urls in Vcs-*. + - Build-dep on cpp, gfortran, gnat, gcj-jdk for getting default + versions at build-time. + - Use replaces and breaks to overwrite files in older packages, instead of + conflicts. + - Added Homepage field. + * Use "set -e" in *.preinst scripts. + * Added lintian override files: + - for arch-dependent document packages, + - for symlinks to files in other packages. + * Improved README. + + [ Sponsor Steffen Moeller ] + * Added DMUA flag for Guo Yixuan. + + -- Guo Yixuan <culu....@gmail.com> Thu, 04 Oct 2012 11:19:36 +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-06 05:03:35.000000000 +0800 @@ -3,14 +3,21 @@ Priority: optional Maintainer: Debian GCC Maintainers <debian-...@lists.debian.org> Uploaders: - Nikita V. Youshchenko <yo...@debian.org> -Build-Depends: debhelper (>> 5) -Standards-Version: 3.7.3 + Nikita V. Youshchenko <yo...@debian.org>, + Guo Yixuan <culu....@gmail.com> +Build-Depends: debhelper (>> 5), + cpp, gfortran, gnat, gcj-jdk +Standards-Version: 3.9.4 +DM-Upload-Allowed: yes +Homepage: http://gcc.gnu.org/ +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} -Conflicts: gcc (<< 4:4.1.1-7), g++ (<< 4:4.1.1-7) +Depends: gcc-4.7-doc (>= 4.7.2-1), ${misc:Depends} +Replaces: gcc (<< 4:4.1.1-7), g++ (<< 4:4.1.1-7) +Breaks: 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 and documentation for Debian default version of GNU compilers. @@ -19,8 +26,9 @@ Package: cpp-doc Architecture: any -Depends: cpp-4.4-doc (>= 4.4.4.nf1-1), ${misc:Depends} -Conflicts: cpp (<< 4:4.1.1-7) +Depends: cpp-4.7-doc (>= 4.7.2-1), ${misc:Depends} +Replaces: cpp (<< 4:4.1.1-7) +Breaks: cpp (<< 4:4.1.1-7) Description: documentation for the GNU C preprocessor (cpp) This is the dependency package that should install manual page and documentation for Debian default version of GNU C preprocessor. @@ -29,8 +37,9 @@ Package: gfortran-doc Architecture: any -Depends: gfortran-4.4-doc (>= 4.4.4.nf1-1), ${misc:Depends} -Conflicts: gfortran (<< 4:4.1.1-7) +Depends: gfortran-4.7-doc (>= 4.7.2-1), ${misc:Depends} +Replaces: gfortran (<< 4:4.1.1-7) +Breaks: gfortran (<< 4:4.1.1-7) Description: documentation for the GNU Fortran Compiler (gfortran) This is the dependency package that should install manual page and documentation for Debian default version of GNU Fortran compiler. @@ -39,7 +48,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,8 +57,9 @@ 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) +Breaks: gcj (<< 4:4.3.1-2) Description: documentation for the GNU Java tools (gcj, gij) This is the dependency package that should install documentation for Debian default version of GNU Java tools. 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-03 14:13:00.000000000 +0800 @@ -3,14 +3,20 @@ Priority: optional Maintainer: Debian GCC Maintainers <debian-...@lists.debian.org> Uploaders: - Nikita V. Youshchenko <yo...@debian.org> -Build-Depends: debhelper (>> 5) -Standards-Version: 3.7.3 + Nikita V. Youshchenko <yo...@debian.org>, + Guo Yixuan <culu....@gmail.com> +Build-Depends: debhelper (>> 5), + cpp, gfortran, gnat, gcj-jdk +Standards-Version: 3.9.4 +Homepage: http://gcc.gnu.org/ +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% -Conflicts: gcc (<< 4:4.1.1-7), g++ (<< 4:4.1.1-7) +Depends: %GCC_DEP_VER%, ${misc:Depends} +Replaces: gcc (<< 4:4.1.1-7), g++ (<< 4:4.1.1-7) +Breaks: 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 and documentation for Debian default version of GNU compilers. @@ -19,8 +25,9 @@ Package: cpp-doc Architecture: any -Depends: %CPP_DEP_VER% -Conflicts: cpp (<< 4:4.1.1-7) +Depends: %CPP_DEP_VER%, ${misc:Depends} +Replaces: cpp (<< 4:4.1.1-7) +Breaks: cpp (<< 4:4.1.1-7) Description: documentation for the GNU C preprocessor (cpp) This is the dependency package that should install manual page and documentation for Debian default version of GNU C preprocessor. @@ -29,8 +36,9 @@ Package: gfortran-doc Architecture: any -Depends: %GFORTRAN_DEP_VER% -Conflicts: gfortran (<< 4:4.1.1-7) +Depends: %GFORTRAN_DEP_VER%, ${misc:Depends} +Replaces: gfortran (<< 4:4.1.1-7) +Breaks: gfortran (<< 4:4.1.1-7) Description: documentation for the GNU Fortran Compiler (gfortran) This is the dependency package that should install manual page and documentation for Debian default version of GNU Fortran compiler. @@ -39,7 +47,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,8 +56,9 @@ Package: gcj-doc Architecture: any -Depends: %GCJ_DEP_VER% +Depends: %GCJ_DEP_VER%, ${misc:Depends} Replaces: gcj (<< 4:4.3.1-2) +Breaks: gcj (<< 4:4.3.1-2) Description: documentation for the GNU Java tools (gcj, gij) This is the dependency package that should install documentation for Debian default version of GNU Java tools. diff -Nru gcc-doc-defaults-3/debian/cpp-doc.lintian-overrides gcc-doc-defaults-4/debian/cpp-doc.lintian-overrides --- gcc-doc-defaults-3/debian/cpp-doc.lintian-overrides 1970-01-01 08:00:00.000000000 +0800 +++ gcc-doc-defaults-4/debian/cpp-doc.lintian-overrides 2012-10-03 14:13:00.000000000 +0800 @@ -0,0 +1,5 @@ +# gcc-defaults has different default versions for architectures, +# so our packages are arch-dependent, too. +cpp-doc binary: documentation-package-not-architecture-independent +# symlinks fulfilled by dependency +cpp-doc binary: package-contains-broken-symlink 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-01 10:42:53.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.lintian-overrides gcc-doc-defaults-4/debian/gcc-doc.lintian-overrides --- gcc-doc-defaults-3/debian/gcc-doc.lintian-overrides 1970-01-01 08:00:00.000000000 +0800 +++ gcc-doc-defaults-4/debian/gcc-doc.lintian-overrides 2012-10-03 14:13:00.000000000 +0800 @@ -0,0 +1,5 @@ +# gcc-defaults has different default versions for architectures, +# so our packages are arch-dependent, too. +gcc-doc binary: documentation-package-not-architecture-independent +# symlinks fulfilled by dependency +gcc-doc binary: package-contains-broken-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-01 10:44:31.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.lintian-overrides gcc-doc-defaults-4/debian/gcj-doc.lintian-overrides --- gcc-doc-defaults-3/debian/gcj-doc.lintian-overrides 1970-01-01 08:00:00.000000000 +0800 +++ gcc-doc-defaults-4/debian/gcj-doc.lintian-overrides 2012-10-03 14:13:00.000000000 +0800 @@ -0,0 +1,5 @@ +# gcc-defaults has different default versions for architectures, +# so our packages are arch-dependent, too. +gcj-doc binary: documentation-package-not-architecture-independent +# symlinks fulfilled by dependency +gcj-doc binary: package-contains-broken-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-01 10:44:43.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.lintian-overrides gcc-doc-defaults-4/debian/gfortran-doc.lintian-overrides --- gcc-doc-defaults-3/debian/gfortran-doc.lintian-overrides 1970-01-01 08:00:00.000000000 +0800 +++ gcc-doc-defaults-4/debian/gfortran-doc.lintian-overrides 2012-10-03 14:13:00.000000000 +0800 @@ -0,0 +1,5 @@ +# gcc-defaults has different default versions for architectures, +# so our packages are arch-dependent, too. +gfortran-doc binary: documentation-package-not-architecture-independent +# symlinks fulfilled by dependency +gfortran-doc binary: package-contains-broken-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-01 10:44:57.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.lintian-overrides gcc-doc-defaults-4/debian/gnat-doc.lintian-overrides --- gcc-doc-defaults-3/debian/gnat-doc.lintian-overrides 1970-01-01 08:00:00.000000000 +0800 +++ gcc-doc-defaults-4/debian/gnat-doc.lintian-overrides 2012-10-03 14:13:00.000000000 +0800 @@ -0,0 +1,5 @@ +# gcc-defaults has different default versions for architectures, +# so our packages are arch-dependent, too. +gnat-doc binary: documentation-package-not-architecture-independent +# symlinks fulfilled by dependency +gnat-doc binary: package-contains-broken-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-01 10:45:09.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/README gcc-doc-defaults-4/debian/README --- gcc-doc-defaults-3/debian/README 2006-09-18 04:43:21.000000000 +0800 +++ gcc-doc-defaults-4/debian/README 2012-10-04 11:11:33.000000000 +0800 @@ -4,8 +4,9 @@ There is no documentation in this package, only symlinks. Documentation itself is distributed under the terms of the -GNU Free Documentation License, which is not DFSG-free, +GNU Free Documentation License (with invariant sections or +front/back cover texts), which is not DFSG-free, so documentation could not be distributed in Debian main. -However, for pople who needs the documentation, it is available +However, for people who need the documentation, it is available from non-free section of the Debian archive. 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-04 11:25:51.000000000 +0800 @@ -1,15 +1,22 @@ #!/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 by symlinks, eg. /usr/bin/gcc -> gcc-4.7 +PREFIX_BIN := /usr/bin/ +get_default_version = $(shell bash -c 'readlink `type -P $(PREFIX_BIN)$(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))) @@ -34,6 +41,10 @@ build: debian/control $(GENFILES) +build-arch: build + +build-indep: + install: build dh_testdir dh_testroot @@ -52,6 +63,7 @@ dh_testroot dh_installdocs -a -A debian/README dh_installchangelogs -a + dh_lintian -a dh_link -a dh_compress -a dh_fixperms -a @@ -64,5 +76,13 @@ binary: binary-indep binary-arch +# debug helper +show-versions: + # cpp $(CPP_VER) + # gcc $(GCC_VER) + # gfortran $(GFORTRAN_VER) + # gnat $(GNAT_VER) + # gcj $(GCJ_VER) + .PHONY: build install clean binary-indep binary-arch binary \ - debian/control $(GENFILES) + debian/control $(GENFILES) show-versions -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
