This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2godesktopsharing. commit 6d376a1081faa9ae240d0fca821502fc32cba593 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Sat Nov 10 03:32:44 2018 +0100 Drop KDevelop configuration files. --- .kdev4/x2godesktopsharing-3.0.1.kdev4 | 2 - debian/changelog | 6 +- x2godesktopsharing-3.0.1.kdev4 | 3 - x2godesktopsharing.kdevelop | 124 ---------------------------------- x2godesktopsharing.kdevses | 43 ------------ 5 files changed, 5 insertions(+), 173 deletions(-) diff --git a/.kdev4/x2godesktopsharing-3.0.1.kdev4 b/.kdev4/x2godesktopsharing-3.0.1.kdev4 deleted file mode 100644 index df7eacc..0000000 --- a/.kdev4/x2godesktopsharing-3.0.1.kdev4 +++ /dev/null @@ -1,2 +0,0 @@ -[Buildset] -BuildItems=@Variant(\x00\x00\x00\t\x00\x00\x00\x00\x01\x00\x00\x00\x0b\x00\x00\x00\x00\x01\x00\x00\x000\x00x\x002\x00g\x00o\x00d\x00e\x00s\x00k\x00t\x00o\x00p\x00s\x00h\x00a\x00r\x00i\x00n\x00g\x00-\x003\x00.\x000\x00.\x001) diff --git a/debian/changelog b/debian/changelog index d13adf4..05d2d9a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,9 +3,13 @@ x2godesktopsharing (3.1.1.5-0x2go1) UNRELEASED; urgency=medium [ Mihai Moldovan ] * New upstream version (3.1.1.5): * x2godesktopsharing.spec: - - Pull in redhat-rpm-config manually. This should probably be done by + + Pull in redhat-rpm-config manually. This should probably be done by something else, like... gcc or qmake or qt(4)-dev, but it isn't. + [ Mike Gabriel ] + * New upstream version (3.1.1.5): + - Drop KDevelop configuration files. + -- X2Go Release Manager <git-admin@x2go.org> Wed, 15 Nov 2017 22:00:53 +0100 x2godesktopsharing (3.1.1.4-0x2go1) unstable; urgency=medium diff --git a/x2godesktopsharing-3.0.1.kdev4 b/x2godesktopsharing-3.0.1.kdev4 deleted file mode 100644 index 70f84e2..0000000 --- a/x2godesktopsharing-3.0.1.kdev4 +++ /dev/null @@ -1,3 +0,0 @@ -[Project] -Manager=KDevCustomMakeManager -Name=x2godesktopsharing-3.0.1 diff --git a/x2godesktopsharing.kdevelop b/x2godesktopsharing.kdevelop deleted file mode 100644 index eeb3820..0000000 --- a/x2godesktopsharing.kdevelop +++ /dev/null @@ -1,124 +0,0 @@ -<?xml version = '1.0'?> -<kdevelop> - <general> - <author>Oleksandr Shneyder</author> - <email>oleksandr.shneyder@treuchtlingen.de</email> - <version>1</version> - <projectmanagement>KDevTrollProject</projectmanagement> - <primarylanguage>C++</primarylanguage> - <keywords> - <keyword>Qt</keyword> - </keywords> - <projectname>x2godesktopsharing</projectname> - <ignoreparts/> - </general> - <kdevfileview> - <groups> - <group pattern="*.cpp;*.cxx;*.h" name="Sources" /> - <group pattern="*.ui" name="User Interface" /> - <group pattern="*.png" name="Icons" /> - <group pattern="*" name="Others" /> - <hidenonprojectfiles>false</hidenonprojectfiles> - <hidenonlocation>false</hidenonlocation> - </groups> - <tree> - <hidepatterns>*.o,*.lo,CVS</hidepatterns> - <hidenonprojectfiles>false</hidenonprojectfiles> - </tree> - </kdevfileview> - <kdevdoctreeview> - <ignoretocs> - <toc>bash</toc> - <toc>bash_bugs</toc> - <toc>clanlib</toc> - <toc>w3c-dom-level2-html</toc> - <toc>fortran_bugs_gcc</toc> - <toc>gnome1</toc> - <toc>gnustep</toc> - <toc>gtk</toc> - <toc>gtk_bugs</toc> - <toc>haskell</toc> - <toc>haskell_bugs_ghc</toc> - <toc>java_bugs_gcc</toc> - <toc>java_bugs_sun</toc> - <toc>kde2book</toc> - <toc>opengl</toc> - <toc>pascal_bugs_fp</toc> - <toc>php</toc> - <toc>php_bugs</toc> - <toc>perl</toc> - <toc>perl_bugs</toc> - <toc>python</toc> - <toc>python_bugs</toc> - <toc>qt-kdev3</toc> - <toc>ruby</toc> - <toc>ruby_bugs</toc> - <toc>sdl</toc> - <toc>stl</toc> - <toc>w3c-svg</toc> - <toc>sw</toc> - <toc>w3c-uaag10</toc> - <toc>wxwidgets_bugs</toc> - </ignoretocs> - <ignoredoxygen> - <toc>KDE Libraries (Doxygen)</toc> - </ignoredoxygen> - </kdevdoctreeview> - <kdevdebugger> - <general> - <dbgshell/> - </general> - </kdevdebugger> - <kdevcppsupport> - <qt> - <version>3</version> - <used>true</used> - <includestyle>3</includestyle> - <designerintegration>KDevEmbeddedDesigner</designerintegration> - <root>/usr/share/qt3</root> - <qmake>/usr/bin/qmake-qt3</qmake> - <designer>/usr/bin/designer-qt3</designer> - <designerpluginpaths/> - </qt> - <references/> - <codecompletion> - <automaticCodeCompletion>false</automaticCodeCompletion> - <automaticArgumentsHint>true</automaticArgumentsHint> - <automaticHeaderCompletion>true</automaticHeaderCompletion> - <codeCompletionDelay>250</codeCompletionDelay> - <argumentsHintDelay>400</argumentsHintDelay> - <headerCompletionDelay>250</headerCompletionDelay> - <showOnlyAccessibleItems>false</showOnlyAccessibleItems> - <completionBoxItemOrder>0</completionBoxItemOrder> - <howEvaluationContextMenu>true</howEvaluationContextMenu> - <showCommentWithArgumentHint>true</showCommentWithArgumentHint> - <statusBarTypeEvaluation>false</statusBarTypeEvaluation> - <namespaceAliases>std=_GLIBCXX_STD;__gnu_cxx=std</namespaceAliases> - <processPrimaryTypes>true</processPrimaryTypes> - <processFunctionArguments>false</processFunctionArguments> - <preProcessAllHeaders>false</preProcessAllHeaders> - <parseMissingHeadersExperimental>false</parseMissingHeadersExperimental> - <resolveIncludePathsUsingMakeExperimental>false</resolveIncludePathsUsingMakeExperimental> - <alwaysParseInBackground>true</alwaysParseInBackground> - <usePermanentCaching>true</usePermanentCaching> - <alwaysIncludeNamespaces>false</alwaysIncludeNamespaces> - <includePaths>.;</includePaths> - </codecompletion> - </kdevcppsupport> - <kdevfilecreate> - <useglobaltypes> - <type ext="ui" /> - <type ext="cpp" /> - <type ext="h" /> - </useglobaltypes> - </kdevfilecreate> - <kdevtrollproject> - <general> - <activedir></activedir> - </general> - <run> - <directoryradio>executable</directoryradio> - </run> - <subclassing/> - </kdevtrollproject> -</kdevelop> diff --git a/x2godesktopsharing.kdevses b/x2godesktopsharing.kdevses deleted file mode 100644 index 0dddff4..0000000 --- a/x2godesktopsharing.kdevses +++ /dev/null @@ -1,43 +0,0 @@ -<?xml version = '1.0' encoding = 'UTF-8'?> -<!DOCTYPE KDevPrjSession> -<KDevPrjSession> - <DocsAndViews NumberOfDocuments="6" > - <Doc0 NumberOfViews="1" URL="file:///usr/src.cur/db-builds/x2godesktopsharing/x2godesktopsharing-3.0.1/sharetray.cpp" > - <View0 Encoding="" Type="Source" /> - </Doc0> - <Doc1 NumberOfViews="1" URL="file:///usr/share/doc/qt4-doc/html/qtimer.html" > - <View0 Type="Documentation" /> - </Doc1> - <Doc2 NumberOfViews="1" URL="file:///usr/src.cur/db-builds/x2godesktopsharing/x2godesktopsharing-3.0.1/sharetray.h" > - <View0 Encoding="" Type="Source" /> - </Doc2> - <Doc3 NumberOfViews="1" URL="file:///usr/share/doc/qt4-doc/html/qgraphicslayout.html" > - <View0 Type="Documentation" /> - </Doc3> - <Doc4 NumberOfViews="1" URL="file:///usr/share/doc/qt4-doc/html/qgraphicslinearlayout.html#addStretch" > - <View0 Type="Documentation" /> - </Doc4> - <Doc5 NumberOfViews="1" URL="file:///usr/share/doc/qt4-doc/html/qstring.html" > - <View0 Type="Documentation" /> - </Doc5> - </DocsAndViews> - <pluginList> - <kdevdebugger> - <breakpointList/> - <showInternalCommands value="0" /> - </kdevdebugger> - <kdevastyle> - <Extensions ext="*.cpp *.h,*.c *.h,*.cxx *.hxx,*.c++ *.h++,*.cc *.hh,*.C *.H,*.diff,*.inl,*.java,*.moc,*.patch,*.tlh,*.xpm" /> - <AStyle IndentPreprocessors="0" FillCount="3" PadParenthesesOut="0" IndentNamespaces="0" IndentLabels="0" Fill="Spaces" MaxStatement="40" Brackets="Break" MinConditional="-1" IndentBrackets="0" PadParenthesesUn="1" BlockBreak="1" KeepStatements="0" KeepBlocks="0" BlockIfElse="1" IndentSwitches="0" PadOperators="0" FStyle="ANSI" IndentCases="0" FillEmptyLines="0" BracketsCloseHeaders="0" BlockBreakAll="0" PadParenthesesIn="0" IndentClasses="0" IndentBlocks="1" FillForce="0" /> - </kdevastyle> - <kdevbookmarks> - <bookmarks/> - </kdevbookmarks> - <kdevvalgrind> - <executable path="" params="" /> - <valgrind path="" params="" /> - <calltree path="" params="" /> - <kcachegrind path="" /> - </kdevvalgrind> - </pluginList> -</KDevPrjSession> -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2godesktopsharing.git

