[pkg-kde-commits] rev 2643 - trunk/packages/kdebase/debian/patches
Christopher Martin
chrsmrtn at costa.debian.org
Fri Dec 16 03:25:12 UTC 2005
Author: chrsmrtn
Date: 2005-12-16 03:25:09 +0000 (Fri, 16 Dec 2005)
New Revision: 2643
Modified:
trunk/packages/kdebase/debian/patches/98_buildprep.diff
Log:
Updated buildprep for kdebase.
Modified: trunk/packages/kdebase/debian/patches/98_buildprep.diff
===================================================================
--- trunk/packages/kdebase/debian/patches/98_buildprep.diff 2005-12-16 03:23:22 UTC (rev 2642)
+++ trunk/packages/kdebase/debian/patches/98_buildprep.diff 2005-12-16 03:25:09 UTC (rev 2643)
@@ -30777,7 +30777,26 @@
@$(NORMAL_INSTALL)
--- ksmserver/Makefile.in
+++ ksmserver/Makefile.in
-@@ -356,6 +356,9 @@
+@@ -89,7 +89,8 @@
+ #>- $(am__DEPENDENCIES_1)
+ #>+ 1
+ ksmserver_la_DEPENDENCIES = libkdeinit_ksmserver.la
+-#>- am_ksmserver_la_OBJECTS = main.lo server.lo shutdown.lo
++#>- am_ksmserver_la_OBJECTS = main.lo server.lo shutdowndlg.lo legacy.lo \
++#>- startup.lo shutdown.lo client.lo
+ #>+ 1
+ am_ksmserver_la_OBJECTS = ksmserver_dummy.lo
+ #>- ksmserver_la_OBJECTS = $(am_ksmserver_la_OBJECTS)
+@@ -104,7 +105,7 @@
+ #>- testsh_OBJECTS = $(am_testsh_OBJECTS)
+ #>+ 1
+ testsh_OBJECTS = test.$(OBJEXT)
+-testsh_DEPENDENCIES = $(am__DEPENDENCIES_1) shutdown.lo \
++testsh_DEPENDENCIES = $(am__DEPENDENCIES_1) shutdowndlg.lo \
+ ../kdmlib/libdmctl.la
+ updateSCRIPT_INSTALL = $(INSTALL_SCRIPT)
+ SCRIPTS = $(update_SCRIPTS)
+@@ -356,6 +357,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -30787,7 +30806,40 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -673,7 +676,7 @@
+@@ -646,15 +650,20 @@
+ #>+ 1
+ lib_LTLIBRARIES = libkdeinit_ksmserver.la
+ kdeinit_LTLIBRARIES = ksmserver.la
+-noinst_HEADERS = global.h server.h shutdown.h
++noinst_HEADERS = global.h server.h
+ #>- ksmserver_la_METASOURCES = AUTO
+ #>+ 1
+ #>- libkdeinit_ksmserver_la_METASOURCES = AUTO
+ # Order is important for --enable-final!
+-#>- ksmserver_la_SOURCES = main.cpp server.cpp shutdown.cpp KSMServerInterface.skel server.skel
+-#>+ 2
++#>- ksmserver_la_SOURCES = main.cpp server.cpp shutdowndlg.cpp \
++#>- legacy.cpp startup.cpp shutdown.cpp client.cpp \
++#>- KSMServerInterface.skel server.skel
++#>+ 4
+ ksmserver_la_SOURCES = ksmserver_la_dummy.cpp
+-libkdeinit_ksmserver_la_SOURCES = main.cpp server.cpp shutdown.cpp KSMServerInterface_skel.cpp server_skel.cpp
++libkdeinit_ksmserver_la_SOURCES = main.cpp server.cpp shutdowndlg.cpp \
++ legacy.cpp startup.cpp shutdown.cpp client.cpp \
++ KSMServerInterface_skel.cpp server_skel.cpp
++
+ ksmserver_la_LDFLAGS = $(all_libraries) -avoid-version -module
+ #>- ksmserver_la_LIBADD = ../kdmlib/libdmctl.la $(LIB_KDEUI)
+ #>+ 1
+@@ -666,14 +675,14 @@
+ updatedir = $(kde_datadir)/kconf_update
+ testsh_SOURCES = test.cpp
+ testsh_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+-testsh_LDADD = $(LIB_KDEUI) shutdown.lo ../kdmlib/libdmctl.la
++testsh_LDADD = $(LIB_KDEUI) shutdowndlg.lo ../kdmlib/libdmctl.la
+ #>- all: all-recursive
+ #>+ 1
+ all: docs-am all-recursive
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -30796,7 +30848,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -711,9 +714,9 @@
+@@ -711,9 +720,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -30808,6 +30860,105 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES)
@$(NORMAL_INSTALL)
+@@ -828,9 +837,13 @@
+ distclean-compile:
+ -rm -f *.tab.c
+
++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/client.Plo at am__quote@
++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/legacy.Plo at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/main.Plo at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/server.Plo at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/shutdown.Plo at am__quote@
++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/shutdowndlg.Plo at am__quote@
++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/startup.Plo at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/test.Po at am__quote@
+
+ .cpp.o:
+@@ -1206,8 +1219,9 @@
+ libkdeinit_ksmserver_la_DEPENDENCIES = ../kdmlib/libdmctl.la \
+ $(am__DEPENDENCIES_1)
+
+-#>+ 2
+-am_libkdeinit_ksmserver_la_OBJECTS = main.lo server.lo shutdown.lo
++#>+ 3
++am_libkdeinit_ksmserver_la_OBJECTS = main.lo server.lo shutdowndlg.lo legacy.lo \
++ startup.lo shutdown.lo client.lo
+
+ #>+ 13
+
+@@ -1234,11 +1248,11 @@
+ $(DCOPIDL2CPP) --c++-suffix cpp --no-signals --no-stub server.kidl
+
+ #>+ 3
+-shutdown.moc: $(srcdir)/shutdown.h
+- $(MOC) $(srcdir)/shutdown.h -o shutdown.moc
++shutdowndlg.moc: $(srcdir)/shutdowndlg.h
++ $(MOC) $(srcdir)/shutdowndlg.h -o shutdowndlg.moc
+
+ #>+ 2
+-mocs: shutdown.moc
++mocs: shutdowndlg.moc
+
+ #>+ 3
+ server.moc: $(srcdir)/server.h
+@@ -1249,10 +1263,10 @@
+
+ #>+ 3
+ clean-metasources:
+- -rm -f shutdown.moc server.moc
++ -rm -f shutdowndlg.moc server.moc
+
+ #>+ 2
+-KDE_DIST=move_session_config.sh Makefile.in LICENSE configure.in.in shutdownkonq.png server2.h ksmserver.upd KSMServerInterface.h Makefile.am
++KDE_DIST=move_session_config.sh Makefile.in shutdowndlg.h LICENSE configure.in.in client.h shutdownkonq.png server2.h ksmserver.upd KSMServerInterface.h Makefile.am
+
+ #>+ 5
+ clean-idl:
+@@ -1302,11 +1316,11 @@
+
+
+ #>+ 11
+-libkdeinit_ksmserver_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/server.cpp $(srcdir)/shutdown.cpp KSMServerInterface_skel.cpp server_skel.cpp shutdown.moc server.moc
++libkdeinit_ksmserver_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/server.cpp $(srcdir)/shutdowndlg.cpp $(srcdir)/legacy.cpp $(srcdir)/startup.cpp $(srcdir)/shutdown.cpp $(srcdir)/client.cpp KSMServerInterface_skel.cpp server_skel.cpp shutdowndlg.moc server.moc
+ @echo 'creating libkdeinit_ksmserver_la.all_cpp.cpp ...'; \
+ rm -f libkdeinit_ksmserver_la.all_cpp.files libkdeinit_ksmserver_la.all_cpp.final; \
+ echo "#define KDE_USE_FINAL 1" >> libkdeinit_ksmserver_la.all_cpp.final; \
+- for file in main.cpp server.cpp shutdown.cpp KSMServerInterface_skel.cpp server_skel.cpp ; do \
++ for file in main.cpp server.cpp shutdowndlg.cpp legacy.cpp startup.cpp shutdown.cpp client.cpp KSMServerInterface_skel.cpp server_skel.cpp ; do \
+ echo "#include \"$$file\"" >> libkdeinit_ksmserver_la.all_cpp.files; \
+ test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libkdeinit_ksmserver_la.all_cpp.final; \
+ done; \
+@@ -1317,9 +1331,10 @@
+ clean-final:
+ -rm -f libkdeinit_ksmserver_la.all_cpp.cpp
+
+-#>+ 5
++#>+ 6
+ libkdeinit_ksmserver_la_final_OBJECTS = libkdeinit_ksmserver_la.all_cpp.lo
+-libkdeinit_ksmserver_la_nofinal_OBJECTS = main.lo server.lo shutdown.lo KSMServerInterface_skel.lo server_skel.lo
++libkdeinit_ksmserver_la_nofinal_OBJECTS = main.lo server.lo shutdowndlg.lo legacy.lo \
++ startup.lo shutdown.lo client.lo KSMServerInterface_skel.lo server_skel.lo
+ @KDE_USE_FINAL_FALSE at libkdeinit_ksmserver_la_OBJECTS = $(libkdeinit_ksmserver_la_nofinal_OBJECTS)
+ @KDE_USE_FINAL_TRUE at libkdeinit_ksmserver_la_OBJECTS = $(libkdeinit_ksmserver_la_final_OBJECTS)
+
+@@ -1348,15 +1363,15 @@
+
+ #>+ 14
+ nmcheck:
++shutdowndlg.o: shutdowndlg.moc
+ server.lo: server.moc
+ ksmserver$(EXEEXT): $(ksmserver_OBJECTS) $(ksmserver_DEPENDENCIES)
+ @rm -f ksmserver$(EXEEXT)
+ $(CXXLINK) $(ksmserver_LDFLAGS) $(ksmserver_OBJECTS) $(ksmserver_LDADD) $(LIBS)
+
+-shutdown.lo: shutdown.moc
+ nmcheck-am: nmcheck
++shutdowndlg.lo: shutdowndlg.moc
+ libkdeinit_ksmserver.la: $(libkdeinit_ksmserver_la_OBJECTS) $(libkdeinit_ksmserver_la_DEPENDENCIES)
+ $(CXXLINK) -rpath $(libdir) $(libkdeinit_ksmserver_la_LDFLAGS) $(libkdeinit_ksmserver_la_OBJECTS) $(libkdeinit_ksmserver_la_LIBADD) $(LIBS)
+
+-shutdown.o: shutdown.moc
+ server.o: server.moc
--- ksplashml/kcmksplash/Makefile.in
+++ ksplashml/kcmksplash/Makefile.in
@@ -313,6 +313,9 @@
More information about the pkg-kde-commits
mailing list