* Fix installation of the gnat upstream ChangeLog. Closes: #781451.

git-svn-id: svn://anonscm.debian.org/gcccvs/branches/sid/gcc-5@7931 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca

4 files changed, 13 insertions, 2 deletions

diff --git a/debian/changelog b/debian/changelog
index c87de77..a84dfbb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ gcc-5 (5-20150328-1) UNRELEASED; urgency=medium
   * Update to SVN 20150328.
   * Fix building the gnat-5-doc package.
   * Fix gnat build dependencies.
+  * Fix installation of the gnat upstream ChangeLog. Closes: #781451.
 
  -- Matthias Klose <doko@debian.org>  Sat, 28 Mar 2015 15:08:55 +0100
 
diff --git a/debian/control b/debian/control
index bb34cae..581f1ba 100644
--- a/debian/control
+++ b/debian/control
@@ -264,7 +264,8 @@ Depends: cpp-5 (= ${gcc:Version}), gcc-5-base (= ${gcc:Version}),
   binutils (>= ${binutils:Version}), 
   ${dep:libgccdev}, ${shlibs:Depends}, ${misc:Depends}
 Recommends: ${dep:libcdev}
-Replaces: gccgo-5 (<< ${gcc:Version}), gcc-5-plugin-dev (<< 5-20150321-1)
+Replaces: gccgo-5 (<< ${gcc:Version}), gcc-5-plugin-dev (<< 5-20150321-1),
+  gcc-5-base (<< 5-20150329-1)
 Suggests: ${gcc:multilib}, gcc-5-doc (>= ${gcc:SoftVersion}),
  gcc-5-locales (>= ${gcc:SoftVersion}),
  libgcc1-dbg (>= ${libgcc:Version}),
diff --git a/debian/control.m4 b/debian/control.m4
index 3b6efa9..f511f45 100644
--- a/debian/control.m4
+++ b/debian/control.m4
@@ -745,7 +745,8 @@ Depends: cpp`'PV`'TS (= ${gcc:Version}),ifenabled(`gccbase',` BASEDEP,')
   binutils`'TS (>= ${binutils:Version}),
   ${dep:libgccdev}, ${shlibs:Depends}, ${misc:Depends}
 Recommends: ${dep:libcdev}
-Replaces: gccgo-5 (<< ${gcc:Version}), gcc`'PV-plugin-dev`'TS (<< 5-20150321-1)
+Replaces: gccgo-5 (<< ${gcc:Version}), gcc`'PV-plugin-dev`'TS (<< 5-20150321-1),
+  gcc-5-base (<< 5-20150329-1)
 Suggests: ${gcc:multilib}, gcc`'PV-doc (>= ${gcc:SoftVersion}),
  gcc`'PV-locales (>= ${gcc:SoftVersion}),
  libdbgdep(gcc`'GCC_SO-dbg,,>=,${libgcc:Version}),
diff --git a/debian/rules.d/binary-ada.mk b/debian/rules.d/binary-ada.mk
index 8d7b241..db35be9 100644
--- a/debian/rules.d/binary-ada.mk
+++ b/debian/rules.d/binary-ada.mk
@@ -262,7 +262,12 @@ $(binary_stamp)-ada: $(binary_stamp)-libgnatprj
 else
 $(binary_stamp)-ada: $(install_stamp)
 endif
+
+ifeq ($(with_separate_gnat),yes)
 $(binary_stamp)-ada: $(binary_stamp)-gnatbase
+else
+$(binary_stamp)-ada:
+endif
 	dh_testdir
 	dh_testroot
 	mv $(install_stamp) $(install_stamp)-tmp
@@ -306,6 +311,9 @@ ifeq ($(PKGSOURCE),gnat-$(BASE_VERSION))
   ifeq ($(with_check),yes)
 	cp -p test-summary $(d_gnat)/$(docdir)/$(p_gbase)/.
   endif
+else
+	mkdir -p $(d_gnat)/$(docdir)/$(p_gbase)/ada
+	cp -p src/gcc/ada/ChangeLog $(d_gnat)/$(docdir)/$(p_gbase)/ada/.
 endif
 	for i in $(GNAT_TOOLS); do \
 	  case "$$i" in \