[gcc-7] 138/354: * Fix symlinks to man pages in the hppa64 package. Addresses: #857583.

[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 b66a860bf538be7666e6cb4055982a5c6d92bb4f
Author: doko <doko at 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca>
Date:   Mon Mar 13 11:03:01 2017 +0000

      * Fix symlinks to man pages in the hppa64 package. Addresses: #857583.
    
    
    git-svn-id: svn+ssh://svn.debian.org/svn/gcccvs/branches/sid/gcc-7@9348 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca
---
 debian/changelog  | 1 +
 debian/control    | 7 +++----
 debian/control.m4 | 7 +++----
 debian/rules2     | 8 +++++++-
 4 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 02c796f..c113427 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ gcc-7 (7-20170303-1) UNRELEASED; urgency=medium
   * Fix base package name for rtlibs stage build (Helmut Grohne).
     Closes: #857074.
   * Update the cross-install-location patch (Helmut Grohne). Closes: #855565.
+  * Fix symlinks to man pages in the hppa64 package. Addresses: #857583.
 
  -- Matthias Klose <doko at debian.org>  Fri, 03 Mar 2017 10:14:38 +0100
 
diff --git a/debian/control b/debian/control
index dc385a4..bfece37 100644
--- a/debian/control
+++ b/debian/control
@@ -323,10 +323,9 @@ Package: gcc-7-hppa64-linux-gnu
 Architecture: hppa amd64 i386 x32
 Section: devel
 Priority: optional
-Depends: gcc-7-base (= ${gcc:Version}), ${shlibs:Depends}, ${misc:Depends}, binutils-hppa64-linux-gnu | binutils-hppa64
-Replaces: gcc-5-hppa64 (<< 5.2.1-22)
-Provides: gcc-5-hppa64
-Conflicts: gcc-3.3-hppa64 (<= 1:3.3.4-5), gcc-3.4-hppa64 (<= 3.4.1-3), gcc-4.7-hppa64 (<< 4.7.3-13), gcc-4.8-hppa64 (<< 4.8.2-22), gcc-4.9-hppa64 (<< 4.9.3-1)
+Depends: gcc-7-base (= ${gcc:Version}), gcc-7 (= ${gcc:Version}),
+  binutils-hppa64-linux-gnu | binutils-hppa64, 
+  ${shlibs:Depends}, ${misc:Depends}
 Description: GNU C compiler (cross compiler for hppa64)
  This is the GNU C compiler, a fairly portable optimizing compiler for C.
 
diff --git a/debian/control.m4 b/debian/control.m4
index 01d9679..d9598e8 100644
--- a/debian/control.m4
+++ b/debian/control.m4
@@ -766,10 +766,9 @@ ifdef(`TARGET',`Multi-Arch: foreign
 ')dnl
 Section: devel
 Priority: PRI(optional)
-Depends: BASEDEP, ${shlibs:Depends}, ${misc:Depends}, binutils-hppa64-linux-gnu | binutils-hppa64
-Replaces: gcc-5-hppa64 (<< 5.2.1-22)
-Provides: gcc-5-hppa64
-Conflicts: gcc-3.3-hppa64 (<= 1:3.3.4-5), gcc-3.4-hppa64 (<= 3.4.1-3), gcc-4.7-hppa64 (<< 4.7.3-13), gcc-4.8-hppa64 (<< 4.8.2-22), gcc-4.9-hppa64 (<< 4.9.3-1)
+Depends: BASEDEP, gcc`'PV`'TS (= ${gcc:Version}),
+  binutils-hppa64-linux-gnu | binutils-hppa64,
+  ${shlibs:Depends}, ${misc:Depends}
 BUILT_USING`'dnl
 Description: GNU C compiler (cross compiler for hppa64)
  This is the GNU C compiler, a fairly portable optimizing compiler for C.
diff --git a/debian/rules2 b/debian/rules2
index 227a076..a0d4c44 100644
--- a/debian/rules2
+++ b/debian/rules2
@@ -2402,10 +2402,16 @@ ifeq ($(versioned_packages),yes)
 	done
 endif
 	mkdir -p $(d_hppa64)/$(PF)/share/man/man1
-	for i in cpp gcc-ar gcc-nm gcc-ranlib; do \
+	for i in gcc-ar gcc-nm gcc-ranlib; do \
 	  ln -sf $$i$(pkg_ver).1.gz \
 	    $(d_hppa64)/$(PF)/share/man/man1/hppa64-linux-gnu-$$i$(pkg_ver).1.gz; \
 	done
+ifneq ($(GFDL_INVARIANT_FREE),yes)
+	for i in cpp gcc; do \
+	  ln -sf $$i$(pkg_ver).1.gz \
+	    $(d_hppa64)/$(PF)/share/man/man1/hppa64-linux-gnu-$$i$(pkg_ver).1.gz; \
+	done
+endif
 
 	: # remove '*.la' and '*.lai' files, not shipped in any package.
 	find $(d_hppa64) -name '*.la' -o -name '*.lai' | xargs -r rm -f

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