tags 503335 + patch
tags 515476 + patch
tags 527734 + patch
tags 529122 + patch
thanks

Dear maintainer,

I've prepared an NMU for kinput2 (versioned as 3.1-10.2). The diff
is attached to this message.

Regards.
diff -u kinput2-3.1/debian/control kinput2-3.1/debian/control
--- kinput2-3.1/debian/control
+++ kinput2-3.1/debian/control
@@ -3,12 +3,12 @@
 Priority: optional
 Maintainer: Keita Maehara <maeh...@debian.org>
 Standards-Version: 3.7.2
-Build-Depends: debhelper (>= 5), xutils, x-dev, libice-dev, libsm-dev, 
libx11-dev, libxext-dev, libxmu-dev, libxp-dev, libxpm-dev, libxt-dev, 
libxaw7-dev | libxaw-dev, libcanna1g-dev, libwnn6-dev
+Build-Depends: debhelper (>= 5), xutils-dev, x11proto-core-dev, libice-dev, 
libsm-dev, libx11-dev, libxext-dev, libxmu-dev, libxp-dev, libxpm-dev, 
libxt-dev, libxaw7-dev | libxaw-dev, libcanna1g-dev, libwnn6-dev
 
 Package: kinput2-common
 Architecture: all
 Conflicts: xbase (<< 3.3.2.3a-2)
-Depends: im-switch
+Depends: im-switch, ${misc:Depends}
 Description: Files shared among kinput2 packages
  This package contains files that is needed by three kinput2 packages
  (kinput2-canna, kinput2-wnn and kinput2-canna-wnn).
diff -u kinput2-3.1/debian/watch kinput2-3.1/debian/watch
--- kinput2-3.1/debian/watch
+++ kinput2-3.1/debian/watch
@@ -1,5 +1,2 @@
-# Example watch control file for uscan
-# Rename this file to "watch" and then you can run the "uscan" command
-# to check for upstream updates and more.
-# Site         Directory               Pattern                 Version Script
-ftp.sra.co.jp  /pub/x11/kinput2        kinput2-(.*)\.tar\.gz   debian  uupdate
+version=3
+ftp://ftp.sra.co.jp/pub/x11/kinput2/kinput2-v([\d.]+)\.tar\.gz debian uupdate
diff -u kinput2-3.1/debian/changelog kinput2-3.1/debian/changelog
--- kinput2-3.1/debian/changelog
+++ kinput2-3.1/debian/changelog
@@ -1,3 +1,14 @@
+kinput2 (3.1-10.2) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Add a missing build-dependency on xutils-dev (Closes: #527734).
+  * B-Depend on x11proto-core-dev instead of x-dev (Closes: #515476).
+  * Upgrade watch file (Closes: #529122).
+  * Add a dependency on misc:Depends for kinput2-common
+  * Include Spanish Debconf translation (Closes: #503335).
+
+ -- Raphael Geissert <geiss...@debian.org>  Wed, 08 Jul 2009 01:24:36 -0500
+
 kinput2 (3.1-10.1) unstable; urgency=low
 
   * Non-maintainer upload to fix pending l10n issues.
only in patch2:
unchanged:
--- kinput2-3.1.orig/debian/po/es.po
+++ kinput2-3.1/debian/po/es.po
@@ -0,0 +1,54 @@
+# kinput2 translation to spanish
+# Copyright (C) 2008 Software in the Public Interest
+# This file is distributed under the same license as the kinput2 package.
+# Changes:
+# - Initial translation
+# Ignacio Mondino <ignacio.mond...@gmail.com>, 2008
+# Traductores, si no conoce 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 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: 3.1-10.1\n"
+"Report-Msgid-Bugs-To: kinp...@packages.debian.org\n"
+"POT-Creation-Date: 2008-03-19 18:32+0100\n"
+"PO-Revision-Date: 2008-10-20 21:51-0200\n"
+"Last-Translator: Ignacio Mondino <ignacio.mond...@gmail.com>\n"
+"Language-Team: Debian Spanish team <debian-l10n-span...@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit"
+
+#. Type: select
+#. Description
+#: ../kinput2-canna-wnn.templates:1001 ../kinput2-wnn.templates:1001
+msgid "Default system keybindings of Kinput2 for Wnn"
+msgstr "Combinación de teclas del sistema por omisión de Kinput2 para Wnn"
+
+#. Type: select
+#. Description
+#: ../kinput2-canna-wnn.templates:1001 ../kinput2-wnn.templates:1001
+msgid ""
+"Debian prepackaged version of Kinput2 provides a functionality to select "
+"default keybindings of Kinput2 for Wnn from \"Kinput2\" and \"Egg\". "
+"Although the former is the original keybindings of Kinput2, Egg on Emacs "
+"users may prefer the latter."
+msgstr ""
+"La versión empaquetada de Debian de Kinput2 provee la funcionalidad de 
elegir "
+"la combinación de teclas por omisión de Kinput2 para Wnn de entre 
«Kinput2» y "
+"«Egg». Aunque la primera sea la combinación de teclas original de Kinput2, 
"
+"los usuarios de «Egg» sobre Emacs preferirán la segunda."
+



-- 
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org

Reply via email to