From adec25f54995debcaa165864eaaf4654802f0ca0 Mon Sep 17 00:00:00 2001 From: Fritz Elfert Date: Tue, 16 Jul 2002 05:58:13 +0000 Subject: - Debian package now nearly finished - Applied patches from Chris Halls --- debian/changelog | 6 +--- debian/control | 23 +++++++++------- debian/klipsi.files | 3 +- debian/kpsion.files | 5 ++-- debian/kpsion.override | 4 +++ debian/plptools-kde.dirs | 1 - debian/plptools-kde.files | 10 +++---- debian/plptools-kde.override | 1 - debian/plptools-kde.postinst | 44 ++++++++++++++++++++++++++++++ debian/plptools-kde.prerm | 35 ++++++++++++++++++++++++ debian/plptools.config | 11 ++++++++ debian/plptools.init | 65 ++++++++++++++++++++++++++++++++------------ debian/plptools.menu | 3 -- debian/plptools.postinst | 20 +++++++------- debian/plptools.postrm | 25 +++++++++++++++++ debian/plptools.templates | 16 +++++++---- debian/rules | 5 ++-- 17 files changed, 214 insertions(+), 63 deletions(-) create mode 100644 debian/kpsion.override delete mode 100644 debian/plptools-kde.dirs delete mode 100644 debian/plptools-kde.override create mode 100644 debian/plptools-kde.postinst create mode 100644 debian/plptools-kde.prerm create mode 100644 debian/plptools.config create mode 100644 debian/plptools.postrm (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index f7ce4ff..d2d86e4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -plptools (0.11-1) unstable; urgency=low +plptools (0.11-0) unstable; urgency=low * New upstream version * Made separate binaries for KDE dependant programs @@ -25,7 +25,3 @@ plptools (0.7-1) unstable; urgency=low * Initial Release. -- John Lines Wed, 13 Dec 2000 11:35:52 +0000 - -Local variables: -mode: debian-changelog -End: diff --git a/debian/control b/debian/control index d221449..e118c0f 100644 --- a/debian/control +++ b/debian/control @@ -1,16 +1,16 @@ Source: plptools -Build-Depends: debhelper (>= 4.0.2), automake (>= 1:1.4-p4-1.1), autoconf, libtool, gettext, libncurses5-dev, libreadline4-dev, libnewt-dev, kdoc, libqt-dev, kdebase-dev +Build-Depends: debhelper (>= 4.0.2), automake (>= 1:1.4-p4-1.1) | automake1.6, autoconf, libtool, gettext, libncurses5-dev, libreadline4-dev, libnewt-dev, kdoc, libqt-dev|libqt3-dev, kdebase-dev Section: otherosfs Priority: optional Maintainer: John Lines -Standards-Version: 3.5.6 +Standards-Version: 3.5.6.1 Package: plptools Architecture: any Depends: ${shlibs:Depends}, debconf Description: Access a Psion PDA over a serial link This package lets you access Psion drives over a serial link. You - can mount them, pseudo NFS style, access them ftp-like, use a local + can mount them, pseudo NFS style, access them FTP-like, use a local printer from the Psion (Psion S5 only) and perform backup/restore. . The software is partially based on p3nfs, which is also packed for @@ -22,29 +22,32 @@ Architecture: any Section: devel Depends: plptools (= ${Source-Version}) Description: plptools (development files) - You need these files if you want to build programs which use libplp. + This package provides a static library, headers and API documentation + for plptools development. You need these files if you want to build + programs which use libplp. Package: plptools-kde Architecture: any -Depends: ${shlibs:Depends}, kdebase-libs, konqueror +Depends: ${shlibs:Depends} +Suggests: konqueror Enhances: kdebase Description: KDE integration of plptools This package provides integrated access to a Psion PDA into KDE Using a kioslave, any KDE compliant application can access files on - a Psion using a new URL protocol type "psion:/". Furthermore, a plugin + a Psion using a new URI protocol type "psion:/". Furthermore, a plug-in for KDE's advanced file manager konqueror adds Psion-related entries to it's property dialog. Package: kpsion Architecture: any -Depends: ${shlibs:Depends}, kdebase-libs +Depends: ${shlibs:Depends} Description: Backup and Restore of a Psion PDA - This package provides a KDE frontend for backup/restore of a Psion PDA + This package provides a KDE front-end for backup/restore of a Psion PDA Package: klipsi Architecture: any -Depends: ${shlibs:Depends}, kdebase-libs +Depends: ${shlibs:Depends} Description: Remote Cut&Paste for Psion PDA - This package provides a KDE systray application which allows to share + This package provides a KDE sys-tray application which allows to share KDE's clipboard remotely with a Psion PDA. diff --git a/debian/klipsi.files b/debian/klipsi.files index 945f63c..11e1b1c 100644 --- a/debian/klipsi.files +++ b/debian/klipsi.files @@ -1,5 +1,6 @@ usr/bin/klipsi -usr/lib/klipsi.* +usr/lib/klipsi.la +usr/lib/klipsi.so usr/share/applnk/*/klipsi* usr/share/apps/klipsi/* usr/share/icons/*/*/apps/klipsi* diff --git a/debian/kpsion.files b/debian/kpsion.files index b5e53b5..9462dd0 100644 --- a/debian/kpsion.files +++ b/debian/kpsion.files @@ -1,5 +1,5 @@ usr/bin/kpsion -usr/lib/libkpsion.so.* +usr/lib/libkpsion.so usr/lib/libkpsion.la usr/share/applnk/*/kpsion* usr/share/apps/kpsion/* @@ -7,5 +7,6 @@ usr/share/apps/konqueror/* usr/share/icons/*/*/apps/kpsion* usr/share/icons/*/*/actions/psion* usr/share/locale/*/LC_MESSAGES/kpsion.mo -usr/share/doc/HTML/*/kpsion +usr/share/doc/kde/HTML/*/kpsion usr/share/man/man1/kpsion.1 +usr/share/lintian/overrides/kpsion diff --git a/debian/kpsion.override b/debian/kpsion.override new file mode 100644 index 0000000..7d743b3 --- /dev/null +++ b/debian/kpsion.override @@ -0,0 +1,4 @@ +kpsion: menu-item-contains-unknown-tag kderemove /usr/lib/menu/kpsion:7 +kpsion: no-shlibs-control-file usr/lib/libkpsion.so +kpsion: postinst-must-call-ldconfig usr/lib/libkpsion.so +kpsion: postrm-should-call-ldconfig usr/lib/libkpsion.so diff --git a/debian/plptools-kde.dirs b/debian/plptools-kde.dirs deleted file mode 100644 index 1da8fba..0000000 --- a/debian/plptools-kde.dirs +++ /dev/null @@ -1 +0,0 @@ -usr/share/lintian/overrides diff --git a/debian/plptools-kde.files b/debian/plptools-kde.files index 2cf544c..ee569ad 100644 --- a/debian/plptools-kde.files +++ b/debian/plptools-kde.files @@ -1,11 +1,11 @@ -usr/lib/kio_plp.so -usr/lib/kio_plp.la -usr/lib/libplpprops.so.* -usr/lib/libplpprops.la +usr/lib/kde*/kio_plp.so +usr/lib/kde*/kio_plp.la +usr/lib/kde*/libplpprops.so +usr/lib/kde*/libplpprops.la usr/share/services/* usr/share/icons/*/*/mimetypes/* usr/share/icons/*/*/devices/* usr/share/icons/*/*/apps/psion* usr/share/locale/*/LC_MESSAGES/libplpprops.mo usr/share/mimelnk/*/* -usr/share/lintian/overrides/plptools-kde +usr/share/doc/kde/HTML/*/kioslave/* diff --git a/debian/plptools-kde.override b/debian/plptools-kde.override deleted file mode 100644 index 91fbc72..0000000 --- a/debian/plptools-kde.override +++ /dev/null @@ -1 +0,0 @@ -plptools-kde: shlib-missing-in-control-file kio_plp.so usr/lib/kio_plp.so diff --git a/debian/plptools-kde.postinst b/debian/plptools-kde.postinst new file mode 100644 index 0000000..468896b --- /dev/null +++ b/debian/plptools-kde.postinst @@ -0,0 +1,44 @@ +#! /bin/sh + +set -e + +# +# Workaround for a mis-feature (bug?) in kdelibs: +# If mimetype is inode/x-directory, then always the folder-icon is displayed. +# If mimetype is something else, open dialog pops up. So, for displaying +# Psion's drive icons _AND_ opening drives without annoying dialog, +# modify konquerorrc to hide dialog when opening a Psion-drive +# +case "$1" in + configure) + KONQRC=`kde-config --expandvars --install config`/konquerorrc + if test -f $KONQRC && grep -q '\[Notification Messages\]' $KONQRC ; then + cp $KONQRC $KONQRC.$$ + cat $KONQRC.$$ | grep -v "askSaveinode/x-psion-drive=No" | sed \ + -e '/\[Notification Messages\]/a\' \ + -e 'askSaveinode/x-psion-drive=No' > $KONQRC && \ + rm -f $KONQRC.$$ + else + cat>>$KONQRC<<-EOF + + [Notification Messages] + askSaveinode/x-psion-drive=No + EOF + fi + ;; + + abort-upgrade|abort-remove|abort-deconfigure) + ;; + + *) + echo "postinst called with unknown argument \`$1'" >&2 + exit 0 + ;; +esac + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +#DEBHELPER# + +exit 0 diff --git a/debian/plptools-kde.prerm b/debian/plptools-kde.prerm new file mode 100644 index 0000000..d658fba --- /dev/null +++ b/debian/plptools-kde.prerm @@ -0,0 +1,35 @@ +#! /bin/sh +# prerm script for plptools-kde +# +# see: dh_installdeb(1) + +set -e + +# +# Workaround for a mis-feature (bug?) in kdelibs: +# If mimetype is inode/x-directory, then always the folder-icon is displayed. +# If mimetype is something else, open dialog pops up. So, for displaying +# Psion's drive icons _AND_ opening drives without annoying dialog, +# modify konquerorrc to hide dialog when opening a Psion-drive +# + +case "$1" in + remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear) + KONQRC=`kde-config --expandvars --install config`/konquerorrc + if test -f $KONQRC ; then + cp $KONQRC $KONQRC.$$ + grep -v 'askSaveinode/x-psion-drive=' $KONQRC.$$ > $KONQRC && rm -f $KONQRC.$$ + fi + ;; + *) + echo "prerm called with unknown argument \`$1'" >&2 + exit 0 + ;; +esac + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +#DEBHELPER# + +exit 0 diff --git a/debian/plptools.config b/debian/plptools.config new file mode 100644 index 0000000..6fe411f --- /dev/null +++ b/debian/plptools.config @@ -0,0 +1,11 @@ +#! /bin/sh + +set -e +# Use debconf baby +. /usr/share/debconf/confmodule + +# minimalistic for now ;-) +db_text medium plptools/customize || true +db_go + +exit 0 diff --git a/debian/plptools.init b/debian/plptools.init index 1108970..7c250d4 100644 --- a/debian/plptools.init +++ b/debian/plptools.init @@ -2,30 +2,63 @@ # # start or stop the plptools daemon # -# This file was automatically customized by dh-make on Wed, 13 Dec 2000 11:35:52 +0000 -PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin -DAEMON=/usr/sbin/ncpd +PATH=/sbin:/bin:/usr/sbin:/usr/bin +DAEMON1=/usr/sbin/ncpd +DAEMON2=/usr/sbin/plpnfsd +DAEMON3=/usr/sbin/plpprintd NAME=plptools DESC=plptools -SERIAL=/dev/ttyS0 +CONFIG=/etc/plptools.conf -test -f $DAEMON || exit 0 +test -x $DAEMON1 || exit 0 +test -x $DAEMON2 || exit 0 +test -x $DAEMON3 || exit 0 +test -f $CONFIG && . $CONFIG || exit 0 set -e case "$1" in start) - echo -n "Starting $DESC: " + echo -n "Starting $DESC ($DAEMON1): " start-stop-daemon --start --quiet \ - --exec $DAEMON -- -s $SERIAL - echo "$NAME." + --exec $DAEMON1 -- $NCPD_ARGS && \ + echo -n "done" || echo -n "already running" + echo "." + if test "$START_PLPNFSD" = "yes" ; then + echo -n "Starting $DESC ($DAEMON2): " + start-stop-daemon --start --quiet \ + --exec $DAEMON2 -- $PLPNFSD_ARGS && \ + echo -n "done" || echo -n "already running" + echo "." + fi + if test "$START_PLPPRINTD" = "yes" ; then + echo -n "Starting $DESC ($DAEMON3): " + start-stop-daemon --start --quiet \ + --exec $DAEMON3 -- $PLPPRINTD_ARGS && \ + echo -n "done" || echo -n "already running" + echo "." + fi ;; stop) - echo -n "Stopping $DESC: " - start-stop-daemon --stop --quiet \ - --exec $DAEMON - echo "$NAME." + if test "$START_PLPNFSD" = "yes" ; then + echo -n "Stopping $DESC ($DAEMON2): " + start-stop-daemon --stop --schedule HUP/5/TERM/1 --quiet \ + --exec $DAEMON2 && \ + echo -n "done" || echo -n "already stopped" + echo "." + fi + if test "$START_PLPPRINTD" = "yes" ; then + echo -n "Stopping $DESC ($DAEMON3): " + start-stop-daemon --stop --quiet --exec $DAEMON3 && \ + echo -n "done" || echo -n "already stopped" + echo "." + fi + echo -n "Stopping $DESC ($DAEMON1): " + start-stop-daemon --stop --quiet --exec $DAEMON1 && \ + echo -n "done" || echo -n "already stopped" + echo "." + ;; #reload) # @@ -45,13 +78,9 @@ case "$1" in # option to the "reload" entry above. If not, "force-reload" is # just the same as "restart". # - echo -n "Restarting $DESC: " - start-stop-daemon --stop --quiet --pidfile \ - /var/run/$NAME.pid --exec $DAEMON + $0 stop sleep 1 - start-stop-daemon --start --quiet --pidfile \ - /var/run/$NAME.pid --exec $DAEMON - echo "$NAME." + $0 start ;; *) N=/etc/init.d/$NAME diff --git a/debian/plptools.menu b/debian/plptools.menu index 4dd06d6..a3f1427 100644 --- a/debian/plptools.menu +++ b/debian/plptools.menu @@ -1,5 +1,2 @@ ?package(plptools):needs=text section=Apps/Tools\ title="plpftp" command="/usr/bin/plpftp" - -?package(plptools):needs=text section=Apps/Tools\ - title="plpbackup" command="/usr/bin/plpbackup" diff --git a/debian/plptools.postinst b/debian/plptools.postinst index 4704349..6b5db45 100644 --- a/debian/plptools.postinst +++ b/debian/plptools.postinst @@ -24,18 +24,16 @@ set -e # `abort-remove' or `abort-deconfigure'. case "$1" in - configure) + configure) + ;; - ;; + abort-upgrade|abort-remove|abort-deconfigure) + ;; - abort-upgrade|abort-remove|abort-deconfigure) - - ;; - - *) - echo "postinst called with unknown argument \`$1'" >&2 - exit 0 - ;; + *) + echo "postinst called with unknown argument \`$1'" >&2 + exit 0 + ;; esac # dh_installdeb will replace this with shell code automatically @@ -43,6 +41,8 @@ esac #DEBHELPER# +db_stop + exit 0 diff --git a/debian/plptools.postrm b/debian/plptools.postrm new file mode 100644 index 0000000..6b5752e --- /dev/null +++ b/debian/plptools.postrm @@ -0,0 +1,25 @@ +#! /bin/sh +# postrm script for plptools +# +# see: dh_installdeb(1) + +set -e + +case "$1" in + remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear) + ;; + + purge) + rm -f /etc/plptools.conf + ;; + + *) + echo "postrm called with unknown argument \`$1'" >&2 + exit 0 + ;; + +esac + +#DEBHELPER# + +exit 0 diff --git a/debian/plptools.templates b/debian/plptools.templates index f0eb4ee..01232e0 100644 --- a/debian/plptools.templates +++ b/debian/plptools.templates @@ -1,14 +1,20 @@ -Template: plptools/setup +Template: plptools/customize Type: note -Description: In addition to plptools' main daemon "ncpd", plptools provides - two optional daemons: +Description: Customize /etc/plptools.conf + In addition to plptools' main daemon "ncpd", plptools provides two optional + daemons: + . plpnfsd (for nfs-like mounting a Psion's drives) plpprintd (for printing via PC from a Psion Series 5) + . Both daemons are disabled by default. You can enable them by editing /etc/plptools.conf. -Description-de: Zusätzlich zum Haupt-Daemon "ncpd", stellt das Packet plptools - zwei optionale Daemonen zur Verfügung: +Description-de: Anpassung von /etc/plptools.conf + Zusätzlich zum Haupt-Daemon "ncpd", stellt das Packet plptools zwei + optionale Daemonen zur Verfügung: + . plpnfsd (zum Einhängen von Psion-Laufwerken - ähnlich wie NFS) plpprintd (zum Drucken via PC von einem Psion Serie 5) + . Beide Daemonen sind standardmäßig abgeschaltet. Sie können aktiviert weden, indem die Datei /etc/plptools.conf editiert wird. diff --git a/debian/rules b/debian/rules index 28c430f..644f289 100755 --- a/debian/rules +++ b/debian/rules @@ -10,6 +10,7 @@ export DH_COMPAT=3 tmp = $(shell pwd)/debian/tmp ltmp = $(tmp)/usr/share/lintian/overrides +hdir = $(shell kde-config --expandvars -install html) %.1: %.1.in MANDATE=`grep CHECKIN $< | awk '{print $$4}'` ; \ @@ -56,7 +57,7 @@ install: build debian/kpsion.1 debian/klipsi.1 dh_clean -k dh_installdirs # install into debian/tmp. - $(MAKE) DESTDIR=$(tmp) install + $(MAKE) DESTDIR=$(tmp) kde_htmldir=$(hdir) install install -d $(tmp)/etc install -d $(ltmp) install -m 644 debian/plptools.conf $(tmp)/etc @@ -100,7 +101,7 @@ binary-arch: build install dh_installchangelogs dh_link dh_strip - dh_compress + dh_compress -a -X.docbook -X.css -X-license -X.dcl -X.bz2 dh_fixperms # You may want to make some executables suid here. # dh_suidregister -- cgit v1.2.3