diff -u tpb-0.6.4/debian/changelog tpb-0.6.4/debian/changelog --- tpb-0.6.4/debian/changelog +++ tpb-0.6.4/debian/changelog @@ -1,3 +1,22 @@ +tpb (0.6.4-2.3ubuntu1) gutsy; urgency=low + + * Merge from Debian unstable (LP: #133051): keep all ubuntu changes. + * Modify Maintainer value to match Debian-Maintainer-Field Spec + + -- Cesare.Tirabassi Fri, 17 Aug 2007 00:12:32 +0200 + +tpb (0.6.4-2.3) unstable; urgency=low + + * NMU + * Bump to Standards-Version 3.7.2. + * Add amd64 to the architecture list. closes: #409582. + * Add Dutch po-debconf translation from Bart Cornelis. closes: #419402. + * Add Portuguese po-debconf translation from Luísa Lourenço. + closes: #415069. + * Fix XSI:ism in /etc/X11/Xsession.d/90tpb. closes: #382859. + + -- Clint Adams Fri, 20 Jul 2007 23:52:06 -0400 + tpb (0.6.4-2.2ubuntu1) feisty; urgency=low * Merge from debian unstable. diff -u tpb-0.6.4/debian/control tpb-0.6.4/debian/control --- tpb-0.6.4/debian/control +++ tpb-0.6.4/debian/control @@ -1,12 +1,13 @@ Source: tpb Section: utils Priority: extra -Maintainer: Markus Braun +Maintainer: Ubuntu MOTU Developers +XSBC-Original-Maintainer: Markus Braun Build-Depends: debhelper (>= 4.1.16), libx11-dev, libxt-dev, libxosd-dev, libxinerama-dev, gettext, dpatch -Standards-Version: 3.6.2 +Standards-Version: 3.7.2 Package: tpb -Architecture: i386 +Architecture: i386 amd64 Depends: makedev, debconf | debconf-2.0, adduser, ${shlibs:Depends} Suggests: xfonts-base-transcoded Description: program to use the IBM ThinkPad(tm) special keys diff -u tpb-0.6.4/debian/tpb.xsession tpb-0.6.4/debian/tpb.xsession --- tpb-0.6.4/debian/tpb.xsession +++ tpb-0.6.4/debian/tpb.xsession @@ -6,5 +6,5 @@ fi -if [ -x $TPB -a "$START_TPB" = true ]; then +if [ -x $TPB ] && [ "$START_TPB" = true ]; then LANG=C $TPB -d fi only in patch2: unchanged: --- tpb-0.6.4.orig/debian/po/pt.po +++ tpb-0.6.4/debian/po/pt.po @@ -0,0 +1,67 @@ +# Portuguese translation of tpb's debconf messages. +# Copyright (C) 2007 +# This file is distributed under the same license as the tpb package. +# Luísa Lourenço , 2007. +# +msgid "" +msgstr "" +"Project-Id-Version: tpb 0.6.4-2.2\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2007-01-13 20:23+0100\n" +"PO-Revision-Date: 2007-03-15 10:22+0000\n" +"Last-Translator: Luísa Lourenço \n" +"Language-Team: Portuguese \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: note +#. Description +#: ../tpb.templates:1001 +msgid "Group for tpb users changed!" +msgstr "O grupo para os utilizadores tpb mudou!" + +#. Type: note +#. Description +#: ../tpb.templates:1001 +msgid "" +"The group of the device file used by tpb changed. Note that you have to move " +"the tpb users from the old group \"thinkpad\" to the new group \"nvram\"!" +msgstr "" +"O grupo do ficheiro do dispositivo usado pelo tpb mudou. Note que tem de mudar " +"os utilizadores do tpb do grupo antigo \"thinkpad\" para o novo grupo \"nvram\"!" + +#. Type: boolean +#. Description +#: ../tpb.templates:2001 +msgid "Create special device file?" +msgstr "Criar ficheiro de dispositivo especial?" + +#. Type: boolean +#. Description +#: ../tpb.templates:2001 +msgid "" +"tpb needs a special device file to access the information about pressed " +"buttons. Users who should be able to use tpb must be in the group nvram." +msgstr "" +"O tpb precisa de um ficheiro de dispositivo especial para aceder a informação " +"acerca de botões pressionados. Os utilizadores que devam ser capazes de usar " +"o tpb têm de estar no grupo nvram." + +#. Type: boolean +#. Description +#: ../tpb.templates:3001 +msgid "Start tpb automatically?" +msgstr "Iniciar o tpb automaticamente?" + +#. Type: boolean +#. Description +#: ../tpb.templates:3001 +msgid "" +"tpb can be started automatically after X has been started for a user. That " +"can be either after startx from console or after login with a display " +"manager." +msgstr "" +"O tpb pode ser iniciado automaticamente depois do X ter iniciado para o " +"utilizador. Isso pode ser tanto depois do startx a partir da consola como " +"pode ser depois do login através de um gestor de janelas." only in patch2: unchanged: --- tpb-0.6.4.orig/debian/po/nl.po +++ tpb-0.6.4/debian/po/nl.po @@ -0,0 +1,54 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +msgid "" +msgstr "" +"Project-Id-Version: tpb\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2007-01-13 20:23+0100\n" +"PO-Revision-Date: 2007-03-15 18:26+0100\n" +"Last-Translator: Bart Cornelis \n" +"Language-Team: debian-l10n-dutch \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=utf-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Poedit-Language: Dutch\n" + +#. Type: note +#. Description +#: ../tpb.templates:1001 +msgid "Group for tpb users changed!" +msgstr "De groep voor tpb-gebruikers is veranderd!" + +#. Type: note +#. Description +#: ../tpb.templates:1001 +msgid "The group of the device file used by tpb changed. Note that you have to move the tpb users from the old group \"thinkpad\" to the new group \"nvram\"!" +msgstr "De groep die aan het door tpb gebruikte apparaatbestand is toegewezen is veranderd. U dient de tpb-gebruikers te verplaatsen van de oude groep 'thinkpad' naar de nieuwe groep 'nvram'!" + +#. Type: boolean +#. Description +#: ../tpb.templates:2001 +msgid "Create special device file?" +msgstr "Wilt u het speciaal apparaatbestand aanmaken?" + +#. Type: boolean +#. Description +#: ../tpb.templates:2001 +msgid "tpb needs a special device file to access the information about pressed buttons. Users who should be able to use tpb must be in the group nvram." +msgstr "Om gebruik te kunnen maken van de de informatie over ingedrukte knoppen heeft tpb toegang nodig tot een speciaal apparaatbestand. Gebruikers die gebruik moeten kunnen maken van tpb dienen lid te zijn van de groep 'nvram'." + +#. Type: boolean +#. Description +#: ../tpb.templates:3001 +msgid "Start tpb automatically?" +msgstr "Wilt u tpb automatisch opstarten?" + +#. Type: boolean +#. Description +#: ../tpb.templates:3001 +msgid "tpb can be started automatically after X has been started for a user. That can be either after startx from console or after login with a display manager." +msgstr "tpb kan automatisch opgestart worden nadat een gebruiker X (het grafische systeem) heeft opgestart. Dit geld zowel voor het starten van het grafische systeem vanaf de console met het commando 'startx', als na aanmelden via een beeldschermbeheerder. " +