[Pkg-gdb-logs] [gdb] 02/10: Imported Debian patch 7.10-1.1

[Riku Voipio]

This is an automated email from the git hooks/post-receive script.

riku pushed a commit to annotated tag debian/7.11.1-2
in repository gdb.

commit e84efa0f42908e081c76ea6da5105b894be87c1d
Author: Andreas Bombe <aeb at debian.org>
Date:   Sat May 28 17:22:54 2016 +0200

    Imported Debian patch 7.10-1.1
---
 debian/changelog           |  7 +++++++
 debian/gdb-python2.install |  2 +-
 debian/rules               | 36 ++++++++++++++++++++++--------------
 3 files changed, 30 insertions(+), 15 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d96c393..b28c3f7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+gdb (7.10-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix build of gdb-python2 package (Closes: #798401)
+
+ -- Andreas Bombe <aeb at debian.org>  Sat, 28 May 2016 17:22:54 +0200
+
 gdb (7.10-1) unstable; urgency=medium
 
   * Imported Upstream version 7.10:
diff --git a/debian/gdb-python2.install b/debian/gdb-python2.install
index 9f20418..6747d0d 100644
--- a/debian/gdb-python2.install
+++ b/debian/gdb-python2.install
@@ -1,2 +1,2 @@
-usr/bin/gdb
+usr/bin/gcore
 usr/share/gdb
diff --git a/debian/rules b/debian/rules
index 55bb258..ebde65e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -236,9 +236,9 @@ clean::
 
 binary-post-install/gdb$(TS) ::
 	if [ -x debian/tmp/usr/bin/run ]; then				\
-		mv debian/tmp/usr/bin/run					\
+		install -m 755 debian/tmp/usr/bin/run					\
 		  debian/gdb$(TS)/usr/bin/$(DEB_TARGET_ALIAS)-run;		\
-		mv debian/tmp/usr/share/man/man1/run.1			\
+		install -m 644 debian/tmp/usr/share/man/man1/run.1			\
 		  debian/gdb$(TS)/usr/share/man/man1/$(DEB_TARGET_ALIAS)-run.1;	\
 	fi
 ifeq ($(run_tests),yes)
@@ -247,29 +247,37 @@ ifeq ($(run_tests),yes)
 		debian/gdb$(TS)/usr/share/doc/gdb/check.log
 endif
 
+ifneq ($(DEB_CROSS),yes)
+	# Only ship a global gdbinit for the native GDB.
+	install -d debian/gdb$(TS)/etc/gdb
+	install -m 644 debian/gdbinit debian/gdb$(TS)/etc/gdb/
+	# Likewise gdb-add-index
+	install -m 755 gdb/contrib/gdb-add-index.sh debian/gdb$(TS)/usr/bin/gdb-add-index
+endif
+
+	rm -f debian/gdb$(TS)/usr/bin/$(TP)gdbtui
+	install -m 755 debian/gdbtui debian/gdb$(TS)/usr/bin/$(TP)gdbtui
+
 binary-post-install/gdb-python2$(TS) ::
+	install -d debian/gdb-python24$(TS)/usr/bin
+	install -s -m 755 $(BUILDDIRPYTHON2)/gdb/gdb debian/gdb-python2$(TS)/usr/bin/gdb
 	if [ -x debian/tmp/usr/bin/run ]; then				\
-		mv debian/tmp/usr/bin/run					\
+		install -m 755 debian/tmp/usr/bin/run					\
 		  debian/gdb-python2$(TS)/usr/bin/$(DEB_TARGET_ALIAS)-run;		\
-		mv debian/tmp/usr/share/man/man1/run.1			\
+		install -m 644 debian/tmp/usr/share/man/man1/run.1			\
 		  debian/gdb-python2$(TS)/usr/share/man/man1/$(DEB_TARGET_ALIAS)-run.1;	\
 	fi
-ifeq ($(run_tests),yes)
-	install -d debian/gdb-python2$(TS)/usr/share/doc/gdb
-	install -m 644 $(DEB_BUILDDIR)/gdb/testsuite/gdb.sum \
-		debian/gdb-python2$(TS)/usr/share/doc/gdb/check.log
-endif
 
 ifneq ($(DEB_CROSS),yes)
 	# Only ship a global gdbinit for the native GDB.
-	install -d debian/gdb$(TS)/etc/gdb
-	install -m 644 debian/gdbinit debian/gdb$(TS)/etc/gdb/
+	install -d debian/gdb-python2$(TS)/etc/gdb
+	install -m 644 debian/gdbinit debian/gdb-python2$(TS)/etc/gdb/
 	# Likewise gdb-add-index
-	install -m 755 gdb/contrib/gdb-add-index.sh debian/gdb$(TS)/usr/bin/gdb-add-index
+	install -m 755 gdb/contrib/gdb-add-index.sh debian/gdb-python2$(TS)/usr/bin/gdb-add-index
 endif
 
-	rm -f debian/gdb$(TS)/usr/bin/$(TP)gdbtui
-	install -m 755 debian/gdbtui debian/gdb$(TS)/usr/bin/$(TP)gdbtui
+	rm -f debian/gdb-python2$(TS)/usr/bin/$(TP)gdbtui
+	install -m 755 debian/gdbtui debian/gdb-python2$(TS)/usr/bin/$(TP)gdbtui
 
 binary-post-install/gdb-multiarch ::
 	install -d debian/gdb-multiarch/usr/bin

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-gdb/gdb.git