rev 13739 - branches/kde3-legacy/kdebase/debian/patches

Xavier Vello wdgt-guest at alioth.debian.org
Tue Feb 3 16:46:15 UTC 2009


Author: wdgt-guest
Date: 2009-02-03 16:46:15 +0000 (Tue, 03 Feb 2009)
New Revision: 13739

Modified:
   branches/kde3-legacy/kdebase/debian/patches/99_strip.diff
Log:
new stipping patch, hope it all compiles this time



Modified: branches/kde3-legacy/kdebase/debian/patches/99_strip.diff
===================================================================
--- branches/kde3-legacy/kdebase/debian/patches/99_strip.diff	2009-02-03 16:18:37 UTC (rev 13738)
+++ branches/kde3-legacy/kdebase/debian/patches/99_strip.diff	2009-02-03 16:46:15 UTC (rev 13739)
@@ -1,5 +1,5 @@
---- a/kcontrol/Makefile.am
-+++ b/kcontrol/Makefile.am
+--- a/kcontrol/Makefile.am	2009-02-03 17:22:01.000000000 +0100
++++ kcontrol/Makefile.am	2009-02-03 17:23:39.000000000 +0100
 @@ -28,12 +28,10 @@
  endif
  
@@ -13,10 +13,206 @@
 -	$(KSMCARD_SUBDIR) nics $(FONTINST_SUBDIR) $(RANDR_SUBDIR) \
 -	componentchooser performance xinerama $(VIEW1394_SUBDIR) display kthememanager \
 -        $(JOYSTICK_SUBDIR)
-+SUBDIRS = bell background dnssd filetypes samba krdb input info ioslaveinfo\
++SUBDIRS = bell background dnssd filetypes samba krdb ioslaveinfo \
 +	locale keys kio style kded \
-+	konqhtml kcontrol knotify\
++	konqhtml kcontrol knotify \
 +	pics $(ACCESS_SUBDIR) colors fonts css \
-+	icons crypto privacy \
++	icons crypto \
 +	spellchecking \
 +	componentchooser kthememanager
