The unified diff between revisions [cc3a9d71..] and [4fb27e8b..] is displayed below. It can also be downloaded as a raw diff.
#
#
# delete "debian/273581.patch"
#
# delete "debian/286822.patch"
#
# delete "debian/287484.patch"
#
# delete "debian/326497.patch"
#
# delete "debian/326499.patch"
#
# delete "debian/arm.patch"
#
# delete "debian/powerpc.patch"
#
# add_dir "patches"
#
# add_file "patches/13.use-dynamic-readline.patch"
# content [45e531a224805d03205f730bcb302d2f59361b52]
#
# add_file "patches/series"
# content [bf11942cf0ee64b829a7986ff00a0b442e1de61e]
#
# patch "debian/README.Debian"
# from [1dfba862a2ecfbee9f4c295596bf454b8f8ac8e4]
# to [440ce249c0f805b1210c5c904e42c5a663153622]
#
# patch "debian/changelog"
# from [623e757e366a0ecfc384cc72c0fde6ffc328278d]
# to [61903bf88c3c3f668e632592e8a0fe997ab9b613]
#
# patch "debian/control"
# from [a934fd4d89177aa193ffb7e6a5f7a546a612090d]
# to [0728e3f59ced9c53e69674bb8e17c32e080eee69]
#
# patch "debian/rules"
# from [dfda2cdc5d9e82a194df7cf73be8fac22d8e5a7b]
# to [0347afa2336fd19a4c2f1c0113d0c54e09f32681]
#
============================================================
--- patches/13.use-dynamic-readline.patch 45e531a224805d03205f730bcb302d2f59361b52
+++ patches/13.use-dynamic-readline.patch 45e531a224805d03205f730bcb302d2f59361b52
@@ -0,0 +1,29 @@
+Debian local - Use system readline to build.
+
+It would be nice to add a configure argument for this upstream.
+
+Index: gdb/Makefile.in
+===================================================================
+--- gdb/Makefile.in.orig 2006-05-11 11:15:14.000000000 -0400
++++ gdb/Makefile.in 2006-05-11 11:15:17.000000000 -0400
+@@ -122,10 +122,16 @@ BFD_SRC = $(srcdir)/$(BFD_DIR)
+ BFD_CFLAGS = -I$(BFD_DIR) -I$(BFD_SRC)
+
+ # Where is the READLINE library? Typically in ../readline.
+-READLINE_DIR = ../readline
+-READLINE = $(READLINE_DIR)/libreadline.a
+-READLINE_SRC = $(srcdir)/$(READLINE_DIR)
+-READLINE_CFLAGS = -I$(READLINE_SRC)/..
++#READLINE_DIR = ../readline
++#READLINE = $(READLINE_DIR)/libreadline.a
++#READLINE_SRC = $(srcdir)/$(READLINE_DIR)
++#READLINE_CFLAGS = -I$(READLINE_SRC)/..
++#
++# Debian has a perfectly fine readline - use it.
++READLINE_SRC=/usr/include/readline
++READLINE=-lreadline
++READLINE_CFLAGS=
++READLINE_DIR=
+
+ WARN_CFLAGS = @WARN_CFLAGS@
+ WERROR_CFLAGS = @WERROR_CFLAGS@
============================================================
--- patches/series bf11942cf0ee64b829a7986ff00a0b442e1de61e
+++ patches/series bf11942cf0ee64b829a7986ff00a0b442e1de61e
@@ -0,0 +1 @@
+13.use-dynamic-readline.patch -p0
============================================================
--- debian/README.Debian 1dfba862a2ecfbee9f4c295596bf454b8f8ac8e4
+++ debian/README.Debian 440ce249c0f805b1210c5c904e42c5a663153622
@@ -1,32 +1,14 @@
-The package gnat-gdb contains GDB 5.3 with patches from Ada Core
-Technologies. These patches make GDB Ada-aware, in addition to the
-other languages already supported by GDB. The user's guide (in
-package gnat-gdb-doc) provides details on this support for Ada.
+This is GDB 6.4 with patches from AdaCore, as it was released as part
+of GNAT GPL 2006 Edition. It replaces the patched GDB 5.3 that was
+shipped in Sarge.
-It is also possible to use the regular GDB to debug Ada programs; the
-Ada-aware GDB only provides some additional support.
+Debian carries gdb 6.4.90 (the "FSF GDB") and gnat-gdb 6.4+2006 (the
+"AdaCore GDB"). Both can debug Ada programs, but the AdaCore GDB has
+better support for breakpoints, in particular in the area of generics,
+and also has some minor improvements and fixes.
-Starting with GCC 3.4, the default format for debugging information
-changed from STABS to DWARF2. This implies that Ada programs compiled
-with gnat-3.4 or gnat-4.0 will use DWARF2 by default. GDB 5.3 does
-not support this format; if you want to use it to debug Ada programs
-compiled with gnat-3.4 or gnat-4.0, you must pass the option -gstabs+
-to gcc when compiling. This causes GCC to use the older format for
-debugging information. For example:
+It is recommended to use this package to debug Ada programs,
+especially if your program uses generics.
-$ gnatmake -g -gstabs+ program
-$ gnatgdb program
-
-The Ada compilers in packages gnat and gnat-3.3 work out of the box
-without the need for -gstabs+.
-
-GDB 5.3 also does not support the New POSIX Thread Library (NPTL),
-which is enabled by default on linux >= 2.6 and glibc >= 2.3. If you
-have such a system, you must disable NPTL by setting the environment
-variable LD_ASSUME_KERNEL to a value such as 2.4.1. For example:
-
-$ gnatmake -g program
-$ LD_ASSUME_KERNEL=2.4.1 gnatgdb program
-
--
-Ludovic Brenta Mon, 5 Sep 2005 21:12:22 +0200
+Ludovic Brenta, 2006-10-05
============================================================
--- debian/changelog 623e757e366a0ecfc384cc72c0fde6ffc328278d
+++ debian/changelog 61903bf88c3c3f668e632592e8a0fe997ab9b613
@@ -1,3 +1,32 @@
+gnat-gdb (6.4+2006-1) unstable; urgency=low
+
+ * New upstream version:
+ GDB 6.4 with AdaCore patches from GNAT GPL 2006 Edition.
+ * debian/control (Maintainer): update my email address, I'm now a full DD.
+ (Uploaders): remove.
+ (Build-Depends): add quilt, libreadline5-dev, libtool.
+ (Standards-Version): update to 3.7.2.
+ (Architecture): add kfreebsd-i386.
+ (gnat-gdb): simply Recommend gnat, remove the variable.
+ * debian/arm.patch,
+ debian/powerpc.patch,
+ debian/326499.patch,
+ debian/326497.patch,
+ debian/287484.patch,
+ debian/286822.patch,
+ debian/273581.patch: remove.
+ * Remove the documentation, as it is non-DFSG-free due to invariant
+ sections.
+ * patches/13.use-dynamic-readline.patch: new, copied from gdb (= 6.4.90dfsg-1).
+ Thanks to Daniel Jacobowitz for this.
+ * patches/series: new.
+ * debian/rules:
+ - use quilt to apply and revert patches.
+ - do not build the documentation.
+ - (recommended_gnat, build-stamp): remove.
+
+ -- Ludovic Brenta <lbrenta@debian.org> Thu, 5 Oct 2006 19:17:34 +0200
+
gnat-gdb (5.3.gnat.0.0.20030225-12) unstable; urgency=low
* debian/control: disable build on m68k; gnat is not supported on m68k
============================================================
--- debian/control a934fd4d89177aa193ffb7e6a5f7a546a612090d
+++ debian/control 0728e3f59ced9c53e69674bb8e17c32e080eee69
@@ -1,29 +1,19 @@ Priority: optional
Source: gnat-gdb
Section: devel
Priority: optional
-Maintainer: Ludovic Brenta <ludovic@ludovic-brenta.org>
-Uploaders: Matthias Klose <doko@debian.org>
-Build-Depends: debhelper (>> 4.1.0), libncurses5-dev, bison, texinfo, gettext
-Standards-Version: 3.6.2
+Maintainer: Ludovic Brenta <lbrenta@debian.org>
+Build-Depends: debhelper (>> 4.1.0), libncurses5-dev, bison, texinfo, gettext, libreadline5-dev, quilt, libtool
+Standards-Version: 3.7.2
Package: gnat-gdb
-Architecture: alpha amd64 arm i386 ia64 mips mipsel powerpc s390 sparc
-Recommends: ${recommended:gnat}, gnat-gdb-doc
-Depends: ${shlibs:Depends} ${misc:Depends}
+Architecture: alpha amd64 arm i386 ia64 kfreebsd-i386 mips mipsel powerpc s390 sparc
+Recommends: gnat, gnat-gdb-doc
+Depends: ${shlibs:Depends}
Description: Ada-aware version of GDB
- This is a version of GDB 5.3 that allows debugging of programs written in Ada
- 95. It consists of GDB 5.3 with patches contributed by Ada Core Technologies,
- the company behind GNAT. Note that ACT considers this version to be
- beta-quality.
- .
- You can use this debugger against programs compiled with gnat, gnat-3.3,
- gnat-3.4, or gnat-4.0 (but see the README.Debian for caveats related to
- gnat-3.4 and gnat-4.0).
-
-Package: gnat-gdb-doc
-Architecture: all
-Section: doc
-Description: Documentation for the Ada-aware version of GDB
- This package contains the documentation for GDB 5.3, with additional
- information on how to debug Ada programs. The documentation is in info,
- HTML and plain text.
+ This is GDB 6.4 with patches from AdaCore, as it was released as part
+ of GNAT GPL 2006 Edition. It has better support for breakpoints, in
+ particular in the area of generics, and also has some minor
+ improvements and fixes.
+.
+ It is recommended to use this package to debug Ada programs,
+ especially if your program uses generics.
============================================================
--- debian/rules dfda2cdc5d9e82a194df7cf73be8fac22d8e5a7b
+++ debian/rules 0347afa2336fd19a4c2f1c0113d0c54e09f32681
@@ -1,6 +1,6 @@
#!/usr/bin/make -f
# debian/rules file to build gnat-gdb
-# Copyright (c) 2003, 2004 Ludovic Brenta <ludovic.brenta@insalien.org>
+# Copyright (c) 2003, 2004, 2006 Ludovic Brenta <lbrenta@debian.org>
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
@@ -12,33 +12,13 @@ ARCH := $(shell dpkg-architecture -qDEB_
DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
ARCH := $(shell dpkg-architecture -qDEB_HOST_ARCH)
-ifneq (,$(findstring $(ARCH),i386 powerpc sparc))
- recommended_gnat := gnat
-endif
-ifneq (,$(findstring $(ARCH),alpha amd64 hppa ia64 mips mipsel s390))
- recommended_gnat := gnat-3.4
-endif
-ifneq (,$(findstring $(ARCH),arm m68k))
- recommended_gnat :=
-endif
+patch:
+ -quilt push -a
-patch-stamp:
- for i in debian/*.patch; do \
- echo Applying $$i; \
- patch --forward -p0 < $$i; \
- done
- touch patch-stamp
-
unpatch:
- if [ -f patch-stamp ] ; then \
- for i in debian/*.patch; do \
- echo Reverting $$i; \
- patch --reverse -p0 < $$i; \
- done; \
- rm patch-stamp; \
- fi
+ -quilt pop -a
-debian/build/config.status: configure
+debian/build/config.status: patch configure
dh_testdir
-mkdir debian/build
cd debian/build && \
@@ -49,53 +29,28 @@ debian/build/config.status: configure
--mandir=\$${prefix}/share/man \
--infodir=\$${prefix}/share/info
-build: build-stamp
-
-build-stamp: patch-stamp debian/build/config.status
+build: debian/build/config.status
dh_testdir
$(MAKE) -C debian/build
- $(MAKE) -C debian/build/gdb/doc info MAKEINFO="makeinfo --no-split"
- mv debian/build/gdb/doc/gdb.info debian/build/gdb/doc/gnatgdb.info
- cd debian/build/gdb/doc && \
- makeinfo --no-headers --no-split -o gnatgdb.txt gdb.texinfo \
- -I../../../../gdb/doc \
- -I../../../../gdb/mi \
- -I../../../../readline/doc
- cd debian/build/gdb/doc && \
- makeinfo --html -o gnatgdb gdb.texinfo \
- -I../../../../gdb/doc \
- -I../../../../gdb/mi \
- -I../../../../readline/doc
- touch build-stamp
clean: unpatch
dh_testdir
dh_testroot
- rm -f build-stamp
rm -rf debian/build
find . -name '*.gmo' -exec rm {} \;
dh_clean
-install: build-stamp
+install: build
dh_testdir
dh_testroot
dh_clean -k
dh_installdirs -pgnat-gdb usr/bin usr/share/man/man1
mv debian/build/gdb/gdb debian/gnat-gdb/usr/bin/gnatgdb
cp -p gdb/gdb.1 debian/gnat-gdb/usr/share/man/man1/gnatgdb.1
- : # The doc package
- dh_installdirs -pgnat-gdb-doc usr/share/doc/gnat-gdb usr/share/info
- dh_installdocs -pgnat-gdb-doc debian/build/gdb/doc/gnatgdb
- dh_installdocs -pgnat-gdb-doc debian/build/gdb/doc/gnatgdb.txt
- dh_installinfo -pgnat-gdb-doc debian/build/gdb/doc/gnatgdb.info
+binary-indep: build install
-# Build architecture-independent files here.
-binary-indep: build-stamp install
-# We have nothing to do by default.
-
-# Build architecture-dependent files here.
-binary-arch: build-stamp install
+binary-arch: build install
dh_testdir
dh_testroot
dh_installchangelogs ChangeLog
@@ -106,7 +61,7 @@ binary-arch: build-stamp install
dh_fixperms
dh_installdeb
dh_shlibdeps
- dh_gencontrol -Vrecommended:gnat=$(recommended_gnat)
+ dh_gencontrol
dh_md5sums
dh_builddeb