Bug#506050: delo: diff for NMU version 0.8-2.6

Chris Lamb Sun, 02 Aug 2009 12:27:42 -0700

tags 506050 + pending
tags 518155 + pending
thanks

Hi,


The attached file is the diff for my delo 0.8-2.6 NMU. The associated
changelog entry is:

 delo (0.8-2.6) unstable; urgency=medium

   * Non-maintainer upload.
   * Explicitly includes limits.h to fix FTBFS under glibc 2.9 and GCC
     4.3. Thanks to Bobby R. Ward <bobbyrw...@gmail.com> and Ubuntu for
     the patch. (Closes: #506050)
   * Fix FTBFS twice in a row by not manually deleting debian/patched in
     clean target.
   * Add Spanish Debconf translation. Thanks to Francisco Javier Cuadrado
      <fcocuadr...@gmail.com>. (Closes: #518155)


Regards,

-- 
      ,''`.
     : :'  :     Chris Lamb
     `. `'`      la...@debian.org
       `-

diff -Nru delo-0.8/debian/changelog delo-0.8/debian/changelog
--- delo-0.8/debian/changelog   2008-10-24 05:09:05.000000000 +0100
+++ delo-0.8/debian/changelog   2009-08-02 20:21:06.000000000 +0100
@@ -1,3 +1,16 @@
+delo (0.8-2.6) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Explicitly includes limits.h to fix FTBFS under glibc 2.9 and GCC 4.3.
+    Thanks to Bobby R. Ward <bobbyrw...@gmail.com> and Ubuntu for the patch.
+    (Closes: #506050)
+  * Fix FTBFS twice in a row by not manually deleting debian/patched in clean
+    target.
+  * Add Spanish Debconf translation. Thanks to Francisco Javier Cuadrado
+     <fcocuadr...@gmail.com>. (Closes: #518155)
+
+ -- Chris Lamb <la...@debian.org>  Sun, 02 Aug 2009 20:01:08 +0100
+
 delo (0.8-2.5) unstable; urgency=low
 
   * Non-maintainer upload.
diff -Nru delo-0.8/debian/patches/00list delo-0.8/debian/patches/00list
--- delo-0.8/debian/patches/00list      2008-03-29 13:05:14.000000000 +0000
+++ delo-0.8/debian/patches/00list      2009-08-02 20:12:22.000000000 +0100
@@ -1,2 +1 @@
-# Make lintian happy. Should this all dpatch stuff go away anywway?
-
+01_include-limits-h.dpatch
diff -Nru delo-0.8/debian/patches/01_include-limits-h.dpatch 
delo-0.8/debian/patches/01_include-limits-h.dpatch
--- delo-0.8/debian/patches/01_include-limits-h.dpatch  1970-01-01 
01:00:00.000000000 +0100
+++ delo-0.8/debian/patches/01_include-limits-h.dpatch  2009-08-02 
20:07:02.000000000 +0100
@@ -0,0 +1,17 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 01_include-limits-h.dpatch by Bobby R. Ward <bobbyrw...@gmail.com>
+##
+## DP: Explicitly include limits.h for gcc 4.3
+
+...@dpatch@
+diff -urNad delo-0.8~/delo/delo.c delo-0.8/delo/delo.c
+--- delo-0.8~/delo/delo.c      2004-01-18 15:01:27.000000000 +0000
++++ delo-0.8/delo/delo.c       2008-07-10 14:02:33.000000000 +0000
+@@ -26,6 +26,7 @@
+ #include <sys/stat.h>
+ #include <sys/ioctl.h>
+ #include <netinet/in.h>
++#include <limits.h>
+ 
+ #include <elf.h>
+ 
diff -Nru delo-0.8/debian/po/es.po delo-0.8/debian/po/es.po
--- delo-0.8/debian/po/es.po    1970-01-01 01:00:00.000000000 +0100
+++ delo-0.8/debian/po/es.po    2009-08-02 20:08:14.000000000 +0100
@@ -0,0 +1,86 @@
+# delo po-debconf translation to Spanish
+# Copyright (C) 2009 Software in the Public Interest
+# This file is distributed under the same license as the delo package.
+#
+# Changes:
+#   - Initial translation
+#       Francisco Javier Cuadrado <fcocuadr...@gmail.com>, 2009
+#
+# Traductores, si no conocen el formato PO, merece la pena leer la
+# documentaciÃ³n de gettext, especialmente las secciones dedicadas a este
+# formato, por ejemplo ejecutando:
+#       info -n '(gettext)PO Files'
+#       info -n '(gettext)Header Entry'
+#
+# Equipo de traducciÃ³n al espaÃ±ol, por favor lean antes de traducir
+# los siguientes documentos:
+#
+#   - El proyecto de traducciÃ³n de Debian al espaÃ±ol
+#     http://www.debian.org/intl/spanish/
+#     especialmente las notas y normas de traducciÃ³n en
+#     http://www.debian.org/intl/spanish/notas
+#
+#   - La guÃa de traducciÃ³n de po's de debconf:
+#     /usr/share/doc/po-debconf/README-trans
+#     o http://www.debian.org/intl/l10n/po-debconf/README-trans
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: delo 0.8-2.5\n"
+"Report-Msgid-Bugs-To: d...@packages.debian.org\n"
+"POT-Creation-Date: 2008-03-27 20:41+0100\n"
+"PO-Revision-Date: 2009-03-01 14:00+0100\n"
+"Last-Translator: Francisco Javier Cuadrado <fcocuadr...@gmail.com>\n"
+"Language-Team: Debian l10n Spanish <debian-l10n-span...@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: string
+#. Description
+#: ../delo.templates:1001
+msgid "Disk on which to intall the bootloader:"
+msgstr "Disco en el que instalar el cargador de arranque:"
+
+#. Type: string
+#. Description
+#: ../delo.templates:1001
+msgid "Delo, the DECstation harddisk bootloader, must be installed into the 
bootsector of a disk with a DOS partition table. Currently this must be the 
disk on which the root partition resides. Please give the device name of the 
harddisk to install delo onto."
+msgstr "Delo, el cargador de arranque del disco duro de DECstation, se debe 
instalar en el sector de arranque de un disco con una tabla de particiÃ³n DOS. 
Actualmente, esto serÃ¡ el disco en el que reside la particiÃ³n raÃz. 
Proporcione el nombre del dispositivo del disco duro en el que instalar delo."
+
+#. Type: string
+#. Description
+#: ../delo.templates:2001
+msgid "Root partition to use:"
+msgstr "ParticiÃ³n raÃz a utilizar:"
+
+#. Type: string
+#. Description
+#: ../delo.templates:2001
+msgid "Please enter the device name of your root partition."
+msgstr "Introduzca el nombre del dispositivo de la particiÃ³n raÃz."
+
+#. Type: string
+#. Description
+#: ../delo.templates:3001
+msgid "Console device:"
+msgstr "Dispositivo de la consola:"
+
+#. Type: string
+#. Description
+#: ../delo.templates:3001
+msgid "Delo can use the local console or a serial port as the system console. 
Please give the name of the system console. If no device is given, delo assumes 
local console."
+msgstr "Delo puede utilizar una consola local o un puerto serie como consola 
del sistema. Proporcione el nombre del dispositivo de la consola del sistema. 
Si no proporciona ningÃºn dispositivo, delo asumirÃ¡ que se trata de la consola 
local."
+
+#. Type: note
+#. Description
+#: ../delo.templates:4001
+msgid "Firmware variables for booting"
+msgstr "Variables del Â«firmwareÂ» para el arranque"
+
+#. Type: note
+#. Description
+#: ../delo.templates:4001
+msgid "You have to set the \"boot\" firmware variables to boot your new debian 
installation:"
+msgstr "Debe configurar las variables Â«bootÂ» del Â«firmwareÂ» para que 
arranque la nueva instalaciÃ³n de Debian:"
+
diff -Nru delo-0.8/debian/rules delo-0.8/debian/rules
--- delo-0.8/debian/rules       2008-03-29 12:50:42.000000000 +0000
+++ delo-0.8/debian/rules       2009-08-02 20:18:35.000000000 +0100
@@ -20,7 +20,6 @@
        dh_testdir
        dh_testroot
        rm -f build-stamp
-       rm -rf debian/patched
        $(MAKE) clean
        dh_clean
        debconf-updatepo

signature.asc
Description: PGP signature

Bug#506050: delo: diff for NMU version 0.8-2.6

Reply via email to