Hi, while looking at Brice's patch for twin, I also applied the patch for #377810 and removed the hard-coding of the package version from debian/rules and debian/control. The X frontend was also broken (missing) because libxt-dev was missing from the build-depends. Unfortunately, the bitops patch does not yet fix the tty frontend, hence I will be uploading this NMU to experimental.
The resulting diff is quoted below - I'll upload to delayed/3 in a minute. debdiff twin_0.5.1-3.dsc /srv/pbuilder/result/twin_0.5.1-3.1.dsc twin-0.5.1/debian/control | 8 ++++---- twin-0.5.1/debian/changelog | 21 +++++++++++++++++++++ twin-0.5.1/debian/rules | 9 +++++++-- twin-0.5.1/debian/patches/00list | 2 ++ debian/patches/kfreebsd.dpatch | 29 +++++++++++++++++++++++++++++ debian/patches/drop_include_bitops.dpatch | 17 +++++++++++++++++ 6 files changed, 80 insertions(+), 6 deletions(-) diff -u twin-0.5.1/debian/control twin-0.5.1/debian/control --- twin-0.5.1/debian/control +++ twin-0.5.1/debian/control @@ -3,7 +3,7 @@ Priority: optional Maintainer: Marco Bodrato <[EMAIL PROTECTED]> Uploaders: Marco Presi (Zufus) <[EMAIL PROTECTED]>, Marco Bodrato <[EMAIL PROTECTED]> -Build-Depends: debhelper (>> 4.0.0), libgpmg1-dev, libncurses5-dev, libx11-dev, libxpm-dev, x-dev, zlib1g-dev, m4, dpatch +Build-Depends: debhelper (>> 4.0.0), libgpmg1-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libncurses5-dev, libx11-dev, libxt-dev, libxpm-dev, x-dev, zlib1g-dev, m4, dpatch, flex, bison Standards-Version: 3.6.2.1 Package: twin @@ -14,11 +14,11 @@ terminal emulator and networked clients, all inside a text display. It supports a variety of displays: * plain text terminals (any termcap/ncurses compatible terminal, - Linux console, twin's own terminal emulator); + Linux console, twin's own terminal emulator); * X11, where it can be used as a multi-window xterm; * itself (you can display a twin on another twin); * twdisplay, a general network-transparent display client, used - to attach/detach more displays on-the-fly. + to attach/detach more displays on-the-fly. Package: libtw0 Section: libs @@ -35,7 +35,7 @@ Package: libtw0-dev Section: devel Architecture: any -Depends: libtw0(=4.5.1-3), libc6-dev +Depends: libtw0 (= ${libtw:Version}), libc6-dev Conflicts: libtw-dev Replaces: libtw-dev Description: a Text mode WINdow environment library, development diff -u twin-0.5.1/debian/changelog twin-0.5.1/debian/changelog --- twin-0.5.1/debian/changelog +++ twin-0.5.1/debian/changelog @@ -1,3 +1,24 @@ +twin (0.5.1-3.1) experimental; urgency=low + + [ Brice Goglin ] + * Non-maintainer upload. + * Add drop_include_bitops.dpatch to stop including <linux/bitops.h> + since it is not required and causes a FTBFS on mips, closes: #373127. + * Add flex and bison to build-depends so that server/rcparse_lex.c and + rcparse_tab.c are rebuilt instead of using the ones shipped in the + tarball, which do not work on all architectures. + + [ Christoph Berg ] + * Add kfreebsd.dpatch by Petr Salinger to fix FTBFS on kfreebsd, + closes: #377810. + * Do not statically code version numbers in debian/rules and debian/control. + * Fix indentation of the twin Description. + * Add libxt-dev to Build-Depends to reenable X frontend. + * Note that the tty frontend is broken, hence uploading to experimental; + the clean target also needs fixing (AM_MAINTAINER_MODE). + + -- Christoph Berg <[EMAIL PROTECTED]> Wed, 10 Jan 2007 21:54:51 +0100 + twin (0.5.1-3) unstable; urgency=low * Fixes the wrong fix in the previous upload: in libtw0-dev reintroduced explict diff -u twin-0.5.1/debian/rules twin-0.5.1/debian/rules --- twin-0.5.1/debian/rules +++ twin-0.5.1/debian/rules @@ -13,8 +13,8 @@ #export DH_COMPAT=4 #Version of twin -TWIN_VERSION=0.5.1-3 -LIBTW_VERSION=4.5.1-3 +TWIN_VERSION=$(shell dpkg-parsechangelog | grep ^Version: | cut -d' ' -f 2) +LIBTW_VERSION=$(shell echo $(TWIN_VERSION) | sed s/^0/4/) #LIBTT_VERSION=0.0.8-1 include /usr/share/dpatch/dpatch.make @@ -38,6 +38,8 @@ build-stamp: patch-stamp dh_testdir + # touch configure here since it was patched in kfreebsd.dpatch + touch configure # Add here commands to compile the package. $(MAKE) @@ -48,6 +50,8 @@ dh_testroot rm -f build-stamp configure-stamp + # touch configure here since it was patched in kfreebsd.dpatch + touch configure # Add here commands to clean up after the build process. -$(MAKE) clean -$(MAKE) distclean @@ -147,6 +151,7 @@ # see dh_makeshlibs # dh_shlibdeps -a dh_shlibdeps -l./debian/libtw0/usr/lib/ + echo "libtw:Version=$(LIBTW_VERSION)" >> debian/libtw0-dev.substvars # dh_gencontrol -a dh_gencontrol -v -ptwin -u-v$(TWIN_VERSION) dh_gencontrol -v -plibtw0 -u-v$(LIBTW_VERSION) diff -u twin-0.5.1/debian/patches/00list twin-0.5.1/debian/patches/00list --- twin-0.5.1/debian/patches/00list +++ twin-0.5.1/debian/patches/00list @@ -1,2 +1,4 @@ +kfreebsd.dpatch gcc-4.0.dpatch rawkbd.dpatch +drop_include_bitops.dpatch only in patch2: unchanged: --- twin-0.5.1.orig/debian/patches/kfreebsd.dpatch +++ twin-0.5.1/debian/patches/kfreebsd.dpatch @@ -0,0 +1,29 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## kfreebsd.dpatch by Petr Salinger <[EMAIL PROTECTED]> +## #377810 + [EMAIL PROTECTED]@ +--- twin-0.5.1.orig/configure.in ++++ twin-0.5.1/configure.in +@@ -276,7 +276,7 @@ + ]) + + AC_CACHE_CHECK(for shared library support, ac_cv_sys_shlibs, [ +- if test "$ac_cv_sys_uname" = Linux -o "$ac_cv_sys_uname" = FreeBSD; then ++ if test "$ac_cv_sys_uname" = Linux -o "$ac_cv_sys_uname" = "GNU/kFreeBSD" -o "$ac_cv_sys_uname" = FreeBSD; then + if test "$ac_cv_prog_gcc" = yes; then + ac_cv_sys_shlibs=native + fi +only in patch2: +unchanged: +--- twin-0.5.1.orig/configure ++++ twin-0.5.1/configure +@@ -1743,7 +1743,7 @@ + echo $ac_n "(cached) $ac_c" 1>&6 + else + +- if test "$ac_cv_sys_uname" = Linux -o "$ac_cv_sys_uname" = FreeBSD; then ++ if test "$ac_cv_sys_uname" = Linux -o "$ac_cv_sys_uname" = "GNU/kFreeBSD" -o "$ac_cv_sys_uname" = FreeBSD; then + if test "$ac_cv_prog_gcc" = yes; then + ac_cv_sys_shlibs=native + fi only in patch2: unchanged: --- twin-0.5.1.orig/debian/patches/drop_include_bitops.dpatch +++ twin-0.5.1/debian/patches/drop_include_bitops.dpatch @@ -0,0 +1,17 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## gcc-4.0.dpatch by Andreas Jochens <[EMAIL PROTECTED]> +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: including linux/bitops.h is broken, and we actually do not need it + [EMAIL PROTECTED]@ +--- twin-0.5.1.orig/server/HW/hw_tty_linux/kbd_raw1.h 2007-01-07 17:51:12.000000000 +0100 ++++ twin-0.5.1/server/HW/hw_tty_linux/kbd_raw1.h 2007-01-07 17:51:37.000000000 +0100 +@@ -40,7 +40,6 @@ + #include <linux/kd.h> + #include <linux/keyboard.h> + #include <linux/vt.h> +-#include <linux/bitops.h> + + + #define SIZE(array) (sizeof(array)/sizeof(array[0])) Christoph -- [EMAIL PROTECTED] | http://www.df7cb.de/
signature.asc
Description: Digital signature