[Pkg-kde-commits] rev 1083 - trunk/packages/kdenetwork/debian/patches
Adeodato Simó
dato-guest@costa.debian.org
Thu, 19 May 2005 21:24:21 +0000
Author: dato-guest
Date: 2005-05-19 21:24:20 +0000 (Thu, 19 May 2005)
New Revision: 1083
Modified:
trunk/packages/kdenetwork/debian/patches/12_kopete-fix-latest-login-trouble.diff
Log:
Makefile.in hunk for the patch.
Modified: trunk/packages/kdenetwork/debian/patches/12_kopete-fix-latest-login-trouble.diff
===================================================================
--- trunk/packages/kdenetwork/debian/patches/12_kopete-fix-latest-login-trouble.diff 2005-05-19 19:57:15 UTC (rev 1082)
+++ trunk/packages/kdenetwork/debian/patches/12_kopete-fix-latest-login-trouble.diff 2005-05-19 21:24:20 UTC (rev 1083)
@@ -770,3 +770,119 @@
+ }
+}
+
+diff -u -Nrua kdenetwork-3.3.2/kopete/protocols/msn.orig/Makefile.in kdenetwork-3.3.2/kopete/protocols/msn/Makefile.in
+--- kdenetwork-3.3.2/kopete/protocols/msn.orig/Makefile.in 2005-05-19 18:44:40.000000000 +0000
++++ kdenetwork-3.3.2/kopete/protocols/msn/Makefile.in 2005-05-19 19:56:57.000000000 +0000
+@@ -72,18 +72,18 @@
+ ../../libkopete/libkopete.la $(am__DEPENDENCIES_1)
+ am_libkopete_msn_shared_la_OBJECTS = msnprotocol.lo msnaccount.lo \
+ msnaddcontactpage.lo msncontact.lo msnsocket.lo \
+- msnmessagemanager.lo msndebugrawcmddlg.lo msnnotifysocket.lo \
+- msnswitchboardsocket.lo msnfiletransfersocket.lo \
+- msninvitation.lo msnp2p.lo sha1.lo
++ msnmessagemanager.lo msndebugrawcmddlg.lo sslloginhandler.lo \
++ msnnotifysocket.lo msnswitchboardsocket.lo \
++ msnfiletransfersocket.lo msninvitation.lo msnp2p.lo sha1.lo
+ #>- libkopete_msn_shared_la_OBJECTS = \
+ #>- $(am_libkopete_msn_shared_la_OBJECTS)
+ #>+ 8
+ libkopete_msn_shared_la_final_OBJECTS = libkopete_msn_shared_la.all_cpp.lo
+ libkopete_msn_shared_la_nofinal_OBJECTS = msnprotocol.lo msnaccount.lo \
+ msnaddcontactpage.lo msncontact.lo msnsocket.lo \
+- msnmessagemanager.lo msndebugrawcmddlg.lo msnnotifysocket.lo \
+- msnswitchboardsocket.lo msnfiletransfersocket.lo \
+- msninvitation.lo msnp2p.lo sha1.lo
++ msnmessagemanager.lo msndebugrawcmddlg.lo sslloginhandler.lo \
++ msnnotifysocket.lo msnswitchboardsocket.lo \
++ msnfiletransfersocket.lo msninvitation.lo msnp2p.lo sha1.lo
+ @KDE_USE_FINAL_FALSE@libkopete_msn_shared_la_OBJECTS = $(libkopete_msn_shared_la_nofinal_OBJECTS)
+ @KDE_USE_FINAL_TRUE@libkopete_msn_shared_la_OBJECTS = $(libkopete_msn_shared_la_final_OBJECTS)
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+@@ -443,6 +443,7 @@
+ CLEANFILES = dummy.cpp
+ libkopete_msn_shared_la_SOURCES = msnprotocol.cpp msnaccount.cpp msnaddcontactpage.cpp msncontact.cpp \
+ msnsocket.cpp msnmessagemanager.cpp msndebugrawcmddlg.cpp \
++ sslloginhandler.cpp \
+ msnnotifysocket.cpp msnswitchboardsocket.cpp msnfiletransfersocket.cpp msninvitation.cpp msnp2p.cpp sha1.cpp
+
+ libkopete_msn_shared_la_LIBADD = ./ui/libkopetemsnui.la ../../libkopete/libkopete.la $(LIB_KIO)
+@@ -591,6 +592,7 @@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/msnsocket.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/msnswitchboardsocket.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sha1.Plo@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sslloginhandler.Plo@am__quote@
+
+ .cpp.o:
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+@@ -1001,6 +1003,13 @@
+ mocs: msnprotocol.moc
+
+ #>+ 3
++sslloginhandler.moc: $(srcdir)/sslloginhandler.h
++ $(MOC) $(srcdir)/sslloginhandler.h -o sslloginhandler.moc
++
++#>+ 2
++mocs: sslloginhandler.moc
++
++#>+ 3
+ msnaccount.moc: $(srcdir)/msnaccount.h
+ $(MOC) $(srcdir)/msnaccount.h -o msnaccount.moc
+
+@@ -1053,10 +1062,10 @@
+
+ #>+ 3
+ clean-metasources:
+- -rm -f msndebugrawcmddlg.moc msnmessagemanager.moc msnfiletransfersocket.moc msncontact.moc msnprotocol.moc msnaccount.moc msnsocket.moc msnswitchboardsocket.moc msnnotifysocket.moc msnp2p.moc msnaddcontactpage.moc
++ -rm -f msndebugrawcmddlg.moc msnmessagemanager.moc msnfiletransfersocket.moc msncontact.moc msnprotocol.moc sslloginhandler.moc msnaccount.moc msnsocket.moc msnswitchboardsocket.moc msnnotifysocket.moc msnp2p.moc msnaddcontactpage.moc
+
+ #>+ 2
+-KDE_DIST=kopete_msn.desktop msncontact.h msnp2p.h msnmessagemanager.h msnchatui.rc Changelog msnsocket.h ReleaseNotes msndebugrawcmddlg.h msnaccount.h msnfiletransfersocket.h sha1.h msninvitation.h Makefile.in msnswitchboardsocket.h msnprotocol.h msnnotifysocket.h msnaddcontactpage.h Makefile.am
++KDE_DIST=kopete_msn.desktop msncontact.h msnp2p.h msnmessagemanager.h msnchatui.rc Changelog msnsocket.h ReleaseNotes msndebugrawcmddlg.h msnaccount.h msnfiletransfersocket.h sha1.h sslloginhandler.h msninvitation.h Makefile.in msnswitchboardsocket.h msnprotocol.h msnnotifysocket.h msnaddcontactpage.h Makefile.am
+
+ #>+ 3
+ clean-closures:
+@@ -1104,11 +1113,11 @@
+
+
+ #>+ 11
+-libkopete_msn_shared_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/msnprotocol.cpp $(srcdir)/msnaccount.cpp $(srcdir)/msnaddcontactpage.cpp $(srcdir)/msncontact.cpp $(srcdir)/msnsocket.cpp $(srcdir)/msnmessagemanager.cpp $(srcdir)/msndebugrawcmddlg.cpp $(srcdir)/msnnotifysocket.cpp $(srcdir)/msnswitchboardsocket.cpp $(srcdir)/msnfiletransfersocket.cpp $(srcdir)/msninvitation.cpp $(srcdir)/msnp2p.cpp $(srcdir)/sha1.cpp msndebugrawcmddlg.moc msncontact.moc msnfiletransfersocket.moc msnmessagemanager.moc msnprotocol.moc msnaccount.moc msnsocket.moc msnswitchboardsocket.moc msnnotifysocket.moc msnp2p.moc msnaddcontactpage.moc
++libkopete_msn_shared_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/msnprotocol.cpp $(srcdir)/msnaccount.cpp $(srcdir)/msnaddcontactpage.cpp $(srcdir)/msncontact.cpp $(srcdir)/msnsocket.cpp $(srcdir)/msnmessagemanager.cpp $(srcdir)/msndebugrawcmddlg.cpp $(srcdir)/sslloginhandler.cpp $(srcdir)/msnnotifysocket.cpp $(srcdir)/msnswitchboardsocket.cpp $(srcdir)/msnfiletransfersocket.cpp $(srcdir)/msninvitation.cpp $(srcdir)/msnp2p.cpp $(srcdir)/sha1.cpp msndebugrawcmddlg.moc msncontact.moc msnfiletransfersocket.moc msnmessagemanager.moc msnprotocol.moc sslloginhandler.moc msnaccount.moc msnsocket.moc msnswitchboardsocket.moc msnnotifysocket.moc msnp2p.moc msnaddcontactpage.moc
+ @echo 'creating libkopete_msn_shared_la.all_cpp.cpp ...'; \
+ rm -f libkopete_msn_shared_la.all_cpp.files libkopete_msn_shared_la.all_cpp.final; \
+ echo "#define KDE_USE_FINAL 1" >> libkopete_msn_shared_la.all_cpp.final; \
+- for file in msnprotocol.cpp msnaccount.cpp msnaddcontactpage.cpp msncontact.cpp msnsocket.cpp msnmessagemanager.cpp msndebugrawcmddlg.cpp msnnotifysocket.cpp msnswitchboardsocket.cpp msnfiletransfersocket.cpp msninvitation.cpp msnp2p.cpp sha1.cpp ; do \
++ for file in msnprotocol.cpp msnaccount.cpp msnaddcontactpage.cpp msncontact.cpp msnsocket.cpp msnmessagemanager.cpp msndebugrawcmddlg.cpp sslloginhandler.cpp msnnotifysocket.cpp msnswitchboardsocket.cpp msnfiletransfersocket.cpp msninvitation.cpp msnp2p.cpp sha1.cpp ; do \
+ echo "#include \"$$file\"" >> libkopete_msn_shared_la.all_cpp.files; \
+ test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libkopete_msn_shared_la.all_cpp.final; \
+ done; \
+@@ -1143,7 +1152,7 @@
+ kde-rpo-clean:
+ -rm -f *.rpo
+
+-#>+ 25
++#>+ 27
+ msnnotifysocket.lo: msnnotifysocket.moc
+ msnprotocol.lo: msnprotocol.moc
+ msncontact.o: msncontact.moc
+@@ -1154,17 +1163,19 @@
+ msnmessagemanager.lo: msnmessagemanager.moc
+ msndebugrawcmddlg.o: msndebugrawcmddlg.moc
+ msnsocket.lo: msnsocket.moc
++sslloginhandler.lo: sslloginhandler.moc
+ msndebugrawcmddlg.lo: msndebugrawcmddlg.moc
+ msncontact.lo: msncontact.moc
+ nmcheck:
+ msnaddcontactpage.o: msnaddcontactpage.moc
+-msnsocket.o: msnsocket.moc
+ msnnotifysocket.o: msnnotifysocket.moc
++msnsocket.o: msnsocket.moc
+ nmcheck-am: nmcheck
+ msnswitchboardsocket.lo: msnswitchboardsocket.moc
++sslloginhandler.o: sslloginhandler.moc
+ msnprotocol.o: msnprotocol.moc
+-msnmessagemanager.o: msnmessagemanager.moc
+ msnswitchboardsocket.o: msnswitchboardsocket.moc
++msnmessagemanager.o: msnmessagemanager.moc
+ msnaddcontactpage.lo: msnaddcontactpage.moc
+ msnp2p.o: msnp2p.moc
+ msnfiletransfersocket.lo: msnfiletransfersocket.moc