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 --- Makefile.am | 10 ++- Makefile.cvs | 2 +- README | 20 ++++- conf/am_edit | 47 +++++++++-- conf/m4/kde/AC_CREATE_KFSSTND.m4 | 165 ++++++++++++++++++++------------------- conf/m4/kde/AC_SUBST_KFSSTND.m4 | 1 + conf/m4/kde/KDE_VERSION.m4 | 2 + configure.in | 2 + 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 +- etc/plptools.spec.in | 22 ++++-- kde2/kioslave/Makefile.am | 10 +-- kde2/klipsi/Makefile.am | 2 +- kde2/kpsion/Makefile.am | 4 +- kde2/plugins/Makefile.am | 11 ++- lib/Makefile.am | 2 +- po/de.po | 20 ++--- po/sv.po | 20 ++--- 33 files changed, 418 insertions(+), 199 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 diff --git a/Makefile.am b/Makefile.am index 1fc6c75..243dc1d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -9,14 +9,16 @@ endif SUBDIRS = intl po lib ncpd plpnfsd plpftp plpbackup plpprint sisinstall \ $(KDESUB) doc . + EXTRA_DIST = CHANGES COPYING README TODO INSTALL ABOUT-NLS include/*.h* \ - etc/*magic etc/*.in etc/*.c etc/psidump* patches conf/m4/kde/*.m4 \ + etc/*magic etc/*.in etc/*.c etc/psidump* conf/m4/kde/*.m4 \ conf/m4/plptools/*.m4 conf/[a-l]* conf/missing conf/mkinstalldirs \ - debian + debian/* patches/* DISTCLEANFILES = etc/psion etc/psion.SuSE etc/psion.SuSE8 AUTOMAKE_OPTIONS = foreign TMPDEST= + # # remove all intermediate files that can be recreated using # Makefile.cvs @@ -40,10 +42,12 @@ dist-hook: test -f CVS/Root && conf/cvs2cl -W 1800 -S --no-wrap --prune \ --gmt -f $(distdir)/ChangeLog || \ cp -f ChangeLog $(distdir)/ChangeLog + # remove CVS from debian/ and patches/ subdirs + rm -rf $(distdir)/debian/CVS $(distdir)/patches/CVS kdoc: kdoc -d $(TMPDEST)doc/api -n libplp --strip-h-path $(TMPDEST)lib/*.h specfile: - sed -e "s/_VERSION_/$(VERSION)/" < $(TMPDEST)etc/plptools.spec.in \ + sed -e "s/\@VERSION\@/$(VERSION)/" < $(TMPDEST)etc/plptools.spec.in \ > $(TMPDEST)etc/plptools.spec diff --git a/Makefile.cvs b/Makefile.cvs index cba308d..8a3e59b 100644 --- a/Makefile.cvs +++ b/Makefile.cvs @@ -39,7 +39,7 @@ $(CONFIGHIN): acconfig.h configure.in autoheader $(LIBTOOLFILES): - libtoolize + libtoolize --force $(GETTEXT): $(ACLOCAL) echo n | gettextize -f diff --git a/README b/README index 7dcda99..aea3d44 100644 --- a/README +++ b/README @@ -87,7 +87,7 @@ --enable-kde Enable build of KDE related stuff. This needs installed - KDE 2.1 headers/development-libraries as well as QT 2.2.4 + KDE (>= 2) headers/development-libraries as well as QT (>= 2.2.4) headers/development-libraries. --with-kdedir=/path/to/your/kde @@ -107,6 +107,12 @@ Same as above. Use these, when automatic detection fails. + --with-kdeversion=X + + Override the KDE version detection manually. Only needed in + special cases where more than one KDE version is installed and + autodetection fails. X can be either 2 or 3. + You will get 6 programs and a shared and static library (in case you enabled KDE: 8 Programs 4 shared libraries). By default, the install-prefix is /usr/local, so you probably @@ -114,7 +120,15 @@ ldconfig after installation. Another option is to run configure with the option --prefix=/usr - IMPORTANT NOTE: + NOTE: + Although the subdirectory for KDE stuff is named "kde2", this is only + for historical reason. The package builds on KDE2 as well as KDE3. + It tries to figure out the version of KDE automatically. People who have + both versions installed should carefully watch the output of configure. + The KDEDIR as well as KDE's version can be overridden via commandline + (see above). + + IMPORTANT NOTE about the following descriptions: Please read the man pages ncpd(8) plpftp(1), plpnfsd(8) plpprintd(8), sisinstall(1) and plpbackup(1)! The information there is more up-to-date. @@ -169,7 +183,7 @@ KDE STUFF - The KDE2 KIOslave library adds support for a new protocol named + The KDE KIOslave library adds support for a new protocol named "psion:". So in konqueror, just open psion:/ to see your Psion's drives. You now can copy, move, rename, open ... all those operations you are used to. Any KDE application which supports diff --git a/conf/am_edit b/conf/am_edit index 0f7ad8a..9cb2ca6 100644 --- a/conf/am_edit +++ b/conf/am_edit @@ -345,19 +345,39 @@ sub processMakefile ($) appendLines($cvs_lines); $target_adds{"clean"} .= "kde-rpo-clean "; - foreach $add (keys %target_adds) { - my $lookup = "$add:\s*(.*)"; + # some strange people like to do a install-exec, and expect that also + # all modules are installed. automake doesn't know this, so we need to move + # this here from install-data to install-exec. + if ($MakefileData =~ m/\nkdemodule_LTLIBRARIES\s*=/) { + $target_adds{"install-exec-am"} .= "install-kdemoduleLTLIBRARIES"; + my $lookup = 'install-data-am:\s*(.*)'; if ($MakefileData =~ /\n$lookup\n/) { - substituteLine($lookup, "$add: " . $target_adds{$add} . $1); + my $newdeps = $1; + $newdeps =~ s/\s*install-kdemoduleLTLIBRARIES\s*/ /g; + substituteLine($lookup, "install-data-am: " . $newdeps); } } + + my $lines = ""; + + foreach $add (keys %target_adds) { + my $lookup = quotemeta($add) . ':([^\n]*)'; + if ($MakefileData =~ /\n$lookup\n/) { + substituteLine($lookup, "$add: " . $target_adds{$add} . $1); + } else { + $lines .= "$add: " . $target_adds{$add} . "\n"; + } + } + if ($lines) { + appendLines($lines); + } my $found = 1; while ($found) { if ($MakefileData =~ m/\n(.*)\$\(CXXFLAGS\)(.*)\n/) { - my $vor = $1; - my $nach = $2; + my $vor = $1; # "vor" means before in German + my $nach = $2; # "nach" means after in German my $lookup = quotemeta("$1\$(CXXFLAGS)$2"); my $replacement = "$1\$(KCXXFLAGS)$2"; $MakefileData =~ s/$lookup/$replacement/; @@ -369,8 +389,24 @@ sub processMakefile ($) } } +# $lookup = '(\n[^#].*\$\(LIBTOOL\) --mode=link) (\$\(CXXLD\).*\$\(KCXXFLAGS\))'; +# +# if ($MakefileData =~ m/$lookup/ ) { +# $MakefileData =~ s/$lookup/$1 --tag=CXX $2/; +# } +# +# $lookup = '(\n[^#].*\$\(LIBTOOL\) --mode=compile) (\$\(CXX\).*\$\(KCXXFLAGS\))'; +# if ($MakefileData =~ m/$lookup/ ) { +# $MakefileData =~ s/$lookup/$1 --tag=CXX $2/; +# } + $MakefileData =~ s/\$\(KCXXFLAGS\)/\$\(CXXFLAGS\)/g; + $lookup = '(.*)cp -pr \$\$/\$\$file \$\(distdir\)/\$\$file(.*)'; + if ($MakefileData =~ m/\n$lookup\n/) { + substituteLine($lookup, "$1cp -pr \$\$d/\$\$file \$(distdir)/\$\$file$2"); + } + # Always update the Makefile.in updateMakefile (); return; @@ -1078,6 +1114,7 @@ sub tag_ICON() 'hi22' => 'hicolor/22x22', 'hi32' => 'hicolor/32x32', 'hi48' => 'hicolor/48x48', + 'hi64' => 'hicolor/64x64', 'hisc' => 'hicolor/scalable' ); diff --git a/conf/m4/kde/AC_CREATE_KFSSTND.m4 b/conf/m4/kde/AC_CREATE_KFSSTND.m4 index de4653c..bc8485b 100644 --- a/conf/m4/kde/AC_CREATE_KFSSTND.m4 +++ b/conf/m4/kde/AC_CREATE_KFSSTND.m4 @@ -1,92 +1,95 @@ -AC_DEFUN(AC_CREATE_KFSSTND, -[ -AC_MSG_CHECKING([for KDE paths]) -kde_result="" +AC_DEFUN(AC_CREATE_KFSSTND,[ + AC_REQUIRE([KDE_VERSION]) + AC_MSG_CHECKING([for KDE paths]) + kde_result="" -AC_CACHE_VAL(kde_cv_all_paths, -[ - if test -z "$kde_htmldir"; then - kde_htmldir='\$(kde_prefix)/share/doc/HTML' - fi - if test -z "$kde_appsdir"; then - kde_appsdir='\$(kde_prefix)/share/applnk' - fi - if test -z "$kde_icondir"; then - kde_icondir='\$(kde_prefix)/share/icons' - fi - if test -z "$kde_sounddir"; then - kde_sounddir='\$(kde_prefix)/share/sounds' - fi - if test -z "$kde_datadir"; then - kde_datadir='\$(kde_prefix)/share/apps' - fi - if test -z "$kde_locale"; then - kde_locale='\$(kde_prefix)/share/locale' - fi - if test -z "$kde_cgidir"; then - kde_cgidir='\$(kde_exec_prefix)/cgi-bin' - fi - if test -z "$kde_confdir"; then - kde_confdir='\$(kde_prefix)/share/config' - fi - if test -z "$kde_mimedir"; then - kde_mimedir='\$(kde_prefix)/share/mimelnk' - fi - if test -z "$kde_toolbardir"; then - kde_toolbardir='\$(kde_prefix)/share/toolbar' - fi - if test -z "$kde_wallpaperdir"; then - kde_wallpaperdir='\$(kde_prefix)/share/wallpapers' - fi - if test -z "$kde_bindir"; then - kde_bindir='\$(kde_exec_prefix)/bin' - fi - if test -z "$kde_servicesdir"; then - kde_servicesdir='\$(kde_prefix)/share/services' - fi - if test -z "$kde_servicetypesdir"; then - kde_servicetypesdir='\$(kde_prefix)/share/servicetypes' - fi + AC_CACHE_VAL(kde_cv_all_paths,[ + if test -z "$kde_htmldir"; then + kde_htmldir='\$(kde_prefix)/share/doc/HTML' + fi + if test -z "$kde_appsdir"; then + kde_appsdir='\$(kde_prefix)/share/applnk' + fi + if test -z "$kde_icondir"; then + kde_icondir='\$(kde_prefix)/share/icons' + fi + if test -z "$kde_sounddir"; then + kde_sounddir='\$(kde_prefix)/share/sounds' + fi + if test -z "$kde_datadir"; then + kde_datadir='\$(kde_prefix)/share/apps' + fi + if test -z "$kde_locale"; then + kde_locale='\$(kde_prefix)/share/locale' + fi + if test -z "$kde_cgidir"; then + kde_cgidir='\$(kde_exec_prefix)/cgi-bin' + fi + if test -z "$kde_confdir"; then + kde_confdir='\$(kde_prefix)/share/config' + fi + if test -z "$kde_mimedir"; then + kde_mimedir='\$(kde_prefix)/share/mimelnk' + fi + if test -z "$kde_toolbardir"; then + kde_toolbardir='\$(kde_prefix)/share/toolbar' + fi + if test -z "$kde_wallpaperdir"; then + kde_wallpaperdir='\$(kde_prefix)/share/wallpapers' + fi + if test -z "$kde_bindir"; then + kde_bindir='\$(kde_exec_prefix)/bin' + fi + if test -z "$kde_servicesdir"; then + kde_servicesdir='\$(kde_prefix)/share/services' + fi + if test -z "$kde_servicetypesdir"; then + kde_servicetypesdir='\$(kde_prefix)/share/servicetypes' + fi + if test -z "$kde_moduledir"; then + kde_moduledir='\$(kde_exec_prefix)/lib/kde\$(kdeversion)' + fi - kde_cv_all_paths="kde_have_all_paths=\"yes\" \ - kde_htmldir=\"$kde_htmldir\" \ - kde_appsdir=\"$kde_appsdir\" \ - kde_icondir=\"$kde_icondir\" \ - kde_sounddir=\"$kde_sounddir\" \ - kde_datadir=\"$kde_datadir\" \ - kde_locale=\"$kde_locale\" \ - kde_cgidir=\"$kde_cgidir\" \ - kde_confdir=\"$kde_confdir\" \ - kde_mimedir=\"$kde_mimedir\" \ - kde_toolbardir=\"$kde_toolbardir\" \ - kde_wallpaperdir=\"$kde_wallpaperdir\" \ - kde_bindir=\"$kde_bindir\" \ - kde_servicesdir=\"$kde_servicesdir\" \ - kde_servicetypesdir=\"$kde_servicetypesdir\" \ - kde_result=defaults" + kde_cv_all_paths="kde_have_all_paths=\"yes\" \ + kde_htmldir=\"$kde_htmldir\" \ + kde_appsdir=\"$kde_appsdir\" \ + kde_icondir=\"$kde_icondir\" \ + kde_sounddir=\"$kde_sounddir\" \ + kde_datadir=\"$kde_datadir\" \ + kde_locale=\"$kde_locale\" \ + kde_cgidir=\"$kde_cgidir\" \ + kde_confdir=\"$kde_confdir\" \ + kde_mimedir=\"$kde_mimedir\" \ + kde_toolbardir=\"$kde_toolbardir\" \ + kde_wallpaperdir=\"$kde_wallpaperdir\" \ + kde_bindir=\"$kde_bindir\" \ + kde_servicesdir=\"$kde_servicesdir\" \ + kde_servicetypesdir=\"$kde_servicetypesdir\" \ + kde_moduledir=\"$kde_moduledir\" \ + kde_result=defaults" -]) + ]) -eval "$kde_cv_all_paths" + eval "$kde_cv_all_paths" -if test -z "$kde_htmldir" || test -z "$kde_appsdir" || - test -z "$kde_icondir" || test -z "$kde_sounddir" || - test -z "$kde_datadir" || test -z "$kde_locale" || - test -z "$kde_cgidir" || test -z "$kde_confdir" || - test -z "$kde_mimedir" || test -z "$kde_toolbardir" || - test -z "$kde_wallpaperdir" || test -z "$kde_bindir" || - test -z "$kde_servicesdir" || - test -z "$kde_servicetypesdir" || test "$kde_have_all_paths" != "yes"; then - kde_have_all_paths=no - AC_MSG_ERROR([configure could not run a little KDE program to test the environment. + if test -z "$kde_htmldir" || test -z "$kde_appsdir" || + test -z "$kde_icondir" || test -z "$kde_sounddir" || + test -z "$kde_datadir" || test -z "$kde_locale" || + test -z "$kde_cgidir" || test -z "$kde_confdir" || + test -z "$kde_mimedir" || test -z "$kde_toolbardir" || + test -z "$kde_wallpaperdir" || test -z "$kde_bindir" || + test -z "$kde_servicesdir" || test -z "$kde_moduledir" || + test -z "$kde_servicetypesdir" || + test "$kde_have_all_paths" != "yes"; then + kde_have_all_paths=no + AC_MSG_ERROR([configure could not run a little KDE program to test the environment. Since it had compiled and linked before, it must be a strange problem on your system. Look at config.log for details. If you are not able to fix this, look at http://www.kde.org/faq/installation.html or any www.kde.org mirror. (If you're using an egcs version on Linux, you may update binutils!) ]) -else - rm -f conftest* - AC_MSG_RESULT($kde_result) -fi - + else + rm -f conftest* + AC_MSG_RESULT($kde_result) + fi ]) diff --git a/conf/m4/kde/AC_SUBST_KFSSTND.m4 b/conf/m4/kde/AC_SUBST_KFSSTND.m4 index 5c1316f..c3d4962 100644 --- a/conf/m4/kde/AC_SUBST_KFSSTND.m4 +++ b/conf/m4/kde/AC_SUBST_KFSSTND.m4 @@ -14,4 +14,5 @@ AC_SUBST(kde_wallpaperdir) AC_SUBST(kde_bindir) AC_SUBST(kde_servicesdir) AC_SUBST(kde_servicetypesdir) +AC_SUBST(kde_moduledir) ]) diff --git a/conf/m4/kde/KDE_VERSION.m4 b/conf/m4/kde/KDE_VERSION.m4 index 37e47b2..65fee9d 100644 --- a/conf/m4/kde/KDE_VERSION.m4 +++ b/conf/m4/kde/KDE_VERSION.m4 @@ -12,4 +12,6 @@ AC_DEFUN(KDE_VERSION, ;; esac AC_MSG_RESULT($ac_kde_version.x) + kdeversion=$ac_kde_version + AC_SUBST(kdeversion) ]) diff --git a/configure.in b/configure.in index 3603810..a91ae5f 100644 --- a/configure.in +++ b/configure.in @@ -310,6 +310,8 @@ if test "x$ac_enable_kde" = "xyes" ; then AC_CHECK_KDEMAXPATHLEN KDE_CHECK_FINAL AM_KDE_WITH_NLS + KDE_PLUGIN="-avoid-version -module -no-undefined \$(KDE_RPATH)" + AC_SUBST(KDE_PLUGIN) AM_CONDITIONAL(BUILD_KDE, true) fi 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 diff --git a/etc/plptools.spec.in b/etc/plptools.spec.in index b5edadb..b3f8b9d 100644 --- a/etc/plptools.spec.in +++ b/etc/plptools.spec.in @@ -228,6 +228,8 @@ cp /etc/rc.config /etc/rc.config.old && mv /etc/rc.config.$$ /etc/rc.config /sbin/insserv -d psion %endif %endif + +%post kde %{_initrddir}/psion condrestart KONQRC=`kde-config --expandvars --install config`/konquerorrc if grep -q '\[Notification Messages\]' $KONQRC ; then @@ -243,7 +245,7 @@ askSaveinode/x-psion-drive=No EOF fi -%preun +%preun kde if [ "$1" = 0 ] then %{_initrddir}/psion stop >/dev/null 2>&1 @@ -269,7 +271,7 @@ fi %{_bindir}/sisinstall %{_sbindir}/* %{_mandir}/*/* -%{_libdir}/libplp.so* +%{_libdir}/libplp.so.* %{_libdir}/libplp.la %{_datadir}/locale/*/LC_MESSAGES/plptools.mo %{_datadir}/%{name}/* @@ -286,23 +288,26 @@ fi %files devel %doc doc/api etc/*.spec %{_libdir}/libplp.a +%{_libdir}/libplp.so %{_includedir}/%{name}/* %files kde -%{_libdir}/kio_plp.so* -%{_libdir}/kio_plp.la -%{_libdir}/libplpprops.so* -%{_libdir}/libplpprops.la +%{_libdir}/kde*/kio_plp.so* +%{_libdir}/kde*/kio_plp.la +%{_libdir}/kde*/libplpprops.so* +%{_libdir}/kde*/libplpprops.la %{_datadir}/services/* %{_datadir}/icons/*/*/mimetypes/* %{_datadir}/icons/*/*/devices/* %{_datadir}/icons/*/*/apps/psion* %{_datadir}/locale/*/LC_MESSAGES/libplpprops.mo %{_datadir}/mimelnk/*/* +%{_datadir}/doc/HTML/*/kioslave/* %files -n kpsion %{_bindir}/kpsion -%{_libdir}/libkpsion.* +%{_libdir}/libkpsion.so +%{_libdir}/libkpsion.la %{_datadir}/applnk/*/kpsion* %{_datadir}/apps/kpsion/* %{_datadir}/apps/konqueror/* @@ -313,7 +318,8 @@ fi %files -n klipsi %{_bindir}/klipsi -%{_libdir}/klipsi.* +%{_libdir}/klipsi.so +%{_libdir}/klipsi.la %{_datadir}/applnk/*/klipsi* %{_datadir}/apps/klipsi/* %{_datadir}/icons/*/*/apps/klipsi* diff --git a/kde2/kioslave/Makefile.am b/kde2/kioslave/Makefile.am index f0efa3a..f306934 100644 --- a/kde2/kioslave/Makefile.am +++ b/kde2/kioslave/Makefile.am @@ -1,19 +1,19 @@ # $Id$ -libdir=$(kde_libraries) - maintainer-clean-local: rm -f Makefile.in INCLUDES = $(all_includes) -I$(top_srcdir)/lib LDFLAGS = $(all_libraries) $(KDE_RPATH) -kio_plp_la_LDFLAGS = -module -avoid-version +kdemoduledir = $(kde_moduledir) +kdemodule_LTLIBRARIES = kio_plp.la -lib_LTLIBRARIES = kio_plp.la +kio_plp_la_LDFLAGS = -module $(KDE_PLUGIN) kio_plp_la_SOURCES = kio_plp.cpp -kio_plp_la_LIBADD = -L$(top_srcdir)/lib/.libs $(top_srcdir)/lib/libplp.la $(LIB_KIO) +kio_plp_la_LIBADD = -L$(top_srcdir)/lib/.libs $(top_srcdir)/lib/libplp.la \ + $(LIB_KIO) noinst_HEADERS = kio_plp.h diff --git a/kde2/klipsi/Makefile.am b/kde2/klipsi/Makefile.am index 1b5ac7b..21e035f 100644 --- a/kde2/klipsi/Makefile.am +++ b/kde2/klipsi/Makefile.am @@ -29,7 +29,7 @@ klipsi_LDFLAGS = $(all_libraries) $(KDE_RPATH) applnkdir = $(kde_appsdir)/Utilities applnk_DATA = klipsi.desktop -EXTRA_DIST += $(applnk_DATA) +EXTRA_DIST = $(applnk_DATA) appsdir = $(kde_datadir)/klipsi apps_DATA = eventsrc diff --git a/kde2/kpsion/Makefile.am b/kde2/kpsion/Makefile.am index 51e748c..5c7550b 100644 --- a/kde2/kpsion/Makefile.am +++ b/kde2/kpsion/Makefile.am @@ -18,7 +18,7 @@ DISTCLEANFILES = $(kpsion_METASOURCES) ./.deps/* ./.deps/.P lib_LTLIBRARIES = libkpsion.la bin_PROGRAMS = kpsion -libkpsion_la_LDFLAGS = $(LIBDEBUG) $(all_libraries) -module -version-info $(LIBVERSION) +libkpsion_la_LDFLAGS = $(LIBDEBUG) $(all_libraries) -module -avoid-version libkpsion_la_SOURCES = kpsion.cpp setupdialog.cpp wizards.cpp \ statusbarprogress.cpp kpsionconfig.cpp kpsionbackuplistview.cpp \ kpsionrestoredialog.cpp @@ -31,7 +31,7 @@ kpsion_LDADD = libkpsion.la $(top_srcdir)/lib/libplp.la $(LIB_KDECORE) $(LIB_KDE applnk_DATA = kpsion.desktop applnkdir = $(kde_appsdir)/Utilities -EXTRA_DIST += kpsion.desktop +EXTRA_DIST = kpsion.desktop rcdir = $(kde_datadir)/kpsion rc_DATA = kpsionui.rc diff --git a/kde2/plugins/Makefile.am b/kde2/plugins/Makefile.am index f8e20f7..e0cfb82 100644 --- a/kde2/plugins/Makefile.am +++ b/kde2/plugins/Makefile.am @@ -1,14 +1,13 @@ -libdir=$(kde_libraries) - INCLUDES = $(all_includes) -I$(top_srcdir)/lib LDFLAGS = $(all_libraries) -libplpprops_la_LDFLAGS = $(LIBDEBUG) $(all_libraries) -module -no-undefined -version-info $(LIBVERSION) +kdemoduledir = $(kde_moduledir) +kdemodule_LTLIBRARIES = libplpprops.la -METASOURCES = AUTO +libplpprops_la_LDFLAGS = $(LIBDEBUG) $(all_libraries) $(KDE_PLUGIN) -lib_LTLIBRARIES = libplpprops.la +METASOURCES = AUTO libplpprops_la_SOURCES = plpprops.cc plppropsFactory.cc pie3dpiece.cpp \ pie3dwidget.cpp @@ -17,7 +16,7 @@ noinst_HEADERS = plpprops.h plppropsFactory.h pie3dpiece.h pie3dwidget.h services_DATA = plpprops.desktop servicesdir = $(kde_servicesdir) -EXTRA_DIST += $(services_DATA) +EXTRA_DIST = $(services_DATA) messages: $(XGETTEXT) -C -ki18n -kI18N_NOOP -ktranslate -kaliasLocale *.cc *.cpp *.h && mv messages.po ../po/libplpprops.pot diff --git a/lib/Makefile.am b/lib/Makefile.am index d419387..10f4358 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -1,6 +1,6 @@ # $Id$ # -INCLUDES += -I$(top_srcdir)/intl +INCLUDES = -I$(top_srcdir)/intl CFLAGS = $(THREADED_CFLAGS) CXXFLAGS = $(THREADED_CXXFLAGS) diff --git a/po/de.po b/po/de.po index 2dc63c3..346ceac 100644 --- a/po/de.po +++ b/po/de.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: plptools 0.11\n" -"POT-Creation-Date: 2002-07-15 00:16+0200\n" +"POT-Creation-Date: 2002-07-16 06:23+0200\n" "PO-Revision-Date: 2002-07-08 00:06CET\n" "Last-Translator: Fritz Elfert \n" "Language-Team: Deutsch \n" @@ -552,7 +552,7 @@ msgstr "Keine Antwort vom ncpd" msgid "Not present" msgstr "Nicht vorhanden" -#: lib/plpdirent.cc:176 ncpd/link.cc:59 +#: lib/plpdirent.cc:176 ncpd/link.cc:57 msgid "Unknown" msgstr "Unbekannt" @@ -1710,7 +1710,7 @@ msgstr "Konnte SIS-Datei nicht parsen.\n" msgid "Installation complete. Press any key to exit." msgstr "Installation beendet. Beenden mit beliebiger Taste." -#: ncpd/main.cc:145 +#: ncpd/main.cc:147 msgid "" "Usage: ncpd [OPTIONS]...\n" "\n" @@ -1756,17 +1756,17 @@ msgstr "" " -s, --serial=DEV Benutze serielle Schnittstelle DEV.\n" " -b, --baudrate=RATE Setze Schnittstellengeschwindigkeit auf BAUD.\n" -#: ncpd/main.cc:170 +#: ncpd/main.cc:172 msgid " Default: " msgstr " Vorgabe: " -#: ncpd/main.cc:172 +#: ncpd/main.cc:174 msgid "" " Default: Autocycle 115.2k, 57.6k 38.4k, 19.2k\n" msgstr "" " Vorgabe: Automatisch 115.2k, 57.6k 38.4k, 19.2k\n" -#: ncpd/main.cc:175 +#: ncpd/main.cc:177 msgid "" " -p, --port=[HOST:]PORT Listen on host HOST, port PORT.\n" " Default for HOST: 127.0.0.1\n" @@ -1776,19 +1776,19 @@ msgstr "" " Vorgabe für HOST: 127.0.0.1\n" " Vorgabe für PORT: " -#: ncpd/main.cc:183 +#: ncpd/main.cc:185 msgid "Try `ncpd --help' for more information" msgstr "Versuchen Sie `ncpd --help' für weitere Informationen." -#: ncpd/main.cc:275 +#: ncpd/main.cc:277 msgid "ncpd Version " msgstr "ncpd Version " -#: ncpd/link.cc:60 +#: ncpd/link.cc:58 msgid "SIBO" msgstr "SIBO" -#: ncpd/link.cc:61 +#: ncpd/link.cc:59 msgid "EPOC" msgstr "EPOC" diff --git a/po/sv.po b/po/sv.po index 8bafd10..e09ffde 100644 --- a/po/sv.po +++ b/po/sv.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: plptools 0.11\n" -"POT-Creation-Date: 2002-07-15 00:16+0200\n" +"POT-Creation-Date: 2002-07-16 06:23+0200\n" "PO-Revision-Date: 2002-07-11 09:10+0200\n" "Last-Translator: Daniel Brahneborg \n" "Language-Team: SWEDISH \n" @@ -552,7 +552,7 @@ msgstr "inget svar fr msgid "Not present" msgstr "Inte tillgänglig" -#: lib/plpdirent.cc:176 ncpd/link.cc:59 +#: lib/plpdirent.cc:176 ncpd/link.cc:57 msgid "Unknown" msgstr "Okänd" @@ -1719,7 +1719,7 @@ msgstr "Kunde inte parsa sisfilen.\n" msgid "Installation complete. Press any key to exit." msgstr "" -#: ncpd/main.cc:145 +#: ncpd/main.cc:147 msgid "" "Usage: ncpd [OPTIONS]...\n" "\n" @@ -1744,36 +1744,36 @@ msgid "" " -b, --baudrate=RATE Set serial speed to BAUD.\n" msgstr "" -#: ncpd/main.cc:170 +#: ncpd/main.cc:172 msgid " Default: " msgstr "" -#: ncpd/main.cc:172 +#: ncpd/main.cc:174 msgid "" " Default: Autocycle 115.2k, 57.6k 38.4k, 19.2k\n" msgstr "" -#: ncpd/main.cc:175 +#: ncpd/main.cc:177 msgid "" " -p, --port=[HOST:]PORT Listen on host HOST, port PORT.\n" " Default for HOST: 127.0.0.1\n" " Default for PORT: " msgstr "" -#: ncpd/main.cc:183 +#: ncpd/main.cc:185 #, fuzzy msgid "Try `ncpd --help' for more information" msgstr "Prova 'plpftp --help' för mer information" -#: ncpd/main.cc:275 +#: ncpd/main.cc:277 msgid "ncpd Version " msgstr "" -#: ncpd/link.cc:60 +#: ncpd/link.cc:58 msgid "SIBO" msgstr "" -#: ncpd/link.cc:61 +#: ncpd/link.cc:59 msgid "EPOC" msgstr "" -- cgit v1.2.3