[Pkg-gdb-logs] [gdb] 02/03: d/{control*, gdb64*, rules}: drop gdb64 support.

[Hector Oron]

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

zumbi pushed a commit to branch master
in repository gdb.

commit 9edbeb9644852a3e974b0a99c61f771d6e3cbb8b
Author: Héctor Orón Martínez <zumbi at debian.org>
Date:   Thu Jan 22 02:17:15 2015 +0100

    d/{control*,gdb64*,rules}: drop gdb64 support.
    
    Signed-off-by: Héctor Orón Martínez <zumbi at debian.org>
---
 debian/control                 | 14 --------------
 debian/control.in              | 14 --------------
 debian/gdb64.lintian-overrides |  2 --
 debian/gdb64.postinst          | 13 -------------
 debian/rules                   | 16 +---------------
 5 files changed, 1 insertion(+), 58 deletions(-)

diff --git a/debian/control b/debian/control
index de44a29..c012d9c 100644
--- a/debian/control
+++ b/debian/control
@@ -92,20 +92,6 @@ Description: GNU Debugger (minimal version)
  This package contains a minimal version of GDB with optional features
  disabled.
 
-Package: gdb64
-Architecture: i386 powerpc s390 sparc
-Replaces: gdb-multiarch (<< 7.6-1)
-Depends: gdb (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
-Description: GNU Debugger (64-bit)
- GDB is a source-level debugger, capable of breaking programs at
- any specific line, displaying variable values, and determining
- where errors occurred. Currently, gdb supports C, C++, D,
- Objective-C, Fortran, Java, OpenCL C, Pascal, assembly, Modula-2,
- Go, and Ada. A must-have for any serious programmer.
- .
- This package contains a version of GDB compiled for a 64-bit variant
- of its architecture.
-
 Package: gdb-multiarch
 Architecture: any
 Depends: gdb (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
diff --git a/debian/control.in b/debian/control.in
index ec460cf..8a1e07c 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -92,20 +92,6 @@ Description: GNU Debugger (minimal version)
  This package contains a minimal version of GDB with optional features
  disabled.
 
-Package: gdb64
-Architecture: i386 powerpc s390 sparc
-Replaces: gdb-multiarch (<< 7.6-1)
-Depends: gdb (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
-Description: GNU Debugger (64-bit)
- GDB is a source-level debugger, capable of breaking programs at
- any specific line, displaying variable values, and determining
- where errors occurred. Currently, gdb supports C, C++, D,
- Objective-C, Fortran, Java, OpenCL C, Pascal, assembly, Modula-2,
- Go, and Ada. A must-have for any serious programmer.
- .
- This package contains a version of GDB compiled for a 64-bit variant
- of its architecture.
-
 Package: gdb-multiarch
 Architecture: any
 Depends: gdb (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
diff --git a/debian/gdb64.lintian-overrides b/debian/gdb64.lintian-overrides
deleted file mode 100644
index a2de989..0000000
--- a/debian/gdb64.lintian-overrides
+++ /dev/null
@@ -1,2 +0,0 @@
-# Yes, this is *supposed* to be from another architecture
-binary-from-other-architecture usr/bin/gdb64
diff --git a/debian/gdb64.postinst b/debian/gdb64.postinst
deleted file mode 100755
index 3d2725c..0000000
--- a/debian/gdb64.postinst
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh
-set -e
-
-# Replace documentation directory with symlink
-if [ -d /usr/share/doc/gdb64 ] && [ ! -L /usr/share/doc/gdb64 ]; then
-    if rmdir /usr/share/doc/gdb64 2>/dev/null; then
-        ln -sf gdb /usr/share/doc/gdb64
-    fi
-fi
-
-#DEBHELPER#
-
-exit 0
diff --git a/debian/rules b/debian/rules
index c7f498a..d1a5e62 100755
--- a/debian/rules
+++ b/debian/rules
@@ -218,14 +218,6 @@ build-python2-stamp:
 	cd $(BUILDDIRPYTHON2) && $(DEB_MAKE_ENVVARS) $(MAKE) $(NJOBS)
 	touch $@
 
-build/gdb64:: build64-stamp
-build64-stamp:
-	mkdir -p $(BUILDDIR64)
-	cd $(BUILDDIR64) && CC="$(CC64)" CFLAGS="$(CFLAGS64)" AR=ar \
-	  $(shell pwd)/configure $(DEB_CONFIGURE_NORMAL_ARGS) $(DEB_CONFIGURE_DEBUG_ARGS) $(DEB_CONFIGURE_FLAGS_64)
-	cd $(BUILDDIR64) && $(DEB_MAKE_ENVVARS) $(MAKE) $(NJOBS)
-	touch $@
-
 build/gdb-multiarch:: build-multiarch-stamp
 build-multiarch-stamp:
 	mkdir -p $(BUILDDIRMULTIARCH)
@@ -302,12 +294,6 @@ 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/gdb64 ::
-	install -d debian/gdb64/usr/bin
-	install -s -m 755 $(BUILDDIR64)/gdb/gdb debian/gdb64/usr/bin/gdb64
-	rm -rf debian/gdb64/usr/share/doc/gdb64
-	ln -s gdb debian/gdb64/usr/share/doc/gdb64
-
 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
@@ -346,7 +332,7 @@ debian/control:: debian/control.in $(CROSS_FORCE)
 		| sed "s/@TS@/$(TS)/g" \
 		> debian/control
 ifeq ($(DEB_CROSS),yes)
-	sed -i "/Package: gdb64/,\$$ d" -i "/Package: gdb-multiarch/,\$$ d" debian/control
+	sed -i "/Package: gdb-multiarch/,\$$ d" debian/control
 	sed "s+/gdb+/$(TP)gdb+g; s+usr/share/$(TP)gdb+usr/share/gdb$(TS)+g" \
 		debian/gdb.install > debian/gdb$(TS).install
 	sed "s+/gdb+/$(TP)gdb+g; s+usr/share/$(TP)gdb+usr/share/gdb-python2$(TS)+g" \

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