rev 6843 - in kde-extras/konversation: branches/experimental/debian branches/experimental/debian/patches trunk/debian trunk/debian/patches
Modestas Vainius
modax-guest at alioth.debian.org
Mon Jul 23 22:52:43 UTC 2007
Author: modax-guest
Date: 2007-07-23 22:52:42 +0000 (Mon, 23 Jul 2007)
New Revision: 6843
Added:
kde-extras/konversation/trunk/debian/patches/12_dbug405384_dccsendfile.diff
kde-extras/konversation/trunk/debian/patches/13_dbug412894_lowercase_nick.diff
kde-extras/konversation/trunk/debian/patches/14_dbug412803_assert_crash.diff
Removed:
kde-extras/konversation/branches/experimental/debian/patches/06_fix_relibtoolization.diff
Modified:
kde-extras/konversation/branches/experimental/debian/changelog
kde-extras/konversation/branches/experimental/debian/control
kde-extras/konversation/branches/experimental/debian/patches/98_buildprep.diff
kde-extras/konversation/branches/experimental/debian/patches/series
kde-extras/konversation/trunk/debian/changelog
kde-extras/konversation/trunk/debian/control
kde-extras/konversation/trunk/debian/patches/series
Log:
Preparing 1.0.1-3 for unstable & 1.0.1+svn690460 for experimental
Modified: kde-extras/konversation/branches/experimental/debian/changelog
===================================================================
--- kde-extras/konversation/branches/experimental/debian/changelog 2007-07-23 22:43:32 UTC (rev 6842)
+++ kde-extras/konversation/branches/experimental/debian/changelog 2007-07-23 22:52:42 UTC (rev 6843)
@@ -1,24 +1,28 @@
-konversation (1.0.1+svn688929-1~pre2) UNRELEASED; urgency=low
+konversation (1.0.1+svn691548-1) experimental; urgency=low
[Modestas Vainius]
* New upstream development snapshot:
- - Revision: 688929. Date: Tue, 17 Jul 2007 08:51:13 +0000
+ - Revision: 691548. Date: Tue, 24 Jul 2007 00:41:29 +0300
- The latest translations and documentation are included.
- Changes since 1.0.1 are listed in
/usr/share/doc/konversation/changelog.gz file.
* Patches:
- 01_libtool_update.diff - update;
+ - 06_fix_relibtoolization.diff - removed, merged upstream.
- 10_debian_channel.diff - adopt to upstream changes;
- 11_dbug_autoreplace.diff - fix offset;
+ - 12_dbug405384_dccsendfile.diff - removed, merged upstream.
+ - 13_dbug412894_lowercase_nick.diff - removed, merged upstream.
+ - 14_dbug412803_assert_crash.diff - removed, merged upstream.
- 98_buildprep.diff - relibtoolize again.
* Add konversation-dbg to konversation Recommends. This snapshot
is untested and possibly crash-prone.
- -- Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org> Wed, 18 Jul 2007 00:48:07 +0300
+ -- Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org> Tue, 24 Jul 2007 01:16:43 +0300
konversation (1.0.1-3) unstable; urgency=low
- [Modestas Vainius]
+ [ Modestas Vainius ]
* Documentation is provided under the terms of GNU GFDL with no Invariant
Sections, no Front-Cover Texts, and no Back-Cover Texts. Mention this
in debian/copyright.
@@ -26,10 +30,19 @@
/usr/share/common-licenses/GFDL in debian/copyright.
* Use more strict wildcards in konversation.install mostly to track
upstream changes and to eliminate empty apidox directory.
- * Update patch 10_debian_channel.diff to use port 7000 for irc.debian.org
- by default to prevent possible DCC exploit.
+ * New/updated patches:
+ - 10_debian_channel.diff - update to use port 7000 for irc.debian.org
+ by default to prevent possible DCC exploit.
+ - 12_dbug405384_dccsendfile.diff - remember whole URL (including protocol),
+ not just directory for "Send File" dialog (Closes: #405384).
+ - 13_dbug412894_lowercase_nick.diff - don't crash on typing text in
+ reopened query/channel after all channels/queries were left (lowercase
+ nicknames were not affected) (Closes: #412894).
+ - 14_dbug412803_assert_crash.diff - avoid a possible crash on DCOP info.
+ Remove a bogus assert (Closes: #412803).
+ * Add kdelibs-dbg to konversation-dbg Recommends.
- -- Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org> Tue, 17 Jul 2007 23:34:06 +0300
+ -- Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org> Tue, 24 Jul 2007 01:15:48 +0300
konversation (1.0.1-2) unstable; urgency=low
Modified: kde-extras/konversation/branches/experimental/debian/control
===================================================================
--- kde-extras/konversation/branches/experimental/debian/control 2007-07-23 22:43:32 UTC (rev 6842)
+++ kde-extras/konversation/branches/experimental/debian/control 2007-07-23 22:52:42 UTC (rev 6843)
@@ -35,6 +35,7 @@
Architecture: any
Priority: extra
Depends: konversation (= ${binary:Version})
+Recommends: kdelibs-dbg
Description: debugging symbols for konversation
This package contains the debugging symbols associated with konversation.
They will automatically be used by gdb for debugging konversation-related
Deleted: kde-extras/konversation/branches/experimental/debian/patches/06_fix_relibtoolization.diff
Modified: kde-extras/konversation/branches/experimental/debian/patches/98_buildprep.diff
===================================================================
Modified: kde-extras/konversation/branches/experimental/debian/patches/series
===================================================================
--- kde-extras/konversation/branches/experimental/debian/patches/series 2007-07-23 22:43:32 UTC (rev 6842)
+++ kde-extras/konversation/branches/experimental/debian/patches/series 2007-07-23 22:52:42 UTC (rev 6843)
@@ -2,7 +2,6 @@
02_am_maintainer_mode.diff
03_pedantic-errors.diff
04_disable_no_undefined.diff
-06_fix_relibtoolization.diff
10_debian_channel.diff
11_dbug_autoreplace.diff
98_buildprep.diff
Modified: kde-extras/konversation/trunk/debian/changelog
===================================================================
--- kde-extras/konversation/trunk/debian/changelog 2007-07-23 22:43:32 UTC (rev 6842)
+++ kde-extras/konversation/trunk/debian/changelog 2007-07-23 22:52:42 UTC (rev 6843)
@@ -1,6 +1,6 @@
-konversation (1.0.1-3~pre1) UNRELEASED; urgency=low
+konversation (1.0.1-3) unstable; urgency=low
- [Modestas Vainius]
+ [ Modestas Vainius ]
* Documentation is provided under the terms of GNU GFDL with no Invariant
Sections, no Front-Cover Texts, and no Back-Cover Texts. Mention this
in debian/copyright.
@@ -8,10 +8,19 @@
/usr/share/common-licenses/GFDL in debian/copyright.
* Use more strict wildcards in konversation.install mostly to track
upstream changes and to eliminate empty apidox directory.
- * Update patch 10_debian_channel.diff to use port 7000 for irc.debian.org
- by default to prevent possible DCC exploit.
+ * New/updated patches:
+ - 10_debian_channel.diff - update to use port 7000 for irc.debian.org
+ by default to prevent possible DCC exploit.
+ - 12_dbug405384_dccsendfile.diff - remember whole URL (including protocol),
+ not just directory for "Send File" dialog (Closes: #405384).
+ - 13_dbug412894_lowercase_nick.diff - don't crash on typing text in
+ reopened query/channel after all channels/queries were left (lowercase
+ nicknames were not affected) (Closes: #412894).
+ - 14_dbug412803_assert_crash.diff - avoid a possible crash on DCOP info.
+ Remove a bogus assert (Closes: #412803).
+ * Add kdelibs-dbg to konversation-dbg Recommends.
- -- Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org> Wed, 18 Jul 2007 00:10:02 +0300
+ -- Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org> Tue, 24 Jul 2007 01:15:48 +0300
konversation (1.0.1-2) unstable; urgency=low
Modified: kde-extras/konversation/trunk/debian/control
===================================================================
--- kde-extras/konversation/trunk/debian/control 2007-07-23 22:43:32 UTC (rev 6842)
+++ kde-extras/konversation/trunk/debian/control 2007-07-23 22:52:42 UTC (rev 6843)
@@ -35,6 +35,7 @@
Architecture: any
Priority: extra
Depends: konversation (= ${binary:Version})
+Recommends: kdelibs-dbg
Description: debugging symbols for konversation
This package contains the debugging symbols associated with konversation.
They will automatically be used by gdb for debugging konversation-related
Added: kde-extras/konversation/trunk/debian/patches/12_dbug405384_dccsendfile.diff
===================================================================
--- kde-extras/konversation/trunk/debian/patches/12_dbug405384_dccsendfile.diff (rev 0)
+++ kde-extras/konversation/trunk/debian/patches/12_dbug405384_dccsendfile.diff 2007-07-23 22:52:42 UTC (rev 6843)
@@ -0,0 +1,31 @@
+diff -uNr -x debian -x .pc konversation-1.0.1/konversation/src/server.cpp konversation-1.0.1.n/konversation/src/server.cpp
+--- konversation-1.0.1/konversation/src/server.cpp 2006-10-06 19:43:29.000000000 +0300
++++ konversation-1.0.1.n/konversation/src/server.cpp 2007-07-21 13:39:41.000000000 +0300
+@@ -1817,7 +1817,7 @@
+ if(!recipient.isEmpty())
+ {
+ KURL::List fileURLs=KFileDialog::getOpenURLs(
+- lastDccDir,
++ ":lastDccDir",
+ QString::null,
+ getViewContainer()->getWindow(),
+ i18n("Select File(s) to Send to %1").arg(recipient)
+@@ -1825,7 +1825,6 @@
+ KURL::List::iterator it;
+ for ( it = fileURLs.begin() ; it != fileURLs.end() ; ++it )
+ {
+- lastDccDir = (*it).directory();
+ addDccSend( recipient, *it );
+ }
+ }
+diff -uNr -x debian -x .pc konversation-1.0.1/konversation/src/server.h konversation-1.0.1.n/konversation/src/server.h
+--- konversation-1.0.1/konversation/src/server.h 2006-10-06 19:43:29.000000000 +0300
++++ konversation-1.0.1.n/konversation/src/server.h 2007-07-21 13:39:06.000000000 +0300
+@@ -608,7 +608,6 @@
+ QString m_loweredNickname;
+ QString ownIpByUserhost; // RPL_USERHOST
+ QString ownIpByWelcome; // RPL_WELCOME
+- QString lastDccDir;
+
+ QPtrList<Channel> channelList;
+ QPtrList<Query> queryList;
Added: kde-extras/konversation/trunk/debian/patches/13_dbug412894_lowercase_nick.diff
===================================================================
--- kde-extras/konversation/trunk/debian/patches/13_dbug412894_lowercase_nick.diff (rev 0)
+++ kde-extras/konversation/trunk/debian/patches/13_dbug412894_lowercase_nick.diff 2007-07-23 22:52:42 UTC (rev 6843)
@@ -0,0 +1,40 @@
+--- konversation-1.0.1/konversation/src/server.cpp 2007-07-21 13:45:46.000000000 +0300
++++ konversation-1.0.1.n/konversation/src/server.cpp 2007-07-22 17:45:56.000000000 +0300
+@@ -1666,7 +1666,7 @@
+ // is deleted altogether in that case.
+ QString lcNickname = name.lower();
+ m_queryNicks.remove(lcNickname);
+- if (!isWatchedNick(nickname)) deleteNickIfUnlisted(nickname);
++ if (!isWatchedNick(name)) deleteNickIfUnlisted(name);
+ }
+
+ void Server::closeChannel(const QString& name)
+@@ -2432,7 +2432,7 @@
+ * @param nickname The nickname to be deleted. Case insensitive.
+ * @return True if the nickname is deleted.
+ */
+-bool Server::deleteNickIfUnlisted(QString &nickname)
++bool Server::deleteNickIfUnlisted(const QString &nickname)
+ {
+ // Don't delete our own nickinfo.
+ if (nickname == getNickname()) return false;
+@@ -2556,7 +2556,7 @@
+ // Remove the unwatched nickname from the unjoined channel.
+ channel->remove(member);
+ // If the nick is no longer listed in any channels or query list, delete it altogether.
+- deleteNickIfUnlisted(lcNickname);
++ deleteNickIfUnlisted(member.data()->getNickInfo()->getNickname());
+ member = channel->begin();
+ }
+ else
+--- konversation-1.0.1/konversation/src/server.h 2007-07-21 13:45:46.000000000 +0300
++++ konversation-1.0.1.n/konversation/src/server.h 2007-07-22 17:44:58.000000000 +0300
+@@ -529,7 +529,7 @@
+ * @param nickname The nickname to be deleted. Case insensitive.
+ * @return True if the nickname is deleted.
+ */
+- bool deleteNickIfUnlisted(QString &nickname);
++ bool deleteNickIfUnlisted(const QString &nickname);
+ /**
+ * If not already offline, changes a nick to the offline state.
+ * Removes it from all channels on the joined and unjoined lists.
Added: kde-extras/konversation/trunk/debian/patches/14_dbug412803_assert_crash.diff
===================================================================
--- kde-extras/konversation/trunk/debian/patches/14_dbug412803_assert_crash.diff (rev 0)
+++ kde-extras/konversation/trunk/debian/patches/14_dbug412803_assert_crash.diff 2007-07-23 22:52:42 UTC (rev 6843)
@@ -0,0 +1,25 @@
+--- konversation-1.0.1/konversation/src/viewcontainer.cpp 2006-10-06 19:43:29.000000000 +0300
++++ konversation-1.0.1.n/konversation/src/viewcontainer.cpp 2007-07-23 15:07:32.000000000 +0300
+@@ -1756,12 +1756,17 @@
+
+ void ViewContainer::appendToFrontmost(const QString& type,const QString& message,ChatWindow* serverView, bool parseURL)
+ {
+- if (!serverView) serverView = m_frontView->getServer()->getStatusView();
+-
+- //if this fails, we need to fix frontServer
+- Q_ASSERT(m_frontView && m_frontView->getServer() == m_frontServer);
++ if (!serverView) { // e.g. DCOP info call
++ if (m_frontView) // m_frontView == NULL if canBeFrontView() == false for active ChatWindow
++ serverView = m_frontView->getServer()->getStatusView();
++ else if (m_frontServer) // m_fronView == NULL && m_frontServer != NULL if ChannelListPanel is active.
++ serverView = m_frontServer->getStatusView();
++ }
+
+- Q_ASSERT(serverView); if(!serverView) return;
++ // This might happen if canBeFrontView() is false for active ChatWindow
++ // and the view does not belong to any server (e.g. DCC Status View).
++ // Discard message in this case.
++ if(!serverView) return;
+
+ updateFrontView();
+
Modified: kde-extras/konversation/trunk/debian/patches/series
===================================================================
--- kde-extras/konversation/trunk/debian/patches/series 2007-07-23 22:43:32 UTC (rev 6842)
+++ kde-extras/konversation/trunk/debian/patches/series 2007-07-23 22:52:42 UTC (rev 6843)
@@ -5,4 +5,7 @@
06_fix_relibtoolization.diff
10_debian_channel.diff
11_dbug_autoreplace.diff
+12_dbug405384_dccsendfile.diff
+13_dbug412894_lowercase_nick.diff
+14_dbug412803_assert_crash.diff
98_buildprep.diff
More information about the pkg-kde-commits
mailing list