+--- a/kcontrol/Makefile.in	2009-02-03 17:22:01.000000000 +0100
++++ kcontrol/Makefile.in	2009-02-03 17:25:18.000000000 +0100
+@@ -1,5 +1,4 @@
+ # Makefile.in generated by automake 1.10.1 from Makefile.am.
+-# KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -45,35 +44,22 @@
+ CONFIG_CLEAN_FILES =
+ SOURCES =
+ DIST_SOURCES =
+-#>- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+-#>- 	html-recursive info-recursive install-data-recursive \
+-#>- 	install-dvi-recursive install-exec-recursive \
+-#>- 	install-html-recursive install-info-recursive \
+-#>- 	install-pdf-recursive install-ps-recursive install-recursive \
+-#>- 	installcheck-recursive installdirs-recursive pdf-recursive \
+-#>- 	ps-recursive uninstall-recursive
+-#>+ 7
+ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+ 	html-recursive info-recursive install-data-recursive \
+ 	install-dvi-recursive install-exec-recursive \
+ 	install-html-recursive install-info-recursive \
+ 	install-pdf-recursive install-ps-recursive install-recursive \
+ 	installcheck-recursive installdirs-recursive pdf-recursive \
+-	ps-recursive uninstall-recursive nmcheck-recursive bcheck-recursive
++	ps-recursive uninstall-recursive
+ RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
+   distclean-recursive maintainer-clean-recursive
+ ETAGS = etags
+ CTAGS = ctags
+-DIST_SUBDIRS = bell background dnssd filetypes samba krdb input info \
+-	ioslaveinfo kdm kicker locale launch keys kio konq style kded \
+-	konqhtml ebrowsing arts kcontrol knotify clock pics access \
+-	colors energy fonts css icons screensaver taskbar crypto \
+-	privacy smserver konsole spellchecking usbview smartcard nics \
+-	kfontinst randr componentchooser performance xinerama view1394 \
+-	display kthememanager joystick
+-#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+-#>+ 1
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
++DIST_SUBDIRS = bell background dnssd filetypes samba krdb ioslaveinfo \
++	locale keys kio style kded konqhtml kcontrol knotify pics \
++	access colors fonts css icons crypto spellchecking \
++	componentchooser kthememanager
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ ACLOCAL = @ACLOCAL@
+ AMTAR = @AMTAR@
+ AR = @AR@
+@@ -431,34 +417,18 @@
+ @include_kcontrol_joystick_TRUE at JOYSTICK_SUBDIR = joystick
+ 
+ # 'colors' and 'fonts' should come after 'krdb'
+-SUBDIRS = bell background dnssd filetypes samba krdb input info ioslaveinfo kdm\
+-	kicker locale launch keys kio konq style kded \
+-	konqhtml ebrowsing arts kcontrol knotify\
+-	clock pics $(ACCESS_SUBDIR) colors energy fonts css \
+-	icons screensaver taskbar crypto privacy smserver \
+-	konsole spellchecking $(USBVIEW_SUBDIR) \
+-	$(KSMCARD_SUBDIR) nics $(FONTINST_SUBDIR) $(RANDR_SUBDIR) \
+-	componentchooser performance xinerama $(VIEW1394_SUBDIR) display kthememanager \
+-        $(JOYSTICK_SUBDIR)
+-
+-#>- all: all-recursive
+-#>+ 1
+-all: docs-am  all-recursive
++SUBDIRS = bell background dnssd filetypes samba krdb ioslaveinfo \
++	locale keys kio style kded \
++	konqhtml kcontrol knotify \
++	pics $(ACCESS_SUBDIR) colors fonts css \
++	icons crypto \
++	spellchecking \
++	componentchooser kthememanager
++
++all: all-recursive
+ 
+ .SUFFIXES:
+ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+-#>- 	@for dep in $?; do \
+-#>- 	  case '$(am__configure_deps)' in \
+-#>- 	    *$$dep*) \
+-#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+-#>- 		&& exit 0; \
+-#>- 	      exit 1;; \
+-#>- 	  esac; \
+-#>- 	done; \
+-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kcontrol/Makefile'; \
+-#>- 	cd $(top_srcdir) && \
+-#>- 	  $(AUTOMAKE) --foreign  kcontrol/Makefile
+-#>+ 12
+ 	@for dep in $?; do \
+ 	  case '$(am__configure_deps)' in \
+ 	    *$$dep*) \
+@@ -467,10 +437,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kcontrol/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kcontrol/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  kcontrol/Makefile
+-	cd $(top_srcdir) && perl admin/am_edit kcontrol/Makefile.in
++	  $(AUTOMAKE) --gnu  kcontrol/Makefile
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ 	@case '$?' in \
+@@ -697,13 +666,9 @@
+ maintainer-clean-generic:
+ 	@echo "This command is intended for maintainers to use"
+ 	@echo "it deletes files that may require special tools to rebuild."
+-#>- clean: clean-recursive
+-#>+ 1
+-clean: kde-rpo-clean  clean-recursive
+-
+-#>- clean-am: clean-generic clean-libtool mostlyclean-am
+-#>+ 1
+-clean-am: clean-bcheck  clean-generic clean-libtool mostlyclean-am
++clean: clean-recursive
++
++clean-am: clean-generic clean-libtool mostlyclean-am
+ 
+ distclean: distclean-recursive
+ 	-rm -f Makefile
+@@ -775,71 +740,3 @@
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
+-
+-#>+ 2
+-KDE_DIST=Makefile.in structure Makefile.am 
+-
+-#>+ 2
+-docs-am:
+-
+-#>+ 15
+-force-reedit:
+-		@for dep in $?; do \
+-	  case '$(am__configure_deps)' in \
+-	    *$$dep*) \
+-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+-		&& exit 0; \
+-	      exit 1;; \
+-	  esac; \
+-	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kcontrol/Makefile'; \
+-	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  kcontrol/Makefile
+-	cd $(top_srcdir) && perl admin/am_edit kcontrol/Makefile.in
+-
+-
+-#>+ 21
+-clean-bcheck: 
+-	rm -f *.bchecktest.cc *.bchecktest.cc.class a.out
+-
+-bcheck: bcheck-recursive
+-
+-bcheck-am:
+-	@for i in ; do \
+-	    if test $(srcdir)/$$i -nt $$i.bchecktest.cc; then \
+-	        echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+-	        echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+-	        echo "$$i"; \
+-	        if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)  --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+-	            rm -f $$i.bchecktest.cc; exit 1; \
+-	        fi ; \
+-	        echo "" >> $$i.bchecktest.cc.class; \
+-	        perl $(top_srcdir)/admin/bcheck.pl $$i.bchecktest.cc.class || { rm -f $$i.bchecktest.cc; exit 1; }; \
+-	        rm -f a.out; \
+-	    fi ; \
+-	done
+-
+-
+-#>+ 3
+-final:
+-	$(MAKE) all-am
+-
+-#>+ 3
+-final-install:
+-	$(MAKE) install-am
+-
+-#>+ 3
+-no-final:
+-	$(MAKE) all-am
+-
+-#>+ 3
+-no-final-install:
+-	$(MAKE) install-am
+-
+-#>+ 3
+-kde-rpo-clean:
+-	-rm -f *.rpo
+-
+-#>+ 3
+-nmcheck: 
+-nmcheck-am: nmcheck




More information about the pkg-kde-commits mailing list