[gcc-6] 350/401: * Better fix symlinks to unprefixed man pages. Closes: #851886.

[Ximin Luo]

This is an automated email from the git hooks/post-receive script.

infinity0 pushed a commit to branch pu/reproducible_builds
in repository gcc-6.

commit be341d1ad7ce630c74400325ef92947f963fdae0
Author: doko <doko at 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca>
Date:   Sat Jan 21 01:01:10 2017 +0000

      * Better fix symlinks to unprefixed man pages. Closes: #851886.
    
    
    git-svn-id: svn://anonscm.debian.org/gcccvs/branches/sid/gcc-6@9235 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca
---
 debian/changelog             |  1 +
 debian/rules.d/binary-gcc.mk | 12 ++++++------
 debian/rules.patch           |  8 +++++---
 3 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2e258c2..3f14681 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 gcc-6 (6.3.0-4) UNRELEASED; urgency=medium
 
   * Fix gdc cross build.
+  * Better fix symlinks to unprefixed man pages. Closes: #851886.
 
  -- Matthias Klose <doko at debian.org>  Thu, 19 Jan 2017 13:40:26 +0100
 
diff --git a/debian/rules.d/binary-gcc.mk b/debian/rules.d/binary-gcc.mk
index 67d0495..e521c79 100644
--- a/debian/rules.d/binary-gcc.mk
+++ b/debian/rules.d/binary-gcc.mk
@@ -140,14 +140,14 @@ ifeq ($(unprefixed_names),yes)
 	    $(d_gcc)/$(PF)/bin/$$i$(pkg_ver); \
 	done
   ifneq ($(GFDL_INVARIANT_FREE),yes)
-	for i in gcc gcov; do \
-	  ln -sf $(cmd_prefix)gcc$(pkg_ver).1 \
-	    $(d_gcc)/$(PF)/share/man/man1/$$i$(pkg_ver).1; \
+	for i in gcc gcov gcov-tool; do \
+	  ln -sf $(cmd_prefix)$$i$(pkg_ver).1.gz \
+	    $(d_gcc)/$(PF)/share/man/man1/$$i$(pkg_ver).1.gz; \
 	done
   endif
-	for i in gcc gcov; do \
-	  ln -sf $(cmd_prefix)gcc$(pkg_ver).1 \
-	    $(d_gcc)/$(PF)/share/man/man1/$$i$(pkg_ver).1; \
+	for i in gcc-ar gcc-nm gcc-ranlib; do \
+	  ln -sf $(cmd_prefix)$$i$(pkg_ver).1.gz \
+	    $(d_gcc)/$(PF)/share/man/man1/$$i$(pkg_ver).1.gz; \
 	done
 endif
 
diff --git a/debian/rules.patch b/debian/rules.patch
index 0ee63ef..2ca2d8f 100644
--- a/debian/rules.patch
+++ b/debian/rules.patch
@@ -235,9 +235,11 @@ ifeq ($(DEB_TARGET_ARCH),alpha)
   endif
 endif
 
-debian_patches += pr64735-headers
-ifeq ($(DEB_TARGET_ARCH),armel)
-  debian_patches += pr64735
+ifeq (,$(filter $(derivative),Ubuntu))
+  debian_patches += pr64735-headers
+  ifeq ($(DEB_TARGET_ARCH),armel)
+    debian_patches += pr64735
+  endif
 endif
 
 ifneq (,$(findstring $(DEB_TARGET_ARCH),arm armel armhf))

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/reproducible/gcc-6.git