summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog2
-rw-r--r--debian/rules29
2 files changed, 10 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index b64e113..eb5fe62 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,8 @@ gcc-4.9 (4.9.0-6) UNRELEASED; urgency=medium
* Fix the removal of the libstdc++6 package, removing byte-compiled pretty
printer files and pycache directories.
* Fix PR c++/61046, taken from the trunk. LP: #1313102.
+ * Fix installation of gcc-{ar,nm,ranlib} man pages for snapshot builds.
+ Closes: #745906.
-- Matthias Klose <doko@debian.org> Fri, 30 May 2014 15:34:10 +0200
diff --git a/debian/rules2 b/debian/rules2
index d868aa0..d71d221 100644
--- a/debian/rules2
+++ b/debian/rules2
@@ -1928,7 +1928,8 @@ ifeq ($(with_hppa64),yes)
fi
for i in ar nm ranlib; do \
- cp debian/gcc-$$i$(pkg_ver).1 $(d)/$(PF)/share/man/man1/$(cmd_prefix)gcc-$$i$(pkg_ver).1; \
+ cp debian/gcc-$$i-$(BASE_VERSION).1 \
+ $(d)/$(PF)/share/man/man1/hppa64-linux-gnu-gcc-$$i.1; \
done
: # remove files not needed from the hppa64 build
@@ -1967,6 +1968,12 @@ endif
install
ls -l $(d)/$(PF)/bin
+
+ for i in ar nm ranlib; do \
+ cp debian/gcc-$$i-$(BASE_VERSION).1 \
+ $(d)/$(PF)/share/man/man1/$(cmd_prefix)gcc-$$i.1; \
+ done
+
if [ ! -x $(d)/$(PF)/bin/$(TARGET_ALIAS)-gcc ]; then \
mv $(d)/$(PF)/bin/$(TARGET_ALIAS)-gcc-4* $(d)/$(PF)/bin/$(TARGET_ALIAS)-gcc; \
else \