[Pkg-gdb-logs] [gdb] 05/05: debian: manually sync master with my changes

[Riku Voipio]

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

riku pushed a commit to branch master
in repository gdb.

commit 20f2c938acbfddc497ee505287eb33e9f319be9d
Author: Riku Voipio <riku.voipio at linaro.org>
Date:   Tue Aug 2 16:33:00 2016 +0300

    debian: manually sync master with my changes
    
    since I accidentally made my changes to pkg-gdb.git
    instead of gdb.git, these changes had to manually merged.
    See the git tag debian/7.11.1-2 for what actually was
    the git history.
    
    Signed-off-by: Riku Voipio <riku.voipio at linaro.org>
---
 debian/changelog           | 20 +++++++++++++++++++
 debian/gdb-python2.install |  2 +-
 debian/rules               | 48 +++++++++++++++++++++++++++++-----------------
 3 files changed, 51 insertions(+), 19 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d96c393..4f441a9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,23 @@
+gdb (7.11.1-2) unstable; urgency=medium
+
+  * Fix build when run.1 is missing
+
+ -- Riku Voipio <riku.voipio at linaro.org>  Fri, 17 Jun 2016 15:43:34 +0300
+
+gdb (7.11.1-1) unstable; urgency=medium
+
+  * New upstream version
+  * Ack NMU, Fixed gdb-python, thanks Andreas!
+
+ -- Riku Voipio <riku.voipio at linaro.org>  Thu, 16 Jun 2016 14:49:19 +0300
+
+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 a90bd77..d15d44f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -233,11 +233,13 @@ clean::
 	find bfd -name bfd.info\* | xargs --no-run-if-empty touch
 
 binary-post-install/gdb$(TS) ::
-	if [ -x debian/tmp/usr/bin/run ]; then				\
-		mv debian/tmp/usr/bin/run					\
-		  debian/gdb$(TS)/usr/bin/$(DEB_TARGET_ALIAS)-run;		\
-		mv debian/tmp/usr/share/man/man1/run.1			\
-		  debian/gdb$(TS)/usr/share/man/man1/$(DEB_TARGET_ALIAS)-run.1;	\
+	if [ -x debian/tmp/usr/bin/run ]; then \
+		mv debian/tmp/usr/bin/run \
+		  debian/gdb$(TS)/usr/bin/$(DEB_TARGET_ALIAS)-run; \
+	fi
+	if [ -r debian/tmp/usr/share/man/man1/run.1 ]; then \
+		mv 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)
 	install -d debian/gdb$(TS)/usr/share/doc/gdb
@@ -245,19 +247,6 @@ ifeq ($(run_tests),yes)
 		debian/gdb$(TS)/usr/share/doc/gdb/check.log
 endif
 
-binary-post-install/gdb-python2$(TS) ::
-	if [ -x debian/tmp/usr/bin/run ]; then				\
-		mv debian/tmp/usr/bin/run					\
-		  debian/gdb-python2$(TS)/usr/bin/$(DEB_TARGET_ALIAS)-run;		\
-		mv 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
@@ -269,6 +258,29 @@ 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  \
+		install -m 755 debian/tmp/usr/bin/run \
+		  debian/gdb-python2$(TS)/usr/bin/$(DEB_TARGET_ALIAS)-run; \
+	fi
+	if [ -r debian/tmp/usr/share/man/man1/run.1 ]; then  \
+		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
+
+ifneq ($(DEB_CROSS),yes)
+	# Only ship a global gdbinit for the native 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-python2$(TS)/usr/bin/gdb-add-index
+endif
+
+	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
 	install -s -m 755 $(BUILDDIRMULTIARCH)/gdb/gdb debian/gdb-multiarch/usr/bin/gdb-multiarch

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