* Move the libstdc++ gdb pretty printers into libstdc++6, install the

    -gdb.py files into /usr/share/gdb/auto-load.



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

4 files changed, 27 insertions, 10 deletions

diff --git a/debian/changelog b/debian/changelog
index e8feeda..8cbaaf7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,8 @@ gcc-4.8 (4.8.2-22) UNRELEASED; urgency=medium
   * Ensure that the common libs (built from the next GCC version) are
     available when building without common libs.
   * Fix java.security symlink in libgcj14. Closes: #746786.
+  * Move the libstdc++ gdb pretty printers into libstdc++6, install the
+    -gdb.py files into /usr/share/gdb/auto-load.
 
  -- Matthias Klose <doko@debian.org>  Mon, 05 May 2014 20:29:25 +0200
 
diff --git a/debian/control.m4 b/debian/control.m4
index 88c6638..a9dad72 100644
--- a/debian/control.m4
+++ b/debian/control.m4
@@ -3158,6 +3158,7 @@ Pre-Depends: multiarch-support
 Breaks: ${multiarch:breaks}
 ')`Provides: libstdc++'CXX_SO`-armel [armel], libstdc++'CXX_SO`-armhf [armhf]')
 Conflicts: scim (<< 1.4.2-1)
+Replaces: libstdc++CXX_SO`'PV-dbg`'LS (<< 4.8.2-22)
 BUILT_USING`'dnl
 Description: GNU Standard C++ Library v3`'ifdef(`TARGET)',` (TARGET)', `')
  This package contains an additional runtime library for C++ programs
diff --git a/debian/libstdc++CXX.prerm b/debian/libstdc++CXX.prerm
new file mode 100644
index 0000000..65bcb3e
--- /dev/null
+++ b/debian/libstdc++CXX.prerm
@@ -0,0 +1,11 @@
+#! /bin/sh
+
+set -e
+
+case "$1" in
+    remove)
+	files=$(dpkg -L libstdc++@CXX@ | awk -F/ 'BEGIN {OFS="/"} /\.py$/ {$NF=sprintf("__pycache__/%s.*.py[co]", substr($NF,1,length($NF)-3)); print}')
+	rm -f $files
+esac
+
+#DEBHELPER#
diff --git a/debian/rules.d/binary-libstdcxx.mk b/debian/rules.d/binary-libstdcxx.mk
index 3359019..53cc469 100644
--- a/debian/rules.d/binary-libstdcxx.mk
+++ b/debian/rules.d/binary-libstdcxx.mk
@@ -126,11 +126,6 @@ dirs_dbg = \
 files_dbg = \
 	$(usr_lib)/debug/libstdc++.{a,so*}
 
-ifneq ($(DEB_CROSS),yes)
-  dirs_dbg  += $(PF)/share/gcc-$(BASE_VERSION)/python
-  files_dbg += $(PF)/share/gcc-$(BASE_VERSION)/python/libstdcxx
-endif
-
 dirs_pic = \
 	$(docdir) \
 	$(gcc_lib_dir)
@@ -184,7 +179,19 @@ define __do_libstdcxx
 
 	dh_installdirs -p$(p_l) \
 		$(docdir) \
-		$(usr_lib$(2))
+		$(usr_lib$(2)) \
+		$(PF)/share/gdb/auto-load/$(usr_lib$(2))
+
+	$(if $(2),,
+	dh_installdirs -p$(p_l) \
+		$(PF)/share/gcc-$(BASE_VERSION)/python
+	DH_COMPAT=2 dh_movefiles -p$(p_l) \
+		$(PF)/share/gcc-$(BASE_VERSION)/python/libstdcxx
+	)
+	cp -p $(d)/$(usr_lib$(2))/libstdc++.so.*.py \
+		$(d_l)/$(PF)/share/gdb/auto-load/$(usr_lib$(2))/.
+	sed -i -e "/^libdir *=/s,=.*,= '/$(usr_lib$(2))'," \
+		$(d_l)/$(PF)/share/gdb/auto-load/$(usr_lib$(2))/libstdc++.so.*.py
 
 	cp -a $(d)/$(usr_lib$(2))/libstdc++.so.*[0-9] \
 		$(d_l)/$(usr_lib$(2))/.
@@ -221,10 +228,6 @@ define __do_libstdcxx_dbg
 		$(PF)/lib/debug/$(usr_lib$(2)) \
 		$(usr_lib$(2))
 
-	cp -p $(d)/$(usr_lib$(2))/libstdc++.so.*.py \
-		$(d_d)/$(PF)/lib/debug/$(usr_lib$(2))/.
-	sed -i -e "/^libdir *=/s,=.*,= '/$(usr_lib$(2))'," \
-		$(d_d)/$(PF)/lib/debug/$(usr_lib$(2))/libstdc++.so.*.py
 	$(if $(filter yes,$(with_lib$(2)cxx)),
 		cp -a $(d)/$(usr_lib$(2))/libstdc++.so.*[0-9] \
 			$(d_d)/$(usr_lib$(2))/.;