On Thu, 08 Sep 2016 00:10:01 +0300 Dmitry Eremin-Solenikov wrote: > The error with gnat-doc package version was most probably caused by the > missinchronization of gcc-doc-defaults rebuild vs. gnat defaults > changes. The attached patch should adds support for new GCC/GNAT/etc > packages defaulting to 6.x branch.
I've uploaded to the two-days delayed queue a package based on your patch but with (diff attached) the addition of a "Non-maintainer upload" line in debian/changelog, and changing from using gnatgcc to just using gnat to prevent the FTBFS, which is caused by gnat-6/#839209 Guo Yixuan: If you object to this NMU, please le me know ASAP. If not, please merge the NMU into your git repository. -- bye, pabs https://wiki.debian.org/PaulWise
diff -Nru gcc-doc-defaults-14/debian/changelog gcc-doc-defaults-15/debian/changelog
--- gcc-doc-defaults-14/debian/changelog 2015-05-06 04:43:02.000000000 +0800
+++ gcc-doc-defaults-15/debian/changelog 2016-09-08 04:48:17.000000000 +0800
@@ -1,3 +1,16 @@
+gcc-doc-defaults (5:15) unstable; urgency=medium
+
+ * Non-maintainer upload.
+
+ [ Dmitry Eremin-Solenikov ]
+ * Updated to 6.1 versions. (Closes: #794778, #833505)
+
+ [ Paul Wise ]
+ * Switch from gnatgcc to gnat for version determination due to #839209
+ (Closes: #825320)
+
+ -- Dmitry Eremin-Solenikov <dbarysh...@gmail.com> Wed, 07 Sep 2016 23:48:17 +0300
+
gcc-doc-defaults (5:14) unstable; urgency=medium
* Updated gcc/doc/ with upstream 4.9.1.
diff -Nru gcc-doc-defaults-14/debian/control gcc-doc-defaults-15/debian/control
--- gcc-doc-defaults-14/debian/control 2015-05-06 04:43:47.000000000 +0800
+++ gcc-doc-defaults-15/debian/control 2016-09-08 04:48:17.000000000 +0800
@@ -16,7 +16,7 @@
Package: gcc-doc
Architecture: any
-Depends: gcc-4.9-doc (>= 4.9.2-1~), ${misc:Depends}
+Depends: gcc-6-doc (>= 6.1.0-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++)
@@ -27,7 +27,7 @@
Package: cpp-doc
Architecture: any
-Depends: cpp-4.9-doc (>= 4.9.2-1~), ${misc:Depends}
+Depends: cpp-6-doc (>= 6.1.0-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)
@@ -38,7 +38,7 @@
Package: gfortran-doc
Architecture: any
-Depends: gfortran-4.9-doc (>= 4.9.2-1~), ${misc:Depends}
+Depends: gfortran-6-doc (>= 6.1.0-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)
@@ -49,7 +49,7 @@
Package: gnat-doc
Architecture: any
-Depends: gnat-4.9-doc (>= 4.9.2-1~), ${misc:Depends}
+Depends: gnat-6-doc (>= 6.1.0-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.
@@ -58,7 +58,7 @@
Package: gcj-doc
Architecture: any
-Depends: gcj-4.9-doc (>= 4.9.2-1~), ${misc:Depends}
+Depends: gcj-6-doc (>= 6.1.0-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)
@@ -69,7 +69,7 @@
Package: gccgo-doc
Architecture: amd64 arm64 armel armhf i386 ia64 mips mips64 mips64el mipsel powerpc ppc64 ppc64el s390 s390x x32
-Depends: gccgo-4.9-doc (>= 4.9.2-1~), ${misc:Depends}
+Depends: gccgo-6-doc (>= 6.1.0-1~), ${misc:Depends}
Description: documentation for the GNU Go compiler (gccgo)
This is the dependency package that should install documentation
for Debian default version of GNU Go compiler.
diff -Nru gcc-doc-defaults-14/debian/rules gcc-doc-defaults-15/debian/rules
--- gcc-doc-defaults-14/debian/rules 2015-05-06 04:26:21.000000000 +0800
+++ gcc-doc-defaults-15/debian/rules 2016-09-08 04:48:17.000000000 +0800
@@ -12,6 +12,7 @@
DOC_VER_4.8 := 4.8.4-1~
DOC_VER_4.9 := 4.9.2-1~
DOC_VER_5 := 5.1.0-1~
+DOC_VER_6 := 6.1.0-1~
# The version for binary packages: gcc-doc-base, gcc-doc, etc.
# Automatic set debian revision, adapted from gcc-defaults' rules.
@@ -27,15 +28,18 @@
#PKG_VER_4.8 := 4.8.4-1
#PKG_VER_4.9 := 4.9.2-1
#PKG_VER_5 := 5.1.0-1
+#PKG_VER_6 := 6.1.0-1
-PKG_VER_4.4 := 4.4.7-$(shell expr $(VMAJOR) - 4)
-PKG_VER_4.6 := 4.6.4-$(shell expr $(VMAJOR) - 5)
-PKG_VER_4.7 := 4.7.4-$(shell expr $(VMAJOR) - 9)
-PKG_VER_4.8 := 4.8.4-$(shell expr $(VMAJOR) - 13)
-PKG_VER_4.9 := 4.9.2-$(shell expr $(VMAJOR) - 13)
-PKG_VER_5 := 5.1.0-$(shell expr $(VMAJOR) - 13)
+PKG_VER_4.4 := 4.4.7-$(shell expr $(VMAJOR) - 5)
+PKG_VER_4.6 := 4.6.4-$(shell expr $(VMAJOR) - 6)
+PKG_VER_4.7 := 4.7.4-$(shell expr $(VMAJOR) - 10)
+PKG_VER_4.8 := 4.8.4-$(shell expr $(VMAJOR) - 14)
+PKG_VER_4.9 := 4.9.2-$(shell expr $(VMAJOR) - 14)
+PKG_VER_5 := 5.1.0-$(shell expr $(VMAJOR) - 14)
+PKG_VER_6 := 6.1.0-$(shell expr $(VMAJOR) - 14)
-PKG_VER_BASE := $(PKG_VER_4.9)
+#PKG_VER_BASE := $(PKG_VER_4.9)
+PKG_VER_BASE := $(PKG_VER_6)
# Keep in sync with gcc-defaults, gccgo doesn't exist on all archs
go_archs = amd64 arm64 armel armhf i386 ia64 mips mips64 mips64el mipsel \
@@ -63,7 +67,7 @@
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)
+GNAT_VER := $(call get_default_version,gnat)
GCJ_VER := $(call get_default_version,gcj)
ifneq (,$(filter $(DEB_HOST_ARCH),$(go_archs)))
GCCGO_VER := $(call get_default_version,gccgo)
@@ -161,5 +165,6 @@
# pkg-ver $(PKG_VER_4.8)
# pkg-ver $(PKG_VER_4.9)
# pkg-ver $(PKG_VER_5)
+ # pkg-ver $(PKG_VER_6)
.PHONY: show-versions
signature.asc
Description: This is a digitally signed message part
