I forgot to update the versions in debian/rules to match the NMU version
from the changelog. Clean patch attached.

Brice

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, libncurses5-dev, 
libx11-dev, libxpm-dev, x-dev, zlib1g-dev, m4, dpatch, flex, bison
 Standards-Version: 3.6.2.1
 
 Package: twin
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,14 @@
+twin (0.5.1-3.1) unstable; urgency=low
+
+  * 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.
+
+ -- Brice Goglin <[EMAIL PROTECTED]>  Sun,  7 Jan 2007 19:09:37 +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=0.5.1-3.1
+LIBTW_VERSION=4.5.1-3.1
 #LIBTT_VERSION=0.0.8-1
 
 include /usr/share/dpatch/dpatch.make
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
@@ -2,0 +3 @@
+drop_include_bitops.dpatch
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]))

Reply via email to