[gcc-7] 226/354: * Move the liblto_plugin from the cpp to the gcc package.

[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 4944a6ec34157db561e9ff1fe6d496f07fbfb195
Author: doko <doko at 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca>
Date:   Tue Jun 27 11:21:02 2017 +0000

      * Move the liblto_plugin from the cpp to the gcc package.
    
    
    git-svn-id: svn+ssh://svn.debian.org/svn/gcccvs/branches/sid/gcc-7@9534 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca
---
 debian/changelog             | 6 ++++++
 debian/control               | 2 +-
 debian/control.m4            | 2 +-
 debian/rules.d/binary-cpp.mk | 3 +--
 debian/rules.d/binary-gcc.mk | 3 +++
 5 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f6d9854..dad06a7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+gcc-7 (7.1.0-7ubuntu1) UNRELEASED; urgency=medium
+
+  * Move the liblto_plugin from the cpp to the gcc package.
+
+ -- Matthias Klose <doko at debian.org>  Tue, 27 Jun 2017 13:19:14 +0200
+
 gcc-7 (7.1.0-7) unstable; urgency=medium
 
   * Update to SVN 20170618 (r249347) from the gcc-7-branch.
diff --git a/debian/control b/debian/control
index 06dc761..ba5a9b5 100644
--- a/debian/control
+++ b/debian/control
@@ -270,7 +270,7 @@ Depends: cpp-7 (= ${gcc:Version}), gcc-7-base (= ${gcc:Version}),
   binutils (>= ${binutils:Version}), 
   ${dep:libgccdev}, ${shlibs:Depends}, ${misc:Depends}
 Recommends: ${dep:libcdev}
-Replaces: gccgo-7 (<< ${gcc:Version})
+Replaces: gccgo-7 (<< ${gcc:Version}), cpp-7 (<< 7.1.1-8)
 Suggests: ${gcc:multilib}, gcc-7-doc (>= ${gcc:SoftVersion}),
  gcc-7-locales (>= ${gcc:SoftVersion}),
  libgcc1-dbg (>= ${libgcc:Version}),
diff --git a/debian/control.m4 b/debian/control.m4
index 45878b9..327fd59 100644
--- a/debian/control.m4
+++ b/debian/control.m4
@@ -686,7 +686,7 @@ Depends: cpp`'PV`'TS (= ${gcc:Version}),ifenabled(`gccbase',` BASEDEP,')
   binutils`'TS (>= ${binutils:Version}),
   ${dep:libgccdev}, ${shlibs:Depends}, ${misc:Depends}
 Recommends: ${dep:libcdev}
-Replaces: gccgo-7 (<< ${gcc:Version})
+Replaces: gccgo-7 (<< ${gcc:Version}), cpp`'PV`'TS (<< 7.1.1-8)
 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-cpp.mk b/debian/rules.d/binary-cpp.mk
index b38e42b..b3beba4 100644
--- a/debian/rules.d/binary-cpp.mk
+++ b/debian/rules.d/binary-cpp.mk
@@ -15,8 +15,7 @@ dirs_cpp = \
 
 files_cpp = \
 	$(PF)/bin/$(cmd_prefix)cpp$(pkg_ver) \
-	$(gcc_lexec_dir)/cc1 \
-	$(gcc_lexec_dir)/liblto_plugin.so{,.0,.0.0.0}
+	$(gcc_lexec_dir)/cc1
 
 ifneq ($(GFDL_INVARIANT_FREE),yes)
   files_cpp += \
diff --git a/debian/rules.d/binary-gcc.mk b/debian/rules.d/binary-gcc.mk
index f7dd40c..22a17d4 100644
--- a/debian/rules.d/binary-gcc.mk
+++ b/debian/rules.d/binary-gcc.mk
@@ -47,6 +47,9 @@ ifeq ($(with_libcc1_plugin),yes)
 	$(gcc_lib_dir)/plugin/libc[cp]1plugin.so{,.0,.0.0.0}
 endif
 
+files_gcc += \
+	$(gcc_lexec_dir)/liblto_plugin.so{,.0,.0.0.0}
+
 ifeq ($(DEB_STAGE),stage1)
     files_gcc += \
 	$(gcc_lib_dir)/include \

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