Package: ddd
Version: 1:3.3.12-2.1
Followup-For: Bug #646170
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu precise ubuntu-patch

In Debian sid, the attached patch can be applied to achieve the following:

  * termcap.diff: Look for libtinfo first. Fixes FTBFS. (Closes: #646170)
  * Build-depend on info as well. Thanks, Sven Joachim!


Thanks for considering the patch.


-- System Information:
Debian Release: wheezy/sid
  APT prefers oneiric-updates
  APT policy: (500, 'oneiric-updates'), (500, 'oneiric-security'), (500, 
'oneiric-proposed'), (500, 'oneiric')
Architecture: amd64 (x86_64)

Kernel: Linux 3.0.0-12-generic (SMP w/8 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -Nru ddd-3.3.12/debian/control ddd-3.3.12/debian/control
--- ddd-3.3.12/debian/control	2011-07-08 12:35:07.000000000 -0400
+++ ddd-3.3.12/debian/control	2011-10-29 18:05:58.000000000 -0400
@@ -1,7 +1,7 @@
 Source: ddd
 Section: devel
 Priority: optional
-Build-Depends: automake (>= 1:1.10), bison, cdbs (>= 0.4.0), debhelper (>= 7), flex, lesstif2-dev, libreadline-dev, libtool, libxaw7-dev, libxp-dev, libelfg0-dev [powerpc]
+Build-Depends: automake (>= 1:1.10), bison, cdbs (>= 0.4.0), debhelper (>= 7), flex, lesstif2-dev, libreadline-dev, libtool, libxaw7-dev, libxp-dev, libelfg0-dev [powerpc], info
 Maintainer: Daniel Schepler <schep...@debian.org>
 Homepage: http://www.gnu.org/software/ddd/
 Standards-Version: 3.9.1
diff -Nru ddd-3.3.12/debian/patches/series ddd-3.3.12/debian/patches/series
--- ddd-3.3.12/debian/patches/series	2011-07-08 12:27:55.000000000 -0400
+++ ddd-3.3.12/debian/patches/series	2011-10-29 17:48:08.000000000 -0400
@@ -5,3 +5,4 @@
 005_gcc44_fix.diff
 006_unumlaut_fix.diff
 machine_code_window_fix.diff
+termcap.diff
diff -Nru ddd-3.3.12/debian/patches/termcap.diff ddd-3.3.12/debian/patches/termcap.diff
--- ddd-3.3.12/debian/patches/termcap.diff	1969-12-31 19:00:00.000000000 -0500
+++ ddd-3.3.12/debian/patches/termcap.diff	2011-10-29 17:50:13.000000000 -0400
@@ -0,0 +1,44 @@
+Index: ddd-3.3.12/configure
+===================================================================
+--- ddd-3.3.12.orig/configure	2011-10-29 17:50:10.000000000 -0400
++++ ddd-3.3.12/configure	2011-10-29 17:49:54.000000000 -0400
+@@ -1581,7 +1581,7 @@
+                           both]
+   --with-tags[=TAGS]      include additional configurations [automatic]
+   --with-termlib=LIB      terminal library is
+-                          LIB=mytinfo|ncurses|curses|termcap|terminfo|...
++                          LIB=tinfo|mytinfo|ncurses|curses|termcap|terminfo|...
+   --with-termlib-libraries=DIR
+                           termlib libraries are in DIR
+   --with-readline         do use the readline library default=no
+@@ -24646,7 +24646,7 @@
+ ddd_have_termcap=false
+ _termlib="${ddd_termlib}"
+ if test "x${ddd_termlib}" = x; then
+-  _termlib="mytinfo ncurses curses termcap terminfo termlib"
++  _termlib="tinfo mytinfo ncurses curses termcap terminfo termlib"
+ fi
+ _termlib_path=
+ if test x"${ddd_termlib_libraries_path}" != x; then
+Index: ddd-3.3.12/configure.ac
+===================================================================
+--- ddd-3.3.12.orig/configure.ac	2011-10-29 17:50:09.000000000 -0400
++++ ddd-3.3.12/configure.ac	2011-10-29 17:49:10.000000000 -0400
+@@ -329,7 +329,7 @@
+ ddd_termlib=
+ AC_ARG_WITH([termlib],
+ AS_HELP_STRING([--with-termlib=LIB],
+-[terminal library is LIB=mytinfo|ncurses|curses|termcap|terminfo|...]),[
++[terminal library is LIB=tinfo|mytinfo|ncurses|curses|termcap|terminfo|...]),[
+  case "${withval}" in
+  no)
+   AC_MSG_ERROR([A termcap compatible library is necessary.])
+@@ -360,7 +360,7 @@
+ dnl
+ _termlib="${ddd_termlib}"
+ if test "x${ddd_termlib}" = x; then
+-  _termlib="mytinfo ncurses curses termcap terminfo termlib"
++  _termlib="tinfo mytinfo ncurses curses termcap terminfo termlib"
+ fi
+ _termlib_path=
+ if test x"${ddd_termlib_libraries_path}" != x; then

Reply via email to