rev 4274 - in trunk/packages/kdenetwork/debian: . patches
Christopher Martin
chrsmrtn at costa.debian.org
Tue Aug 1 22:20:03 UTC 2006
Author: chrsmrtn
Date: 2006-08-01 22:19:11 +0000 (Tue, 01 Aug 2006)
New Revision: 4274
Added:
trunk/packages/kdenetwork/debian/patches/01_kdenetwork_branch_r568672.diff
Modified:
trunk/packages/kdenetwork/debian/changelog
trunk/packages/kdenetwork/debian/patches/98_buildprep.diff
Log:
Easy enough to fix the ICQ breakage.
Modified: trunk/packages/kdenetwork/debian/changelog
===================================================================
--- trunk/packages/kdenetwork/debian/changelog 2006-08-01 16:38:43 UTC (rev 4273)
+++ trunk/packages/kdenetwork/debian/changelog 2006-08-01 22:19:11 UTC (rev 4274)
@@ -1,3 +1,13 @@
+kdenetwork (4:3.5.4-2) unstable; urgency=low
+
+ +++ Changes by Christopher Martin:
+
+ * KDE_3_5_BRANCH update (up to r568672).
+ + Picks up an ICQ compatibility fix for Kopete, made necessary by a recent
+ change in the protocol. (Closes: #380740)
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Tue, 1 Aug 2006 18:04:24 -0400
+
kdenetwork (4:3.5.4-1) unstable; urgency=low
* New upstream release.
Added: trunk/packages/kdenetwork/debian/patches/01_kdenetwork_branch_r568672.diff
===================================================================
--- trunk/packages/kdenetwork/debian/patches/01_kdenetwork_branch_r568672.diff 2006-08-01 16:38:43 UTC (rev 4273)
+++ trunk/packages/kdenetwork/debian/patches/01_kdenetwork_branch_r568672.diff 2006-08-01 22:19:11 UTC (rev 4274)
@@ -0,0 +1,64 @@
+#DPATCHLEVEL=0
+--- kopete/protocols/oscar/liboscar/oscartypes.h (revision 567759)
++++ kopete/protocols/oscar/liboscar/oscartypes.h (revision 568672)
+@@ -237,7 +237,7 @@
+ const WORD ICQ_MAJOR = 0x0014;
+ const WORD ICQ_MINOR = 0x0034;
+ const WORD ICQ_POINT = 0x0000;
+- const WORD ICQ_BUILD = 0x0A0F;
++ const WORD ICQ_BUILD = 0x0BB8;
+ const char ICQ_OTHER[] = { 0x00, 0x00, 0x04, 0x3d };
+ const char ICQ_COUNTRY[] = "us";
+ const char ICQ_LANG[] = "en";
+--- kopete/protocols/oscar/liboscar/client.cpp (revision 567759)
++++ kopete/protocols/oscar/liboscar/client.cpp (revision 568672)
+@@ -1049,8 +1049,11 @@
+ if ( !c )
+ return;
+
+- if ( c->isSupported( 0x0002 ) )
++ if ( c->isSupported( 0x0002 ) ||
++ d->stage == ClientPrivate::StageOne ) //emit on login
++ {
+ emit socketError( code, string );
++ }
+
+ //connection is deleted. deleteLater() is used
+ d->connections.remove( c );
+--- ksirc/dccMgrTest.cpp (revision 567759)
++++ ksirc/dccMgrTest.cpp (revision 568672)
+@@ -8,12 +8,12 @@
+ Timer( dccManager *view )
+ : m_view( view )
+ {
+- m_it = m_view->newSendItem("test", "boren", dccItem::dccOffer, 123523);
+- m_view->newSendItem("test2", "boren", dccItem::dccOffer, 123523);
+- m_view->newSendItem("test3", "boren", dccItem::dccOffer, 123523);
+- m_view->newGetItem("test4", "boren", dccItem::dccOffer, 123523);
+- m_view->newGetItem("test4", "boren", dccItem::dccOffer, 123523);
+- m_view->newGetItem("test4", "boren", dccItem::dccOffer, 123523);
++ m_it = m_view->newSendItem("test", "boren", dccItem::dccSentOffer, 123523);
++ m_view->newSendItem("test2", "boren", dccItem::dccSentOffer, 123523);
++ m_view->newSendItem("test3", "boren", dccItem::dccSentOffer, 123523);
++ m_view->newGetItem("test4", "boren", dccItem::dccGotOffer, 123523);
++ m_view->newGetItem("test4", "boren", dccItem::dccGotOffer, 123523);
++ m_view->newGetItem("test4", "boren", dccItem::dccGotOffer, 123523);
+ bytes = 0;
+ startTimer( 100 );
+ }
+--- ksirc/Makefile.am (revision 567759)
++++ ksirc/Makefile.am (revision 568672)
+@@ -12,11 +12,11 @@
+ check_PROGRAMS = testview dccMgrTest
+
+ testview_SOURCES = kstextviewtest.cpp
+-testview_LDADD = kstextview.lo $(LIB_KDEUI)
++testview_LDADD = kstextview.lo dccNew.lo dccNewbase.lo alistbox.lo objFinder.lo ksopts.lo nickColourMaker.lo $(LIB_KUTILS) $(LIB_KDEUI)
+ testview_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+
+ dccMgrTest_SOURCES = dccMgrTest.cpp
+-dccMgrTest_LDADD = dccManager.lo dccManagerbase.lo $(LIB_KDEUI)
++dccMgrTest_LDADD = dccManager.lo dccManagerbase.lo dccNew.lo dccNewbase.lo alistbox.lo objFinder.lo ksopts.lo nickColourMaker.lo $(LIB_KUTILS) $(LIB_KDEUI)
+ dccMgrTest_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+
+ bin_PROGRAMS =
Modified: trunk/packages/kdenetwork/debian/patches/98_buildprep.diff
===================================================================
--- trunk/packages/kdenetwork/debian/patches/98_buildprep.diff 2006-08-01 16:38:43 UTC (rev 4273)
+++ trunk/packages/kdenetwork/debian/patches/98_buildprep.diff 2006-08-01 22:19:11 UTC (rev 4274)
@@ -85269,7 +85269,30 @@
clean-noinstLTLIBRARIES:
--- ksirc/Makefile.in
+++ ksirc/Makefile.in
-@@ -227,6 +227,7 @@
+@@ -102,8 +102,9 @@
+ #>- dccMgrTest_OBJECTS = $(am_dccMgrTest_OBJECTS)
+ #>+ 1
+ dccMgrTest_OBJECTS = dccMgrTest.$(OBJEXT)
+-dccMgrTest_DEPENDENCIES = dccManager.lo dccManagerbase.lo \
+- $(am__DEPENDENCIES_1)
++dccMgrTest_DEPENDENCIES = dccManager.lo dccManagerbase.lo dccNew.lo \
++ dccNewbase.lo alistbox.lo objFinder.lo ksopts.lo \
++ nickColourMaker.lo $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+ am_getdate_OBJECTS = getdate.$(OBJEXT)
+ #>- getdate_OBJECTS = $(am_getdate_OBJECTS)
+ #>+ 1
+@@ -113,7 +114,9 @@
+ #>- testview_OBJECTS = $(am_testview_OBJECTS)
+ #>+ 1
+ testview_OBJECTS = kstextviewtest.$(OBJEXT)
+-testview_DEPENDENCIES = kstextview.lo $(am__DEPENDENCIES_1)
++testview_DEPENDENCIES = kstextview.lo dccNew.lo dccNewbase.lo \
++ alistbox.lo objFinder.lo ksopts.lo nickColourMaker.lo \
++ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+ binSCRIPT_INSTALL = $(INSTALL_SCRIPT)
+ SCRIPTS = $(bin_SCRIPTS)
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+@@ -227,6 +230,7 @@
GLINC = @GLINC@
GLLIB = @GLLIB@
GMSGFMT = @GMSGFMT@
@@ -85277,7 +85300,7 @@
HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
IDN_CPPFLAGS = @IDN_CPPFLAGS@
IDN_LDFLAGS = @IDN_LDFLAGS@
-@@ -323,6 +324,9 @@
+@@ -323,6 +327,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -85287,7 +85310,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -366,6 +370,7 @@
+@@ -366,6 +373,7 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
@@ -85295,7 +85318,7 @@
XMLLINT = @XMLLINT@
XMMS_INCLUDES = @XMMS_INCLUDES@
XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -377,12 +382,9 @@
+@@ -377,12 +385,9 @@
X_RPATH = @X_RPATH@
YAHOO2_VERSION = @YAHOO2_VERSION@
YAHOOPKGREQ = @YAHOOPKGREQ@
@@ -85308,7 +85331,7 @@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -401,10 +403,13 @@
+@@ -401,10 +406,13 @@
build_os = @build_os@
build_vendor = @build_vendor@
datadir = @datadir@
@@ -85322,7 +85345,7 @@
exec_prefix = @exec_prefix@
filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
-@@ -413,6 +418,7 @@
+@@ -413,6 +421,7 @@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
@@ -85330,7 +85353,7 @@
include_ARTS_FALSE = @include_ARTS_FALSE@
include_ARTS_TRUE = @include_ARTS_TRUE@
include_gadu_FALSE = @include_gadu_FALSE@
-@@ -489,12 +495,15 @@
+@@ -489,12 +498,15 @@
libexecdir = @libexecdir@
librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
@@ -85346,7 +85369,20 @@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
sbindir = @sbindir@
-@@ -687,7 +696,7 @@
+@@ -523,10 +535,10 @@
+ SUBDIRS = KSTicker KSProgress KSPrefs KSOpenkSirc img icons
+ #>- METASOURCES = AUTO
+ testview_SOURCES = kstextviewtest.cpp
+-testview_LDADD = kstextview.lo $(LIB_KDEUI)
++testview_LDADD = kstextview.lo dccNew.lo dccNewbase.lo alistbox.lo objFinder.lo ksopts.lo nickColourMaker.lo $(LIB_KUTILS) $(LIB_KDEUI)
+ testview_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+ dccMgrTest_SOURCES = dccMgrTest.cpp
+-dccMgrTest_LDADD = dccManager.lo dccManagerbase.lo $(LIB_KDEUI)
++dccMgrTest_LDADD = dccManager.lo dccManagerbase.lo dccNew.lo dccNewbase.lo alistbox.lo objFinder.lo ksopts.lo nickColourMaker.lo $(LIB_KUTILS) $(LIB_KDEUI)
+ dccMgrTest_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+ #>- lib_LTLIBRARIES =
+ #>+ 1
+@@ -687,7 +699,7 @@
.SUFFIXES:
.SUFFIXES: .c .cpp .lo .o .obj
@@ -85355,7 +85391,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -725,9 +734,9 @@
+@@ -725,9 +737,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -85367,7 +85403,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -1356,18 +1365,18 @@
+@@ -1356,18 +1368,18 @@
ksirc_DEPENDENCIES = libkdeinit_ksirc.la
#>+ 3
@@ -85392,7 +85428,7 @@
#>+ 3
ioDCC.moc: $(srcdir)/ioDCC.h
-@@ -1384,13 +1393,6 @@
+@@ -1384,13 +1396,6 @@
mocs: ssfeprompt.moc
#>+ 3
@@ -85406,7 +85442,7 @@
FilterRuleEditor.moc: $(srcdir)/FilterRuleEditor.h
$(MOC) $(srcdir)/FilterRuleEditor.h -o FilterRuleEditor.moc
-@@ -1405,6 +1407,13 @@
+@@ -1405,6 +1410,13 @@
mocs: ahistlineedit.moc
#>+ 3
@@ -85420,7 +85456,7 @@
alistbox.moc: $(srcdir)/alistbox.h
$(MOC) $(srcdir)/alistbox.h -o alistbox.moc
-@@ -1433,13 +1442,6 @@
+@@ -1433,13 +1445,6 @@
mocs: ksview.moc
#>+ 3
@@ -85434,7 +85470,7 @@
ioLAG.moc: $(srcdir)/ioLAG.h
$(MOC) $(srcdir)/ioLAG.h -o ioLAG.moc
-@@ -1447,18 +1449,18 @@
+@@ -1447,18 +1452,18 @@
mocs: ioLAG.moc
#>+ 3
@@ -85459,7 +85495,7 @@
#>+ 3
colorpicker.moc: $(srcdir)/colorpicker.h
-@@ -1475,6 +1477,13 @@
+@@ -1475,6 +1480,13 @@
mocs: objFinder.moc
#>+ 3
@@ -85473,7 +85509,7 @@
displayMgrMDI.moc: $(srcdir)/displayMgrMDI.h
$(MOC) $(srcdir)/displayMgrMDI.h -o displayMgrMDI.moc
-@@ -1503,18 +1512,18 @@
+@@ -1503,18 +1515,18 @@
mocs: dccToplevel.moc
#>+ 3
@@ -85498,7 +85534,7 @@
#>+ 3
dockservercontroller.moc: $(srcdir)/dockservercontroller.h
-@@ -1539,7 +1548,7 @@
+@@ -1539,7 +1551,7 @@
#>+ 3
clean-metasources:
@@ -85507,7 +85543,7 @@
#>+ 2
KDE_DIST=advfollow.pl sirc.help.gz nickColourMaker.h eventsrc displayMgrMDI.h ksircserver.h Artistic default.pl kstextview.h charSelector.h relnotes filters.pl openksircproc.dlg FilterRuleWidget.ui servercontroller.dlg Makefile.in autodcc.pl dccManagerbase.ui chanButtons.h topic.h ksircrc ksirc.pl stringparserstate.h FilterRuleEditor.dlg ksirc.desktop dccNewbase.ui ksircchannel.h FAQ logfile.h colorpicker.h dsirc mditoplevel.h version.h Makefile.am
-@@ -1593,7 +1602,7 @@
+@@ -1593,7 +1605,7 @@
#>+ 11
More information about the pkg-kde-commits
mailing list