rev 9559 - in kde-extras/k3b/k3b/trunk: . debian doc k3bsetup kfile-plugins kfile-plugins/k3bproject kioslaves kioslaves/videodvd libk3b libk3b/cddb libk3b/core libk3b/jobs libk3b/plugin libk3b/plugin/libsamplerate libk3b/projects libk3b/projects/audiocd libk3b/projects/datacd libk3b/projects/datadvd libk3b/projects/mixedcd libk3b/projects/movixcd libk3b/projects/movixdvd libk3b/projects/videocd libk3b/projects/videocd/cdi libk3b/projects/videocd/extra libk3b/projects/videocd/mpeginfo libk3b/projects/videodvd libk3b/scripts libk3b/tools libk3b/tools/libisofs libk3b/videodvd libk3bdevice plugins plugins/audiooutput plugins/audiooutput/alsa plugins/audiooutput/arts plugins/decoder plugins/decoder/ffmpeg plugins/decoder/flac plugins/decoder/libsndfile plugins/decoder/mp3 plugins/decoder/musepack plugins/decoder/ogg plugins/decoder/wave plugins/encoder plugins/encoder/external plugins/encoder/lame plugins/encoder/ogg plugins/encoder/sox plugins/project plugins/project/audiometainforenamer plugins/project/audioprojectcddb src src/fastscale src/icons src/icons/actions src/konqi src/mimetypes src/misc src/option src/pics src/pics/73lab src/pics/RobsTheme src/pics/crystal src/pics/quant src/projects src/projects/kostore src/rip src/rip/videodvd src/sounds

Francois Marier francois at alioth.debian.org
Tue Mar 4 01:11:50 UTC 2008


Author: francois
Date: 2008-03-04 01:11:49 +0000 (Tue, 04 Mar 2008)
New Revision: 9559

Added:
   kde-extras/k3b/k3b/trunk/debian/
   kde-extras/k3b/k3b/trunk/debian/README.Debian
   kde-extras/k3b/k3b/trunk/debian/changelog
   kde-extras/k3b/k3b/trunk/debian/compat
   kde-extras/k3b/k3b/trunk/debian/control
   kde-extras/k3b/k3b/trunk/debian/copyright
   kde-extras/k3b/k3b/trunk/debian/docs
   kde-extras/k3b/k3b/trunk/debian/k3b-data.files
   kde-extras/k3b/k3b/trunk/debian/k3b.1
   kde-extras/k3b/k3b/trunk/debian/k3b.files
   kde-extras/k3b/k3b/trunk/debian/k3b.manpages
   kde-extras/k3b/k3b/trunk/debian/k3b.menu
   kde-extras/k3b/k3b/trunk/debian/k3b.postinst
   kde-extras/k3b/k3b/trunk/debian/k3b.xpm
   kde-extras/k3b/k3b/trunk/debian/libk3b-dev.files
   kde-extras/k3b/k3b/trunk/debian/libk3b3.files
   kde-extras/k3b/k3b/trunk/debian/rules
   kde-extras/k3b/k3b/trunk/debian/watch
Modified:
   kde-extras/k3b/k3b/trunk/Makefile.in
   kde-extras/k3b/k3b/trunk/doc/Makefile.in
   kde-extras/k3b/k3b/trunk/k3bsetup/Makefile.in
   kde-extras/k3b/k3b/trunk/k3bsetup/k3bsetup
   kde-extras/k3b/k3b/trunk/k3bsetup/k3bsetup2.cpp
   kde-extras/k3b/k3b/trunk/k3bsetup/k3bsetup2.desktop
   kde-extras/k3b/k3b/trunk/kfile-plugins/Makefile.in
   kde-extras/k3b/k3b/trunk/kfile-plugins/k3bproject/Makefile.in
   kde-extras/k3b/k3b/trunk/kioslaves/Makefile.in
   kde-extras/k3b/k3b/trunk/kioslaves/videodvd/Makefile.in
   kde-extras/k3b/k3b/trunk/kioslaves/videodvd/videodvd.desktop
   kde-extras/k3b/k3b/trunk/libk3b/Makefile.in
   kde-extras/k3b/k3b/trunk/libk3b/cddb/Makefile.in
   kde-extras/k3b/k3b/trunk/libk3b/core/Makefile.in
   kde-extras/k3b/k3b/trunk/libk3b/core/k3bdefaultexternalprograms.cpp
   kde-extras/k3b/k3b/trunk/libk3b/jobs/Makefile.in
   kde-extras/k3b/k3b/trunk/libk3b/plugin/Makefile.in
   kde-extras/k3b/k3b/trunk/libk3b/plugin/libsamplerate/Makefile.in
   kde-extras/k3b/k3b/trunk/libk3b/projects/Makefile.in
   kde-extras/k3b/k3b/trunk/libk3b/projects/audiocd/Makefile.in
   kde-extras/k3b/k3b/trunk/libk3b/projects/audiocd/k3baudionormalizejob.cpp
   kde-extras/k3b/k3b/trunk/libk3b/projects/datacd/Makefile.in
   kde-extras/k3b/k3b/trunk/libk3b/projects/datacd/k3bisoimager.cpp
   kde-extras/k3b/k3b/trunk/libk3b/projects/datadvd/Makefile.in
   kde-extras/k3b/k3b/trunk/libk3b/projects/mixedcd/Makefile.in
   kde-extras/k3b/k3b/trunk/libk3b/projects/movixcd/Makefile.in
   kde-extras/k3b/k3b/trunk/libk3b/projects/movixdvd/Makefile.in
   kde-extras/k3b/k3b/trunk/libk3b/projects/videocd/Makefile.in
   kde-extras/k3b/k3b/trunk/libk3b/projects/videocd/cdi/Makefile.in
   kde-extras/k3b/k3b/trunk/libk3b/projects/videocd/extra/Makefile.in
   kde-extras/k3b/k3b/trunk/libk3b/projects/videocd/mpeginfo/Makefile.in
   kde-extras/k3b/k3b/trunk/libk3b/projects/videodvd/Makefile.in
   kde-extras/k3b/k3b/trunk/libk3b/scripts/Makefile.in
   kde-extras/k3b/k3b/trunk/libk3b/tools/Makefile.in
   kde-extras/k3b/k3b/trunk/libk3b/tools/libisofs/Makefile.in
   kde-extras/k3b/k3b/trunk/libk3b/videodvd/Makefile.in
   kde-extras/k3b/k3b/trunk/libk3bdevice/Makefile.in
   kde-extras/k3b/k3b/trunk/plugins/Makefile.in
   kde-extras/k3b/k3b/trunk/plugins/audiooutput/Makefile.in
   kde-extras/k3b/k3b/trunk/plugins/audiooutput/alsa/Makefile.in
   kde-extras/k3b/k3b/trunk/plugins/audiooutput/arts/Makefile.in
   kde-extras/k3b/k3b/trunk/plugins/decoder/Makefile.in
   kde-extras/k3b/k3b/trunk/plugins/decoder/ffmpeg/Makefile.in
   kde-extras/k3b/k3b/trunk/plugins/decoder/flac/Makefile.in
   kde-extras/k3b/k3b/trunk/plugins/decoder/libsndfile/Makefile.in
   kde-extras/k3b/k3b/trunk/plugins/decoder/mp3/Makefile.in
   kde-extras/k3b/k3b/trunk/plugins/decoder/musepack/Makefile.in
   kde-extras/k3b/k3b/trunk/plugins/decoder/ogg/Makefile.in
   kde-extras/k3b/k3b/trunk/plugins/decoder/wave/Makefile.in
   kde-extras/k3b/k3b/trunk/plugins/encoder/Makefile.in
   kde-extras/k3b/k3b/trunk/plugins/encoder/external/Makefile.in
   kde-extras/k3b/k3b/trunk/plugins/encoder/lame/Makefile.in
   kde-extras/k3b/k3b/trunk/plugins/encoder/ogg/Makefile.in
   kde-extras/k3b/k3b/trunk/plugins/encoder/sox/Makefile.in
   kde-extras/k3b/k3b/trunk/plugins/encoder/sox/k3bsoxencoder.cpp
   kde-extras/k3b/k3b/trunk/plugins/project/Makefile.in
   kde-extras/k3b/k3b/trunk/plugins/project/audiometainforenamer/Makefile.in
   kde-extras/k3b/k3b/trunk/plugins/project/audioprojectcddb/Makefile.in
   kde-extras/k3b/k3b/trunk/src/Makefile.in
   kde-extras/k3b/k3b/trunk/src/fastscale/Makefile.in
   kde-extras/k3b/k3b/trunk/src/icons/Makefile.in
   kde-extras/k3b/k3b/trunk/src/icons/actions/Makefile.in
   kde-extras/k3b/k3b/trunk/src/k3b.desktop
   kde-extras/k3b/k3b/trunk/src/k3bapplication.cpp
   kde-extras/k3b/k3b/trunk/src/k3bsystemproblemdialog.cpp
   kde-extras/k3b/k3b/trunk/src/k3bwelcomewidget.cpp
   kde-extras/k3b/k3b/trunk/src/konqi/Makefile.am
   kde-extras/k3b/k3b/trunk/src/konqi/Makefile.in
   kde-extras/k3b/k3b/trunk/src/mimetypes/Makefile.in
   kde-extras/k3b/k3b/trunk/src/misc/Makefile.in
   kde-extras/k3b/k3b/trunk/src/option/Makefile.in
   kde-extras/k3b/k3b/trunk/src/pics/73lab/Makefile.in
   kde-extras/k3b/k3b/trunk/src/pics/Makefile.in
   kde-extras/k3b/k3b/trunk/src/pics/RobsTheme/Makefile.in
   kde-extras/k3b/k3b/trunk/src/pics/crystal/Makefile.in
   kde-extras/k3b/k3b/trunk/src/pics/quant/Makefile.in
   kde-extras/k3b/k3b/trunk/src/projects/Makefile.in
   kde-extras/k3b/k3b/trunk/src/projects/k3baudioburndialog.cpp
   kde-extras/k3b/k3b/trunk/src/projects/k3bmixedburndialog.cpp
   kde-extras/k3b/k3b/trunk/src/projects/kostore/Makefile.in
   kde-extras/k3b/k3b/trunk/src/rip/Makefile.in
   kde-extras/k3b/k3b/trunk/src/rip/videodvd/Makefile.in
   kde-extras/k3b/k3b/trunk/src/sounds/Makefile.in
Log:
[svn-inject] Applying Debian modifications to trunk

Modified: kde-extras/k3b/k3b/trunk/Makefile.in
===================================================================
--- kde-extras/k3b/k3b/trunk/Makefile.in	2008-03-04 01:08:55 UTC (rev 9558)
+++ kde-extras/k3b/k3b/trunk/Makefile.in	2008-03-04 01:11:49 UTC (rev 9559)
@@ -831,8 +831,74 @@
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
+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
+
+
+
+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
+
+
+
+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
+
+
+
 #>+ 2
-KDE_DIST=COPYING-DOCS KNOWNBUGS subdirs Makefile.in configure.in.bot FAQ configure.files config.h.in RELEASE_HOWTO configure.in aclocal.m4 PERMISSIONS configure Makefile.am acinclude.m4 
+KDE_DIST=stamp-h.in COPYING-DOCS KNOWNBUGS subdirs configure.in.bot Makefile.in FAQ configure.files config.h.in RELEASE_HOWTO configure.in aclocal.m4 PERMISSIONS acinclude.m4 Makefile.am configure configure-stamp 
 
 #>+ 2
 docs-am:

Added: kde-extras/k3b/k3b/trunk/debian/README.Debian
===================================================================
--- kde-extras/k3b/k3b/trunk/debian/README.Debian	                        (rev 0)
+++ kde-extras/k3b/k3b/trunk/debian/README.Debian	2008-03-04 01:11:49 UTC (rev 9559)
@@ -0,0 +1,49 @@
+Users must be members of the "cdrom" group
+------------------------------------------
+
+To be able to access the CD/DVD burner, users must be members of the "cdrom"
+group.  To check whether you are a member of that group, run the following 
+command:
+
+  groups
+
+If you don't see the "cdrom" group, ask the administrator to be added to that 
+group or run the following command as root:
+
+  adduser [username] cdrom
+
+If you are already a member of the "cdrom" group and are experiencing problems, 
+then you may need to give SUID privileges to wodim.  To do this, run the
+following command as root:
+
+  dpkg-statoverride --add root cdrom 04710 /usr/bin/wodim
+ 
+ -- Francois Marier <francois at debian.org>, Fri, 3 Dec 2006 16:38:14 -0500
+
+
+Ripping DVD using transcode
+---------------------------
+
+K3b can use transcode in order to rip dvd if you properly setup the "Options"
+tab that allows you to configure the location of additional tools. Some of
+these tools (tccat, tcdecode, tcextract) are provided by the transcode program.
+However, transcode is not currently available in Debian due to legal issues and
+probably never will be. If you want to use transcode you can find it on
+http://debian.video.free.fr, to have apt use it as an additional source add the
+line corresponding to your debian version in your your /etc/apt/sources.list
+
+For stable:
+  deb http://www.debian-multimedia.org stable main
+
+For testing:
+  deb http://www.debian-multimedia.org testing main
+
+For unstable:
+  deb http://www.debian-multimedia.org sid main
+
+Notice, however, that the above packages are neither official nor
+supported by Debian. Moreover, the binary packages are only available
+for a limited set of architectures and not for all the architectures
+supported by Debian.
+
+ -- Jean-Michel Kelbert <kelbert at debian.org>, Thu, 20 Feb 2003 17:23:39 -0500

Added: kde-extras/k3b/k3b/trunk/debian/changelog
===================================================================
--- kde-extras/k3b/k3b/trunk/debian/changelog	                        (rev 0)
+++ kde-extras/k3b/k3b/trunk/debian/changelog	2008-03-04 01:11:49 UTC (rev 9559)
@@ -0,0 +1,657 @@
+k3b (1.0.4-7) unstable; urgency=low
+
+  * Remove libqt3-compat-headers from build-depends (closes: #464431)
+  * Remove -1 in the flac build dependency
+  * Fix copyright notice to stop lintian warning
+
+ -- Francois Marier <francois at debian.org>  Thu, 14 Feb 2008 23:04:06 +1300
+
+k3b (1.0.4-6) unstable; urgency=low
+
+  * Add .desktop icon in k3b-data (closes: #463731)
+  * Bump debhelper compatibility to 6
+
+ -- Francois Marier <francois at debian.org>  Sun, 03 Feb 2008 10:50:24 +1300
+
+k3b (1.0.4-5) unstable; urgency=medium
+
+  * Make k3b-data conflict on older versions of k3b (closes: #462496)
+  * Urgency medium since this made the package non-upgradable
+
+ -- Francois Marier <francois at debian.org>  Sat, 26 Jan 2008 11:31:38 +1300
+
+k3b (1.0.4-4) unstable; urgency=low
+
+  * Create a new k3b-data package to hold the arch-independent data files
+  * Remove dependency on kdebase-bin (closes: #460481).  It's not needed
+    since we don't build k3bsetup anymore.
+  * Remove Entry key from k3b.desktop (fixes lintian info)
+
+ -- Francois Marier <francois at debian.org>  Wed, 23 Jan 2008 00:02:28 +1300
+
+k3b (1.0.4-3) unstable; urgency=low
+
+  * Fix watch file (closes: #453529)
+  * Add call to dh_desktop in debian/rules 
+  * Bump Standards-Version up to 3.7.3 (no other changes)
+
+ -- Francois Marier <francois at debian.org>  Wed, 12 Dec 2007 13:24:42 +1300
+
+k3b (1.0.4-2) unstable; urgency=low
+
+  * Remove k3bsetup.1 since we don't build k3bsetup anymore
+  * Rename XS-Vcs-* fields to Vcs-*
+  * Add libavformat-dev and libavcodec-dev to the build dependencies (from Ubuntu)
+
+ -- Francois Marier <francois at debian.org>  Fri, 23 Nov 2007 09:45:28 +1300
+
+k3b (1.0.4-1) unstable; urgency=low
+
+  * New upstream release:
+    - allow burning of files larger than 4 GB (closes: #444856)
+    - work-around for the "disabled DMA bug" (closes: #439264)
+    - only reload medium before verification if necessary 
+      (closes: #446196, #420674, #438865)
+    - don't use -dvd-compat on DVD+RW (closes: #378051)
+    - unmount drive before formatting (closes: #446471)
+
+ -- Francois Marier <francois at debian.org>  Sat, 03 Nov 2007 18:24:53 +1300
+
+k3b (1.0.3-5) unstable; urgency=low
+
+  * Update SoX version string (closes: #448703)
+
+ -- Francois Marier <francois at debian.org>  Wed, 31 Oct 2007 22:53:44 +1300
+
+k3b (1.0.3-4) unstable; urgency=low
+
+  * Disable 4BG check for files (closes: #444856).  Thanks to Victor Ashirov for the patch!
+  * Replace "Open=false" by "NoDisplay=true" in videodvd.desktop (lintian warning)
+  * Sync with latest Ubuntu patch:
+    - Bump debhelper depends version to 5
+    - Make libk3b-dev conflict with k3blibs
+    - Add application/x-cue to the KDE mime-types
+    - Disable FirstRun dialog
+
+ -- Francois Marier <francois at debian.org>  Tue, 30 Oct 2007 14:59:19 +1300
+
+k3b (1.0.3-3) unstable; urgency=low
+
+  * Rebuild with new flac libraries (closes: #446775)
+  * Make libk3b-dev depend on kdelibs4-dev (closes: #443374)
+  * Add homepage field to debian/control
+
+ -- Francois Marier <francois at debian.org>  Fri, 19 Oct 2007 15:23:32 +1300
+
+k3b (1.0.3-2) unstable; urgency=low
+
+  * Refer explicitely to /usr/share/common-licenses/GPL-2
+  * debian/control: mention the svn repository
+  * Fix lintian warning about main desktop icon
+
+ -- Francois Marier <francois at debian.org>  Mon, 20 Aug 2007 21:14:14 +1200
+
+k3b (1.0.3-1) unstable; urgency=low
+
+  * New upstream release (closes: #432760, #431491, #433686)
+  * Fix menu for menu transition
+
+ -- Francois Marier <francois at debian.org>  Thu, 26 Jul 2007 00:18:10 +1200
+
+k3b (1.0.2-1) unstable; urgency=low
+
+  * New upstream release (closes: #413994)
+  * Remove popup window when no problems were found (closes: #430130)
+  * Fix "Source-Version" lintian warning
+
+ -- Francois Marier <francois at debian.org>  Sun, 01 Jul 2007 04:47:05 +1200
+
+k3b (1.0.1-2) unstable; urgency=low
+
+  * Rebuild for flac 1.1.4 transition (closes: #426678)
+  * Remove DH_COMPAT from debian/rules to fix lintian warning
+
+ -- Francois Marier <francois at debian.org>  Wed, 30 May 2007 22:12:02 +1200
+
+k3b (1.0.1-1) unstable; urgency=low
+
+  * New upstream release (closes: #419499, #419628)
+  * Build with libdvdread to enable DVD ripping.
+
+ -- Francois Marier <francois at debian.org>  Fri, 20 Apr 2007 12:08:55 +1200
+
+k3b (1.0-2) unstable; urgency=low
+
+  * Fix conflict/replace of libk3b2 (closes: #418483)
+
+ -- Francois Marier <francois at debian.org>  Wed, 11 Apr 2007 15:19:46 +1200
+
+k3b (1.0-1) unstable; urgency=low
+
+  * Major new upstream release which, according to the upstream developer, fixes most open bugs (closes: #354118, #336375, #345766, #348929, #349445, #352923, #365263, #374820, #374975, #377067, #385526, #386802, #398203, #398743, #347625, #387303)
+  * libk3b becomes libk3b3
+  * Add more rpath removals
+  * Include flac and mpc in package description (closes: #410526)
+
+ -- Francois Marier <francois at debian.org>  Fri, 30 Mar 2007 19:05:13 -0700
+k3b (0.12.17-9) unstable; urgency=low
+
+  * Fix a typo in the manpage (--datacd instead of --datadvd).
+  * Add Data DVD to the Konqueror actions menu. Thanks to Adriano Bonat!
+  * Depend on cdrdao instead of recommending it (closes: #369930)
+
+ -- Francois Marier <francois at debian.org>  Sun, 28 Jan 2007 21:15:39 -0500
+
+k3b (0.12.17-8) unstable; urgency=medium
+
+  * Remove a wrong version check for readom (follow-up to bug #401739)
+
+ -- Francois Marier <francois at debian.org>  Thu, 14 Dec 2006 09:23:25 -0500
+
+k3b (0.12.17-7) unstable; urgency=medium
+
+  * Support for "readom" which is the new renamed "readcd" (closes: #401739)
+
+ -- Francois Marier <francois at debian.org>  Tue, 12 Dec 2006 21:27:29 -0500
+
+k3b (0.12.17-6) unstable; urgency=low
+
+  * Use genisoimage instead of mkisofs.
+  * Add a note regarding being part of the "cdrom" group to README.Debian
+
+ -- Francois Marier <francois at debian.org>  Sun,  3 Dec 2006 16:41:49 -0500
+
+k3b (0.12.17-5) unstable; urgency=low
+
+  * Hack version checks to support wodim version numbers (closes: #397836, #399090)
+  * Stop building k3bsetup since K3b should be working out of the box on Debian,
+    otherwise it's a bug that needs to be fixed, not worked around with a utility.
+    (closes: #393216, #397267, #385878)
+
+ -- Francois Marier <francois at debian.org>  Sat, 18 Nov 2006 00:06:09 -0500
+
+k3b (0.12.17-4) unstable; urgency=low
+
+  * Remove unnecessary version check for cdrtools (closes: #397836)
+  * Remove the deprecated /usr/share/applnk (closes: #398443)
+  * Allow the use of cdrskin as an alternative to wodim (closes: #398398)
+  * Set myself as maintainer with Jean-Michel's permission.
+
+ -- Francois Marier <francois at debian.org>  Wed, 15 Nov 2006 21:13:20 -0500
+
+k3b (0.12.17-3) unstable; urgency=low
+
+  * Remove the cdrecord and cdrdao warnings (closes: #390083)
+  * Support DEB_BUILD_OPTIONS="noopt" properly (via CXXFLAGS,
+    not just CFLAGS) thanks to Modestas Vainius! (closes: #394276)
+  * Fix a crash when changing the default for the last external 
+    application, thanks to Pier Luigi Pau! (closes: #386688)
+  * Fix the watch file to use qa.debian.org
+
+ -- Francois Marier <francois at debian.org>  Sat, 21 Oct 2006 15:24:15 -0400
+
+k3b (0.12.17-2) unstable; urgency=low
+
+  * Update transcode apt source (closes: #386080), thanks Eric!
+  * Switch from cdrecord to wodim (closes: #386327), thanks Sune! 
+  * Fix the calls to dpkg-statoverride (closes: #381170), thanks Dirk!
+
+ -- Francois Marier <francois at debian.org>  Wed,  6 Sep 2006 16:50:03 -0400
+
+k3b (0.12.17-1) unstable; urgency=low
+
+  * New upstream release
+  * Remove RPATHs using chrpath to get rid of lintian warnings
+
+ -- Francois Marier <francois at debian.org>  Wed, 23 Aug 2006 19:04:42 -0400
+
+k3b (0.12.16-1) unstable; urgency=low
+
+  * New upstream release (closes: #375323)
+    - fixed mixed-mode CD copy (closes: #367494)
+    - fixed some SCSI device detection problems
+  * Apply Romain Lenglet's patch to preserve k3setup's changes
+    during package upgrades (closes: #367473)
+  * Bump Standards-Version up to 3.7.2 (no changes)
+
+ -- Francois Marier <francois at debian.org>  Sun, 25 Jun 2006 14:59:26 -0400
+
+k3b (0.12.15-2) unstable; urgency=low
+
+  * Restore libk3b (closes: #355477)
+  * Fix lintian warnings (thanks to James Thorniley!)
+
+ -- Francois Marier <francois at debian.org>  Sun, 23 Apr 2006 23:35:09 -0400
+
+k3b (0.12.15-1) unstable; urgency=low
+
+  * New upstream release
+    - improved error message (closes: #229051)
+    - warn about shortened filenames (closes: #277155)
+    - SCSI IO fix (closes: #339871)
+  * Build without resmgr (closes: #362818)
+  * Restore k3bsetup (closes: #360378, #296257)
+
+ -- Francois Marier <francois at debian.org>  Sun, 23 Apr 2006 00:44:50 -0400
+
+k3b (0.12.14-1) unstable; urgency=low
+
+  * New upstream release
+  * Move kcontrol to recommends to reduce the KDE dependency (closes: #353335)
+  * Fix Ubuntu patch to k3bsetup2.desktop (closes: #353826)
+
+ -- Francois Marier <francois at debian.org>  Fri, 24 Mar 2006 17:24:54 -0500
+
+k3b (0.12.12-1) unstable; urgency=low
+
+  * New upstream release
+  * Remove the unused libk3b-dev package
+  * Fix the file lists to include all libraries
+
+ -- Francois Marier <francois at debian.org>  Thu, 16 Feb 2006 00:13:15 -0500
+
+k3b (0.12.11-1) unstable; urgency=low
+
+  * New upstream release (closes: #348929) 
+  * Fix the watch file (.gz -> .bz2)
+  * Merge Ubuntu patch (kubuntu_01_hide_k3bsetup)
+
+ -- Francois Marier <francois at debian.org>  Sun, 12 Feb 2006 13:31:47 -0500
+
+k3b (0.12.10-2) unstable; urgency=low
+
+  * Rename the menu file so that it shows up in the Debian menu system
+    and install the freedesktop menu item into /usr/share/applications
+    directly instead of /usr/share/applications/kde so that it shows up in the
+    GNOME menu (closes: #345989)
+  * Update the build dependencies for KDE 3.5, dbus 0.6 and the new hal
+    (closes: #337882)
+  * Remove unnecessary lines from debian/rules
+  * Merge Ubuntu patches:
+    - kubuntu_03_open_iso_files
+    - kubuntu_04_add_iso_burning_to_welcome_screen
+  * Remove the versioned dependency on k3b-i18n
+
+ -- Francois Marier <francois at debian.org>  Sun,  8 Jan 2006 14:15:24 -0500
+
+k3b (0.12.10-1) unstable; urgency=low
+
+  * New upstream release
+    - fixed Auto multisession mode in DVD projects
+    - fixed crash in dcop call directBurn in case no valid burner device was set
+    - fixed verification of datacd projects when using the MaxIso9660 option
+    without the OmitVersionNumber option
+  * Add libmad0-dev to the build dependencies
+
+ -- Francois Marier <francois at debian.org>  Fri, 16 Dec 2005 12:47:27 -0500
+
+k3b (0.12.9-1) unstable; urgency=low
+
+  * New upstream release:
+    - warn about incorrectly encoded filenanes (closes: #303572)
+    - support the media:// protocol (closes: #342648)
+    - stop with an error instead of overwriting read medium (closes: #338274)
+    - new Alsa plugin
+    - new set of icons
+  * Add a watch file
+  * Rename k3blibs and k3blibs-dev packages to libk3b2 and libk3b-dev
+    (closes: #341765)
+
+ -- Francois Marier <francois at debian.org>  Mon, 12 Dec 2005 23:03:32 -0500
+
+k3b (0.12.8-1) unstable; urgency=low
+
+  * New upstream release (minor bug fixes):
+    - Load index0 value in audio project.
+    - Ignore case in cue files.
+    - Fixed "eject media" setting.
+    - Fixed a bug in the mp3 decoder which caused it to miss
+      some perfectly valid mp3 files.
+  * Updated README.Debian with a section about running k3b as root (thanks to
+    Ross Boylan for the suggestion)
+ 
+ -- Francois Marier <francois at debian.org>  Fri, 25 Nov 2005 12:02:49 -0500
+
+k3b (0.12.7-1) unstable; urgency=low
+
+  * New upstream release (closes: #336756, #336676)
+
+ -- Francois Marier <francois at debian.org>  Wed,  2 Nov 2005 09:03:15 -0500
+
+k3b (0.12.6-1) unstable; urgency=low
+
+  * New upstream release
+  * Remove duplicate item in GNOME menu (closes: #335226)
+
+ -- Francois Marier <francois at debian.org>  Sat, 29 Oct 2005 17:23:22 -0400
+
+k3b (0.12.5-1) unstable; urgency=low
+
+  * New upstream release
+  * Add kdebase-kio-plugins to the recommended packages to enable features
+    like file deletion in the built-in browser (thanks to Nikita Youshchenko
+    for the suggestion)
+  * Update the version dependency on k3b-i18n
+
+ -- Francois Marier <francois at debian.org>  Wed, 19 Oct 2005 14:43:27 -0400
+
+k3b (0.12.4a-3) unstable; urgency=low
+
+  * Fix the name of normalize-audio (closes: #298686)
+  * Fix the long name of dvd+rw-tools (closes: #328589)
+  * Add menu item in GNOME (closes: #331212)
+
+ -- Francois Marier <francois at debian.org>  Wed,  5 Oct 2005 12:15:36 -0400
+
+k3b (0.12.4a-2) unstable; urgency=low
+
+  * Remove unnecessary libid3 from the Build-Depends (closes: #329199)
+  * Restore the lost changelog entry (from 0.12.1-3)
+
+ -- Francois Marier <francois at debian.org>  Tue, 20 Sep 2005 12:24:17 -0400
+
+k3b (0.12.4a-1) unstable; urgency=low
+
+  [ Jean-Michel Kelbert ]
+  * Apply and adapt a patch provided by Javier Fernández-Sanguino Peña for the
+    README.Debian.
+  (closes: #303433)
+  * Don't change date of all files anymore during build.
+  (closes: #288677)
+  * Depend on libflac++-dev (>= 1.1.2-1) to ensure that the package is build
+    with the new version.
+  (closes: #325941, #320514)
+
+  [ Francois Marier ]
+  * New upstream release (closes: #328979)
+  * Bump Standards-Version up to 3.6.2 (no changes)
+  * Update FSF address in debian/copyright
+  * Add myself to the Uploaders fields in debian/control to reflect
+    co-maintainership
+  * Fix lintian warnings related to the Debian menu item
+  * Shorten and reformat package description (closes: #249910)
+
+ -- Francois Marier <francois at debian.org>  Sun, 18 Sep 2005 23:45:44 -0400
+
+k3b (0.12.1-3) unstable; urgency=low
+
+  * Upgrade build dependancy on dbus-qt-1-dev to build with a C++
+    transitioned version. (closes: #322084)
+
+ -- Jean-Michel Kelbert <kelbert at debian.org>  Tue, 30 Aug 2005 22:54:44 +0200 
+
+k3b (0.12.1-2) unstable; urgency=low
+
+  * Add to Build-Depends:
+    - dbus-qt-1-dev, libhal-dev, libhal-storage-dev, libpopt-dev for DBus/Hal support
+    - libmpcdec-dev for Musepack support
+    - libresmgr-dev for Resmgr support
+    - libtag1-dev for audio meta data reading with Taglib
+    - libmusicbrainz4-dev for tag guessing using MusicBrainz
+    - flac to avoid configure errors
+  (closes: #315613)
+  * Add *.la and *.so files to the k3blibs-dev package
+
+ -- Jean-Michel Kelbert <kelbert at debian.org>  Tue, 28 Jun 2005 11:49:11 +0200
+
+k3b (0.12.1-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Jean-Michel Kelbert <kelbert at debian.org>  Mon, 20 Jun 2005 17:16:46 +0200
+
+k3b (0.11.20-2) unstable; urgency=low
+
+  * Rename normalize to normalize-audio.
+  (closes: #267052)
+  * Apply a patch to update man page. Thanks to Stuart Prescott.
+  (closes: #266005)
+  * Move menu entry in Applications/Tools.
+  (closes: #270444)
+  * Apply a patch to prevent the ripping progress icon from flickering
+    heavily. Thanks to Eike Sauer.
+  (closes: #294230)
+  * Add sox and movixmaker-2 to Suggests.
+  (closes: #249278)
+
+ -- Jean-Michel Kelbert <kelbert at debian.org>  Fri,  4 Mar 2005 21:44:10 +0100
+
+k3b (0.11.20-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Jean-Michel Kelbert  <kelbert at debian.org>  Fri, 11 Feb 2005 23:25:28 +0000
+
+k3b (0.11.19-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Jean-Michel Kelbert <kelbert at debian.org>  Thu, 27 Jan 2005 09:56:51 +0100
+
+k3b (0.11.18-2) unstable; urgency=high
+
+  * Apply a patch to prevent k3b from crashing when pressing "Burn". That's
+    why a set urgency to high.
+  (closes: #289440)
+  * Rebuild with newer FLAC.
+  (closes: #289372)
+
+ -- Jean-Michel Kelbert <kelbert at debian.org>  Tue, 11 Jan 2005 20:50:31 +0100
+
+k3b (0.11.18-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Jean-Michel Kelbert <kelbert at debian.org>  Sun, 26 Dec 2004 22:38:48 +0100
+
+k3b (0.11.17-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Jean-Michel Kelbert <kelbert at debian.org>  Thu, 23 Sep 2004 21:33:09 +0200
+
+k3b (0.11.16-1) unstable; urgency=low
+
+  * New upstream release
+  (closes: #267338, #271780, #272122, #269736)
+
+ -- Jean-Michel Kelbert <kelbert at debian.org>  Sun, 19 Sep 2004 10:27:06 +0200
+
+k3b (0.11.14-2) unstable; urgency=low
+
+  * Recompile k3b to prevent it from crashing when the configure diaglog is
+    closed.
+    (closes: #269741, #266086)
+
+ -- Jean-Michel Kelbert <kelbert at debian.org>  Sat, 11 Sep 2004 15:00:23 +0200
+
+k3b (0.11.14-1) unstable; urgency=low
+
+  * New upstream release.
+  (closes: #264943)
+  * Move kcontrol do Depends.
+  (closes: #252984)
+  * Change the burning group to "cdrom".
+  (closes: #263948)
+
+ -- Jean-Michel Kelbert <kelbert at debian.org>  Wed, 11 Aug 2004 20:00:12 +0200
+
+k3b (0.11.13-1) unstable; urgency=low
+
+  * New upstream release
+  (closes: #261025, #257570, #253266, #252984, #249411, #248185, #240460, #260271, #253177, #249338)
+
+ -- Jean-Michel Kelbert <kelbert at debian.org>  Wed,  4 Aug 2004 15:18:37 +0200
+
+k3b (0.11.12-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Jean-Michel Kelbert <kelbert at debian.org>  Sat, 26 Jun 2004 17:18:49 +0200
+
+k3b (0.11.11-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Jean-Michel Kelbert <kelbert at debian.org>  Tue, 15 Jun 2004 13:30:01 +0200
+
+k3b (0.11.10-1) unstable; urgency=low
+
+  * New upstream release
+  (closes: #252291)
+
+ -- Jean-Michel Kelbert <kelbert at debian.org>  Wed, 26 May 2004 22:38:48 +0200
+
+k3b (0.11.9-2) unstable; urgency=low
+
+  * Depends now on kdebase-bin.
+  (closes: #245566)
+  * Suggests normalize and toolame.
+  (closes: #240770)
+  * Correct typos in description.
+  (closes: #232004) 
+  * Remove references to wrong documentation in the manpage.
+  (closes: #225758)
+
+ -- Jean-Michel Kelbert <kelbert at debian.org>  Sat,  1 May 2004 11:22:30 +0000
+
+k3b (0.11.9-1) unstable; urgency=low
+
+  * New upstream release. Wouh, two releases today, I don't have time to
+    package the first one.
+
+ -- Jean-Michel Kelbert <kelbert at debian.org>  Mon, 29 Mar 2004 23:05:45 +0200
+
+k3b (0.11.7-1) unstable; urgency=low
+
+  * New upstream release
+  * Remove dpatch commands from debian/rules
+  (closes: #239832)
+
+ -- Jean-Michel Kelbert <kelbert at debian.org>  Sun, 28 Mar 2004 12:56:43 +0200
+
+k3b (0.11.6-1) unstable; urgency=low
+
+  * New upstream release.
+  (closes: #229898, #226858)
+  * Add libflac++-dec to Build-Depends.
+  * Merge libraries packages.
+
+ -- Jean-Michel Kelbert <kelbert at debian.org>  Tue,  9 Mar 2004 15:36:23 +0100
+
+k3b (0.10.3-5) unstable; urgency=low
+
+  * Add kdebase-bin to Suggests in debian/control
+  (closes: #227254)
+  * Apply a patch to let cdrdao working with ATAPI drives on kernel 2.6
+  (closes: #227336)
+
+ -- Jean-Michel Kelbert <kelbert at debian.org>  Wed, 14 Jan 2004 22:22:22 +0100
+
+k3b (0.10.3-4) unstable; urgency=low
+
+  * Add plugins to libk3plugins
+  (closes: #225553, #225600)
+
+ -- Jean-Michel Kelbert <kelbert at debian.org>  Tue,  6 Jan 2004 08:54:15 +0100
+
+k3b (0.10.3-3) unstable; urgency=low
+
+  * Add libkcm_k3bsetup2.la to libk3bcore.
+  (closes: #225566, #225589, #225985)
+
+ -- Jean-Michel Kelbert <kelbert at debian.org>  Sun,  4 Jan 2004 01:27:35 +0100
+
+k3b (0.10.3-2) unstable; urgency=low
+
+  * Fix missing depends on k3b libs.
+  (closes: #225457, #225459)
+  * Change icons location under kde.
+  (closes: #224820)
+
+ -- Jean-Michel Kelbert <kelbert at debian.org>  Thu,  1 Jan 2004 19:10:45 +0100
+
+k3b (0.10.3-1) unstable; urgency=low
+
+  * New upstream release
+  (closes: #218063)
+
+ -- Jean-Michel Kelbert <kelbert at debian.org>  Tue,  9 Dec 2003 19:57:45 +0100
+
+k3b (0.9-4) unstable; urgency=low
+
+  * Add a patch to inform user to use 'dpkg-reconfigure cdrecord' instead of
+    k3bsetup when k3b detect that cdrecord isn't setuid.
+  * Add kcontrol to Recommands.
+  (closes: #206753)
+  * Add kdelibs-data to Depends since
+    usr/share/mimelnk/application/x-iso.desktop and
+    usr/share/mimelnk/application/x-cue.desktop which where conflicting with
+    arson package are now included in it. 
+  (closes: #204532)
+  * Add a patch for solving a syntax problem in some German entries. 
+  (closes: #212238)
+  * Add the patch provided by Chris Cheney to clean debian/rules. Adapt the
+    resulting debian/rules to k3b.(Thanks to Chris)
+  (closes: #214509)  
+
+ -- Jean-Michel Kelbert <kelbert at debian.org>  Fri, 10 Oct 2003 22:47:29 +0200
+
+k3b (0.9-3.1) unstable; urgency=low
+
+  * NMU
+  * Removed x-cue.desktop and x-iso.desktop since they are now a part of
+    kdelibs-data.
+
+ -- Christopher L Cheney <ccheney at debian.org>  Mon,  6 Oct 2003 22:00:00 -0500
+
+k3b (0.9-3) unstable; urgency=low
+
+  * Change the previous changelog entry. Thanks to Rene Engelhard.
+  * Add a patch for adding group read permission on cdrecord in k3bsetup. The
+    patch concerns src/k3bsetup/k3bsetup.cpp. Thanks to Matthew A. Nicholson.
+  (closes: #201393, #203819)
+
+ -- Jean-Michel Kelbert <kelbert at debian.org>  Sun,  3 Aug 2003 21:20:13 +0200
+
+k3b (0.9-2) unstable; urgency=low
+
+  * Add a patch for changing dlopen() libcdda_interface.so.0 instead of
+    libcdda_interface.so. The patch concerns src/tools/k3bcdparanoialib.cpp.
+  (closes: #199819) 
+
+ -- Jean-Michel Kelbert <kelbert at debian.org>  Sun,  3 Aug 2003 11:06:25 +0200
+
+k3b (0.9-1) unstable; urgency=low
+
+  * New upstream release.
+  (closes: #195684, #202359)
+  * Use -fpermissive to allow compilation with gcc 3.3.1.
+  * Split the package in three because there is now a library: libk3bcore.
+  * Added k3b-i18n in Suggest.
+
+ -- Jean-Michel Kelbert <kelbert at debian.org>  Thu, 24 Jul 2003 00:17:05 +0200
+
+k3b (0.8.1-3) unstable; urgency=low
+
+  * Made some changes in the dependancies.
+  * Compile against kdelibs4-dev (>= 3.1.1) in order to depend on the new
+    libvorbis.
+
+ -- Jean-Michel Kelbert <kelbert at debian.org>  Sat, 15 Mar 2003 00:57:14 -0500
+
+k3b (0.8.1-2) unstable; urgency=low
+
+  * Added a line debian/rules to change the date of admin/config.guess, so
+    that the package will compile from sources. 
+
+ -- Jean-Michel Kelbert <kelbert at debian.org>  Thu, 13 Mar 2003 22:43:17 -0500
+
+k3b (0.8.1-1) unstable; urgency=low
+
+  * Initial Release.
+    (closes: #165264)
+  * Thanks to Karolina Lindqvist for manpages
+
+ -- Jean-Michel Kelbert <kelbert at debian.org>  Wed, 19 Feb 2003 23:53:45 -0500
+

Added: kde-extras/k3b/k3b/trunk/debian/compat
===================================================================
--- kde-extras/k3b/k3b/trunk/debian/compat	                        (rev 0)
+++ kde-extras/k3b/k3b/trunk/debian/compat	2008-03-04 01:11:49 UTC (rev 9559)
@@ -0,0 +1 @@
+6

Added: kde-extras/k3b/k3b/trunk/debian/control
===================================================================
--- kde-extras/k3b/k3b/trunk/debian/control	                        (rev 0)
+++ kde-extras/k3b/k3b/trunk/debian/control	2008-03-04 01:11:49 UTC (rev 9559)
@@ -0,0 +1,64 @@
+Source: k3b
+Section: otherosfs
+Priority: optional
+Maintainer: Francois Marier <francois at debian.org>
+Uploaders: Jean-Michel Kelbert <kelbert at debian.org>
+Build-Depends: debhelper (>= 6), kdelibs4-dev (>= 3.5.0), libflac++-dev (>= 1.1.2), flac, libdbus-qt-1-dev, libhal-dev (>= 0.5.5.1), libhal-storage-dev (>= 0.5.5.1), libpopt-dev, libmpcdec-dev, libtag1-dev (>= 1.4-3), libmusicbrainz4-dev (>= 2.1.1-4.1), libmad0-dev, chrpath, libdvdread-dev, libavformat-dev, libavcodec-dev
+Standards-Version: 3.7.3
+Homepage: http://www.k3b.org
+Vcs-Svn: svn://svn.debian.org/svn/pkg-k3b/k3b/
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-k3b/k3b/
+
+Package: k3b
+Architecture: any
+Depends: ${shlibs:Depends}, wodim | cdrskin, cdparanoia (>= 3a9.8), genisoimage, kdelibs-data (>= 4:3.1.4-2), cdrdao (>= 1.1.7-5), k3b-data (= ${source:Version})
+Recommends: vcdimager (>= 0.7), dvd+rw-tools, kdebase-kio-plugins, kcontrol
+Suggests: k3b-i18n, normalize-audio, toolame, sox, movixmaker-2
+Description: A sophisticated KDE CD burning application 
+ K3b is a GUI frontend to the CD recording programs cdrdao and cdrecord.
+ Its aim is to provide a very user friendly interface to all the tasks
+ that come with cd recording.
+ .
+ It can be used to copy CDs and burn:
+  - audio CDs (from wav, mp3, ogg vorbis, mpc or flac files)
+  - data CDs and DVDs
+  - mixed-mode CDs (CD-Extra support)
+  - VCDs (1.1, 2.0 and SVCD)
+  - ISO files (Joliet/Rockridge and El Torito support)
+  - eMovix CDs
+
+Package: k3b-data
+Conflicts: k3b (<< 1.0.4-4)
+Replaces: k3b (<< 1.0.4-4)
+Architecture: all
+Description: A sophisticated KDE CD burning application - data files
+ K3b is a GUI frontend to the CD recording programs cdrdao and cdrecord.
+ Its aim is to provide a very user friendly interface to all the tasks
+ that come with cd recording.
+ .
+ This package contains the required data files common to all architectures.
+
+Package: libk3b-dev
+Conflicts: libk3bcore-dev, libk3bplugin-dev, libk3btools-dev, libk3bproject-dev, k3blibs-dev, k3blibs
+Section: libdevel
+Architecture: any
+Depends: libk3b3 (= ${binary:Version}), kdelibs4-dev
+Description: The KDE cd burning application library - development files
+ K3b is a GUI frontend to the cd recording programs cdrdao and cdrecord.
+ Its aim is to provide a very user friendly interface to all the tasks
+ that come with cd recording and a lot more.
+ .
+ This package contains development files.
+
+Package: libk3b3
+Section: libs
+Architecture: any
+Conflicts: libk3bcore, libk3bplugin, libk3btools, libk3bproject, k3blibs, libk3b2
+Replaces: libk3b2
+Depends: ${shlibs:Depends}
+Description: The KDE cd burning application library - runtime files
+ K3b is a GUI frontend to the cd recording programs cdrdao and cdrecord.
+ Its aim is to provide a very user friendly interface to all the tasks
+ that come with cd recording and a lot more.
+ .
+ This package contains runtime libraries.

Added: kde-extras/k3b/k3b/trunk/debian/copyright
===================================================================
--- kde-extras/k3b/k3b/trunk/debian/copyright	                        (rev 0)
+++ kde-extras/k3b/k3b/trunk/debian/copyright	2008-03-04 01:11:49 UTC (rev 9559)
@@ -0,0 +1,30 @@
+This package was debianized by Jean-Michel Kelbert <kelbert at debian.org> on
+Wed, 19 Feb 2003 23:53:45 -0500.
+
+It was downloaded from http://www.k3b.org/
+
+Upstream Authors:
+
+   Sebastian Trueg <trueg at k3b.org>
+   Thomas Froescher <tfroescher at k3b.org>
+   Christian Kvasny <chris at k3b.org>
+   Klaus-Dieter Krannich <kd at k3b.org>
+
+Copyright: (C) 2001-2008 Sebastian Trueg
+
+   This package is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; version 2 dated June, 1991.
+
+   This package is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with this library; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  
+   02110-1301, USA
+
+On Debian GNU/Linux systems, the complete text of the GNU General
+Public License can be found in `/usr/share/common-licenses/GPL-2'.

Added: kde-extras/k3b/k3b/trunk/debian/docs
===================================================================
--- kde-extras/k3b/k3b/trunk/debian/docs	                        (rev 0)
+++ kde-extras/k3b/k3b/trunk/debian/docs	2008-03-04 01:11:49 UTC (rev 9559)
@@ -0,0 +1,3 @@
+FAQ
+README
+TODO

Added: kde-extras/k3b/k3b/trunk/debian/k3b-data.files
===================================================================
--- kde-extras/k3b/k3b/trunk/debian/k3b-data.files	                        (rev 0)
+++ kde-extras/k3b/k3b/trunk/debian/k3b-data.files	2008-03-04 01:11:49 UTC (rev 9559)
@@ -0,0 +1,5 @@
+usr/share/apps/*
+usr/share/icons/*
+usr/share/kde/*
+usr/share/sounds/*
+usr/share/doc/kde/*

Added: kde-extras/k3b/k3b/trunk/debian/k3b.1
===================================================================
--- kde-extras/k3b/k3b/trunk/debian/k3b.1	                        (rev 0)
+++ kde-extras/k3b/k3b/trunk/debian/k3b.1	2008-03-04 01:11:49 UTC (rev 9559)
@@ -0,0 +1,207 @@
+.TH K3B "1" "December 2002" KDE "KDE Application"
+.SH NAME
+k3b \- KDE CD burning program
+.SH SYNOPSIS
+.B k3b
+[\fIQt-options\fR] [\fIKDE-options\fR] [\fIFile\fR]
+.SH DESCRIPTION
+This manual page documents briefly the
+.B k3b
+KDE Application.
+This manual page was written for the Debian GNU/Linux distribution
+because the original program does not have a manual page.
+.PP
+K3b is a CD burning program that has two aims:
+usability and as many features as possible.
+.P
+This program is part of the official KDE extra gear #1 module.
+.SH OPTIONS
+.SS "Arguments:"
+.TP
+File(s)
+file(s) to open
+.SS "General Options"
+.B \-\-help
+Show help about options
+.TP
+.B \-\-help\-qt
+Show Qt specific options
+.TP
+.B \-\-help\-kde
+Show KDE specific options
+.TP
+.B \-\-help\-all
+Show all options
+.TP
+.B \-\-author
+Show author information
+.TP
+.B \-v\fR, \fB\-\-version
+Show version information
+.TP
+.B \-\-license
+Show license information
+.TP
+.B \-\-
+End of options
+.SS "Options:"
+.B \-\-datacd
+Create a new data CD project and add all given files
+.TP
+.B \-\-audiocd
+Create a new audio CD project and add all given files
+.TP
+.B \-\-videocd
+Create a new video CD project and add all given files
+.TP
+.B \-\-mixedcd
+Create a new mixed mode CD project and add all given files
+.TP
+.B \-\-emovixcd
+Create a new eMovix CD project and add all given files
+.TP
+.B \-\-datadvd
+Create a new data DVD project and add all given files
+.TP
+.B \-\-emovixdvd
+Create a new eMovix DVD project and add all given files
+.TP
+.B \-\-copycd
+Open the CD copy dialog
+.TP
+.B \-\-clonecd
+Open the CD cloning dialog
+.TP
+.B \-\-cdimage
+Write an ISO image or Bin/Cue image to cd
+.TP
+.B \-\-erasecd
+Erase a CDRW
+.TP
+.B \-\-formatdvd
+Format a DVD-RW or DVD+RW
+.TP
+.BI \-\-lang \ language
+Set the GUI language
+.SS "Qt options:"
+.TP
+.BI \-\-display \ displayname
+Use the X-server display \fIdisplayname\fP.
+.TP
+.BI \-\-session \ sessionId
+Restore the application for the given \fIsessionId\fP.
+.TP
+.B \-\-cmap
+Causes the application to install a private color
+map on an 8-bit display.
+.TP
+.BI \-\-ncols \ count
+Limits the number of colors allocated in the color
+cube on an 8-bit display, if the application is
+using the QApplication::ManyColor color
+specification.
+.TP
+.B \-\-nograb
+tells Qt to never grab the mouse or the keyboard.
+.TP
+.B \-\-dograb
+running under a debugger can cause an implicit
+.B \-nograb, use \fB\-dograb\fR to override.
+.TP
+.B \-\-sync
+switches to synchronous mode for debugging.
+.TP
+.BI "\-\-fn\fR, \fP\-\-font" \ fontname
+defines the application font.
+.TP
+.BI "-\-bg\fR, \fB\-\-background"  \ color
+sets the default background color and an
+application palette (light and dark shades are
+calculated).
+.TP
+.BI "\-\-fg\fR, \fB\-\-foreground"  \ color
+sets the default foreground color.
+.TP
+.BI \-\-btn\fR, \fB\-\-button \ color
+sets the default button color.
+.TP
+.BI \-\-name \ name
+sets the application name.
+.TP
+.BI \-\-title \ title
+sets the application title (caption).
+.TP
+.B \-\-visual TrueColor
+forces the application to use a TrueColor visual on
+an 8-bit display.
+.TP
+.BI \-\-inputstyle \ inputstyle
+sets XIM (X Input Method) input style. Possible
+values are 
+.BR onthespot ", " overthespot ", " offthespot and root .
+.TP
+.BI \-\-im " XIM-server"
+set XIM server.
+.TP
+.B \-\-noxim
+disable XIM.
+.TP
+.B \-\-reverse
+mirrors the whole layout of widgets.
+.SS "KDE options:"
+.TP
+.BI \-\-caption \ caption
+Use \fIcaption\fP as name in the titlebar.
+.TP
+.BI \-\-icon \ icon
+Use \fIicon\fP as the application icon.
+.TP
+.BI \-\-miniicon \ icon
+Use \fIicon\fP as the icon in the titlebar.
+.TP
+.BI \-\-config \ filename
+Use alternative configuration file.
+.TP
+.BI \-\-dcopserver \ server
+Use the DCOP Server specified by \fIserver\fP.
+.TP
+.B \-\-nocrashhandler
+Disable crash handler, to get core dumps.
+.TP
+.B \-\-waitforwm
+Waits for a WM_NET compatible windowmanager.
+.TP
+.BI \-\-style \ style
+sets the application GUI style.
+.TP
+.BI \-\-geometry \ geometry
+sets the client geometry of the main widget.
+.SH AUTHOR
+K3b was written by
+.nh
+.ad l
+Sebastian Trueg <trueg at informatik.uni-freiburg.de>
+and Thomas Froescher <tfroescher at gmx.de>.
+.hy
+.br
+Please use http://bugs.kde.org to report bugs, do not mail the authors directly.
+.br
+This manual page was prepared by
+.nh
+.ad l
+Karolina Lindqvist <pgd\-karolinali at algonet.se>
+.hy
+for the Debian GNU/Linux system (but may be used by others).
+.SH "SEE ALSO"
+If the
+.B khelpcenter
+program is properly installed at your site, the command
+.IP
+.B khelpcenter help:/k3b
+.PP
+should give you access to the complete manual.
+.P
+Alternatively the manual can be browsed in
+.B konqueror
+giving it the URL help:/k3b
+

Added: kde-extras/k3b/k3b/trunk/debian/k3b.files
===================================================================
--- kde-extras/k3b/k3b/trunk/debian/k3b.files	                        (rev 0)
+++ kde-extras/k3b/k3b/trunk/debian/k3b.files	2008-03-04 01:11:49 UTC (rev 9559)
@@ -0,0 +1,6 @@
+usr/share/applications/*
+usr/share/mimelnk/*
+usr/share/pixmaps/*
+usr/share/services/*
+usr/bin/*
+etc/*

Added: kde-extras/k3b/k3b/trunk/debian/k3b.manpages
===================================================================
--- kde-extras/k3b/k3b/trunk/debian/k3b.manpages	                        (rev 0)
+++ kde-extras/k3b/k3b/trunk/debian/k3b.manpages	2008-03-04 01:11:49 UTC (rev 9559)
@@ -0,0 +1 @@
+debian/k3b.1

Added: kde-extras/k3b/k3b/trunk/debian/k3b.menu
===================================================================
--- kde-extras/k3b/k3b/trunk/debian/k3b.menu	                        (rev 0)
+++ kde-extras/k3b/k3b/trunk/debian/k3b.menu	2008-03-04 01:11:49 UTC (rev 9559)
@@ -0,0 +1,6 @@
+?package(k3b):\
+	needs="X11"\
+	section="Applications/File Management"\
+	title="K3b"\
+	command="/usr/bin/k3b"\
+	icon="/usr/share/pixmaps/k3b.xpm"

Added: kde-extras/k3b/k3b/trunk/debian/k3b.postinst
===================================================================
--- kde-extras/k3b/k3b/trunk/debian/k3b.postinst	                        (rev 0)
+++ kde-extras/k3b/k3b/trunk/debian/k3b.postinst	2008-03-04 01:11:49 UTC (rev 9559)
@@ -0,0 +1,33 @@
+#!/bin/sh -e
+
+case "$1" in
+	configure)
+
+	# Remove bad files 
+	if dpkg --compare-versions "$2" eq "0.10.3-1"; then
+		rm -rf /usr/share/applnk/.hidden
+		rm -rf /usr/share/applnk/System/k3b.desktop
+	fi
+	
+	if dpkg --compare-versions "$2" lt "0.10.3-1"; then
+		rm -rf /usr/share/applnk/System/k3b.desktop
+		rm -rf /usr/share/applnk/System/k3bsetup.desktop
+	fi
+
+	;;	
+abort-upgrade|abort-remove|abort-deconfigure)
+	;;
+
+*)
+	echo "postinst called with unknown argument \`$1'" >&2
+	exit 1
+	;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
+

Added: kde-extras/k3b/k3b/trunk/debian/k3b.xpm
===================================================================
--- kde-extras/k3b/k3b/trunk/debian/k3b.xpm	                        (rev 0)
+++ kde-extras/k3b/k3b/trunk/debian/k3b.xpm	2008-03-04 01:11:49 UTC (rev 9559)
@@ -0,0 +1,49 @@
+/* XPM */
+static char *k3b[] = {
+/* columns rows colors chars-per-pixel */
+"32 32 11 1",
+"  c #7F0000",
+". c #7F007F",
+"X c #666667",
+"o c gray50",
+"O c red",
+"+ c magenta",
+"@ c gray60",
+"# c #B2B2B2",
+"$ c gray80",
+"% c gray90",
+"& c gray100",
+/* pixels */
+" O.O.O.O.O.O.O .OO.OO O.O.O.OO.O",
+"O.O O.. O O.. O.O.O..O.O.O.O .O ",
+".O.O.OOO.OO.OO.OO. .O.OOOO.O.O.O",
+"O.&#O.O.O. O.O@%&OO$$$%$$$$$$.O.",
+" .&%oO.OO.O.O#&&& O$%$#$$#$$$O.O",
+"OO&&&@O O..O%&&&%.O$$$$$$$##$O. ",
+".O$&&&$..Oo&&&&@O.O$$$$##$$$%.O.",
+"O.Oo&&&&O#&&&$.O O.%$##$#$$$$O O",
+".O.O.%&&&&&&#OO.O.O$$##$$##$$O.O",
+"O O.O$&&&&&&#..O O.$#$$$$$$##OO.",
+".O$$#$@&&&%. O.OO.O$$$$$#$$$%O O",
+"O &&&&&&&&&&&&&&&OO$$#$$$##$$.O.",
+".O%%&&&&&&&&&&&&&.O%%$$$$$$%$O.O",
+"O. at o@.. at Oo.@Oo.ooO.OO.O.O.OOO.O ",
+"..OOOO.O.O.O.O.OO.O. OO .OO .O.O",
+"O &&@OO@&&oOO#&&oOOo&&&&&&%.O.O.",
+".O&&#O.O&&@O.O&&.O.@&&&&&&&$O.O.",
+"O &&@ O+&%@ Oo&&@O.O&&#.@%&&.O.O",
+".O&&O.O@&&+O.@&&@OO@&&@OO.&&@.O ",
+"O.&&@O.O&&@.OO&&@ O+&%@.O@&&OOO.",
+"..&&+O @&&.O.@&&O.O@&&#O#&&%.O.O",
+"O &&@.O@&&@.OO&&@O.O&&&&&&&OO.O ",
+".O&&OO.O&&OO.@&&+O.@&&&&&&&%XO.O",
+"O &&@.Oo&&@.O.&&O O#&&#.O#&&%.O.",
+".O&&oO.@&&oO.@&&@OO@&&@..O#%& .O",
+"O.&&.O.O&&O..O&&..O#&&OOO..&&OO.",
+" O&&@.O#&&o.O@%&@O.O&&.O.O$&&O O",
+"O.&&OOO@&&OOO#&&@OOo&&%$$%&&%.O.",
+"O &&@O.@&&o.O@&&+O.@&&&&&&&%.O O",
+"..O.O.OO.OOO. O.O  O.O O .O.O.O.",
+"O..O.O.OO.. O..OO.O.O.. O..O O.O",
+" OO.O O..OOO.O O.O.O.OOO.OOO..O."
+};

Added: kde-extras/k3b/k3b/trunk/debian/libk3b-dev.files
===================================================================
--- kde-extras/k3b/k3b/trunk/debian/libk3b-dev.files	                        (rev 0)
+++ kde-extras/k3b/k3b/trunk/debian/libk3b-dev.files	2008-03-04 01:11:49 UTC (rev 9559)
@@ -0,0 +1,3 @@
+usr/include/*
+usr/lib/*.la
+usr/lib/*.so

Added: kde-extras/k3b/k3b/trunk/debian/libk3b3.files
===================================================================
--- kde-extras/k3b/k3b/trunk/debian/libk3b3.files	                        (rev 0)
+++ kde-extras/k3b/k3b/trunk/debian/libk3b3.files	2008-03-04 01:11:49 UTC (rev 9559)
@@ -0,0 +1,3 @@
+usr/lib/*.so.*
+usr/lib/libk3baudio*.{so,la}
+usr/lib/kde3/*

Added: kde-extras/k3b/k3b/trunk/debian/rules
===================================================================
--- kde-extras/k3b/k3b/trunk/debian/rules	                        (rev 0)
+++ kde-extras/k3b/k3b/trunk/debian/rules	2008-03-04 01:11:49 UTC (rev 9559)
@@ -0,0 +1,146 @@
+#!/usr/bin/make -f
+# -*- makefile -*-
+# Sample debian/rules that uses debhelper.
+# GNU copyright 1997 to 1999 by Joey Hess.
+#
+# Modified to make a template file for a multi-binary package with separated
+# build-arch and build-indep targets  by Bill Allombert 2001
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+# This has to be exported to make some magic below work.
+export DH_OPTIONS
+
+# These are used for cross-compiling and for saving the configure script
+# from having to guess our platform (since we know it already)
+DEB_HOST_GNU_TYPE       ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+DEB_BUILD_GNU_TYPE      ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+
+CFLAGS = -Wall -g3
+CXXFLAGS = -Wall -g3 -fpermissive
+
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+	CFLAGS += -O0
+	CXXFLAGS += -O0
+else
+	CFLAGS += -O2
+	CXXFLAGS += -O2
+endif
+ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
+	INSTALL_PROGRAM += -s
+endif
+
+objdir = $(CURDIR)/obj-$(DEB_BUILD_GNU_TYPE)
+
+
+-include debian/debiandirs
+
+debian/debiandirs: admin/debianrules
+	perl -w admin/debianrules echodirs > debian/debiandirs
+
+configure: configure-stamp
+configure-stamp: 
+	dh_testdir
+	
+	# make build directory
+	mkdir $(objdir)
+
+	# run configure with build tree $(objdir)
+	cd $(objdir) && \
+	CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" ../configure $(configkde) --without-resmgr --without-k3bsetup --without-cdrecord-suid-root
+
+	touch configure-stamp
+
+#Architecture 
+build: build-arch build-indep
+
+build-arch: build-arch-stamp
+build-arch-stamp: configure-stamp 
+
+	cd $(objdir) && \
+	$(MAKE)
+
+	touch build-arch-stamp
+
+build-indep: build-indep-stamp
+build-indep-stamp: configure-stamp 
+
+	# Add here commands to compile the indep part of the package.
+	#$(MAKE) doc
+	touch build-indep-stamp
+
+clean: clean1
+	dh_testdir
+	dh_testroot
+	rm -f build-arch-stamp build-indep-stamp configure-stamp debian/debiandirs
+
+	# Remove build tree
+	rm -rf $(objdir)
+
+	dh_clean 
+
+install: install-indep install-arch
+install-indep:
+	dh_testdir
+	dh_testroot
+
+install-arch:
+	dh_testdir
+	dh_testroot
+	dh_clean -k -s 
+	dh_installdirs -s
+
+	cd $(objdir) && \
+	$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
+	rm -f $(CURDIR)/debian/tmp/usr/share/mimelnk/application/x-cue.desktop
+	rm -f $(CURDIR)/debian/tmp/usr/share/mimelnk/application/x-iso.desktop
+	rm -rf $(CURDIR)/debian/tmp/usr/share/applnk/
+
+	chrpath -d $(CURDIR)/debian/tmp/usr/bin/k3b
+	chrpath -d $(CURDIR)/debian/tmp/usr/lib/libk3b*so*
+	chrpath -d $(CURDIR)/debian/tmp/usr/lib/kde3/libk3b*so
+	chrpath -d $(CURDIR)/debian/tmp/usr/lib/kde3/kfile_k3b.so
+	chrpath -d $(CURDIR)/debian/tmp/usr/lib/kde3/kio_videodvd.so
+	
+	mv $(CURDIR)/debian/tmp/usr/share/applications/kde/k3b.desktop $(CURDIR)/debian/tmp/usr/share/applications/
+	mkdir -p $(CURDIR)/debian/tmp/usr/share/pixmaps/
+	install -m 644 $(CURDIR)/debian/k3b.xpm $(CURDIR)/debian/tmp/usr/share/pixmaps/
+
+	dh_install -s --list-missing
+
+# Must not depend on anything. This is to be called by
+# binary-arch/binary-indep
+# in another 'make' thread.
+binary-common:
+	dh_testdir
+	dh_testroot
+	dh_movefiles
+	dh_installdocs
+	dh_installexamples
+	dh_installmenu
+	dh_installman
+	dh_installinfo
+	dh_desktop
+	dh_link
+	dh_installchangelogs ChangeLog
+	dh_strip
+	dh_compress -X.docbook -X.css -X-license -X.dcl -X.bz2
+	dh_fixperms
+	dh_makeshlibs -V 
+	dh_installdeb
+	dh_shlibdeps -ldebian/libk3b2/usr/lib
+	dh_gencontrol
+	dh_md5sums
+	dh_builddeb
+
+# Build architecture independant packages using the common target.
+binary-indep: build-indep install-indep
+	$(MAKE) -f debian/rules DH_OPTIONS=-i binary-common
+
+# Build architecture dependant packages using the common target.
+binary-arch: build-arch install-arch
+	$(MAKE) -f debian/rules DH_OPTIONS=-a binary-common
+
+binary: binary-arch binary-indep
+.PHONY: build clean clean1 binary-indep binary-arch binary install install-indep install-arch configure 


Property changes on: kde-extras/k3b/k3b/trunk/debian/rules
___________________________________________________________________
Name: svn:executable
   + *

Added: kde-extras/k3b/k3b/trunk/debian/watch
===================================================================
--- kde-extras/k3b/k3b/trunk/debian/watch	                        (rev 0)
+++ kde-extras/k3b/k3b/trunk/debian/watch	2008-03-04 01:11:49 UTC (rev 9559)
@@ -0,0 +1,2 @@
+version=3
+http://sf.net/k3b/k3b-([\d.]*).tar.bz2

Modified: kde-extras/k3b/k3b/trunk/doc/Makefile.in
===================================================================
--- kde-extras/k3b/k3b/trunk/doc/Makefile.in	2008-03-04 01:08:55 UTC (rev 9558)
+++ kde-extras/k3b/k3b/trunk/doc/Makefile.in	2008-03-04 01:11:49 UTC (rev 9559)
@@ -332,9 +332,9 @@
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  doc/Makefile'; \
+#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  doc/Makefile'; \
 #>- 	cd $(top_srcdir) && \
-#>- 	  $(AUTOMAKE) --gnu  doc/Makefile
+#>- 	  $(AUTOMAKE) --foreign  doc/Makefile
 #>+ 12
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
@@ -344,9 +344,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  doc/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  doc/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  doc/Makefile
+	  $(AUTOMAKE) --foreign  doc/Makefile
 	cd $(top_srcdir) && perl admin/am_edit doc/Makefile.in
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -513,11 +513,12 @@
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
+
 #>+ 2
-KDE_DIST=Makefile.in select_audiofiles.png cdcopy_done.png cdcloning_reading.png audiocd-howto.docbook commands.docbook burndialog_progress.png index.docbook cdcloning_dialog.png cdcopy_settings.png Makefile.am cdcopy-howto.docbook burndialog_audio.png cdcopy_writing.png dcop.docbook cdcopy_reading.png select_project.png 
+KDE_DIST=Makefile.in select_audiofiles.png cdcopy_done.png cdcloning_reading.png audiocd-howto.docbook commands.docbook index.docbook burndialog_progress.png cdcopy_settings.png cdcloning_dialog.png cdcopy-howto.docbook burndialog_audio.png Makefile.am cdcopy_writing.png dcop.docbook cdcopy_reading.png select_project.png 
 
 #>+ 24
-index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) commands.docbook cdcopy_settings.png audiocd-howto.docbook index.docbook select_project.png burndialog_audio.png cdcopy_reading.png burndialog_progress.png cdcopy-howto.docbook cdcloning_dialog.png dcop.docbook select_audiofiles.png cdcopy_writing.png cdcopy_done.png cdcloning_reading.png 
+index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) commands.docbook cdcopy_reading.png audiocd-howto.docbook cdcopy_done.png dcop.docbook cdcloning_dialog.png burndialog_audio.png cdcopy_settings.png cdcopy_writing.png select_project.png burndialog_progress.png select_audiofiles.png cdcloning_reading.png index.docbook cdcopy-howto.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
@@ -544,20 +545,20 @@
 #>+ 13
 install-nls:
 	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/k3b
-	@for base in commands.docbook cdcopy_settings.png audiocd-howto.docbook index.docbook select_project.png burndialog_audio.png cdcopy_reading.png burndialog_progress.png cdcopy-howto.docbook cdcloning_dialog.png dcop.docbook select_audiofiles.png cdcopy_writing.png cdcopy_done.png cdcloning_reading.png ; do \
+	@for base in commands.docbook cdcopy_reading.png audiocd-howto.docbook cdcopy_done.png dcop.docbook cdcloning_dialog.png burndialog_audio.png cdcopy_settings.png cdcopy_writing.png select_project.png burndialog_progress.png select_audiofiles.png cdcloning_reading.png index.docbook cdcopy-howto.docbook ; do \
 	  echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/k3b/$$base ;\
 	  $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/k3b/$$base ;\
 	done
 
 uninstall-nls:
-	for base in commands.docbook cdcopy_settings.png audiocd-howto.docbook index.docbook select_project.png burndialog_audio.png cdcopy_reading.png burndialog_progress.png cdcopy-howto.docbook cdcloning_dialog.png dcop.docbook select_audiofiles.png cdcopy_writing.png cdcopy_done.png cdcloning_reading.png ; do \
+	for base in commands.docbook cdcopy_reading.png audiocd-howto.docbook cdcopy_done.png dcop.docbook cdcloning_dialog.png burndialog_audio.png cdcopy_settings.png cdcopy_writing.png select_project.png burndialog_progress.png select_audiofiles.png cdcloning_reading.png index.docbook cdcopy-howto.docbook ; do \
 	  rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/k3b/$$base ;\
 	done
 
 
 #>+ 5
 distdir-nls:
-	for file in commands.docbook cdcopy_settings.png audiocd-howto.docbook index.docbook select_project.png burndialog_audio.png cdcopy_reading.png burndialog_progress.png cdcopy-howto.docbook cdcloning_dialog.png dcop.docbook select_audiofiles.png cdcopy_writing.png cdcopy_done.png cdcloning_reading.png ; do \
+	for file in commands.docbook cdcopy_reading.png audiocd-howto.docbook cdcopy_done.png dcop.docbook cdcloning_dialog.png burndialog_audio.png cdcopy_settings.png cdcopy_writing.png select_project.png burndialog_progress.png select_audiofiles.png cdcloning_reading.png index.docbook cdcopy-howto.docbook ; do \
 	  cp $(srcdir)/$$file $(distdir); \
 	done
 
@@ -571,9 +572,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  doc/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  doc/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  doc/Makefile
+	  $(AUTOMAKE) --foreign  doc/Makefile
 	cd $(top_srcdir) && perl admin/am_edit doc/Makefile.in
 
 

Modified: kde-extras/k3b/k3b/trunk/k3bsetup/Makefile.in
===================================================================
--- kde-extras/k3b/k3b/trunk/k3bsetup/Makefile.in	2008-03-04 01:08:55 UTC (rev 9558)
+++ kde-extras/k3b/k3b/trunk/k3bsetup/Makefile.in	2008-03-04 01:11:49 UTC (rev 9559)
@@ -403,9 +403,9 @@
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  k3bsetup/Makefile'; \
+#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  k3bsetup/Makefile'; \
 #>- 	cd $(top_srcdir) && \
-#>- 	  $(AUTOMAKE) --gnu  k3bsetup/Makefile
+#>- 	  $(AUTOMAKE) --foreign  k3bsetup/Makefile
 #>+ 12
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
@@ -415,9 +415,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  k3bsetup/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  k3bsetup/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  k3bsetup/Makefile
+	  $(AUTOMAKE) --foreign  k3bsetup/Makefile
 	cd $(top_srcdir) && perl admin/am_edit k3bsetup/Makefile.in
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -736,6 +736,7 @@
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
+
 #>+ 3
 k3bsetup2.moc: $(srcdir)/k3bsetup2.h
 	$(MOC) $(srcdir)/k3bsetup2.h -o k3bsetup2.moc
@@ -768,9 +769,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  k3bsetup/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  k3bsetup/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  k3bsetup/Makefile
+	  $(AUTOMAKE) --foreign  k3bsetup/Makefile
 	cd $(top_srcdir) && perl admin/am_edit k3bsetup/Makefile.in
 
 

Modified: kde-extras/k3b/k3b/trunk/k3bsetup/k3bsetup
===================================================================
--- kde-extras/k3b/k3b/trunk/k3bsetup/k3bsetup	2008-03-04 01:08:55 UTC (rev 9558)
+++ kde-extras/k3b/k3b/trunk/k3bsetup/k3bsetup	2008-03-04 01:11:49 UTC (rev 9559)
@@ -1,3 +1,4 @@
+#!/bin/sh
 #
 # $Id: k3bsetup 476230 2005-10-31 23:05:34Z thiago $
 # Copyright (C) 2003 Sebastian Trueg <trueg at k3b.org>
@@ -13,8 +14,6 @@
 #
 
 
-#!/usr/bin/sh
-
 #TODO: if kdesu not found and not currently root use kdialog to display an error message
 
 kdesu kcmshell k3bsetup2

Modified: kde-extras/k3b/k3b/trunk/k3bsetup/k3bsetup2.cpp
===================================================================
--- kde-extras/k3b/k3b/trunk/k3bsetup/k3bsetup2.cpp	2008-03-04 01:08:55 UTC (rev 9558)
+++ kde-extras/k3b/k3b/trunk/k3bsetup/k3bsetup2.cpp	2008-03-04 01:11:49 UTC (rev 9559)
@@ -47,6 +47,8 @@
 #include <k3bdefaultexternalprograms.h>
 #include <k3bglobals.h>
 
+#include <kprocess.h>
+
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <unistd.h>
@@ -445,30 +447,37 @@
 
       K3bExternalBin* bin = d->listBinMap[checkItem];
 
+      KProcess cleanupProc;
+      cleanupProc << "/usr/sbin/dpkg-statoverride" << "--quiet" << "--remove";
+      cleanupProc << QFile::encodeName(bin->path);
+      if (!cleanupProc.start(KProcess::Block))
+	success = false;
+
       if( w->m_checkUseBurningGroup->isChecked() ) {
-	if( ::chown( QFile::encodeName(bin->path), (gid_t)0, g->gr_gid ) )
-	  success = false;
+	KProcess proc;
+	proc << "/usr/sbin/dpkg-statoverride" << "--quiet" << "--update" << "--add" << "#0" << "#";
+        proc << g->gr_gid;
 
-	int perm = 0;
 	if( shouldRunSuidRoot( bin ) )
-	  perm = S_ISUID|S_IRWXU|S_IXGRP;
+	  proc << "4710";
 	else
-	  perm = S_IRWXU|S_IXGRP|S_IRGRP;
+	  proc << "0750";
 
-	if( ::chmod( QFile::encodeName(bin->path), perm ) )
+	proc << QFile::encodeName(bin->path);
+	if (!proc.start(KProcess::Block))
 	  success = false;
       }
       else {
-	if( ::chown( QFile::encodeName(bin->path), 0, 0 ) )
-	  success = false;
+	KProcess proc;
+	proc << "/usr/sbin/dpkg-statoverride" << "--quiet" << "--update" << "--add" << "#0" << "#0";
 
-	int perm = 0;
 	if( shouldRunSuidRoot( bin ) )
-	  perm = S_ISUID|S_IRWXU|S_IXGRP|S_IXOTH;
+	  proc << "4711";
 	else
-	  perm = S_IRWXU|S_IXGRP|S_IRGRP|S_IXOTH|S_IROTH;
+	  proc << "0755";
 
-	if( ::chmod( QFile::encodeName(bin->path), perm ) )
+	proc << QFile::encodeName(bin->path);
+	if (!proc.start(KProcess::Block))
 	  success = false;
       }
     }

Modified: kde-extras/k3b/k3b/trunk/k3bsetup/k3bsetup2.desktop
===================================================================
--- kde-extras/k3b/k3b/trunk/k3bsetup/k3bsetup2.desktop	2008-03-04 01:08:55 UTC (rev 9558)
+++ kde-extras/k3b/k3b/trunk/k3bsetup/k3bsetup2.desktop	2008-03-04 01:11:49 UTC (rev 9559)
@@ -93,7 +93,7 @@
 X-KDE-Library=k3bsetup2
 X-KDE-ModuleType=Library
 X-KDE-RootOnly=true
-Categories=Application;System;X-KDE-System;
+Categories=QT;KDE;X-KDE-settings-system;
 GenericName=CD & DVD Burning Setup
 GenericName[af]=CD & DVD Skryf Opstelling
 GenericName[ar]=العام  اعداد كتابة القرص المدمج (CD) و القرص المرئي الرقمي (DVD)

Modified: kde-extras/k3b/k3b/trunk/kfile-plugins/Makefile.in
===================================================================
--- kde-extras/k3b/k3b/trunk/kfile-plugins/Makefile.in	2008-03-04 01:08:55 UTC (rev 9558)
+++ kde-extras/k3b/k3b/trunk/kfile-plugins/Makefile.in	2008-03-04 01:11:49 UTC (rev 9559)
@@ -351,9 +351,9 @@
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kfile-plugins/Makefile'; \
+#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kfile-plugins/Makefile'; \
 #>- 	cd $(top_srcdir) && \
-#>- 	  $(AUTOMAKE) --gnu  kfile-plugins/Makefile
+#>- 	  $(AUTOMAKE) --foreign  kfile-plugins/Makefile
 #>+ 12
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
@@ -363,9 +363,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kfile-plugins/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kfile-plugins/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  kfile-plugins/Makefile
+	  $(AUTOMAKE) --foreign  kfile-plugins/Makefile
 	cd $(top_srcdir) && perl admin/am_edit kfile-plugins/Makefile.in
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -673,6 +673,7 @@
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
+
 #>+ 2
 KDE_DIST=Makefile.in Makefile.am 
 
@@ -689,9 +690,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kfile-plugins/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kfile-plugins/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  kfile-plugins/Makefile
+	  $(AUTOMAKE) --foreign  kfile-plugins/Makefile
 	cd $(top_srcdir) && perl admin/am_edit kfile-plugins/Makefile.in
 
 

Modified: kde-extras/k3b/k3b/trunk/kfile-plugins/k3bproject/Makefile.in
===================================================================
--- kde-extras/k3b/k3b/trunk/kfile-plugins/k3bproject/Makefile.in	2008-03-04 01:08:55 UTC (rev 9558)
+++ kde-extras/k3b/k3b/trunk/kfile-plugins/k3bproject/Makefile.in	2008-03-04 01:11:49 UTC (rev 9559)
@@ -410,9 +410,9 @@
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kfile-plugins/k3bproject/Makefile'; \
+#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kfile-plugins/k3bproject/Makefile'; \
 #>- 	cd $(top_srcdir) && \
-#>- 	  $(AUTOMAKE) --gnu  kfile-plugins/k3bproject/Makefile
+#>- 	  $(AUTOMAKE) --foreign  kfile-plugins/k3bproject/Makefile
 #>+ 12
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
@@ -422,9 +422,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kfile-plugins/k3bproject/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kfile-plugins/k3bproject/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  kfile-plugins/k3bproject/Makefile
+	  $(AUTOMAKE) --foreign  kfile-plugins/k3bproject/Makefile
 	cd $(top_srcdir) && perl admin/am_edit kfile-plugins/k3bproject/Makefile.in
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -722,6 +722,7 @@
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
+
 #>+ 3
 kfile_k3bprojectfileplugin.moc: $(srcdir)/kfile_k3bprojectfileplugin.h
 	$(MOC) $(srcdir)/kfile_k3bprojectfileplugin.h -o kfile_k3bprojectfileplugin.moc
@@ -749,9 +750,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kfile-plugins/k3bproject/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kfile-plugins/k3bproject/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  kfile-plugins/k3bproject/Makefile
+	  $(AUTOMAKE) --foreign  kfile-plugins/k3bproject/Makefile
 	cd $(top_srcdir) && perl admin/am_edit kfile-plugins/k3bproject/Makefile.in
 
 

Modified: kde-extras/k3b/k3b/trunk/kioslaves/Makefile.in
===================================================================
--- kde-extras/k3b/k3b/trunk/kioslaves/Makefile.in	2008-03-04 01:08:55 UTC (rev 9558)
+++ kde-extras/k3b/k3b/trunk/kioslaves/Makefile.in	2008-03-04 01:11:49 UTC (rev 9559)
@@ -351,9 +351,9 @@
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kioslaves/Makefile'; \
+#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kioslaves/Makefile'; \
 #>- 	cd $(top_srcdir) && \
-#>- 	  $(AUTOMAKE) --gnu  kioslaves/Makefile
+#>- 	  $(AUTOMAKE) --foreign  kioslaves/Makefile
 #>+ 12
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
@@ -363,9 +363,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kioslaves/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kioslaves/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  kioslaves/Makefile
+	  $(AUTOMAKE) --foreign  kioslaves/Makefile
 	cd $(top_srcdir) && perl admin/am_edit kioslaves/Makefile.in
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -673,6 +673,7 @@
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
+
 #>+ 2
 KDE_DIST=Makefile.in Makefile.am 
 
@@ -689,9 +690,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kioslaves/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kioslaves/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  kioslaves/Makefile
+	  $(AUTOMAKE) --foreign  kioslaves/Makefile
 	cd $(top_srcdir) && perl admin/am_edit kioslaves/Makefile.in
 
 

Modified: kde-extras/k3b/k3b/trunk/kioslaves/videodvd/Makefile.in
===================================================================
--- kde-extras/k3b/k3b/trunk/kioslaves/videodvd/Makefile.in	2008-03-04 01:08:55 UTC (rev 9558)
+++ kde-extras/k3b/k3b/trunk/kioslaves/videodvd/Makefile.in	2008-03-04 01:11:49 UTC (rev 9559)
@@ -397,9 +397,9 @@
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kioslaves/videodvd/Makefile'; \
+#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kioslaves/videodvd/Makefile'; \
 #>- 	cd $(top_srcdir) && \
-#>- 	  $(AUTOMAKE) --gnu  kioslaves/videodvd/Makefile
+#>- 	  $(AUTOMAKE) --foreign  kioslaves/videodvd/Makefile
 #>+ 12
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
@@ -409,9 +409,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kioslaves/videodvd/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kioslaves/videodvd/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  kioslaves/videodvd/Makefile
+	  $(AUTOMAKE) --foreign  kioslaves/videodvd/Makefile
 	cd $(top_srcdir) && perl admin/am_edit kioslaves/videodvd/Makefile.in
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -735,6 +735,7 @@
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
+
 #>+ 2
 KDE_DIST=videodvd.protocol Makefile.in videodvd.h videodvd.desktop Makefile.am 
 
@@ -751,9 +752,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kioslaves/videodvd/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kioslaves/videodvd/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  kioslaves/videodvd/Makefile
+	  $(AUTOMAKE) --foreign  kioslaves/videodvd/Makefile
 	cd $(top_srcdir) && perl admin/am_edit kioslaves/videodvd/Makefile.in
 
 

Modified: kde-extras/k3b/k3b/trunk/kioslaves/videodvd/videodvd.desktop
===================================================================
--- kde-extras/k3b/k3b/trunk/kioslaves/videodvd/videodvd.desktop	2008-03-04 01:08:55 UTC (rev 9558)
+++ kde-extras/k3b/k3b/trunk/kioslaves/videodvd/videodvd.desktop	2008-03-04 01:11:49 UTC (rev 9559)
@@ -41,6 +41,6 @@
 Name[uz]=Видео-DVD браузери
 Name[zh_CN]=视频 DVD 浏览器
 Name[zh_TW]=Video DVD 瀏覽器
-Open=false
+NoDisplay=true
 X-KDE-TreeModule=Directory
 X-KDE-KonqSidebarModule=konqsidebar_tree

Modified: kde-extras/k3b/k3b/trunk/libk3b/Makefile.in
===================================================================
--- kde-extras/k3b/k3b/trunk/libk3b/Makefile.in	2008-03-04 01:08:55 UTC (rev 9558)
+++ kde-extras/k3b/k3b/trunk/libk3b/Makefile.in	2008-03-04 01:11:49 UTC (rev 9559)
@@ -414,9 +414,9 @@
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  libk3b/Makefile'; \
+#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  libk3b/Makefile'; \
 #>- 	cd $(top_srcdir) && \
-#>- 	  $(AUTOMAKE) --gnu  libk3b/Makefile
+#>- 	  $(AUTOMAKE) --foreign  libk3b/Makefile
 #>+ 12
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
@@ -426,9 +426,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  libk3b/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  libk3b/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  libk3b/Makefile
+	  $(AUTOMAKE) --foreign  libk3b/Makefile
 	cd $(top_srcdir) && perl admin/am_edit libk3b/Makefile.in
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -811,6 +811,7 @@
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
+
 #>+ 2
 KDE_DIST=Makefile.in k3bimage.xsd configure.in.in Makefile.am 
 
@@ -827,9 +828,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  libk3b/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  libk3b/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  libk3b/Makefile
+	  $(AUTOMAKE) --foreign  libk3b/Makefile
 	cd $(top_srcdir) && perl admin/am_edit libk3b/Makefile.in
 
 

Modified: kde-extras/k3b/k3b/trunk/libk3b/cddb/Makefile.in
===================================================================
--- kde-extras/k3b/k3b/trunk/libk3b/cddb/Makefile.in	2008-03-04 01:08:55 UTC (rev 9558)
+++ kde-extras/k3b/k3b/trunk/libk3b/cddb/Makefile.in	2008-03-04 01:11:49 UTC (rev 9559)
@@ -376,9 +376,9 @@
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  libk3b/cddb/Makefile'; \
+#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  libk3b/cddb/Makefile'; \
 #>- 	cd $(top_srcdir) && \
-#>- 	  $(AUTOMAKE) --gnu  libk3b/cddb/Makefile
+#>- 	  $(AUTOMAKE) --foreign  libk3b/cddb/Makefile
 #>+ 12
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
@@ -388,9 +388,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  libk3b/cddb/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  libk3b/cddb/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  libk3b/cddb/Makefile
+	  $(AUTOMAKE) --foreign  libk3b/cddb/Makefile
 	cd $(top_srcdir) && perl admin/am_edit libk3b/cddb/Makefile.in
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -649,6 +649,7 @@
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
+
 #>+ 3
 k3bcddbquery.moc: $(srcdir)/k3bcddbquery.h
 	$(MOC) $(srcdir)/k3bcddbquery.h -o k3bcddbquery.moc
@@ -664,20 +665,6 @@
 mocs: k3bcddb.moc
 
 #>+ 3
-k3bcddbhttpquery.moc: $(srcdir)/k3bcddbhttpquery.h
-	$(MOC) $(srcdir)/k3bcddbhttpquery.h -o k3bcddbhttpquery.moc
-
-#>+ 2
-mocs: k3bcddbhttpquery.moc
-
-#>+ 3
-k3bcddbpquery.moc: $(srcdir)/k3bcddbpquery.h
-	$(MOC) $(srcdir)/k3bcddbpquery.h -o k3bcddbpquery.moc
-
-#>+ 2
-mocs: k3bcddbpquery.moc
-
-#>+ 3
 k3bcddblocalquery.moc: $(srcdir)/k3bcddblocalquery.h
 	$(MOC) $(srcdir)/k3bcddblocalquery.h -o k3bcddblocalquery.moc
 
@@ -692,6 +679,13 @@
 mocs: k3bcddblocalsubmit.moc
 
 #>+ 3
+k3bcddbpquery.moc: $(srcdir)/k3bcddbpquery.h
+	$(MOC) $(srcdir)/k3bcddbpquery.h -o k3bcddbpquery.moc
+
+#>+ 2
+mocs: k3bcddbpquery.moc
+
+#>+ 3
 k3bcddbsubmit.moc: $(srcdir)/k3bcddbsubmit.h
 	$(MOC) $(srcdir)/k3bcddbsubmit.h -o k3bcddbsubmit.moc
 
@@ -699,6 +693,13 @@
 mocs: k3bcddbsubmit.moc
 
 #>+ 3
+k3bcddbhttpquery.moc: $(srcdir)/k3bcddbhttpquery.h
+	$(MOC) $(srcdir)/k3bcddbhttpquery.h -o k3bcddbhttpquery.moc
+
+#>+ 2
+mocs: k3bcddbhttpquery.moc
+
+#>+ 3
 k3bcddbmultientriesdialog.moc: $(srcdir)/k3bcddbmultientriesdialog.h
 	$(MOC) $(srcdir)/k3bcddbmultientriesdialog.h -o k3bcddbmultientriesdialog.moc
 
@@ -707,7 +708,7 @@
 
 #>+ 3
 clean-metasources:
-	-rm -f  k3bcddbquery.moc k3bcddb.moc k3bcddbhttpquery.moc k3bcddbpquery.moc k3bcddblocalquery.moc k3bcddblocalsubmit.moc k3bcddbsubmit.moc k3bcddbmultientriesdialog.moc
+	-rm -f  k3bcddbquery.moc k3bcddb.moc k3bcddblocalquery.moc k3bcddblocalsubmit.moc k3bcddbpquery.moc k3bcddbsubmit.moc k3bcddbhttpquery.moc k3bcddbmultientriesdialog.moc
 
 #>+ 2
 KDE_DIST=k3bcddblocalsubmit.h Makefile.in k3bcddb.h k3bcddbmultientriesdialog.h k3bcddblocalquery.h k3bcddbquery.h k3bcddbsubmit.h k3bcddbhttpquery.h k3bcddbpquery.h Makefile.am k3bcddbresult.h 
@@ -725,9 +726,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  libk3b/cddb/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  libk3b/cddb/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  libk3b/cddb/Makefile
+	  $(AUTOMAKE) --foreign  libk3b/cddb/Makefile
 	cd $(top_srcdir) && perl admin/am_edit libk3b/cddb/Makefile.in
 
 
@@ -754,7 +755,7 @@
 
 
 #>+ 11
-libcddb_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/k3bcddbquery.cpp $(srcdir)/k3bcddb.cpp $(srcdir)/k3bcddbresult.cpp $(srcdir)/k3bcddbhttpquery.cpp $(srcdir)/k3bcddbpquery.cpp $(srcdir)/k3bcddblocalquery.cpp $(srcdir)/k3bcddbsubmit.cpp $(srcdir)/k3bcddblocalsubmit.cpp $(srcdir)/k3bcddbmultientriesdialog.cpp  k3bcddb.moc k3bcddbquery.moc k3bcddbhttpquery.moc k3bcddblocalsubmit.moc k3bcddblocalquery.moc k3bcddbpquery.moc k3bcddbsubmit.moc k3bcddbmultientriesdialog.moc
+libcddb_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/k3bcddbquery.cpp $(srcdir)/k3bcddb.cpp $(srcdir)/k3bcddbresult.cpp $(srcdir)/k3bcddbhttpquery.cpp $(srcdir)/k3bcddbpquery.cpp $(srcdir)/k3bcddblocalquery.cpp $(srcdir)/k3bcddbsubmit.cpp $(srcdir)/k3bcddblocalsubmit.cpp $(srcdir)/k3bcddbmultientriesdialog.cpp  k3bcddb.moc k3bcddbquery.moc k3bcddbhttpquery.moc k3bcddbpquery.moc k3bcddblocalsubmit.moc k3bcddblocalquery.moc k3bcddbsubmit.moc k3bcddbmultientriesdialog.moc
 	@echo 'creating libcddb_la.all_cpp.cpp ...'; \
 	rm -f libcddb_la.all_cpp.files libcddb_la.all_cpp.final; \
 	echo "#define KDE_USE_FINAL 1" >> libcddb_la.all_cpp.final; \
@@ -791,16 +792,16 @@
 
 #>+ 19
 k3bcddbmultientriesdialog.o: k3bcddbmultientriesdialog.moc 
+k3bcddbhttpquery.lo: k3bcddbhttpquery.moc 
 k3bcddbsubmit.o: k3bcddbsubmit.moc 
-k3bcddbhttpquery.lo: k3bcddbhttpquery.moc 
 k3bcddbquery.lo: k3bcddbquery.moc 
 k3bcddbhttpquery.o: k3bcddbhttpquery.moc 
 k3bcddblocalquery.o: k3bcddblocalquery.moc 
+k3bcddblocalquery.lo: k3bcddblocalquery.moc 
 k3bcddblocalsubmit.o: k3bcddblocalsubmit.moc 
-k3bcddblocalquery.lo: k3bcddblocalquery.moc 
+k3bcddbpquery.lo: k3bcddbpquery.moc 
 k3bcddb.o: k3bcddb.moc 
 k3bcddb.lo: k3bcddb.moc 
-k3bcddbpquery.lo: k3bcddbpquery.moc 
 nmcheck: 
 k3bcddblocalsubmit.lo: k3bcddblocalsubmit.moc 
 k3bcddbsubmit.lo: k3bcddbsubmit.moc 

Modified: kde-extras/k3b/k3b/trunk/libk3b/core/Makefile.in
===================================================================
--- kde-extras/k3b/k3b/trunk/libk3b/core/Makefile.in	2008-03-04 01:08:55 UTC (rev 9558)
+++ kde-extras/k3b/k3b/trunk/libk3b/core/Makefile.in	2008-03-04 01:11:49 UTC (rev 9559)
@@ -405,9 +405,9 @@
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  libk3b/core/Makefile'; \
+#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  libk3b/core/Makefile'; \
 #>- 	cd $(top_srcdir) && \
-#>- 	  $(AUTOMAKE) --gnu  libk3b/core/Makefile
+#>- 	  $(AUTOMAKE) --foreign  libk3b/core/Makefile
 #>+ 12
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
@@ -417,9 +417,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  libk3b/core/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  libk3b/core/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  libk3b/core/Makefile
+	  $(AUTOMAKE) --foreign  libk3b/core/Makefile
 	cd $(top_srcdir) && perl admin/am_edit libk3b/core/Makefile.in
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -701,6 +701,7 @@
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
+
 #>+ 3
 k3bprocess.moc: $(srcdir)/k3bprocess.h
 	$(MOC) $(srcdir)/k3bprocess.h -o k3bprocess.moc
@@ -716,18 +717,18 @@
 mocs: k3bjob.moc
 
 #>+ 3
-k3bexternalbinmanager.moc: $(srcdir)/k3bexternalbinmanager.h
-	$(MOC) $(srcdir)/k3bexternalbinmanager.h -o k3bexternalbinmanager.moc
+k3bthreadjob.moc: $(srcdir)/k3bthreadjob.h
+	$(MOC) $(srcdir)/k3bthreadjob.h -o k3bthreadjob.moc
 
 #>+ 2
-mocs: k3bexternalbinmanager.moc
+mocs: k3bthreadjob.moc
 
 #>+ 3
-k3bthreadjob.moc: $(srcdir)/k3bthreadjob.h
-	$(MOC) $(srcdir)/k3bthreadjob.h -o k3bthreadjob.moc
+k3bexternalbinmanager.moc: $(srcdir)/k3bexternalbinmanager.h
+	$(MOC) $(srcdir)/k3bexternalbinmanager.h -o k3bexternalbinmanager.moc
 
 #>+ 2
-mocs: k3bthreadjob.moc
+mocs: k3bexternalbinmanager.moc
 
 #>+ 3
 k3bsimplejobhandler.moc: $(srcdir)/k3bsimplejobhandler.h
@@ -745,7 +746,7 @@
 
 #>+ 3
 clean-metasources:
-	-rm -f  k3bprocess.moc k3bjob.moc k3bexternalbinmanager.moc k3bthreadjob.moc k3bsimplejobhandler.moc k3bcore.moc
+	-rm -f  k3bprocess.moc k3bjob.moc k3bthreadjob.moc k3bexternalbinmanager.moc k3bsimplejobhandler.moc k3bcore.moc
 
 #>+ 2
 KDE_DIST=k3bprogressinfoevent.h Makefile.in k3bdataevent.h Makefile.am 
@@ -763,9 +764,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  libk3b/core/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  libk3b/core/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  libk3b/core/Makefile
+	  $(AUTOMAKE) --foreign  libk3b/core/Makefile
 	cd $(top_srcdir) && perl admin/am_edit libk3b/core/Makefile.in
 
 
@@ -792,7 +793,7 @@
 
 
 #>+ 11
-libk3bcore_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/k3bcore.cpp $(srcdir)/k3bglobals.cpp $(srcdir)/k3bdefaultexternalprograms.cpp $(srcdir)/k3bexternalbinmanager.cpp $(srcdir)/k3bversion.cpp $(srcdir)/k3bprocess.cpp $(srcdir)/k3bjob.cpp $(srcdir)/k3bthread.cpp $(srcdir)/k3bthreadjob.cpp $(srcdir)/k3bglobalsettings.cpp $(srcdir)/k3bsimplejobhandler.cpp  k3bjob.moc k3bprocess.moc k3bthreadjob.moc k3bexternalbinmanager.moc k3bsimplejobhandler.moc k3bcore.moc
+libk3bcore_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/k3bcore.cpp $(srcdir)/k3bglobals.cpp $(srcdir)/k3bdefaultexternalprograms.cpp $(srcdir)/k3bexternalbinmanager.cpp $(srcdir)/k3bversion.cpp $(srcdir)/k3bprocess.cpp $(srcdir)/k3bjob.cpp $(srcdir)/k3bthread.cpp $(srcdir)/k3bthreadjob.cpp $(srcdir)/k3bglobalsettings.cpp $(srcdir)/k3bsimplejobhandler.cpp  k3bjob.moc k3bprocess.moc k3bexternalbinmanager.moc k3bthreadjob.moc k3bsimplejobhandler.moc k3bcore.moc
 	@echo 'creating libk3bcore_la.all_cpp.cpp ...'; \
 	rm -f libk3bcore_la.all_cpp.files libk3bcore_la.all_cpp.final; \
 	echo "#define KDE_USE_FINAL 1" >> libk3bcore_la.all_cpp.final; \

Modified: kde-extras/k3b/k3b/trunk/libk3b/core/k3bdefaultexternalprograms.cpp
===================================================================
--- kde-extras/k3b/k3b/trunk/libk3b/core/k3bdefaultexternalprograms.cpp	2008-03-04 01:08:55 UTC (rev 9558)
+++ kde-extras/k3b/k3b/trunk/libk3b/core/k3bdefaultexternalprograms.cpp	2008-03-04 01:11:49 UTC (rev 9559)
@@ -126,13 +126,18 @@
     return false;
 
   bool wodim = false;
+  bool cdrskin = false;
   QString path = p;
   QFileInfo fi( path );
   if( fi.isDir() ) {
     if( path[path.length()-1] != '/' )
       path.append("/");
 
-    if( QFile::exists( path + "wodim" ) ) {
+    if( QFile::exists( path + "cdrskin" ) ) {
+      cdrskin = true;
+      path += "cdrskin";
+    }
+    else if( QFile::exists( path + "wodim" ) ) {
       wodim = true;
       path += "wodim";
     }
@@ -708,7 +713,7 @@
 
 
 K3bNormalizeProgram::K3bNormalizeProgram()
-  : K3bExternalProgram( "normalize" )
+  : K3bExternalProgram( "normalize-audio" )
 {
 }
 
@@ -723,7 +728,7 @@
   if( fi.isDir() ) {
     if( path[path.length()-1] != '/' )
       path.append("/");
-    path.append("normalize");
+    path.append("normalize-audio");
   }
 
   if( !QFile::exists( path ) )
@@ -863,7 +868,7 @@
   if( vp.start( KProcess::Block, KProcess::AllOutput ) ) {
     // different locales make searching for the +- char difficult
     // so we simply ignore it.
-    int pos = out.output().find( QRegExp("DVD.*RW(/-RAM)? format utility") );
+    int pos = out.output().find( QRegExp("DVD.*RAM format utility") );
     if( pos < 0 )
       return false;
 

Modified: kde-extras/k3b/k3b/trunk/libk3b/jobs/Makefile.in
===================================================================
--- kde-extras/k3b/k3b/trunk/libk3b/jobs/Makefile.in	2008-03-04 01:08:55 UTC (rev 9558)
+++ kde-extras/k3b/k3b/trunk/libk3b/jobs/Makefile.in	2008-03-04 01:11:49 UTC (rev 9559)
@@ -469,9 +469,9 @@
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  libk3b/jobs/Makefile'; \
+#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  libk3b/jobs/Makefile'; \
 #>- 	cd $(top_srcdir) && \
-#>- 	  $(AUTOMAKE) --gnu  libk3b/jobs/Makefile
+#>- 	  $(AUTOMAKE) --foreign  libk3b/jobs/Makefile
 #>+ 12
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
@@ -481,9 +481,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  libk3b/jobs/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  libk3b/jobs/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  libk3b/jobs/Makefile
+	  $(AUTOMAKE) --foreign  libk3b/jobs/Makefile
 	cd $(top_srcdir) && perl admin/am_edit libk3b/jobs/Makefile.in
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -769,6 +769,7 @@
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
+
 #>+ 3
 k3bbinimagewritingjob.moc: $(srcdir)/k3bbinimagewritingjob.h
 	$(MOC) $(srcdir)/k3bbinimagewritingjob.h -o k3bbinimagewritingjob.moc
@@ -887,9 +888,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  libk3b/jobs/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  libk3b/jobs/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  libk3b/jobs/Makefile
+	  $(AUTOMAKE) --foreign  libk3b/jobs/Makefile
 	cd $(top_srcdir) && perl admin/am_edit libk3b/jobs/Makefile.in
 
 

Modified: kde-extras/k3b/k3b/trunk/libk3b/plugin/Makefile.in
===================================================================
--- kde-extras/k3b/k3b/trunk/libk3b/plugin/Makefile.in	2008-03-04 01:08:55 UTC (rev 9558)
+++ kde-extras/k3b/k3b/trunk/libk3b/plugin/Makefile.in	2008-03-04 01:11:49 UTC (rev 9559)
@@ -429,9 +429,9 @@
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  libk3b/plugin/Makefile'; \
+#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  libk3b/plugin/Makefile'; \
 #>- 	cd $(top_srcdir) && \
-#>- 	  $(AUTOMAKE) --gnu  libk3b/plugin/Makefile
+#>- 	  $(AUTOMAKE) --foreign  libk3b/plugin/Makefile
 #>+ 12
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
@@ -441,9 +441,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  libk3b/plugin/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  libk3b/plugin/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  libk3b/plugin/Makefile
+	  $(AUTOMAKE) --foreign  libk3b/plugin/Makefile
 	cd $(top_srcdir) && perl admin/am_edit libk3b/plugin/Makefile.in
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -825,6 +825,7 @@
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
+
 #>+ 3
 k3bpluginmanager.moc: $(srcdir)/k3bpluginmanager.h
 	$(MOC) $(srcdir)/k3bpluginmanager.h -o k3bpluginmanager.moc
@@ -901,9 +902,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  libk3b/plugin/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  libk3b/plugin/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  libk3b/plugin/Makefile
+	  $(AUTOMAKE) --foreign  libk3b/plugin/Makefile
 	cd $(top_srcdir) && perl admin/am_edit libk3b/plugin/Makefile.in
 
 

Modified: kde-extras/k3b/k3b/trunk/libk3b/plugin/libsamplerate/Makefile.in
===================================================================
--- kde-extras/k3b/k3b/trunk/libk3b/plugin/libsamplerate/Makefile.in	2008-03-04 01:08:55 UTC (rev 9558)
+++ kde-extras/k3b/k3b/trunk/libk3b/plugin/libsamplerate/Makefile.in	2008-03-04 01:11:49 UTC (rev 9559)
@@ -368,9 +368,9 @@
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  libk3b/plugin/libsamplerate/Makefile'; \
+#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  libk3b/plugin/libsamplerate/Makefile'; \
 #>- 	cd $(top_srcdir) && \
-#>- 	  $(AUTOMAKE) --gnu  libk3b/plugin/libsamplerate/Makefile
+#>- 	  $(AUTOMAKE) --foreign  libk3b/plugin/libsamplerate/Makefile
 #>+ 12
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
@@ -380,9 +380,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  libk3b/plugin/libsamplerate/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  libk3b/plugin/libsamplerate/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  libk3b/plugin/libsamplerate/Makefile
+	  $(AUTOMAKE) --foreign  libk3b/plugin/libsamplerate/Makefile
 	cd $(top_srcdir) && perl admin/am_edit libk3b/plugin/libsamplerate/Makefile.in
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -639,8 +639,9 @@
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
+
 #>+ 2
-KDE_DIST=configure.in.in fastest_coeffs.h Makefile.in high_qual_coeffs.h Makefile.am mid_qual_coeffs.h 
+KDE_DIST=fastest_coeffs.h configure.in.in Makefile.in high_qual_coeffs.h Makefile.am mid_qual_coeffs.h 
 
 #>+ 2
 docs-am:
@@ -655,9 +656,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  libk3b/plugin/libsamplerate/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  libk3b/plugin/libsamplerate/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  libk3b/plugin/libsamplerate/Makefile
+	  $(AUTOMAKE) --foreign  libk3b/plugin/libsamplerate/Makefile
 	cd $(top_srcdir) && perl admin/am_edit libk3b/plugin/libsamplerate/Makefile.in
 
 

Modified: kde-extras/k3b/k3b/trunk/libk3b/projects/Makefile.in
===================================================================
--- kde-extras/k3b/k3b/trunk/libk3b/projects/Makefile.in	2008-03-04 01:08:55 UTC (rev 9558)
+++ kde-extras/k3b/k3b/trunk/libk3b/projects/Makefile.in	2008-03-04 01:11:49 UTC (rev 9559)
@@ -440,9 +440,9 @@
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  libk3b/projects/Makefile'; \
+#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  libk3b/projects/Makefile'; \
 #>- 	cd $(top_srcdir) && \
-#>- 	  $(AUTOMAKE) --gnu  libk3b/projects/Makefile
+#>- 	  $(AUTOMAKE) --foreign  libk3b/projects/Makefile
 #>+ 12
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
@@ -452,9 +452,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  libk3b/projects/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  libk3b/projects/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  libk3b/projects/Makefile
+	  $(AUTOMAKE) --foreign  libk3b/projects/Makefile
 	cd $(top_srcdir) && perl admin/am_edit libk3b/projects/Makefile.in
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -840,6 +840,7 @@
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
+
 #>+ 3
 k3bgrowisofswriter.moc: $(srcdir)/k3bgrowisofswriter.h
 	$(MOC) $(srcdir)/k3bgrowisofswriter.h -o k3bgrowisofswriter.moc
@@ -909,9 +910,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  libk3b/projects/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  libk3b/projects/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  libk3b/projects/Makefile
+	  $(AUTOMAKE) --foreign  libk3b/projects/Makefile
 	cd $(top_srcdir) && perl admin/am_edit libk3b/projects/Makefile.in
 
 

Modified: kde-extras/k3b/k3b/trunk/libk3b/projects/audiocd/Makefile.in
===================================================================
--- kde-extras/k3b/k3b/trunk/libk3b/projects/audiocd/Makefile.in	2008-03-04 01:08:55 UTC (rev 9558)
+++ kde-extras/k3b/k3b/trunk/libk3b/projects/audiocd/Makefile.in	2008-03-04 01:11:49 UTC (rev 9559)
@@ -421,9 +421,9 @@
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  libk3b/projects/audiocd/Makefile'; \
+#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  libk3b/projects/audiocd/Makefile'; \
 #>- 	cd $(top_srcdir) && \
-#>- 	  $(AUTOMAKE) --gnu  libk3b/projects/audiocd/Makefile
+#>- 	  $(AUTOMAKE) --foreign  libk3b/projects/audiocd/Makefile
 #>+ 12
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
@@ -433,9 +433,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  libk3b/projects/audiocd/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  libk3b/projects/audiocd/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  libk3b/projects/audiocd/Makefile
+	  $(AUTOMAKE) --foreign  libk3b/projects/audiocd/Makefile
 	cd $(top_srcdir) && perl admin/am_edit libk3b/projects/audiocd/Makefile.in
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -719,6 +719,7 @@
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
+
 #>+ 3
 k3baudioimager.moc: $(srcdir)/k3baudioimager.h
 	$(MOC) $(srcdir)/k3baudioimager.h -o k3baudioimager.moc
@@ -727,18 +728,18 @@
 mocs: k3baudioimager.moc
 
 #>+ 3
-k3baudiomaxspeedjob.moc: $(srcdir)/k3baudiomaxspeedjob.h
-	$(MOC) $(srcdir)/k3baudiomaxspeedjob.h -o k3baudiomaxspeedjob.moc
+k3baudionormalizejob.moc: $(srcdir)/k3baudionormalizejob.h
+	$(MOC) $(srcdir)/k3baudionormalizejob.h -o k3baudionormalizejob.moc
 
 #>+ 2
-mocs: k3baudiomaxspeedjob.moc
+mocs: k3baudionormalizejob.moc
 
 #>+ 3
-k3baudionormalizejob.moc: $(srcdir)/k3baudionormalizejob.h
-	$(MOC) $(srcdir)/k3baudionormalizejob.h -o k3baudionormalizejob.moc
+k3baudiomaxspeedjob.moc: $(srcdir)/k3baudiomaxspeedjob.h
+	$(MOC) $(srcdir)/k3baudiomaxspeedjob.h -o k3baudiomaxspeedjob.moc
 
 #>+ 2
-mocs: k3baudionormalizejob.moc
+mocs: k3baudiomaxspeedjob.moc
 
 #>+ 3
 k3baudiojobtempdata.moc: $(srcdir)/k3baudiojobtempdata.h
@@ -763,7 +764,7 @@
 
 #>+ 3
 clean-metasources:
-	-rm -f  k3baudioimager.moc k3baudiomaxspeedjob.moc k3baudionormalizejob.moc k3baudiojobtempdata.moc k3baudiodoc.moc k3baudiojob.moc
+	-rm -f  k3baudioimager.moc k3baudionormalizejob.moc k3baudiomaxspeedjob.moc k3baudiojobtempdata.moc k3baudiodoc.moc k3baudiojob.moc
 
 #>+ 2
 KDE_DIST=k3baudiojobtempdata.h k3baudioimager.h k3baudionormalizejob.h k3baudiomaxspeedjob.h Makefile.in Makefile.am 
@@ -781,9 +782,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  libk3b/projects/audiocd/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  libk3b/projects/audiocd/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  libk3b/projects/audiocd/Makefile
+	  $(AUTOMAKE) --foreign  libk3b/projects/audiocd/Makefile
 	cd $(top_srcdir) && perl admin/am_edit libk3b/projects/audiocd/Makefile.in
 
 
@@ -810,7 +811,7 @@
 
 
 #>+ 11
-libaudio_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/k3baudiojob.cpp $(srcdir)/k3baudiotrack.cpp $(srcdir)/k3baudiodoc.cpp $(srcdir)/k3baudiofile.cpp $(srcdir)/k3baudiozerodata.cpp $(srcdir)/k3baudiodatasource.cpp $(srcdir)/k3baudionormalizejob.cpp $(srcdir)/k3baudiojobtempdata.cpp $(srcdir)/k3baudioimager.cpp $(srcdir)/k3baudiomaxspeedjob.cpp $(srcdir)/k3baudiocdtracksource.cpp $(srcdir)/k3baudiocdtrackdrag.cpp $(srcdir)/k3baudiodatasourceiterator.cpp  k3baudioimager.moc k3baudionormalizejob.moc k3baudiomaxspeedjob.moc k3baudiojobtempdata.moc k3baudiojob.moc k3baudiodoc.moc
+libaudio_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/k3baudiojob.cpp $(srcdir)/k3baudiotrack.cpp $(srcdir)/k3baudiodoc.cpp $(srcdir)/k3baudiofile.cpp $(srcdir)/k3baudiozerodata.cpp $(srcdir)/k3baudiodatasource.cpp $(srcdir)/k3baudionormalizejob.cpp $(srcdir)/k3baudiojobtempdata.cpp $(srcdir)/k3baudioimager.cpp $(srcdir)/k3baudiomaxspeedjob.cpp $(srcdir)/k3baudiocdtracksource.cpp $(srcdir)/k3baudiocdtrackdrag.cpp $(srcdir)/k3baudiodatasourceiterator.cpp  k3baudioimager.moc k3baudiomaxspeedjob.moc k3baudionormalizejob.moc k3baudiojobtempdata.moc k3baudiojob.moc k3baudiodoc.moc
 	@echo 'creating libaudio_la.all_cpp.cpp ...'; \
 	rm -f libaudio_la.all_cpp.files libaudio_la.all_cpp.final; \
 	echo "#define KDE_USE_FINAL 1" >> libaudio_la.all_cpp.final; \

Modified: kde-extras/k3b/k3b/trunk/libk3b/projects/audiocd/k3baudionormalizejob.cpp
===================================================================
--- kde-extras/k3b/k3b/trunk/libk3b/projects/audiocd/k3baudionormalizejob.cpp	2008-03-04 01:08:55 UTC (rev 9558)
+++ kde-extras/k3b/k3b/trunk/libk3b/projects/audiocd/k3baudionormalizejob.cpp	2008-03-04 01:11:49 UTC (rev 9559)
@@ -52,10 +52,10 @@
   connect( m_process, SIGNAL(stderrLine(const QString&)), this, SLOT(slotStdLine(const QString&)) );
   connect( m_process, SIGNAL(processExited(KProcess*)), this, SLOT(slotProcessExited(KProcess*)) );
 
-  const K3bExternalBin* bin = k3bcore->externalBinManager()->binObject( "normalize" );
+  const K3bExternalBin* bin = k3bcore->externalBinManager()->binObject( "normalize-audio" );
 
   if( !bin ) {
-    emit infoMessage( i18n("Could not find normalize executable."), ERROR );
+    emit infoMessage( i18n("Could not find normalize-audio executable."), ERROR );
     jobFinished(false);
     return;
   }
@@ -82,8 +82,8 @@
   if( !m_process->start( KProcess::NotifyOnExit, KProcess::AllOutput ) ) {
     // something went wrong when starting the program
     // it "should" be the executable
-    kdDebug() << "(K3bAudioNormalizeJob) could not start normalize" << endl;
-    emit infoMessage( i18n("Could not start normalize."), K3bJob::ERROR );
+    kdDebug() << "(K3bAudioNormalizeJob) could not start normalize-audio" << endl;
+    emit infoMessage( i18n("Could not start normalize-audio."), K3bJob::ERROR );
     jobFinished(false);
   }
 }
@@ -106,7 +106,7 @@
 
   //  emit newSubTask( i18n("Normalizing track %1 of %2 (%3)").arg(t).arg(tt).arg(m_files.at(t-1)) );
 
-  emit debuggingOutput( "normalize", line );
+  emit debuggingOutput( "normalize-audio", line );
 
   // wenn "% done" drin:
   //    wenn ein --% drin ist, so beginnt ein neuer track
@@ -185,7 +185,7 @@
       break;
     default:
       if( !m_canceled ) {
-	emit infoMessage( i18n("%1 returned an unknown error (code %2).").arg("normalize").arg(p->exitStatus()), 
+	emit infoMessage( i18n("%1 returned an unknown error (code %2).").arg("normalize-audio").arg(p->exitStatus()), 
 			  K3bJob::ERROR );
 	emit infoMessage( i18n("Please send me an email with the last output."), K3bJob::ERROR );
 	emit infoMessage( i18n("Error while normalizing tracks."), ERROR );
@@ -197,7 +197,7 @@
     }
   }
   else {
-    emit infoMessage( i18n("%1 did not exit cleanly.").arg("Normalize"), K3bJob::ERROR );
+    emit infoMessage( i18n("%1 did not exit cleanly.").arg("Normalize-audio"), K3bJob::ERROR );
     jobFinished( false );
   }
 }

Modified: kde-extras/k3b/k3b/trunk/libk3b/projects/datacd/Makefile.in
===================================================================
--- kde-extras/k3b/k3b/trunk/libk3b/projects/datacd/Makefile.in	2008-03-04 01:08:55 UTC (rev 9558)
+++ kde-extras/k3b/k3b/trunk/libk3b/projects/datacd/Makefile.in	2008-03-04 01:11:49 UTC (rev 9559)
@@ -419,9 +419,9 @@
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  libk3b/projects/datacd/Makefile'; \
+#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  libk3b/projects/datacd/Makefile'; \
 #>- 	cd $(top_srcdir) && \
-#>- 	  $(AUTOMAKE) --gnu  libk3b/projects/datacd/Makefile
+#>- 	  $(AUTOMAKE) --foreign  libk3b/projects/datacd/Makefile
 #>+ 12
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
@@ -431,9 +431,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  libk3b/projects/datacd/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  libk3b/projects/datacd/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  libk3b/projects/datacd/Makefile
+	  $(AUTOMAKE) --foreign  libk3b/projects/datacd/Makefile
 	cd $(top_srcdir) && perl admin/am_edit libk3b/projects/datacd/Makefile.in
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -717,6 +717,7 @@
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
+
 #>+ 3
 k3bisoimager.moc: $(srcdir)/k3bisoimager.h
 	$(MOC) $(srcdir)/k3bisoimager.h -o k3bisoimager.moc
@@ -739,25 +740,25 @@
 mocs: k3bdatajob.moc
 
 #>+ 3
-k3bdatadoc.moc: $(srcdir)/k3bdatadoc.h
-	$(MOC) $(srcdir)/k3bdatadoc.h -o k3bdatadoc.moc
+k3bmsinfofetcher.moc: $(srcdir)/k3bmsinfofetcher.h
+	$(MOC) $(srcdir)/k3bmsinfofetcher.h -o k3bmsinfofetcher.moc
 
 #>+ 2
-mocs: k3bdatadoc.moc
+mocs: k3bmsinfofetcher.moc
 
 #>+ 3
-k3bmsinfofetcher.moc: $(srcdir)/k3bmsinfofetcher.h
-	$(MOC) $(srcdir)/k3bmsinfofetcher.h -o k3bmsinfofetcher.moc
+k3bdatadoc.moc: $(srcdir)/k3bdatadoc.h
+	$(MOC) $(srcdir)/k3bdatadoc.h -o k3bdatadoc.moc
 
 #>+ 2
-mocs: k3bmsinfofetcher.moc
+mocs: k3bdatadoc.moc
 
 #>+ 3
 clean-metasources:
-	-rm -f  k3bisoimager.moc k3bdatapreparationjob.moc k3bdatajob.moc k3bdatadoc.moc k3bmsinfofetcher.moc
+	-rm -f  k3bisoimager.moc k3bdatapreparationjob.moc k3bdatajob.moc k3bmsinfofetcher.moc k3bdatadoc.moc
 
 #>+ 2
-KDE_DIST=k3bmsinfofetcher.h k3bsessionimportitem.h k3bfilecompilationsizehandler.h k3bmkisofshandler.h Makefile.in k3bisoimager.h k3bdatapreparationjob.h k3bspecialdataitem.h Makefile.am 
+KDE_DIST=k3bmsinfofetcher.h k3bsessionimportitem.h k3bfilecompilationsizehandler.h k3bmkisofshandler.h k3bisoimager.h Makefile.in k3bdatapreparationjob.h k3bspecialdataitem.h Makefile.am 
 
 #>+ 2
 docs-am:
@@ -772,9 +773,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  libk3b/projects/datacd/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  libk3b/projects/datacd/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  libk3b/projects/datacd/Makefile
+	  $(AUTOMAKE) --foreign  libk3b/projects/datacd/Makefile
 	cd $(top_srcdir) && perl admin/am_edit libk3b/projects/datacd/Makefile.in
 
 
@@ -801,7 +802,7 @@
 
 
 #>+ 11
-libdata_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/k3bdatajob.cpp $(srcdir)/k3bdatadoc.cpp $(srcdir)/k3bdataitem.cpp $(srcdir)/k3bdiritem.cpp $(srcdir)/k3bfileitem.cpp $(srcdir)/k3bisoimager.cpp $(srcdir)/k3bmsinfofetcher.cpp $(srcdir)/k3bbootitem.cpp $(srcdir)/k3bisooptions.cpp $(srcdir)/k3bfilecompilationsizehandler.cpp $(srcdir)/k3bsessionimportitem.cpp $(srcdir)/k3bmkisofshandler.cpp $(srcdir)/k3bdatapreparationjob.cpp  k3bisoimager.moc k3bdatajob.moc k3bdatapreparationjob.moc k3bmsinfofetcher.moc k3bdatadoc.moc
+libdata_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/k3bdatajob.cpp $(srcdir)/k3bdatadoc.cpp $(srcdir)/k3bdataitem.cpp $(srcdir)/k3bdiritem.cpp $(srcdir)/k3bfileitem.cpp $(srcdir)/k3bisoimager.cpp $(srcdir)/k3bmsinfofetcher.cpp $(srcdir)/k3bbootitem.cpp $(srcdir)/k3bisooptions.cpp $(srcdir)/k3bfilecompilationsizehandler.cpp $(srcdir)/k3bsessionimportitem.cpp $(srcdir)/k3bmkisofshandler.cpp $(srcdir)/k3bdatapreparationjob.cpp  k3bisoimager.moc k3bdatajob.moc k3bdatapreparationjob.moc k3bdatadoc.moc k3bmsinfofetcher.moc
 	@echo 'creating libdata_la.all_cpp.cpp ...'; \
 	rm -f libdata_la.all_cpp.files libdata_la.all_cpp.final; \
 	echo "#define KDE_USE_FINAL 1" >> libdata_la.all_cpp.final; \

Modified: kde-extras/k3b/k3b/trunk/libk3b/projects/datacd/k3bisoimager.cpp
===================================================================
--- kde-extras/k3b/k3b/trunk/libk3b/projects/datacd/k3bisoimager.cpp	2008-03-04 01:08:55 UTC (rev 9558)
+++ kde-extras/k3b/k3b/trunk/libk3b/projects/datacd/k3bisoimager.cpp	2008-03-04 01:11:49 UTC (rev 9559)
@@ -199,13 +199,13 @@
 	  // that contain one or more backslashes
 	  // mkisofs 1.14 has the bug, 1.15a40 not
 	  // TODO: find out the version that fixed the bug
-	  if( m_containsFilesWithMultibleBackslashes &&
+	  /*if( m_containsFilesWithMultibleBackslashes &&
 	      !k3bcore->externalBinManager()->binObject( "mkisofs" )->hasFeature( "backslashed_filenames" ) ) {
 	    emit infoMessage( i18n("Due to a bug in mkisofs <= 1.15a40, K3b is unable to handle "
 				   "filenames that contain more than one backslash:"), ERROR );
 
 	    break;
-	  }
+	  }*/
 	  // otherwise just fall through
 
 	default:

Modified: kde-extras/k3b/k3b/trunk/libk3b/projects/datadvd/Makefile.in
===================================================================
--- kde-extras/k3b/k3b/trunk/libk3b/projects/datadvd/Makefile.in	2008-03-04 01:08:55 UTC (rev 9558)
+++ kde-extras/k3b/k3b/trunk/libk3b/projects/datadvd/Makefile.in	2008-03-04 01:11:49 UTC (rev 9559)
@@ -398,9 +398,9 @@
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  libk3b/projects/datadvd/Makefile'; \
+#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  libk3b/projects/datadvd/Makefile'; \
 #>- 	cd $(top_srcdir) && \
-#>- 	  $(AUTOMAKE) --gnu  libk3b/projects/datadvd/Makefile
+#>- 	  $(AUTOMAKE) --foreign  libk3b/projects/datadvd/Makefile
 #>+ 12
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
@@ -410,9 +410,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  libk3b/projects/datadvd/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  libk3b/projects/datadvd/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  libk3b/projects/datadvd/Makefile
+	  $(AUTOMAKE) --foreign  libk3b/projects/datadvd/Makefile
 	cd $(top_srcdir) && perl admin/am_edit libk3b/projects/datadvd/Makefile.in
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -686,6 +686,7 @@
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
+
 #>+ 3
 k3bdvdjob.moc: $(srcdir)/k3bdvdjob.h
 	$(MOC) $(srcdir)/k3bdvdjob.h -o k3bdvdjob.moc
@@ -727,9 +728,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  libk3b/projects/datadvd/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  libk3b/projects/datadvd/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  libk3b/projects/datadvd/Makefile
+	  $(AUTOMAKE) --foreign  libk3b/projects/datadvd/Makefile
 	cd $(top_srcdir) && perl admin/am_edit libk3b/projects/datadvd/Makefile.in
 
 

Modified: kde-extras/k3b/k3b/trunk/libk3b/projects/mixedcd/Makefile.in
===================================================================
--- kde-extras/k3b/k3b/trunk/libk3b/projects/mixedcd/Makefile.in	2008-03-04 01:08:55 UTC (rev 9558)
+++ kde-extras/k3b/k3b/trunk/libk3b/projects/mixedcd/Makefile.in	2008-03-04 01:11:49 UTC (rev 9559)
@@ -400,9 +400,9 @@
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  libk3b/projects/mixedcd/Makefile'; \
+#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  libk3b/projects/mixedcd/Makefile'; \
 #>- 	cd $(top_srcdir) && \
-#>- 	  $(AUTOMAKE) --gnu  libk3b/projects/mixedcd/Makefile
+#>- 	  $(AUTOMAKE) --foreign  libk3b/projects/mixedcd/Makefile
 #>+ 12
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
@@ -412,9 +412,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  libk3b/projects/mixedcd/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  libk3b/projects/mixedcd/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  libk3b/projects/mixedcd/Makefile
+	  $(AUTOMAKE) --foreign  libk3b/projects/mixedcd/Makefile
 	cd $(top_srcdir) && perl admin/am_edit libk3b/projects/mixedcd/Makefile.in
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -687,6 +687,7 @@
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
+
 #>+ 3
 k3bmixedjob.moc: $(srcdir)/k3bmixedjob.h
 	$(MOC) $(srcdir)/k3bmixedjob.h -o k3bmixedjob.moc
@@ -721,9 +722,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  libk3b/projects/mixedcd/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  libk3b/projects/mixedcd/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  libk3b/projects/mixedcd/Makefile
+	  $(AUTOMAKE) --foreign  libk3b/projects/mixedcd/Makefile
 	cd $(top_srcdir) && perl admin/am_edit libk3b/projects/mixedcd/Makefile.in
 
 

Modified: kde-extras/k3b/k3b/trunk/libk3b/projects/movixcd/Makefile.in
===================================================================
--- kde-extras/k3b/k3b/trunk/libk3b/projects/movixcd/Makefile.in	2008-03-04 01:08:55 UTC (rev 9558)
+++ kde-extras/k3b/k3b/trunk/libk3b/projects/movixcd/Makefile.in	2008-03-04 01:11:49 UTC (rev 9559)
@@ -402,9 +402,9 @@
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  libk3b/projects/movixcd/Makefile'; \
+#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  libk3b/projects/movixcd/Makefile'; \
 #>- 	cd $(top_srcdir) && \
-#>- 	  $(AUTOMAKE) --gnu  libk3b/projects/movixcd/Makefile
+#>- 	  $(AUTOMAKE) --foreign  libk3b/projects/movixcd/Makefile
 #>+ 12
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
@@ -414,9 +414,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  libk3b/projects/movixcd/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  libk3b/projects/movixcd/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  libk3b/projects/movixcd/Makefile
+	  $(AUTOMAKE) --foreign  libk3b/projects/movixcd/Makefile
 	cd $(top_srcdir) && perl admin/am_edit libk3b/projects/movixcd/Makefile.in
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -692,6 +692,7 @@
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
+
 #>+ 3
 k3bmovixdocpreparer.moc: $(srcdir)/k3bmovixdocpreparer.h
 	$(MOC) $(srcdir)/k3bmovixdocpreparer.h -o k3bmovixdocpreparer.moc
@@ -733,9 +734,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  libk3b/projects/movixcd/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  libk3b/projects/movixcd/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  libk3b/projects/movixcd/Makefile
+	  $(AUTOMAKE) --foreign  libk3b/projects/movixcd/Makefile
 	cd $(top_srcdir) && perl admin/am_edit libk3b/projects/movixcd/Makefile.in
 
 

Modified: kde-extras/k3b/k3b/trunk/libk3b/projects/movixdvd/Makefile.in
===================================================================
--- kde-extras/k3b/k3b/trunk/libk3b/projects/movixdvd/Makefile.in	2008-03-04 01:08:55 UTC (rev 9558)
+++ kde-extras/k3b/k3b/trunk/libk3b/projects/movixdvd/Makefile.in	2008-03-04 01:11:49 UTC (rev 9559)
@@ -397,9 +397,9 @@
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  libk3b/projects/movixdvd/Makefile'; \
+#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  libk3b/projects/movixdvd/Makefile'; \
 #>- 	cd $(top_srcdir) && \
-#>- 	  $(AUTOMAKE) --gnu  libk3b/projects/movixdvd/Makefile
+#>- 	  $(AUTOMAKE) --foreign  libk3b/projects/movixdvd/Makefile
 #>+ 12
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
@@ -409,9 +409,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  libk3b/projects/movixdvd/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  libk3b/projects/movixdvd/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  libk3b/projects/movixdvd/Makefile
+	  $(AUTOMAKE) --foreign  libk3b/projects/movixdvd/Makefile
 	cd $(top_srcdir) && perl admin/am_edit libk3b/projects/movixdvd/Makefile.in
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -684,6 +684,7 @@
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
+
 #>+ 3
 k3bmovixdvddoc.moc: $(srcdir)/k3bmovixdvddoc.h
 	$(MOC) $(srcdir)/k3bmovixdvddoc.h -o k3bmovixdvddoc.moc
@@ -718,9 +719,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  libk3b/projects/movixdvd/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  libk3b/projects/movixdvd/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  libk3b/projects/movixdvd/Makefile
+	  $(AUTOMAKE) --foreign  libk3b/projects/movixdvd/Makefile
 	cd $(top_srcdir) && perl admin/am_edit libk3b/projects/movixdvd/Makefile.in
 
 

Modified: kde-extras/k3b/k3b/trunk/libk3b/projects/videocd/Makefile.in
===================================================================
--- kde-extras/k3b/k3b/trunk/libk3b/projects/videocd/Makefile.in	2008-03-04 01:08:55 UTC (rev 9558)
+++ kde-extras/k3b/k3b/trunk/libk3b/projects/videocd/Makefile.in	2008-03-04 01:11:49 UTC (rev 9559)
@@ -413,9 +413,9 @@
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  libk3b/projects/videocd/Makefile'; \
+#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  libk3b/projects/videocd/Makefile'; \
 #>- 	cd $(top_srcdir) && \
-#>- 	  $(AUTOMAKE) --gnu  libk3b/projects/videocd/Makefile
+#>- 	  $(AUTOMAKE) --foreign  libk3b/projects/videocd/Makefile
 #>+ 12
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
@@ -425,9 +425,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  libk3b/projects/videocd/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  libk3b/projects/videocd/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  libk3b/projects/videocd/Makefile
+	  $(AUTOMAKE) --foreign  libk3b/projects/videocd/Makefile
 	cd $(top_srcdir) && perl admin/am_edit libk3b/projects/videocd/Makefile.in
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -807,6 +807,7 @@
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
+
 #>+ 3
 k3bvcdjob.moc: $(srcdir)/k3bvcdjob.h
 	$(MOC) $(srcdir)/k3bvcdjob.h -o k3bvcdjob.moc
@@ -841,9 +842,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  libk3b/projects/videocd/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  libk3b/projects/videocd/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  libk3b/projects/videocd/Makefile
+	  $(AUTOMAKE) --foreign  libk3b/projects/videocd/Makefile
 	cd $(top_srcdir) && perl admin/am_edit libk3b/projects/videocd/Makefile.in
 
 

Modified: kde-extras/k3b/k3b/trunk/libk3b/projects/videocd/cdi/Makefile.in
===================================================================
--- kde-extras/k3b/k3b/trunk/libk3b/projects/videocd/cdi/Makefile.in	2008-03-04 01:08:55 UTC (rev 9558)
+++ kde-extras/k3b/k3b/trunk/libk3b/projects/videocd/cdi/Makefile.in	2008-03-04 01:11:49 UTC (rev 9559)
@@ -343,9 +343,9 @@
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  libk3b/projects/videocd/cdi/Makefile'; \
+#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  libk3b/projects/videocd/cdi/Makefile'; \
 #>- 	cd $(top_srcdir) && \
-#>- 	  $(AUTOMAKE) --gnu  libk3b/projects/videocd/cdi/Makefile
+#>- 	  $(AUTOMAKE) --foreign  libk3b/projects/videocd/cdi/Makefile
 #>+ 12
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
@@ -355,9 +355,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  libk3b/projects/videocd/cdi/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  libk3b/projects/videocd/cdi/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  libk3b/projects/videocd/cdi/Makefile
+	  $(AUTOMAKE) --foreign  libk3b/projects/videocd/cdi/Makefile
 	cd $(top_srcdir) && perl admin/am_edit libk3b/projects/videocd/cdi/Makefile.in
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -539,6 +539,7 @@
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
+
 #>+ 2
 KDE_DIST=cdi_text.fnt icdia.htm Makefile.in vcd_on_cdi_41.pdf cdi_vcd.cfg Makefile.am cdi_vcd.app cdi_imag.rtf 
 
@@ -555,9 +556,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  libk3b/projects/videocd/cdi/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  libk3b/projects/videocd/cdi/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  libk3b/projects/videocd/cdi/Makefile
+	  $(AUTOMAKE) --foreign  libk3b/projects/videocd/cdi/Makefile
 	cd $(top_srcdir) && perl admin/am_edit libk3b/projects/videocd/cdi/Makefile.in
 
 

Modified: kde-extras/k3b/k3b/trunk/libk3b/projects/videocd/extra/Makefile.in
===================================================================
--- kde-extras/k3b/k3b/trunk/libk3b/projects/videocd/extra/Makefile.in	2008-03-04 01:08:55 UTC (rev 9558)
+++ kde-extras/k3b/k3b/trunk/libk3b/projects/videocd/extra/Makefile.in	2008-03-04 01:11:49 UTC (rev 9559)
@@ -343,9 +343,9 @@
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  libk3b/projects/videocd/extra/Makefile'; \
+#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  libk3b/projects/videocd/extra/Makefile'; \
 #>- 	cd $(top_srcdir) && \
-#>- 	  $(AUTOMAKE) --gnu  libk3b/projects/videocd/extra/Makefile
+#>- 	  $(AUTOMAKE) --foreign  libk3b/projects/videocd/extra/Makefile
 #>+ 12
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
@@ -355,9 +355,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  libk3b/projects/videocd/extra/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  libk3b/projects/videocd/extra/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  libk3b/projects/videocd/extra/Makefile
+	  $(AUTOMAKE) --foreign  libk3b/projects/videocd/extra/Makefile
 	cd $(top_srcdir) && perl admin/am_edit libk3b/projects/videocd/extra/Makefile.in
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -539,6 +539,7 @@
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
+
 #>+ 2
 KDE_DIST=k3bphotosvcd.mpg k3bphotovcd.mpg Makefile.in Makefile.am 
 
@@ -555,9 +556,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  libk3b/projects/videocd/extra/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  libk3b/projects/videocd/extra/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  libk3b/projects/videocd/extra/Makefile
+	  $(AUTOMAKE) --foreign  libk3b/projects/videocd/extra/Makefile
 	cd $(top_srcdir) && perl admin/am_edit libk3b/projects/videocd/extra/Makefile.in
 
 

Modified: kde-extras/k3b/k3b/trunk/libk3b/projects/videocd/mpeginfo/Makefile.in
===================================================================
--- kde-extras/k3b/k3b/trunk/libk3b/projects/videocd/mpeginfo/Makefile.in	2008-03-04 01:08:55 UTC (rev 9558)
+++ kde-extras/k3b/k3b/trunk/libk3b/projects/videocd/mpeginfo/Makefile.in	2008-03-04 01:11:49 UTC (rev 9559)
@@ -366,9 +366,9 @@
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  libk3b/projects/videocd/mpeginfo/Makefile'; \
+#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  libk3b/projects/videocd/mpeginfo/Makefile'; \
 #>- 	cd $(top_srcdir) && \
-#>- 	  $(AUTOMAKE) --gnu  libk3b/projects/videocd/mpeginfo/Makefile
+#>- 	  $(AUTOMAKE) --foreign  libk3b/projects/videocd/mpeginfo/Makefile
 #>+ 12
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
@@ -378,9 +378,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  libk3b/projects/videocd/mpeginfo/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  libk3b/projects/videocd/mpeginfo/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  libk3b/projects/videocd/mpeginfo/Makefile
+	  $(AUTOMAKE) --foreign  libk3b/projects/videocd/mpeginfo/Makefile
 	cd $(top_srcdir) && perl admin/am_edit libk3b/projects/videocd/mpeginfo/Makefile.in
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -631,6 +631,7 @@
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
+
 #>+ 2
 KDE_DIST=k3bmpeginfo.h Makefile.in Makefile.am 
 
@@ -647,9 +648,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  libk3b/projects/videocd/mpeginfo/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  libk3b/projects/videocd/mpeginfo/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  libk3b/projects/videocd/mpeginfo/Makefile
+	  $(AUTOMAKE) --foreign  libk3b/projects/videocd/mpeginfo/Makefile
 	cd $(top_srcdir) && perl admin/am_edit libk3b/projects/videocd/mpeginfo/Makefile.in
 
 

Modified: kde-extras/k3b/k3b/trunk/libk3b/projects/videodvd/Makefile.in
===================================================================
--- kde-extras/k3b/k3b/trunk/libk3b/projects/videodvd/Makefile.in	2008-03-04 01:08:55 UTC (rev 9558)
+++ kde-extras/k3b/k3b/trunk/libk3b/projects/videodvd/Makefile.in	2008-03-04 01:11:49 UTC (rev 9559)
@@ -398,9 +398,9 @@
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  libk3b/projects/videodvd/Makefile'; \
+#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  libk3b/projects/videodvd/Makefile'; \
 #>- 	cd $(top_srcdir) && \
-#>- 	  $(AUTOMAKE) --gnu  libk3b/projects/videodvd/Makefile
+#>- 	  $(AUTOMAKE) --foreign  libk3b/projects/videodvd/Makefile
 #>+ 12
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
@@ -410,9 +410,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  libk3b/projects/videodvd/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  libk3b/projects/videodvd/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  libk3b/projects/videodvd/Makefile
+	  $(AUTOMAKE) --foreign  libk3b/projects/videodvd/Makefile
 	cd $(top_srcdir) && perl admin/am_edit libk3b/projects/videodvd/Makefile.in
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -686,6 +686,7 @@
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
+
 #>+ 3
 k3bvideodvdimager.moc: $(srcdir)/k3bvideodvdimager.h
 	$(MOC) $(srcdir)/k3bvideodvdimager.h -o k3bvideodvdimager.moc
@@ -720,9 +721,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  libk3b/projects/videodvd/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  libk3b/projects/videodvd/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  libk3b/projects/videodvd/Makefile
+	  $(AUTOMAKE) --foreign  libk3b/projects/videodvd/Makefile
 	cd $(top_srcdir) && perl admin/am_edit libk3b/projects/videodvd/Makefile.in
 
 

Modified: kde-extras/k3b/k3b/trunk/libk3b/scripts/Makefile.in
===================================================================
--- kde-extras/k3b/k3b/trunk/libk3b/scripts/Makefile.in	2008-03-04 01:08:55 UTC (rev 9558)
+++ kde-extras/k3b/k3b/trunk/libk3b/scripts/Makefile.in	2008-03-04 01:11:49 UTC (rev 9559)
@@ -335,9 +335,9 @@
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  libk3b/scripts/Makefile'; \
+#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  libk3b/scripts/Makefile'; \
 #>- 	cd $(top_srcdir) && \
-#>- 	  $(AUTOMAKE) --gnu  libk3b/scripts/Makefile
+#>- 	  $(AUTOMAKE) --foreign  libk3b/scripts/Makefile
 #>+ 12
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
@@ -347,9 +347,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  libk3b/scripts/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  libk3b/scripts/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  libk3b/scripts/Makefile
+	  $(AUTOMAKE) --foreign  libk3b/scripts/Makefile
 	cd $(top_srcdir) && perl admin/am_edit libk3b/scripts/Makefile.in
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -544,6 +544,7 @@
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
+
 #>+ 2
 KDE_DIST=Makefile.in k3b_automount Makefile.am 
 
@@ -560,9 +561,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  libk3b/scripts/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  libk3b/scripts/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  libk3b/scripts/Makefile
+	  $(AUTOMAKE) --foreign  libk3b/scripts/Makefile
 	cd $(top_srcdir) && perl admin/am_edit libk3b/scripts/Makefile.in
 
 

Modified: kde-extras/k3b/k3b/trunk/libk3b/tools/Makefile.in
===================================================================
--- kde-extras/k3b/k3b/trunk/libk3b/tools/Makefile.in	2008-03-04 01:08:55 UTC (rev 9558)
+++ kde-extras/k3b/k3b/trunk/libk3b/tools/Makefile.in	2008-03-04 01:11:49 UTC (rev 9559)
@@ -470,9 +470,9 @@
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  libk3b/tools/Makefile'; \
+#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  libk3b/tools/Makefile'; \
 #>- 	cd $(top_srcdir) && \
-#>- 	  $(AUTOMAKE) --gnu  libk3b/tools/Makefile
+#>- 	  $(AUTOMAKE) --foreign  libk3b/tools/Makefile
 #>+ 12
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
@@ -482,9 +482,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  libk3b/tools/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  libk3b/tools/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  libk3b/tools/Makefile
+	  $(AUTOMAKE) --foreign  libk3b/tools/Makefile
 	cd $(top_srcdir) && perl admin/am_edit libk3b/tools/Makefile.in
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -899,6 +899,7 @@
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
+
 #>+ 3
 k3bcutcombobox.moc: $(srcdir)/k3bcutcombobox.h
 	$(MOC) $(srcdir)/k3bcutcombobox.h -o k3bcutcombobox.moc
@@ -907,18 +908,18 @@
 mocs: k3bcutcombobox.moc
 
 #>+ 3
-k3bdeviceselectiondialog.moc: $(srcdir)/k3bdeviceselectiondialog.h
-	$(MOC) $(srcdir)/k3bdeviceselectiondialog.h -o k3bdeviceselectiondialog.moc
+k3bprogressdialog.moc: $(srcdir)/k3bprogressdialog.h
+	$(MOC) $(srcdir)/k3bprogressdialog.h -o k3bprogressdialog.moc
 
 #>+ 2
-mocs: k3bdeviceselectiondialog.moc
+mocs: k3bprogressdialog.moc
 
 #>+ 3
-k3bprogressdialog.moc: $(srcdir)/k3bprogressdialog.h
-	$(MOC) $(srcdir)/k3bprogressdialog.h -o k3bprogressdialog.moc
+k3bdeviceselectiondialog.moc: $(srcdir)/k3bdeviceselectiondialog.h
+	$(MOC) $(srcdir)/k3bdeviceselectiondialog.h -o k3bdeviceselectiondialog.moc
 
 #>+ 2
-mocs: k3bprogressdialog.moc
+mocs: k3bdeviceselectiondialog.moc
 
 #>+ 3
 k3bradioaction.moc: $(srcdir)/k3bradioaction.h
@@ -942,18 +943,18 @@
 mocs: k3brichtextlabel.moc
 
 #>+ 3
-k3bintmapcombobox.moc: $(srcdir)/k3bintmapcombobox.h
-	$(MOC) $(srcdir)/k3bintmapcombobox.h -o k3bintmapcombobox.moc
+k3blistviewitemanimator.moc: $(srcdir)/k3blistviewitemanimator.h
+	$(MOC) $(srcdir)/k3blistviewitemanimator.h -o k3blistviewitemanimator.moc
 
 #>+ 2
-mocs: k3bintmapcombobox.moc
+mocs: k3blistviewitemanimator.moc
 
 #>+ 3
-k3blistviewitemanimator.moc: $(srcdir)/k3blistviewitemanimator.h
-	$(MOC) $(srcdir)/k3blistviewitemanimator.h -o k3blistviewitemanimator.moc
+k3bintmapcombobox.moc: $(srcdir)/k3bintmapcombobox.h
+	$(MOC) $(srcdir)/k3bintmapcombobox.h -o k3bintmapcombobox.moc
 
 #>+ 2
-mocs: k3blistviewitemanimator.moc
+mocs: k3bintmapcombobox.moc
 
 #>+ 3
 k3blistview.moc: $(srcdir)/k3blistview.h
@@ -1040,22 +1041,22 @@
 mocs: k3btitlelabel.moc
 
 #>+ 3
-k3btoolbox.moc: $(srcdir)/k3btoolbox.h
-	$(MOC) $(srcdir)/k3btoolbox.h -o k3btoolbox.moc
+k3bdevicehandler.moc: $(srcdir)/k3bdevicehandler.h
+	$(MOC) $(srcdir)/k3bdevicehandler.h -o k3bdevicehandler.moc
 
 #>+ 2
-mocs: k3btoolbox.moc
+mocs: k3bdevicehandler.moc
 
 #>+ 3
-k3bdevicehandler.moc: $(srcdir)/k3bdevicehandler.h
-	$(MOC) $(srcdir)/k3bdevicehandler.h -o k3bdevicehandler.moc
+k3btoolbox.moc: $(srcdir)/k3btoolbox.h
+	$(MOC) $(srcdir)/k3btoolbox.h -o k3btoolbox.moc
 
 #>+ 2
-mocs: k3bdevicehandler.moc
+mocs: k3btoolbox.moc
 
 #>+ 3
 clean-metasources:
-	-rm -f  k3bcutcombobox.moc k3bdeviceselectiondialog.moc k3bprogressdialog.moc k3bradioaction.moc k3bdevicecombobox.moc k3brichtextlabel.moc k3bintmapcombobox.moc k3blistviewitemanimator.moc k3blistview.moc k3bbusywidget.moc k3bthreadwidget.moc k3bthroughputestimator.moc k3bdirsizejob.moc k3bsignalwaiter.moc k3bmsfedit.moc k3bmultichoicedialog.moc k3bmd5job.moc kcutlabel.moc k3bpushbutton.moc k3btitlelabel.moc k3btoolbox.moc k3bdevicehandler.moc
+	-rm -f  k3bcutcombobox.moc k3bprogressdialog.moc k3bdeviceselectiondialog.moc k3bradioaction.moc k3bdevicecombobox.moc k3brichtextlabel.moc k3blistviewitemanimator.moc k3bintmapcombobox.moc k3blistview.moc k3bbusywidget.moc k3bthreadwidget.moc k3bthroughputestimator.moc k3bdirsizejob.moc k3bsignalwaiter.moc k3bmsfedit.moc k3bmultichoicedialog.moc k3bmd5job.moc kcutlabel.moc k3bpushbutton.moc k3btitlelabel.moc k3bdevicehandler.moc k3btoolbox.moc
 
 #>+ 2
 KDE_DIST=k3blibdvdcss.h Makefile.in k3btitlelabel.h Makefile.am 
@@ -1073,9 +1074,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  libk3b/tools/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  libk3b/tools/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  libk3b/tools/Makefile
+	  $(AUTOMAKE) --foreign  libk3b/tools/Makefile
 	cd $(top_srcdir) && perl admin/am_edit libk3b/tools/Makefile.in
 
 
@@ -1102,7 +1103,7 @@
 
 
 #>+ 11
-libk3btools_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/k3bwavefilewriter.cpp $(srcdir)/k3bbusywidget.cpp $(srcdir)/k3bdeviceselectiondialog.cpp $(srcdir)/k3bmd5job.cpp $(srcdir)/k3btitlelabel.cpp $(srcdir)/k3bcutcombobox.cpp $(srcdir)/k3bstringutils.cpp $(srcdir)/k3bdevicecombobox.cpp $(srcdir)/kcutlabel.cpp $(srcdir)/k3bstdguiitems.cpp $(srcdir)/k3bvalidators.cpp $(srcdir)/k3bthroughputestimator.cpp $(srcdir)/k3biso9660.cpp $(srcdir)/k3bmultichoicedialog.cpp $(srcdir)/k3bdevicehandler.cpp $(srcdir)/k3bcdparanoialib.cpp $(srcdir)/k3blistview.cpp $(srcdir)/k3bmsfedit.cpp $(srcdir)/k3bcdtextvalidator.cpp $(srcdir)/k3bintvalidator.cpp $(srcdir)/k3bexceptions.cpp $(srcdir)/k3bprogressdialog.cpp $(srcdir)/k3btoolbox.cpp $(srcdir)/k3bpushbutton.cpp $(srcdir)/k3blistviewitemanimator.cpp $(srcdir)/k3bthreadwidget.cpp $(srcdir)/k3bradioaction.cpp $(srcdir)/k3bsignalwaiter.cpp $(srcdir)/k3blibdvdcss.cpp $(srcdir)/k3biso9660backend.cpp $(srcdir)/k3bpipe.cpp $(srcdir)/k3bchecksumpipe.cpp $(srcdir)/k3btoolbutton.cpp $(srcdir)/k3bintmapcombobox.cpp $(srcdir)/k3bdirsizejob.cpp $(srcdir)/k3brichtextlabel.cpp $(srcdir)/k3btempfile.cpp $(srcdir)/k3bactivepipe.cpp $(srcdir)/k3bfilesplitter.cpp $(srcdir)/k3bfilesysteminfo.cpp  k3bcutcombobox.moc k3bprogressdialog.moc k3bdeviceselectiondialog.moc k3bradioaction.moc k3brichtextlabel.moc k3bdevicecombobox.moc k3bintmapcombobox.moc k3blistviewitemanimator.moc k3bthreadwidget.moc k3bbusywidget.moc k3blistview.moc k3bthroughputestimator.moc k3bsignalwaiter.moc k3bdirsizejob.moc k3bmsfedit.moc k3bmultichoicedialog.moc k3bmd5job.moc kcutlabel.moc k3bpushbutton.moc k3btitlelabel.moc k3bdevicehandler.moc k3btoolbox.moc
+libk3btools_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/k3bwavefilewriter.cpp $(srcdir)/k3bbusywidget.cpp $(srcdir)/k3bdeviceselectiondialog.cpp $(srcdir)/k3bmd5job.cpp $(srcdir)/k3btitlelabel.cpp $(srcdir)/k3bcutcombobox.cpp $(srcdir)/k3bstringutils.cpp $(srcdir)/k3bdevicecombobox.cpp $(srcdir)/kcutlabel.cpp $(srcdir)/k3bstdguiitems.cpp $(srcdir)/k3bvalidators.cpp $(srcdir)/k3bthroughputestimator.cpp $(srcdir)/k3biso9660.cpp $(srcdir)/k3bmultichoicedialog.cpp $(srcdir)/k3bdevicehandler.cpp $(srcdir)/k3bcdparanoialib.cpp $(srcdir)/k3blistview.cpp $(srcdir)/k3bmsfedit.cpp $(srcdir)/k3bcdtextvalidator.cpp $(srcdir)/k3bintvalidator.cpp $(srcdir)/k3bexceptions.cpp $(srcdir)/k3bprogressdialog.cpp $(srcdir)/k3btoolbox.cpp $(srcdir)/k3bpushbutton.cpp $(srcdir)/k3blistviewitemanimator.cpp $(srcdir)/k3bthreadwidget.cpp $(srcdir)/k3bradioaction.cpp $(srcdir)/k3bsignalwaiter.cpp $(srcdir)/k3blibdvdcss.cpp $(srcdir)/k3biso9660backend.cpp $(srcdir)/k3bpipe.cpp $(srcdir)/k3bchecksumpipe.cpp $(srcdir)/k3btoolbutton.cpp $(srcdir)/k3bintmapcombobox.cpp $(srcdir)/k3bdirsizejob.cpp $(srcdir)/k3brichtextlabel.cpp $(srcdir)/k3btempfile.cpp $(srcdir)/k3bactivepipe.cpp $(srcdir)/k3bfilesplitter.cpp $(srcdir)/k3bfilesysteminfo.cpp  k3bcutcombobox.moc k3bdeviceselectiondialog.moc k3bprogressdialog.moc k3bradioaction.moc k3brichtextlabel.moc k3bdevicecombobox.moc k3blistviewitemanimator.moc k3bintmapcombobox.moc k3bthreadwidget.moc k3bbusywidget.moc k3blistview.moc k3bthroughputestimator.moc k3bsignalwaiter.moc k3bdirsizejob.moc k3bmsfedit.moc k3bmultichoicedialog.moc k3bmd5job.moc kcutlabel.moc k3bpushbutton.moc k3btitlelabel.moc k3btoolbox.moc k3bdevicehandler.moc
 	@echo 'creating libk3btools_la.all_cpp.cpp ...'; \
 	rm -f libk3btools_la.all_cpp.files libk3btools_la.all_cpp.final; \
 	echo "#define KDE_USE_FINAL 1" >> libk3btools_la.all_cpp.final; \

Modified: kde-extras/k3b/k3b/trunk/libk3b/tools/libisofs/Makefile.in
===================================================================
--- kde-extras/k3b/k3b/trunk/libk3b/tools/libisofs/Makefile.in	2008-03-04 01:08:55 UTC (rev 9558)
+++ kde-extras/k3b/k3b/trunk/libk3b/tools/libisofs/Makefile.in	2008-03-04 01:11:49 UTC (rev 9559)
@@ -367,9 +367,9 @@
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  libk3b/tools/libisofs/Makefile'; \
+#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  libk3b/tools/libisofs/Makefile'; \
 #>- 	cd $(top_srcdir) && \
-#>- 	  $(AUTOMAKE) --gnu  libk3b/tools/libisofs/Makefile
+#>- 	  $(AUTOMAKE) --foreign  libk3b/tools/libisofs/Makefile
 #>+ 12
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
@@ -379,9 +379,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  libk3b/tools/libisofs/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  libk3b/tools/libisofs/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  libk3b/tools/libisofs/Makefile
+	  $(AUTOMAKE) --foreign  libk3b/tools/libisofs/Makefile
 	cd $(top_srcdir) && perl admin/am_edit libk3b/tools/libisofs/Makefile.in
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -632,6 +632,7 @@
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
+
 #>+ 2
 KDE_DIST=el_torito.h bswap.h rock.h iso_fs.h Makefile.in isofs.h Makefile.am 
 
@@ -648,9 +649,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  libk3b/tools/libisofs/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  libk3b/tools/libisofs/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  libk3b/tools/libisofs/Makefile
+	  $(AUTOMAKE) --foreign  libk3b/tools/libisofs/Makefile
 	cd $(top_srcdir) && perl admin/am_edit libk3b/tools/libisofs/Makefile.in
 
 

Modified: kde-extras/k3b/k3b/trunk/libk3b/videodvd/Makefile.in
===================================================================
--- kde-extras/k3b/k3b/trunk/libk3b/videodvd/Makefile.in	2008-03-04 01:08:55 UTC (rev 9558)
+++ kde-extras/k3b/k3b/trunk/libk3b/videodvd/Makefile.in	2008-03-04 01:11:49 UTC (rev 9559)
@@ -397,9 +397,9 @@
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  libk3b/videodvd/Makefile'; \
+#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  libk3b/videodvd/Makefile'; \
 #>- 	cd $(top_srcdir) && \
-#>- 	  $(AUTOMAKE) --gnu  libk3b/videodvd/Makefile
+#>- 	  $(AUTOMAKE) --foreign  libk3b/videodvd/Makefile
 #>+ 12
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
@@ -409,9 +409,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  libk3b/videodvd/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  libk3b/videodvd/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  libk3b/videodvd/Makefile
+	  $(AUTOMAKE) --foreign  libk3b/videodvd/Makefile
 	cd $(top_srcdir) && perl admin/am_edit libk3b/videodvd/Makefile.in
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -685,6 +685,7 @@
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
+
 #>+ 2
 KDE_DIST=configure.in.bot configure.in.in Makefile.in Makefile.am 
 
@@ -701,9 +702,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  libk3b/videodvd/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  libk3b/videodvd/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  libk3b/videodvd/Makefile
+	  $(AUTOMAKE) --foreign  libk3b/videodvd/Makefile
 	cd $(top_srcdir) && perl admin/am_edit libk3b/videodvd/Makefile.in
 
 

Modified: kde-extras/k3b/k3b/trunk/libk3bdevice/Makefile.in
===================================================================
--- kde-extras/k3b/k3b/trunk/libk3bdevice/Makefile.in	2008-03-04 01:08:55 UTC (rev 9558)
+++ kde-extras/k3b/k3b/trunk/libk3bdevice/Makefile.in	2008-03-04 01:11:49 UTC (rev 9559)
@@ -438,9 +438,9 @@
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  libk3bdevice/Makefile'; \
+#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  libk3bdevice/Makefile'; \
 #>- 	cd $(top_srcdir) && \
-#>- 	  $(AUTOMAKE) --gnu  libk3bdevice/Makefile
+#>- 	  $(AUTOMAKE) --foreign  libk3bdevice/Makefile
 #>+ 12
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
@@ -450,9 +450,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  libk3bdevice/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  libk3bdevice/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  libk3bdevice/Makefile
+	  $(AUTOMAKE) --foreign  libk3bdevice/Makefile
 	cd $(top_srcdir) && perl admin/am_edit libk3bdevice/Makefile.in
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -758,6 +758,7 @@
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
+
 #>+ 3
 k3bdevicemanager.moc: $(srcdir)/k3bdevicemanager.h
 	$(MOC) $(srcdir)/k3bdevicemanager.h -o k3bdevicemanager.moc
@@ -777,7 +778,7 @@
 	-rm -f  k3bdevicemanager.moc k3bhalconnection.moc
 
 #>+ 2
-KDE_DIST=configure.in.bot k3bdeviceglobals.cpp k3bscsicommand.h k3bmmc.h k3bscsicommand_bsd.cpp k3bscsicommand_linux.cpp k3bdeviceglobals.h k3bdevice_export.h k3bcrc.h configure.in.in k3btrack.cpp Makefile.in k3bscsicommand_netbsd.cpp Makefile.am libk3bdevice.doxy 
+KDE_DIST=configure.in.bot k3bdeviceglobals.cpp k3bscsicommand.h k3bmmc.h k3bscsicommand_bsd.cpp k3bscsicommand_linux.cpp k3bdeviceglobals.h k3bdevice_export.h k3bcrc.h configure.in.in k3btrack.cpp Makefile.in k3bscsicommand_netbsd.cpp libk3bdevice.doxy Makefile.am 
 
 #>+ 2
 docs-am:
@@ -792,9 +793,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  libk3bdevice/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  libk3bdevice/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  libk3bdevice/Makefile
+	  $(AUTOMAKE) --foreign  libk3bdevice/Makefile
 	cd $(top_srcdir) && perl admin/am_edit libk3bdevice/Makefile.in
 
 

Modified: kde-extras/k3b/k3b/trunk/plugins/Makefile.in
===================================================================
--- kde-extras/k3b/k3b/trunk/plugins/Makefile.in	2008-03-04 01:08:55 UTC (rev 9558)
+++ kde-extras/k3b/k3b/trunk/plugins/Makefile.in	2008-03-04 01:11:49 UTC (rev 9559)
@@ -351,9 +351,9 @@
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  plugins/Makefile'; \
+#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  plugins/Makefile'; \
 #>- 	cd $(top_srcdir) && \
-#>- 	  $(AUTOMAKE) --gnu  plugins/Makefile
+#>- 	  $(AUTOMAKE) --foreign  plugins/Makefile
 #>+ 12
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
@@ -363,9 +363,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  plugins/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  plugins/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  plugins/Makefile
+	  $(AUTOMAKE) --foreign  plugins/Makefile
 	cd $(top_srcdir) && perl admin/am_edit plugins/Makefile.in
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -673,6 +673,7 @@
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
+
 #>+ 2
 KDE_DIST=Makefile.in Makefile.am 
 
@@ -689,9 +690,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  plugins/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  plugins/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  plugins/Makefile
+	  $(AUTOMAKE) --foreign  plugins/Makefile
 	cd $(top_srcdir) && perl admin/am_edit plugins/Makefile.in
 
 

Modified: kde-extras/k3b/k3b/trunk/plugins/audiooutput/Makefile.in
===================================================================
--- kde-extras/k3b/k3b/trunk/plugins/audiooutput/Makefile.in	2008-03-04 01:08:55 UTC (rev 9558)
+++ kde-extras/k3b/k3b/trunk/plugins/audiooutput/Makefile.in	2008-03-04 01:11:49 UTC (rev 9559)
@@ -353,9 +353,9 @@
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  plugins/audiooutput/Makefile'; \
+#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  plugins/audiooutput/Makefile'; \
 #>- 	cd $(top_srcdir) && \
-#>- 	  $(AUTOMAKE) --gnu  plugins/audiooutput/Makefile
+#>- 	  $(AUTOMAKE) --foreign  plugins/audiooutput/Makefile
 #>+ 12
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
@@ -365,9 +365,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  plugins/audiooutput/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  plugins/audiooutput/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  plugins/audiooutput/Makefile
+	  $(AUTOMAKE) --foreign  plugins/audiooutput/Makefile
 	cd $(top_srcdir) && perl admin/am_edit plugins/audiooutput/Makefile.in
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -675,6 +675,7 @@
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
+
 #>+ 2
 KDE_DIST=Makefile.in Makefile.am 
 
@@ -691,9 +692,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  plugins/audiooutput/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  plugins/audiooutput/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  plugins/audiooutput/Makefile
+	  $(AUTOMAKE) --foreign  plugins/audiooutput/Makefile
 	cd $(top_srcdir) && perl admin/am_edit plugins/audiooutput/Makefile.in
 
 

Modified: kde-extras/k3b/k3b/trunk/plugins/audiooutput/alsa/Makefile.in
===================================================================
--- kde-extras/k3b/k3b/trunk/plugins/audiooutput/alsa/Makefile.in	2008-03-04 01:08:55 UTC (rev 9558)
+++ kde-extras/k3b/k3b/trunk/plugins/audiooutput/alsa/Makefile.in	2008-03-04 01:11:49 UTC (rev 9559)
@@ -396,9 +396,9 @@
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  plugins/audiooutput/alsa/Makefile'; \
+#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  plugins/audiooutput/alsa/Makefile'; \
 #>- 	cd $(top_srcdir) && \
-#>- 	  $(AUTOMAKE) --gnu  plugins/audiooutput/alsa/Makefile
+#>- 	  $(AUTOMAKE) --foreign  plugins/audiooutput/alsa/Makefile
 #>+ 12
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
@@ -408,9 +408,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  plugins/audiooutput/alsa/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  plugins/audiooutput/alsa/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  plugins/audiooutput/alsa/Makefile
+	  $(AUTOMAKE) --foreign  plugins/audiooutput/alsa/Makefile
 	cd $(top_srcdir) && perl admin/am_edit plugins/audiooutput/alsa/Makefile.in
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -705,6 +705,7 @@
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
+
 #>+ 3
 k3balsaoutputplugin.moc: $(srcdir)/k3balsaoutputplugin.h
 	$(MOC) $(srcdir)/k3balsaoutputplugin.h -o k3balsaoutputplugin.moc
@@ -732,9 +733,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  plugins/audiooutput/alsa/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  plugins/audiooutput/alsa/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  plugins/audiooutput/alsa/Makefile
+	  $(AUTOMAKE) --foreign  plugins/audiooutput/alsa/Makefile
 	cd $(top_srcdir) && perl admin/am_edit plugins/audiooutput/alsa/Makefile.in
 
 

Modified: kde-extras/k3b/k3b/trunk/plugins/audiooutput/arts/Makefile.in
===================================================================
--- kde-extras/k3b/k3b/trunk/plugins/audiooutput/arts/Makefile.in	2008-03-04 01:08:55 UTC (rev 9558)
+++ kde-extras/k3b/k3b/trunk/plugins/audiooutput/arts/Makefile.in	2008-03-04 01:11:49 UTC (rev 9559)
@@ -393,9 +393,9 @@
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  plugins/audiooutput/arts/Makefile'; \
+#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  plugins/audiooutput/arts/Makefile'; \
 #>- 	cd $(top_srcdir) && \
-#>- 	  $(AUTOMAKE) --gnu  plugins/audiooutput/arts/Makefile
+#>- 	  $(AUTOMAKE) --foreign  plugins/audiooutput/arts/Makefile
 #>+ 12
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
@@ -405,9 +405,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  plugins/audiooutput/arts/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  plugins/audiooutput/arts/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  plugins/audiooutput/arts/Makefile
+	  $(AUTOMAKE) --foreign  plugins/audiooutput/arts/Makefile
 	cd $(top_srcdir) && perl admin/am_edit plugins/audiooutput/arts/Makefile.in
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -702,6 +702,7 @@
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
+
 #>+ 2
 KDE_DIST=k3bartsoutputplugin.h Makefile.in k3bartsoutputplugin.plugin Makefile.am 
 
@@ -718,9 +719,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  plugins/audiooutput/arts/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  plugins/audiooutput/arts/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  plugins/audiooutput/arts/Makefile
+	  $(AUTOMAKE) --foreign  plugins/audiooutput/arts/Makefile
 	cd $(top_srcdir) && perl admin/am_edit plugins/audiooutput/arts/Makefile.in
 
 

Modified: kde-extras/k3b/k3b/trunk/plugins/decoder/Makefile.in
===================================================================
--- kde-extras/k3b/k3b/trunk/plugins/decoder/Makefile.in	2008-03-04 01:08:55 UTC (rev 9558)
+++ kde-extras/k3b/k3b/trunk/plugins/decoder/Makefile.in	2008-03-04 01:11:49 UTC (rev 9559)
@@ -357,9 +357,9 @@
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  plugins/decoder/Makefile'; \
+#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  plugins/decoder/Makefile'; \
 #>- 	cd $(top_srcdir) && \
-#>- 	  $(AUTOMAKE) --gnu  plugins/decoder/Makefile
+#>- 	  $(AUTOMAKE) --foreign  plugins/decoder/Makefile
 #>+ 12
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
@@ -369,9 +369,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  plugins/decoder/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  plugins/decoder/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  plugins/decoder/Makefile
+	  $(AUTOMAKE) --foreign  plugins/decoder/Makefile
 	cd $(top_srcdir) && perl admin/am_edit plugins/decoder/Makefile.in
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -679,6 +679,7 @@
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
+
 #>+ 2
 KDE_DIST=skeleton.cpp skeleton.plugin skeleton.h Makefile.in Makefile.am 
 
@@ -695,9 +696,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  plugins/decoder/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  plugins/decoder/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  plugins/decoder/Makefile
+	  $(AUTOMAKE) --foreign  plugins/decoder/Makefile
 	cd $(top_srcdir) && perl admin/am_edit plugins/decoder/Makefile.in
 
 

Modified: kde-extras/k3b/k3b/trunk/plugins/decoder/ffmpeg/Makefile.in
===================================================================
--- kde-extras/k3b/k3b/trunk/plugins/decoder/ffmpeg/Makefile.in	2008-03-04 01:08:55 UTC (rev 9558)
+++ kde-extras/k3b/k3b/trunk/plugins/decoder/ffmpeg/Makefile.in	2008-03-04 01:11:49 UTC (rev 9559)
@@ -398,9 +398,9 @@
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  plugins/decoder/ffmpeg/Makefile'; \
+#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  plugins/decoder/ffmpeg/Makefile'; \
 #>- 	cd $(top_srcdir) && \
-#>- 	  $(AUTOMAKE) --gnu  plugins/decoder/ffmpeg/Makefile
+#>- 	  $(AUTOMAKE) --foreign  plugins/decoder/ffmpeg/Makefile
 #>+ 12
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
@@ -410,9 +410,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  plugins/decoder/ffmpeg/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  plugins/decoder/ffmpeg/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  plugins/decoder/ffmpeg/Makefile
+	  $(AUTOMAKE) --foreign  plugins/decoder/ffmpeg/Makefile
 	cd $(top_srcdir) && perl admin/am_edit plugins/decoder/ffmpeg/Makefile.in
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -708,6 +708,7 @@
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
+
 #>+ 3
 k3bffmpegdecoder.moc: $(srcdir)/k3bffmpegdecoder.h
 	$(MOC) $(srcdir)/k3bffmpegdecoder.h -o k3bffmpegdecoder.moc
@@ -735,9 +736,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  plugins/decoder/ffmpeg/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  plugins/decoder/ffmpeg/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  plugins/decoder/ffmpeg/Makefile
+	  $(AUTOMAKE) --foreign  plugins/decoder/ffmpeg/Makefile
 	cd $(top_srcdir) && perl admin/am_edit plugins/decoder/ffmpeg/Makefile.in
 
 

Modified: kde-extras/k3b/k3b/trunk/plugins/decoder/flac/Makefile.in
===================================================================
--- kde-extras/k3b/k3b/trunk/plugins/decoder/flac/Makefile.in	2008-03-04 01:08:55 UTC (rev 9558)
+++ kde-extras/k3b/k3b/trunk/plugins/decoder/flac/Makefile.in	2008-03-04 01:11:49 UTC (rev 9559)
@@ -392,9 +392,9 @@
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  plugins/decoder/flac/Makefile'; \
+#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  plugins/decoder/flac/Makefile'; \
 #>- 	cd $(top_srcdir) && \
-#>- 	  $(AUTOMAKE) --gnu  plugins/decoder/flac/Makefile
+#>- 	  $(AUTOMAKE) --foreign  plugins/decoder/flac/Makefile
 #>+ 12
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
@@ -404,9 +404,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  plugins/decoder/flac/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  plugins/decoder/flac/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  plugins/decoder/flac/Makefile
+	  $(AUTOMAKE) --foreign  plugins/decoder/flac/Makefile
 	cd $(top_srcdir) && perl admin/am_edit plugins/decoder/flac/Makefile.in
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -701,6 +701,7 @@
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
+
 #>+ 3
 k3bflacdecoder.moc: $(srcdir)/k3bflacdecoder.h
 	$(MOC) $(srcdir)/k3bflacdecoder.h -o k3bflacdecoder.moc
@@ -728,9 +729,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  plugins/decoder/flac/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  plugins/decoder/flac/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  plugins/decoder/flac/Makefile
+	  $(AUTOMAKE) --foreign  plugins/decoder/flac/Makefile
 	cd $(top_srcdir) && perl admin/am_edit plugins/decoder/flac/Makefile.in
 
 

Modified: kde-extras/k3b/k3b/trunk/plugins/decoder/libsndfile/Makefile.in
===================================================================
--- kde-extras/k3b/k3b/trunk/plugins/decoder/libsndfile/Makefile.in	2008-03-04 01:08:55 UTC (rev 9558)
+++ kde-extras/k3b/k3b/trunk/plugins/decoder/libsndfile/Makefile.in	2008-03-04 01:11:49 UTC (rev 9559)
@@ -395,9 +395,9 @@
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  plugins/decoder/libsndfile/Makefile'; \
+#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  plugins/decoder/libsndfile/Makefile'; \
 #>- 	cd $(top_srcdir) && \
-#>- 	  $(AUTOMAKE) --gnu  plugins/decoder/libsndfile/Makefile
+#>- 	  $(AUTOMAKE) --foreign  plugins/decoder/libsndfile/Makefile
 #>+ 12
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
@@ -407,9 +407,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  plugins/decoder/libsndfile/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  plugins/decoder/libsndfile/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  plugins/decoder/libsndfile/Makefile
+	  $(AUTOMAKE) --foreign  plugins/decoder/libsndfile/Makefile
 	cd $(top_srcdir) && perl admin/am_edit plugins/decoder/libsndfile/Makefile.in
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -704,6 +704,7 @@
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
+
 #>+ 3
 k3blibsndfiledecoder.moc: $(srcdir)/k3blibsndfiledecoder.h
 	$(MOC) $(srcdir)/k3blibsndfiledecoder.h -o k3blibsndfiledecoder.moc
@@ -731,9 +732,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  plugins/decoder/libsndfile/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  plugins/decoder/libsndfile/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  plugins/decoder/libsndfile/Makefile
+	  $(AUTOMAKE) --foreign  plugins/decoder/libsndfile/Makefile
 	cd $(top_srcdir) && perl admin/am_edit plugins/decoder/libsndfile/Makefile.in
 
 

Modified: kde-extras/k3b/k3b/trunk/plugins/decoder/mp3/Makefile.in
===================================================================
--- kde-extras/k3b/k3b/trunk/plugins/decoder/mp3/Makefile.in	2008-03-04 01:08:55 UTC (rev 9558)
+++ kde-extras/k3b/k3b/trunk/plugins/decoder/mp3/Makefile.in	2008-03-04 01:11:49 UTC (rev 9559)
@@ -396,9 +396,9 @@
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  plugins/decoder/mp3/Makefile'; \
+#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  plugins/decoder/mp3/Makefile'; \
 #>- 	cd $(top_srcdir) && \
-#>- 	  $(AUTOMAKE) --gnu  plugins/decoder/mp3/Makefile
+#>- 	  $(AUTOMAKE) --foreign  plugins/decoder/mp3/Makefile
 #>+ 12
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
@@ -408,9 +408,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  plugins/decoder/mp3/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  plugins/decoder/mp3/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  plugins/decoder/mp3/Makefile
+	  $(AUTOMAKE) --foreign  plugins/decoder/mp3/Makefile
 	cd $(top_srcdir) && perl admin/am_edit plugins/decoder/mp3/Makefile.in
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -706,6 +706,7 @@
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
+
 #>+ 3
 k3bmaddecoder.moc: $(srcdir)/k3bmaddecoder.h
 	$(MOC) $(srcdir)/k3bmaddecoder.h -o k3bmaddecoder.moc
@@ -733,9 +734,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  plugins/decoder/mp3/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  plugins/decoder/mp3/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  plugins/decoder/mp3/Makefile
+	  $(AUTOMAKE) --foreign  plugins/decoder/mp3/Makefile
 	cd $(top_srcdir) && perl admin/am_edit plugins/decoder/mp3/Makefile.in
 
 

Modified: kde-extras/k3b/k3b/trunk/plugins/decoder/musepack/Makefile.in
===================================================================
--- kde-extras/k3b/k3b/trunk/plugins/decoder/musepack/Makefile.in	2008-03-04 01:08:55 UTC (rev 9558)
+++ kde-extras/k3b/k3b/trunk/plugins/decoder/musepack/Makefile.in	2008-03-04 01:11:49 UTC (rev 9559)
@@ -399,9 +399,9 @@
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  plugins/decoder/musepack/Makefile'; \
+#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  plugins/decoder/musepack/Makefile'; \
 #>- 	cd $(top_srcdir) && \
-#>- 	  $(AUTOMAKE) --gnu  plugins/decoder/musepack/Makefile
+#>- 	  $(AUTOMAKE) --foreign  plugins/decoder/musepack/Makefile
 #>+ 12
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
@@ -411,9 +411,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  plugins/decoder/musepack/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  plugins/decoder/musepack/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  plugins/decoder/musepack/Makefile
+	  $(AUTOMAKE) --foreign  plugins/decoder/musepack/Makefile
 	cd $(top_srcdir) && perl admin/am_edit plugins/decoder/musepack/Makefile.in
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -709,6 +709,7 @@
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
+
 #>+ 3
 k3bmpcdecoder.moc: $(srcdir)/k3bmpcdecoder.h
 	$(MOC) $(srcdir)/k3bmpcdecoder.h -o k3bmpcdecoder.moc
@@ -736,9 +737,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  plugins/decoder/musepack/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  plugins/decoder/musepack/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  plugins/decoder/musepack/Makefile
+	  $(AUTOMAKE) --foreign  plugins/decoder/musepack/Makefile
 	cd $(top_srcdir) && perl admin/am_edit plugins/decoder/musepack/Makefile.in
 
 

Modified: kde-extras/k3b/k3b/trunk/plugins/decoder/ogg/Makefile.in
===================================================================
--- kde-extras/k3b/k3b/trunk/plugins/decoder/ogg/Makefile.in	2008-03-04 01:08:55 UTC (rev 9558)
+++ kde-extras/k3b/k3b/trunk/plugins/decoder/ogg/Makefile.in	2008-03-04 01:11:49 UTC (rev 9559)
@@ -393,9 +393,9 @@
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  plugins/decoder/ogg/Makefile'; \
+#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  plugins/decoder/ogg/Makefile'; \
 #>- 	cd $(top_srcdir) && \
-#>- 	  $(AUTOMAKE) --gnu  plugins/decoder/ogg/Makefile
+#>- 	  $(AUTOMAKE) --foreign  plugins/decoder/ogg/Makefile
 #>+ 12
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
@@ -405,9 +405,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  plugins/decoder/ogg/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  plugins/decoder/ogg/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  plugins/decoder/ogg/Makefile
+	  $(AUTOMAKE) --foreign  plugins/decoder/ogg/Makefile
 	cd $(top_srcdir) && perl admin/am_edit plugins/decoder/ogg/Makefile.in
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -702,6 +702,7 @@
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
+
 #>+ 3
 k3boggvorbisdecoder.moc: $(srcdir)/k3boggvorbisdecoder.h
 	$(MOC) $(srcdir)/k3boggvorbisdecoder.h -o k3boggvorbisdecoder.moc
@@ -714,7 +715,7 @@
 	-rm -f  k3boggvorbisdecoder.moc
 
 #>+ 2
-KDE_DIST=configure.in.bot k3boggvorbisdecoder.h k3boggvorbisdecoder.plugin configure.in.in Makefile.in Makefile.am 
+KDE_DIST=configure.in.bot k3boggvorbisdecoder.plugin k3boggvorbisdecoder.h configure.in.in Makefile.in Makefile.am 
 
 #>+ 2
 docs-am:
@@ -729,9 +730,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  plugins/decoder/ogg/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  plugins/decoder/ogg/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  plugins/decoder/ogg/Makefile
+	  $(AUTOMAKE) --foreign  plugins/decoder/ogg/Makefile
 	cd $(top_srcdir) && perl admin/am_edit plugins/decoder/ogg/Makefile.in
 
 

Modified: kde-extras/k3b/k3b/trunk/plugins/decoder/wave/Makefile.in
===================================================================
--- kde-extras/k3b/k3b/trunk/plugins/decoder/wave/Makefile.in	2008-03-04 01:08:55 UTC (rev 9558)
+++ kde-extras/k3b/k3b/trunk/plugins/decoder/wave/Makefile.in	2008-03-04 01:11:49 UTC (rev 9559)
@@ -392,9 +392,9 @@
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  plugins/decoder/wave/Makefile'; \
+#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  plugins/decoder/wave/Makefile'; \
 #>- 	cd $(top_srcdir) && \
-#>- 	  $(AUTOMAKE) --gnu  plugins/decoder/wave/Makefile
+#>- 	  $(AUTOMAKE) --foreign  plugins/decoder/wave/Makefile
 #>+ 12
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
@@ -404,9 +404,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  plugins/decoder/wave/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  plugins/decoder/wave/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  plugins/decoder/wave/Makefile
+	  $(AUTOMAKE) --foreign  plugins/decoder/wave/Makefile
 	cd $(top_srcdir) && perl admin/am_edit plugins/decoder/wave/Makefile.in
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -701,6 +701,7 @@
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
+
 #>+ 3
 k3bwavedecoder.moc: $(srcdir)/k3bwavedecoder.h
 	$(MOC) $(srcdir)/k3bwavedecoder.h -o k3bwavedecoder.moc
@@ -728,9 +729,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  plugins/decoder/wave/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  plugins/decoder/wave/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  plugins/decoder/wave/Makefile
+	  $(AUTOMAKE) --foreign  plugins/decoder/wave/Makefile
 	cd $(top_srcdir) && perl admin/am_edit plugins/decoder/wave/Makefile.in
 
 

Modified: kde-extras/k3b/k3b/trunk/plugins/encoder/Makefile.in
===================================================================
--- kde-extras/k3b/k3b/trunk/plugins/encoder/Makefile.in	2008-03-04 01:08:55 UTC (rev 9558)
+++ kde-extras/k3b/k3b/trunk/plugins/encoder/Makefile.in	2008-03-04 01:11:49 UTC (rev 9559)
@@ -353,9 +353,9 @@
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  plugins/encoder/Makefile'; \
+#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  plugins/encoder/Makefile'; \
 #>- 	cd $(top_srcdir) && \
-#>- 	  $(AUTOMAKE) --gnu  plugins/encoder/Makefile
+#>- 	  $(AUTOMAKE) --foreign  plugins/encoder/Makefile
 #>+ 12
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
@@ -365,9 +365,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  plugins/encoder/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  plugins/encoder/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  plugins/encoder/Makefile
+	  $(AUTOMAKE) --foreign  plugins/encoder/Makefile
 	cd $(top_srcdir) && perl admin/am_edit plugins/encoder/Makefile.in
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -675,6 +675,7 @@
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
+
 #>+ 2
 KDE_DIST=skeleton.cpp skeleton.plugin skeleton.h Makefile.in Makefile.am 
 
@@ -691,9 +692,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  plugins/encoder/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  plugins/encoder/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  plugins/encoder/Makefile
+	  $(AUTOMAKE) --foreign  plugins/encoder/Makefile
 	cd $(top_srcdir) && perl admin/am_edit plugins/encoder/Makefile.in
 
 

Modified: kde-extras/k3b/k3b/trunk/plugins/encoder/external/Makefile.in
===================================================================
--- kde-extras/k3b/k3b/trunk/plugins/encoder/external/Makefile.in	2008-03-04 01:08:55 UTC (rev 9558)
+++ kde-extras/k3b/k3b/trunk/plugins/encoder/external/Makefile.in	2008-03-04 01:11:49 UTC (rev 9559)
@@ -407,9 +407,9 @@
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  plugins/encoder/external/Makefile'; \
+#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  plugins/encoder/external/Makefile'; \
 #>- 	cd $(top_srcdir) && \
-#>- 	  $(AUTOMAKE) --gnu  plugins/encoder/external/Makefile
+#>- 	  $(AUTOMAKE) --foreign  plugins/encoder/external/Makefile
 #>+ 12
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
@@ -419,9 +419,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  plugins/encoder/external/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  plugins/encoder/external/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  plugins/encoder/external/Makefile
+	  $(AUTOMAKE) --foreign  plugins/encoder/external/Makefile
 	cd $(top_srcdir) && perl admin/am_edit plugins/encoder/external/Makefile.in
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -718,6 +718,7 @@
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
+
 #>+ 3
 k3bexternalencoder.moc: $(srcdir)/k3bexternalencoder.h
 	$(MOC) $(srcdir)/k3bexternalencoder.h -o k3bexternalencoder.moc
@@ -758,9 +759,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  plugins/encoder/external/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  plugins/encoder/external/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  plugins/encoder/external/Makefile
+	  $(AUTOMAKE) --foreign  plugins/encoder/external/Makefile
 	cd $(top_srcdir) && perl admin/am_edit plugins/encoder/external/Makefile.in
 
 

Modified: kde-extras/k3b/k3b/trunk/plugins/encoder/lame/Makefile.in
===================================================================
--- kde-extras/k3b/k3b/trunk/plugins/encoder/lame/Makefile.in	2008-03-04 01:08:55 UTC (rev 9558)
+++ kde-extras/k3b/k3b/trunk/plugins/encoder/lame/Makefile.in	2008-03-04 01:11:49 UTC (rev 9559)
@@ -402,9 +402,9 @@
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  plugins/encoder/lame/Makefile'; \
+#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  plugins/encoder/lame/Makefile'; \
 #>- 	cd $(top_srcdir) && \
-#>- 	  $(AUTOMAKE) --gnu  plugins/encoder/lame/Makefile
+#>- 	  $(AUTOMAKE) --foreign  plugins/encoder/lame/Makefile
 #>+ 12
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
@@ -414,9 +414,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  plugins/encoder/lame/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  plugins/encoder/lame/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  plugins/encoder/lame/Makefile
+	  $(AUTOMAKE) --foreign  plugins/encoder/lame/Makefile
 	cd $(top_srcdir) && perl admin/am_edit plugins/encoder/lame/Makefile.in
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -711,6 +711,7 @@
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
+
 #>+ 3
 k3blameencoder.moc: $(srcdir)/k3blameencoder.h
 	$(MOC) $(srcdir)/k3blameencoder.h -o k3blameencoder.moc
@@ -744,9 +745,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  plugins/encoder/lame/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  plugins/encoder/lame/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  plugins/encoder/lame/Makefile
+	  $(AUTOMAKE) --foreign  plugins/encoder/lame/Makefile
 	cd $(top_srcdir) && perl admin/am_edit plugins/encoder/lame/Makefile.in
 
 

Modified: kde-extras/k3b/k3b/trunk/plugins/encoder/ogg/Makefile.in
===================================================================
--- kde-extras/k3b/k3b/trunk/plugins/encoder/ogg/Makefile.in	2008-03-04 01:08:55 UTC (rev 9558)
+++ kde-extras/k3b/k3b/trunk/plugins/encoder/ogg/Makefile.in	2008-03-04 01:11:49 UTC (rev 9559)
@@ -400,9 +400,9 @@
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  plugins/encoder/ogg/Makefile'; \
+#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  plugins/encoder/ogg/Makefile'; \
 #>- 	cd $(top_srcdir) && \
-#>- 	  $(AUTOMAKE) --gnu  plugins/encoder/ogg/Makefile
+#>- 	  $(AUTOMAKE) --foreign  plugins/encoder/ogg/Makefile
 #>+ 12
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
@@ -412,9 +412,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  plugins/encoder/ogg/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  plugins/encoder/ogg/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  plugins/encoder/ogg/Makefile
+	  $(AUTOMAKE) --foreign  plugins/encoder/ogg/Makefile
 	cd $(top_srcdir) && perl admin/am_edit plugins/encoder/ogg/Makefile.in
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -709,6 +709,7 @@
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
+
 #>+ 3
 k3boggvorbisencoder.moc: $(srcdir)/k3boggvorbisencoder.h
 	$(MOC) $(srcdir)/k3boggvorbisencoder.h -o k3boggvorbisencoder.moc
@@ -741,9 +742,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  plugins/encoder/ogg/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  plugins/encoder/ogg/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  plugins/encoder/ogg/Makefile
+	  $(AUTOMAKE) --foreign  plugins/encoder/ogg/Makefile
 	cd $(top_srcdir) && perl admin/am_edit plugins/encoder/ogg/Makefile.in
 
 

Modified: kde-extras/k3b/k3b/trunk/plugins/encoder/sox/Makefile.in
===================================================================
--- kde-extras/k3b/k3b/trunk/plugins/encoder/sox/Makefile.in	2008-03-04 01:08:55 UTC (rev 9558)
+++ kde-extras/k3b/k3b/trunk/plugins/encoder/sox/Makefile.in	2008-03-04 01:11:49 UTC (rev 9559)
@@ -397,9 +397,9 @@
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  plugins/encoder/sox/Makefile'; \
+#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  plugins/encoder/sox/Makefile'; \
 #>- 	cd $(top_srcdir) && \
-#>- 	  $(AUTOMAKE) --gnu  plugins/encoder/sox/Makefile
+#>- 	  $(AUTOMAKE) --foreign  plugins/encoder/sox/Makefile
 #>+ 12
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
@@ -409,9 +409,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  plugins/encoder/sox/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  plugins/encoder/sox/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  plugins/encoder/sox/Makefile
+	  $(AUTOMAKE) --foreign  plugins/encoder/sox/Makefile
 	cd $(top_srcdir) && perl admin/am_edit plugins/encoder/sox/Makefile.in
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -706,6 +706,7 @@
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
+
 #>+ 3
 k3bsoxencoder.moc: $(srcdir)/k3bsoxencoder.h
 	$(MOC) $(srcdir)/k3bsoxencoder.h -o k3bsoxencoder.moc
@@ -738,9 +739,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  plugins/encoder/sox/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  plugins/encoder/sox/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  plugins/encoder/sox/Makefile
+	  $(AUTOMAKE) --foreign  plugins/encoder/sox/Makefile
 	cd $(top_srcdir) && perl admin/am_edit plugins/encoder/sox/Makefile.in
 
 

Modified: kde-extras/k3b/k3b/trunk/plugins/encoder/sox/k3bsoxencoder.cpp
===================================================================
--- kde-extras/k3b/k3b/trunk/plugins/encoder/sox/k3bsoxencoder.cpp	2008-03-04 01:08:55 UTC (rev 9558)
+++ kde-extras/k3b/k3b/trunk/plugins/encoder/sox/k3bsoxencoder.cpp	2008-03-04 01:11:49 UTC (rev 9559)
@@ -73,7 +73,7 @@
 
     vp << path << "-h";
     if( vp.start( KProcess::Block, KProcess::AllOutput ) ) {
-      int pos = out.output().find( "sox: SoX Version" );
+      int pos = out.output().find( "sox: SoX v" );
       if ( pos < 0 )
           pos = out.output().find( "sox: SoX v" ); // newer sox versions
       int endPos = out.output().find( "\n", pos );

Modified: kde-extras/k3b/k3b/trunk/plugins/project/Makefile.in
===================================================================
--- kde-extras/k3b/k3b/trunk/plugins/project/Makefile.in	2008-03-04 01:08:55 UTC (rev 9558)
+++ kde-extras/k3b/k3b/trunk/plugins/project/Makefile.in	2008-03-04 01:11:49 UTC (rev 9559)
@@ -351,9 +351,9 @@
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  plugins/project/Makefile'; \
+#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  plugins/project/Makefile'; \
 #>- 	cd $(top_srcdir) && \
-#>- 	  $(AUTOMAKE) --gnu  plugins/project/Makefile
+#>- 	  $(AUTOMAKE) --foreign  plugins/project/Makefile
 #>+ 12
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
@@ -363,9 +363,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  plugins/project/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  plugins/project/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  plugins/project/Makefile
+	  $(AUTOMAKE) --foreign  plugins/project/Makefile
 	cd $(top_srcdir) && perl admin/am_edit plugins/project/Makefile.in
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -673,6 +673,7 @@
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
+
 #>+ 2
 KDE_DIST=Makefile.in Makefile.am 
 
@@ -689,9 +690,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  plugins/project/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  plugins/project/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  plugins/project/Makefile
+	  $(AUTOMAKE) --foreign  plugins/project/Makefile
 	cd $(top_srcdir) && perl admin/am_edit plugins/project/Makefile.in
 
 

Modified: kde-extras/k3b/k3b/trunk/plugins/project/audiometainforenamer/Makefile.in
===================================================================
--- kde-extras/k3b/k3b/trunk/plugins/project/audiometainforenamer/Makefile.in	2008-03-04 01:08:55 UTC (rev 9558)
+++ kde-extras/k3b/k3b/trunk/plugins/project/audiometainforenamer/Makefile.in	2008-03-04 01:11:49 UTC (rev 9559)
@@ -405,9 +405,9 @@
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  plugins/project/audiometainforenamer/Makefile'; \
+#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  plugins/project/audiometainforenamer/Makefile'; \
 #>- 	cd $(top_srcdir) && \
-#>- 	  $(AUTOMAKE) --gnu  plugins/project/audiometainforenamer/Makefile
+#>- 	  $(AUTOMAKE) --foreign  plugins/project/audiometainforenamer/Makefile
 #>+ 12
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
@@ -417,9 +417,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  plugins/project/audiometainforenamer/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  plugins/project/audiometainforenamer/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  plugins/project/audiometainforenamer/Makefile
+	  $(AUTOMAKE) --foreign  plugins/project/audiometainforenamer/Makefile
 	cd $(top_srcdir) && perl admin/am_edit plugins/project/audiometainforenamer/Makefile.in
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -714,6 +714,7 @@
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
+
 #>+ 3
 k3baudiometainforenamerplugin.moc: $(srcdir)/k3baudiometainforenamerplugin.h
 	$(MOC) $(srcdir)/k3baudiometainforenamerplugin.h -o k3baudiometainforenamerplugin.moc
@@ -741,9 +742,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  plugins/project/audiometainforenamer/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  plugins/project/audiometainforenamer/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  plugins/project/audiometainforenamer/Makefile
+	  $(AUTOMAKE) --foreign  plugins/project/audiometainforenamer/Makefile
 	cd $(top_srcdir) && perl admin/am_edit plugins/project/audiometainforenamer/Makefile.in
 
 

Modified: kde-extras/k3b/k3b/trunk/plugins/project/audioprojectcddb/Makefile.in
===================================================================
--- kde-extras/k3b/k3b/trunk/plugins/project/audioprojectcddb/Makefile.in	2008-03-04 01:08:55 UTC (rev 9558)
+++ kde-extras/k3b/k3b/trunk/plugins/project/audioprojectcddb/Makefile.in	2008-03-04 01:11:49 UTC (rev 9559)
@@ -404,9 +404,9 @@
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  plugins/project/audioprojectcddb/Makefile'; \
+#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  plugins/project/audioprojectcddb/Makefile'; \
 #>- 	cd $(top_srcdir) && \
-#>- 	  $(AUTOMAKE) --gnu  plugins/project/audioprojectcddb/Makefile
+#>- 	  $(AUTOMAKE) --foreign  plugins/project/audioprojectcddb/Makefile
 #>+ 12
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
@@ -416,9 +416,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  plugins/project/audioprojectcddb/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  plugins/project/audioprojectcddb/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  plugins/project/audioprojectcddb/Makefile
+	  $(AUTOMAKE) --foreign  plugins/project/audioprojectcddb/Makefile
 	cd $(top_srcdir) && perl admin/am_edit plugins/project/audioprojectcddb/Makefile.in
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -713,6 +713,7 @@
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
+
 #>+ 3
 k3baudioprojectcddbplugin.moc: $(srcdir)/k3baudioprojectcddbplugin.h
 	$(MOC) $(srcdir)/k3baudioprojectcddbplugin.h -o k3baudioprojectcddbplugin.moc
@@ -740,9 +741,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  plugins/project/audioprojectcddb/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  plugins/project/audioprojectcddb/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  plugins/project/audioprojectcddb/Makefile
+	  $(AUTOMAKE) --foreign  plugins/project/audioprojectcddb/Makefile
 	cd $(top_srcdir) && perl admin/am_edit plugins/project/audioprojectcddb/Makefile.in
 
 

Modified: kde-extras/k3b/k3b/trunk/src/Makefile.in
===================================================================
--- kde-extras/k3b/k3b/trunk/src/Makefile.in	2008-03-04 01:08:55 UTC (rev 9558)
+++ kde-extras/k3b/k3b/trunk/src/Makefile.in	2008-03-04 01:11:49 UTC (rev 9559)
@@ -571,9 +571,9 @@
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/Makefile'; \
+#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/Makefile'; \
 #>- 	cd $(top_srcdir) && \
-#>- 	  $(AUTOMAKE) --gnu  src/Makefile
+#>- 	  $(AUTOMAKE) --foreign  src/Makefile
 #>+ 12
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
@@ -583,9 +583,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  src/Makefile
+	  $(AUTOMAKE) --foreign  src/Makefile
 	cd $(top_srcdir) && perl admin/am_edit src/Makefile.in
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -1077,6 +1077,7 @@
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
+
 #>+ 25
 k3binterface.kidl: $(srcdir)/k3binterface.h $(DCOP_DEPENDENCIES)
 	$(DCOPIDL) $(srcdir)/k3binterface.h > k3binterface.kidl || ( rm -f k3binterface.kidl ; false )
@@ -1293,18 +1294,18 @@
 mocs: k3bsidepanel.moc
 
 #>+ 3
-k3bflatbutton.moc: $(srcdir)/k3bflatbutton.h
-	$(MOC) $(srcdir)/k3bflatbutton.h -o k3bflatbutton.moc
+k3bwelcomewidget.moc: $(srcdir)/k3bwelcomewidget.h
+	$(MOC) $(srcdir)/k3bwelcomewidget.h -o k3bwelcomewidget.moc
 
 #>+ 2
-mocs: k3bflatbutton.moc
+mocs: k3bwelcomewidget.moc
 
 #>+ 3
-k3bwelcomewidget.moc: $(srcdir)/k3bwelcomewidget.h
-	$(MOC) $(srcdir)/k3bwelcomewidget.h -o k3bwelcomewidget.moc
+k3bflatbutton.moc: $(srcdir)/k3bflatbutton.h
+	$(MOC) $(srcdir)/k3bflatbutton.h -o k3bflatbutton.moc
 
 #>+ 2
-mocs: k3bwelcomewidget.moc
+mocs: k3bflatbutton.moc
 
 #>+ 3
 k3bthemedheader.moc: $(srcdir)/k3bthemedheader.h
@@ -1321,11 +1322,11 @@
 mocs: k3bprojectmanager.moc
 
 #>+ 3
-k3bmediacontentsview.moc: $(srcdir)/k3bmediacontentsview.h
-	$(MOC) $(srcdir)/k3bmediacontentsview.h -o k3bmediacontentsview.moc
+k3bapplication.moc: $(srcdir)/k3bapplication.h
+	$(MOC) $(srcdir)/k3bapplication.h -o k3bapplication.moc
 
 #>+ 2
-mocs: k3bmediacontentsview.moc
+mocs: k3bapplication.moc
 
 #>+ 3
 k3bdiskinfoview.moc: $(srcdir)/k3bdiskinfoview.h
@@ -1335,18 +1336,18 @@
 mocs: k3bdiskinfoview.moc
 
 #>+ 3
-k3bapplication.moc: $(srcdir)/k3bapplication.h
-	$(MOC) $(srcdir)/k3bapplication.h -o k3bapplication.moc
+k3bwriterselectionwidget.moc: $(srcdir)/k3bwriterselectionwidget.h
+	$(MOC) $(srcdir)/k3bwriterselectionwidget.h -o k3bwriterselectionwidget.moc
 
 #>+ 2
-mocs: k3bapplication.moc
+mocs: k3bwriterselectionwidget.moc
 
 #>+ 3
-k3bwriterselectionwidget.moc: $(srcdir)/k3bwriterselectionwidget.h
-	$(MOC) $(srcdir)/k3bwriterselectionwidget.h -o k3bwriterselectionwidget.moc
+k3bmediacontentsview.moc: $(srcdir)/k3bmediacontentsview.h
+	$(MOC) $(srcdir)/k3bmediacontentsview.h -o k3bmediacontentsview.moc
 
 #>+ 2
-mocs: k3bwriterselectionwidget.moc
+mocs: k3bmediacontentsview.moc
 
 #>+ 3
 k3bappdevicemanager.moc: $(srcdir)/k3bappdevicemanager.h
@@ -1370,6 +1371,13 @@
 mocs: k3bdebuggingoutputdialog.moc
 
 #>+ 3
+k3bwritingmodewidget.moc: $(srcdir)/k3bwritingmodewidget.h
+	$(MOC) $(srcdir)/k3bwritingmodewidget.h -o k3bwritingmodewidget.moc
+
+#>+ 2
+mocs: k3bwritingmodewidget.moc
+
+#>+ 3
 k3bjobprogressdialog.moc: $(srcdir)/k3bjobprogressdialog.h
 	$(MOC) $(srcdir)/k3bjobprogressdialog.h -o k3bjobprogressdialog.moc
 
@@ -1384,13 +1392,6 @@
 mocs: k3bpassivepopup.moc
 
 #>+ 3
-k3bwritingmodewidget.moc: $(srcdir)/k3bwritingmodewidget.h
-	$(MOC) $(srcdir)/k3bwritingmodewidget.h -o k3bwritingmodewidget.moc
-
-#>+ 2
-mocs: k3bwritingmodewidget.moc
-
-#>+ 3
 k3baudioplayer.moc: $(srcdir)/k3baudioplayer.h
 	$(MOC) $(srcdir)/k3baudioplayer.h -o k3baudioplayer.moc
 
@@ -1420,10 +1421,10 @@
 
 #>+ 3
 clean-metasources:
-	-rm -f  k3bmediaselectioncombobox.moc k3bprojecttabwidget.moc k3bburnprogressdialog.moc k3bsystemproblemdialog.moc k3bfiletreecombobox.moc k3bdiroperator.moc k3bwidgetshoweffect.moc k3bstatusbarmanager.moc k3bjobprogressosd.moc k3bcontentsview.moc k3bdebuggingoutputfile.moc k3binteractiondialog.moc k3bthememanager.moc k3bminibutton.moc k3b.moc k3bfileview.moc k3btooltip.moc k3bemptydiscwaiter.moc k3bsplash.moc k3bdatamodewidget.moc k3bthemedlabel.moc k3bfirstrun.moc k3btimeoutwidget.moc k3bmediacache.moc k3bdirview.moc k3bmediaselectiondialog.moc k3bsidepanel.moc k3bflatbutton.moc k3bwelcomewidget.moc k3bthemedheader.moc k3bprojectmanager.moc k3bmediacontentsview.moc k3bdiskinfoview.moc k3bapplication.moc k3bwriterselectionwidget.moc k3bappdevicemanager.moc k3bjobinterface.moc k3bdebuggingoutputdialog.moc k3bjobprogressdialog.moc k3bpassivepopup.moc k3bwritingmodewidget.moc k3baudioplayer.moc k3btempdirselectionwidget.moc k3blsofwrapperdialog.moc k3bfiletreeview.moc
+	-rm -f  k3bmediaselectioncombobox.moc k3bprojecttabwidget.moc k3bburnprogressdialog.moc k3bsystemproblemdialog.moc k3bfiletreecombobox.moc k3bdiroperator.moc k3bwidgetshoweffect.moc k3bstatusbarmanager.moc k3bjobprogressosd.moc k3bcontentsview.moc k3bdebuggingoutputfile.moc k3binteractiondialog.moc k3bthememanager.moc k3bminibutton.moc k3b.moc k3bfileview.moc k3btooltip.moc k3bemptydiscwaiter.moc k3bsplash.moc k3bdatamodewidget.moc k3bthemedlabel.moc k3bfirstrun.moc k3btimeoutwidget.moc k3bmediacache.moc k3bdirview.moc k3bmediaselectiondialog.moc k3bsidepanel.moc k3bwelcomewidget.moc k3bflatbutton.moc k3bthemedheader.moc k3bprojectmanager.moc k3bapplication.moc k3bdiskinfoview.moc k3bwriterselectionwidget.moc k3bmediacontentsview.moc k3bappdevicemanager.moc k3bjobinterface.moc k3bdebuggingoutputdialog.moc k3bwritingmodewidget.moc k3bjobprogressdialog.moc k3bpassivepopup.moc k3baudioplayer.moc k3btempdirselectionwidget.moc k3blsofwrapperdialog.moc k3bfiletreeview.moc
 
 #>+ 2
-KDE_DIST=k3binteractiondialog.h k3bwriterselectionwidget.h k3baudioplayer.h IDEAS k3bfiletreecombobox.h k3bthemedlabel.h k3bwidgetshoweffect.h k3bminibutton.h k3bui.rc k3btrm.h k3bdiroperator.h k3baudioplayer.cpp k3bpassivepopup.h k3binterface.h eventsrc k3bdebuggingoutputfile.h k3bmedium.h k3bapplication.h k3btooltip.h k3bemptydiscwaiter.h k3b-iso.desktop k3bwritingmodewidget.h k3bprojectinterface.h k3bmediaselectioncombobox.h tips k3b-cue.desktop k3bsplash.h k3bcontentsview.h k3bmediacache.h k3btimeoutwidget.h k3b.desktop k3bappdevicemanager.h k3bsystemproblemdialog.h k3b.h k3bdataprojectinterface.h k3bthemedheader.h k3bstatusbarmanager.h k3bflatbutton.h k3bburnprogressdialog.h k3bdiskinfoview.h k3bservicemenuinstaller.h k3bfiletreeview.h k3bjobprogressosd.h k3bjobprogressdialog.h k3bsidepanel.h k3bmusicbrainz.h Makefile.in k3bmixedprojectinterface.h k3bdatamodewidget.h k3bmediacontentsview.h k3bprojectmanager.h k3blsofwrapper.h k3blsofwrapperdialog.h k3bdebuggingoutputdialog.h k3bjobinterface.h k3bfirstrun.h k3btempdirselectionwidget.h k3bprojecttabwidget.h k3bwelcomewidget.h k3bthememanager.h sourceheader k3bfileview.h Makefile.am k3bdirview.h k3baudioprojectinterface.h k3bmediaselectiondialog.h 
+KDE_DIST=k3binteractiondialog.h k3bwriterselectionwidget.h k3baudioplayer.h IDEAS k3bfiletreecombobox.h k3bthemedlabel.h k3bwidgetshoweffect.h k3bminibutton.h k3bui.rc k3btrm.h k3bdiroperator.h k3baudioplayer.cpp k3bpassivepopup.h k3binterface.h eventsrc k3bdebuggingoutputfile.h k3bmedium.h k3bapplication.h k3btooltip.h k3bemptydiscwaiter.h k3b-iso.desktop k3bwritingmodewidget.h k3bprojectinterface.h k3bmediaselectioncombobox.h tips k3b-cue.desktop k3bsplash.h k3bcontentsview.h k3bmediacache.h k3btimeoutwidget.h k3b.desktop k3bappdevicemanager.h k3bsystemproblemdialog.h k3b.h k3bthemedheader.h k3bdataprojectinterface.h k3bstatusbarmanager.h k3bflatbutton.h k3bburnprogressdialog.h k3bdiskinfoview.h k3bservicemenuinstaller.h k3bfiletreeview.h k3bjobprogressosd.h k3bjobprogressdialog.h k3bsidepanel.h k3bmusicbrainz.h Makefile.in k3bmixedprojectinterface.h k3bdatamodewidget.h k3bmediacontentsview.h k3bprojectmanager.h k3blsofwrapper.h k3blsofwrapperdialog.h k3bdebuggingoutputdialog.h k3bjobinterface.h k3bfirstrun.h k3btempdirselectionwidget.h k3bprojecttabwidget.h k3bwelcomewidget.h k3bthememanager.h sourceheader k3bfileview.h Makefile.am k3bdirview.h k3baudioprojectinterface.h k3bmediaselectiondialog.h 
 
 #>+ 9
 clean-idl:
@@ -1448,9 +1449,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  src/Makefile
+	  $(AUTOMAKE) --foreign  src/Makefile
 	cd $(top_srcdir) && perl admin/am_edit src/Makefile.in
 
 
@@ -1477,7 +1478,7 @@
 
 
 #>+ 11
-k3b.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/k3bwelcomewidget.cpp $(srcdir)/k3bapplication.cpp $(srcdir)/k3bdiroperator.cpp $(srcdir)/k3bfiletreeview.cpp $(srcdir)/k3bprojecttabwidget.cpp $(srcdir)/k3bsplash.cpp $(srcdir)/k3bfileview.cpp $(srcdir)/k3bdirview.cpp $(srcdir)/k3b.cpp $(srcdir)/main.cpp $(srcdir)/k3bstatusbarmanager.cpp $(srcdir)/k3bfiletreecombobox.cpp $(srcdir)/k3binterface.cpp $(srcdir)/k3bjobinterface.cpp $(srcdir)/k3bprojectinterface.cpp $(srcdir)/k3bdataprojectinterface.cpp $(srcdir)/k3bsystemproblemdialog.cpp $(srcdir)/k3bmediacontentsview.cpp $(srcdir)/k3bsidepanel.cpp $(srcdir)/k3bcontentsview.cpp $(srcdir)/k3bjobprogressdialog.cpp $(srcdir)/k3bburnprogressdialog.cpp $(srcdir)/k3btempdirselectionwidget.cpp $(srcdir)/k3bdatamodewidget.cpp $(srcdir)/k3bwritingmodewidget.cpp $(srcdir)/k3bwriterselectionwidget.cpp $(srcdir)/k3binteractiondialog.cpp $(srcdir)/k3bthememanager.cpp $(srcdir)/k3bprojectmanager.cpp $(srcdir)/k3btrm.cpp $(srcdir)/k3bmusicbrainz.cpp $(srcdir)/k3baudioprojectinterface.cpp $(srcdir)/k3bmixedprojectinterface.cpp $(srcdir)/k3bflatbutton.cpp $(srcdir)/k3bemptydiscwaiter.cpp $(srcdir)/k3bjobprogressosd.cpp $(srcdir)/k3bdebuggingoutputdialog.cpp $(srcdir)/k3bdebuggingoutputfile.cpp $(srcdir)/k3bappdevicemanager.cpp $(srcdir)/k3bmediacache.cpp $(srcdir)/k3bmedium.cpp $(srcdir)/k3bmediaselectioncombobox.cpp $(srcdir)/k3btooltip.cpp $(srcdir)/k3bwidgetshoweffect.cpp $(srcdir)/k3bmediaselectiondialog.cpp $(srcdir)/k3bdiskinfoview.cpp $(srcdir)/k3bpassivepopup.cpp $(srcdir)/k3btimeoutwidget.cpp $(srcdir)/k3bminibutton.cpp $(srcdir)/k3bthemedheader.cpp $(srcdir)/k3bthemedlabel.cpp $(srcdir)/k3blsofwrapper.cpp $(srcdir)/k3blsofwrapperdialog.cpp $(srcdir)/k3bservicemenuinstaller.cpp $(srcdir)/k3bfirstrun.cpp k3binterface_skel.cpp k3bjobinterface_skel.cpp k3bprojectinterface_skel.cpp k3bdataprojectinterface_skel.cpp k3baudioprojectinterface_skel.cpp k3bmixedprojectinterface_skel.cpp  k3bmediaselectioncombobox.moc k3bprojecttabwidget.moc k3bburnprogressdialog.moc k3bsystemproblemdialog.moc k3bfiletreecombobox.moc k3bdiroperator.moc k3bwidgetshoweffect.moc k3bstatusbarmanager.moc k3bjobprogressosd.moc k3bcontentsview.moc k3bdebuggingoutputfile.moc k3binteractiondialog.moc k3bthememanager.moc k3bminibutton.moc k3b.moc k3bfileview.moc k3btooltip.moc k3bemptydiscwaiter.moc k3bsplash.moc k3bdatamodewidget.moc k3bthemedlabel.moc k3bfirstrun.moc k3btimeoutwidget.moc k3bmediacache.moc k3bdirview.moc k3bmediaselectiondialog.moc k3bsidepanel.moc k3bflatbutton.moc k3bwelcomewidget.moc k3bthemedheader.moc k3bprojectmanager.moc k3bwriterselectionwidget.moc k3bapplication.moc k3bmediacontentsview.moc k3bdiskinfoview.moc k3bjobinterface.moc k3bappdevicemanager.moc k3bdebuggingoutputdialog.moc k3bwritingmodewidget.moc k3bpassivepopup.moc k3bjobprogressdialog.moc k3btempdirselectionwidget.moc k3blsofwrapperdialog.moc k3bfiletreeview.moc
+k3b.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/k3bwelcomewidget.cpp $(srcdir)/k3bapplication.cpp $(srcdir)/k3bdiroperator.cpp $(srcdir)/k3bfiletreeview.cpp $(srcdir)/k3bprojecttabwidget.cpp $(srcdir)/k3bsplash.cpp $(srcdir)/k3bfileview.cpp $(srcdir)/k3bdirview.cpp $(srcdir)/k3b.cpp $(srcdir)/main.cpp $(srcdir)/k3bstatusbarmanager.cpp $(srcdir)/k3bfiletreecombobox.cpp $(srcdir)/k3binterface.cpp $(srcdir)/k3bjobinterface.cpp $(srcdir)/k3bprojectinterface.cpp $(srcdir)/k3bdataprojectinterface.cpp $(srcdir)/k3bsystemproblemdialog.cpp $(srcdir)/k3bmediacontentsview.cpp $(srcdir)/k3bsidepanel.cpp $(srcdir)/k3bcontentsview.cpp $(srcdir)/k3bjobprogressdialog.cpp $(srcdir)/k3bburnprogressdialog.cpp $(srcdir)/k3btempdirselectionwidget.cpp $(srcdir)/k3bdatamodewidget.cpp $(srcdir)/k3bwritingmodewidget.cpp $(srcdir)/k3bwriterselectionwidget.cpp $(srcdir)/k3binteractiondialog.cpp $(srcdir)/k3bthememanager.cpp $(srcdir)/k3bprojectmanager.cpp $(srcdir)/k3btrm.cpp $(srcdir)/k3bmusicbrainz.cpp $(srcdir)/k3baudioprojectinterface.cpp $(srcdir)/k3bmixedprojectinterface.cpp $(srcdir)/k3bflatbutton.cpp $(srcdir)/k3bemptydiscwaiter.cpp $(srcdir)/k3bjobprogressosd.cpp $(srcdir)/k3bdebuggingoutputdialog.cpp $(srcdir)/k3bdebuggingoutputfile.cpp $(srcdir)/k3bappdevicemanager.cpp $(srcdir)/k3bmediacache.cpp $(srcdir)/k3bmedium.cpp $(srcdir)/k3bmediaselectioncombobox.cpp $(srcdir)/k3btooltip.cpp $(srcdir)/k3bwidgetshoweffect.cpp $(srcdir)/k3bmediaselectiondialog.cpp $(srcdir)/k3bdiskinfoview.cpp $(srcdir)/k3bpassivepopup.cpp $(srcdir)/k3btimeoutwidget.cpp $(srcdir)/k3bminibutton.cpp $(srcdir)/k3bthemedheader.cpp $(srcdir)/k3bthemedlabel.cpp $(srcdir)/k3blsofwrapper.cpp $(srcdir)/k3blsofwrapperdialog.cpp $(srcdir)/k3bservicemenuinstaller.cpp $(srcdir)/k3bfirstrun.cpp k3binterface_skel.cpp k3bjobinterface_skel.cpp k3bprojectinterface_skel.cpp k3bdataprojectinterface_skel.cpp k3baudioprojectinterface_skel.cpp k3bmixedprojectinterface_skel.cpp  k3bmediaselectioncombobox.moc k3bprojecttabwidget.moc k3bburnprogressdialog.moc k3bsystemproblemdialog.moc k3bfiletreecombobox.moc k3bdiroperator.moc k3bwidgetshoweffect.moc k3bstatusbarmanager.moc k3bjobprogressosd.moc k3bcontentsview.moc k3bdebuggingoutputfile.moc k3binteractiondialog.moc k3bthememanager.moc k3bminibutton.moc k3b.moc k3bfileview.moc k3btooltip.moc k3bemptydiscwaiter.moc k3bsplash.moc k3bdatamodewidget.moc k3bthemedlabel.moc k3bfirstrun.moc k3btimeoutwidget.moc k3bmediacache.moc k3bdirview.moc k3bmediaselectiondialog.moc k3bsidepanel.moc k3bwelcomewidget.moc k3bflatbutton.moc k3bthemedheader.moc k3bprojectmanager.moc k3bmediacontentsview.moc k3bwriterselectionwidget.moc k3bapplication.moc k3bdiskinfoview.moc k3bjobinterface.moc k3bappdevicemanager.moc k3bdebuggingoutputdialog.moc k3bpassivepopup.moc k3bjobprogressdialog.moc k3bwritingmodewidget.moc k3btempdirselectionwidget.moc k3blsofwrapperdialog.moc k3bfiletreeview.moc
 	@echo 'creating k3b.all_cpp.cpp ...'; \
 	rm -f k3b.all_cpp.files k3b.all_cpp.final; \
 	echo "#define KDE_USE_FINAL 1" >> k3b.all_cpp.final; \

Modified: kde-extras/k3b/k3b/trunk/src/fastscale/Makefile.in
===================================================================
--- kde-extras/k3b/k3b/trunk/src/fastscale/Makefile.in	2008-03-04 01:08:55 UTC (rev 9558)
+++ kde-extras/k3b/k3b/trunk/src/fastscale/Makefile.in	2008-03-04 01:11:49 UTC (rev 9559)
@@ -393,9 +393,9 @@
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/fastscale/Makefile'; \
+#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/fastscale/Makefile'; \
 #>- 	cd $(top_srcdir) && \
-#>- 	  $(AUTOMAKE) --gnu  src/fastscale/Makefile
+#>- 	  $(AUTOMAKE) --foreign  src/fastscale/Makefile
 #>+ 12
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
@@ -405,9 +405,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/fastscale/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/fastscale/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  src/fastscale/Makefile
+	  $(AUTOMAKE) --foreign  src/fastscale/Makefile
 	cd $(top_srcdir) && perl admin/am_edit src/fastscale/Makefile.in
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -680,6 +680,7 @@
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
+
 #>+ 2
 KDE_DIST=scale.h configure.in.in Makefile.in Makefile.am 
 
@@ -696,9 +697,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/fastscale/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/fastscale/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  src/fastscale/Makefile
+	  $(AUTOMAKE) --foreign  src/fastscale/Makefile
 	cd $(top_srcdir) && perl admin/am_edit src/fastscale/Makefile.in
 
 

Modified: kde-extras/k3b/k3b/trunk/src/icons/Makefile.in
===================================================================
--- kde-extras/k3b/k3b/trunk/src/icons/Makefile.in	2008-03-04 01:08:55 UTC (rev 9558)
+++ kde-extras/k3b/k3b/trunk/src/icons/Makefile.in	2008-03-04 01:11:49 UTC (rev 9559)
@@ -352,9 +352,9 @@
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/icons/Makefile'; \
+#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/icons/Makefile'; \
 #>- 	cd $(top_srcdir) && \
-#>- 	  $(AUTOMAKE) --gnu  src/icons/Makefile
+#>- 	  $(AUTOMAKE) --foreign  src/icons/Makefile
 #>+ 12
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
@@ -364,9 +364,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/icons/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/icons/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  src/icons/Makefile
+	  $(AUTOMAKE) --foreign  src/icons/Makefile
 	cd $(top_srcdir) && perl admin/am_edit src/icons/Makefile.in
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -678,6 +678,7 @@
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
+
 #>+ 2
 KDE_DIST=hi48-app-k3b.png hi128-app-k3b.png hi32-app-k3b.png hi64-app-k3b.png Makefile.in hi22-app-k3b.png hi16-app-k3b.png Makefile.am 
 
@@ -686,26 +687,26 @@
 
 #>+ 22
 install-kde-icons:
+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps
+	$(INSTALL_DATA) $(srcdir)/hi64-app-k3b.png $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/k3b.png
 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps
 	$(INSTALL_DATA) $(srcdir)/hi22-app-k3b.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/k3b.png
+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps
+	$(INSTALL_DATA) $(srcdir)/hi128-app-k3b.png $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/k3b.png
 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
 	$(INSTALL_DATA) $(srcdir)/hi32-app-k3b.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/k3b.png
+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
+	$(INSTALL_DATA) $(srcdir)/hi48-app-k3b.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/k3b.png
 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
 	$(INSTALL_DATA) $(srcdir)/hi16-app-k3b.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/k3b.png
-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps
-	$(INSTALL_DATA) $(srcdir)/hi64-app-k3b.png $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/k3b.png
-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps
-	$(INSTALL_DATA) $(srcdir)/hi128-app-k3b.png $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/k3b.png
-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
-	$(INSTALL_DATA) $(srcdir)/hi48-app-k3b.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/k3b.png
 
 uninstall-kde-icons:
+	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/k3b.png
 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/k3b.png
+	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/k3b.png
 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/k3b.png
+	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/k3b.png
 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/k3b.png
-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/k3b.png
-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/k3b.png
-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/k3b.png
 
 #>+ 15
 force-reedit:
@@ -717,9 +718,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/icons/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/icons/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  src/icons/Makefile
+	  $(AUTOMAKE) --foreign  src/icons/Makefile
 	cd $(top_srcdir) && perl admin/am_edit src/icons/Makefile.in
 
 

Modified: kde-extras/k3b/k3b/trunk/src/icons/actions/Makefile.in
===================================================================
--- kde-extras/k3b/k3b/trunk/src/icons/actions/Makefile.in	2008-03-04 01:08:55 UTC (rev 9558)
+++ kde-extras/k3b/k3b/trunk/src/icons/actions/Makefile.in	2008-03-04 01:11:49 UTC (rev 9559)
@@ -332,9 +332,9 @@
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/icons/actions/Makefile'; \
+#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/icons/actions/Makefile'; \
 #>- 	cd $(top_srcdir) && \
-#>- 	  $(AUTOMAKE) --gnu  src/icons/actions/Makefile
+#>- 	  $(AUTOMAKE) --foreign  src/icons/actions/Makefile
 #>+ 12
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
@@ -344,9 +344,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/icons/actions/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/icons/actions/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  src/icons/actions/Makefile
+	  $(AUTOMAKE) --foreign  src/icons/actions/Makefile
 	cd $(top_srcdir) && perl admin/am_edit src/icons/actions/Makefile.in
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -511,195 +511,196 @@
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
+
 #>+ 2
-KDE_DIST=hi22-action-datadvd.png hi22-action-datacd.png cr16-action-greenled.png hi32-action-dvdcopy.png hi22-action-videocd.png hi22-action-cdcopy.png hi16-action-erasecd.png hisc-action-formatdvd.svgz hi22-action-audiocd.png hi64-action-musicbrainz.png hi16-action-musicbrainz.png hi32-action-burn_dvdimage.png hi48-action-videocd.png hi22-action-formatdvd.png hisc-action-mixedcd.svgz hi22-action-burn_dvdimage.png hi32-action-cdcopy.png hi22-action-mp3cd.png hi48-action-videodvd.png hi48-action-burn_dvdimage.png hi32-action-videodvd.png hi32-action-erasecd.png hisc-action-mp3cd.svgz hi32-action-burn_cdimage.png hi48-action-audiocd.png hisc-action-dvdcopy.svgz hi48-action-formatdvd.png hi22-action-cdburn.png hisc-action-videodvd.svgz hi32-action-cdburn.png hi16-action-mp3cd.png hi32-action-datacd.png hi48-action-dvdcopy.png hi16-action-dvdcopy.png hi32-action-formatdvd.png hisc-action-emovix.svgz hisc-action-cdcopy.svgz hi32-action-emovix.png hi48-action-datadvd.png hi32-action-mp3cd.png hi48-action-erasecd.png hi16-action-emovix.png hi48-action-cddarip.png hisc-action-audiocd.svgz cr16-action-redled.png hi32-action-datadvd.png hisc-action-datacd.svgz hi22-action-dvdcopy.png hi16-action-audiocd.png hisc-action-videocd.svgz hi16-action-mixedcd.png hisc-action-cddarip.svgz hi48-action-datacd.png hi22-action-erasecd.png hi16-action-burn_cdimage.png hi32-action-audiocd.png hi16-action-cdburn.png hi48-action-burn_cdimage.png hi22-action-cddarip.png hi16-action-cddarip.png hisc-action-burn_dvdimage.svgz hi48-action-mixedcd.png hi32-action-mixedcd.png hisc-action-burn_cdimage.svgz hi22-action-emovix.png cr16-action-yellowled.png hi16-action-datacd.png hi48-action-mp3cd.png hi48-action-emovix.png hi22-action-burn_cdimage.png hisc-action-datadvd.svgz Makefile.in hi16-action-videodvd.png hi16-action-datadvd.png hi32-action-cddarip.png hisc-action-erasecd.svgz hi16-action-videocd.png hisc-action-cdburn.svgz hi16-action-burn_dvdimage.png hi22-action-videodvd.png hi22-action-mixedcd.png hi32-action-videocd.png hi16-action-formatdvd.png hi16-action-cdcopy.png Makefile.am hi48-action-cdburn.png cr16-action-yellowinfo.png hi48-action-cdcopy.png 
+KDE_DIST=hi22-action-datacd.png hi22-action-datadvd.png cr16-action-greenled.png hi22-action-videocd.png hi32-action-dvdcopy.png hi22-action-cdcopy.png hi16-action-erasecd.png hisc-action-formatdvd.svgz hi22-action-audiocd.png hi64-action-musicbrainz.png hi16-action-musicbrainz.png hi48-action-videocd.png hi32-action-burn_dvdimage.png hi22-action-formatdvd.png hisc-action-mixedcd.svgz hi22-action-burn_dvdimage.png hi32-action-cdcopy.png hi48-action-burn_dvdimage.png hi48-action-videodvd.png hi22-action-mp3cd.png hi32-action-videodvd.png hi32-action-erasecd.png hisc-action-mp3cd.svgz hi32-action-burn_cdimage.png hi48-action-audiocd.png hisc-action-dvdcopy.svgz hi48-action-formatdvd.png hi22-action-cdburn.png hisc-action-videodvd.svgz hi32-action-cdburn.png hi32-action-datacd.png hi16-action-mp3cd.png hi48-action-dvdcopy.png hi16-action-dvdcopy.png hi32-action-formatdvd.png hisc-action-emovix.svgz hisc-action-cdcopy.svgz hi32-action-emovix.png hi48-action-datadvd.png hi48-action-erasecd.png hi32-action-mp3cd.png hi16-action-emovix.png hi48-action-cddarip.png hisc-action-audiocd.svgz hisc-action-datacd.svgz hi32-action-datadvd.png cr16-action-redled.png hi22-action-dvdcopy.png hisc-action-videocd.svgz hi16-action-audiocd.png hi16-action-mixedcd.png hisc-action-cddarip.svgz hi48-action-datacd.png hi22-action-erasecd.png hi16-action-burn_cdimage.png hi32-action-audiocd.png hi48-action-burn_cdimage.png hi16-action-cdburn.png hi22-action-cddarip.png hi16-action-cddarip.png hisc-action-burn_dvdimage.svgz hi48-action-mixedcd.png hi32-action-mixedcd.png hisc-action-burn_cdimage.svgz cr16-action-yellowled.png hi22-action-emovix.png hi16-action-datacd.png hi48-action-mp3cd.png hi48-action-emovix.png hisc-action-datadvd.svgz hi22-action-burn_cdimage.png Makefile.in hi16-action-videodvd.png hi16-action-datadvd.png hi32-action-cddarip.png hisc-action-erasecd.svgz hi16-action-videocd.png hisc-action-cdburn.svgz hi16-action-burn_dvdimage.png hi22-action-videodvd.png hi22-action-mixedcd.png hi32-action-videocd.png hi16-action-formatdvd.png hi16-action-cdcopy.png Makefile.am hi48-action-cdburn.png cr16-action-yellowinfo.png hi48-action-cdcopy.png 
 
 #>+ 2
 docs-am:
 
 #>+ 183
 install-kde-icons:
+	$(mkinstalldirs) $(DESTDIR)$(k3bicondir)/hicolor/scalable/actions
+	$(INSTALL_DATA) $(srcdir)/hisc-action-cdcopy.svgz $(DESTDIR)$(k3bicondir)/hicolor/scalable/actions/cdcopy.svgz
 	$(mkinstalldirs) $(DESTDIR)$(k3bicondir)/hicolor/32x32/actions
-	$(INSTALL_DATA) $(srcdir)/hi32-action-burn_cdimage.png $(DESTDIR)$(k3bicondir)/hicolor/32x32/actions/burn_cdimage.png
-	$(INSTALL_DATA) $(srcdir)/hi32-action-datacd.png $(DESTDIR)$(k3bicondir)/hicolor/32x32/actions/datacd.png
-	$(mkinstalldirs) $(DESTDIR)$(k3bicondir)/hicolor/16x16/actions
-	$(INSTALL_DATA) $(srcdir)/hi16-action-cdcopy.png $(DESTDIR)$(k3bicondir)/hicolor/16x16/actions/cdcopy.png
-	$(mkinstalldirs) $(DESTDIR)$(k3bicondir)/hicolor/48x48/actions
-	$(INSTALL_DATA) $(srcdir)/hi48-action-cdburn.png $(DESTDIR)$(k3bicondir)/hicolor/48x48/actions/cdburn.png
-	$(INSTALL_DATA) $(srcdir)/hi48-action-mixedcd.png $(DESTDIR)$(k3bicondir)/hicolor/48x48/actions/mixedcd.png
-	$(INSTALL_DATA) $(srcdir)/hi48-action-videocd.png $(DESTDIR)$(k3bicondir)/hicolor/48x48/actions/videocd.png
-	$(INSTALL_DATA) $(srcdir)/hi32-action-formatdvd.png $(DESTDIR)$(k3bicondir)/hicolor/32x32/actions/formatdvd.png
-	$(INSTALL_DATA) $(srcdir)/hi16-action-formatdvd.png $(DESTDIR)$(k3bicondir)/hicolor/16x16/actions/formatdvd.png
-	$(INSTALL_DATA) $(srcdir)/hi16-action-musicbrainz.png $(DESTDIR)$(k3bicondir)/hicolor/16x16/actions/musicbrainz.png
+	$(INSTALL_DATA) $(srcdir)/hi32-action-emovix.png $(DESTDIR)$(k3bicondir)/hicolor/32x32/actions/emovix.png
+	$(INSTALL_DATA) $(srcdir)/hi32-action-cdburn.png $(DESTDIR)$(k3bicondir)/hicolor/32x32/actions/cdburn.png
+	$(mkinstalldirs) $(DESTDIR)$(k3bicondir)/hicolor/22x22/actions
+	$(INSTALL_DATA) $(srcdir)/hi22-action-cdburn.png $(DESTDIR)$(k3bicondir)/hicolor/22x22/actions/cdburn.png
 	$(mkinstalldirs) $(DESTDIR)$(k3bicondir)/crystalsvg/16x16/actions
+	$(INSTALL_DATA) $(srcdir)/cr16-action-redled.png $(DESTDIR)$(k3bicondir)/crystalsvg/16x16/actions/redled.png
+	$(INSTALL_DATA) $(srcdir)/hi32-action-burn_dvdimage.png $(DESTDIR)$(k3bicondir)/hicolor/32x32/actions/burn_dvdimage.png
+	$(INSTALL_DATA) $(srcdir)/hi22-action-burn_cdimage.png $(DESTDIR)$(k3bicondir)/hicolor/22x22/actions/burn_cdimage.png
 	$(INSTALL_DATA) $(srcdir)/cr16-action-greenled.png $(DESTDIR)$(k3bicondir)/crystalsvg/16x16/actions/greenled.png
-	$(mkinstalldirs) $(DESTDIR)$(k3bicondir)/hicolor/scalable/actions
-	$(INSTALL_DATA) $(srcdir)/hisc-action-burn_dvdimage.svgz $(DESTDIR)$(k3bicondir)/hicolor/scalable/actions/burn_dvdimage.svgz
-	$(INSTALL_DATA) $(srcdir)/hisc-action-mp3cd.svgz $(DESTDIR)$(k3bicondir)/hicolor/scalable/actions/mp3cd.svgz
-	$(INSTALL_DATA) $(srcdir)/cr16-action-yellowinfo.png $(DESTDIR)$(k3bicondir)/crystalsvg/16x16/actions/yellowinfo.png
-	$(INSTALL_DATA) $(srcdir)/hi48-action-formatdvd.png $(DESTDIR)$(k3bicondir)/hicolor/48x48/actions/formatdvd.png
-	$(INSTALL_DATA) $(srcdir)/hisc-action-datadvd.svgz $(DESTDIR)$(k3bicondir)/hicolor/scalable/actions/datadvd.svgz
-	$(INSTALL_DATA) $(srcdir)/hisc-action-emovix.svgz $(DESTDIR)$(k3bicondir)/hicolor/scalable/actions/emovix.svgz
-	$(mkinstalldirs) $(DESTDIR)$(k3bicondir)/hicolor/22x22/actions
-	$(INSTALL_DATA) $(srcdir)/hi22-action-videodvd.png $(DESTDIR)$(k3bicondir)/hicolor/22x22/actions/videodvd.png
-	$(INSTALL_DATA) $(srcdir)/cr16-action-yellowled.png $(DESTDIR)$(k3bicondir)/crystalsvg/16x16/actions/yellowled.png
-	$(INSTALL_DATA) $(srcdir)/hi22-action-emovix.png $(DESTDIR)$(k3bicondir)/hicolor/22x22/actions/emovix.png
-	$(INSTALL_DATA) $(srcdir)/hisc-action-cdcopy.svgz $(DESTDIR)$(k3bicondir)/hicolor/scalable/actions/cdcopy.svgz
-	$(INSTALL_DATA) $(srcdir)/hi48-action-cddarip.png $(DESTDIR)$(k3bicondir)/hicolor/48x48/actions/cddarip.png
-	$(INSTALL_DATA) $(srcdir)/hi32-action-cdburn.png $(DESTDIR)$(k3bicondir)/hicolor/32x32/actions/cdburn.png
-	$(INSTALL_DATA) $(srcdir)/hi48-action-erasecd.png $(DESTDIR)$(k3bicondir)/hicolor/48x48/actions/erasecd.png
-	$(INSTALL_DATA) $(srcdir)/hi48-action-datadvd.png $(DESTDIR)$(k3bicondir)/hicolor/48x48/actions/datadvd.png
-	$(INSTALL_DATA) $(srcdir)/hi48-action-dvdcopy.png $(DESTDIR)$(k3bicondir)/hicolor/48x48/actions/dvdcopy.png
-	$(INSTALL_DATA) $(srcdir)/hi22-action-datacd.png $(DESTDIR)$(k3bicondir)/hicolor/22x22/actions/datacd.png
-	$(INSTALL_DATA) $(srcdir)/hi48-action-burn_cdimage.png $(DESTDIR)$(k3bicondir)/hicolor/48x48/actions/burn_cdimage.png
-	$(INSTALL_DATA) $(srcdir)/hi48-action-cdcopy.png $(DESTDIR)$(k3bicondir)/hicolor/48x48/actions/cdcopy.png
+	$(INSTALL_DATA) $(srcdir)/hi32-action-mp3cd.png $(DESTDIR)$(k3bicondir)/hicolor/32x32/actions/mp3cd.png
+	$(mkinstalldirs) $(DESTDIR)$(k3bicondir)/hicolor/48x48/actions
+	$(INSTALL_DATA) $(srcdir)/hi48-action-datacd.png $(DESTDIR)$(k3bicondir)/hicolor/48x48/actions/datacd.png
+	$(INSTALL_DATA) $(srcdir)/hi32-action-mixedcd.png $(DESTDIR)$(k3bicondir)/hicolor/32x32/actions/mixedcd.png
+	$(mkinstalldirs) $(DESTDIR)$(k3bicondir)/hicolor/16x16/actions
+	$(INSTALL_DATA) $(srcdir)/hi16-action-mp3cd.png $(DESTDIR)$(k3bicondir)/hicolor/16x16/actions/mp3cd.png
 	$(INSTALL_DATA) $(srcdir)/hisc-action-videodvd.svgz $(DESTDIR)$(k3bicondir)/hicolor/scalable/actions/videodvd.svgz
 	$(INSTALL_DATA) $(srcdir)/hisc-action-dvdcopy.svgz $(DESTDIR)$(k3bicondir)/hicolor/scalable/actions/dvdcopy.svgz
+	$(INSTALL_DATA) $(srcdir)/hi32-action-cdcopy.png $(DESTDIR)$(k3bicondir)/hicolor/32x32/actions/cdcopy.png
+	$(INSTALL_DATA) $(srcdir)/hi32-action-erasecd.png $(DESTDIR)$(k3bicondir)/hicolor/32x32/actions/erasecd.png
+	$(mkinstalldirs) $(DESTDIR)$(k3bicondir)/hicolor/64x64/actions
+	$(INSTALL_DATA) $(srcdir)/hi64-action-musicbrainz.png $(DESTDIR)$(k3bicondir)/hicolor/64x64/actions/musicbrainz.png
 	$(INSTALL_DATA) $(srcdir)/hisc-action-mixedcd.svgz $(DESTDIR)$(k3bicondir)/hicolor/scalable/actions/mixedcd.svgz
-	$(INSTALL_DATA) $(srcdir)/hisc-action-videocd.svgz $(DESTDIR)$(k3bicondir)/hicolor/scalable/actions/videocd.svgz
-	$(INSTALL_DATA) $(srcdir)/hi32-action-videodvd.png $(DESTDIR)$(k3bicondir)/hicolor/32x32/actions/videodvd.png
-	$(INSTALL_DATA) $(srcdir)/hi32-action-mp3cd.png $(DESTDIR)$(k3bicondir)/hicolor/32x32/actions/mp3cd.png
-	$(INSTALL_DATA) $(srcdir)/hi32-action-burn_dvdimage.png $(DESTDIR)$(k3bicondir)/hicolor/32x32/actions/burn_dvdimage.png
-	$(INSTALL_DATA) $(srcdir)/hisc-action-datacd.svgz $(DESTDIR)$(k3bicondir)/hicolor/scalable/actions/datacd.svgz
+	$(INSTALL_DATA) $(srcdir)/hi16-action-cdcopy.png $(DESTDIR)$(k3bicondir)/hicolor/16x16/actions/cdcopy.png
+	$(INSTALL_DATA) $(srcdir)/hi32-action-burn_cdimage.png $(DESTDIR)$(k3bicondir)/hicolor/32x32/actions/burn_cdimage.png
+	$(INSTALL_DATA) $(srcdir)/hi48-action-cddarip.png $(DESTDIR)$(k3bicondir)/hicolor/48x48/actions/cddarip.png
+	$(INSTALL_DATA) $(srcdir)/hi32-action-dvdcopy.png $(DESTDIR)$(k3bicondir)/hicolor/32x32/actions/dvdcopy.png
+	$(INSTALL_DATA) $(srcdir)/hi32-action-videocd.png $(DESTDIR)$(k3bicondir)/hicolor/32x32/actions/videocd.png
+	$(INSTALL_DATA) $(srcdir)/hi32-action-audiocd.png $(DESTDIR)$(k3bicondir)/hicolor/32x32/actions/audiocd.png
 	$(INSTALL_DATA) $(srcdir)/hi16-action-burn_dvdimage.png $(DESTDIR)$(k3bicondir)/hicolor/16x16/actions/burn_dvdimage.png
-	$(INSTALL_DATA) $(srcdir)/hi16-action-mp3cd.png $(DESTDIR)$(k3bicondir)/hicolor/16x16/actions/mp3cd.png
-	$(INSTALL_DATA) $(srcdir)/hi16-action-emovix.png $(DESTDIR)$(k3bicondir)/hicolor/16x16/actions/emovix.png
-	$(INSTALL_DATA) $(srcdir)/hi22-action-videocd.png $(DESTDIR)$(k3bicondir)/hicolor/22x22/actions/videocd.png
-	$(INSTALL_DATA) $(srcdir)/hi22-action-mixedcd.png $(DESTDIR)$(k3bicondir)/hicolor/22x22/actions/mixedcd.png
-	$(INSTALL_DATA) $(srcdir)/hi22-action-cdburn.png $(DESTDIR)$(k3bicondir)/hicolor/22x22/actions/cdburn.png
-	$(INSTALL_DATA) $(srcdir)/hi48-action-burn_dvdimage.png $(DESTDIR)$(k3bicondir)/hicolor/48x48/actions/burn_dvdimage.png
-	$(INSTALL_DATA) $(srcdir)/hi32-action-videocd.png $(DESTDIR)$(k3bicondir)/hicolor/32x32/actions/videocd.png
-	$(INSTALL_DATA) $(srcdir)/hi32-action-mixedcd.png $(DESTDIR)$(k3bicondir)/hicolor/32x32/actions/mixedcd.png
-	$(INSTALL_DATA) $(srcdir)/hi48-action-mp3cd.png $(DESTDIR)$(k3bicondir)/hicolor/48x48/actions/mp3cd.png
-	$(INSTALL_DATA) $(srcdir)/hi48-action-audiocd.png $(DESTDIR)$(k3bicondir)/hicolor/48x48/actions/audiocd.png
-	$(INSTALL_DATA) $(srcdir)/hi16-action-mixedcd.png $(DESTDIR)$(k3bicondir)/hicolor/16x16/actions/mixedcd.png
-	$(INSTALL_DATA) $(srcdir)/hi16-action-videocd.png $(DESTDIR)$(k3bicondir)/hicolor/16x16/actions/videocd.png
-	$(INSTALL_DATA) $(srcdir)/hi32-action-cdcopy.png $(DESTDIR)$(k3bicondir)/hicolor/32x32/actions/cdcopy.png
+	$(INSTALL_DATA) $(srcdir)/hisc-action-cdburn.svgz $(DESTDIR)$(k3bicondir)/hicolor/scalable/actions/cdburn.svgz
+	$(INSTALL_DATA) $(srcdir)/hi16-action-audiocd.png $(DESTDIR)$(k3bicondir)/hicolor/16x16/actions/audiocd.png
 	$(INSTALL_DATA) $(srcdir)/hi16-action-burn_cdimage.png $(DESTDIR)$(k3bicondir)/hicolor/16x16/actions/burn_cdimage.png
-	$(INSTALL_DATA) $(srcdir)/hi16-action-datacd.png $(DESTDIR)$(k3bicondir)/hicolor/16x16/actions/datacd.png
-	$(INSTALL_DATA) $(srcdir)/hi22-action-formatdvd.png $(DESTDIR)$(k3bicondir)/hicolor/22x22/actions/formatdvd.png
-	$(mkinstalldirs) $(DESTDIR)$(k3bicondir)/hicolor/64x64/actions
-	$(INSTALL_DATA) $(srcdir)/hi64-action-musicbrainz.png $(DESTDIR)$(k3bicondir)/hicolor/64x64/actions/musicbrainz.png
-	$(INSTALL_DATA) $(srcdir)/hisc-action-audiocd.svgz $(DESTDIR)$(k3bicondir)/hicolor/scalable/actions/audiocd.svgz
-	$(INSTALL_DATA) $(srcdir)/hi22-action-erasecd.png $(DESTDIR)$(k3bicondir)/hicolor/22x22/actions/erasecd.png
+	$(INSTALL_DATA) $(srcdir)/hi22-action-dvdcopy.png $(DESTDIR)$(k3bicondir)/hicolor/22x22/actions/dvdcopy.png
+	$(INSTALL_DATA) $(srcdir)/hi48-action-videocd.png $(DESTDIR)$(k3bicondir)/hicolor/48x48/actions/videocd.png
+	$(INSTALL_DATA) $(srcdir)/hisc-action-cddarip.svgz $(DESTDIR)$(k3bicondir)/hicolor/scalable/actions/cddarip.svgz
+	$(INSTALL_DATA) $(srcdir)/hi22-action-emovix.png $(DESTDIR)$(k3bicondir)/hicolor/22x22/actions/emovix.png
 	$(INSTALL_DATA) $(srcdir)/hi22-action-cddarip.png $(DESTDIR)$(k3bicondir)/hicolor/22x22/actions/cddarip.png
-	$(INSTALL_DATA) $(srcdir)/hisc-action-burn_cdimage.svgz $(DESTDIR)$(k3bicondir)/hicolor/scalable/actions/burn_cdimage.svgz
-	$(INSTALL_DATA) $(srcdir)/hi32-action-erasecd.png $(DESTDIR)$(k3bicondir)/hicolor/32x32/actions/erasecd.png
-	$(INSTALL_DATA) $(srcdir)/hi32-action-cddarip.png $(DESTDIR)$(k3bicondir)/hicolor/32x32/actions/cddarip.png
+	$(INSTALL_DATA) $(srcdir)/hi16-action-dvdcopy.png $(DESTDIR)$(k3bicondir)/hicolor/16x16/actions/dvdcopy.png
+	$(INSTALL_DATA) $(srcdir)/hi48-action-erasecd.png $(DESTDIR)$(k3bicondir)/hicolor/48x48/actions/erasecd.png
 	$(INSTALL_DATA) $(srcdir)/hi22-action-datadvd.png $(DESTDIR)$(k3bicondir)/hicolor/22x22/actions/datadvd.png
-	$(INSTALL_DATA) $(srcdir)/hi32-action-datadvd.png $(DESTDIR)$(k3bicondir)/hicolor/32x32/actions/datadvd.png
-	$(INSTALL_DATA) $(srcdir)/hi22-action-dvdcopy.png $(DESTDIR)$(k3bicondir)/hicolor/22x22/actions/dvdcopy.png
-	$(INSTALL_DATA) $(srcdir)/hi32-action-dvdcopy.png $(DESTDIR)$(k3bicondir)/hicolor/32x32/actions/dvdcopy.png
-	$(INSTALL_DATA) $(srcdir)/hi16-action-erasecd.png $(DESTDIR)$(k3bicondir)/hicolor/16x16/actions/erasecd.png
 	$(INSTALL_DATA) $(srcdir)/hi16-action-cddarip.png $(DESTDIR)$(k3bicondir)/hicolor/16x16/actions/cddarip.png
+	$(INSTALL_DATA) $(srcdir)/hisc-action-emovix.svgz $(DESTDIR)$(k3bicondir)/hicolor/scalable/actions/emovix.svgz
+	$(INSTALL_DATA) $(srcdir)/hisc-action-videocd.svgz $(DESTDIR)$(k3bicondir)/hicolor/scalable/actions/videocd.svgz
+	$(INSTALL_DATA) $(srcdir)/hi48-action-mp3cd.png $(DESTDIR)$(k3bicondir)/hicolor/48x48/actions/mp3cd.png
 	$(INSTALL_DATA) $(srcdir)/hi16-action-datadvd.png $(DESTDIR)$(k3bicondir)/hicolor/16x16/actions/datadvd.png
-	$(INSTALL_DATA) $(srcdir)/hi16-action-dvdcopy.png $(DESTDIR)$(k3bicondir)/hicolor/16x16/actions/dvdcopy.png
-	$(INSTALL_DATA) $(srcdir)/hi48-action-videodvd.png $(DESTDIR)$(k3bicondir)/hicolor/48x48/actions/videodvd.png
-	$(INSTALL_DATA) $(srcdir)/hisc-action-formatdvd.svgz $(DESTDIR)$(k3bicondir)/hicolor/scalable/actions/formatdvd.svgz
+	$(INSTALL_DATA) $(srcdir)/cr16-action-yellowled.png $(DESTDIR)$(k3bicondir)/crystalsvg/16x16/actions/yellowled.png
+	$(INSTALL_DATA) $(srcdir)/hi32-action-cddarip.png $(DESTDIR)$(k3bicondir)/hicolor/32x32/actions/cddarip.png
+	$(INSTALL_DATA) $(srcdir)/hi22-action-mixedcd.png $(DESTDIR)$(k3bicondir)/hicolor/22x22/actions/mixedcd.png
+	$(INSTALL_DATA) $(srcdir)/hi16-action-datacd.png $(DESTDIR)$(k3bicondir)/hicolor/16x16/actions/datacd.png
 	$(INSTALL_DATA) $(srcdir)/hi48-action-emovix.png $(DESTDIR)$(k3bicondir)/hicolor/48x48/actions/emovix.png
-	$(INSTALL_DATA) $(srcdir)/hi22-action-burn_cdimage.png $(DESTDIR)$(k3bicondir)/hicolor/22x22/actions/burn_cdimage.png
+	$(INSTALL_DATA) $(srcdir)/hi32-action-formatdvd.png $(DESTDIR)$(k3bicondir)/hicolor/32x32/actions/formatdvd.png
+	$(INSTALL_DATA) $(srcdir)/hi16-action-emovix.png $(DESTDIR)$(k3bicondir)/hicolor/16x16/actions/emovix.png
+	$(INSTALL_DATA) $(srcdir)/hi48-action-formatdvd.png $(DESTDIR)$(k3bicondir)/hicolor/48x48/actions/formatdvd.png
+	$(INSTALL_DATA) $(srcdir)/hi22-action-formatdvd.png $(DESTDIR)$(k3bicondir)/hicolor/22x22/actions/formatdvd.png
+	$(INSTALL_DATA) $(srcdir)/hi32-action-videodvd.png $(DESTDIR)$(k3bicondir)/hicolor/32x32/actions/videodvd.png
+	$(INSTALL_DATA) $(srcdir)/hi22-action-datacd.png $(DESTDIR)$(k3bicondir)/hicolor/22x22/actions/datacd.png
 	$(INSTALL_DATA) $(srcdir)/hi16-action-cdburn.png $(DESTDIR)$(k3bicondir)/hicolor/16x16/actions/cdburn.png
+	$(INSTALL_DATA) $(srcdir)/hi48-action-cdburn.png $(DESTDIR)$(k3bicondir)/hicolor/48x48/actions/cdburn.png
+	$(INSTALL_DATA) $(srcdir)/hi32-action-datacd.png $(DESTDIR)$(k3bicondir)/hicolor/32x32/actions/datacd.png
+	$(INSTALL_DATA) $(srcdir)/hi16-action-formatdvd.png $(DESTDIR)$(k3bicondir)/hicolor/16x16/actions/formatdvd.png
+	$(INSTALL_DATA) $(srcdir)/hi16-action-erasecd.png $(DESTDIR)$(k3bicondir)/hicolor/16x16/actions/erasecd.png
+	$(INSTALL_DATA) $(srcdir)/hi22-action-mp3cd.png $(DESTDIR)$(k3bicondir)/hicolor/22x22/actions/mp3cd.png
 	$(INSTALL_DATA) $(srcdir)/hi22-action-cdcopy.png $(DESTDIR)$(k3bicondir)/hicolor/22x22/actions/cdcopy.png
-	$(INSTALL_DATA) $(srcdir)/hi48-action-datacd.png $(DESTDIR)$(k3bicondir)/hicolor/48x48/actions/datacd.png
-	$(INSTALL_DATA) $(srcdir)/hisc-action-cddarip.svgz $(DESTDIR)$(k3bicondir)/hicolor/scalable/actions/cddarip.svgz
+	$(INSTALL_DATA) $(srcdir)/hi22-action-videocd.png $(DESTDIR)$(k3bicondir)/hicolor/22x22/actions/videocd.png
+	$(INSTALL_DATA) $(srcdir)/hisc-action-audiocd.svgz $(DESTDIR)$(k3bicondir)/hicolor/scalable/actions/audiocd.svgz
+	$(INSTALL_DATA) $(srcdir)/hi48-action-audiocd.png $(DESTDIR)$(k3bicondir)/hicolor/48x48/actions/audiocd.png
+	$(INSTALL_DATA) $(srcdir)/hi48-action-mixedcd.png $(DESTDIR)$(k3bicondir)/hicolor/48x48/actions/mixedcd.png
+	$(INSTALL_DATA) $(srcdir)/hi22-action-videodvd.png $(DESTDIR)$(k3bicondir)/hicolor/22x22/actions/videodvd.png
+	$(INSTALL_DATA) $(srcdir)/hi22-action-erasecd.png $(DESTDIR)$(k3bicondir)/hicolor/22x22/actions/erasecd.png
+	$(INSTALL_DATA) $(srcdir)/hi16-action-videocd.png $(DESTDIR)$(k3bicondir)/hicolor/16x16/actions/videocd.png
+	$(INSTALL_DATA) $(srcdir)/hisc-action-mp3cd.svgz $(DESTDIR)$(k3bicondir)/hicolor/scalable/actions/mp3cd.svgz
+	$(INSTALL_DATA) $(srcdir)/hisc-action-burn_cdimage.svgz $(DESTDIR)$(k3bicondir)/hicolor/scalable/actions/burn_cdimage.svgz
+	$(INSTALL_DATA) $(srcdir)/cr16-action-yellowinfo.png $(DESTDIR)$(k3bicondir)/crystalsvg/16x16/actions/yellowinfo.png
+	$(INSTALL_DATA) $(srcdir)/hi48-action-videodvd.png $(DESTDIR)$(k3bicondir)/hicolor/48x48/actions/videodvd.png
 	$(INSTALL_DATA) $(srcdir)/hisc-action-erasecd.svgz $(DESTDIR)$(k3bicondir)/hicolor/scalable/actions/erasecd.svgz
-	$(INSTALL_DATA) $(srcdir)/hisc-action-cdburn.svgz $(DESTDIR)$(k3bicondir)/hicolor/scalable/actions/cdburn.svgz
-	$(INSTALL_DATA) $(srcdir)/hi22-action-mp3cd.png $(DESTDIR)$(k3bicondir)/hicolor/22x22/actions/mp3cd.png
-	$(INSTALL_DATA) $(srcdir)/cr16-action-redled.png $(DESTDIR)$(k3bicondir)/crystalsvg/16x16/actions/redled.png
+	$(INSTALL_DATA) $(srcdir)/hi22-action-audiocd.png $(DESTDIR)$(k3bicondir)/hicolor/22x22/actions/audiocd.png
+	$(INSTALL_DATA) $(srcdir)/hi48-action-cdcopy.png $(DESTDIR)$(k3bicondir)/hicolor/48x48/actions/cdcopy.png
+	$(INSTALL_DATA) $(srcdir)/hi16-action-mixedcd.png $(DESTDIR)$(k3bicondir)/hicolor/16x16/actions/mixedcd.png
+	$(INSTALL_DATA) $(srcdir)/hi32-action-datadvd.png $(DESTDIR)$(k3bicondir)/hicolor/32x32/actions/datadvd.png
+	$(INSTALL_DATA) $(srcdir)/hi48-action-burn_cdimage.png $(DESTDIR)$(k3bicondir)/hicolor/48x48/actions/burn_cdimage.png
+	$(INSTALL_DATA) $(srcdir)/hisc-action-datadvd.svgz $(DESTDIR)$(k3bicondir)/hicolor/scalable/actions/datadvd.svgz
+	$(INSTALL_DATA) $(srcdir)/hi48-action-datadvd.png $(DESTDIR)$(k3bicondir)/hicolor/48x48/actions/datadvd.png
+	$(INSTALL_DATA) $(srcdir)/hisc-action-formatdvd.svgz $(DESTDIR)$(k3bicondir)/hicolor/scalable/actions/formatdvd.svgz
+	$(INSTALL_DATA) $(srcdir)/hisc-action-burn_dvdimage.svgz $(DESTDIR)$(k3bicondir)/hicolor/scalable/actions/burn_dvdimage.svgz
+	$(INSTALL_DATA) $(srcdir)/hi48-action-dvdcopy.png $(DESTDIR)$(k3bicondir)/hicolor/48x48/actions/dvdcopy.png
+	$(INSTALL_DATA) $(srcdir)/hi16-action-musicbrainz.png $(DESTDIR)$(k3bicondir)/hicolor/16x16/actions/musicbrainz.png
+	$(INSTALL_DATA) $(srcdir)/hi48-action-burn_dvdimage.png $(DESTDIR)$(k3bicondir)/hicolor/48x48/actions/burn_dvdimage.png
+	$(INSTALL_DATA) $(srcdir)/hisc-action-datacd.svgz $(DESTDIR)$(k3bicondir)/hicolor/scalable/actions/datacd.svgz
 	$(INSTALL_DATA) $(srcdir)/hi22-action-burn_dvdimage.png $(DESTDIR)$(k3bicondir)/hicolor/22x22/actions/burn_dvdimage.png
 	$(INSTALL_DATA) $(srcdir)/hi16-action-videodvd.png $(DESTDIR)$(k3bicondir)/hicolor/16x16/actions/videodvd.png
-	$(INSTALL_DATA) $(srcdir)/hi32-action-emovix.png $(DESTDIR)$(k3bicondir)/hicolor/32x32/actions/emovix.png
-	$(INSTALL_DATA) $(srcdir)/hi22-action-audiocd.png $(DESTDIR)$(k3bicondir)/hicolor/22x22/actions/audiocd.png
-	$(INSTALL_DATA) $(srcdir)/hi32-action-audiocd.png $(DESTDIR)$(k3bicondir)/hicolor/32x32/actions/audiocd.png
-	$(INSTALL_DATA) $(srcdir)/hi16-action-audiocd.png $(DESTDIR)$(k3bicondir)/hicolor/16x16/actions/audiocd.png
 
 uninstall-kde-icons:
-	-rm -f $(DESTDIR)$(k3bicondir)/hicolor/32x32/actions/burn_cdimage.png
-	-rm -f $(DESTDIR)$(k3bicondir)/hicolor/32x32/actions/datacd.png
-	-rm -f $(DESTDIR)$(k3bicondir)/hicolor/16x16/actions/cdcopy.png
-	-rm -f $(DESTDIR)$(k3bicondir)/hicolor/48x48/actions/cdburn.png
-	-rm -f $(DESTDIR)$(k3bicondir)/hicolor/48x48/actions/mixedcd.png
-	-rm -f $(DESTDIR)$(k3bicondir)/hicolor/48x48/actions/videocd.png
-	-rm -f $(DESTDIR)$(k3bicondir)/hicolor/32x32/actions/formatdvd.png
-	-rm -f $(DESTDIR)$(k3bicondir)/hicolor/16x16/actions/formatdvd.png
-	-rm -f $(DESTDIR)$(k3bicondir)/hicolor/16x16/actions/musicbrainz.png
-	-rm -f $(DESTDIR)$(k3bicondir)/crystalsvg/16x16/actions/greenled.png
-	-rm -f $(DESTDIR)$(k3bicondir)/hicolor/scalable/actions/burn_dvdimage.svgz
-	-rm -f $(DESTDIR)$(k3bicondir)/hicolor/scalable/actions/mp3cd.svgz
-	-rm -f $(DESTDIR)$(k3bicondir)/crystalsvg/16x16/actions/yellowinfo.png
-	-rm -f $(DESTDIR)$(k3bicondir)/hicolor/48x48/actions/formatdvd.png
-	-rm -f $(DESTDIR)$(k3bicondir)/hicolor/scalable/actions/datadvd.svgz
-	-rm -f $(DESTDIR)$(k3bicondir)/hicolor/scalable/actions/emovix.svgz
-	-rm -f $(DESTDIR)$(k3bicondir)/hicolor/22x22/actions/videodvd.png
-	-rm -f $(DESTDIR)$(k3bicondir)/crystalsvg/16x16/actions/yellowled.png
-	-rm -f $(DESTDIR)$(k3bicondir)/hicolor/22x22/actions/emovix.png
 	-rm -f $(DESTDIR)$(k3bicondir)/hicolor/scalable/actions/cdcopy.svgz
-	-rm -f $(DESTDIR)$(k3bicondir)/hicolor/48x48/actions/cddarip.png
+	-rm -f $(DESTDIR)$(k3bicondir)/hicolor/32x32/actions/emovix.png
 	-rm -f $(DESTDIR)$(k3bicondir)/hicolor/32x32/actions/cdburn.png
-	-rm -f $(DESTDIR)$(k3bicondir)/hicolor/48x48/actions/erasecd.png
-	-rm -f $(DESTDIR)$(k3bicondir)/hicolor/48x48/actions/datadvd.png
-	-rm -f $(DESTDIR)$(k3bicondir)/hicolor/48x48/actions/dvdcopy.png
-	-rm -f $(DESTDIR)$(k3bicondir)/hicolor/22x22/actions/datacd.png
-	-rm -f $(DESTDIR)$(k3bicondir)/hicolor/48x48/actions/burn_cdimage.png
-	-rm -f $(DESTDIR)$(k3bicondir)/hicolor/48x48/actions/cdcopy.png
+	-rm -f $(DESTDIR)$(k3bicondir)/hicolor/22x22/actions/cdburn.png
+	-rm -f $(DESTDIR)$(k3bicondir)/crystalsvg/16x16/actions/redled.png
+	-rm -f $(DESTDIR)$(k3bicondir)/hicolor/32x32/actions/burn_dvdimage.png
+	-rm -f $(DESTDIR)$(k3bicondir)/hicolor/22x22/actions/burn_cdimage.png
+	-rm -f $(DESTDIR)$(k3bicondir)/crystalsvg/16x16/actions/greenled.png
+	-rm -f $(DESTDIR)$(k3bicondir)/hicolor/32x32/actions/mp3cd.png
+	-rm -f $(DESTDIR)$(k3bicondir)/hicolor/48x48/actions/datacd.png
+	-rm -f $(DESTDIR)$(k3bicondir)/hicolor/32x32/actions/mixedcd.png
+	-rm -f $(DESTDIR)$(k3bicondir)/hicolor/16x16/actions/mp3cd.png
 	-rm -f $(DESTDIR)$(k3bicondir)/hicolor/scalable/actions/videodvd.svgz
 	-rm -f $(DESTDIR)$(k3bicondir)/hicolor/scalable/actions/dvdcopy.svgz
+	-rm -f $(DESTDIR)$(k3bicondir)/hicolor/32x32/actions/cdcopy.png
+	-rm -f $(DESTDIR)$(k3bicondir)/hicolor/32x32/actions/erasecd.png
+	-rm -f $(DESTDIR)$(k3bicondir)/hicolor/64x64/actions/musicbrainz.png
 	-rm -f $(DESTDIR)$(k3bicondir)/hicolor/scalable/actions/mixedcd.svgz
-	-rm -f $(DESTDIR)$(k3bicondir)/hicolor/scalable/actions/videocd.svgz
-	-rm -f $(DESTDIR)$(k3bicondir)/hicolor/32x32/actions/videodvd.png
-	-rm -f $(DESTDIR)$(k3bicondir)/hicolor/32x32/actions/mp3cd.png
-	-rm -f $(DESTDIR)$(k3bicondir)/hicolor/32x32/actions/burn_dvdimage.png
-	-rm -f $(DESTDIR)$(k3bicondir)/hicolor/scalable/actions/datacd.svgz
+	-rm -f $(DESTDIR)$(k3bicondir)/hicolor/16x16/actions/cdcopy.png
+	-rm -f $(DESTDIR)$(k3bicondir)/hicolor/32x32/actions/burn_cdimage.png
+	-rm -f $(DESTDIR)$(k3bicondir)/hicolor/48x48/actions/cddarip.png
+	-rm -f $(DESTDIR)$(k3bicondir)/hicolor/32x32/actions/dvdcopy.png
+	-rm -f $(DESTDIR)$(k3bicondir)/hicolor/32x32/actions/videocd.png
+	-rm -f $(DESTDIR)$(k3bicondir)/hicolor/32x32/actions/audiocd.png
 	-rm -f $(DESTDIR)$(k3bicondir)/hicolor/16x16/actions/burn_dvdimage.png
-	-rm -f $(DESTDIR)$(k3bicondir)/hicolor/16x16/actions/mp3cd.png
-	-rm -f $(DESTDIR)$(k3bicondir)/hicolor/16x16/actions/emovix.png
-	-rm -f $(DESTDIR)$(k3bicondir)/hicolor/22x22/actions/videocd.png
-	-rm -f $(DESTDIR)$(k3bicondir)/hicolor/22x22/actions/mixedcd.png
-	-rm -f $(DESTDIR)$(k3bicondir)/hicolor/22x22/actions/cdburn.png
-	-rm -f $(DESTDIR)$(k3bicondir)/hicolor/48x48/actions/burn_dvdimage.png
-	-rm -f $(DESTDIR)$(k3bicondir)/hicolor/32x32/actions/videocd.png
-	-rm -f $(DESTDIR)$(k3bicondir)/hicolor/32x32/actions/mixedcd.png
-	-rm -f $(DESTDIR)$(k3bicondir)/hicolor/48x48/actions/mp3cd.png
-	-rm -f $(DESTDIR)$(k3bicondir)/hicolor/48x48/actions/audiocd.png
-	-rm -f $(DESTDIR)$(k3bicondir)/hicolor/16x16/actions/mixedcd.png
-	-rm -f $(DESTDIR)$(k3bicondir)/hicolor/16x16/actions/videocd.png
-	-rm -f $(DESTDIR)$(k3bicondir)/hicolor/32x32/actions/cdcopy.png
+	-rm -f $(DESTDIR)$(k3bicondir)/hicolor/scalable/actions/cdburn.svgz
+	-rm -f $(DESTDIR)$(k3bicondir)/hicolor/16x16/actions/audiocd.png
 	-rm -f $(DESTDIR)$(k3bicondir)/hicolor/16x16/actions/burn_cdimage.png
-	-rm -f $(DESTDIR)$(k3bicondir)/hicolor/16x16/actions/datacd.png
-	-rm -f $(DESTDIR)$(k3bicondir)/hicolor/22x22/actions/formatdvd.png
-	-rm -f $(DESTDIR)$(k3bicondir)/hicolor/64x64/actions/musicbrainz.png
-	-rm -f $(DESTDIR)$(k3bicondir)/hicolor/scalable/actions/audiocd.svgz
-	-rm -f $(DESTDIR)$(k3bicondir)/hicolor/22x22/actions/erasecd.png
+	-rm -f $(DESTDIR)$(k3bicondir)/hicolor/22x22/actions/dvdcopy.png
+	-rm -f $(DESTDIR)$(k3bicondir)/hicolor/48x48/actions/videocd.png
+	-rm -f $(DESTDIR)$(k3bicondir)/hicolor/scalable/actions/cddarip.svgz
+	-rm -f $(DESTDIR)$(k3bicondir)/hicolor/22x22/actions/emovix.png
 	-rm -f $(DESTDIR)$(k3bicondir)/hicolor/22x22/actions/cddarip.png
-	-rm -f $(DESTDIR)$(k3bicondir)/hicolor/scalable/actions/burn_cdimage.svgz
-	-rm -f $(DESTDIR)$(k3bicondir)/hicolor/32x32/actions/erasecd.png
-	-rm -f $(DESTDIR)$(k3bicondir)/hicolor/32x32/actions/cddarip.png
+	-rm -f $(DESTDIR)$(k3bicondir)/hicolor/16x16/actions/dvdcopy.png
+	-rm -f $(DESTDIR)$(k3bicondir)/hicolor/48x48/actions/erasecd.png
 	-rm -f $(DESTDIR)$(k3bicondir)/hicolor/22x22/actions/datadvd.png
-	-rm -f $(DESTDIR)$(k3bicondir)/hicolor/32x32/actions/datadvd.png
-	-rm -f $(DESTDIR)$(k3bicondir)/hicolor/22x22/actions/dvdcopy.png
-	-rm -f $(DESTDIR)$(k3bicondir)/hicolor/32x32/actions/dvdcopy.png
-	-rm -f $(DESTDIR)$(k3bicondir)/hicolor/16x16/actions/erasecd.png
 	-rm -f $(DESTDIR)$(k3bicondir)/hicolor/16x16/actions/cddarip.png
+	-rm -f $(DESTDIR)$(k3bicondir)/hicolor/scalable/actions/emovix.svgz
+	-rm -f $(DESTDIR)$(k3bicondir)/hicolor/scalable/actions/videocd.svgz
+	-rm -f $(DESTDIR)$(k3bicondir)/hicolor/48x48/actions/mp3cd.png
 	-rm -f $(DESTDIR)$(k3bicondir)/hicolor/16x16/actions/datadvd.png
-	-rm -f $(DESTDIR)$(k3bicondir)/hicolor/16x16/actions/dvdcopy.png
-	-rm -f $(DESTDIR)$(k3bicondir)/hicolor/48x48/actions/videodvd.png
-	-rm -f $(DESTDIR)$(k3bicondir)/hicolor/scalable/actions/formatdvd.svgz
+	-rm -f $(DESTDIR)$(k3bicondir)/crystalsvg/16x16/actions/yellowled.png
+	-rm -f $(DESTDIR)$(k3bicondir)/hicolor/32x32/actions/cddarip.png
+	-rm -f $(DESTDIR)$(k3bicondir)/hicolor/22x22/actions/mixedcd.png
+	-rm -f $(DESTDIR)$(k3bicondir)/hicolor/16x16/actions/datacd.png
 	-rm -f $(DESTDIR)$(k3bicondir)/hicolor/48x48/actions/emovix.png
-	-rm -f $(DESTDIR)$(k3bicondir)/hicolor/22x22/actions/burn_cdimage.png
+	-rm -f $(DESTDIR)$(k3bicondir)/hicolor/32x32/actions/formatdvd.png
+	-rm -f $(DESTDIR)$(k3bicondir)/hicolor/16x16/actions/emovix.png
+	-rm -f $(DESTDIR)$(k3bicondir)/hicolor/48x48/actions/formatdvd.png
+	-rm -f $(DESTDIR)$(k3bicondir)/hicolor/22x22/actions/formatdvd.png
+	-rm -f $(DESTDIR)$(k3bicondir)/hicolor/32x32/actions/videodvd.png
+	-rm -f $(DESTDIR)$(k3bicondir)/hicolor/22x22/actions/datacd.png
 	-rm -f $(DESTDIR)$(k3bicondir)/hicolor/16x16/actions/cdburn.png
+	-rm -f $(DESTDIR)$(k3bicondir)/hicolor/48x48/actions/cdburn.png
+	-rm -f $(DESTDIR)$(k3bicondir)/hicolor/32x32/actions/datacd.png
+	-rm -f $(DESTDIR)$(k3bicondir)/hicolor/16x16/actions/formatdvd.png
+	-rm -f $(DESTDIR)$(k3bicondir)/hicolor/16x16/actions/erasecd.png
+	-rm -f $(DESTDIR)$(k3bicondir)/hicolor/22x22/actions/mp3cd.png
 	-rm -f $(DESTDIR)$(k3bicondir)/hicolor/22x22/actions/cdcopy.png
-	-rm -f $(DESTDIR)$(k3bicondir)/hicolor/48x48/actions/datacd.png
-	-rm -f $(DESTDIR)$(k3bicondir)/hicolor/scalable/actions/cddarip.svgz
+	-rm -f $(DESTDIR)$(k3bicondir)/hicolor/22x22/actions/videocd.png
+	-rm -f $(DESTDIR)$(k3bicondir)/hicolor/scalable/actions/audiocd.svgz
+	-rm -f $(DESTDIR)$(k3bicondir)/hicolor/48x48/actions/audiocd.png
+	-rm -f $(DESTDIR)$(k3bicondir)/hicolor/48x48/actions/mixedcd.png
+	-rm -f $(DESTDIR)$(k3bicondir)/hicolor/22x22/actions/videodvd.png
+	-rm -f $(DESTDIR)$(k3bicondir)/hicolor/22x22/actions/erasecd.png
+	-rm -f $(DESTDIR)$(k3bicondir)/hicolor/16x16/actions/videocd.png
+	-rm -f $(DESTDIR)$(k3bicondir)/hicolor/scalable/actions/mp3cd.svgz
+	-rm -f $(DESTDIR)$(k3bicondir)/hicolor/scalable/actions/burn_cdimage.svgz
+	-rm -f $(DESTDIR)$(k3bicondir)/crystalsvg/16x16/actions/yellowinfo.png
+	-rm -f $(DESTDIR)$(k3bicondir)/hicolor/48x48/actions/videodvd.png
 	-rm -f $(DESTDIR)$(k3bicondir)/hicolor/scalable/actions/erasecd.svgz
-	-rm -f $(DESTDIR)$(k3bicondir)/hicolor/scalable/actions/cdburn.svgz
-	-rm -f $(DESTDIR)$(k3bicondir)/hicolor/22x22/actions/mp3cd.png
-	-rm -f $(DESTDIR)$(k3bicondir)/crystalsvg/16x16/actions/redled.png
+	-rm -f $(DESTDIR)$(k3bicondir)/hicolor/22x22/actions/audiocd.png
+	-rm -f $(DESTDIR)$(k3bicondir)/hicolor/48x48/actions/cdcopy.png
+	-rm -f $(DESTDIR)$(k3bicondir)/hicolor/16x16/actions/mixedcd.png
+	-rm -f $(DESTDIR)$(k3bicondir)/hicolor/32x32/actions/datadvd.png
+	-rm -f $(DESTDIR)$(k3bicondir)/hicolor/48x48/actions/burn_cdimage.png
+	-rm -f $(DESTDIR)$(k3bicondir)/hicolor/scalable/actions/datadvd.svgz
+	-rm -f $(DESTDIR)$(k3bicondir)/hicolor/48x48/actions/datadvd.png
+	-rm -f $(DESTDIR)$(k3bicondir)/hicolor/scalable/actions/formatdvd.svgz
+	-rm -f $(DESTDIR)$(k3bicondir)/hicolor/scalable/actions/burn_dvdimage.svgz
+	-rm -f $(DESTDIR)$(k3bicondir)/hicolor/48x48/actions/dvdcopy.png
+	-rm -f $(DESTDIR)$(k3bicondir)/hicolor/16x16/actions/musicbrainz.png
+	-rm -f $(DESTDIR)$(k3bicondir)/hicolor/48x48/actions/burn_dvdimage.png
+	-rm -f $(DESTDIR)$(k3bicondir)/hicolor/scalable/actions/datacd.svgz
 	-rm -f $(DESTDIR)$(k3bicondir)/hicolor/22x22/actions/burn_dvdimage.png
 	-rm -f $(DESTDIR)$(k3bicondir)/hicolor/16x16/actions/videodvd.png
-	-rm -f $(DESTDIR)$(k3bicondir)/hicolor/32x32/actions/emovix.png
-	-rm -f $(DESTDIR)$(k3bicondir)/hicolor/22x22/actions/audiocd.png
-	-rm -f $(DESTDIR)$(k3bicondir)/hicolor/32x32/actions/audiocd.png
-	-rm -f $(DESTDIR)$(k3bicondir)/hicolor/16x16/actions/audiocd.png
 
 #>+ 15
 force-reedit:
@@ -711,9 +712,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/icons/actions/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/icons/actions/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  src/icons/actions/Makefile
+	  $(AUTOMAKE) --foreign  src/icons/actions/Makefile
 	cd $(top_srcdir) && perl admin/am_edit src/icons/actions/Makefile.in
 
 

Modified: kde-extras/k3b/k3b/trunk/src/k3b.desktop
===================================================================
--- kde-extras/k3b/k3b/trunk/src/k3b.desktop	2008-03-04 01:08:55 UTC (rev 9558)
+++ kde-extras/k3b/k3b/trunk/src/k3b.desktop	2008-03-04 01:11:49 UTC (rev 9559)
@@ -1,5 +1,4 @@
 [Desktop Entry]
-Encoding=UTF-8
 Type=Application
 Exec=k3b %U
 Icon=k3b
@@ -113,8 +112,8 @@
 Name[ar]= K3b
 Name[bn]=কে-থ্রি-বি
 Name[hi]=के3बी
-MimeType=application/x-k3b
+MimeType=application/x-k3b;application/x-iso;application/x-cue
 X-KDE-StartupNotify=true
-X-KDE-NativeMimeType=application/x-k3b;application/x-iso
-Categories=KDE;Application;AudioVideo;DiscBurning;
+X-KDE-NativeMimeType=application/x-k3b;application/x-iso;application/x-cue
+Categories=KDE;AudioVideo;DiscBurning;
 X-DCOP-ServiceType=Unique

Modified: kde-extras/k3b/k3b/trunk/src/k3bapplication.cpp
===================================================================
--- kde-extras/k3b/k3b/trunk/src/k3bapplication.cpp	2008-03-04 01:08:55 UTC (rev 9558)
+++ kde-extras/k3b/k3b/trunk/src/k3bapplication.cpp	2008-03-04 01:11:49 UTC (rev 9559)
@@ -143,7 +143,7 @@
 
     emit initializationDone();
 
-    K3bFirstRun::run( m_mainWindow );
+    //K3bFirstRun::run( m_mainWindow );
 
     if( K3bSystemProblemDialog::readCheckSystemConfig() ) {
       emit initializationInfo( i18n("Checking System") );

Modified: kde-extras/k3b/k3b/trunk/src/k3bsystemproblemdialog.cpp
===================================================================
--- kde-extras/k3b/k3b/trunk/src/k3bsystemproblemdialog.cpp	2008-03-04 01:08:55 UTC (rev 9558)
+++ kde-extras/k3b/k3b/trunk/src/k3bsystemproblemdialog.cpp	2008-03-04 01:11:49 UTC (rev 9559)
@@ -322,6 +322,7 @@
     }
   }
 
+  /*
   if( !k3bcore->externalBinManager()->foundBin( "mkisofs" ) ) {
 
   }
@@ -334,7 +335,7 @@
 					      "when creating data projects."),
 					 i18n("Install a more recent version of %1.").arg("mkisofs"),
 					 false ) );
-  }
+  }*/
 
   // 2. device check
   bool atapiReader = false;
@@ -584,7 +585,7 @@
   }
   if( problems.isEmpty() ) {
     kdDebug() << "          - none - " << endl;
-    K3bPassivePopup::showPopup( i18n("No problems found in system configuration."), i18n("System Problems") );
+    //K3bPassivePopup::showPopup( i18n("No problems found in system configuration."), i18n("System Problems") );
   }
   else {
     static K3bSystemProblemDialog* s_openDlg = 0;

Modified: kde-extras/k3b/k3b/trunk/src/k3bwelcomewidget.cpp
===================================================================
--- kde-extras/k3b/k3b/trunk/src/k3bwelcomewidget.cpp	2008-03-04 01:08:55 UTC (rev 9558)
+++ kde-extras/k3b/k3b/trunk/src/k3bwelcomewidget.cpp	2008-03-04 01:11:49 UTC (rev 9559)
@@ -371,6 +371,8 @@
     sl.append( "file_new_data" );
     sl.append( "file_new_dvd" );
     sl.append( "tools_copy_cd" );
+    sl.append( "tools_write_cd_image" );
+    sl.append( "tools_write_dvd_iso" );
   }
 
   QPtrList<KAction> actions;

Modified: kde-extras/k3b/k3b/trunk/src/konqi/Makefile.am
===================================================================
--- kde-extras/k3b/k3b/trunk/src/konqi/Makefile.am	2008-03-04 01:08:55 UTC (rev 9558)
+++ kde-extras/k3b/k3b/trunk/src/konqi/Makefile.am	2008-03-04 01:11:49 UTC (rev 9559)
@@ -1,5 +1,6 @@
 k3bservice_DATA =  k3b_create_data_cd.desktop \
 		   k3b_create_data_dvd.desktop \
+	           k3b_create_data_dvd.desktop \
 	           k3b_create_audio_cd.desktop \
 	           k3b_create_video_cd.desktop \
                    k3b_write_bin_image.desktop \

Modified: kde-extras/k3b/k3b/trunk/src/konqi/Makefile.in
===================================================================
--- kde-extras/k3b/k3b/trunk/src/konqi/Makefile.in	2008-03-04 01:08:55 UTC (rev 9558)
+++ kde-extras/k3b/k3b/trunk/src/konqi/Makefile.in	2008-03-04 01:11:49 UTC (rev 9559)
@@ -330,6 +330,7 @@
 xdg_menudir = @xdg_menudir@
 k3bservice_DATA = k3b_create_data_cd.desktop \
 		   k3b_create_data_dvd.desktop \
+	           k3b_create_data_dvd.desktop \
 	           k3b_create_audio_cd.desktop \
 	           k3b_create_video_cd.desktop \
                    k3b_write_bin_image.desktop \
@@ -358,9 +359,9 @@
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/konqi/Makefile'; \
+#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/konqi/Makefile'; \
 #>- 	cd $(top_srcdir) && \
-#>- 	  $(AUTOMAKE) --gnu  src/konqi/Makefile
+#>- 	  $(AUTOMAKE) --foreign  src/konqi/Makefile
 #>+ 12
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
@@ -370,9 +371,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/konqi/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/konqi/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  src/konqi/Makefile
+	  $(AUTOMAKE) --foreign  src/konqi/Makefile
 	cd $(top_srcdir) && perl admin/am_edit src/konqi/Makefile.in
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -572,6 +573,7 @@
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
+
 #>+ 2
 KDE_DIST=k3b_write_iso_image.desktop k3b_create_data_dvd.desktop k3b_handle_empty_cd.desktop k3b_audiocd_rip.desktop k3b_create_audio_cd.desktop k3b_videodvd_rip.desktop k3b_write_bin_image.desktop k3b_cd_copy.desktop k3b_dvd_copy.desktop k3b_create_data_cd.desktop k3b_create_video_cd.desktop Makefile.in k3b_handle_empty_dvd.desktop Makefile.am 
 
@@ -588,9 +590,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/konqi/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/konqi/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  src/konqi/Makefile
+	  $(AUTOMAKE) --foreign  src/konqi/Makefile
 	cd $(top_srcdir) && perl admin/am_edit src/konqi/Makefile.in
 
 

Modified: kde-extras/k3b/k3b/trunk/src/mimetypes/Makefile.in
===================================================================
--- kde-extras/k3b/k3b/trunk/src/mimetypes/Makefile.in	2008-03-04 01:08:55 UTC (rev 9558)
+++ kde-extras/k3b/k3b/trunk/src/mimetypes/Makefile.in	2008-03-04 01:11:49 UTC (rev 9559)
@@ -342,9 +342,9 @@
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/mimetypes/Makefile'; \
+#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/mimetypes/Makefile'; \
 #>- 	cd $(top_srcdir) && \
-#>- 	  $(AUTOMAKE) --gnu  src/mimetypes/Makefile
+#>- 	  $(AUTOMAKE) --foreign  src/mimetypes/Makefile
 #>+ 12
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
@@ -354,9 +354,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/mimetypes/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/mimetypes/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  src/mimetypes/Makefile
+	  $(AUTOMAKE) --foreign  src/mimetypes/Makefile
 	cd $(top_srcdir) && perl admin/am_edit src/mimetypes/Makefile.in
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -538,6 +538,7 @@
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
+
 #>+ 2
 KDE_DIST=x-k3b.desktop Makefile.in Makefile.am 
 
@@ -554,9 +555,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/mimetypes/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/mimetypes/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  src/mimetypes/Makefile
+	  $(AUTOMAKE) --foreign  src/mimetypes/Makefile
 	cd $(top_srcdir) && perl admin/am_edit src/mimetypes/Makefile.in
 
 

Modified: kde-extras/k3b/k3b/trunk/src/misc/Makefile.in
===================================================================
--- kde-extras/k3b/k3b/trunk/src/misc/Makefile.in	2008-03-04 01:08:55 UTC (rev 9558)
+++ kde-extras/k3b/k3b/trunk/src/misc/Makefile.in	2008-03-04 01:11:49 UTC (rev 9559)
@@ -383,9 +383,9 @@
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/misc/Makefile'; \
+#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/misc/Makefile'; \
 #>- 	cd $(top_srcdir) && \
-#>- 	  $(AUTOMAKE) --gnu  src/misc/Makefile
+#>- 	  $(AUTOMAKE) --foreign  src/misc/Makefile
 #>+ 12
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
@@ -395,9 +395,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/misc/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/misc/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  src/misc/Makefile
+	  $(AUTOMAKE) --foreign  src/misc/Makefile
 	cd $(top_srcdir) && perl admin/am_edit src/misc/Makefile.in
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -653,6 +653,7 @@
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
+
 #>+ 3
 k3bisoimagewritingdialog.moc: $(srcdir)/k3bisoimagewritingdialog.h
 	$(MOC) $(srcdir)/k3bisoimagewritingdialog.h -o k3bisoimagewritingdialog.moc
@@ -715,9 +716,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/misc/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/misc/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  src/misc/Makefile
+	  $(AUTOMAKE) --foreign  src/misc/Makefile
 	cd $(top_srcdir) && perl admin/am_edit src/misc/Makefile.in
 
 

Modified: kde-extras/k3b/k3b/trunk/src/option/Makefile.in
===================================================================
--- kde-extras/k3b/k3b/trunk/src/option/Makefile.in	2008-03-04 01:08:55 UTC (rev 9558)
+++ kde-extras/k3b/k3b/trunk/src/option/Makefile.in	2008-03-04 01:11:49 UTC (rev 9559)
@@ -405,9 +405,9 @@
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/option/Makefile'; \
+#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/option/Makefile'; \
 #>- 	cd $(top_srcdir) && \
-#>- 	  $(AUTOMAKE) --gnu  src/option/Makefile
+#>- 	  $(AUTOMAKE) --foreign  src/option/Makefile
 #>+ 12
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
@@ -417,9 +417,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/option/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/option/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  src/option/Makefile
+	  $(AUTOMAKE) --foreign  src/option/Makefile
 	cd $(top_srcdir) && perl admin/am_edit src/option/Makefile.in
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -680,13 +680,7 @@
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
-#>+ 3
-k3bcddboptiontab.moc: $(srcdir)/k3bcddboptiontab.h
-	$(MOC) $(srcdir)/k3bcddboptiontab.h -o k3bcddboptiontab.moc
 
-#>+ 2
-mocs: k3bcddboptiontab.moc
-
 #>+ 3
 k3bmiscoptiontab.moc: $(srcdir)/k3bmiscoptiontab.h
 	$(MOC) $(srcdir)/k3bmiscoptiontab.h -o k3bmiscoptiontab.moc
@@ -695,6 +689,13 @@
 mocs: k3bmiscoptiontab.moc
 
 #>+ 3
+k3bcddboptiontab.moc: $(srcdir)/k3bcddboptiontab.h
+	$(MOC) $(srcdir)/k3bcddboptiontab.h -o k3bcddboptiontab.moc
+
+#>+ 2
+mocs: k3bcddboptiontab.moc
+
+#>+ 3
 k3bburningoptiontab.moc: $(srcdir)/k3bburningoptiontab.h
 	$(MOC) $(srcdir)/k3bburningoptiontab.h -o k3bburningoptiontab.moc
 
@@ -716,11 +717,11 @@
 mocs: k3bthemeoptiontab.moc
 
 #>+ 3
-k3boptiondialog.moc: $(srcdir)/k3boptiondialog.h
-	$(MOC) $(srcdir)/k3boptiondialog.h -o k3boptiondialog.moc
+k3bpluginoptiontab.moc: $(srcdir)/k3bpluginoptiontab.h
+	$(MOC) $(srcdir)/k3bpluginoptiontab.h -o k3bpluginoptiontab.moc
 
 #>+ 2
-mocs: k3boptiondialog.moc
+mocs: k3bpluginoptiontab.moc
 
 #>+ 3
 k3bnotifyoptiontab.moc: $(srcdir)/k3bnotifyoptiontab.h
@@ -730,25 +731,25 @@
 mocs: k3bnotifyoptiontab.moc
 
 #>+ 3
-k3bpluginoptiontab.moc: $(srcdir)/k3bpluginoptiontab.h
-	$(MOC) $(srcdir)/k3bpluginoptiontab.h -o k3bpluginoptiontab.moc
+k3boptiondialog.moc: $(srcdir)/k3boptiondialog.h
+	$(MOC) $(srcdir)/k3boptiondialog.h -o k3boptiondialog.moc
 
 #>+ 2
-mocs: k3bpluginoptiontab.moc
+mocs: k3boptiondialog.moc
 
 #>+ 3
-k3bdevicewidget.moc: $(srcdir)/k3bdevicewidget.h
-	$(MOC) $(srcdir)/k3bdevicewidget.h -o k3bdevicewidget.moc
+k3bdeviceoptiontab.moc: $(srcdir)/k3bdeviceoptiontab.h
+	$(MOC) $(srcdir)/k3bdeviceoptiontab.h -o k3bdeviceoptiontab.moc
 
 #>+ 2
-mocs: k3bdevicewidget.moc
+mocs: k3bdeviceoptiontab.moc
 
 #>+ 3
-k3bdeviceoptiontab.moc: $(srcdir)/k3bdeviceoptiontab.h
-	$(MOC) $(srcdir)/k3bdeviceoptiontab.h -o k3bdeviceoptiontab.moc
+k3bdevicewidget.moc: $(srcdir)/k3bdevicewidget.h
+	$(MOC) $(srcdir)/k3bdevicewidget.h -o k3bdevicewidget.moc
 
 #>+ 2
-mocs: k3bdeviceoptiontab.moc
+mocs: k3bdevicewidget.moc
 
 #>+ 3
 k3bexternalbinoptiontab.moc: $(srcdir)/k3bexternalbinoptiontab.h
@@ -759,7 +760,7 @@
 
 #>+ 3
 clean-metasources:
-	-rm -f  k3bcddboptiontab.moc k3bmiscoptiontab.moc k3bburningoptiontab.moc k3bexternalbinwidget.moc k3bthemeoptiontab.moc k3boptiondialog.moc k3bnotifyoptiontab.moc k3bpluginoptiontab.moc k3bdevicewidget.moc k3bdeviceoptiontab.moc k3bexternalbinoptiontab.moc
+	-rm -f  k3bmiscoptiontab.moc k3bcddboptiontab.moc k3bburningoptiontab.moc k3bexternalbinwidget.moc k3bthemeoptiontab.moc k3bpluginoptiontab.moc k3bnotifyoptiontab.moc k3boptiondialog.moc k3bdeviceoptiontab.moc k3bdevicewidget.moc k3bexternalbinoptiontab.moc
 
 #>+ 2
 KDE_DIST=base_k3bpluginoptiontab.ui base_k3bcddboptiontab.ui k3bthemeoptiontab.h k3bdevicewidget.h base_k3bmiscoptiontab.ui k3bmiscoptiontab.h k3bexternalbinwidget.h k3bdeviceoptiontab.h base_k3bthemeoptiontab.ui k3bexternalbinoptiontab.h k3bburningoptiontab.h k3bcddboptiontab.h Makefile.in k3bnotifyoptiontab.h k3boptiondialog.h k3bpluginoptiontab.h Makefile.am 
@@ -785,9 +786,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/option/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/option/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  src/option/Makefile
+	  $(AUTOMAKE) --foreign  src/option/Makefile
 	cd $(top_srcdir) && perl admin/am_edit src/option/Makefile.in
 
 
@@ -814,7 +815,7 @@
 
 
 #>+ 11
-liboption_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/k3bmiscoptiontab.cpp $(srcdir)/k3bexternalbinoptiontab.cpp $(srcdir)/k3bcddboptiontab.cpp $(srcdir)/k3bburningoptiontab.cpp $(srcdir)/k3boptiondialog.cpp $(srcdir)/k3bdeviceoptiontab.cpp $(srcdir)/k3bnotifyoptiontab.cpp $(srcdir)/k3bpluginoptiontab.cpp $(srcdir)/k3bthemeoptiontab.cpp $(srcdir)/k3bdevicewidget.cpp $(srcdir)/k3bexternalbinwidget.cpp base_k3bcddboptiontab.cpp base_k3bmiscoptiontab.cpp base_k3bpluginoptiontab.cpp base_k3bthemeoptiontab.cpp  k3bmiscoptiontab.moc k3bcddboptiontab.moc k3bburningoptiontab.moc k3bexternalbinwidget.moc k3bthemeoptiontab.moc base_k3bpluginoptiontab.moc k3bpluginoptiontab.moc k3bnotifyoptiontab.moc k3boptiondialog.moc k3bdeviceoptiontab.moc k3bdevicewidget.moc base_k3bthemeoptiontab.moc k3bexternalbinoptiontab.moc base_k3bmiscoptiontab.moc base_k3bcddboptiontab.moc
+liboption_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/k3bmiscoptiontab.cpp $(srcdir)/k3bexternalbinoptiontab.cpp $(srcdir)/k3bcddboptiontab.cpp $(srcdir)/k3bburningoptiontab.cpp $(srcdir)/k3boptiondialog.cpp $(srcdir)/k3bdeviceoptiontab.cpp $(srcdir)/k3bnotifyoptiontab.cpp $(srcdir)/k3bpluginoptiontab.cpp $(srcdir)/k3bthemeoptiontab.cpp $(srcdir)/k3bdevicewidget.cpp $(srcdir)/k3bexternalbinwidget.cpp base_k3bcddboptiontab.cpp base_k3bmiscoptiontab.cpp base_k3bpluginoptiontab.cpp base_k3bthemeoptiontab.cpp  k3bcddboptiontab.moc k3bmiscoptiontab.moc k3bburningoptiontab.moc k3bexternalbinwidget.moc k3bthemeoptiontab.moc base_k3bpluginoptiontab.moc k3boptiondialog.moc k3bnotifyoptiontab.moc k3bpluginoptiontab.moc k3bdevicewidget.moc k3bdeviceoptiontab.moc base_k3bthemeoptiontab.moc k3bexternalbinoptiontab.moc base_k3bmiscoptiontab.moc base_k3bcddboptiontab.moc
 	@echo 'creating liboption_la.all_cpp.cpp ...'; \
 	rm -f liboption_la.all_cpp.files liboption_la.all_cpp.final; \
 	echo "#define KDE_USE_FINAL 1" >> liboption_la.all_cpp.final; \

Modified: kde-extras/k3b/k3b/trunk/src/pics/73lab/Makefile.in
===================================================================
--- kde-extras/k3b/k3b/trunk/src/pics/73lab/Makefile.in	2008-03-04 01:08:55 UTC (rev 9558)
+++ kde-extras/k3b/k3b/trunk/src/pics/73lab/Makefile.in	2008-03-04 01:11:49 UTC (rev 9559)
@@ -362,9 +362,9 @@
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/pics/73lab/Makefile'; \
+#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/pics/73lab/Makefile'; \
 #>- 	cd $(top_srcdir) && \
-#>- 	  $(AUTOMAKE) --gnu  src/pics/73lab/Makefile
+#>- 	  $(AUTOMAKE) --foreign  src/pics/73lab/Makefile
 #>+ 12
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
@@ -374,9 +374,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/pics/73lab/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/pics/73lab/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  src/pics/73lab/Makefile
+	  $(AUTOMAKE) --foreign  src/pics/73lab/Makefile
 	cd $(top_srcdir) && perl admin/am_edit src/pics/73lab/Makefile.in
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -558,6 +558,7 @@
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
+
 #>+ 2
 KDE_DIST=project_left.png progress_working.png media_mixed.png welcome_bg.png media_video.png media_data.png progress_success.png project_right.png progress_right.png progress_fail.png probing.png media_none.png dialog_right.png media_audio.png media_empty.png k3b.theme Makefile.in media_left.png splash.png dialog_left.png Makefile.am 
 
@@ -574,9 +575,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/pics/73lab/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/pics/73lab/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  src/pics/73lab/Makefile
+	  $(AUTOMAKE) --foreign  src/pics/73lab/Makefile
 	cd $(top_srcdir) && perl admin/am_edit src/pics/73lab/Makefile.in
 
 

Modified: kde-extras/k3b/k3b/trunk/src/pics/Makefile.in
===================================================================
--- kde-extras/k3b/k3b/trunk/src/pics/Makefile.in	2008-03-04 01:08:55 UTC (rev 9558)
+++ kde-extras/k3b/k3b/trunk/src/pics/Makefile.in	2008-03-04 01:11:49 UTC (rev 9559)
@@ -351,9 +351,9 @@
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/pics/Makefile'; \
+#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/pics/Makefile'; \
 #>- 	cd $(top_srcdir) && \
-#>- 	  $(AUTOMAKE) --gnu  src/pics/Makefile
+#>- 	  $(AUTOMAKE) --foreign  src/pics/Makefile
 #>+ 12
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
@@ -363,9 +363,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/pics/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/pics/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  src/pics/Makefile
+	  $(AUTOMAKE) --foreign  src/pics/Makefile
 	cd $(top_srcdir) && perl admin/am_edit src/pics/Makefile.in
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -673,6 +673,7 @@
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
+
 #>+ 2
 KDE_DIST=Makefile.in Makefile.am 
 
@@ -689,9 +690,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/pics/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/pics/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  src/pics/Makefile
+	  $(AUTOMAKE) --foreign  src/pics/Makefile
 	cd $(top_srcdir) && perl admin/am_edit src/pics/Makefile.in
 
 

Modified: kde-extras/k3b/k3b/trunk/src/pics/RobsTheme/Makefile.in
===================================================================
--- kde-extras/k3b/k3b/trunk/src/pics/RobsTheme/Makefile.in	2008-03-04 01:08:55 UTC (rev 9558)
+++ kde-extras/k3b/k3b/trunk/src/pics/RobsTheme/Makefile.in	2008-03-04 01:11:49 UTC (rev 9559)
@@ -361,9 +361,9 @@
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/pics/RobsTheme/Makefile'; \
+#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/pics/RobsTheme/Makefile'; \
 #>- 	cd $(top_srcdir) && \
-#>- 	  $(AUTOMAKE) --gnu  src/pics/RobsTheme/Makefile
+#>- 	  $(AUTOMAKE) --foreign  src/pics/RobsTheme/Makefile
 #>+ 12
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
@@ -373,9 +373,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/pics/RobsTheme/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/pics/RobsTheme/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  src/pics/RobsTheme/Makefile
+	  $(AUTOMAKE) --foreign  src/pics/RobsTheme/Makefile
 	cd $(top_srcdir) && perl admin/am_edit src/pics/RobsTheme/Makefile.in
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -557,6 +557,7 @@
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
+
 #>+ 2
 KDE_DIST=project_left.png progress_working.png media_mixed.png welcome_bg.png media_video.png media_data.png progress_success.png project_right.png progress_right.png progress_fail.png media_none.png dialog_right.png media_audio.png media_empty.png k3b.theme Makefile.in media_left.png splash.png dialog_left.png Makefile.am 
 
@@ -573,9 +574,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/pics/RobsTheme/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/pics/RobsTheme/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  src/pics/RobsTheme/Makefile
+	  $(AUTOMAKE) --foreign  src/pics/RobsTheme/Makefile
 	cd $(top_srcdir) && perl admin/am_edit src/pics/RobsTheme/Makefile.in
 
 

Modified: kde-extras/k3b/k3b/trunk/src/pics/crystal/Makefile.in
===================================================================
--- kde-extras/k3b/k3b/trunk/src/pics/crystal/Makefile.in	2008-03-04 01:08:55 UTC (rev 9558)
+++ kde-extras/k3b/k3b/trunk/src/pics/crystal/Makefile.in	2008-03-04 01:11:49 UTC (rev 9559)
@@ -362,9 +362,9 @@
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/pics/crystal/Makefile'; \
+#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/pics/crystal/Makefile'; \
 #>- 	cd $(top_srcdir) && \
-#>- 	  $(AUTOMAKE) --gnu  src/pics/crystal/Makefile
+#>- 	  $(AUTOMAKE) --foreign  src/pics/crystal/Makefile
 #>+ 12
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
@@ -374,9 +374,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/pics/crystal/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/pics/crystal/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  src/pics/crystal/Makefile
+	  $(AUTOMAKE) --foreign  src/pics/crystal/Makefile
 	cd $(top_srcdir) && perl admin/am_edit src/pics/crystal/Makefile.in
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -558,6 +558,7 @@
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
+
 #>+ 2
 KDE_DIST=project_left.png progress_working.png media_mixed.png welcome_bg.png media_video.png media_data.png progress_success.png project_right.png progress_right.png progress_fail.png probing.png media_none.png dialog_right.png media_audio.png media_empty.png k3b.theme Makefile.in media_left.png splash.png dialog_left.png Makefile.am 
 
@@ -574,9 +575,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/pics/crystal/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/pics/crystal/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  src/pics/crystal/Makefile
+	  $(AUTOMAKE) --foreign  src/pics/crystal/Makefile
 	cd $(top_srcdir) && perl admin/am_edit src/pics/crystal/Makefile.in
 
 

Modified: kde-extras/k3b/k3b/trunk/src/pics/quant/Makefile.in
===================================================================
--- kde-extras/k3b/k3b/trunk/src/pics/quant/Makefile.in	2008-03-04 01:08:55 UTC (rev 9558)
+++ kde-extras/k3b/k3b/trunk/src/pics/quant/Makefile.in	2008-03-04 01:11:49 UTC (rev 9559)
@@ -361,9 +361,9 @@
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/pics/quant/Makefile'; \
+#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/pics/quant/Makefile'; \
 #>- 	cd $(top_srcdir) && \
-#>- 	  $(AUTOMAKE) --gnu  src/pics/quant/Makefile
+#>- 	  $(AUTOMAKE) --foreign  src/pics/quant/Makefile
 #>+ 12
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
@@ -373,9 +373,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/pics/quant/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/pics/quant/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  src/pics/quant/Makefile
+	  $(AUTOMAKE) --foreign  src/pics/quant/Makefile
 	cd $(top_srcdir) && perl admin/am_edit src/pics/quant/Makefile.in
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -557,6 +557,7 @@
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
+
 #>+ 2
 KDE_DIST=project_left.png progress_working.png media_mixed.png welcome_bg.png media_video.png media_data.png progress_success.png project_right.png progress_right.png progress_fail.png media_none.png dialog_right.png media_audio.png media_empty.png k3b.theme Makefile.in media_left.png splash.png dialog_left.png Makefile.am 
 
@@ -573,9 +574,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/pics/quant/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/pics/quant/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  src/pics/quant/Makefile
+	  $(AUTOMAKE) --foreign  src/pics/quant/Makefile
 	cd $(top_srcdir) && perl admin/am_edit src/pics/quant/Makefile.in
 
 

Modified: kde-extras/k3b/k3b/trunk/src/projects/Makefile.in
===================================================================
--- kde-extras/k3b/k3b/trunk/src/projects/Makefile.in	2008-03-04 01:08:55 UTC (rev 9558)
+++ kde-extras/k3b/k3b/trunk/src/projects/Makefile.in	2008-03-04 01:11:49 UTC (rev 9559)
@@ -572,9 +572,9 @@
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/projects/Makefile'; \
+#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/projects/Makefile'; \
 #>- 	cd $(top_srcdir) && \
-#>- 	  $(AUTOMAKE) --gnu  src/projects/Makefile
+#>- 	  $(AUTOMAKE) --foreign  src/projects/Makefile
 #>+ 12
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
@@ -584,9 +584,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/projects/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/projects/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  src/projects/Makefile
+	  $(AUTOMAKE) --foreign  src/projects/Makefile
 	cd $(top_srcdir) && perl admin/am_edit src/projects/Makefile.in
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -992,6 +992,7 @@
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
+
 #>+ 3
 k3bdataview.moc: $(srcdir)/k3bdataview.h
 	$(MOC) $(srcdir)/k3bdataview.h -o k3bdataview.moc
@@ -1035,18 +1036,18 @@
 mocs: k3bmixeddirtreeview.moc
 
 #>+ 3
-k3bprojectplugindialog.moc: $(srcdir)/k3bprojectplugindialog.h
-	$(MOC) $(srcdir)/k3bprojectplugindialog.h -o k3bprojectplugindialog.moc
+k3bdatavolumedescwidget.moc: $(srcdir)/k3bdatavolumedescwidget.h
+	$(MOC) $(srcdir)/k3bdatavolumedescwidget.h -o k3bdatavolumedescwidget.moc
 
 #>+ 2
-mocs: k3bprojectplugindialog.moc
+mocs: k3bdatavolumedescwidget.moc
 
 #>+ 3
-k3bdatavolumedescwidget.moc: $(srcdir)/k3bdatavolumedescwidget.h
-	$(MOC) $(srcdir)/k3bdatavolumedescwidget.h -o k3bdatavolumedescwidget.moc
+k3bprojectplugindialog.moc: $(srcdir)/k3bprojectplugindialog.h
+	$(MOC) $(srcdir)/k3bprojectplugindialog.h -o k3bprojectplugindialog.moc
 
 #>+ 2
-mocs: k3bdatavolumedescwidget.moc
+mocs: k3bprojectplugindialog.moc
 
 #>+ 3
 k3baudioeditorwidget.moc: $(srcdir)/k3baudioeditorwidget.h
@@ -1077,18 +1078,18 @@
 mocs: k3bdataimagesettingswidget.moc
 
 #>+ 3
-k3baudiotrackview.moc: $(srcdir)/k3baudiotrackview.h
-	$(MOC) $(srcdir)/k3baudiotrackview.h -o k3baudiotrackview.moc
+k3bdvdburndialog.moc: $(srcdir)/k3bdvdburndialog.h
+	$(MOC) $(srcdir)/k3bdvdburndialog.h -o k3bdvdburndialog.moc
 
 #>+ 2
-mocs: k3baudiotrackview.moc
+mocs: k3bdvdburndialog.moc
 
 #>+ 3
-k3bdvdburndialog.moc: $(srcdir)/k3bdvdburndialog.h
-	$(MOC) $(srcdir)/k3bdvdburndialog.h -o k3bdvdburndialog.moc
+k3baudiotrackview.moc: $(srcdir)/k3baudiotrackview.h
+	$(MOC) $(srcdir)/k3baudiotrackview.h -o k3baudiotrackview.moc
 
 #>+ 2
-mocs: k3bdvdburndialog.moc
+mocs: k3baudiotrackview.moc
 
 #>+ 3
 k3bdatasessionimportdialog.moc: $(srcdir)/k3bdatasessionimportdialog.h
@@ -1126,18 +1127,18 @@
 mocs: k3bdataadvancedimagesettingswidget.moc
 
 #>+ 3
-k3bmovixdvdburndialog.moc: $(srcdir)/k3bmovixdvdburndialog.h
-	$(MOC) $(srcdir)/k3bmovixdvdburndialog.h -o k3bmovixdvdburndialog.moc
+k3bvcdlistview.moc: $(srcdir)/k3bvcdlistview.h
+	$(MOC) $(srcdir)/k3bvcdlistview.h -o k3bvcdlistview.moc
 
 #>+ 2
-mocs: k3bmovixdvdburndialog.moc
+mocs: k3bvcdlistview.moc
 
 #>+ 3
-k3bvcdlistview.moc: $(srcdir)/k3bvcdlistview.h
-	$(MOC) $(srcdir)/k3bvcdlistview.h -o k3bvcdlistview.moc
+k3bmovixdvdburndialog.moc: $(srcdir)/k3bmovixdvdburndialog.h
+	$(MOC) $(srcdir)/k3bmovixdvdburndialog.h -o k3bmovixdvdburndialog.moc
 
 #>+ 2
-mocs: k3bvcdlistview.moc
+mocs: k3bmovixdvdburndialog.moc
 
 #>+ 3
 k3bprojectburndialog.moc: $(srcdir)/k3bprojectburndialog.h
@@ -1182,18 +1183,18 @@
 mocs: k3bview.moc
 
 #>+ 3
-k3bvcdburndialog.moc: $(srcdir)/k3bvcdburndialog.h
-	$(MOC) $(srcdir)/k3bvcdburndialog.h -o k3bvcdburndialog.moc
+k3bdataurladdingdialog.moc: $(srcdir)/k3bdataurladdingdialog.h
+	$(MOC) $(srcdir)/k3bdataurladdingdialog.h -o k3bdataurladdingdialog.moc
 
 #>+ 2
-mocs: k3bvcdburndialog.moc
+mocs: k3bdataurladdingdialog.moc
 
 #>+ 3
-k3bdataurladdingdialog.moc: $(srcdir)/k3bdataurladdingdialog.h
-	$(MOC) $(srcdir)/k3bdataurladdingdialog.h -o k3bdataurladdingdialog.moc
+k3bvcdburndialog.moc: $(srcdir)/k3bvcdburndialog.h
+	$(MOC) $(srcdir)/k3bvcdburndialog.h -o k3bvcdburndialog.moc
 
 #>+ 2
-mocs: k3bdataurladdingdialog.moc
+mocs: k3bvcdburndialog.moc
 
 #>+ 3
 k3baudiocdtextwidget.moc: $(srcdir)/k3baudiocdtextwidget.h
@@ -1217,18 +1218,18 @@
 mocs: k3bvideodvdburndialog.moc
 
 #>+ 3
-k3bvcdview.moc: $(srcdir)/k3bvcdview.h
-	$(MOC) $(srcdir)/k3bvcdview.h -o k3bvcdview.moc
+k3bbootimageview.moc: $(srcdir)/k3bbootimageview.h
+	$(MOC) $(srcdir)/k3bbootimageview.h -o k3bbootimageview.moc
 
 #>+ 2
-mocs: k3bvcdview.moc
+mocs: k3bbootimageview.moc
 
 #>+ 3
-k3bbootimageview.moc: $(srcdir)/k3bbootimageview.h
-	$(MOC) $(srcdir)/k3bbootimageview.h -o k3bbootimageview.moc
+k3bvcdview.moc: $(srcdir)/k3bvcdview.h
+	$(MOC) $(srcdir)/k3bvcdview.h -o k3bvcdview.moc
 
 #>+ 2
-mocs: k3bbootimageview.moc
+mocs: k3bvcdview.moc
 
 #>+ 3
 k3bmixedburndialog.moc: $(srcdir)/k3bmixedburndialog.h
@@ -1323,10 +1324,10 @@
 
 #>+ 3
 clean-metasources:
-	-rm -f  k3bdataview.moc k3baudiodatasourceeditwidget.moc k3bmusicbrainzjob.moc k3bmovixlistview.moc k3baudiotrackwidget.moc k3bmixeddirtreeview.moc k3bprojectplugindialog.moc k3bdatavolumedescwidget.moc k3baudioeditorwidget.moc k3baudioview.moc k3bdvdview.moc k3bdataimagesettingswidget.moc k3baudiotrackview.moc k3bdvdburndialog.moc k3bdatasessionimportdialog.moc k3baudiotrackplayer.moc k3bdataburndialog.moc k3baudiotrackdialog.moc k3bdataadvancedimagesettingswidget.moc k3bmovixdvdburndialog.moc k3bvcdlistview.moc k3bprojectburndialog.moc k3baudiotracksplitdialog.moc k3bdatapropertiesdialog.moc k3bdatafileview.moc k3baudiotrackaddingdialog.moc k3bview.moc k3bvcdburndialog.moc k3bdataurladdingdialog.moc k3baudiocdtextwidget.moc k3bdatadirtreeview.moc k3bvideodvdburndialog.moc k3bvcdview.moc k3bbootimageview.moc k3bmixedburndialog.moc k3bmovixoptionswidget.moc k3bmixedview.moc k3bmovixdvdview.moc k3bfillstatusdisplay.moc k3bmovixburndialog.moc k3bdatamultisessioncombobox.moc k3bvideodvdview.moc k3baudioburndialog.moc k3baudiotracktrmlookupdialog.moc k3bmovixview.moc k3bbootimagedialog.moc k3bvcdtrackdialog.moc
+	-rm -f  k3bdataview.moc k3baudiodatasourceeditwidget.moc k3bmusicbrainzjob.moc k3bmovixlistview.moc k3baudiotrackwidget.moc k3bmixeddirtreeview.moc k3bdatavolumedescwidget.moc k3bprojectplugindialog.moc k3baudioeditorwidget.moc k3baudioview.moc k3bdvdview.moc k3bdataimagesettingswidget.moc k3bdvdburndialog.moc k3baudiotrackview.moc k3bdatasessionimportdialog.moc k3baudiotrackplayer.moc k3bdataburndialog.moc k3baudiotrackdialog.moc k3bdataadvancedimagesettingswidget.moc k3bvcdlistview.moc k3bmovixdvdburndialog.moc k3bprojectburndialog.moc k3baudiotracksplitdialog.moc k3bdatapropertiesdialog.moc k3bdatafileview.moc k3baudiotrackaddingdialog.moc k3bview.moc k3bdataurladdingdialog.moc k3bvcdburndialog.moc k3baudiocdtextwidget.moc k3bdatadirtreeview.moc k3bvideodvdburndialog.moc k3bbootimageview.moc k3bvcdview.moc k3bmixedburndialog.moc k3bmovixoptionswidget.moc k3bmixedview.moc k3bmovixdvdview.moc k3bfillstatusdisplay.moc k3bmovixburndialog.moc k3bdatamultisessioncombobox.moc k3bvideodvdview.moc k3baudioburndialog.moc k3baudiotracktrmlookupdialog.moc k3bmovixview.moc k3bbootimagedialog.moc k3bvcdtrackdialog.moc
 
 #>+ 2
-KDE_DIST=k3baudiotrackwidget.h k3bvcdview.h k3baudiotrackdialog.h k3bvcdtrackdialog.h k3bview.h k3bvideodvdview.h k3bdataurladdingdialog.h k3bdataburndialog.h k3bdatafileview.h k3bdataadvancedimagesettingswidget.h base_k3bdataimagesettings.ui k3bdatapropertiesdialog.h k3bmovixview.h k3bdataview.h k3baudioburndialog.h k3bdatavolumedescwidget.h k3bmovixdvdview.h k3bmixedburndialog.h k3baudiodatasourceviewitem.h k3baudioview.h k3bmovixdvdburndialog.h k3bbootimagedialog.h k3bmovixlistview.h k3baudiotracksplitdialog.h k3bdvdburndialog.h base_k3badvanceddataimagesettings.ui k3bdatasessionimportdialog.h k3bmusicbrainzjob.h k3bfillstatusdisplay.h base_k3baudiotrackwidget.ui k3baudiotrackaddingdialog.h k3baudiodatasourceeditwidget.h base_k3baudiocdtextallfieldswidget.ui base_k3bbootimageview.ui k3bdataimagesettingswidget.h k3baudiotrackview.h base_k3bmovixoptionswidget.ui k3bprojectplugindialog.h k3baudiotrackviewitem.h k3bmixeddirtreeview.h k3bprojectburndialog.h k3bencodingconverter.h base_k3baudiocdtextwidget.ui k3baudiotracktrmlookupdialog.h base_k3bdatavolumedescwidget.ui k3bbootimageview.h k3bmovixburndialog.h k3bdvdview.h k3baudioeditorwidget.h k3bmixedview.h Makefile.in k3bdatadirtreeview.h k3bdataviewitem.h k3bvcdlistviewitem.h k3bvideodvdburndialog.h k3bvcdlistview.h k3baudiotrackplayer.h k3bdatamultisessioncombobox.h k3bvcdburndialog.h Makefile.am k3bmovixoptionswidget.h k3baudiocdtextwidget.h 
+KDE_DIST=k3baudiotrackwidget.h k3bvcdview.h k3baudiotrackdialog.h k3bview.h k3bvcdtrackdialog.h k3bvideodvdview.h k3bdataurladdingdialog.h k3bdataburndialog.h k3bdatafileview.h k3bdataadvancedimagesettingswidget.h base_k3bdataimagesettings.ui k3bdatapropertiesdialog.h k3bmovixview.h k3bdataview.h k3baudioburndialog.h k3bdatavolumedescwidget.h k3bmovixdvdview.h k3bmixedburndialog.h k3baudioview.h k3baudiodatasourceviewitem.h k3bmovixdvdburndialog.h k3bmovixlistview.h k3baudiotracksplitdialog.h k3bbootimagedialog.h k3bdvdburndialog.h k3bdatasessionimportdialog.h base_k3badvanceddataimagesettings.ui k3bmusicbrainzjob.h k3bfillstatusdisplay.h base_k3baudiotrackwidget.ui k3baudiotrackaddingdialog.h base_k3baudiocdtextallfieldswidget.ui k3baudiodatasourceeditwidget.h k3bdataimagesettingswidget.h k3baudiotrackview.h base_k3bbootimageview.ui base_k3bmovixoptionswidget.ui k3bprojectplugindialog.h k3baudiotrackviewitem.h k3bmixeddirtreeview.h k3bprojectburndialog.h k3bencodingconverter.h base_k3baudiocdtextwidget.ui k3baudiotracktrmlookupdialog.h base_k3bdatavolumedescwidget.ui k3bbootimageview.h k3bmovixburndialog.h k3bdvdview.h k3baudioeditorwidget.h k3bmixedview.h Makefile.in k3bdatadirtreeview.h k3bdataviewitem.h k3bvcdlistviewitem.h k3bvideodvdburndialog.h k3bvcdlistview.h k3baudiotrackplayer.h k3bdatamultisessioncombobox.h k3bvcdburndialog.h Makefile.am k3bmovixoptionswidget.h k3baudiocdtextwidget.h 
 
 #>+ 11
 clean-ui:
@@ -1353,9 +1354,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/projects/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/projects/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  src/projects/Makefile
+	  $(AUTOMAKE) --foreign  src/projects/Makefile
 	cd $(top_srcdir) && perl admin/am_edit src/projects/Makefile.in
 
 
@@ -1382,7 +1383,7 @@
 
 
 #>+ 11
-libprojects_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/k3baudioburndialog.cpp $(srcdir)/k3baudiocdtextwidget.cpp $(srcdir)/k3baudiodatasourceviewitem.cpp $(srcdir)/k3baudioeditorwidget.cpp $(srcdir)/k3baudiotrackdialog.cpp $(srcdir)/k3baudiotrackwidget.cpp $(srcdir)/k3baudiotrackplayer.cpp $(srcdir)/k3baudiotracksplitdialog.cpp $(srcdir)/k3baudiotrackview.cpp $(srcdir)/k3baudiotrackviewitem.cpp $(srcdir)/k3baudioview.cpp $(srcdir)/k3bmixedburndialog.cpp $(srcdir)/k3bmixeddirtreeview.cpp $(srcdir)/k3bmixedview.cpp $(srcdir)/k3bdataadvancedimagesettingswidget.cpp $(srcdir)/k3bdatadirtreeview.cpp $(srcdir)/k3bdatafileview.cpp $(srcdir)/k3bdataimagesettingswidget.cpp $(srcdir)/k3bdatapropertiesdialog.cpp $(srcdir)/k3bdataview.cpp $(srcdir)/k3bdataviewitem.cpp $(srcdir)/k3bdatavolumedescwidget.cpp $(srcdir)/k3bdataburndialog.cpp $(srcdir)/k3bbootimagedialog.cpp $(srcdir)/k3bbootimageview.cpp $(srcdir)/k3bdvdburndialog.cpp $(srcdir)/k3bdvdview.cpp $(srcdir)/k3bmovixburndialog.cpp $(srcdir)/k3bmovixlistview.cpp $(srcdir)/k3bmovixoptionswidget.cpp $(srcdir)/k3bmovixview.cpp $(srcdir)/k3bmovixdvdburndialog.cpp $(srcdir)/k3bmovixdvdview.cpp $(srcdir)/k3bvideodvdburndialog.cpp $(srcdir)/k3bvideodvdview.cpp $(srcdir)/k3bvcdburndialog.cpp $(srcdir)/k3bvcdlistview.cpp $(srcdir)/k3bvcdlistviewitem.cpp $(srcdir)/k3bvcdtrackdialog.cpp $(srcdir)/k3bvcdview.cpp $(srcdir)/k3bfillstatusdisplay.cpp $(srcdir)/k3bview.cpp $(srcdir)/k3bprojectburndialog.cpp $(srcdir)/k3bprojectplugindialog.cpp $(srcdir)/k3baudiotracktrmlookupdialog.cpp $(srcdir)/k3bdatamultisessioncombobox.cpp $(srcdir)/k3bmusicbrainzjob.cpp $(srcdir)/k3bdataurladdingdialog.cpp $(srcdir)/k3bdatasessionimportdialog.cpp $(srcdir)/k3baudiodatasourceeditwidget.cpp $(srcdir)/k3baudiotrackaddingdialog.cpp $(srcdir)/k3bencodingconverter.cpp base_k3baudiocdtextwidget.cpp base_k3baudiocdtextallfieldswidget.cpp base_k3baudiotrackwidget.cpp base_k3badvanceddataimagesettings.cpp base_k3bbootimageview.cpp base_k3bdataimagesettings.cpp base_k3bdatavolumedescwidget.cpp base_k3bmovixoptionswidget.cpp  k3bdataview.moc k3baudiodatasourceeditwidget.moc k3bmusicbrainzjob.moc k3bmovixlistview.moc k3baudiotrackwidget.moc k3bmixeddirtreeview.moc k3bdatavolumedescwidget.moc k3bprojectplugindialog.moc k3baudioeditorwidget.moc k3baudioview.moc k3bdvdview.moc k3bdvdburndialog.moc k3baudiotrackview.moc k3bdataimagesettingswidget.moc k3bdatasessionimportdialog.moc k3baudiotrackplayer.moc k3bdataburndialog.moc k3baudiotrackdialog.moc base_k3bbootimageview.moc k3bdataadvancedimagesettingswidget.moc k3bmovixdvdburndialog.moc k3bvcdlistview.moc base_k3baudiocdtextallfieldswidget.moc k3bprojectburndialog.moc k3baudiotracksplitdialog.moc base_k3bdatavolumedescwidget.moc k3bdatapropertiesdialog.moc k3baudiotrackaddingdialog.moc k3bdatafileview.moc base_k3baudiocdtextwidget.moc k3bdataurladdingdialog.moc k3bvcdburndialog.moc k3bview.moc base_k3bdataimagesettings.moc k3baudiocdtextwidget.moc k3bvideodvdburndialog.moc k3bdatadirtreeview.moc k3bbootimageview.moc k3bvcdview.moc k3bmixedburndialog.moc base_k3bmovixoptionswidget.moc k3bmovixoptionswidget.moc k3bmixedview.moc k3bmovixdvdview.moc k3bmovixburndialog.moc k3bfillstatusdisplay.moc k3bvideodvdview.moc k3bdatamultisessioncombobox.moc k3bmovixview.moc k3baudiotracktrmlookupdialog.moc k3baudioburndialog.moc base_k3baudiotrackwidget.moc k3bvcdtrackdialog.moc k3bbootimagedialog.moc base_k3badvanceddataimagesettings.moc
+libprojects_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/k3baudioburndialog.cpp $(srcdir)/k3baudiocdtextwidget.cpp $(srcdir)/k3baudiodatasourceviewitem.cpp $(srcdir)/k3baudioeditorwidget.cpp $(srcdir)/k3baudiotrackdialog.cpp $(srcdir)/k3baudiotrackwidget.cpp $(srcdir)/k3baudiotrackplayer.cpp $(srcdir)/k3baudiotracksplitdialog.cpp $(srcdir)/k3baudiotrackview.cpp $(srcdir)/k3baudiotrackviewitem.cpp $(srcdir)/k3baudioview.cpp $(srcdir)/k3bmixedburndialog.cpp $(srcdir)/k3bmixeddirtreeview.cpp $(srcdir)/k3bmixedview.cpp $(srcdir)/k3bdataadvancedimagesettingswidget.cpp $(srcdir)/k3bdatadirtreeview.cpp $(srcdir)/k3bdatafileview.cpp $(srcdir)/k3bdataimagesettingswidget.cpp $(srcdir)/k3bdatapropertiesdialog.cpp $(srcdir)/k3bdataview.cpp $(srcdir)/k3bdataviewitem.cpp $(srcdir)/k3bdatavolumedescwidget.cpp $(srcdir)/k3bdataburndialog.cpp $(srcdir)/k3bbootimagedialog.cpp $(srcdir)/k3bbootimageview.cpp $(srcdir)/k3bdvdburndialog.cpp $(srcdir)/k3bdvdview.cpp $(srcdir)/k3bmovixburndialog.cpp $(srcdir)/k3bmovixlistview.cpp $(srcdir)/k3bmovixoptionswidget.cpp $(srcdir)/k3bmovixview.cpp $(srcdir)/k3bmovixdvdburndialog.cpp $(srcdir)/k3bmovixdvdview.cpp $(srcdir)/k3bvideodvdburndialog.cpp $(srcdir)/k3bvideodvdview.cpp $(srcdir)/k3bvcdburndialog.cpp $(srcdir)/k3bvcdlistview.cpp $(srcdir)/k3bvcdlistviewitem.cpp $(srcdir)/k3bvcdtrackdialog.cpp $(srcdir)/k3bvcdview.cpp $(srcdir)/k3bfillstatusdisplay.cpp $(srcdir)/k3bview.cpp $(srcdir)/k3bprojectburndialog.cpp $(srcdir)/k3bprojectplugindialog.cpp $(srcdir)/k3baudiotracktrmlookupdialog.cpp $(srcdir)/k3bdatamultisessioncombobox.cpp $(srcdir)/k3bmusicbrainzjob.cpp $(srcdir)/k3bdataurladdingdialog.cpp $(srcdir)/k3bdatasessionimportdialog.cpp $(srcdir)/k3baudiodatasourceeditwidget.cpp $(srcdir)/k3baudiotrackaddingdialog.cpp $(srcdir)/k3bencodingconverter.cpp base_k3baudiocdtextwidget.cpp base_k3baudiocdtextallfieldswidget.cpp base_k3baudiotrackwidget.cpp base_k3badvanceddataimagesettings.cpp base_k3bbootimageview.cpp base_k3bdataimagesettings.cpp base_k3bdatavolumedescwidget.cpp base_k3bmovixoptionswidget.cpp  k3bdataview.moc k3baudiodatasourceeditwidget.moc k3bmusicbrainzjob.moc k3bmovixlistview.moc k3baudiotrackwidget.moc k3bmixeddirtreeview.moc k3bprojectplugindialog.moc k3bdatavolumedescwidget.moc k3baudioeditorwidget.moc k3baudioview.moc k3bdvdview.moc k3baudiotrackview.moc k3bdvdburndialog.moc k3bdataimagesettingswidget.moc k3bdatasessionimportdialog.moc k3baudiotrackplayer.moc k3bdataburndialog.moc k3baudiotrackdialog.moc base_k3bbootimageview.moc k3bdataadvancedimagesettingswidget.moc k3bvcdlistview.moc k3bmovixdvdburndialog.moc base_k3baudiocdtextallfieldswidget.moc k3bprojectburndialog.moc k3baudiotracksplitdialog.moc base_k3bdatavolumedescwidget.moc k3bdatapropertiesdialog.moc k3baudiotrackaddingdialog.moc k3bdatafileview.moc base_k3baudiocdtextwidget.moc k3bvcdburndialog.moc k3bdataurladdingdialog.moc k3bview.moc base_k3bdataimagesettings.moc k3baudiocdtextwidget.moc k3bvideodvdburndialog.moc k3bdatadirtreeview.moc k3bvcdview.moc k3bbootimageview.moc k3bmixedburndialog.moc base_k3bmovixoptionswidget.moc k3bmovixoptionswidget.moc k3bmixedview.moc k3bmovixdvdview.moc k3bmovixburndialog.moc k3bfillstatusdisplay.moc k3bvideodvdview.moc k3bdatamultisessioncombobox.moc k3bmovixview.moc k3baudiotracktrmlookupdialog.moc k3baudioburndialog.moc base_k3baudiotrackwidget.moc k3bvcdtrackdialog.moc k3bbootimagedialog.moc base_k3badvanceddataimagesettings.moc
 	@echo 'creating libprojects_la.all_cpp.cpp ...'; \
 	rm -f libprojects_la.all_cpp.files libprojects_la.all_cpp.final; \
 	echo "#define KDE_USE_FINAL 1" >> libprojects_la.all_cpp.final; \

Modified: kde-extras/k3b/k3b/trunk/src/projects/k3baudioburndialog.cpp
===================================================================
--- kde-extras/k3b/k3b/trunk/src/projects/k3baudioburndialog.cpp	2008-03-04 01:08:55 UTC (rev 9558)
+++ kde-extras/k3b/k3b/trunk/src/projects/k3baudioburndialog.cpp	2008-03-04 01:11:49 UTC (rev 9559)
@@ -297,9 +297,9 @@
 {
   if( on ) {
     // we are not able to normalize in on-the-fly mode
-    if( !k3bcore->externalBinManager()->foundBin( "normalize" ) ) {
-      KMessageBox::sorry( this, i18n("<p><b>External program <em>normalize</em> is not installed.</b>"
-				     "<p>K3b uses <em>normalize</em> (http://www1.cs.columbia.edu/~cvaill/normalize/) "
+    if( !k3bcore->externalBinManager()->foundBin( "normalize-audio" ) ) {
+      KMessageBox::sorry( this, i18n("<p><b>External program <em>normalize-audio</em> is not installed.</b>"
+				     "<p>K3b uses <em>normalize-audio</em> (http://www1.cs.columbia.edu/~cvaill/normalize/) "
 				     "to normalize audio tracks. In order to "
 				     "use this functionality, please install it first.") );
       m_checkNormalize->setChecked( false );

Modified: kde-extras/k3b/k3b/trunk/src/projects/k3bmixedburndialog.cpp
===================================================================
--- kde-extras/k3b/k3b/trunk/src/projects/k3bmixedburndialog.cpp	2008-03-04 01:08:55 UTC (rev 9558)
+++ kde-extras/k3b/k3b/trunk/src/projects/k3bmixedburndialog.cpp	2008-03-04 01:11:49 UTC (rev 9559)
@@ -307,9 +307,9 @@
 {
   if( on ) {
     // we are not able to normalize in on-the-fly mode
-    if( !k3bcore->externalBinManager()->foundBin( "normalize" ) ) {
-      KMessageBox::sorry( this, i18n("<p><b>External program <em>normalize</em> is not installed.</b>"
-				     "<p>K3b uses <em>normalize</em> (http://www1.cs.columbia.edu/~cvaill/normalize/) "
+    if( !k3bcore->externalBinManager()->foundBin( "normalize-audio" ) ) {
+      KMessageBox::sorry( this, i18n("<p><b>External program <em>normalize-audio</em> is not installed.</b>"
+				     "<p>K3b uses <em>normalize-audio</em> (http://www1.cs.columbia.edu/~cvaill/normalize/) "
 				     "to normalize audio tracks. In order to "
 				     "use this functionality, please install it first.") );
       m_checkNormalize->setChecked( false );

Modified: kde-extras/k3b/k3b/trunk/src/projects/kostore/Makefile.in
===================================================================
--- kde-extras/k3b/k3b/trunk/src/projects/kostore/Makefile.in	2008-03-04 01:08:55 UTC (rev 9558)
+++ kde-extras/k3b/k3b/trunk/src/projects/kostore/Makefile.in	2008-03-04 01:11:49 UTC (rev 9559)
@@ -374,9 +374,9 @@
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/projects/kostore/Makefile'; \
+#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/projects/kostore/Makefile'; \
 #>- 	cd $(top_srcdir) && \
-#>- 	  $(AUTOMAKE) --gnu  src/projects/kostore/Makefile
+#>- 	  $(AUTOMAKE) --foreign  src/projects/kostore/Makefile
 #>+ 12
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
@@ -386,9 +386,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/projects/kostore/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/projects/kostore/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  src/projects/kostore/Makefile
+	  $(AUTOMAKE) --foreign  src/projects/kostore/Makefile
 	cd $(top_srcdir) && perl admin/am_edit src/projects/kostore/Makefile.in
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -643,6 +643,7 @@
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
+
 #>+ 2
 KDE_DIST=koZipStore.h SPEC Makefile.in koStoreDevice.h koStoreBase.h README.k3b Makefile.am 
 
@@ -659,9 +660,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/projects/kostore/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/projects/kostore/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  src/projects/kostore/Makefile
+	  $(AUTOMAKE) --foreign  src/projects/kostore/Makefile
 	cd $(top_srcdir) && perl admin/am_edit src/projects/kostore/Makefile.in
 
 

Modified: kde-extras/k3b/k3b/trunk/src/rip/Makefile.in
===================================================================
--- kde-extras/k3b/k3b/trunk/src/rip/Makefile.in	2008-03-04 01:08:55 UTC (rev 9558)
+++ kde-extras/k3b/k3b/trunk/src/rip/Makefile.in	2008-03-04 01:11:49 UTC (rev 9559)
@@ -431,9 +431,9 @@
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/rip/Makefile'; \
+#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/rip/Makefile'; \
 #>- 	cd $(top_srcdir) && \
-#>- 	  $(AUTOMAKE) --gnu  src/rip/Makefile
+#>- 	  $(AUTOMAKE) --foreign  src/rip/Makefile
 #>+ 12
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
@@ -443,9 +443,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/rip/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/rip/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  src/rip/Makefile
+	  $(AUTOMAKE) --foreign  src/rip/Makefile
 	cd $(top_srcdir) && perl admin/am_edit src/rip/Makefile.in
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -814,13 +814,7 @@
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
-#>+ 3
-k3baudioripthread.moc: $(srcdir)/k3baudioripthread.h
-	$(MOC) $(srcdir)/k3baudioripthread.h -o k3baudioripthread.moc
 
-#>+ 2
-mocs: k3baudioripthread.moc
-
 #>+ 3
 k3baudiocdview.moc: $(srcdir)/k3baudiocdview.h
 	$(MOC) $(srcdir)/k3baudiocdview.h -o k3baudiocdview.moc
@@ -829,6 +823,13 @@
 mocs: k3baudiocdview.moc
 
 #>+ 3
+k3baudioripthread.moc: $(srcdir)/k3baudioripthread.h
+	$(MOC) $(srcdir)/k3baudioripthread.h -o k3baudioripthread.moc
+
+#>+ 2
+mocs: k3baudioripthread.moc
+
+#>+ 3
 k3baudiocdlistview.moc: $(srcdir)/k3baudiocdlistview.h
 	$(MOC) $(srcdir)/k3baudiocdlistview.h -o k3baudiocdlistview.moc
 
@@ -843,6 +844,13 @@
 mocs: k3baudioprojectconvertingdialog.moc
 
 #>+ 3
+k3bvideocdinfo.moc: $(srcdir)/k3bvideocdinfo.h
+	$(MOC) $(srcdir)/k3bvideocdinfo.h -o k3bvideocdinfo.moc
+
+#>+ 2
+mocs: k3bvideocdinfo.moc
+
+#>+ 3
 k3bcddbpatternwidget.moc: $(srcdir)/k3bcddbpatternwidget.h
 	$(MOC) $(srcdir)/k3bcddbpatternwidget.h -o k3bcddbpatternwidget.moc
 
@@ -850,11 +858,11 @@
 mocs: k3bcddbpatternwidget.moc
 
 #>+ 3
-k3bvideocdinfo.moc: $(srcdir)/k3bvideocdinfo.h
-	$(MOC) $(srcdir)/k3bvideocdinfo.h -o k3bvideocdinfo.moc
+k3baudiorippingdialog.moc: $(srcdir)/k3baudiorippingdialog.h
+	$(MOC) $(srcdir)/k3baudiorippingdialog.h -o k3baudiorippingdialog.moc
 
 #>+ 2
-mocs: k3bvideocdinfo.moc
+mocs: k3baudiorippingdialog.moc
 
 #>+ 3
 k3bvideocdrippingdialog.moc: $(srcdir)/k3bvideocdrippingdialog.h
@@ -864,13 +872,6 @@
 mocs: k3bvideocdrippingdialog.moc
 
 #>+ 3
-k3baudiorippingdialog.moc: $(srcdir)/k3baudiorippingdialog.h
-	$(MOC) $(srcdir)/k3baudiorippingdialog.h -o k3baudiorippingdialog.moc
-
-#>+ 2
-mocs: k3baudiorippingdialog.moc
-
-#>+ 3
 k3bvideocdrip.moc: $(srcdir)/k3bvideocdrip.h
 	$(MOC) $(srcdir)/k3bvideocdrip.h -o k3bvideocdrip.moc
 
@@ -900,10 +901,10 @@
 
 #>+ 3
 clean-metasources:
-	-rm -f  k3baudioripthread.moc k3baudiocdview.moc k3baudiocdlistview.moc k3baudioprojectconvertingdialog.moc k3bcddbpatternwidget.moc k3bvideocdinfo.moc k3bvideocdrippingdialog.moc k3baudiorippingdialog.moc k3bvideocdrip.moc k3baudioconvertingoptionwidget.moc k3baudioripjob.moc k3bvideocdview.moc
+	-rm -f  k3baudiocdview.moc k3baudioripthread.moc k3baudiocdlistview.moc k3baudioprojectconvertingdialog.moc k3bvideocdinfo.moc k3bcddbpatternwidget.moc k3baudiorippingdialog.moc k3bvideocdrippingdialog.moc k3bvideocdrip.moc k3baudioconvertingoptionwidget.moc k3baudioripjob.moc k3bvideocdview.moc
 
 #>+ 2
-KDE_DIST=k3baudiorippingdialog.h base_k3baudiorippingoptionwidget.ui k3baudiocdlistview.h k3bcddbpatternwidget.h k3baudioprojectconvertingdialog.h k3baudioprojectconvertingthread.h k3bvideocdview.h k3bpatternparser.h k3bvideocdrip.h k3baudiocdview.h k3bcuefilewriter.h k3baudioripjob.h Makefile.in base_k3bcddbpatternwidget.ui k3baudioripthread.h k3bvideocdinfo.h k3bvideocdrippingdialog.h Makefile.am k3bvideocdrippingoptions.h k3baudioconvertingoptionwidget.h 
+KDE_DIST=k3baudiorippingdialog.h base_k3baudiorippingoptionwidget.ui k3baudiocdlistview.h k3bcddbpatternwidget.h k3baudioprojectconvertingdialog.h k3baudioprojectconvertingthread.h k3bvideocdview.h k3bpatternparser.h k3bvideocdrip.h k3baudiocdview.h k3bcuefilewriter.h k3baudioripjob.h base_k3bcddbpatternwidget.ui Makefile.in k3baudioripthread.h k3bvideocdinfo.h k3bvideocdrippingdialog.h k3bvideocdrippingoptions.h Makefile.am k3baudioconvertingoptionwidget.h 
 
 #>+ 5
 clean-ui:
@@ -924,9 +925,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/rip/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/rip/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  src/rip/Makefile
+	  $(AUTOMAKE) --foreign  src/rip/Makefile
 	cd $(top_srcdir) && perl admin/am_edit src/rip/Makefile.in
 
 
@@ -953,7 +954,7 @@
 
 
 #>+ 11
-librip_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/k3bpatternparser.cpp $(srcdir)/k3baudiorippingdialog.cpp $(srcdir)/k3baudioripthread.cpp $(srcdir)/k3baudiocdview.cpp $(srcdir)/k3bcddbpatternwidget.cpp $(srcdir)/k3bvideocdinfo.cpp $(srcdir)/k3bvideocdview.cpp $(srcdir)/k3bvideocdrip.cpp $(srcdir)/k3bvideocdrippingdialog.cpp $(srcdir)/k3bcuefilewriter.cpp $(srcdir)/k3baudioconvertingoptionwidget.cpp $(srcdir)/k3baudiocdlistview.cpp $(srcdir)/k3baudioprojectconvertingdialog.cpp $(srcdir)/k3baudioprojectconvertingthread.cpp $(srcdir)/k3baudioripjob.cpp base_k3baudiorippingoptionwidget.cpp base_k3bcddbpatternwidget.cpp  k3baudiocdview.moc k3baudioripthread.moc k3baudiocdlistview.moc k3baudioprojectconvertingdialog.moc k3bvideocdinfo.moc k3bcddbpatternwidget.moc k3baudiorippingdialog.moc k3bvideocdrippingdialog.moc k3bvideocdrip.moc base_k3bcddbpatternwidget.moc k3baudioconvertingoptionwidget.moc k3baudioripjob.moc k3bvideocdview.moc base_k3baudiorippingoptionwidget.moc
+librip_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/k3bpatternparser.cpp $(srcdir)/k3baudiorippingdialog.cpp $(srcdir)/k3baudioripthread.cpp $(srcdir)/k3baudiocdview.cpp $(srcdir)/k3bcddbpatternwidget.cpp $(srcdir)/k3bvideocdinfo.cpp $(srcdir)/k3bvideocdview.cpp $(srcdir)/k3bvideocdrip.cpp $(srcdir)/k3bvideocdrippingdialog.cpp $(srcdir)/k3bcuefilewriter.cpp $(srcdir)/k3baudioconvertingoptionwidget.cpp $(srcdir)/k3baudiocdlistview.cpp $(srcdir)/k3baudioprojectconvertingdialog.cpp $(srcdir)/k3baudioprojectconvertingthread.cpp $(srcdir)/k3baudioripjob.cpp base_k3baudiorippingoptionwidget.cpp base_k3bcddbpatternwidget.cpp  k3baudioripthread.moc k3baudiocdview.moc k3baudiocdlistview.moc k3baudioprojectconvertingdialog.moc k3bcddbpatternwidget.moc k3bvideocdinfo.moc k3bvideocdrippingdialog.moc k3baudiorippingdialog.moc k3bvideocdrip.moc base_k3bcddbpatternwidget.moc k3baudioconvertingoptionwidget.moc k3baudioripjob.moc k3bvideocdview.moc base_k3baudiorippingoptionwidget.moc
 	@echo 'creating librip_la.all_cpp.cpp ...'; \
 	rm -f librip_la.all_cpp.files librip_la.all_cpp.final; \
 	echo "#define KDE_USE_FINAL 1" >> librip_la.all_cpp.final; \

Modified: kde-extras/k3b/k3b/trunk/src/rip/videodvd/Makefile.in
===================================================================
--- kde-extras/k3b/k3b/trunk/src/rip/videodvd/Makefile.in	2008-03-04 01:08:55 UTC (rev 9558)
+++ kde-extras/k3b/k3b/trunk/src/rip/videodvd/Makefile.in	2008-03-04 01:11:49 UTC (rev 9559)
@@ -392,9 +392,9 @@
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/rip/videodvd/Makefile'; \
+#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/rip/videodvd/Makefile'; \
 #>- 	cd $(top_srcdir) && \
-#>- 	  $(AUTOMAKE) --gnu  src/rip/videodvd/Makefile
+#>- 	  $(AUTOMAKE) --foreign  src/rip/videodvd/Makefile
 #>+ 12
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
@@ -404,9 +404,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/rip/videodvd/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/rip/videodvd/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  src/rip/videodvd/Makefile
+	  $(AUTOMAKE) --foreign  src/rip/videodvd/Makefile
 	cd $(top_srcdir) && perl admin/am_edit src/rip/videodvd/Makefile.in
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -662,6 +662,7 @@
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
+
 #>+ 3
 k3bvideodvdrippingtitlelistview.moc: $(srcdir)/k3bvideodvdrippingtitlelistview.h
 	$(MOC) $(srcdir)/k3bvideodvdrippingtitlelistview.h -o k3bvideodvdrippingtitlelistview.moc
@@ -729,9 +730,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/rip/videodvd/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/rip/videodvd/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  src/rip/videodvd/Makefile
+	  $(AUTOMAKE) --foreign  src/rip/videodvd/Makefile
 	cd $(top_srcdir) && perl admin/am_edit src/rip/videodvd/Makefile.in
 
 

Modified: kde-extras/k3b/k3b/trunk/src/sounds/Makefile.in
===================================================================
--- kde-extras/k3b/k3b/trunk/src/sounds/Makefile.in	2008-03-04 01:08:55 UTC (rev 9558)
+++ kde-extras/k3b/k3b/trunk/src/sounds/Makefile.in	2008-03-04 01:11:49 UTC (rev 9559)
@@ -343,9 +343,9 @@
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/sounds/Makefile'; \
+#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/sounds/Makefile'; \
 #>- 	cd $(top_srcdir) && \
-#>- 	  $(AUTOMAKE) --gnu  src/sounds/Makefile
+#>- 	  $(AUTOMAKE) --foreign  src/sounds/Makefile
 #>+ 12
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
@@ -355,9 +355,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/sounds/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/sounds/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  src/sounds/Makefile
+	  $(AUTOMAKE) --foreign  src/sounds/Makefile
 	cd $(top_srcdir) && perl admin/am_edit src/sounds/Makefile.in
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -539,6 +539,7 @@
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
+
 #>+ 2
 KDE_DIST=k3b_error1.wav k3b_success1.wav Makefile.in k3b_wait_media1.wav Makefile.am 
 
@@ -555,9 +556,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/sounds/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/sounds/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  src/sounds/Makefile
+	  $(AUTOMAKE) --foreign  src/sounds/Makefile
 	cd $(top_srcdir) && perl admin/am_edit src/sounds/Makefile.in
 
 




More information about the pkg-kde-commits mailing list