diff -Nru /tmp/aFCxMSZCxJ/kdebase-3.5.5/debian/changelog /tmp/It1Ke7ftdA/kdebase-3.5.5/debian/changelog --- /tmp/aFCxMSZCxJ/kdebase-3.5.5/debian/changelog 2007-02-19 17:58:04.000000000 +0000 +++ /tmp/It1Ke7ftdA/kdebase-3.5.5/debian/changelog 2007-02-19 17:58:08.000000000 +0000 @@ -1,3 +1,15 @@ +kdebase (4:3.5.5-0ubuntu3.3) edgy-proposed; urgency=low + + * Update for https://blueprints.launchpad.net/ubuntu/+spec/kubuntu-update-manager + https://launchpad.net/ubuntu/+source/update-manager/+bug/84717 + * Add kubuntu_85_konsole_pty.diff + - adds setPtyFd() function to TEPty.h to attach an existing pty from another process + to Konsole, and export in konsole_part + * Add an shlib version on konsole for 4:3.5.5-0ubuntu3.3 + * Update kdelibs build-dep + + -- Jonathan Riddell Mon, 5 Feb 2007 15:10:23 +0000 + kdebase (4:3.5.5-0ubuntu3.2) edgy-updates; urgency=low * Upload to edgy-updates, no changes diff -Nru /tmp/aFCxMSZCxJ/kdebase-3.5.5/debian/control /tmp/It1Ke7ftdA/kdebase-3.5.5/debian/control --- /tmp/aFCxMSZCxJ/kdebase-3.5.5/debian/control 2007-02-19 17:58:04.000000000 +0000 +++ /tmp/It1Ke7ftdA/kdebase-3.5.5/debian/control 2007-02-19 17:58:08.000000000 +0000 @@ -3,7 +3,7 @@ Priority: optional Maintainer: Debian Qt/KDE Maintainers Uploaders: Isaac Clerencia , Pierre Habouzit , Christopher Martin , Adeodato Simó , Riku Voipio , Luk Claes -Build-Depends: cdbs (>= 0.4.46ubuntu3), debhelper (>= 5.0.31), autotools-dev, gawk, gettext, kdelibs4-dev (>= 4:3.5.5), libdbus-qt-1-dev (>= 0.60), libldap2-dev, libhal-dev (>= 0.5.5.1-2), libhal-storage-dev (>= 0.5.5.1-2), libncurses5-dev, libpam0g-dev, libpopt-dev, libraw1394-dev, libsensors-dev, libsmbclient-dev, libusb-dev, libxtst-dev, libfontenc-dev, libxss-dev, libxxf86misc-dev, libxcomposite-dev, libxdamage-dev, libxkbfile-dev, xutils, sharutils, texinfo, libavahi-compat-libdnssd-dev (>= 0.4), x11proto-kb-dev, libxkbfile-dev, xmkmf, sudo +Build-Depends: cdbs (>= 0.4.46ubuntu3), debhelper (>= 5.0.31), autotools-dev, gawk, gettext, kdelibs4-dev (>= 4:3.5.5-0ubuntu3.2), libdbus-qt-1-dev (>= 0.60), libldap2-dev, libhal-dev (>= 0.5.5.1-2), libhal-storage-dev (>= 0.5.5.1-2), libncurses5-dev, libpam0g-dev, libpopt-dev, libraw1394-dev, libsensors-dev, libsmbclient-dev, libusb-dev, libxtst-dev, libfontenc-dev, libxss-dev, libxxf86misc-dev, libxcomposite-dev, libxdamage-dev, libxkbfile-dev, xutils, sharutils, texinfo, libavahi-compat-libdnssd-dev (>= 0.4), x11proto-kb-dev, libxkbfile-dev, xmkmf, sudo Build-Depends-Indep: doxygen, qt3-doc, graphviz, gsfonts-x11, kdelibs4-doc Build-Conflicts: nvidia-glx Standards-Version: 3.7.2 diff -Nru /tmp/aFCxMSZCxJ/kdebase-3.5.5/debian/patches/kubuntu_85_konsole_pty.diff /tmp/It1Ke7ftdA/kdebase-3.5.5/debian/patches/kubuntu_85_konsole_pty.diff --- /tmp/aFCxMSZCxJ/kdebase-3.5.5/debian/patches/kubuntu_85_konsole_pty.diff 1970-01-01 00:00:00.000000000 +0000 +++ /tmp/It1Ke7ftdA/kdebase-3.5.5/debian/patches/kubuntu_85_konsole_pty.diff 2007-02-19 17:58:08.000000000 +0000 @@ -0,0 +1,50 @@ +--- kdebase-3.5.5a.dfsg.1.orig/konsole/konsole/konsole_part.cpp ++++ kdebase-3.5.5a.dfsg.1/konsole/konsole/konsole_part.cpp +@@ -1056,6 +1056,16 @@ + se->run(); + } + ++bool konsolePart::setPtyFd( int master_pty ) ++{ ++ kdDebug(1211) << "konsolePart::setPtyFd " << master_pty << endl; ++ TEPty *pty = new TEPty(); ++ pty->setPtyFd(master_pty); ++ if ( !se ) ++ newSession(); ++ se->setPty(pty); ++} ++ + void konsolePart::newSession() + { + if ( se ) delete se; +only in patch2: +unchanged: +--- kdebase-3.5.5a.dfsg.1.orig/konsole/konsole/TEPty.h ++++ kdebase-3.5.5a.dfsg.1/konsole/konsole/TEPty.h +@@ -39,6 +39,13 @@ + ~TEPty(); + + public: ++ bool setPtyFd(int p) { ++ bool res = pty()->setPty(p); ++ setupCommunication((Communication)(Stdin|Stdout)); ++ commSetupDoneP(); ++ runs = true; ++ return res; ++ }; + + /*! + * having a `run' separate from the constructor allows to make +only in patch2: +unchanged: +--- kdebase-3.5.5a.dfsg.1.orig/konsole/konsole/konsole_part.h ++++ kdebase-3.5.5a.dfsg.1/konsole/konsole/konsole_part.h +@@ -190,6 +190,8 @@ + int n_encoding; + + public: ++ virtual bool setPtyFd(int); ++ + // these are the implementations for the TermEmuInterface + // functions... + void startProgram( const QString& program, diff -Nru /tmp/aFCxMSZCxJ/kdebase-3.5.5/debian/rules /tmp/It1Ke7ftdA/kdebase-3.5.5/debian/rules --- /tmp/aFCxMSZCxJ/kdebase-3.5.5/debian/rules 2007-02-19 17:58:04.000000000 +0000 +++ /tmp/It1Ke7ftdA/kdebase-3.5.5/debian/rules 2007-02-19 17:58:08.000000000 +0000 @@ -29,6 +29,7 @@ DEB_DH_MAKESHLIBS_ARGS_ksysguard := -V'ksysguard (>= 4:3.5.3-1)' DEB_DH_MAKESHLIBS_ARGS_kwin := -V'kwin (>= 4:3.5.3-1)' DEB_DH_MAKESHLIBS_ARGS_libkonq4 := -V'libkonq4 (>= 4:3.5.3-1)' +DEB_DH_MAKESHLIBS_ARGS_konsole := -V'konsole (>= 4:3.5.5-0ubuntu3.3)' #shlibs_ver = 4:3.5.0-1 #$(foreach p,$(PACKAGES_WITH_LIBS),$(eval DEB_DH_MAKESHLIBS_ARGS_$(p) := -V'$(p) (>= $(shlibs_ver))'))