diff -Nru /tmp/ev0oeH5rwy/python-kde3-3.15.2+20060422/debian/changelog /tmp/FtEmkvzL4x/python-kde3-3.15.2+20060422/debian/changelog --- /tmp/ev0oeH5rwy/python-kde3-3.15.2+20060422/debian/changelog 2007-02-12 17:07:29.000000000 +0000 +++ /tmp/FtEmkvzL4x/python-kde3-3.15.2+20060422/debian/changelog 2007-02-12 17:07:30.000000000 +0000 @@ -1,3 +1,14 @@ +python-kde3 (3.15.2+20060422-2ubuntu4.1) edgy-proposed; urgency=low + + * Add kubuntu_02_embedded_konsole.diff for + https://blueprints.launchpad.net/ubuntu/+spec/kubuntu-update-manager + - https://launchpad.net/ubuntu/+source/update-manager/+bug/84717 + * Create symlink in debian/rules for libkonsole + * Incrase build-deps to new kdelibs + * Add build and install dep on new Konsole + + -- Jonathan Riddell Mon, 12 Feb 2007 13:33:55 +0000 + python-kde3 (3.15.2+20060422-2ubuntu4) edgy; urgency=low * Don't build for python2.5, sip4-qt3 doesn't support it yet. diff -Nru /tmp/ev0oeH5rwy/python-kde3-3.15.2+20060422/debian/patches/kubuntu_02_embedded_konsole.diff /tmp/FtEmkvzL4x/python-kde3-3.15.2+20060422/debian/patches/kubuntu_02_embedded_konsole.diff --- /tmp/ev0oeH5rwy/python-kde3-3.15.2+20060422/debian/patches/kubuntu_02_embedded_konsole.diff 1970-01-01 00:00:00.000000000 +0000 +++ /tmp/FtEmkvzL4x/python-kde3-3.15.2+20060422/debian/patches/kubuntu_02_embedded_konsole.diff 2007-02-12 17:07:30.000000000 +0000 @@ -0,0 +1,476 @@ +diff -Nru /tmp/Tsd0NdF0ep/python-kde3-3.15.2+20060422/configure.py python-kde3-3.15.2+20060422/configure.py +--- python-kde3-3.15.2+20060422/configure.py 2007-02-12 13:26:58.000000000 +0000 ++++ python-kde3-3.15.2+20060422/configure.py 2007-02-12 13:26:58.000000000 +0000 +@@ -748,9 +748,9 @@ + makefile.extra_libs.append ("kdeui") + if extra_lib == "kabc" and kde_version >= 0x030200: + makefile.extra_libs.append ("kabc_file") +-# if extra_lib == "kparts": +-# makefile.extra_lib_dirs.append (os.path.join (opt_kdelibdir, "kde3")) +-# makefile.extra_libs.append ("konsolepart") ++ if extra_lib == "kparts": ++ makefile.extra_lib_dirs.append (os.path.join (opt_kdelibdir, "kde3")) ++ makefile.extra_libs.append ("konsolepart") + + if extra_lib == "kdeprint": + makefile.extra_cflags.append ("-fno-rtti") +diff -Nru /tmp/Tsd0NdF0ep/python-kde3-3.15.2+20060422/extra/kde352/konsole_part.h python-kde3-3.15.2+20060422/extra/kde352/konsole_part.h +--- python-kde3-3.15.2+20060422/extra/kde352/konsole_part.h 1970-01-01 00:00:00.000000000 +0000 ++++ python-kde3-3.15.2+20060422/extra/kde352/konsole_part.h 2007-02-12 13:26:58.000000000 +0000 +@@ -0,0 +1,241 @@ ++/* -*- C++ -*- ++ This file is part of the KDE system ++ Copyright (C) 1999,2000 Boloni Laszlo ++ ++ This program is free software; you can redistribute it and/or ++ modify it under the terms of the GNU Library General Public ++ License as published by the Free Software Foundation; either ++ version 2 of the License, or (at your option) any later version. ++ ++ This program is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ Library General Public License for more details. ++ ++ You should have received a copy of the GNU Library General Public License ++ along with this library; see the file COPYING.LIB. If not, write to ++ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ++ Boston, MA 02110-1301, USA. ++ */ ++ ++#ifndef KONSOLE_PART_H ++#define KONSOLE_PART_H ++ ++#include ++#include ++ ++ ++#include ++ ++#include ++ ++//#include "schema.h" ++//#include "session.h" ++ ++class KInstance; ++class konsoleBrowserExtension; ++class QPushButton; ++class QSpinBox; ++class KPopupMenu; ++class KActionMenu; ++class QCheckBox; ++class KRootPixmap; ++class KToggleAction; ++class KSelectAction; ++ ++namespace KParts { class GUIActivateEvent; } ++ ++class konsoleFactory : public KParts::Factory ++{ ++ Q_OBJECT ++public: ++ konsoleFactory(); ++ virtual ~konsoleFactory(); ++ ++ virtual KParts::Part* createPartObject(QWidget *parentWidget = 0, const char *widgetName = 0, ++ QObject* parent = 0, const char* name = 0, ++ const char* classname = "KParts::Part", ++ const QStringList &args = QStringList()); ++ ++ static KInstance *instance(); ++ ++ private: ++ static KInstance *s_instance; ++ static KAboutData *s_aboutData; ++}; ++ ++////////////////////////////////////////////////////////////////////// ++ ++class konsolePart: public KParts::ReadOnlyPart, public TerminalInterface, public ExtTerminalInterface ++{ ++ Q_OBJECT ++ public: ++ konsolePart(QWidget *parentWidget, const char *widgetName, QObject * parent, const char *name, const char *classname = 0); ++ virtual ~konsolePart(); ++ ++signals: ++ void processExited( KProcess * ); ++ void receivedData( const QString& s ); ++ void forkedChild(); ++ protected: ++ virtual bool openURL( const KURL & url ); ++ virtual bool openFile() {return false;} // never used ++ virtual bool closeURL() {return true;} ++ virtual void guiActivateEvent( KParts::GUIActivateEvent * event ); ++ ++ protected slots: ++ void showShell(); ++ ++// void doneSession(TESession*); ++ void sessionDestroyed(); ++// void configureRequest(TEWidget*,int,int x,int y); ++// void updateTitle(TESession*); ++ void enableMasterModeConnections(); ++ ++ private slots: ++ void emitOpenURLRequest(const QString &url); ++ ++ void readProperties(); ++ void saveProperties(); ++ void applyProperties(); ++ void setSettingsMenuEnabled( bool ); ++ ++ void sendSignal(int n); ++ void closeCurrentSession(); ++ ++ void notifySize(int /*columns*/, int /*lines*/); ++ ++ void slotToggleFrame(); ++ void slotSelectScrollbar(); ++ void slotSelectFont(); ++ void schema_menu_check(); ++ void keytab_menu_activated(int item); ++ void updateSchemaMenu(); ++ void setSchema(int n); ++ void pixmap_menu_activated(int item); ++ void schema_menu_activated(int item); ++ void slotHistoryType(); ++ void slotSelectBell(); ++ void slotSelectLineSpacing(); ++ void slotBlinkingCursor(); ++ void slotUseKonsoleSettings(); ++ void slotWordSeps(); ++ void slotSetEncoding(); ++ void biggerFont(); ++ void smallerFont(); ++ ++ void autoShowShell(); ++ ++ private: ++ konsoleBrowserExtension *m_extension; ++ KURL currentURL; ++ ++ void makeGUI(); ++ void applySettingsToGUI(); ++ ++// void setSchema(ColorSchema* s); ++ void updateKeytabMenu(); ++ ++ bool doOpenStream( const QString& ); ++ bool doWriteStream( const QByteArray& ); ++ bool doCloseStream(); ++ ++ QWidget* parentWidget; ++// TEWidget* te; ++// TESession* se; ++ // ColorSchemaList* colors; ++ KRootPixmap* rootxpm; ++ ++ KActionCollection* actions; ++ KActionCollection* settingsActions; ++ ++ KToggleAction* blinkingCursor; ++ KToggleAction* showFrame; ++ KToggleAction* m_useKonsoleSettings; ++ ++ KSelectAction* selectBell; ++ KSelectAction* selectLineSpacing; ++ KSelectAction* selectScrollbar; ++ KSelectAction* selectSetEncoding; ++ ++ KActionMenu* m_fontsizes; ++ ++ KPopupMenu* m_keytab; ++ KPopupMenu* m_schema; ++ KPopupMenu* m_signals; ++ KPopupMenu* m_options; ++ KPopupMenu* m_popupMenu; ++ ++ QFont defaultFont; ++ ++ QString pmPath; // pixmap path ++ QString s_schema; ++ QString s_kconfigSchema; ++ QString s_word_seps; // characters that are considered part of a word ++ ++ bool b_framevis:1; ++ bool b_histEnabled:1; ++ bool b_useKonsoleSettings:1; ++ bool b_autoDestroy:1; ++ bool b_autoStartShell:1; ++ ++ int curr_schema; // current schema no ++ int n_bell; ++ int n_keytab; ++ int n_render; ++ int n_scroll; ++ unsigned m_histSize; ++ bool m_runningShell; ++ bool m_streamEnabled; ++ int n_encoding; ++ ++public: ++ // these are the implementations for the TermEmuInterface ++ // functions... ++ void startProgram( const QString& program, ++ const QStrList& args ); ++ void newSession(); ++ void showShellInDir( const QString& dir ); ++ void sendInput( const QString& text ); ++ void setAutoDestroy( bool ); ++ void setAutoStartShell( bool ); ++}; ++ ++////////////////////////////////////////////////////////////////////// ++ ++/*class HistoryTypeDialog : public KDialogBase ++{ ++ Q_OBJECT ++public: ++ HistoryTypeDialog(const HistoryType& histType, ++ unsigned int histSize, ++ QWidget *parent); ++ ++public slots: ++ void slotDefault(); ++ void slotSetUnlimited(); ++ void slotHistEnable(bool); ++ ++ unsigned int nbLines() const; ++ bool isOn() const; ++ ++protected: ++ QCheckBox* m_btnEnable; ++ QSpinBox* m_size; ++ QPushButton* m_setUnlimited; ++};*/ ++ ++////////////////////////////////////////////////////////////////////// ++ ++class konsoleBrowserExtension : public KParts::BrowserExtension ++{ ++ Q_OBJECT ++ friend class konsolePart; ++ public: ++ konsoleBrowserExtension(konsolePart *parent); ++ virtual ~konsoleBrowserExtension(); ++ ++ void emitOpenURLRequest(const KURL &url); ++}; ++ ++#endif +diff -Nru /tmp/Tsd0NdF0ep/python-kde3-3.15.2+20060422/sip/kparts/kparts-kde352.diff python-kde3-3.15.2+20060422/sip/kparts/kparts-kde352.diff +--- python-kde3-3.15.2+20060422/sip/kparts/kparts-kde352.diff 2006-04-19 16:55:32.000000000 +0000 ++++ python-kde3-3.15.2+20060422/sip/kparts/kparts-kde352.diff 2007-02-12 13:26:58.000000000 +0000 +@@ -1 +1,2 @@ +++ %Include konsole_part.sip + + %Include statusbarextension.sip +--- python-kde3-3.15.2+20060422/sip/kparts/konsole_part.sip 2005-07-26 19:28:33.000000000 +0000 ++++ python-kde3-3.15.2+20060422/sip/kparts/konsole_part.sip 2007-02-12 17:00:41.000000000 +0000 +@@ -1,8 +1,11 @@ + // +-// Copyright 2005 Jim Bublitz ++// Copyright 2006 Jim Bublitz ++// Earlier copyrights 1998 - 2005 Jim Bublitz and/or Phil Thompson ++// may also apply + + +-// module kparts version KDE_3_4_1 ++// Generated by preSip ++// module kparts version KDE 3.5.3 + + + // This software is free software; you can redistribute it and/or +@@ -20,64 +23,158 @@ + // If not, write to the Free Software Foundation, Inc., + // 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + +-class TerminalInterface ++ ++class konsoleFactory : KParts::Factory + { + %TypeHeaderCode +-#include ++#include ++#include + %End + ++ + public: +- virtual void startProgram (const QString&, const QStrList&) = 0; +- virtual void showShellInDir (const QString&) = 0; +- virtual void sendInput (const QString&) = 0; +-}; ++ konsoleFactory (); ++ virtual KParts::Part* createPartObject (QWidget* = 0, const char* = 0, QObject* /Transfer/ = 0, const char* = 0, const char* = "KParts::Part", const QStringList& = QStringList ()); ++ static KInstance* instance (); ++ ++}; // class konsoleFactory ++ + ++%If ( KDE_3_5_0 - ) + +-class konsolePart: KParts::ReadOnlyPart, TerminalInterface ++class konsolePart : KParts::ReadOnlyPart, TerminalInterface, ExtTerminalInterface + { + %TypeHeaderCode ++#include + #include + %End + ++ + public: +- konsolePart (QWidget *, const char *, QObject */TransferThis/, const char *, const char * = 0); ++ konsolePart (QWidget*, const char*, QObject* /TransferThis/, const char*, const char* = 0); + + signals: +- void processExited (); +- void receivedData (const QString&); +- protected: +- virtual bool openURL (const KURL &); +- virtual bool openFile (); +- virtual bool closeURL (); +- virtual void guiActivateEvent (KParts::GUIActivateEvent *); +- +- protected slots: +- void showShell (); +- void slotProcessExited (); +- void slotReceivedData (const QString&); +- +-//ig void doneSession (TESession*); +- void sessionDestroyed (); +-//ig void configureRequest (TEWidget*, int, int, int); +- void updateTitle (); +- void enableMasterModeConnections (); +- ++ void processExited (KProcess*); ++ void receivedData (const QString&); ++ void forkedChild (); ++ ++protected: ++ virtual bool openURL (const KURL&); ++ virtual bool openFile (); ++ virtual bool closeURL (); ++ virtual void guiActivateEvent (KParts::GUIActivateEvent*); ++ ++protected slots: ++ void showShell (); ++ void sessionDestroyed (); ++ void enableMasterModeConnections (); + + public: +- void startProgram (const QString&, const QStrList&); +- void showShellInDir (const QString&); +- void sendInput (const QString&); +-}; ++ void startProgram (const QString&, const QStrList&); ++ void newSession (); ++ void showShellInDir (const QString&); ++ void sendInput (const QString&); ++ void setAutoDestroy (bool); ++ void setAutoStartShell (bool); ++ bool setPtyFd(int master_pty); ++ ++}; // class konsolePart ++ ++%End + + + class konsoleBrowserExtension : KParts::BrowserExtension + { + %TypeHeaderCode ++#include ++#include ++%End ++ ++ ++public: ++ konsoleBrowserExtension (konsolePart*); ++ void emitOpenURLRequest (const KURL&); ++ ++}; // class konsoleBrowserExtension ++ ++ ++%If ( - KDE_3_5_0 ) ++ ++class konsolePart : KParts::ReadOnlyPart, TerminalInterface ++{ ++%TypeHeaderCode ++#include + #include + %End + ++ ++public: ++ konsolePart (QWidget*, const char*, QObject* /TransferThis/, const char*, const char* = 0); ++ ++signals: ++ void processExited (); ++ void receivedData (const QString&); ++ ++protected: ++ virtual bool openURL (const KURL&); ++ virtual bool openFile (); ++ virtual bool closeURL (); ++ virtual void guiActivateEvent (KParts::GUIActivateEvent*); ++ ++protected slots: ++ void showShell (); ++ void slotProcessExited (); ++ void slotReceivedData (const QString&); ++ void sessionDestroyed (); ++ void updateTitle (); ++ void enableMasterModeConnections (); ++ ++public: ++ void startProgram (const QString&, const QStrList&); ++ void showShellInDir (const QString&); ++ void sendInput (const QString&); ++ bool setPtyFd(int master_pty); ++ ++}; // class konsolePart ++ ++%End ++ ++//force ++ ++class TerminalInterface ++{ ++%TypeHeaderCode ++#include ++%End ++ ++ ++public: ++ virtual void startProgram (const QString&, const QStrList&) = 0; ++ virtual void showShellInDir (const QString&) = 0; ++ virtual void sendInput (const QString&) = 0; ++ ++}; // class TerminalInterface ++ ++ ++%If ( KDE_3_5_0 - ) ++ ++class ExtTerminalInterface ++{ ++%TypeHeaderCode ++#include ++%End ++ ++ + public: +- konsoleBrowserExtension(konsolePart *); +- void emitOpenURLRequest(const KURL &); +-}; ++ virtual void startProgram (const QString&, const QStrList&) = 0; ++ virtual void showShellInDir (const QString&) = 0; ++ virtual void sendInput (const QString&) = 0; ++ virtual void setAutoStartShell (bool) = 0; ++ virtual void setAutoDestroy (bool) = 0; ++ virtual bool setPtyFd(int master_pty) = 0; ++ ++}; // class ExtTerminalInterface ++ ++%End + ++//end