rev 5764 - in kde-extras/kile/trunk/debian: . patches

[Mark Purcell]

Author: msp
Date: 2007-03-22 21:55:16 +0000 (Thu, 22 Mar 2007)
New Revision: 5764

Modified:
   kde-extras/kile/trunk/debian/
   kde-extras/kile/trunk/debian/patches/fifo-in-tmp-2.diff
Log:
Convert patch with cdbs-edit-patch


Property changes on: kde-extras/kile/trunk/debian
___________________________________________________________________
Name: mergeWithUpstream
   + 1

Modified: kde-extras/kile/trunk/debian/patches/fifo-in-tmp-2.diff
===================================================================
--- kde-extras/kile/trunk/debian/patches/fifo-in-tmp-2.diff	2007-03-22 21:44:07 UTC (rev 5763)
+++ kde-extras/kile/trunk/debian/patches/fifo-in-tmp-2.diff	2007-03-22 21:55:16 UTC (rev 5764)
@@ -1,41 +1,6 @@
-Index: kilelyxserver.h
-===================================================================
---- kilelyxserver.h	(Revision 645204)
-+++ kilelyxserver.h	(Arbeitskopie)
-@@ -24,11 +24,12 @@
- #include <qptrlist.h>
- #include <qintdict.h>
- #include <qstringlist.h>
--
-+#include <ktempdir.h>
- /**
-  * @short Simple server that impersonates as LyX to work with gBib, pyBibliographer etc.
-  * @author Jeroen Wijnhout <Jeroen.Wijnhout at kdemail.net>
-- * @version 0.1
-+ * @author Thomas Braun
-+ * @version 0.2
-  */
- 
- class QFile;
-@@ -61,11 +62,13 @@ signals:
- 	void insert(const KileAction::TagData &);
- 
- private:
-+	mode_t 				m_perms;
-+	KTempDir			*m_tempDir;
- 	QPtrList<QFile>					m_pipeIn;
- 	QPtrList<QSocketNotifier>		m_notifier;
- 	QIntDict<QFile>					m_file;
- 	bool							m_running;
--	QStringList 					m_pipes;
-+	QStringList 			m_links,m_pipes;
- };
- 
- #endif // _LYXSERVER_H_
-Index: kilelyxserver.cpp
-===================================================================
---- kilelyxserver.cpp	(Revision 618283)
-+++ kilelyxserver.cpp	(Arbeitskopie)
+diff -Nur kile-1.9.3/src/kile/kilelyxserver.cpp kile-1.9.3.new/src/kile/kilelyxserver.cpp
+--- kile-1.9.3/src/kile/kilelyxserver.cpp	2006-11-20 09:23:18.000000000 +0000
++++ kile-1.9.3.new/src/kile/kilelyxserver.cpp	2007-03-22 21:54:41.000000000 +0000
 @@ -1,6 +1,7 @@
  /***************************************************************************
      begin                : Sat Sept 9 2003
@@ -72,13 +37,13 @@
 +		return;
 +
 +	m_tempDir->setAutoDelete(true);
-+
-+	m_links << ".lyxpipe.in" << ".lyx/lyxpipe.in";
-+	m_links << ".lyxpipe.out" << ".lyx/lyxpipe.out";
  
 -	QString home(QDir::homeDirPath());
 -	m_pipes << home+"/.lyxpipe.in" << home+"/.lyx/lyxpipe.in";
 -	m_pipes << home+"/.lyxpipe.out" << home+"/.lyx/lyxpipe.out";
++	m_links << ".lyxpipe.in" << ".lyx/lyxpipe.in";
++	m_links << ".lyxpipe.out" << ".lyx/lyxpipe.out";
++
 +	for(uint i = 0; i< m_links.count() ; i++)
 +	{
 +		m_pipes.append( m_tempDir->name() + m_links[i] );
@@ -110,7 +75,7 @@
  
  	if (openPipes())
  	{
-@@ -70,7 +89,7 @@ bool KileLyxServer::start()
+@@ -70,7 +89,7 @@
  				kdDebug() << "Created notifier for " << (*it)->name() << endl;
  			}
  			else
@@ -119,7 +84,7 @@
  			++it;
  		}
  		m_running=true;
-@@ -81,49 +100,78 @@ bool KileLyxServer::start()
+@@ -81,49 +100,78 @@
  
  bool KileLyxServer::openPipes()
  {
@@ -185,12 +150,12 @@
 +		pipeInfo.refresh();
 +
 +		if( pipeInfo.exists() && file->open(IO_ReadWrite) ) // in that order we don't create the file if it does not exist
-+		{
+ 		{
+-			kdDebug() << "Opened " << info.absFilePath() << endl;
 +			kdDebug() << "Opened file: " << pipeInfo.absFilePath() << endl;
 +			fstat(file->handle(),stats);
 +			if( !S_ISFIFO(stats->st_mode) )
- 		{
--			kdDebug() << "Opened " << info.absFilePath() << endl;
++		{
 +				kdError() << "The file " << pipeInfo.absFilePath() <<  "we just created is not a pipe!" << endl;
 +				file->close();
 +				continue;
@@ -216,7 +181,7 @@
  
  	QPtrListIterator<QFile> it(m_pipeIn);
  	while (it.current())
-@@ -140,12 +188,17 @@ void KileLyxServer::stop()
+@@ -140,12 +188,17 @@
  
  void KileLyxServer::removePipes()
  {
@@ -234,3 +199,36 @@
  	QRegExp cite(":citation-insert:(.*)$");
  	QRegExp bibtexdbadd(":bibtex-database-add:(.*)$");
  
+diff -Nur kile-1.9.3/src/kile/kilelyxserver.h kile-1.9.3.new/src/kile/kilelyxserver.h
+--- kile-1.9.3/src/kile/kilelyxserver.h	2006-11-20 09:23:18.000000000 +0000
++++ kile-1.9.3.new/src/kile/kilelyxserver.h	2007-03-22 21:54:41.000000000 +0000
+@@ -24,11 +24,12 @@
+ #include <qptrlist.h>
+ #include <qintdict.h>
+ #include <qstringlist.h>
+-
++#include <ktempdir.h>
+ /**
+  * @short Simple server that impersonates as LyX to work with gBib, pyBibliographer etc.
+  * @author Jeroen Wijnhout <Jeroen.Wijnhout at kdemail.net>
+- * @version 0.1
++ * @author Thomas Braun
++ * @version 0.2
+  */
+ 
+ class QFile;
+@@ -61,11 +62,13 @@
+ 	void insert(const KileAction::TagData &);
+ 
+ private:
++	mode_t 				m_perms;
++	KTempDir			*m_tempDir;
+ 	QPtrList<QFile>					m_pipeIn;
+ 	QPtrList<QSocketNotifier>		m_notifier;
+ 	QIntDict<QFile>					m_file;
+ 	bool							m_running;
+-	QStringList 					m_pipes;
++	QStringList 			m_links,m_pipes;
+ };
+ 
+ #endif // _LYXSERVER_H_