[gcc-7] 139/354: * Don't ship the gnatgcc manpage symlink when building GFDL packages. Addresses: #857384.

[Ximin Luo]

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

infinity0 pushed a commit to branch master
in repository gcc-7.

commit 60ecb7d4fd9652e66521809bdf55b942944ef741
Author: doko <doko at 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca>
Date:   Mon Mar 13 11:19:05 2017 +0000

      * Don't ship the gnatgcc manpage symlink when building GFDL packages.
        Addresses: #857384.
    
    
    git-svn-id: svn+ssh://svn.debian.org/svn/gcccvs/branches/sid/gcc-7@9352 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca
---
 debian/changelog             |  2 ++
 debian/rules.d/binary-ada.mk | 16 ++++++++++++----
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c113427..7fc3286 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,8 @@ gcc-7 (7-20170303-1) UNRELEASED; urgency=medium
     Closes: #857074.
   * Update the cross-install-location patch (Helmut Grohne). Closes: #855565.
   * Fix symlinks to man pages in the hppa64 package. Addresses: #857583.
+  * Don't ship the gnatgcc manpage symlink when building GFDL packages.
+    Addresses: #857384.
 
  -- Matthias Klose <doko at debian.org>  Fri, 03 Mar 2017 10:14:38 +0100
 
diff --git a/debian/rules.d/binary-ada.mk b/debian/rules.d/binary-ada.mk
index 3fc8ca8..76678a3 100644
--- a/debian/rules.d/binary-ada.mk
+++ b/debian/rules.d/binary-ada.mk
@@ -226,12 +226,20 @@ ifneq (,$(filter $(build_type), build-native cross-build-native))
 endif
 	: # keep this one unversioned, see Debian #802838.
 	dh_link -p$(p_gnat) \
-		usr/bin/$(cmd_prefix)gcc$(pkg_ver) usr/bin/$(cmd_prefix)gnatgcc \
-		usr/share/man/man1/$(cmd_prefix)gcc$(pkg_ver).1.gz usr/share/man/man1/$(cmd_prefix)gnatgcc.1.gz
+		usr/bin/$(cmd_prefix)gcc$(pkg_ver) usr/bin/$(cmd_prefix)gnatgcc
+ifneq ($(GFDL_INVARIANT_FREE),yes)
+	dh_link -p$(p_gnat) \
+		usr/share/man/man1/$(cmd_prefix)gcc$(pkg_ver).1.gz \
+		usr/share/man/man1/$(cmd_prefix)gnatgcc.1.gz
+endif
 ifeq ($(unprefixed_names),yes)
 	dh_link -p$(p_gnat) \
-		usr/bin/$(cmd_prefix)gcc$(pkg_ver) usr/bin/gnatgcc \
-		usr/share/man/man1/$(cmd_prefix)gcc$(pkg_ver).1.gz usr/share/man/man1/gnatgcc.1.gz
+		usr/bin/$(cmd_prefix)gcc$(pkg_ver) usr/bin/gnatgcc
+  ifneq ($(GFDL_INVARIANT_FREE),yes)
+	dh_link -p$(p_gnat) \
+		usr/share/man/man1/$(cmd_prefix)gcc$(pkg_ver).1.gz \
+		usr/share/man/man1/gnatgcc.1.gz
+  endif
 endif
 	debian/dh_rmemptydirs -p$(p_gnat)
 

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