This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2godesktopsharing. commit ff98348b3a4be60672862ae343be2ecb881d8936 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Sat Nov 10 03:36:21 2018 +0100 simplelocalsocket.cpp: Stop using deprecated QString::toAscii() function (replace it by toLatin1()). --- debian/changelog | 2 ++ main.cpp | 10 +++++----- sharetray.cpp | 2 +- simplelocalsocket.cpp | 5 ++--- 4 files changed, 10 insertions(+), 9 deletions(-) diff --git a/debian/changelog b/debian/changelog index 0ffeb0f..7be2bc9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,6 +10,8 @@ x2godesktopsharing (3.1.1.5-0x2go1) UNRELEASED; urgency=medium * New upstream version (3.1.1.5): - Drop KDevelop configuration files. - x2godesktopsharing.pro: Define TARGET as x2godesktopsharing. + - simplelocalsocket.cpp: Stop using deprecated QString::toAscii() function + (replace it by toLatin1()). -- X2Go Release Manager <git-admin@x2go.org> Wed, 15 Nov 2017 22:00:53 +0100 diff --git a/main.cpp b/main.cpp index 4ae271d..d33a0ec 100644 --- a/main.cpp +++ b/main.cpp @@ -48,7 +48,7 @@ void client ( const QStringList & cmd ) } cerr<<"starting x2godesktopsharing in client mode, cmd: "<< - cmd.join(" ").toAscii().data() <<std::endl; + cmd.join(" ").toLatin1().data() <<std::endl; QString dispname=params[2]; // QString socketName=QDir::tempPath() +"/x2godesktopsharing_@"+ @@ -60,14 +60,14 @@ void client ( const QStringList & cmd ) { QString message="Unable to connect: " +socketName; cout<<"DENY"; - cerr<<message.toAscii().data() <<endl; + cerr<<message.toLatin1().data() <<endl; return; } - sock.write ( cmd.join(" ").toAscii().data(),cmd.join(" ").toAscii().length() ); + sock.write ( cmd.join(" ").toLatin1().data(),cmd.join(" ").toLatin1().length() ); if ( !sock.waitForReadyRead() ) { cout<<"DENY"; - cerr<<"Cannot write to socket: "<<socketName.toAscii().data() <<endl; + cerr<<"Cannot write to socket: "<<socketName.toLatin1().data() <<endl; return;; } char buffer[256]; @@ -75,7 +75,7 @@ void client ( const QStringList & cmd ) if ( read<=0 ) { cout<<"DENY"; - cerr<<"Cannot read from socket: " <<socketName.toAscii().data() <<endl; + cerr<<"Cannot read from socket: " <<socketName.toLatin1().data() <<endl; return; } buffer[read]=0; diff --git a/sharetray.cpp b/sharetray.cpp index 722d306..0a9acfe 100644 --- a/sharetray.cpp +++ b/sharetray.cpp @@ -345,7 +345,7 @@ void ShareTray::slotStartSharing() if ( serverSocket->listen ( socketFname ) ) { - chown ( socketFname.toAscii(),getuid(),getgrnam ( "x2godesktopsharing" )->gr_gid ); + chown ( socketFname.toLatin1(),getuid(),getgrnam ( "x2godesktopsharing" )->gr_gid ); QFile::setPermissions ( socketFname, QFile::ReadOwner|QFile::WriteOwner|QFile::ReadGroup|QFile::WriteGroup ); connect ( serverSocket,SIGNAL ( newConnection() ), diff --git a/simplelocalsocket.cpp b/simplelocalsocket.cpp index de71d42..d8e6f00 100644 --- a/simplelocalsocket.cpp +++ b/simplelocalsocket.cpp @@ -53,9 +53,8 @@ void SimpleLocalSocket::slotReadFromSocket() socket->state()==QLocalSocket::ConnectedState&& socket->openMode()!=QIODevice::NotOpen) { - int len; - len=socket->write(answer.toAscii().data(), - answer.toAscii().length()); + socket->write(answer.toLatin1().data(), + answer.toLatin1().length()); QTimer::singleShot ( 10000, this, SLOT ( closeSocket() ) ); } } -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2godesktopsharing.git

