rev 8634 - trunk/packages/kdebase/debian/patches

[Fathi Boudra]

Author: fabo
Date: 2007-12-29 13:03:22 +0000 (Sat, 29 Dec 2007)
New Revision: 8634

Modified:
   trunk/packages/kdebase/debian/patches/70_kdm_consolekit.diff
Log:
Do not patch Makefile.in. Breaks create-buildprep script.
WIP - tune create-buildprep script to avoid these mistake.


Modified: trunk/packages/kdebase/debian/patches/70_kdm_consolekit.diff
===================================================================
--- trunk/packages/kdebase/debian/patches/70_kdm_consolekit.diff	2007-12-29 09:20:29 UTC (rev 8633)
+++ trunk/packages/kdebase/debian/patches/70_kdm_consolekit.diff	2007-12-29 13:03:22 UTC (rev 8634)
@@ -700,111 +700,6 @@
      ctrl.c \
      daemon.c \
      dm.c \
-diff -Nur kdebase-3.5.8.dfsg.1/kdm/backend/Makefile.in kdebase-3.5.8.dfsg.1.new/kdm/backend/Makefile.in
---- kdebase-3.5.8.dfsg.1/kdm/backend/Makefile.in	2007-10-08 16:40:24.000000000 +0200
-+++ kdebase-3.5.8.dfsg.1.new/kdm/backend/Makefile.in	2007-12-26 14:41:46.000000000 +0100
-@@ -51,8 +51,8 @@
- binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
- PROGRAMS = $(bin_PROGRAMS)
- am_kdm_OBJECTS = access.$(OBJEXT) auth.$(OBJEXT) bootman.$(OBJEXT) \
--	choose.$(OBJEXT) client.$(OBJEXT) ctrl.$(OBJEXT) \
--	daemon.$(OBJEXT) dm.$(OBJEXT) dpylist.$(OBJEXT) \
-+	choose.$(OBJEXT) client.$(OBJEXT) consolekit.$(OBJEXT) \
-+	ctrl.$(OBJEXT) daemon.$(OBJEXT) dm.$(OBJEXT) dpylist.$(OBJEXT) \
- 	error.$(OBJEXT) genauth.$(OBJEXT) inifile.$(OBJEXT) \
- 	krb5auth.$(OBJEXT) mitauth.$(OBJEXT) netaddr.$(OBJEXT) \
- 	policy.$(OBJEXT) process.$(OBJEXT) protodpy.$(OBJEXT) \
-@@ -62,10 +62,10 @@
- 	xdmauth.$(OBJEXT) xdmcp.$(OBJEXT)
- #>- kdm_OBJECTS = $(am_kdm_OBJECTS)
- #>+ 13
--kdm_final_OBJECTS = access.o auth.o bootman.o choose.o client.o ctrl.o daemon.o dm.o dpylist.o error.o genauth.o inifile.o krb5auth.o mitauth.o netaddr.o policy.o process.o protodpy.o reset.o resource.o rpcauth.o server.o session.o sessreg.o socket.o streams.o util.o xdmauth.o xdmcp.o 
-+kdm_final_OBJECTS = access.o auth.o bootman.o choose.o client.o consolekit.o ctrl.o daemon.o dm.o dpylist.o error.o genauth.o inifile.o krb5auth.o mitauth.o netaddr.o policy.o process.o protodpy.o reset.o resource.o rpcauth.o server.o session.o sessreg.o socket.o streams.o util.o xdmauth.o xdmcp.o 
- kdm_nofinal_OBJECTS = access.$(OBJEXT) auth.$(OBJEXT) bootman.$(OBJEXT) \
--	choose.$(OBJEXT) client.$(OBJEXT) ctrl.$(OBJEXT) \
--	daemon.$(OBJEXT) dm.$(OBJEXT) dpylist.$(OBJEXT) \
-+	choose.$(OBJEXT) client.$(OBJEXT) consolekit.$(OBJEXT) \
-+	ctrl.$(OBJEXT) daemon.$(OBJEXT) dm.$(OBJEXT) dpylist.$(OBJEXT) \
- 	error.$(OBJEXT) genauth.$(OBJEXT) inifile.$(OBJEXT) \
- 	krb5auth.$(OBJEXT) mitauth.$(OBJEXT) netaddr.$(OBJEXT) \
- 	policy.$(OBJEXT) process.$(OBJEXT) protodpy.$(OBJEXT) \
-@@ -83,7 +83,7 @@
- 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
--	$(am__DEPENDENCIES_1)
-+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
- DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
- depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
- am__depfiles_maybe = depfiles
-@@ -119,7 +119,7 @@
- CFLAGS = @CFLAGS@
- CONF_FILES = @CONF_FILES@
- CPP = @CPP@
--CPPFLAGS = $(USER_INCLUDES) $(X_INCLUDES) $(KRB4_INCS) $(KRB5_INCS) -I.. -I../..
-+CPPFLAGS = $(USER_INCLUDES) $(X_INCLUDES) $(KRB4_INCS) $(KRB5_INCS) $(DBUS_INCS) -I.. -I../..
- CXX = @CXX@
- CXXCPP = @CXXCPP@
- CXXDEPMODE = @CXXDEPMODE@
-@@ -453,7 +453,7 @@
- # forcibly remove thread-related defines & flags
- AUTOMAKE_OPTIONS = foreign
- LDADD = $(LIB_X11) -lXau $(LIBXDMCP) $(PASSWDLIBS) $(LIBSHADOW) $(LIBGEN) \
--    $(LIB_LIBS) $(KRB4_LIBS) $(KRB5_LIBS) $(LIBSOCKET) $(LIBRESOLV) \
-+    $(LIB_LIBS) $(KRB4_LIBS) $(KRB5_LIBS) $(DBUS_LIBS) $(LIBSOCKET) $(LIBRESOLV) \
-     $(LIBUCB) $(LIBUTIL) $(LIBPOSIX4)
- 
- kdm_SOURCES = \
-@@ -462,6 +462,7 @@
-     bootman.c \
-     choose.c \
-     client.c \
-+    consolekit.c \
-     ctrl.c \
-     daemon.c \
-     dm.c \
-@@ -583,6 +584,7 @@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/bootman.Po at am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/choose.Po at am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/client.Po at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/consolekit.Po at am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/ctrl.Po at am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/daemon.Po at am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/dm.Po at am__quote@
-@@ -823,7 +825,7 @@
- .NOEXPORT:
- 
- #>+ 2
--KDE_DIST=Makefile.in Imakefile Makefile.am 
-+KDE_DIST=Makefile.in consolekit.h Imakefile Makefile.am kdm 
- 
- #>+ 2
- docs-am:
-@@ -886,7 +888,7 @@
- kde-rpo-clean:
- 	-rm -f *.rpo
- 
--#>+ 33
-+#>+ 34
- : ../config.ci 
- $(srcdir)/dpylist.c: ../config.ci 
- $(srcdir)/error.c: ../config.ci 
-@@ -897,13 +899,14 @@
- $(srcdir)/inifile.c: ../config.ci 
- $(srcdir)/daemon.c: ../config.ci 
- nmcheck-am: nmcheck
-+$(srcdir)/consolekit.c: ../config.ci 
- $(srcdir)/server.c: ../config.ci 
- $(srcdir)/client.c: ../config.ci 
- $(srcdir)/util.c: ../config.ci 
- $(srcdir)/policy.c: ../config.ci 
- $(srcdir)/socket.c: ../config.ci 
--$(srcdir)/reset.c: ../config.ci 
- $(srcdir)/xdmcp.c: ../config.ci 
-+$(srcdir)/reset.c: ../config.ci 
- $(srcdir)/bootman.c: ../config.ci 
- $(srcdir)/process.c: ../config.ci 
- $(srcdir)/resource.c: ../config.ci 
 diff -Nur kdebase-3.5.8.dfsg.1/kdm/backend/session.c kdebase-3.5.8.dfsg.1.new/kdm/backend/session.c
 --- kdebase-3.5.8.dfsg.1/kdm/backend/session.c	2007-12-26 14:41:34.000000000 +0100
 +++ kdebase-3.5.8.dfsg.1.new/kdm/backend/session.c	2007-12-26 14:41:46.000000000 +0100