tags 346896 patch
thanks

Hi Roberto,

On Mon, Jan 09, 2006 at 02:23:27PM +0100, Roberto Sanchez wrote:

> [Please do not reply to this email as my @yahoo.es account is a junk account
> which I do not check.]

> Bug #346896 was recently filed against toshutils.  I am not able to correct
> this bug right now and would sincerely appreciate it if someone could NMU
> it for me.
> 
> Due to a catastrophic hardware failure last month and now waiting for
> Internet access to be installed at my new place, there is really no way I
> can fix this in a reasonable time frame.

> If you do NMU to fix this bug, please attach a diff of the debian/ directories
> in the source package to this bug and also CC to [EMAIL PROTECTED]  I
> will not get the email right away, but I will eventually, as Sean Finney has
> graciously agreed to collect my emails for me until I get Internet access at
> home (thanks Sean).

Sorry to hear about the hardware problems.  I've attached an NMU patch for
this bug, which fixes the build-dependencies and also the Makefile problem
that Luk identified (your upstream seems to have some bizarre
whitespace-phobia! :).  The NMU will be uploaded shortly.

Thanks,
-- 
Steve Langasek                   Give me a lever long enough and a Free OS
Debian Developer                   to set it on, and I can move the world.
[EMAIL PROTECTED]                                   http://www.debian.org/
diff -u toshutils-2.0.1/debian/changelog toshutils-2.0.1/debian/changelog
--- toshutils-2.0.1/debian/changelog
+++ toshutils-2.0.1/debian/changelog
@@ -1,3 +1,14 @@
+toshutils (2.0.1-13.1) unstable; urgency=high
+
+  * Non-maintainer upload with permission of the maintainer.
+  * High-urgency upload for RC bugfix.
+  * Build-depend on libx11-dev, libxext-dev, libxpm-dev, x-dev instead of on
+    the obsolete xlibs-dev.  Closes: #346896.
+  * Fix up a syntax problem in src/Makefile.in that's causing build failures
+    with current versions of make.
+
+ -- Steve Langasek <[EMAIL PROTECTED]>  Mon,  9 Jan 2006 18:00:30 -0800
+
 toshutils (2.0.1-13) unstable; urgency=low
 
   * Removed Build-Depend on yacc, since there is no such package.
diff -u toshutils-2.0.1/debian/control toshutils-2.0.1/debian/control
--- toshutils-2.0.1/debian/control
+++ toshutils-2.0.1/debian/control
@@ -1,7 +1,7 @@
 Source: toshutils
 Section: utils
 Priority: extra
-Build-Depends: debhelper (>> 4.0.0), dpatch, bison, flex, libgtk2.0-dev, 
autoconf, automake, xlibs-dev, autotools-dev
+Build-Depends: debhelper (>> 4.0.0), dpatch, bison, flex, libgtk2.0-dev, 
autoconf, automake, libx11-dev, libxext-dev, libxpm-dev, x-dev, autotools-dev
 Maintainer: Roberto C. Sanchez <[EMAIL PROTECTED]>
 Standards-Version: 3.6.2
 
diff -u toshutils-2.0.1/debian/patches/00list 
toshutils-2.0.1/debian/patches/00list
--- toshutils-2.0.1/debian/patches/00list
+++ toshutils-2.0.1/debian/patches/00list
@@ -9,0 +10 @@
+10_posix_make_line_continuation.dpatch
only in patch2:
unchanged:
--- toshutils-2.0.1.orig/debian/patches/10_posix_make_line_continuation.dpatch
+++ toshutils-2.0.1/debian/patches/10_posix_make_line_continuation.dpatch
@@ -0,0 +1,29 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 10_posix_make_line_continuation.dpatch by Steve Langasek <[EMAIL PROTECTED]>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Upstream seems to be space-impaired; fix line continuations in 
src/Makefile.in
+## DP: to work with new POSIX-compliant GNU make
+
[EMAIL PROTECTED]@
+
+--- toshutils-2.0.1.orig/src/Makefile.in
++++ toshutils-2.0.1/src/Makefile.in
+@@ -83,7 +83,7 @@
+ WALL = @WALL@
+ 
+ .c.o:
+-      $(CC) $(CFLAGS) -DVERSION=\"$(VERSION)\" -DBINDIR=\"$(BINDESTDIR)\"\
++      $(CC) $(CFLAGS) -DVERSION=\"$(VERSION)\" -DBINDIR=\"$(BINDESTDIR)\" \
+       -DXMESSAGE=\"$(XMESSAGE)\" -DWALL=\"$(WALL)\" -c $<
+ 
+ 
+@@ -96,7 +96,7 @@
+       $(LEX) -i parsetime.l
+ 
+ wmtuxtime.o: wmtuxtime.c
+-      $(CC) $(CFLAGS) -DVERSION=\"$(VERSION)\"\
++      $(CC) $(CFLAGS) -DVERSION=\"$(VERSION)\" \
+       -DBINDIR=\"$(BINDESTDIR)\" -DXMESSAGE=\"$(XMESSAGE)\" -c $<
+ 
+ 

Attachment: signature.asc
Description: Digital signature

Reply via email to