[pkg-kde-commits] rev 2763 -
trunk/packages/kdemultimedia/debian/patches
Christopher Martin
chrsmrtn at costa.debian.org
Sat Jan 7 17:38:24 UTC 2006
Author: chrsmrtn
Date: 2006-01-07 17:38:22 +0000 (Sat, 07 Jan 2006)
New Revision: 2763
Modified:
trunk/packages/kdemultimedia/debian/patches/98_buildprep.diff
Log:
buildprep update for kdemultimedia.
Modified: trunk/packages/kdemultimedia/debian/patches/98_buildprep.diff
===================================================================
--- trunk/packages/kdemultimedia/debian/patches/98_buildprep.diff 2006-01-07 17:38:00 UTC (rev 2762)
+++ trunk/packages/kdemultimedia/debian/patches/98_buildprep.diff 2006-01-07 17:38:22 UTC (rev 2763)
@@ -13107,11 +13107,11 @@
#>+ 2
-KDE_DIST=kscd18.png index.docbook kscd6.png kscd13.png kscd2.png kscd14.png index.cache.bz2 kscd5.png kscd12.png kscd16.png kscd11.png kscd19.png kscd9.png kscd3.png kscd.png Makefile.in Makefile.am
-+KDE_DIST=kscd18.png kscd5.png kscd12.png index.docbook kscd16.png kscd11.png kscd9.png kscd19.png kscd6.png kscd3.png kscd.png kscd13.png Makefile.in kscd2.png kscd14.png Makefile.am index.cache.bz2
++KDE_DIST=kscd18.png kscd5.png kscd12.png index.docbook kscd16.png kscd11.png kscd9.png kscd19.png kscd6.png kscd3.png kscd.png kscd13.png Makefile.in kscd2.png kscd14.png Makefile.am kscdannounc.png index.cache.bz2
#>+ 24
-index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) index.docbook kscd18.png kscd9.png kscd19.png kscd.png kscd11.png kscd2.png kscd12.png kscd3.png kscd13.png kscd14.png kscd5.png kscd6.png kscd16.png
-+index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) kscd11.png kscd12.png kscd13.png kscd14.png kscd16.png kscd18.png kscd19.png kscd2.png kscd3.png kscd5.png kscd6.png kscd9.png kscd.png index.docbook
++index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) kscd11.png kscd12.png kscd13.png kscd14.png kscd16.png kscd18.png kscd19.png kscd2.png kscd3.png kscd5.png kscd6.png kscd9.png kscd.png kscdannounc.png index.docbook
@if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi
docs-am: index.cache.bz2
@@ -13120,14 +13120,14 @@
install-nls:
$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kscd
- @for base in index.docbook kscd18.png kscd9.png kscd19.png kscd.png kscd11.png kscd2.png kscd12.png kscd3.png kscd13.png kscd14.png kscd5.png kscd6.png kscd16.png ; do \
-+ @for base in kscd11.png kscd12.png kscd13.png kscd14.png kscd16.png kscd18.png kscd19.png kscd2.png kscd3.png kscd5.png kscd6.png kscd9.png kscd.png index.docbook ; do \
++ @for base in kscd11.png kscd12.png kscd13.png kscd14.png kscd16.png kscd18.png kscd19.png kscd2.png kscd3.png kscd5.png kscd6.png kscd9.png kscd.png kscdannounc.png index.docbook ; do \
echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kscd/$$base ;\
$(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kscd/$$base ;\
done
uninstall-nls:
- for base in index.docbook kscd18.png kscd9.png kscd19.png kscd.png kscd11.png kscd2.png kscd12.png kscd3.png kscd13.png kscd14.png kscd5.png kscd6.png kscd16.png ; do \
-+ for base in kscd11.png kscd12.png kscd13.png kscd14.png kscd16.png kscd18.png kscd19.png kscd2.png kscd3.png kscd5.png kscd6.png kscd9.png kscd.png index.docbook ; do \
++ for base in kscd11.png kscd12.png kscd13.png kscd14.png kscd16.png kscd18.png kscd19.png kscd2.png kscd3.png kscd5.png kscd6.png kscd9.png kscd.png kscdannounc.png index.docbook ; do \
rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kscd/$$base ;\
done
@@ -13135,7 +13135,7 @@
#>+ 5
distdir-nls:
- for file in index.docbook kscd18.png kscd9.png kscd19.png kscd.png kscd11.png kscd2.png kscd12.png kscd3.png kscd13.png kscd14.png kscd5.png kscd6.png kscd16.png ; do \
-+ for file in kscd11.png kscd12.png kscd13.png kscd14.png kscd16.png kscd18.png kscd19.png kscd2.png kscd3.png kscd5.png kscd6.png kscd9.png kscd.png index.docbook ; do \
++ for file in kscd11.png kscd12.png kscd13.png kscd14.png kscd16.png kscd18.png kscd19.png kscd2.png kscd3.png kscd5.png kscd6.png kscd9.png kscd.png kscdannounc.png index.docbook ; do \
cp $(srcdir)/$$file $(distdir); \
done
@@ -14375,7 +14375,25 @@
@$(NORMAL_INSTALL)
--- kioslave/audiocd/plugins/lame/Makefile.in
+++ kioslave/audiocd/plugins/lame/Makefile.in
-@@ -242,6 +242,9 @@
+@@ -62,12 +62,14 @@
+ am__DEPENDENCIES_1 =
+ libaudiocd_encoder_lame_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+ ../libaudiocdplugins.la
+-am_libaudiocd_encoder_lame_la_OBJECTS = encoderlame.lo
++am_libaudiocd_encoder_lame_la_OBJECTS = encoderlame.lo \
++ collectingprocess.lo
+ #>- libaudiocd_encoder_lame_la_OBJECTS = \
+ #>- $(am_libaudiocd_encoder_lame_la_OBJECTS)
+-#>+ 4
++#>+ 5
+ libaudiocd_encoder_lame_la_final_OBJECTS = libaudiocd_encoder_lame_la.all_cpp.lo
+-libaudiocd_encoder_lame_la_nofinal_OBJECTS = encoderlame.lo encoderlameconfig.lo audiocd_lame_encoder.lo
++libaudiocd_encoder_lame_la_nofinal_OBJECTS = encoderlame.lo \
++ collectingprocess.lo encoderlameconfig.lo audiocd_lame_encoder.lo
+ @KDE_USE_FINAL_FALSE at libaudiocd_encoder_lame_la_OBJECTS = $(libaudiocd_encoder_lame_la_nofinal_OBJECTS)
+ @KDE_USE_FINAL_TRUE at libaudiocd_encoder_lame_la_OBJECTS = $(libaudiocd_encoder_lame_la_final_OBJECTS)
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+@@ -242,6 +244,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -14385,7 +14403,19 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -488,7 +491,7 @@
+@@ -473,9 +478,9 @@
+ INCLUDES = -I$(top_srcdir)/libkcddb -I$(srcdir)/.. $(taglib_includes) $(all_includes)
+ kde_kcfg_DATA = audiocd_lame_encoder.kcfg
+ kde_module_LTLIBRARIES = libaudiocd_encoder_lame.la
+-#>- libaudiocd_encoder_lame_la_SOURCES = audiocd_lame_encoder.kcfgc encoderlame.cpp encoderlameconfig.ui
++#>- libaudiocd_encoder_lame_la_SOURCES = audiocd_lame_encoder.kcfgc encoderlame.cpp encoderlameconfig.ui collectingprocess.cpp
+ #>+ 1
+-libaudiocd_encoder_lame_la_SOURCES= encoderlame.cpp encoderlameconfig.cpp audiocd_lame_encoder.cpp
++libaudiocd_encoder_lame_la_SOURCES= encoderlame.cpp collectingprocess.cpp encoderlameconfig.cpp audiocd_lame_encoder.cpp
+ libaudiocd_encoder_lame_la_LIBADD = $(LIB_KIO) ../libaudiocdplugins.la
+ #>- libaudiocd_encoder_lame_la_LDFLAGS = -avoid-version -module -no-undefined $(taglib_libs) $(all_libraries)
+ #>+ 1
+@@ -488,7 +493,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -14394,7 +14424,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -526,9 +529,9 @@
+@@ -526,9 +531,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -14406,6 +14436,69 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
+@@ -569,6 +574,7 @@
+ distclean-compile:
+ -rm -f *.tab.c
+
++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/collectingprocess.Plo at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/encoderlame.Plo at am__quote@
+
+ .cpp.o:
+@@ -817,6 +823,13 @@
+
+
+ #>+ 3
++collectingprocess.moc: $(srcdir)/collectingprocess.h
++ $(MOC) $(srcdir)/collectingprocess.h -o collectingprocess.moc
++
++#>+ 2
++mocs: collectingprocess.moc
++
++#>+ 3
+ encoderlame.moc: $(srcdir)/encoderlame.h
+ $(MOC) $(srcdir)/encoderlame.h -o encoderlame.moc
+
+@@ -825,10 +838,10 @@
+
+ #>+ 3
+ clean-metasources:
+- -rm -f encoderlame.moc
++ -rm -f collectingprocess.moc encoderlame.moc
+
+ #>+ 2
+-KDE_DIST=audiocd_lame_encoder.kcfgc encoderlameconfig.ui Makefile.in encoderlame.h audiocd_lame_encoder.kcfg Makefile.am
++KDE_DIST=audiocd_lame_encoder.kcfgc encoderlameconfig.ui Makefile.in encoderlame.h audiocd_lame_encoder.kcfg collectingprocess.h Makefile.am
+
+ #>+ 4
+ clean-ui:
+@@ -886,11 +899,11 @@
+
+
+ #>+ 11
+-libaudiocd_encoder_lame_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/encoderlame.cpp encoderlameconfig.cpp audiocd_lame_encoder.cpp encoderlameconfig.moc encoderlame.moc
++libaudiocd_encoder_lame_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/encoderlame.cpp $(srcdir)/collectingprocess.cpp encoderlameconfig.cpp audiocd_lame_encoder.cpp encoderlameconfig.moc collectingprocess.moc encoderlame.moc
+ @echo 'creating libaudiocd_encoder_lame_la.all_cpp.cpp ...'; \
+ rm -f libaudiocd_encoder_lame_la.all_cpp.files libaudiocd_encoder_lame_la.all_cpp.final; \
+ echo "#define KDE_USE_FINAL 1" >> libaudiocd_encoder_lame_la.all_cpp.final; \
+- for file in encoderlame.cpp encoderlameconfig.cpp audiocd_lame_encoder.cpp ; do \
++ for file in encoderlame.cpp collectingprocess.cpp encoderlameconfig.cpp audiocd_lame_encoder.cpp ; do \
+ echo "#include \"$$file\"" >> libaudiocd_encoder_lame_la.all_cpp.files; \
+ test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libaudiocd_encoder_lame_la.all_cpp.final; \
+ done; \
+@@ -921,9 +934,12 @@
+ kde-rpo-clean:
+ -rm -f *.rpo
+
+-#>+ 6
++#>+ 9
+ nmcheck:
++collectingprocess.o: collectingprocess.moc
+ nmcheck-am: nmcheck
++$(srcdir)/collectingprocess.cpp: encoderlameconfig.h audiocd_lame_encoder.h
++collectingprocess.lo: collectingprocess.moc
+ encoderlame.o: encoderlame.moc
+ $(srcdir)/encoderlame.cpp: encoderlameconfig.h audiocd_lame_encoder.h
+ encoderlame.lo: encoderlame.moc
--- kioslave/audiocd/plugins/Makefile.in
+++ kioslave/audiocd/plugins/Makefile.in
@@ -256,6 +256,9 @@
More information about the pkg-kde-commits
mailing list