diff -u plptools-1.0.9/debian/plptools.init plptools-1.0.9/debian/plptools.init --- plptools-1.0.9/debian/plptools.init +++ plptools-1.0.9/debian/plptools.init @@ -1,8 +1,8 @@ #! /bin/sh ### BEGIN INIT INFO # Provides: plptools -# Required-Start: $remote_fs $syslog -# Required-Stop: $remote_fs $syslog +# Required-Start: $remote_fs $syslog fuse +# Required-Stop: $remote_fs $syslog fuse # Default-Start: 2 3 4 5 # Default-Stop: 0 1 6 # Short-Description: start or stop the plptools daemons @@ -37,9 +37,6 @@ fi if test "$START_PLPFUSE" = "yes" ; then echo -n "Starting $DESC ($DAEMON2): " - if ! grep -q fuse /proc/filesystems; then - modprobe fuse - fi start-stop-daemon --start --quiet \ --exec $DAEMON2 -- $PLPFUSE_ARGS $MOUNTPOINT && \ echo -n "done" || echo -n "failed" @@ -56,7 +53,14 @@ stop) if test "$START_PLPFUSE" = "yes" ; then echo -n "Stopping $DESC ($DAEMON2): " - fusermount -z -u $MOUNTPOINT || true + if [ "$(uname)" = Linux ]; then + fusermount -z -u $MOUNTPOINT || true + elif [ "$(uname)" = GNU/kFreeBSD ]; then + umount $MOUNTPOINT || true + else + echo "Port me" >&2 + exit 1 + fi start-stop-daemon --stop --retry HUP/5/TERM/1 --quiet \ --exec $DAEMON2 && \ echo -n "done" || echo -n "already stopped" diff -u plptools-1.0.9/debian/changelog plptools-1.0.9/debian/changelog --- plptools-1.0.9/debian/changelog +++ plptools-1.0.9/debian/changelog @@ -1,3 +1,10 @@ +plptools (1.0.9-2.1) unstable; urgency=low + + * Non-maintainer upload. + * Fix installability on kfreebsd-*. (Closes: #634328) + + -- Robert Millan Fri, 02 Dec 2011 19:40:03 +0000 + plptools (1.0.9-2) unstable; urgency=low * Update Portuguese debconf translation (closes: #574190) diff -u plptools-1.0.9/debian/control plptools-1.0.9/debian/control --- plptools-1.0.9/debian/control +++ plptools-1.0.9/debian/control @@ -6,8 +6,8 @@ Standards-Version: 3.8.3 Package: plptools -Architecture: any -Depends: ${shlibs:Depends},${misc:Depends},fuse-utils +Architecture: linux-any kfreebsd-any +Depends: ${shlibs:Depends},${misc:Depends}, fuse [linux-any] | fuse4bsd [kfreebsd-any] Conflicts: klipsi, plptools-kde, kpsion Provides: libplpc2a Replaces: libplpc2a @@ -25,7 +25,7 @@ Version 1.0 and later no longer provide specific KDE integration. Package: plptools-dev -Architecture: any +Architecture: linux-any kfreebsd-any Section: devel Depends: plptools (= ${binary:Version}),${misc:Depends} Homepage: http://plptools.sourceforge.net/ diff -u plptools-1.0.9/debian/po/fr.po plptools-1.0.9/debian/po/fr.po --- plptools-1.0.9/debian/po/fr.po +++ plptools-1.0.9/debian/po/fr.po @@ -19,6 +19,7 @@ "PO-Revision-Date: 2008-07-31 11:50+0100\n" "Last-Translator: Julien Patriarca \n" "Language-Team: French \n" +"Language: fr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=ISO-8859-15\n" "Content-Transfer-Encoding: 8bit\n" @@ -158,9 +159,9 @@ "this option. You must have a working print queue which is capable of " "printing Postscript in order to use this feature." msgstr "" -"Si vous prévoyez d'utiliser la fonction « Imprimer via un PC » du Psion, vous " -"pouvez activer cette option. Pour cela, vous devez avoir une file d'attente " -"active et capable d'imprimer du PostScript." +"Si vous prévoyez d'utiliser la fonction « Imprimer via un PC » du Psion, " +"vous pouvez activer cette option. Pour cela, vous devez avoir une file " +"d'attente active et capable d'imprimer du PostScript." #. Type: string #. Description diff -u plptools-1.0.9/debian/po/es.po plptools-1.0.9/debian/po/es.po --- plptools-1.0.9/debian/po/es.po +++ plptools-1.0.9/debian/po/es.po @@ -32,10 +32,11 @@ msgstr "" "Project-Id-Version: plptools 1.0.4-4\n" "Report-Msgid-Bugs-To: plptools@packages.debian.org\n" -"POT-Creation-Date: 2008-07-25 23:42+0100\n" +"POT-Creation-Date: 2009-12-31 16:42+0000\n" "PO-Revision-Date: 2009-09-11 13:39+0100\n" "Last-Translator: Francisco Javier Cuadrado \n" "Language-Team: Deian l10n Spanish \n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -49,8 +50,12 @@ #. Type: note #. Description #: ../plptools.templates:1001 -msgid "In addition to plptools' main daemon \"ncpd\", plptools provides two optional daemons:" -msgstr "Además del demonio principal «ncpd», plptools proporciona dos demonios opcionales:" +msgid "" +"In addition to plptools' main daemon \"ncpd\", plptools provides two " +"optional daemons:" +msgstr "" +"Además del demonio principal «ncpd», plptools proporciona dos demonios " +"opcionales:" #. Type: note #. Description @@ -59,14 +64,19 @@ " plpfuse (for mounting a Psion's drives using Filesystem in USErspace)\n" " plpprintd (for printing via PC from a Psion Series 5)" msgstr "" -" plpfuse (para montar unidades Psion utilizando el sistema de archivos en espacio de usuario)\n" +" plpfuse (para montar unidades Psion utilizando el sistema de archivos en " +"espacio de usuario)\n" " plpprintd (para imprimir por medio de un PC desde un Psion Series 5)" #. Type: note #. Description #: ../plptools.templates:1001 -msgid "Both daemons are disabled by default. You can enable them by editing /etc/default/plptools." -msgstr "De manera predeterminada, los dos demonios están deshabilitados. Para habilitarlos, edite el archivo «/etc/default/plptools»." +msgid "" +"Both daemons are disabled by default. You can enable them by editing /etc/" +"default/plptools." +msgstr "" +"De manera predeterminada, los dos demonios están deshabilitados. Para " +"habilitarlos, edite el archivo «/etc/default/plptools»." #. Type: boolean #. Description @@ -77,8 +87,14 @@ #. Type: boolean #. Description #: ../plptools.templates:2001 -msgid "Normally, ncpd - the daemon which handles the serial connection to a Psion - is started on boot-up. If you intend to connect your Psion to another machine on the net and NEVER will use it locally, you can disable this here." -msgstr "Normalmente, ncpd, el demonio que maneja la conexión serie a un Psion, se inicia en el arranque del sistema. Si desea conectar su Psion a otra máquina en la red y NUNCA lo usará localmente, puede deshabilitarlo ahora." +msgid "" +"Normally, ncpd - the daemon which handles the serial connection to a Psion - " +"is started on boot-up. If you intend to connect your Psion to another " +"machine on the net and NEVER will use it locally, you can disable this here." +msgstr "" +"Normalmente, ncpd, el demonio que maneja la conexión serie a un Psion, se " +"inicia en el arranque del sistema. Si desea conectar su Psion a otra máquina " +"en la red y NUNCA lo usará localmente, puede deshabilitarlo ahora." #. Type: string #. Description @@ -89,8 +105,12 @@ #. Type: string #. Description #: ../plptools.templates:3001 -msgid "By default, the Psion is expected to be connected to the first serial line (COM1:) of your machine. You can change this here." -msgstr "De manera predeterminada, se espera que Psion se conecte a la primera línea serie de su máquina (COM1:). Puede cambiarlo aquí." +msgid "" +"By default, the Psion is expected to be connected to the first serial line " +"(COM1:) of your machine. You can change this here." +msgstr "" +"De manera predeterminada, se espera que Psion se conecte a la primera línea " +"serie de su máquina (COM1:). Puede cambiarlo aquí." #. Type: string #. Description @@ -101,14 +121,25 @@ #. Type: string #. Description #: ../plptools.templates:4001 -msgid "If you intend to use the plptools front-ends from other machines, you can specify 0.0.0.0 or the IP address of your machine here. Normal users should keep the default 127.0.0.1!" -msgstr "Si planea usar las interfaces de plptools desde otras máquinas, puede introducir «0.0.0.0» ó la dirección IP de su máquina aquí. ¡Los usuarios normales deberán mantener la IP predeterminada 127.0.0.1!" +msgid "" +"If you intend to use the plptools front-ends from other machines, you can " +"specify 0.0.0.0 or the IP address of your machine here. Normal users should " +"keep the default 127.0.0.1!" +msgstr "" +"Si planea usar las interfaces de plptools desde otras máquinas, puede " +"introducir «0.0.0.0» ó la dirección IP de su máquina aquí. ¡Los usuarios " +"normales deberán mantener la IP predeterminada 127.0.0.1!" #. Type: string #. Description #: ../plptools.templates:4001 -msgid "Note, that THIS IS A SECURITY THREAT as no authentication and no encryption is used! DO NOT USE THIS on machines which are accessible from the Internet!" -msgstr "¡Tenga en cuenta de que ESTO ES UN PROBLEMA DE SEGURIDAD dado que no se utiliza autenticación ni cifrado! ¡NO UTILICE ESTO en máquinas que sean accesibles desde Internet!" +msgid "" +"Note, that THIS IS A SECURITY THREAT as no authentication and no encryption " +"is used! DO NOT USE THIS on machines which are accessible from the Internet!" +msgstr "" +"¡Tenga en cuenta de que ESTO ES UN PROBLEMA DE SEGURIDAD dado que no se " +"utiliza autenticación ni cifrado! ¡NO UTILICE ESTO en máquinas que sean " +"accesibles desde Internet!" #. Type: boolean #. Description @@ -119,8 +150,18 @@ #. Type: boolean #. Description #: ../plptools.templates:5001 -msgid "If plpfuse is started during boot-up, it will wait for a Psion being connected and then automatically mount that Psion. Since this is done as root, non-privileged users will not have access to the mounted directory. If you have a single-user machine, you probably want to start plpfuse manually when you need it." -msgstr "Si se inicia plpfuse durante el arranque, esperará a que se conecte un Psion y montará automáticamente ese Psion. Ya que esto se realiza como administrador («root»), los usuarios sin privilegios no tendrán acceso al directorio montado. Si tiene un sistema con un único usuario, probablemente quiera iniciar plpfuse de forma manual cuando lo necesite." +msgid "" +"If plpfuse is started during boot-up, it will wait for a Psion being " +"connected and then automatically mount that Psion. Since this is done as " +"root, non-privileged users will not have access to the mounted directory. If " +"you have a single-user machine, you probably want to start plpfuse manually " +"when you need it." +msgstr "" +"Si se inicia plpfuse durante el arranque, esperará a que se conecte un Psion " +"y montará automáticamente ese Psion. Ya que esto se realiza como " +"administrador («root»), los usuarios sin privilegios no tendrán acceso al " +"directorio montado. Si tiene un sistema con un único usuario, probablemente " +"quiera iniciar plpfuse de forma manual cuando lo necesite." #. Type: boolean #. Description @@ -131,8 +172,15 @@ #. Type: boolean #. Description #: ../plptools.templates:6001 -msgid "If you intend to use the Psion's \"Print via PC\" feature, you can enable this option. You must have a working print queue which is capable of printing Postscript in order to use this feature." -msgstr "Si planea utilizar la característica «Print via PC» (n. de t.: imprimir a través de un PC) de Psion, puede habilitar esta opción. Para utilizar esta característica debe tener configurada una cola de impresión que sea capaz de imprimir a través de Postscript." +msgid "" +"If you intend to use the Psion's \"Print via PC\" feature, you can enable " +"this option. You must have a working print queue which is capable of " +"printing Postscript in order to use this feature." +msgstr "" +"Si planea utilizar la característica «Print via PC» (n. de t.: imprimir a " +"través de un PC) de Psion, puede habilitar esta opción. Para utilizar esta " +"característica debe tener configurada una cola de impresión que sea capaz de " +"imprimir a través de Postscript." #. Type: string #. Description @@ -143,8 +191,12 @@ #. Type: string #. Description #: ../plptools.templates:7001 -msgid "Please enter the name of the print queue you want to use for printing from the Psion." -msgstr "Por favor, introduzca el nombre de la cola de impresión que desea utilizar para imprimir desde un Psion." +msgid "" +"Please enter the name of the print queue you want to use for printing from " +"the Psion." +msgstr "" +"Por favor, introduzca el nombre de la cola de impresión que desea utilizar " +"para imprimir desde un Psion." #. Type: string #. Description @@ -155,11 +207,17 @@ #. Type: string #. Description #: ../plptools.templates:8001 -msgid "Since you have ncpd either disabled or listening on a non-standard address, you should specify the address for the frontends again." -msgstr "Debido a que ha configurado ncpd para escuchar en una dirección no estándar o lo ha deshabilitado, debe introducir nuevamente la dirección de la interfaz." +msgid "" +"Since you have ncpd either disabled or listening on a non-standard address, " +"you should specify the address for the frontends again." +msgstr "" +"Debido a que ha configurado ncpd para escuchar en una dirección no estándar " +"o lo ha deshabilitado, debe introducir nuevamente la dirección de la " +"interfaz." #~ msgid "Set SUID-root bit of plpnfsd?" #~ msgstr "¿Definir el bit de SUID-root para plpnfsd?" + #~ msgid "" #~ "For convenience on a single-user machine, plpnfsd can be installed with " #~ "the setuid bit enabled. This allows any local user to mount and unmount a " @@ -174 +231,0 @@ - diff -u plptools-1.0.9/debian/po/ru.po plptools-1.0.9/debian/po/ru.po --- plptools-1.0.9/debian/po/ru.po +++ plptools-1.0.9/debian/po/ru.po @@ -12,12 +12,13 @@ "PO-Revision-Date: 2010-01-04 13:04+0300\n" "Last-Translator: Yuri Kozlov \n" "Language-Team: Russian \n" +"Language: ru\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Generator: KBabel 1.11.4\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%" -"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" +"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" #. Type: note #. Description diff -u plptools-1.0.9/debian/po/vi.po plptools-1.0.9/debian/po/vi.po --- plptools-1.0.9/debian/po/vi.po +++ plptools-1.0.9/debian/po/vi.po @@ -10,6 +10,7 @@ "PO-Revision-Date: 2010-03-12 18:19+0930\n" "Last-Translator: Clytie Siddall \n" "Language-Team: Vietnamese \n" +"Language: vi\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff -u plptools-1.0.9/debian/po/nl.po plptools-1.0.9/debian/po/nl.po --- plptools-1.0.9/debian/po/nl.po +++ plptools-1.0.9/debian/po/nl.po @@ -11,6 +11,7 @@ "PO-Revision-Date: 2007-04-29 14:56+0100\n" "Last-Translator: Bart Cornelis \n" "Language-Team: debian-l10n-dutch \n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" diff -u plptools-1.0.9/debian/po/sv.po plptools-1.0.9/debian/po/sv.po --- plptools-1.0.9/debian/po/sv.po +++ plptools-1.0.9/debian/po/sv.po @@ -11,6 +11,7 @@ "PO-Revision-Date: 2010-01-07 22:36+0100\n" "Last-Translator: Martin Bagge \n" "Language-Team: Swedish \n" +"Language: sv\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" diff -u plptools-1.0.9/debian/po/pt.po plptools-1.0.9/debian/po/pt.po --- plptools-1.0.9/debian/po/pt.po +++ plptools-1.0.9/debian/po/pt.po @@ -12,6 +12,7 @@ "PO-Revision-Date: 2010-03-16 22:29+0000\n" "Last-Translator: Miguel Figueiredo \n" "Language-Team: Portuguese \n" +"Language: pt\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff -u plptools-1.0.9/debian/po/de.po plptools-1.0.9/debian/po/de.po --- plptools-1.0.9/debian/po/de.po +++ plptools-1.0.9/debian/po/de.po @@ -12,6 +12,7 @@ "PO-Revision-Date: 2010-01-02 17:00+0100\n" "Last-Translator: Helge Kreutzmann \n" "Language-Team: de \n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -139,8 +140,8 @@ "ein Psion angeschlossen wird und dann den Psion automatisch in den " "Verzeichnisbaum einhängen. Da dies als root ausgeführt wird, werden " "nichtprivilegierte Nutzer keinen Zugang zu dem eingehängten Verzeichnis " -"haben. Falls Sie einen Ein-Benutzer-Rechner haben, möchten Sie wahrscheinlich " -"plpfuse manuell starten, wenn Sie es benötigen." +"haben. Falls Sie einen Ein-Benutzer-Rechner haben, möchten Sie " +"wahrscheinlich plpfuse manuell starten, wenn Sie es benötigen." #. Type: boolean #. Description diff -u plptools-1.0.9/debian/po/cs.po plptools-1.0.9/debian/po/cs.po --- plptools-1.0.9/debian/po/cs.po +++ plptools-1.0.9/debian/po/cs.po @@ -15,10 +15,11 @@ msgstr "" "Project-Id-Version: plptools\n" "Report-Msgid-Bugs-To: plptools@packages.debian.org\n" -"POT-Creation-Date: 2008-07-25 23:42+0100\n" +"POT-Creation-Date: 2009-12-31 16:42+0000\n" "PO-Revision-Date: 2009-06-27 10:25+0200\n" "Last-Translator: Miroslav Kure \n" "Language-Team: Czech \n" +"Language: cs\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -157,9 +158,9 @@ "this option. You must have a working print queue which is capable of " "printing Postscript in order to use this feature." msgstr "" -"Plánujete-li využívat vlastnost Psionu nazvanou „Tisk pÅ™es PC“, můžete " -"tuto možnost povolit. Aby to ovÅ¡em fungovalo, musíte mít také funkÄní " -"tiskovou frontu, která je schopna vytisknout PostScript." +"Plánujete-li využívat vlastnost Psionu nazvanou „Tisk pÅ™es PC“, můžete tuto " +"možnost povolit. Aby to ovÅ¡em fungovalo, musíte mít také funkÄní tiskovou " +"frontu, která je schopna vytisknout PostScript." #. Type: string #. Description diff -u plptools-1.0.9/debian/po/it.po plptools-1.0.9/debian/po/it.po --- plptools-1.0.9/debian/po/it.po +++ plptools-1.0.9/debian/po/it.po @@ -11,6 +11,7 @@ "PO-Revision-Date: 2010-03-11 09:04+0100\n" "Last-Translator: Vincenzo Campanella \n" "Language-Team: Italian \n" +"Language: it\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -131,11 +132,12 @@ "you have a single-user machine, you probably want to start plpfuse manually " "when you need it." msgstr "" -"Se plpfuse viene eseguito all'avvio del sistema, attenderà che un dispositivo " -"Psion venga collegato e lo monterà automaticamente. Poiché questa operazione " -"viene eseguita come root, gli utenti senza privilegi non avranno alcun " -"accesso alla directory di montaggio. Se si ha una macchina monoutente " -"probabilmente si sceglierà di eseguire plpfuse manualmente quando necessario." +"Se plpfuse viene eseguito all'avvio del sistema, attenderà che un " +"dispositivo Psion venga collegato e lo monterà automaticamente. Poiché " +"questa operazione viene eseguita come root, gli utenti senza privilegi non " +"avranno alcun accesso alla directory di montaggio. Se si ha una macchina " +"monoutente probabilmente si sceglierà di eseguire plpfuse manualmente quando " +"necessario." #. Type: boolean #. Description @@ -190 +191,0 @@ -