This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2godesktopsharing. commit 206bee6c592716957721366c6443586978d772ba Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Sat Nov 10 03:47:05 2018 +0100 debian/control: Bump Standards-Version: to 4.2.1. No changes needed. --- debian/changelog | 2 ++ debian/control | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 34f0411..4f3a9a0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -14,6 +14,8 @@ x2godesktopsharing (3.1.1.5-0x2go1) UNRELEASED; urgency=medium (replace it by toLatin1()). * debian/*: + Convert to DH packaging style. Build against Qt5. + * debian/control: + + Bump Standards-Version: to 4.2.1. No changes needed. -- X2Go Release Manager <git-admin@x2go.org> Wed, 15 Nov 2017 22:00:53 +0100 diff --git a/debian/control b/debian/control index 8b45ef6..76c752a 100644 --- a/debian/control +++ b/debian/control @@ -10,7 +10,7 @@ Build-Depends: debhelper (>= 9), qtbase5-dev, qttools5-dev-tools, -Standards-Version: 3.9.6 +Standards-Version: 4.2.1 Homepage: http://code.x2go.org/releases/source/x2godesktopsharing Vcs-Git: git://code.x2go.org/x2godesktopsharing.git Vcs-Browser: http://code.x2go.org/gitweb?p=x2godesktopsharing.git;a=summary -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2godesktopsharing.git