[Pkg-kde-commits] rev 321 - in branches/kde-3.3.2/kdenetwork/debian: . patches
Adeodato Sim??
dato-guest@haydn.debian.org
Thu, 16 Dec 2004 18:53:55 -0700
Author: dato-guest
Date: 2004-12-16 18:53:30 -0700 (Thu, 16 Dec 2004)
New Revision: 321
Added:
branches/kde-3.3.2/kdenetwork/debian/patches/01_kdenetwork_branch.diff
branches/kde-3.3.2/kdenetwork/debian/patches/06_automake-1.9.diff
Modified:
branches/kde-3.3.2/kdenetwork/debian/changelog
branches/kde-3.3.2/kdenetwork/debian/control
Log:
Usual first steps.
Modified: branches/kde-3.3.2/kdenetwork/debian/changelog
===================================================================
--- branches/kde-3.3.2/kdenetwork/debian/changelog 2004-12-17 01:43:14 UTC (rev 320)
+++ branches/kde-3.3.2/kdenetwork/debian/changelog 2004-12-17 01:53:30 UTC (rev 321)
@@ -1,3 +1,14 @@
+kdenetwork (4:3.3.2-1~pre1) unstable; urgency=low
+
+ * New upstream release.
+
+ * KDE_3_3_BRANCH update.
+
+ * debian/control:
+ - removed build-dependency on automake1.9.
+
+ -- Adeodato Simó <asp16@alu.ua.es> Fri, 17 Dec 2004 02:48:03 +0100
+
kdenetwork (4:3.3.1-2) unstable; urgency=low
* reapply kget patch, Closes: #280616
Modified: branches/kde-3.3.2/kdenetwork/debian/control
===================================================================
--- branches/kde-3.3.2/kdenetwork/debian/control 2004-12-17 01:43:14 UTC (rev 320)
+++ branches/kde-3.3.2/kdenetwork/debian/control 2004-12-17 01:53:30 UTC (rev 321)
@@ -3,8 +3,8 @@
Priority: optional
Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
Uploaders: Christopher L Cheney <ccheney@debian.org>, Riku Voipio <riku.voipio@iki.fi>
-Build-Depends: automake1.9, debhelper (>> 4.2.0), docbook-to-man, doxygen, gawk, gettext, kdelibs4-dev (>> 4:3.3.0), libgadu-dev, libiw-dev, libslp-dev, libtiff4-dev, libxml2-dev, libxslt1-dev, qt3-doc, sharutils, valgrind [i386], xlibs-static-pic, xmms-dev
-Standards-Version: 3.6.1.0
+Build-Depends: debhelper (>> 4.2.0), docbook-to-man, doxygen, gawk, gettext, kdelibs4-dev (>> 4:3.3.0), libgadu-dev, libiw-dev, libslp-dev, libtiff4-dev, libxml2-dev, libxslt1-dev, qt3-doc, sharutils, valgrind [i386], xlibs-static-pic, xmms-dev
+Standards-Version: 3.6.1
Package: kdenetwork
Section: kde
Added: branches/kde-3.3.2/kdenetwork/debian/patches/01_kdenetwork_branch.diff
===================================================================
--- branches/kde-3.3.2/kdenetwork/debian/patches/01_kdenetwork_branch.diff 2004-12-17 01:43:14 UTC (rev 320)
+++ branches/kde-3.3.2/kdenetwork/debian/patches/01_kdenetwork_branch.diff 2004-12-17 01:53:30 UTC (rev 321)
@@ -0,0 +1,358 @@
+diff -Nrua -x CVS -x CVS kdenetwork-3.3.2/admin/acinclude.m4.in kdenetwork/admin/acinclude.m4.in
+--- kdenetwork-3.3.2/admin/acinclude.m4.in 2004-12-17 02:44:33.000000000 +0100
++++ kdenetwork/admin/acinclude.m4.in 2004-12-09 22:22:14.000000000 +0100
+@@ -4254,7 +4254,8 @@
+
+ AC_DEFUN([KDE_CHECK_PYTHON],
+ [
+- KDE_CHECK_PYTHON_INTERN("2.3",
++ KDE_CHECK_PYTHON_INTERN("2.4",
++ [KDE_CHECK_PYTHON_INTERN("2.3",
+ [KDE_CHECK_PYTHON_INTERN("2.2",
+ [KDE_CHECK_PYTHON_INTERN("2.1",
+ [KDE_CHECK_PYTHON_INTERN("2.0",
+@@ -4262,6 +4263,7 @@
+ ])
+ ])
+ ])
++ ])
+ ])
+
+ AC_DEFUN([KDE_CHECK_STL],
+diff -Nrua -x CVS -x CVS kdenetwork-3.3.2/kopete/kopete/chatwindow/chatview.cpp kdenetwork/kopete/kopete/chatwindow/chatview.cpp
+--- kdenetwork-3.3.2/kopete/kopete/chatwindow/chatview.cpp 2004-12-17 02:44:34.000000000 +0100
++++ kdenetwork/kopete/kopete/chatwindow/chatview.cpp 2004-12-15 18:33:22.000000000 +0100
+@@ -85,17 +85,20 @@
+ #define ID_TT 97
+ #define ID_UL 99
+
++class ChatViewMembersTip;
+
+ class KopeteChatViewPrivate
+ {
+ public:
+ KopeteXSLT *xsltParser;
++ ChatViewMembersTip *membersTip;
+ };
+
+ class ChatViewMembersTip : public QToolTip
+ {
+ public:
+ ChatViewMembersTip( KListView *parent );
++ ~ChatViewMembersTip();
+ void maybeTip( const QPoint &pos );
+
+ private:
+@@ -107,6 +110,12 @@
+ m_listView = parent;
+ }
+
++ChatViewMembersTip::~ChatViewMembersTip()
++{
++ remove( m_listView->viewport() );
++}
++
++
+ void ChatViewMembersTip::maybeTip( const QPoint &pos )
+ {
+ if( !m_listView )
+@@ -279,6 +288,7 @@
+ m_type = KopeteMessage::Chat;
+ m_mainWindow = 0L;
+ membersDock = 0L;
++ d->membersTip = 0;
+ backgroundFile = QString::null;
+ root = 0L;
+ isActive = false;
+@@ -320,7 +330,7 @@
+ saveOptions();
+
+ delete mComplete;
+-
++ delete d->membersTip;
+ delete d;
+ }
+
+@@ -368,6 +378,7 @@
+ KFileDialog dlg( QString::null, QString::fromLatin1( "text/html text/xml text/plain" ), this , "fileSaveDialog", false );
+ dlg.setCaption( i18n( "Save Conversation" ) );
+ dlg.setOperationMode( KFileDialog::Saving );
++ dlg.setMode( KFile::LocalOnly ); // We can't save remotely using QTextStream
+
+ if( dlg.exec() != QDialog::Accepted )
+ return;
+@@ -537,7 +548,7 @@
+ QString::fromLatin1( "membersDock" ), QString::fromLatin1( " " ) );
+ membersList = new KListView( this, "membersList" );
+ membersList->setShowToolTips( false );
+- new ChatViewMembersTip( membersList );
++ d->membersTip = new ChatViewMembersTip( membersList );
+ membersList->setAllColumnsShowFocus( true );
+ membersList->addColumn( i18n("Chat Members"), -1 );
+ membersList->setSorting( 0, true );
+diff -Nrua -x CVS -x CVS kdenetwork-3.3.2/kopete/plugins/connectionstatus/connectionstatusplugin.cpp kdenetwork/kopete/plugins/connectionstatus/connectionstatusplugin.cpp
+--- kdenetwork-3.3.2/kopete/plugins/connectionstatus/connectionstatusplugin.cpp 2004-12-17 02:44:35.000000000 +0100
++++ kdenetwork/kopete/plugins/connectionstatus/connectionstatusplugin.cpp 2004-12-07 20:01:35.000000000 +0100
+@@ -65,7 +65,7 @@
+ // netstat -rn in slotProcessStdout() to see if it mentions the
+ // default gateway. If so, we're connected, if not, we're offline
+ m_process = new KProcess;
+- *m_process << "netstat" << "-rn";
++ *m_process << "netstat" << "-r";
+
+ connect( m_process, SIGNAL( receivedStdout( KProcess *, char *, int ) ), this, SLOT( slotProcessStdout( KProcess *, char *, int ) ) );
+ connect( m_process, SIGNAL( processExited( KProcess * ) ), this, SLOT( slotProcessExited( KProcess * ) ) );
+diff -Nrua -x CVS -x CVS kdenetwork-3.3.2/kopete/plugins/translator/kopete_translator_config.desktop kdenetwork/kopete/plugins/translator/kopete_translator_config.desktop
+--- kdenetwork-3.3.2/kopete/plugins/translator/kopete_translator_config.desktop 2004-12-17 02:44:35.000000000 +0100
++++ kdenetwork/kopete/plugins/translator/kopete_translator_config.desktop 2004-12-14 08:29:53.000000000 +0100
+@@ -14,6 +14,7 @@
+ Name[ar]=المترجم
+ Name[be]=Перакладчык
+ Name[bg]=Преводач
++Name[br]=Troer
+ Name[bs]=Prevodilac
+ Name[ca]=Traductor
+ Name[cs]=Překladač
+diff -Nrua -x CVS -x CVS kdenetwork-3.3.2/kopete/plugins/translator/kopete_translator.desktop kdenetwork/kopete/plugins/translator/kopete_translator.desktop
+--- kdenetwork-3.3.2/kopete/plugins/translator/kopete_translator.desktop 2004-12-17 02:44:35.000000000 +0100
++++ kdenetwork/kopete/plugins/translator/kopete_translator.desktop 2004-12-14 08:29:52.000000000 +0100
+@@ -18,6 +18,7 @@
+ Name[ar]=المترجم
+ Name[be]=Перакладчык
+ Name[bg]=Преводач
++Name[br]=Troer
+ Name[bs]=Prevodilac
+ Name[ca]=Traductor
+ Name[cs]=Překladač
+diff -Nrua -x CVS -x CVS kdenetwork-3.3.2/kopete/protocols/gadu/gadudcctransaction.cpp kdenetwork/kopete/protocols/gadu/gadudcctransaction.cpp
+--- kdenetwork-3.3.2/kopete/protocols/gadu/gadudcctransaction.cpp 2004-12-17 02:44:35.000000000 +0100
++++ kdenetwork/kopete/protocols/gadu/gadudcctransaction.cpp 2004-12-13 13:48:58.000000000 +0100
+@@ -44,14 +44,14 @@
+ #include "libgadu.h"
+
+ GaduDCCTransaction::GaduDCCTransaction( gg_dcc* socket, GaduDCC* parent, const char* name )
+-:QObject( parent, name ), read_( NULL ), write_( NULL ), account( NULL ), contact( NULL ), transfer_( NULL )
++:QObject( parent, name ), read_( NULL ), write_( NULL ), account( NULL ), contact( NULL ), transfer_( NULL ), peer( 0 )
+ {
+ dccSock_ = socket;
+ gaduDCC_ = parent;
+ }
+
+ GaduDCCTransaction::GaduDCCTransaction( gg_dcc* socket, GaduContact* cont, GaduDCC* parent, const char* name )
+-:QObject( parent, name), read_( NULL ), write_( NULL ), account( NULL ), contact( cont ), transfer_( NULL )
++:QObject( parent, name), read_( NULL ), write_( NULL ), account( NULL ), contact( cont ), transfer_( NULL ), peer( 0 )
+ {
+ dccSock_ = socket;
+ gaduDCC_ = parent;
+diff -Nrua -x CVS -x CVS kdenetwork-3.3.2/kopete/protocols/gadu/gadudcctransaction.h kdenetwork/kopete/protocols/gadu/gadudcctransaction.h
+--- kdenetwork-3.3.2/kopete/protocols/gadu/gadudcctransaction.h 2004-12-17 02:44:35.000000000 +0100
++++ kdenetwork/kopete/protocols/gadu/gadudcctransaction.h 2004-12-13 13:48:58.000000000 +0100
+@@ -79,7 +79,7 @@
+ KopeteTransfer* transfer_;
+ long transferId_;
+ QFile localFile_;
+- bool peer;
++ int peer;
+ unsigned int incoming;
+ GaduDCC* gaduDCC_;
+ };
+diff -Nrua -x CVS -x CVS kdenetwork-3.3.2/kopete/protocols/gadu/libgadu/common.c kdenetwork/kopete/protocols/gadu/libgadu/common.c
+--- kdenetwork-3.3.2/kopete/protocols/gadu/libgadu/common.c 2004-12-17 02:44:35.000000000 +0100
++++ kdenetwork/kopete/protocols/gadu/libgadu/common.c 2004-12-07 13:58:34.000000000 +0100
+@@ -1,4 +1,4 @@
+-/* $Id: common.c,v 1.1.4.1 2004/10/29 13:41:21 gj Exp $ */
++/* $Id: common.c,v 1.1.4.2 2004/12/07 12:58:34 djurban Exp $ */
+
+ /*
+ * (C) Copyright 2001-2002 Wojtek Kaniewski <wojtekka@irc.pl>
+@@ -613,7 +613,7 @@
+ if (!res)
+ return NULL;
+
+- while (j <= len) {
++ while (j < len) {
+ switch (i % 4) {
+ case 0:
+ k = (buf[j] & 252) >> 2;
+diff -Nrua -x CVS -x CVS kdenetwork-3.3.2/kopete/protocols/gadu/libgadu/libgadu.c kdenetwork/kopete/protocols/gadu/libgadu/libgadu.c
+--- kdenetwork-3.3.2/kopete/protocols/gadu/libgadu/libgadu.c 2004-12-17 02:44:35.000000000 +0100
++++ kdenetwork/kopete/protocols/gadu/libgadu/libgadu.c 2004-12-15 22:30:21.000000000 +0100
+@@ -1,4 +1,4 @@
+-/* $Id: libgadu.c,v 1.1.4.1 2004/10/29 13:41:21 gj Exp $ */
++/* $Id: libgadu.c,v 1.1.4.2 2004/12/15 21:30:21 djurban Exp $ */
+
+ /*
+ * (C) Copyright 2001-2003 Wojtek Kaniewski <wojtekka@irc.pl>
+@@ -71,7 +71,7 @@
+ #ifdef __GNUC__
+ __attribute__ ((unused))
+ #endif
+-= "$Id: libgadu.c,v 1.1.4.1 2004/10/29 13:41:21 gj Exp $";
++= "$Id: libgadu.c,v 1.1.4.2 2004/12/15 21:30:21 djurban Exp $";
+ #endif
+
+ /*
+@@ -240,6 +240,8 @@
+ struct gg_resolve_pthread_data *d = arg;
+ struct in_addr a;
+
++ pthread_detach(pthread_self());
++
+ if ((a.s_addr = inet_addr(d->hostname)) == INADDR_NONE) {
+ struct in_addr *hn;
+
+diff -Nrua -x CVS -x CVS kdenetwork-3.3.2/kopete/protocols/jabber/jabberresourcepool.cpp kdenetwork/kopete/protocols/jabber/jabberresourcepool.cpp
+--- kdenetwork-3.3.2/kopete/protocols/jabber/jabberresourcepool.cpp 2004-12-17 02:44:36.000000000 +0100
++++ kdenetwork/kopete/protocols/jabber/jabberresourcepool.cpp 2004-11-30 03:13:09.000000000 +0100
+@@ -204,7 +204,7 @@
+ {
+ if ( (mResource->jid().userHost().lower() == jid.userHost().lower()) )
+ {
+- mLockList.remove ();
++ mLockList.remove (mResource);
+ }
+ }
+
+diff -Nrua -x CVS -x CVS kdenetwork-3.3.2/krfb/kcm_krfb/kcm_krfb.cpp kdenetwork/krfb/kcm_krfb/kcm_krfb.cpp
+--- kdenetwork-3.3.2/krfb/kcm_krfb/kcm_krfb.cpp 2004-12-17 02:44:40.000000000 +0100
++++ kdenetwork/krfb/kcm_krfb/kcm_krfb.cpp 2004-12-14 11:01:24.000000000 +0100
+@@ -47,7 +47,7 @@
+ extern "C" {
+ void *init_kcm_krfb() {
+ KGlobal::locale()->insertCatalogue("krfb"); // For invitation translations
+- return new KcmKRfbFactory("kcm_krfb");
++ return new KcmKRfbFactory("kcm_krfb");
+ }
+ }
+
+@@ -80,9 +80,9 @@
+ connect(m_confWidget->allowDesktopControlCB, SIGNAL(clicked()), SLOT(configChanged()) );
+ connect(m_confWidget->autoPortCB, SIGNAL(clicked()), SLOT(configChanged()) );
+ connect(m_confWidget->portInput, SIGNAL(valueChanged(int)), SLOT(configChanged()) );
+- connect((QObject*)m_confWidget->manageInvitations, SIGNAL(clicked()),
++ connect((QObject*)m_confWidget->manageInvitations, SIGNAL(clicked()),
+ &m_configuration, SLOT(showManageInvitationsDialog()) );
+- connect(&m_configuration, SIGNAL(invitationNumChanged(int)),
++ connect(&m_configuration, SIGNAL(invitationNumChanged(int)),
+ this, SLOT(setInvitationNum(int)));
+ setInvitationNum(m_configuration.invitations().size());
+ connect(m_confWidget->disableBackgroundCB, SIGNAL(clicked()), SLOT(configChanged()) );
+@@ -151,6 +151,7 @@
+ m_configuration.setPreferredPort(m_confWidget->portInput->value());
+ m_configuration.setDisableBackground(m_confWidget->disableBackgroundCB->isChecked());
+ m_configuration.save();
++ kapp->dcopClient()->emitDCOPSignal("KRFB::ConfigChanged", "KRFB_ConfigChanged()", QByteArray());
+ emit changed(false);
+ }
+
+diff -Nrua -x CVS -x CVS kdenetwork-3.3.2/krfb/krfb/configuration.cc kdenetwork/krfb/krfb/configuration.cc
+--- kdenetwork-3.3.2/krfb/krfb/configuration.cc 2004-12-17 02:44:40.000000000 +0100
++++ kdenetwork/krfb/krfb/configuration.cc 2004-12-14 11:01:24.000000000 +0100
+@@ -54,6 +54,9 @@
+ saveToDialogs();
+ doKinetdConf();
+
++ connectDCOPSignal( 0, "KRFB::ConfigChanged", "KRFB_ConfigChanged()",
++ "updateKConfig()", false );
++
+ connect(invMngDlg.newPersonalInvitationButton, SIGNAL(clicked()),
+ SLOT(showPersonalInvitationDialog()));
+ connect(invMngDlg.newEmailInvitationButton, SIGNAL(clicked()), SLOT(inviteEmail()));
+@@ -83,6 +86,11 @@
+ save();
+ }
+
++void Configuration::updateKConfig()
++{
++ loadFromKConfig();
++}
++
+ void Configuration::setKInetdEnabled(bool enabled) {
+ kinetdRef.send("setEnabled", QString("krfb"), enabled);
+ kinetdRef.send("setEnabled", QString("krfb_httpd"), enabled);
+diff -Nrua -x CVS -x CVS kdenetwork-3.3.2/krfb/krfb/configuration.h kdenetwork/krfb/krfb/configuration.h
+--- kdenetwork-3.3.2/krfb/krfb/configuration.h 2004-12-17 02:44:40.000000000 +0100
++++ kdenetwork/krfb/krfb/configuration.h 2004-12-14 11:01:24.000000000 +0100
+@@ -38,17 +38,19 @@
+ KRFB_CONFIGURATION_MODE
+ };
+
++#include <dcopobject.h>
+
+ /**
+ * This class stores the app's configuration, manages the
+ * standalone-config-dialog and all the invitation dialogs
+ * @author Tim Jansen
+ */
+-class Configuration : public QObject {
++class Configuration : public QObject, public DCOPObject {
++ K_DCOP
+ Q_OBJECT
+ public:
+ Configuration(krfb_mode mode);
+- ~Configuration();
++ virtual ~Configuration();
+
+ krfb_mode mode() const;
+ bool askOnConnect() const;
+@@ -122,6 +124,12 @@
+
+ bool disableBackgroundFlag;
+ bool disableXShmFlag;
++
++k_dcop:
++ // Connected to the DCOP signal
++ void updateKConfig();
++
++
+ private slots:
+ void refreshTimeout();
+
+diff -Nrua -x CVS -x CVS kdenetwork-3.3.2/krfb/krfb/eventsrc kdenetwork/krfb/krfb/eventsrc
+--- kdenetwork-3.3.2/krfb/krfb/eventsrc 2004-12-17 02:44:41.000000000 +0100
++++ kdenetwork/krfb/krfb/eventsrc 2004-12-14 08:29:53.000000000 +0100
+@@ -271,6 +271,7 @@
+ Name=ConnectionClosed
+ Name[ar]=اتصال مغلق
+ Name[bg]=Връзката е прекъсната
++Name[br]=Kevreadur serret
+ Name[ca]=Connexió tancada
+ Name[cs]=Spojení ukončeno
+ Name[cy]=CysylltiadArGau
+diff -Nrua -x CVS -x CVS kdenetwork-3.3.2/krfb/krfb/Makefile.am kdenetwork/krfb/krfb/Makefile.am
+--- kdenetwork-3.3.2/krfb/krfb/Makefile.am 2004-12-17 02:44:40.000000000 +0100
++++ kdenetwork/krfb/krfb/Makefile.am 2004-12-14 11:01:24.000000000 +0100
+@@ -3,7 +3,7 @@
+ METASOURCES = AUTO
+
+ noinst_LTLIBRARIES = libkrfbconfig.la
+-libkrfbconfig_la_SOURCES = configuration.cc manageinvitations.ui \
++libkrfbconfig_la_SOURCES = configuration.cc configuration.skel manageinvitations.ui \
+ personalinvitation.ui invite.ui invitation.cc
+ libkrfbconfig_la_LIBADD = ../srvloc/libsrvloc.la $(LIB_KDEUI)
+
+diff -Nrua -x CVS -x CVS kdenetwork-3.3.2/krfb/krfb_httpd/krfb_httpd kdenetwork/krfb/krfb_httpd/krfb_httpd
+--- kdenetwork-3.3.2/krfb/krfb_httpd/krfb_httpd 2004-12-17 02:44:41.000000000 +0100
++++ kdenetwork/krfb/krfb_httpd/krfb_httpd 2004-12-13 13:47:12.000000000 +0100
+@@ -35,7 +35,7 @@
+ content="
+ <HTML><HEAD><TITLE>$LOGNAME's desktop</TITLE></HEAD>
+ <BODY>
+-<APPLET CODE=vncviewer.class ARCHIVE=vncviewer.jar WIDTH=$width HEIGHT=$height>
++<APPLET CODE=VncViewer.class ARCHIVE=VncViewer.jar WIDTH=$width HEIGHT=$height>
+ <param name=PORT value=$port>
+ </APPLET>
+ </BODY></HTML>"
+diff -Nrua -x CVS -x CVS kdenetwork-3.3.2/wifi/main.cpp kdenetwork/wifi/main.cpp
+--- kdenetwork-3.3.2/wifi/main.cpp 2004-12-17 02:44:41.000000000 +0100
++++ kdenetwork/wifi/main.cpp 2004-12-05 21:36:21.000000000 +0100
+@@ -42,8 +42,7 @@
+ {
+ KAboutData aboutData ("kwifimanager", I18N_NOOP ("KWiFiManager"), VERSION,
+ description, KAboutData::License_GPL,
+- "(c) 2001-04, Stefan Winter", 0, 0,
+- "mail@stefan-winter.de");
++ "(c) 2001-04, Stefan Winter");
+ aboutData.addAuthor ("Stefan Winter", 0, "mail@stefan-winter.de");
+ KCmdLineArgs::init (argc, argv, &aboutData);
+ KCmdLineArgs::addCmdLineOptions (options); // Add our own options.
Added: branches/kde-3.3.2/kdenetwork/debian/patches/06_automake-1.9.diff
===================================================================
--- branches/kde-3.3.2/kdenetwork/debian/patches/06_automake-1.9.diff 2004-12-17 01:43:14 UTC (rev 320)
+++ branches/kde-3.3.2/kdenetwork/debian/patches/06_automake-1.9.diff 2004-12-17 01:53:30 UTC (rev 321)
@@ -0,0 +1,11 @@
+--- a/admin/detect-autoconf.sh
++++ b/admin/detect-autoconf.sh
+@@ -11,7 +11,7 @@
+ # needed to compile KDE. Do not forget to include the name/version #
+ # separator if one is present, e.g. -1.2 where - is the separator.
+ KDE_AUTOCONF_VERS="-2.58 -2.57 257 -2.54 -2.53a -2.53 -2.52 -2.5x"
+-KDE_AUTOMAKE_VERS="-1.7 17 -1.6"
++KDE_AUTOMAKE_VERS="-1.9 -1.7 17 -1.6"
+
+ # We don't use variable here for remembering the type ... strings. Local
+ # variables are not that portable, but we fear namespace issues with our