Source: gdb
Source-Version: 7.3-1
Severity: wishlist
Tags: patch

Hi!

This package makes use of type-handling to generate the list of
architectures, but given that type-handling has been considered
deprecated for a while now it would be really nice if you could
apply the following patches for your next upload.

One is line wrapping cleanup, before the actual change. Another
is an unrelated cleanup I found while checking the package. And
the last one is the actual switch to architecture wildcards.

thanks,
guillem
>From 185719a0d92c73a8bef80738ef5904677fec1fdc Mon Sep 17 00:00:00 2001
From: Guillem Jover <[email protected]>
Date: Tue, 23 Aug 2011 22:47:49 +0200
Subject: [PATCH 1/3] Line wrap control fields

---
 debian/control.in |   14 +++++++++++---
 1 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/debian/control.in b/debian/control.in
index f89808c..e9b7a4b 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -3,12 +3,19 @@ Maintainer: Hector Oron <[email protected]>
 Section: devel
 Priority: optional
 Standards-Version: 3.8.4
-Build-Depends: autoconf, libtool, texinfo (>= 4.7-2.2), texlive-base, libncurses5-dev, libreadline-dev, bison, gettext, debhelper (>= 7), dejagnu, gcj-jdk | gcj, gobjc, mig [@gnu@], cdbs (>= 0.4.17), libkvm-dev [@kfreebsd@], type-handling (>= 0.2.1), libunwind7-dev [ia64], flex | flex-old, libexpat1-dev, g++-multilib [i386 powerpc s390 sparc], lib64readline6-dev [i386 powerpc s390 sparc], python-dev, zlib1g-dev, procps, lsb-release, bzip2
+Build-Depends: autoconf, libtool, texinfo (>= 4.7-2.2), texlive-base,
+ libncurses5-dev, libreadline-dev, bison, gettext, debhelper (>= 7),
+ dejagnu, gcj-jdk | gcj, gobjc, mig [@gnu@], cdbs (>= 0.4.17),
+ libkvm-dev [@kfreebsd@], type-handling (>= 0.2.1), libunwind7-dev [ia64],
+ flex | flex-old, libexpat1-dev, g++-multilib [i386 powerpc s390 sparc],
+ lib64readline6-dev [i386 powerpc s390 sparc], python-dev, zlib1g-dev,
+ procps, lsb-release, bzip2
 
 Package: gdb@TS@
 Architecture: any
 Section: devel
-Depends: ${shlibs:Depends}, ${misc:Depends}, gdbserver [amd64 armel i386 ia64 mips mipsel powerpc s390]
+Depends: ${shlibs:Depends}, ${misc:Depends},
+ gdbserver [amd64 armel i386 ia64 mips mipsel powerpc s390]
 Suggests: gdb-doc
 Description: The GNU Debugger
  GDB is a source-level debugger, capable of breaking programs at
@@ -61,7 +68,8 @@ Description: The GNU Debugger (remote server)
 Package: libgdb-dev
 Architecture: any
 Section: libdevel
-Depends: ${shlibs:Depends}, ${misc:Depends}, binutils-dev, libexpat1-dev, python-dev, zlib1g-dev, libncurses5-dev, libreadline-dev, gdb
+Depends: ${shlibs:Depends}, ${misc:Depends}, binutils-dev, libexpat1-dev,
+ python-dev, zlib1g-dev, libncurses5-dev, libreadline-dev, gdb
 Priority: extra
 Description: The GNU Debugger (libgdb.a)
  GDB is a source-level debugger, capable of breaking programs at
-- 
1.7.5.4

>From d6769d5496f07683a4d730f37b6b78e006abb7f2 Mon Sep 17 00:00:00 2001
From: Guillem Jover <[email protected]>
Date: Tue, 23 Aug 2011 22:50:02 +0200
Subject: [PATCH 2/3] Move source.lintian-overrides to debian/source/

---
 debian/source.lintian-overrides |    3 ---
 debian/source/lintian-overrides |    3 +++
 2 files changed, 3 insertions(+), 3 deletions(-)
 delete mode 100644 debian/source.lintian-overrides
 create mode 100644 debian/source/lintian-overrides

diff --git a/debian/source.lintian-overrides b/debian/source.lintian-overrides
deleted file mode 100644
index 8f2fb7f..0000000
--- a/debian/source.lintian-overrides
+++ /dev/null
@@ -1,3 +0,0 @@
-# We do not use the included readline.
-gdb source: outdated-autotools-helper-file readline/support/config.guess 2004-02-16
-gdb source: outdated-autotools-helper-file readline/support/config.sub 2004-02-16
diff --git a/debian/source/lintian-overrides b/debian/source/lintian-overrides
new file mode 100644
index 0000000..8f2fb7f
--- /dev/null
+++ b/debian/source/lintian-overrides
@@ -0,0 +1,3 @@
+# We do not use the included readline.
+gdb source: outdated-autotools-helper-file readline/support/config.guess 2004-02-16
+gdb source: outdated-autotools-helper-file readline/support/config.sub 2004-02-16
-- 
1.7.5.4

>From 245dd932e1414487c71937e4399ca95670f91bf7 Mon Sep 17 00:00:00 2001
From: Guillem Jover <[email protected]>
Date: Tue, 23 Aug 2011 22:58:05 +0200
Subject: [PATCH 3/3] Use architecture wildcards instead of the deprecated
 type-handling

---
 debian/control.in |    4 ++--
 debian/rules      |    2 --
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/debian/control.in b/debian/control.in
index e9b7a4b..a36f5fe 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -5,8 +5,8 @@ Priority: optional
 Standards-Version: 3.8.4
 Build-Depends: autoconf, libtool, texinfo (>= 4.7-2.2), texlive-base,
  libncurses5-dev, libreadline-dev, bison, gettext, debhelper (>= 7),
- dejagnu, gcj-jdk | gcj, gobjc, mig [@gnu@], cdbs (>= 0.4.17),
- libkvm-dev [@kfreebsd@], type-handling (>= 0.2.1), libunwind7-dev [ia64],
+ dejagnu, gcj-jdk | gcj, gobjc, mig [hurd-any], cdbs (>= 0.4.17),
+ libkvm-dev [kfreebsd-any], libunwind7-dev [ia64],
  flex | flex-old, libexpat1-dev, g++-multilib [i386 powerpc s390 sparc],
  lib64readline6-dev [i386 powerpc s390 sparc], python-dev, zlib1g-dev,
  procps, lsb-release, bzip2
diff --git a/debian/rules b/debian/rules
index 25d2b7d..2ff6f44 100755
--- a/debian/rules
+++ b/debian/rules
@@ -255,8 +255,6 @@ binary-post-install/gdb-source ::
 
 debian/control:: debian/control.in $(CROSS_FORCE)
 	cat debian/control.in \
-		| sed "s/@kfreebsd@/`type-handling any kfreebsd`/g" \
-		| sed "s/@gnu@/`type-handling any gnu`/g" \
 		| sed "s/@TS@/$(TS)/g" \
 		> debian/control
 ifeq ($(DEB_CROSS),yes)
-- 
1.7.5.4

Reply via email to