tags 515425 + patch
tags 515425 + pending
thanks
Dear maintainer,
I've prepared an NMU for xxgdb (versioned as 1.12-16.1) and
uploaded it to DELAYED/14. Please feel free to tell me if I
should delay it longer, or if I should remove it from the
delayed upload queue. In addtion to the bug fix for #515425,
the upload contains some minimal "freshening" to the packaging
itself.
Regards.
Tony
diff -u xxgdb-1.12/debian/rules xxgdb-1.12/debian/rules
--- xxgdb-1.12/debian/rules
+++ xxgdb-1.12/debian/rules
@@ -5,9 +5,6 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-# This is the debhelper compatibility version to use.
-export DH_COMPAT=5
-
CFLAGS = -Wall -g
ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
CFLAGS += -O0
@@ -15,6 +12,13 @@
CFLAGS += -O2
endif
+export CC = gcc
+
+# Run manually when package is updated.
+get-changelog:
+ awk '/XXGDB history/,/___________/ {print} ' \
+ XXGDB_README > debian/upstream.changelog
+
build: build-stamp
build-stamp: patch
dh_testdir
@@ -29,7 +33,8 @@
clean1:
dh_testdir
dh_testroot
- dh_clean -k
+ dh_prep
+ dh_clean
# Add here commands to clean up after the build process.
test ! -f Makefile || { $(MAKE) clean && rm Makefile; }
@@ -37,7 +42,7 @@
install: build-stamp
dh_testdir
dh_testroot
- dh_clean -k
+ dh_prep
dh_installdirs usr/share/pixmaps/
# Add here commands to install the package into debian/<packagename>
@@ -67,7 +72,7 @@
dh_installman
dh_installinfo
# dh_undocumented
- dh_installchangelogs
+ dh_installchangelogs debian/upstream.changelog
dh_link
dh_strip
dh_compress
diff -u xxgdb-1.12/debian/copyright xxgdb-1.12/debian/copyright
--- xxgdb-1.12/debian/copyright
+++ xxgdb-1.12/debian/copyright
@@ -2,8 +2,9 @@
debugger, gdb.
This package was assembled by Helmut Geyer <helmut.ge...@iwr.uni-heidelberg.de>
-from the sources available from ftp.x.org (and its numerous
-mirrors) as /contrib/utilities/xxgdb-1.12.tar.gz
+from the sources available from:
+
+ ftp://ftp.x.org/contrib/utilities/xxgdb-1.12.tar.gz
/*****************************************************************************
*
diff -u xxgdb-1.12/debian/preinst xxgdb-1.12/debian/preinst
--- xxgdb-1.12/debian/preinst
+++ xxgdb-1.12/debian/preinst
@@ -1,4 +1,6 @@
-#!/bin/sh -e
+#!/bin/sh
+
+set -e
# Remove xaw-wrappers stuff.
if [ "$1" = upgrade ] && dpkg --compare-versions "$2" lt-nl 1.12-11; then
@@ -9,7 +11,7 @@
fi
if [ -x /usr/sbin/update-xaw-wrappers ]; then
- /usr/sbin/update-xaw-wrappers
+ update-xaw-wrappers
fi
fi
diff -u xxgdb-1.12/debian/control xxgdb-1.12/debian/control
--- xxgdb-1.12/debian/control
+++ xxgdb-1.12/debian/control
@@ -2,13 +2,13 @@
Section: devel
Priority: optional
Maintainer: Joey Schulze <j...@debian.org>
-Standards-Version: 3.7.3
-Build-Depends: debhelper (>= 5.0.31), dpatch, libxaw7-dev, libx11-dev,
- libxt-dev, x-dev, xutils, xutils-dev
+Standards-Version: 3.8.4
+Build-Depends: debhelper (>= 7.1), dpatch, libxaw7-dev, libx11-dev,
+ libxt-dev, x11proto-core-dev, xutils-dev
Package: xxgdb
Architecture: any
-Depends: gdb, ${shlibs:Depends}
+Depends: ${misc:Depends}, gdb, ${shlibs:Depends}
Description: An X front-end to the GNU debugger gdb
xxgdb is a simple but powerful graphical interface to the GNU
debugger gdb. A more powerful (but slower and much bigger) interface
diff -u xxgdb-1.12/debian/changelog xxgdb-1.12/debian/changelog
--- xxgdb-1.12/debian/changelog
+++ xxgdb-1.12/debian/changelog
@@ -1,3 +1,47 @@
+xxgdb (1.12-16.1) unstable; urgency=low
+
+ [ Jari Aalto ]
+ * Non-maintainer upload.
+ - Update to packaging format "3.0 (quilt)".
+ * debian/changelog
+ - Delete obsolete Emacs variables from the end.
+ * debian/clean
+ - Mew file.
+ * debian/compat
+ - Update to 7.
+ * debian/control
+ - (Build-Depends): update obsolete xutils to xutils-dev
+ and x-dev x11proto-core-dev (important; Closes: #515425).
+ Update to debhelper 7.1.
+ - (Depends): add ${misc:Depends}.
+ - (Standards-Version): update to 3.8.4.
+ * debian/copyright
+ - Write full upstream URL.
+ * debian/patches
+ - Convert dpatch into quilt.
+ - (Number 20): Fix manual page.
+ * debian/preinst
+ - Fix Lintian command-with-path-in-maintainer-script.
+ * debian/README.source
+ - New file.
+ * debian/preinst
+ - Arrange "set -e" differently for Lintian.
+ * debian/rules
+ - (CC): Add. Export variable for xmkmf(1).
+ - (DH_COMPAT): remove.
+ - (clean1, install): update dh_clean to dh_prep.
+ Add dh_clean.
+ Fix lintian debian-rules-ignores-make-clean-error.
+ - (get-changelog): New target.
+ * debian/source/format
+ - New file.
+ * debian/upstream.changelog
+ - New file. See debian/rule::get-changelog.
+ * debian/watch
+ - New file.
+
+ -- Jari Aalto <jari.aa...@cante.net> Tue, 11 May 2010 10:57:37 +0300
+
xxgdb (1.12-16) unstable; urgency=low
* Add dependency against xutils-dev, required after it was removed from
@@ -162,4 +205,0 @@
-
-Local variables:
-mode: debian-changelog
-End:
diff -u xxgdb-1.12/debian/patches/00list xxgdb-1.12/debian/patches/00list
--- xxgdb-1.12/debian/patches/00list
+++ xxgdb-1.12/debian/patches/00list
@@ -10,0 +11 @@
+020-xxgdb.man-fixes.dpatch
only in patch2:
unchanged:
--- xxgdb-1.12.orig/debian/upstream.changelog
+++ xxgdb-1.12/debian/upstream.changelog
@@ -0,0 +1,77 @@
+XXGDB history
+-------------
+
+ 1.0 December 1990.
+ 1.01 January 1991 (posted to comp.sources.x news group)
+ Fix bug with display command (when displaying
structures).
+ Fix bug with undisplay command (display window
went blank).
+ Add XXGDB no warranty message at start-up.
+ 1.02 February 1991.
+ Add source files selection in file button.
+ Special test for core file in file button.
+ Fix bug includeDir resource.
+ Fix bug source file directories.
+ Add patches for SUN-OS3.
+ Add strstr function in gdb_parser.c (with
#ifdef NEED_STRSTR)
+ Remove bad test for MIPS and BSD in case of GDB.
+ 1.03 April 1991
+ Miscellaneous patches for lint.
+ Port to SYSV + SCO +SYSV32.
+ Fix bug up/down/frame when arguments are on
several lines.
+ Fix bug in UpdateMessageWindow when arguments
are too long.
+ Fix bug define commands in .gdbinit or source
files
+ Add db_name and db_prompt option (GWC)
+ 1.04 May 1991
+ display command print all error messages (if
any).
+ fix bug display C structures.
+ several patches for more generic BSD machines
(JBL)
+ patches for NeXT because some GDB
incompatibilities.
+ display gdb messages when executing list
command.
+ fix problem scrolling symbols while scrolling
with keys (GWC).
+ fix bug displaying arrow when up/down in
recursive function.
+ 1.05 July - September 1991
+ Fix bug in search window.
+ Update for gdb 4.0 (PW)(SH).
+ 1.06 October 1991
+ Fix bug in creating more than 16 popup windows.
+ Edit defs.h for X11R5.
+ Remove xxgdb start-up error message with no
file specified.
+ Fix bug display arrays.
+ Port to SysVr4 and miscellaneous improvements
(MJH)
+ Fix bug for directories in filemenu (Norbert
Kiesel)
+ Fix bug pointers in arrays in popup windows.
+ Add option -nx for xxgdb.
+ Color for scrollbar is black in resource file.
+ Fix pb when no image file is loaded at startup
(Tom Pavel)
+ 1.07 February 1992
+ Fix problem xxgdb for NeXT because of test for
gdb-4.0.
+ Fix 'info break' problem with gdb 4.5 (Ken
Mandelberg)
+ New buttons and misc. improvements (Amir J.
Katz)(AJK)
+ 1.08 November 1993
+ Update for gdb 4.11.
+ Cleanup + Alpha port + NEW_INTERFACE from Dean
Michaels, TRLabs.
+ 1.09 April 1994
+ New -gdbinit resource and command line option
to specify init filename.
+ Fix problem 'Inappropriate ioctl for device' on
Solaris.
+ Fix bugs displaying C++ structures (Klamer).
+ Use reliable signals on SYSV (Iand).
+ Fix problem compiling with 'cc'.
+ 1.10 August 1994
+ Cleanup calldbx.c (svale...@mit.edu)
+ Add fix for Modula-2 (Norbert Kiesel)
+ Fix bug command too long for fputs.
+ Port to RS6000 (AIX 2.3 rs6000)
+ Add configurable tab widths (Matt Day
<m...@artisoft.com>)
+ 1.11 March 1995
+ Misc. updates.
+ 1.12 November 1995
+ Do not define signal for linux in signals.c
(schwe...@ito.uni-stuttgart.de)
+ In global.h define alloca only in certain cases.
+ Test for MAXPATHLEN already defined (in global.h)
+ Update Imakefile for different architectures
(philippe.def...@cern.ch)
+ Update for NeXT (d...@foxtrot.ccmrc.ucsb.edu)
+ Update for gdb-4.14 : different address format when
step/next/up/down.
+
+
+ --------------------------
+
only in patch2:
unchanged:
--- xxgdb-1.12.orig/debian/README.source
+++ xxgdb-1.12/debian/README.source
@@ -0,0 +1,7 @@
+Sources for Debian
+------------------
+
+This package uses patch system. See more information at
+/usr/share/doc/dpatch/README.source.gz
+
+ -- Jari Aalto <jari.aa...@cante.net>, Sun, 9 May 2010 21:42:19 +0300
only in patch2:
unchanged:
--- xxgdb-1.12.orig/debian/watch
+++ xxgdb-1.12/debian/watch
@@ -0,0 +1,3 @@
+version=3
+ftp://ftp.x.org/contrib/utilities/xxgdb-([\d.]+).tar.gz
+
only in patch2:
unchanged:
--- xxgdb-1.12.orig/debian/compat
+++ xxgdb-1.12/debian/compat
@@ -0,0 +1 @@
+7
only in patch2:
unchanged:
--- xxgdb-1.12.orig/debian/source/format
+++ xxgdb-1.12/debian/source/format
@@ -0,0 +1 @@
+1.0
only in patch2:
unchanged:
--- xxgdb-1.12.orig/debian/patches/020-xxgdb.man-fixes.dpatch
+++ xxgdb-1.12/debian/patches/020-xxgdb.man-fixes.dpatch
@@ -0,0 +1,50 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## /tmp/merge=020-xxgdb.man-fixes.patch.dpatch by Jari Aalto
<jari.aa...@cante.net>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: f4c
+## DP: Author: Jari Aalto <jari.aa...@cante.net>
+## DP:
+## DP:
+## DP: xxgdb.man: Fix hyphens
+
+...@dpatch@
+
+diff --git a/xxgdb.man b/xxgdb.man
+index 9ef9235..239e31c 100644
+--- a/xxgdb.man
++++ b/xxgdb.man
+@@ -15,12 +15,12 @@ variables and data structures, and to browse source files
and functions.
+ \fIXxgdb\fP allows initial gdb commands stored in the file \fI.gdbinit\fP
+ to be executed immediately after the symbolic information is
+ read. If \fI.gdbinit\fP does not exist in the current directory, the
+-user's home directory is searched (\fI~/.gdbinit\fP). Option -nx
+-can be used to prevent xxgdb from executing this file. Option -i
++user's home directory is searched (\fI\~/.gdbinit\fP). Option \-nx
++can be used to prevent xxgdb from executing this file. Option \-i
+ can be used to change the file name of command file.
+ .LP
+ \fIObjfile\fP is an object file produced by a compiler with the
+-appropriate option (-g) specified to produce symbol table
++appropriate option (\-g) specified to produce symbol table
+ information for gdb.
+ .LP
+ If a file named \fIcore\fP exists in the current directory or a
+@@ -38,7 +38,7 @@ the following xxgdb specific options:
+ Specify the name of the debugger to override the default "gdb".
+ WARNING : by default prompt is the name of the debugger enclosed in
+ parenthesis followed by a space. So if the prompt is still "(gdb) ",
+-you HAVE TO use -db_prompt "gdb"
++you HAVE TO use \-db_prompt "gdb"
+ .IP "-db_prompt promptstring"
+ Specify to xxgdb what is the debugger prompt. The default is to
+ expect the prompt to be the name of the debugger enclosed in
+@@ -47,7 +47,7 @@ parenthesis followed by a space (eg, "(gdb) ").
+ Specify the filename of initial gdb command file. The default
+ is ".gdbinit".
+ .IP -nx
+-Do not execute .gdbinit file (or file specified with -i)
++Do not execute .gdbinit file (or file specified with \-i)
+ .IP -bigicon
+ Uses a 64x64 icon instead of the default 48x48 icon.
+ .SH SUBWINDOWS
--
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
