rev 10849 - in kde-extras/k3b/branches/upstream/current: . admin 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 Jun 3 01:26:02 UTC 2008
Author: francois
Date: 2008-06-03 01:26:01 +0000 (Tue, 03 Jun 2008)
New Revision: 10849
Modified:
kde-extras/k3b/branches/upstream/current/ChangeLog
kde-extras/k3b/branches/upstream/current/Makefile.in
kde-extras/k3b/branches/upstream/current/acinclude.m4
kde-extras/k3b/branches/upstream/current/aclocal.m4
kde-extras/k3b/branches/upstream/current/admin/Doxyfile.am
kde-extras/k3b/branches/upstream/current/admin/acinclude.m4.in
kde-extras/k3b/branches/upstream/current/admin/cvs.sh
kde-extras/k3b/branches/upstream/current/admin/detect-autoconf.pl
kde-extras/k3b/branches/upstream/current/configure
kde-extras/k3b/branches/upstream/current/configure.in
kde-extras/k3b/branches/upstream/current/doc/Makefile.in
kde-extras/k3b/branches/upstream/current/k3bsetup/Makefile.in
kde-extras/k3b/branches/upstream/current/k3bsetup/k3bsetup2.desktop
kde-extras/k3b/branches/upstream/current/kfile-plugins/Makefile.in
kde-extras/k3b/branches/upstream/current/kfile-plugins/k3bproject/Makefile.in
kde-extras/k3b/branches/upstream/current/kfile-plugins/k3bproject/kfile_k3b.desktop
kde-extras/k3b/branches/upstream/current/kioslaves/Makefile.in
kde-extras/k3b/branches/upstream/current/kioslaves/videodvd/Makefile.in
kde-extras/k3b/branches/upstream/current/kioslaves/videodvd/videodvd.desktop
kde-extras/k3b/branches/upstream/current/kioslaves/videodvd/videodvd.protocol
kde-extras/k3b/branches/upstream/current/libk3b/Makefile.in
kde-extras/k3b/branches/upstream/current/libk3b/cddb/Makefile.am
kde-extras/k3b/branches/upstream/current/libk3b/cddb/Makefile.in
kde-extras/k3b/branches/upstream/current/libk3b/cddb/k3bcddbresult.h
kde-extras/k3b/branches/upstream/current/libk3b/core/Makefile.in
kde-extras/k3b/branches/upstream/current/libk3b/core/k3bcore.h
kde-extras/k3b/branches/upstream/current/libk3b/jobs/Makefile.in
kde-extras/k3b/branches/upstream/current/libk3b/jobs/k3bverificationjob.cpp
kde-extras/k3b/branches/upstream/current/libk3b/plugin/Makefile.in
kde-extras/k3b/branches/upstream/current/libk3b/plugin/libsamplerate/Makefile.in
kde-extras/k3b/branches/upstream/current/libk3b/projects/Makefile.in
kde-extras/k3b/branches/upstream/current/libk3b/projects/audiocd/Makefile.in
kde-extras/k3b/branches/upstream/current/libk3b/projects/datacd/Makefile.in
kde-extras/k3b/branches/upstream/current/libk3b/projects/datacd/k3bmkisofshandler.cpp
kde-extras/k3b/branches/upstream/current/libk3b/projects/datadvd/Makefile.in
kde-extras/k3b/branches/upstream/current/libk3b/projects/mixedcd/Makefile.in
kde-extras/k3b/branches/upstream/current/libk3b/projects/movixcd/Makefile.in
kde-extras/k3b/branches/upstream/current/libk3b/projects/movixdvd/Makefile.in
kde-extras/k3b/branches/upstream/current/libk3b/projects/videocd/Makefile.in
kde-extras/k3b/branches/upstream/current/libk3b/projects/videocd/cdi/Makefile.in
kde-extras/k3b/branches/upstream/current/libk3b/projects/videocd/extra/Makefile.in
kde-extras/k3b/branches/upstream/current/libk3b/projects/videocd/mpeginfo/Makefile.in
kde-extras/k3b/branches/upstream/current/libk3b/projects/videodvd/Makefile.in
kde-extras/k3b/branches/upstream/current/libk3b/scripts/Makefile.in
kde-extras/k3b/branches/upstream/current/libk3b/tools/Makefile.in
kde-extras/k3b/branches/upstream/current/libk3b/tools/k3blistview.cpp
kde-extras/k3b/branches/upstream/current/libk3b/tools/libisofs/Makefile.in
kde-extras/k3b/branches/upstream/current/libk3b/videodvd/Makefile.in
kde-extras/k3b/branches/upstream/current/libk3bdevice/Makefile.in
kde-extras/k3b/branches/upstream/current/libk3bdevice/k3bhalconnection.cpp
kde-extras/k3b/branches/upstream/current/plugins/Makefile.in
kde-extras/k3b/branches/upstream/current/plugins/audiooutput/Makefile.in
kde-extras/k3b/branches/upstream/current/plugins/audiooutput/alsa/Makefile.in
kde-extras/k3b/branches/upstream/current/plugins/audiooutput/arts/Makefile.in
kde-extras/k3b/branches/upstream/current/plugins/decoder/Makefile.in
kde-extras/k3b/branches/upstream/current/plugins/decoder/ffmpeg/Makefile.in
kde-extras/k3b/branches/upstream/current/plugins/decoder/flac/Makefile.in
kde-extras/k3b/branches/upstream/current/plugins/decoder/libsndfile/Makefile.in
kde-extras/k3b/branches/upstream/current/plugins/decoder/mp3/Makefile.in
kde-extras/k3b/branches/upstream/current/plugins/decoder/musepack/Makefile.in
kde-extras/k3b/branches/upstream/current/plugins/decoder/ogg/Makefile.in
kde-extras/k3b/branches/upstream/current/plugins/decoder/wave/Makefile.in
kde-extras/k3b/branches/upstream/current/plugins/encoder/Makefile.in
kde-extras/k3b/branches/upstream/current/plugins/encoder/external/Makefile.in
kde-extras/k3b/branches/upstream/current/plugins/encoder/lame/Makefile.in
kde-extras/k3b/branches/upstream/current/plugins/encoder/ogg/Makefile.in
kde-extras/k3b/branches/upstream/current/plugins/encoder/sox/Makefile.in
kde-extras/k3b/branches/upstream/current/plugins/project/Makefile.in
kde-extras/k3b/branches/upstream/current/plugins/project/audiometainforenamer/Makefile.in
kde-extras/k3b/branches/upstream/current/plugins/project/audioprojectcddb/Makefile.in
kde-extras/k3b/branches/upstream/current/src/Makefile.in
kde-extras/k3b/branches/upstream/current/src/eventsrc
kde-extras/k3b/branches/upstream/current/src/fastscale/Makefile.in
kde-extras/k3b/branches/upstream/current/src/icons/Makefile.in
kde-extras/k3b/branches/upstream/current/src/icons/actions/Makefile.in
kde-extras/k3b/branches/upstream/current/src/k3b.desktop
kde-extras/k3b/branches/upstream/current/src/k3bapplication.cpp
kde-extras/k3b/branches/upstream/current/src/k3bmediaselectioncombobox.cpp
kde-extras/k3b/branches/upstream/current/src/konqi/Makefile.in
kde-extras/k3b/branches/upstream/current/src/konqi/k3b_audiocd_rip.desktop
kde-extras/k3b/branches/upstream/current/src/konqi/k3b_cd_copy.desktop
kde-extras/k3b/branches/upstream/current/src/konqi/k3b_create_audio_cd.desktop
kde-extras/k3b/branches/upstream/current/src/konqi/k3b_create_data_cd.desktop
kde-extras/k3b/branches/upstream/current/src/konqi/k3b_create_data_dvd.desktop
kde-extras/k3b/branches/upstream/current/src/konqi/k3b_create_video_cd.desktop
kde-extras/k3b/branches/upstream/current/src/konqi/k3b_dvd_copy.desktop
kde-extras/k3b/branches/upstream/current/src/konqi/k3b_handle_empty_cd.desktop
kde-extras/k3b/branches/upstream/current/src/konqi/k3b_handle_empty_dvd.desktop
kde-extras/k3b/branches/upstream/current/src/konqi/k3b_videodvd_rip.desktop
kde-extras/k3b/branches/upstream/current/src/konqi/k3b_write_bin_image.desktop
kde-extras/k3b/branches/upstream/current/src/konqi/k3b_write_iso_image.desktop
kde-extras/k3b/branches/upstream/current/src/mimetypes/Makefile.in
kde-extras/k3b/branches/upstream/current/src/mimetypes/x-k3b.desktop
kde-extras/k3b/branches/upstream/current/src/misc/Makefile.in
kde-extras/k3b/branches/upstream/current/src/misc/k3bcdcopydialog.cpp
kde-extras/k3b/branches/upstream/current/src/misc/k3bcdcopydialog.h
kde-extras/k3b/branches/upstream/current/src/misc/k3bdvdcopydialog.cpp
kde-extras/k3b/branches/upstream/current/src/option/Makefile.in
kde-extras/k3b/branches/upstream/current/src/pics/73lab/Makefile.in
kde-extras/k3b/branches/upstream/current/src/pics/Makefile.in
kde-extras/k3b/branches/upstream/current/src/pics/RobsTheme/Makefile.in
kde-extras/k3b/branches/upstream/current/src/pics/crystal/Makefile.in
kde-extras/k3b/branches/upstream/current/src/pics/quant/Makefile.in
kde-extras/k3b/branches/upstream/current/src/projects/Makefile.in
kde-extras/k3b/branches/upstream/current/src/projects/k3bfillstatusdisplay.cpp
kde-extras/k3b/branches/upstream/current/src/projects/kostore/Makefile.in
kde-extras/k3b/branches/upstream/current/src/rip/Makefile.in
kde-extras/k3b/branches/upstream/current/src/rip/videodvd/Makefile.in
kde-extras/k3b/branches/upstream/current/src/sounds/Makefile.in
Log:
[svn-upgrade] Integrating new upstream version, k3b (1.0.5)
Modified: kde-extras/k3b/branches/upstream/current/ChangeLog
===================================================================
--- kde-extras/k3b/branches/upstream/current/ChangeLog 2008-06-03 01:21:42 UTC (rev 10848)
+++ kde-extras/k3b/branches/upstream/current/ChangeLog 2008-06-03 01:26:01 UTC (rev 10849)
@@ -1,3 +1,9 @@
+1.0.5
+=====
+ * Fix CD Copy device selection (Bug 151924)
+ * Fixed HAL mounting (thanks to Ken Milmore)
+ * Always wait for the drive to become ready before starting verification.
+
1.0.4
=====
* Never use growisofs parameter -dvd-compat with DVD-RW media in restricted overwrite mode
Modified: kde-extras/k3b/branches/upstream/current/Makefile.in
===================================================================
--- kde-extras/k3b/branches/upstream/current/Makefile.in 2008-06-03 01:21:42 UTC (rev 10848)
+++ kde-extras/k3b/branches/upstream/current/Makefile.in 2008-06-03 01:26:01 UTC (rev 10849)
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
# KDE tags expanded automatically by am_edit - $Revision: 483858 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -519,8 +519,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
tags: TAGS
@@ -545,8 +545,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -556,13 +556,12 @@
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
- here=`pwd`; \
list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
@@ -633,6 +632,10 @@
tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
$(am__remove_distdir)
+dist-lzma: distdir
+ tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
+ $(am__remove_distdir)
+
dist-tarZ: distdir
tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
$(am__remove_distdir)
@@ -659,6 +662,8 @@
GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
*.tar.bz2*) \
bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
+ *.tar.lzma*) \
+ unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\
*.tar.Z*) \
uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
*.shar.gz*) \
@@ -814,8 +819,8 @@
.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
all all-am am--refresh check check-am clean clean-generic \
clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \
- dist-gzip dist-shar dist-tarZ dist-zip distcheck distclean \
- distclean-generic distclean-hdr distclean-libtool \
+ dist-gzip dist-lzma dist-shar dist-tarZ dist-zip distcheck \
+ distclean distclean-generic distclean-hdr distclean-libtool \
distclean-tags distcleancheck distdir distuninstallcheck dvi \
dvi-am html html-am info info-am install install-am \
install-data install-data-am install-dvi install-dvi-am \
Modified: kde-extras/k3b/branches/upstream/current/acinclude.m4
===================================================================
--- kde-extras/k3b/branches/upstream/current/acinclude.m4 2008-06-03 01:21:42 UTC (rev 10848)
+++ kde-extras/k3b/branches/upstream/current/acinclude.m4 2008-06-03 01:26:01 UTC (rev 10849)
@@ -1226,7 +1226,15 @@
kde_qt_dirs="$QTDIR /usr/lib/qt4 /usr/lib/qt /usr/share/qt4"
fi
if test $kde_qtver = 3; then
- kde_qt_dirs="$QTDIR /usr/lib/qt3 /usr/lib/qt /usr/share/qt3"
+ kde_qt_dirs="$QTDIR /usr/lib/qt3 /usr/lib/qt /usr/share/qt3 /usr/lib${kdelibsuff}/qt-3.3"
+ if test -z "$PKG_CONFIG"; then
+ AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
+ fi
+ if test "$PKG_CONFIG" != "no" ; then
+ if $PKG_CONFIG --exists qt-mt ; then
+ kde_qt_dirs="$kde_qt_dirs `$PKG_CONFIG --variable=prefix qt-mt`"
+ fi
+ fi
fi
if test $kde_qtver = 2; then
kde_qt_dirs="$QTDIR /usr/lib/qt2 /usr/lib/qt"
@@ -1443,6 +1451,14 @@
for dir in $kde_qt_dirs; do
qt_incdirs="$qt_incdirs $dir/include $dir"
done
+if test -z "$PKG_CONFIG"; then
+ AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
+fi
+if test "$PKG_CONFIG" != "no" ; then
+ if $PKG_CONFIG --exists qt-mt ; then
+ qt_incdirs="$qt_incdirs `$PKG_CONFIG --variable=includedir qt-mt`"
+ fi
+fi
qt_incdirs="$QTINC $qt_incdirs /usr/local/qt/include /usr/include/qt /usr/include /usr/X11R6/include/X11/qt /usr/X11R6/include/qt /usr/X11R6/include/qt2 /usr/include/qt3 $x_includes"
if test ! "$ac_qt_includes" = "NO"; then
qt_incdirs="$ac_qt_includes $qt_incdirs"
@@ -1459,8 +1475,16 @@
qt_libdirs=""
for dir in $kde_qt_dirs; do
- qt_libdirs="$qt_libdirs $dir/lib${kdelibsuff} $dir"
+ qt_libdirs="$qt_libdirs $dir/lib${kdelibsuff} $dir/lib $dir"
done
+if test -z "$PKG_CONFIG"; then
+ AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
+fi
+if test "$PKG_CONFIG" != "no" ; then
+ if $PKG_CONFIG --exists qt-mt ; then
+ qt_libdirs="$qt_incdirs `$PKG_CONFIG --variable=libdir qt-mt`"
+ fi
+fi
qt_libdirs="$QTLIB $qt_libdirs /usr/X11R6/lib /usr/lib /usr/local/qt/lib $x_libraries"
if test ! "$ac_qt_libraries" = "NO"; then
qt_libdir=$ac_qt_libraries
@@ -2739,11 +2763,11 @@
echo "*** to the full path to pkg-config."
echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
else
- if !(`$PKG_CONFIG --exists OpenEXR`) ; then
+ if ! $PKG_CONFIG --exists OpenEXR ; then
AC_MSG_RESULT(no)
EXRSTATUS=no
else
- if !(`$PKG_CONFIG --atleast-version="1.1.1" OpenEXR`) ; then
+ if ! $PKG_CONFIG --atleast-version="1.1.1" OpenEXR ; then
AC_MSG_RESULT(no)
EXRSTATUS=old
else
Modified: kde-extras/k3b/branches/upstream/current/aclocal.m4
===================================================================
--- kde-extras/k3b/branches/upstream/current/aclocal.m4 2008-06-03 01:21:42 UTC (rev 10848)
+++ kde-extras/k3b/branches/upstream/current/aclocal.m4 2008-06-03 01:26:01 UTC (rev 10849)
@@ -1,7 +1,7 @@
-# generated automatically by aclocal 1.10 -*- Autoconf -*-
+# generated automatically by aclocal 1.10.1 -*- Autoconf -*-
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006 Free Software Foundation, Inc.
+# 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -11,12 +11,15 @@
# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
# PARTICULAR PURPOSE.
-m4_if(m4_PACKAGE_VERSION, [2.61],,
-[m4_fatal([this file was generated for autoconf 2.61.
-You have another version of autoconf. If you want to use that,
-you should regenerate the build system entirely.], [63])])
+m4_ifndef([AC_AUTOCONF_VERSION],
+ [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
+m4_if(AC_AUTOCONF_VERSION, [2.61],,
+[m4_warning([this file was generated for autoconf 2.61.
+You have another version of autoconf. It may work, but is not guaranteed to.
+If you have problems, you may need to regenerate the build system entirely.
+To do so, use the procedure documented by the package, typically `autoreconf'.])])
-# Copyright (C) 2002, 2003, 2005, 2006 Free Software Foundation, Inc.
+# Copyright (C) 2002, 2003, 2005, 2006, 2007 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -31,7 +34,7 @@
[am__api_version='1.10'
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
dnl require some minimum version. Point them to the right macro.
-m4_if([$1], [1.10], [],
+m4_if([$1], [1.10.1], [],
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
])
@@ -47,8 +50,10 @@
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.10])dnl
-_AM_AUTOCONF_VERSION(m4_PACKAGE_VERSION)])
+[AM_AUTOMAKE_VERSION([1.10.1])dnl
+m4_ifndef([AC_AUTOCONF_VERSION],
+ [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
+_AM_AUTOCONF_VERSION(AC_AUTOCONF_VERSION)])
# Figure out how to run the assembler. -*- Autoconf -*-
@@ -342,7 +347,7 @@
# each Makefile.in and add a new line on top of each file to say so.
# Grep'ing the whole file is not good either: AIX grep has a line
# limit of 2048, but all sed's we know have understand at least 4000.
- if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then
+ if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
dirpart=`AS_DIRNAME("$mf")`
else
continue
@@ -402,13 +407,13 @@
# Do all the work for Automake. -*- Autoconf -*-
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006 Free Software Foundation, Inc.
+# 2005, 2006, 2008 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-# serial 12
+# serial 13
# This macro actually does too much. Some checks are only needed if
# your package does certain things. But this isn't really a big deal.
@@ -513,16 +518,17 @@
# our stamp files there.
AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
[# Compute $1's index in $config_headers.
+_am_arg=$1
_am_stamp_count=1
for _am_header in $config_headers :; do
case $_am_header in
- $1 | $1:* )
+ $_am_arg | $_am_arg:* )
break ;;
* )
_am_stamp_count=`expr $_am_stamp_count + 1` ;;
esac
done
-echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count])
+echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
#
@@ -794,7 +800,7 @@
# _AM_SUBST_NOTMAKE(VARIABLE)
# ---------------------------
-# Prevent Automake from outputing VARIABLE = @VARIABLE@ in Makefile.in.
+# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
# This macro is traced by Automake.
AC_DEFUN([_AM_SUBST_NOTMAKE])
Modified: kde-extras/k3b/branches/upstream/current/admin/Doxyfile.am
===================================================================
--- kde-extras/k3b/branches/upstream/current/admin/Doxyfile.am 2008-06-03 01:21:42 UTC (rev 10848)
+++ kde-extras/k3b/branches/upstream/current/admin/Doxyfile.am 2008-06-03 01:26:01 UTC (rev 10849)
@@ -72,11 +72,11 @@
uninstall-apidox:
@if test "$(subdir)" != "."; then \
if test -d $(DESTDIR)$(kde_htmldir)/en/$(PACKAGE)-apidocs/$(subdir); then \
- rm -rfv $(DESTDIR)$(kde_htmldir)/en/$(PACKAGE)-apidocs/$(subdir); \
+ rm -rf $(DESTDIR)$(kde_htmldir)/en/$(PACKAGE)-apidocs/$(subdir); \
fi \
else \
if test -d $(DESTDIR)$(kde_htmldir)/en/$(PACKAGE)-apidocs; then \
- rm -rfv $(DESTDIR)$(kde_htmldir)/en/$(PACKAGE)-apidocs; \
+ rm -rf $(DESTDIR)$(kde_htmldir)/en/$(PACKAGE)-apidocs; \
fi \
fi
Modified: kde-extras/k3b/branches/upstream/current/admin/acinclude.m4.in
===================================================================
--- kde-extras/k3b/branches/upstream/current/admin/acinclude.m4.in 2008-06-03 01:21:42 UTC (rev 10848)
+++ kde-extras/k3b/branches/upstream/current/admin/acinclude.m4.in 2008-06-03 01:26:01 UTC (rev 10849)
@@ -1226,7 +1226,15 @@
kde_qt_dirs="$QTDIR /usr/lib/qt4 /usr/lib/qt /usr/share/qt4"
fi
if test $kde_qtver = 3; then
- kde_qt_dirs="$QTDIR /usr/lib/qt3 /usr/lib/qt /usr/share/qt3"
+ kde_qt_dirs="$QTDIR /usr/lib/qt3 /usr/lib/qt /usr/share/qt3 /usr/lib${kdelibsuff}/qt-3.3"
+ if test -z "$PKG_CONFIG"; then
+ AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
+ fi
+ if test "$PKG_CONFIG" != "no" ; then
+ if $PKG_CONFIG --exists qt-mt ; then
+ kde_qt_dirs="$kde_qt_dirs `$PKG_CONFIG --variable=prefix qt-mt`"
+ fi
+ fi
fi
if test $kde_qtver = 2; then
kde_qt_dirs="$QTDIR /usr/lib/qt2 /usr/lib/qt"
@@ -1443,6 +1451,14 @@
for dir in $kde_qt_dirs; do
qt_incdirs="$qt_incdirs $dir/include $dir"
done
+if test -z "$PKG_CONFIG"; then
+ AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
+fi
+if test "$PKG_CONFIG" != "no" ; then
+ if $PKG_CONFIG --exists qt-mt ; then
+ qt_incdirs="$qt_incdirs `$PKG_CONFIG --variable=includedir qt-mt`"
+ fi
+fi
qt_incdirs="$QTINC $qt_incdirs /usr/local/qt/include /usr/include/qt /usr/include /usr/X11R6/include/X11/qt /usr/X11R6/include/qt /usr/X11R6/include/qt2 /usr/include/qt3 $x_includes"
if test ! "$ac_qt_includes" = "NO"; then
qt_incdirs="$ac_qt_includes $qt_incdirs"
@@ -1459,8 +1475,16 @@
qt_libdirs=""
for dir in $kde_qt_dirs; do
- qt_libdirs="$qt_libdirs $dir/lib${kdelibsuff} $dir"
+ qt_libdirs="$qt_libdirs $dir/lib${kdelibsuff} $dir/lib $dir"
done
+if test -z "$PKG_CONFIG"; then
+ AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
+fi
+if test "$PKG_CONFIG" != "no" ; then
+ if $PKG_CONFIG --exists qt-mt ; then
+ qt_libdirs="$qt_incdirs `$PKG_CONFIG --variable=libdir qt-mt`"
+ fi
+fi
qt_libdirs="$QTLIB $qt_libdirs /usr/X11R6/lib /usr/lib /usr/local/qt/lib $x_libraries"
if test ! "$ac_qt_libraries" = "NO"; then
qt_libdir=$ac_qt_libraries
@@ -2739,11 +2763,11 @@
echo "*** to the full path to pkg-config."
echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
else
- if !(`$PKG_CONFIG --exists OpenEXR`) ; then
+ if ! $PKG_CONFIG --exists OpenEXR ; then
AC_MSG_RESULT(no)
EXRSTATUS=no
else
- if !(`$PKG_CONFIG --atleast-version="1.1.1" OpenEXR`) ; then
+ if ! $PKG_CONFIG --atleast-version="1.1.1" OpenEXR ; then
AC_MSG_RESULT(no)
EXRSTATUS=old
else
Modified: kde-extras/k3b/branches/upstream/current/admin/cvs.sh
===================================================================
--- kde-extras/k3b/branches/upstream/current/admin/cvs.sh 2008-06-03 01:21:42 UTC (rev 10848)
+++ kde-extras/k3b/branches/upstream/current/admin/cvs.sh 2008-06-03 01:26:01 UTC (rev 10849)
@@ -316,7 +316,7 @@
fi
fi
if test -z "$VERSION" || test "$VERSION" = "@VERSION@"; then
- VERSION="\"3.5.8\""
+ VERSION="\"3.5.9\""
fi
if test -z "$modulename" || test "$modulename" = "@MODULENAME@"; then
modulename=`pwd`;
Modified: kde-extras/k3b/branches/upstream/current/admin/detect-autoconf.pl
===================================================================
--- kde-extras/k3b/branches/upstream/current/admin/detect-autoconf.pl 2008-06-03 01:21:42 UTC (rev 10848)
+++ kde-extras/k3b/branches/upstream/current/admin/detect-autoconf.pl 2008-06-03 01:26:01 UTC (rev 10849)
@@ -220,12 +220,12 @@
($automake_suffix) = $automake =~ /.*automake(.*)$/;
-# Use unsermake if we found it.
-$automake = "$unsermake -c" if $unsermake;
-
# Find matching automake companions.
$aclocal = findProgram('aclocal', $automake_suffix);
+# Use unsermake if we found it.
+$automake = "$unsermake -c" if ($unsermake and $aclocal);
+
$which = findWhich();
# Make sure we have all of the needed programs.
@@ -233,8 +233,7 @@
{
unless(${$i})
{
- print "# Unable to find $i!!\n";
- exit 1;
+ print STDERR "# Unable to find $i!!\n";
}
}
Modified: kde-extras/k3b/branches/upstream/current/configure
===================================================================
--- kde-extras/k3b/branches/upstream/current/configure 2008-06-03 01:21:42 UTC (rev 10848)
+++ kde-extras/k3b/branches/upstream/current/configure 2008-06-03 01:26:01 UTC (rev 10849)
@@ -900,6 +900,7 @@
MSGFMT
GMSGFMT
XGETTEXT
+PKG_CONFIG
LIBUTIL
LIBCOMPAT
LIBCRYPT
@@ -1036,7 +1037,6 @@
include_HAL_TRUE
include_HAL_FALSE
HAL_DBUS_LIBS
-PKG_CONFIG
ALSA_CFLAGS
ALSA_LIBS
include_ALSA_TRUE
@@ -2678,8 +2678,8 @@
# Define the identity of the package.
- PACKAGE=k3b-1.0.4
- VERSION="3.5.8"
+ PACKAGE=k3b-1.0.5
+ VERSION="3.5.9"
cat >>confdefs.h <<_ACEOF
@@ -22913,8 +22913,56 @@
kde_qt_dirs="$QTDIR /usr/lib/qt4 /usr/lib/qt /usr/share/qt4"
fi
if test $kde_qtver = 3; then
- kde_qt_dirs="$QTDIR /usr/lib/qt3 /usr/lib/qt /usr/share/qt3"
+ kde_qt_dirs="$QTDIR /usr/lib/qt3 /usr/lib/qt /usr/share/qt3 /usr/lib${kdelibsuff}/qt-3.3"
+ if test -z "$PKG_CONFIG"; then
+ # Extract the first word of "pkg-config", so it can be a program name with args.
+set dummy pkg-config; ac_word=$2
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ case $PKG_CONFIG in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+IFS=$as_save_IFS
+
+ test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
+ ;;
+esac
fi
+PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+if test -n "$PKG_CONFIG"; then
+ { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
+echo "${ECHO_T}$PKG_CONFIG" >&6; }
+else
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
+
+
+ fi
+ if test "$PKG_CONFIG" != "no" ; then
+ if $PKG_CONFIG --exists qt-mt ; then
+ kde_qt_dirs="$kde_qt_dirs `$PKG_CONFIG --variable=prefix qt-mt`"
+ fi
+ fi
+fi
if test $kde_qtver = 2; then
kde_qt_dirs="$QTDIR /usr/lib/qt2 /usr/lib/qt"
fi
@@ -30155,7 +30203,7 @@
do
for j in jpeglib.h;
do
- echo "configure: 30158: $i/$j" >&5
+ echo "configure: 30206: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
jpeg_incdir=$i
@@ -30436,6 +30484,54 @@
for dir in $kde_qt_dirs; do
qt_incdirs="$qt_incdirs $dir/include $dir"
done
+if test -z "$PKG_CONFIG"; then
+ # Extract the first word of "pkg-config", so it can be a program name with args.
+set dummy pkg-config; ac_word=$2
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ case $PKG_CONFIG in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+IFS=$as_save_IFS
+
+ test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
+ ;;
+esac
+fi
+PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+if test -n "$PKG_CONFIG"; then
+ { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
+echo "${ECHO_T}$PKG_CONFIG" >&6; }
+else
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
+
+
+fi
+if test "$PKG_CONFIG" != "no" ; then
+ if $PKG_CONFIG --exists qt-mt ; then
+ qt_incdirs="$qt_incdirs `$PKG_CONFIG --variable=includedir qt-mt`"
+ fi
+fi
qt_incdirs="$QTINC $qt_incdirs /usr/local/qt/include /usr/include/qt /usr/include /usr/X11R6/include/X11/qt /usr/X11R6/include/qt /usr/X11R6/include/qt2 /usr/include/qt3 $x_includes"
if test ! "$ac_qt_includes" = "NO"; then
qt_incdirs="$ac_qt_includes $qt_incdirs"
@@ -30453,7 +30549,7 @@
do
for j in $kde_qt_header;
do
- echo "configure: 30456: $i/$j" >&5
+ echo "configure: 30552: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
qt_incdir=$i
@@ -30466,8 +30562,56 @@
qt_libdirs=""
for dir in $kde_qt_dirs; do
- qt_libdirs="$qt_libdirs $dir/lib${kdelibsuff} $dir"
+ qt_libdirs="$qt_libdirs $dir/lib${kdelibsuff} $dir/lib $dir"
done
+if test -z "$PKG_CONFIG"; then
+ # Extract the first word of "pkg-config", so it can be a program name with args.
+set dummy pkg-config; ac_word=$2
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ case $PKG_CONFIG in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+IFS=$as_save_IFS
+
+ test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
+ ;;
+esac
+fi
+PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+if test -n "$PKG_CONFIG"; then
+ { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
+echo "${ECHO_T}$PKG_CONFIG" >&6; }
+else
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
+
+
+fi
+if test "$PKG_CONFIG" != "no" ; then
+ if $PKG_CONFIG --exists qt-mt ; then
+ qt_libdirs="$qt_incdirs `$PKG_CONFIG --variable=libdir qt-mt`"
+ fi
+fi
qt_libdirs="$QTLIB $qt_libdirs /usr/X11R6/lib /usr/lib /usr/local/qt/lib $x_libraries"
if test ! "$ac_qt_libraries" = "NO"; then
qt_libdir=$ac_qt_libraries
@@ -31284,7 +31428,7 @@
do
for j in $kde_check_header;
do
- echo "configure: 31287: $i/$j" >&5
+ echo "configure: 31431: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
kde_incdir=$i
@@ -31314,7 +31458,7 @@
do
for j in $kde_check_lib;
do
- echo "configure: 31317: $i/$j" >&5
+ echo "configure: 31461: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
kde_libdir=$i
@@ -31332,7 +31476,7 @@
do
for j in "kde3/plugins/designer/kdewidgets.la";
do
- echo "configure: 31335: $i/$j" >&5
+ echo "configure: 31479: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
kde_widgetdir=$i
@@ -32851,7 +32995,7 @@
do
for j in apps/ksgmltools2/customization/kde-chunk.xsl;
do
- echo "configure: 32854: $i/$j" >&5
+ echo "configure: 32998: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
KDE_XSL_STYLESHEET=$i
@@ -36090,7 +36234,7 @@
do
for j in libhal.h libhal-storage.h;
do
- echo "configure: 36093: $i/$j" >&5
+ echo "configure: 36237: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
hal_incdir=$i
@@ -36125,7 +36269,7 @@
do
for j in libhal.so;
do
- echo "configure: 36128: $i/$j" >&5
+ echo "configure: 36272: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
hal_libdir=$i
@@ -36170,7 +36314,7 @@
do
for j in dbus/dbus.h;
do
- echo "configure: 36173: $i/$j" >&5
+ echo "configure: 36317: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
dbus_incdir=$i
@@ -36187,7 +36331,7 @@
do
for j in dbus/dbus-arch-deps.h;
do
- echo "configure: 36190: $i/$j" >&5
+ echo "configure: 36334: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
dbus_incdir_arch_deps=$i
@@ -36209,7 +36353,7 @@
do
for j in libdbus-1.so;
do
- echo "configure: 36212: $i/$j" >&5
+ echo "configure: 36356: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
dbus_libdir=$i
@@ -36252,7 +36396,7 @@
do
for j in dbus/connection.h;
do
- echo "configure: 36255: $i/$j" >&5
+ echo "configure: 36399: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
dbusqt_incdir=$i
@@ -36279,7 +36423,7 @@
do
for j in libdbus-qt-1.so;
do
- echo "configure: 36282: $i/$j" >&5
+ echo "configure: 36426: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
dbusqt_libdir=$i
@@ -39791,6 +39935,7 @@
MSGFMT!$MSGFMT$ac_delim
GMSGFMT!$GMSGFMT$ac_delim
XGETTEXT!$XGETTEXT$ac_delim
+PKG_CONFIG!$PKG_CONFIG$ac_delim
LIBUTIL!$LIBUTIL$ac_delim
LIBCOMPAT!$LIBCOMPAT$ac_delim
LIBCRYPT!$LIBCRYPT$ac_delim
@@ -39852,7 +39997,6 @@
KCONFIG_COMPILER!$KCONFIG_COMPILER$ac_delim
KCFG_DEPENDENCIES!$KCFG_DEPENDENCIES$ac_delim
DCOPIDLNG!$DCOPIDLNG$ac_delim
-DCOPIDL!$DCOPIDL$ac_delim
_ACEOF
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
@@ -39894,6 +40038,7 @@
ac_delim='%!_!# '
for ac_last_try in false false false false false :; do
cat >conf$$subs.sed <<_ACEOF
+DCOPIDL!$DCOPIDL$ac_delim
DCOPIDL2CPP!$DCOPIDL2CPP$ac_delim
DCOP_DEPENDENCIES!$DCOP_DEPENDENCIES$ac_delim
MCOPIDL!$MCOPIDL$ac_delim
@@ -39968,7 +40113,6 @@
include_HAL_TRUE!$include_HAL_TRUE$ac_delim
include_HAL_FALSE!$include_HAL_FALSE$ac_delim
HAL_DBUS_LIBS!$HAL_DBUS_LIBS$ac_delim
-PKG_CONFIG!$PKG_CONFIG$ac_delim
ALSA_CFLAGS!$ALSA_CFLAGS$ac_delim
ALSA_LIBS!$ALSA_LIBS$ac_delim
include_ALSA_TRUE!$include_ALSA_TRUE$ac_delim
@@ -40444,21 +40588,22 @@
fi
rm -f "$tmp/out12"
# Compute $ac_file's index in $config_headers.
+_am_arg=$ac_file
_am_stamp_count=1
for _am_header in $config_headers :; do
case $_am_header in
- $ac_file | $ac_file:* )
+ $_am_arg | $_am_arg:* )
break ;;
* )
_am_stamp_count=`expr $_am_stamp_count + 1` ;;
esac
done
-echo "timestamp for $ac_file" >`$as_dirname -- $ac_file ||
-$as_expr X$ac_file : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- X$ac_file : 'X\(//\)[^/]' \| \
- X$ac_file : 'X\(//\)$' \| \
- X$ac_file : 'X\(/\)' \| . 2>/dev/null ||
-echo X$ac_file |
+echo "timestamp for $_am_arg" >`$as_dirname -- "$_am_arg" ||
+$as_expr X"$_am_arg" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+ X"$_am_arg" : 'X\(//\)[^/]' \| \
+ X"$_am_arg" : 'X\(//\)$' \| \
+ X"$_am_arg" : 'X\(/\)' \| . 2>/dev/null ||
+echo X"$_am_arg" |
sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
s//\1/
q
@@ -40495,7 +40640,7 @@
# each Makefile.in and add a new line on top of each file to say so.
# Grep'ing the whole file is not good either: AIX grep has a line
# limit of 2048, but all sed's we know have understand at least 4000.
- if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then
+ if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
dirpart=`$as_dirname -- "$mf" ||
$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
X"$mf" : 'X\(//\)[^/]' \| \
Modified: kde-extras/k3b/branches/upstream/current/configure.in
===================================================================
--- kde-extras/k3b/branches/upstream/current/configure.in 2008-06-03 01:21:42 UTC (rev 10848)
+++ kde-extras/k3b/branches/upstream/current/configure.in 2008-06-03 01:26:01 UTC (rev 10849)
@@ -40,7 +40,7 @@
AC_ARG_PROGRAM
dnl Automake doc recommends to do this only here. (Janos)
-AM_INIT_AUTOMAKE(k3b-1.0.4, "3.5.8") dnl searches for some needed programs
+AM_INIT_AUTOMAKE(k3b-1.0.5, "3.5.9") dnl searches for some needed programs
KDE_SET_PREFIX
Modified: kde-extras/k3b/branches/upstream/current/doc/Makefile.in
===================================================================
--- kde-extras/k3b/branches/upstream/current/doc/Makefile.in 2008-06-03 01:21:42 UTC (rev 10848)
+++ kde-extras/k3b/branches/upstream/current/doc/Makefile.in 2008-06-03 01:26:01 UTC (rev 10849)
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
# KDE tags expanded automatically by am_edit - $Revision: 483858 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
Modified: kde-extras/k3b/branches/upstream/current/k3bsetup/Makefile.in
===================================================================
--- kde-extras/k3b/branches/upstream/current/k3bsetup/Makefile.in 2008-06-03 01:21:42 UTC (rev 10848)
+++ kde-extras/k3b/branches/upstream/current/k3bsetup/Makefile.in 2008-06-03 01:26:01 UTC (rev 10849)
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
# KDE tags expanded automatically by am_edit - $Revision: 483858 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -75,7 +75,7 @@
$(CXXFLAGS) $(KDE_CXXFLAGS) $(kcm_k3bsetup2_la_LDFLAGS) $(LDFLAGS) -o $@
binSCRIPT_INSTALL = $(INSTALL_SCRIPT)
SCRIPTS = $(bin_SCRIPTS)
-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
+DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
am__depfiles_maybe = depfiles
#>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -442,8 +442,8 @@
@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
if test -f $$p; then \
f=$(am__strip_dir) \
- echo " $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_moduledir)/$$f'"; \
- $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_moduledir)/$$f"; \
+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_moduledir)/$$f'"; \
+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_moduledir)/$$f"; \
else :; fi; \
done
@@ -451,8 +451,8 @@
@$(NORMAL_UNINSTALL)
@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
p=$(am__strip_dir) \
- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
done
clean-kde_moduleLTLIBRARIES:
@@ -542,8 +542,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
tags: TAGS
@@ -555,8 +555,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -566,13 +566,12 @@
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
- here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
Modified: kde-extras/k3b/branches/upstream/current/k3bsetup/k3bsetup2.desktop
===================================================================
--- kde-extras/k3b/branches/upstream/current/k3bsetup/k3bsetup2.desktop 2008-06-03 01:21:42 UTC (rev 10848)
+++ kde-extras/k3b/branches/upstream/current/k3bsetup/k3bsetup2.desktop 2008-06-03 01:26:01 UTC (rev 10849)
@@ -24,6 +24,7 @@
Comment[is]=K3b uppsetning 2 - breyta aðgangsheimildum á CD/DVD skrifun með K3b
Comment[it]=Impostazioni di K3b 2 - modifica i permessi per CD/DVD per scrivere con K3b
Comment[ja]=K3bSetup 2 - K3b で CD/DVD に書き込むための権限を設定
+Comment[ka]=K3bSetup 2 - K3b-ით CD/DVD-ის ჩაწერის უფლების შეცვლა
Comment[km]=K3bSetup 2 - កែប្រែសិទ្ធិដើម្បីដុតស៊ីឌី ឬ ឌីវីឌីដោយប្រើ K3b
Comment[lt]=K3bSetup 2 – pakeiskite leidimus CD/DVD kūrimui su K3b
Comment[mk]=K3bSetup 2 - менување на дозволите за снимање на CD/DVD со K3b
@@ -47,7 +48,8 @@
Comment[tg]=K3bSetup 2 - танзим кардани иҷозат барои сабт бо ёрии K3b
Comment[tr]=K3bSetup 2 - K3b ile CD/DVD kaydetme izinlerini ayarlama
Comment[uk]=K3bSetup 2 - зміна прав доступу для запису КД/DVD за допомогою K3b
-Comment[uz]=K3bSetup 2 - K3b ёрдамида CD/DVD'га ёзиш ҳуқуқини мослаш
+Comment[uz]=K3bSetup 2 - K3b yordamida CD/DVD'ga yozish huquqini moslash
+Comment[uz at cyrillic]=K3bSetup 2 - K3b ёрдамида CD/DVD'га ёзиш ҳуқуқини мослаш
Comment[zh_CN]=K3b 设置 2 - 修改使用 K3b 烧录 CD/DVD 的权限
Comment[zh_TW]=K3bSetup 2 - 為 K3b 燒錄 CD/DVD 修改權限
Exec=k3bsetup
@@ -67,7 +69,8 @@
Keywords[sv]=Ställ in K3b 2,k3bsetup2
Keywords[ta]=K3bஅமைவு2,K3bஅமைவு2
Keywords[tg]=ТанзимиK3b2,танзимиk3b2
-Keywords[uz]=K3bSetup2,k3bsetup2,CD,компакт-диск
+Keywords[uz]=K3bSetup2,k3bsetup2,CD,kompakt-disk
+Keywords[uz at cyrillic]=K3bSetup2,k3bsetup2,CD,компакт-диск
Name=K3bSetup
Name[ar]= اعداد K3b
Name[bg]=Настройване на K3b
@@ -115,9 +118,11 @@
GenericName[is]=Uppsetning á CD og DVD brennslu
GenericName[it]=Impostazioni di masterizzazione CD e DVD
GenericName[ja]=CD / DVD 作成の設定
+GenericName[ka]=CD-ის და DVD-ის ჩაწერის გამართვა
GenericName[km]=រៀបចំការដុតស៊ីឌី & ឌីវីឌី
GenericName[lt]=CD & DVD kūrimo parinktys
GenericName[mk]=Поставувања за снимање на CD и DVD
+GenericName[ms]=Tetapan Membakar CD & DVD
GenericName[nb]=Oppsett av CD- og DVD-brenning
GenericName[nds]=Brennen vun CD & DVD instellen
GenericName[ne]=सीडी र डीभीडी बर्निङ सेटअप
@@ -137,6 +142,7 @@
GenericName[tg]=Танзимоти сабткунии CD ва DVD
GenericName[tr]=CD ve DVD Kaydetme Kurulumu
GenericName[uk]=Налажтування запису КД та DVD
-GenericName[uz]=CD ва DVD дискка ёзишни мослаш
+GenericName[uz]=CD va DVD diskka yozishni moslash
+GenericName[uz at cyrillic]=CD ва DVD дискка ёзишни мослаш
GenericName[zh_CN]=CD & DVD 刻录程序设置
GenericName[zh_TW]=CD & DVD 燒錄設定
Modified: kde-extras/k3b/branches/upstream/current/kfile-plugins/Makefile.in
===================================================================
--- kde-extras/k3b/branches/upstream/current/kfile-plugins/Makefile.in 2008-06-03 01:21:42 UTC (rev 10848)
+++ kde-extras/k3b/branches/upstream/current/kfile-plugins/Makefile.in 2008-06-03 01:26:01 UTC (rev 10849)
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
# KDE tags expanded automatically by am_edit - $Revision: 483858 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -466,8 +466,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
tags: TAGS
@@ -492,8 +492,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -503,13 +503,12 @@
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
- here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
Modified: kde-extras/k3b/branches/upstream/current/kfile-plugins/k3bproject/Makefile.in
===================================================================
--- kde-extras/k3b/branches/upstream/current/kfile-plugins/k3bproject/Makefile.in 2008-06-03 01:21:42 UTC (rev 10848)
+++ kde-extras/k3b/branches/upstream/current/kfile-plugins/k3bproject/Makefile.in 2008-06-03 01:26:01 UTC (rev 10849)
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
# KDE tags expanded automatically by am_edit - $Revision: 483858 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -72,7 +72,7 @@
kfile_k3b_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
$(CXXFLAGS) $(KDE_CXXFLAGS) $(kfile_k3b_la_LDFLAGS) $(LDFLAGS) -o $@
-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
+DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
am__depfiles_maybe = depfiles
#>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -449,8 +449,8 @@
@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
if test -f $$p; then \
f=$(am__strip_dir) \
- echo " $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_moduledir)/$$f'"; \
- $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_moduledir)/$$f"; \
+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_moduledir)/$$f'"; \
+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_moduledir)/$$f"; \
else :; fi; \
done
@@ -458,8 +458,8 @@
@$(NORMAL_UNINSTALL)
@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
p=$(am__strip_dir) \
- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
done
clean-kde_moduleLTLIBRARIES:
@@ -530,8 +530,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
tags: TAGS
@@ -543,8 +543,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -554,13 +554,12 @@
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
- here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
Modified: kde-extras/k3b/branches/upstream/current/kfile-plugins/k3bproject/kfile_k3b.desktop
===================================================================
--- kde-extras/k3b/branches/upstream/current/kfile-plugins/k3bproject/kfile_k3b.desktop 2008-06-03 01:21:42 UTC (rev 10848)
+++ kde-extras/k3b/branches/upstream/current/kfile-plugins/k3bproject/kfile_k3b.desktop 2008-06-03 01:26:01 UTC (rev 10849)
@@ -30,6 +30,7 @@
Name[nb]=K3b-prosjektinformasjon
Name[nds]=K3b-Projektinformatschonen
Name[nl]=K3b-projectinformatie
+Name[nn]=K3b-prosjektinfo
Name[pa]=K3b ਪ੍ਰੋਜੈੱਕਟ ਜਾਣਕਾਰੀ
Name[pl]=Informacja dla projektu K3b
Name[pt]=Informação do Projecto do K3b
@@ -41,7 +42,8 @@
Name[sv]=K3b-projektinformation
Name[tr]=K3b Proje Bilgisi
Name[uk]=Інформація проекту K3b
-Name[uz]=K3b лойиҳаси ҳақида маълумот
+Name[uz]=K3b loyihasi haqida maʼlumot
+Name[uz at cyrillic]=K3b лойиҳаси ҳақида маълумот
Name[zh_CN]=K3b 方案信息
Name[zh_TW]=K3b 專案資訊
ServiceTypes=KFilePlugin
Modified: kde-extras/k3b/branches/upstream/current/kioslaves/Makefile.in
===================================================================
--- kde-extras/k3b/branches/upstream/current/kioslaves/Makefile.in 2008-06-03 01:21:42 UTC (rev 10848)
+++ kde-extras/k3b/branches/upstream/current/kioslaves/Makefile.in 2008-06-03 01:26:01 UTC (rev 10849)
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
# KDE tags expanded automatically by am_edit - $Revision: 483858 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -466,8 +466,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
tags: TAGS
@@ -492,8 +492,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -503,13 +503,12 @@
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
- here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
Modified: kde-extras/k3b/branches/upstream/current/kioslaves/videodvd/Makefile.in
===================================================================
--- kde-extras/k3b/branches/upstream/current/kioslaves/videodvd/Makefile.in 2008-06-03 01:21:42 UTC (rev 10848)
+++ kde-extras/k3b/branches/upstream/current/kioslaves/videodvd/Makefile.in 2008-06-03 01:26:01 UTC (rev 10849)
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
# KDE tags expanded automatically by am_edit - $Revision: 483858 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -68,7 +68,7 @@
kio_videodvd_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
$(CXXFLAGS) $(KDE_CXXFLAGS) $(kio_videodvd_la_LDFLAGS) $(LDFLAGS) -o $@
-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
+DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
am__depfiles_maybe = depfiles
#>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -436,8 +436,8 @@
@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
if test -f $$p; then \
f=$(am__strip_dir) \
- echo " $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_moduledir)/$$f'"; \
- $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_moduledir)/$$f"; \
+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_moduledir)/$$f'"; \
+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_moduledir)/$$f"; \
else :; fi; \
done
@@ -445,8 +445,8 @@
@$(NORMAL_UNINSTALL)
@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
p=$(am__strip_dir) \
- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
done
clean-kde_moduleLTLIBRARIES:
@@ -534,8 +534,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
tags: TAGS
@@ -547,8 +547,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -558,13 +558,12 @@
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
- here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
Modified: kde-extras/k3b/branches/upstream/current/kioslaves/videodvd/videodvd.desktop
===================================================================
--- kde-extras/k3b/branches/upstream/current/kioslaves/videodvd/videodvd.desktop 2008-06-03 01:21:42 UTC (rev 10848)
+++ kde-extras/k3b/branches/upstream/current/kioslaves/videodvd/videodvd.desktop 2008-06-03 01:26:01 UTC (rev 10849)
@@ -24,6 +24,7 @@
Name[is]=Vídeó DVD flakkari
Name[it]=Navigatore DVD video
Name[ja]=ビデオ DVD ブラウザ
+Name[ka]=ვიდეო DVD-ის ბროუზერი
Name[km]=កម្មវិធីរុករកឌីវីឌីវីដេអូ
Name[lt]=Video DVD naršyklė
Name[nds]=Video-DVD-Kieker
@@ -38,7 +39,8 @@
Name[sv]=Video-dvd bläddrare
Name[tr]=Görüntü DVD'si Gezgini
Name[uk]=Навігатор відео-DVD
-Name[uz]=Видео-DVD браузери
+Name[uz]=Video-DVD brauzeri
+Name[uz at cyrillic]=Видео-DVD браузери
Name[zh_CN]=视频 DVD 浏览器
Name[zh_TW]=Video DVD 瀏覽器
Open=false
Modified: kde-extras/k3b/branches/upstream/current/kioslaves/videodvd/videodvd.protocol
===================================================================
--- kde-extras/k3b/branches/upstream/current/kioslaves/videodvd/videodvd.protocol 2008-06-03 01:21:42 UTC (rev 10848)
+++ kde-extras/k3b/branches/upstream/current/kioslaves/videodvd/videodvd.protocol 2008-06-03 01:26:01 UTC (rev 10849)
@@ -29,9 +29,11 @@
Description[is]=Kioslave sem leyfir afritun af skrám frá vídeó DVD (með afkóðun)
Description[it]=Un kioslave che permette ai file di essere copiati da un DVD video (incluso decifrazione)
Description[ja]=ビデオ DVD からファイルをコピーすることを可能にする kioslave (暗号解除も含む)
+Description[ka]=Kioslave, რომელიც იძლევა Video DVD-დან ასლის ფაილების მიღების საშუელებას (გაშიფრვასთან ერთად)
Description[km]=kioslave ដែលអនុញ្ញាតឲ្យចម្លងឯកសារពីឌីវីឌីវីដេអូ(រួមទាំងការឌិគ្រីប)
Description[lt]=Priedas (kioslave) leidžiantis kopijuoti bylas iš Video DVD (taip pat ir atšifruoti)
-Description[nb]=En kioslave som gjør det mulig å kopiere filer fra en Video-DVD (inkludert dekryptering)
+Description[ms]=kioslave yang membenarkan fail untuk disalin dari DVD Video (termasuk nyahenkripsi)
+Description[nb]=En kioslave som gjør det mulig å kopiere filer fra en Video-DVD (medregnet dekryptering)
Description[nds]=En In-/Utgaavmoduul, mit dat sik Dateien vun en Video-DVD koperen laat (ok mit Opslöteln)
Description[nl]=Een kioslave waarmee u bestanden van een video-dvd kunt kopiëren (inclusief versleuteling)
Description[nn]=Ein kioslave som gjer det mogleg å kopiera filer frå ein film-DVD (inkludert kryptering)
Modified: kde-extras/k3b/branches/upstream/current/libk3b/Makefile.in
===================================================================
--- kde-extras/k3b/branches/upstream/current/libk3b/Makefile.in 2008-06-03 01:21:42 UTC (rev 10848)
+++ kde-extras/k3b/branches/upstream/current/libk3b/Makefile.in 2008-06-03 01:26:01 UTC (rev 10849)
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
# KDE tags expanded automatically by am_edit - $Revision: 483858 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -68,7 +68,7 @@
libk3b_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
$(CXXFLAGS) $(KDE_CXXFLAGS) $(libk3b_la_LDFLAGS) $(LDFLAGS) -o $@
-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
+DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
am__depfiles_maybe = depfiles
#>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -453,8 +453,8 @@
@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
if test -f $$p; then \
f=$(am__strip_dir) \
- echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
- $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
else :; fi; \
done
@@ -462,8 +462,8 @@
@$(NORMAL_UNINSTALL)
@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
p=$(am__strip_dir) \
- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
done
clean-libLTLIBRARIES:
@@ -587,8 +587,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
tags: TAGS
@@ -613,8 +613,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -624,13 +624,12 @@
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
- here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
Modified: kde-extras/k3b/branches/upstream/current/libk3b/cddb/Makefile.am
===================================================================
--- kde-extras/k3b/branches/upstream/current/libk3b/cddb/Makefile.am 2008-06-03 01:21:42 UTC (rev 10848)
+++ kde-extras/k3b/branches/upstream/current/libk3b/cddb/Makefile.am 2008-06-03 01:26:01 UTC (rev 10849)
@@ -5,3 +5,5 @@
noinst_LTLIBRARIES = libcddb.la
libcddb_la_SOURCES = k3bcddbquery.cpp k3bcddb.cpp k3bcddbresult.cpp k3bcddbhttpquery.cpp k3bcddbpquery.cpp k3bcddblocalquery.cpp k3bcddbsubmit.cpp k3bcddblocalsubmit.cpp k3bcddbmultientriesdialog.cpp
+
+include_HEADERS = k3bcddb.h k3bcddbresult.h
Modified: kde-extras/k3b/branches/upstream/current/libk3b/cddb/Makefile.in
===================================================================
--- kde-extras/k3b/branches/upstream/current/libk3b/cddb/Makefile.in 2008-06-03 01:21:42 UTC (rev 10848)
+++ kde-extras/k3b/branches/upstream/current/libk3b/cddb/Makefile.in 2008-06-03 01:26:01 UTC (rev 10849)
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
# KDE tags expanded automatically by am_edit - $Revision: 483858 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -15,6 +15,7 @@
@SET_MAKE@
+
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@ -35,7 +36,8 @@
host_triplet = @host@
target_triplet = @target@
subdir = libk3b/cddb
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(include_HEADERS) $(srcdir)/Makefile.am \
+ $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
$(top_srcdir)/configure.in
@@ -59,7 +61,7 @@
k3bcddbmultientriesdialog.lo
@KDE_USE_FINAL_FALSE at libcddb_la_OBJECTS = $(libcddb_la_nofinal_OBJECTS)
@KDE_USE_FINAL_TRUE at libcddb_la_OBJECTS = $(libcddb_la_final_OBJECTS)
-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
+DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
am__depfiles_maybe = depfiles
#>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -84,6 +86,15 @@
$(LDFLAGS) -o $@
SOURCES = $(libcddb_la_SOURCES)
DIST_SOURCES = $(libcddb_la_SOURCES)
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+ *) f=$$p;; \
+ esac;
+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__installdirs = "$(DESTDIR)$(includedir)"
+includeHEADERS_INSTALL = $(INSTALL_HEADER)
+HEADERS = $(include_HEADERS)
ETAGS = etags
CTAGS = ctags
#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -361,6 +372,7 @@
#>- METASOURCES = AUTO
noinst_LTLIBRARIES = libcddb.la
libcddb_la_SOURCES = k3bcddbquery.cpp k3bcddb.cpp k3bcddbresult.cpp k3bcddbhttpquery.cpp k3bcddbpquery.cpp k3bcddblocalquery.cpp k3bcddbsubmit.cpp k3bcddblocalsubmit.cpp k3bcddbmultientriesdialog.cpp
+include_HEADERS = k3bcddb.h k3bcddbresult.h
#>- all: all-am
#>+ 1
all: docs-am all-am
@@ -463,14 +475,31 @@
clean-libtool:
-rm -rf .libs _libs
+install-includeHEADERS: $(include_HEADERS)
+ @$(NORMAL_INSTALL)
+ test -z "$(includedir)" || $(MKDIR_P) "$(DESTDIR)$(includedir)"
+ @list='$(include_HEADERS)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ f=$(am__strip_dir) \
+ echo " $(includeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(includedir)/$$f'"; \
+ $(includeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(includedir)/$$f"; \
+ done
+uninstall-includeHEADERS:
+ @$(NORMAL_UNINSTALL)
+ @list='$(include_HEADERS)'; for p in $$list; do \
+ f=$(am__strip_dir) \
+ echo " rm -f '$(DESTDIR)$(includedir)/$$f'"; \
+ rm -f "$(DESTDIR)$(includedir)/$$f"; \
+ done
+
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
tags: TAGS
@@ -482,8 +511,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -493,13 +522,12 @@
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
- here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
@@ -540,8 +568,11 @@
done
check-am: all-am
check: check-am
-all-am: Makefile $(LTLIBRARIES)
+all-am: Makefile $(LTLIBRARIES) $(HEADERS)
installdirs:
+ for dir in "$(DESTDIR)$(includedir)"; do \
+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ done
install: install-am
install-exec: install-exec-am
install-data: install-data-am
@@ -592,7 +623,7 @@
info-am:
-install-data-am:
+install-data-am: install-includeHEADERS
install-dvi: install-dvi-am
@@ -628,7 +659,7 @@
ps-am:
-uninstall-am:
+uninstall-am: uninstall-includeHEADERS
.MAKE: install-am install-strip
@@ -638,12 +669,13 @@
distclean-tags distdir dvi dvi-am html html-am info info-am \
install install-am install-data install-data-am install-dvi \
install-dvi-am install-exec install-exec-am install-html \
- install-html-am install-info install-info-am install-man \
- install-pdf install-pdf-am install-ps install-ps-am \
- install-strip installcheck installcheck-am installdirs \
- maintainer-clean maintainer-clean-generic mostlyclean \
- mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
- pdf pdf-am ps ps-am tags uninstall uninstall-am
+ install-html-am install-includeHEADERS install-info \
+ install-info-am install-man install-pdf install-pdf-am \
+ install-ps install-ps-am install-strip installcheck \
+ installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-compile \
+ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+ tags uninstall uninstall-am uninstall-includeHEADERS
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
@@ -710,7 +742,7 @@
-rm -f k3bcddbquery.moc k3bcddb.moc k3bcddbhttpquery.moc k3bcddbpquery.moc k3bcddblocalquery.moc k3bcddblocalsubmit.moc k3bcddbsubmit.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
+KDE_DIST=k3bcddblocalsubmit.h Makefile.in k3bcddbmultientriesdialog.h k3bcddblocalquery.h k3bcddbquery.h k3bcddbsubmit.h k3bcddbhttpquery.h k3bcddbpquery.h Makefile.am
#>+ 2
docs-am:
@@ -738,7 +770,7 @@
bcheck: bcheck-am
bcheck-am:
- @for i in ; do \
+ @for i in $(include_HEADERS); do \
if test $(srcdir)/$$i -nt $$i.bchecktest.cc; then \
echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
Modified: kde-extras/k3b/branches/upstream/current/libk3b/cddb/k3bcddbresult.h
===================================================================
--- kde-extras/k3b/branches/upstream/current/libk3b/cddb/k3bcddbresult.h 2008-06-03 01:21:42 UTC (rev 10848)
+++ kde-extras/k3b/branches/upstream/current/libk3b/cddb/k3bcddbresult.h 2008-06-03 01:26:01 UTC (rev 10849)
@@ -1,6 +1,6 @@
/*
*
- * $Id: k3bcddbresult.h 619556 2007-01-03 17:38:12Z trueg $
+ * $Id: k3bcddbresult.h 768492 2008-01-30 08:39:42Z trueg $
* Copyright (C) 2003 Sebastian Trueg <trueg at k3b.org>
*
* This file is part of the K3b project.
@@ -20,9 +20,10 @@
#include <qstringlist.h>
+#include "k3b_export.h"
-class K3bCddbResultHeader
+class LIBK3B_EXPORT K3bCddbResultHeader
{
public:
QString category;
@@ -32,7 +33,7 @@
};
-class K3bCddbResultEntry
+class LIBK3B_EXPORT K3bCddbResultEntry
{
public:
// just to set a default
@@ -58,7 +59,7 @@
};
-class K3bCddbResult
+class LIBK3B_EXPORT K3bCddbResult
{
public:
K3bCddbResult();
Modified: kde-extras/k3b/branches/upstream/current/libk3b/core/Makefile.in
===================================================================
--- kde-extras/k3b/branches/upstream/current/libk3b/core/Makefile.in 2008-06-03 01:21:42 UTC (rev 10848)
+++ kde-extras/k3b/branches/upstream/current/libk3b/core/Makefile.in 2008-06-03 01:26:01 UTC (rev 10849)
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
# KDE tags expanded automatically by am_edit - $Revision: 483858 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -69,7 +69,7 @@
libk3bcore_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
$(CXXFLAGS) $(KDE_CXXFLAGS) $(libk3bcore_la_LDFLAGS) $(LDFLAGS) -o $@
-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
+DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
am__depfiles_maybe = depfiles
#>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -517,8 +517,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
tags: TAGS
@@ -530,8 +530,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -541,13 +541,12 @@
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
- here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
Modified: kde-extras/k3b/branches/upstream/current/libk3b/core/k3bcore.h
===================================================================
--- kde-extras/k3b/branches/upstream/current/libk3b/core/k3bcore.h 2008-06-03 01:21:42 UTC (rev 10848)
+++ kde-extras/k3b/branches/upstream/current/libk3b/core/k3bcore.h 2008-06-03 01:26:01 UTC (rev 10849)
@@ -1,6 +1,6 @@
/*
*
- * $Id: k3bcore.h 696897 2007-08-06 07:14:14Z trueg $
+ * $Id: k3bcore.h 733470 2007-11-06 12:10:29Z trueg $
* Copyright (C) 2003 Sebastian Trueg <trueg at k3b.org>
*
* This file is part of the K3b project.
@@ -23,7 +23,7 @@
#include "k3b_export.h"
-#define LIBK3B_VERSION "1.0.4"
+#define LIBK3B_VERSION "1.0.5"
#define k3bcore K3bCore::k3bCore()
Modified: kde-extras/k3b/branches/upstream/current/libk3b/jobs/Makefile.in
===================================================================
--- kde-extras/k3b/branches/upstream/current/libk3b/jobs/Makefile.in 2008-06-03 01:21:42 UTC (rev 10848)
+++ kde-extras/k3b/branches/upstream/current/libk3b/jobs/Makefile.in 2008-06-03 01:26:01 UTC (rev 10849)
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
# KDE tags expanded automatically by am_edit - $Revision: 483858 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -101,7 +101,7 @@
@include_videodvdrip_TRUE@ k3bclonetocreader.lo \
@include_videodvdrip_TRUE@ k3bverificationjob.lo
libjobs_la_OBJECTS = $(am_libjobs_la_OBJECTS)
-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
+DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
am__depfiles_maybe = depfiles
#>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -585,8 +585,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
tags: TAGS
@@ -598,8 +598,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -609,13 +609,12 @@
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
- here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
Modified: kde-extras/k3b/branches/upstream/current/libk3b/jobs/k3bverificationjob.cpp
===================================================================
--- kde-extras/k3b/branches/upstream/current/libk3b/jobs/k3bverificationjob.cpp 2008-06-03 01:21:42 UTC (rev 10848)
+++ kde-extras/k3b/branches/upstream/current/libk3b/jobs/k3bverificationjob.cpp 2008-06-03 01:26:01 UTC (rev 10849)
@@ -161,13 +161,13 @@
}
-void K3bVerificationJob::slotMediaReloaded( bool success )
+void K3bVerificationJob::slotMediaReloaded( bool /*success*/ )
{
- if( !success )
+ // we always need to wait for the medium. Otherwise the diskinfo below
+ // may run before the drive is ready!
waitForMedia( d->device,
- K3bDevice::STATE_COMPLETE|K3bDevice::STATE_INCOMPLETE,
- K3bDevice::MEDIA_WRITABLE,
- i18n("Unable to Close the Tray") );
+ K3bDevice::STATE_COMPLETE|K3bDevice::STATE_INCOMPLETE,
+ K3bDevice::MEDIA_WRITABLE );
d->mediumHasBeenReloaded = true;
Modified: kde-extras/k3b/branches/upstream/current/libk3b/plugin/Makefile.in
===================================================================
--- kde-extras/k3b/branches/upstream/current/libk3b/plugin/Makefile.in 2008-06-03 01:21:42 UTC (rev 10848)
+++ kde-extras/k3b/branches/upstream/current/libk3b/plugin/Makefile.in 2008-06-03 01:26:01 UTC (rev 10849)
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
# KDE tags expanded automatically by am_edit - $Revision: 483858 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -72,7 +72,7 @@
libk3bplugin_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
$(CXXFLAGS) $(KDE_CXXFLAGS) $(libk3bplugin_la_LDFLAGS) $(LDFLAGS) -o $@
-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
+DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
am__depfiles_maybe = depfiles
#>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -607,8 +607,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
tags: TAGS
@@ -633,8 +633,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -644,13 +644,12 @@
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
- here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
Modified: kde-extras/k3b/branches/upstream/current/libk3b/plugin/libsamplerate/Makefile.in
===================================================================
--- kde-extras/k3b/branches/upstream/current/libk3b/plugin/libsamplerate/Makefile.in 2008-06-03 01:21:42 UTC (rev 10848)
+++ kde-extras/k3b/branches/upstream/current/libk3b/plugin/libsamplerate/Makefile.in 2008-06-03 01:26:01 UTC (rev 10849)
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
# KDE tags expanded automatically by am_edit - $Revision: 483858 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -56,7 +56,7 @@
#>- libsamplerate_la_OBJECTS = $(am_libsamplerate_la_OBJECTS)
#>+ 1
libsamplerate_la_OBJECTS = $(am__objects_1)
-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
+DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
am__depfiles_maybe = depfiles
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
@@ -456,8 +456,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
tags: TAGS
@@ -469,8 +469,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -480,13 +480,12 @@
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
- here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
Modified: kde-extras/k3b/branches/upstream/current/libk3b/projects/Makefile.in
===================================================================
--- kde-extras/k3b/branches/upstream/current/libk3b/projects/Makefile.in 2008-06-03 01:21:42 UTC (rev 10848)
+++ kde-extras/k3b/branches/upstream/current/libk3b/projects/Makefile.in 2008-06-03 01:26:01 UTC (rev 10849)
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
# KDE tags expanded automatically by am_edit - $Revision: 483858 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -73,7 +73,7 @@
libk3bproject_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
$(CXXFLAGS) $(KDE_CXXFLAGS) $(libk3bproject_la_LDFLAGS) $(LDFLAGS) -o $@
-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
+DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
am__depfiles_maybe = depfiles
#>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -622,8 +622,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
tags: TAGS
@@ -648,8 +648,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -659,13 +659,12 @@
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
- here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
Modified: kde-extras/k3b/branches/upstream/current/libk3b/projects/audiocd/Makefile.in
===================================================================
--- kde-extras/k3b/branches/upstream/current/libk3b/projects/audiocd/Makefile.in 2008-06-03 01:21:42 UTC (rev 10848)
+++ kde-extras/k3b/branches/upstream/current/libk3b/projects/audiocd/Makefile.in 2008-06-03 01:26:01 UTC (rev 10849)
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
# KDE tags expanded automatically by am_edit - $Revision: 483858 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -65,7 +65,7 @@
k3baudiocdtrackdrag.lo k3baudiodatasourceiterator.lo
@KDE_USE_FINAL_FALSE at libaudio_la_OBJECTS = $(libaudio_la_nofinal_OBJECTS)
@KDE_USE_FINAL_TRUE at libaudio_la_OBJECTS = $(libaudio_la_final_OBJECTS)
-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
+DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
am__depfiles_maybe = depfiles
#>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -535,8 +535,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
tags: TAGS
@@ -548,8 +548,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -559,13 +559,12 @@
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
- here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
Modified: kde-extras/k3b/branches/upstream/current/libk3b/projects/datacd/Makefile.in
===================================================================
--- kde-extras/k3b/branches/upstream/current/libk3b/projects/datacd/Makefile.in 2008-06-03 01:21:42 UTC (rev 10848)
+++ kde-extras/k3b/branches/upstream/current/libk3b/projects/datacd/Makefile.in 2008-06-03 01:26:01 UTC (rev 10849)
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
# KDE tags expanded automatically by am_edit - $Revision: 483858 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -63,7 +63,7 @@
k3bmkisofshandler.lo k3bdatapreparationjob.lo
@KDE_USE_FINAL_FALSE at libdata_la_OBJECTS = $(libdata_la_nofinal_OBJECTS)
@KDE_USE_FINAL_TRUE at libdata_la_OBJECTS = $(libdata_la_final_OBJECTS)
-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
+DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
am__depfiles_maybe = depfiles
#>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -533,8 +533,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
tags: TAGS
@@ -546,8 +546,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -557,13 +557,12 @@
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
- here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
Modified: kde-extras/k3b/branches/upstream/current/libk3b/projects/datacd/k3bmkisofshandler.cpp
===================================================================
--- kde-extras/k3b/branches/upstream/current/libk3b/projects/datacd/k3bmkisofshandler.cpp 2008-06-03 01:21:42 UTC (rev 10848)
+++ kde-extras/k3b/branches/upstream/current/libk3b/projects/datacd/k3bmkisofshandler.cpp 2008-06-03 01:26:01 UTC (rev 10849)
@@ -1,6 +1,6 @@
-/*
+/*
*
- * $Id: k3bmkisofshandler.cpp 619556 2007-01-03 17:38:12Z trueg $
+ * $Id: k3bmkisofshandler.cpp 802340 2008-04-29 07:43:07Z trueg $
* Copyright (C) 2005 Sebastian Trueg <trueg at k3b.org>
*
* This file is part of the K3b project.
@@ -61,7 +61,7 @@
if( d->mkisofsBin ) {
if( !d->mkisofsBin->copyright.isEmpty() )
handleMkisofsInfoMessage( i18n("Using %1 %2 - Copyright (C) %3")
- .arg("mkisofs").arg(d->mkisofsBin->version).arg(d->mkisofsBin->copyright),
+ .arg("mkisofs").arg(d->mkisofsBin->version).arg(d->mkisofsBin->copyright),
K3bJob::INFO );
d->firstProgressValue = -1;
@@ -82,8 +82,8 @@
if( line.startsWith( d->mkisofsBin->path ) ) {
// error or warning
QString errorLine = line.mid( d->mkisofsBin->path.length() + 2 );
- if( errorLine.startsWith( "Input/output error. cannot read from" ) ) {
- handleMkisofsInfoMessage( i18n("Read error from file '%1'").arg( errorLine.mid( 38, errorLine.length()-40 ) ),
+ if( errorLine.startsWith( "Input/output error. Cannot read from" ) ) {
+ handleMkisofsInfoMessage( i18n("Read error from file '%1'").arg( errorLine.mid( 38, errorLine.length()-40 ) ),
K3bJob::ERROR );
d->readError = true;
}
@@ -109,7 +109,7 @@
d->readError = true;
}
else if( line.endsWith( "has not an allowable size." ) ) {
- handleMkisofsInfoMessage( i18n("The boot image has an invalid size."), K3bJob::ERROR );
+ handleMkisofsInfoMessage( i18n("The boot image has an invalid size."), K3bJob::ERROR );
d->readError = true;
}
else if( line.endsWith( "has multiple partitions." ) ) {
@@ -144,7 +144,7 @@
else {
if( d->firstProgressValue < 0 )
d->firstProgressValue = p;
-
+
return( (int)::ceil( (p - d->firstProgressValue)*100.0/(100.0 - d->firstProgressValue) ) );
}
}
Modified: kde-extras/k3b/branches/upstream/current/libk3b/projects/datadvd/Makefile.in
===================================================================
--- kde-extras/k3b/branches/upstream/current/libk3b/projects/datadvd/Makefile.in 2008-06-03 01:21:42 UTC (rev 10848)
+++ kde-extras/k3b/branches/upstream/current/libk3b/projects/datadvd/Makefile.in 2008-06-03 01:26:01 UTC (rev 10849)
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
# KDE tags expanded automatically by am_edit - $Revision: 483858 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -55,7 +55,7 @@
libdvd_la_nofinal_OBJECTS = k3bdvddoc.lo k3bdvdjob.lo k3bdvdbooktypejob.lo
@KDE_USE_FINAL_FALSE at libdvd_la_OBJECTS = $(libdvd_la_nofinal_OBJECTS)
@KDE_USE_FINAL_TRUE at libdvd_la_OBJECTS = $(libdvd_la_final_OBJECTS)
-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
+DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
am__depfiles_maybe = depfiles
#>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -502,8 +502,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
tags: TAGS
@@ -515,8 +515,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -526,13 +526,12 @@
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
- here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
Modified: kde-extras/k3b/branches/upstream/current/libk3b/projects/mixedcd/Makefile.in
===================================================================
--- kde-extras/k3b/branches/upstream/current/libk3b/projects/mixedcd/Makefile.in 2008-06-03 01:21:42 UTC (rev 10848)
+++ kde-extras/k3b/branches/upstream/current/libk3b/projects/mixedcd/Makefile.in 2008-06-03 01:26:01 UTC (rev 10849)
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
# KDE tags expanded automatically by am_edit - $Revision: 483858 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -55,7 +55,7 @@
libmixed_la_nofinal_OBJECTS = k3bmixeddoc.lo k3bmixedjob.lo
@KDE_USE_FINAL_FALSE at libmixed_la_OBJECTS = $(libmixed_la_nofinal_OBJECTS)
@KDE_USE_FINAL_TRUE at libmixed_la_OBJECTS = $(libmixed_la_final_OBJECTS)
-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
+DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
am__depfiles_maybe = depfiles
#>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -503,8 +503,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
tags: TAGS
@@ -516,8 +516,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -527,13 +527,12 @@
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
- here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
Modified: kde-extras/k3b/branches/upstream/current/libk3b/projects/movixcd/Makefile.in
===================================================================
--- kde-extras/k3b/branches/upstream/current/libk3b/projects/movixcd/Makefile.in 2008-06-03 01:21:42 UTC (rev 10848)
+++ kde-extras/k3b/branches/upstream/current/libk3b/projects/movixcd/Makefile.in 2008-06-03 01:26:01 UTC (rev 10849)
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
# KDE tags expanded automatically by am_edit - $Revision: 483858 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -57,7 +57,7 @@
k3bmovixjob.lo k3bmovixfileitem.lo k3bmovixdocpreparer.lo
@KDE_USE_FINAL_FALSE at libmovix_la_OBJECTS = $(libmovix_la_nofinal_OBJECTS)
@KDE_USE_FINAL_TRUE at libmovix_la_OBJECTS = $(libmovix_la_final_OBJECTS)
-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
+DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
am__depfiles_maybe = depfiles
#>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -508,8 +508,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
tags: TAGS
@@ -521,8 +521,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -532,13 +532,12 @@
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
- here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
Modified: kde-extras/k3b/branches/upstream/current/libk3b/projects/movixdvd/Makefile.in
===================================================================
--- kde-extras/k3b/branches/upstream/current/libk3b/projects/movixdvd/Makefile.in 2008-06-03 01:21:42 UTC (rev 10848)
+++ kde-extras/k3b/branches/upstream/current/libk3b/projects/movixdvd/Makefile.in 2008-06-03 01:26:01 UTC (rev 10849)
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
# KDE tags expanded automatically by am_edit - $Revision: 483858 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -55,7 +55,7 @@
libmovixdvd_la_nofinal_OBJECTS = k3bmovixdvddoc.lo k3bmovixdvdjob.lo
@KDE_USE_FINAL_FALSE at libmovixdvd_la_OBJECTS = $(libmovixdvd_la_nofinal_OBJECTS)
@KDE_USE_FINAL_TRUE at libmovixdvd_la_OBJECTS = $(libmovixdvd_la_final_OBJECTS)
-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
+DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
am__depfiles_maybe = depfiles
#>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -500,8 +500,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
tags: TAGS
@@ -513,8 +513,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -524,13 +524,12 @@
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
- here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
Modified: kde-extras/k3b/branches/upstream/current/libk3b/projects/videocd/Makefile.in
===================================================================
--- kde-extras/k3b/branches/upstream/current/libk3b/projects/videocd/Makefile.in 2008-06-03 01:21:42 UTC (rev 10848)
+++ kde-extras/k3b/branches/upstream/current/libk3b/projects/videocd/Makefile.in 2008-06-03 01:26:01 UTC (rev 10849)
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
# KDE tags expanded automatically by am_edit - $Revision: 483858 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -57,7 +57,7 @@
k3bvcdoptions.lo k3bvcdxmlview.lo
@KDE_USE_FINAL_FALSE at libvcd_la_OBJECTS = $(libvcd_la_nofinal_OBJECTS)
@KDE_USE_FINAL_TRUE at libvcd_la_OBJECTS = $(libvcd_la_final_OBJECTS)
-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
+DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
am__depfiles_maybe = depfiles
#>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -589,8 +589,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
tags: TAGS
@@ -615,8 +615,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -626,13 +626,12 @@
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
- here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
Modified: kde-extras/k3b/branches/upstream/current/libk3b/projects/videocd/cdi/Makefile.in
===================================================================
--- kde-extras/k3b/branches/upstream/current/libk3b/projects/videocd/cdi/Makefile.in 2008-06-03 01:21:42 UTC (rev 10848)
+++ kde-extras/k3b/branches/upstream/current/libk3b/projects/videocd/cdi/Makefile.in 2008-06-03 01:26:01 UTC (rev 10849)
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
# KDE tags expanded automatically by am_edit - $Revision: 483858 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
Modified: kde-extras/k3b/branches/upstream/current/libk3b/projects/videocd/extra/Makefile.in
===================================================================
--- kde-extras/k3b/branches/upstream/current/libk3b/projects/videocd/extra/Makefile.in 2008-06-03 01:21:42 UTC (rev 10848)
+++ kde-extras/k3b/branches/upstream/current/libk3b/projects/videocd/extra/Makefile.in 2008-06-03 01:26:01 UTC (rev 10849)
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
# KDE tags expanded automatically by am_edit - $Revision: 483858 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
Modified: kde-extras/k3b/branches/upstream/current/libk3b/projects/videocd/mpeginfo/Makefile.in
===================================================================
--- kde-extras/k3b/branches/upstream/current/libk3b/projects/videocd/mpeginfo/Makefile.in 2008-06-03 01:21:42 UTC (rev 10848)
+++ kde-extras/k3b/branches/upstream/current/libk3b/projects/videocd/mpeginfo/Makefile.in 2008-06-03 01:26:01 UTC (rev 10849)
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
# KDE tags expanded automatically by am_edit - $Revision: 483858 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -50,7 +50,7 @@
#>- libmpeginfo_la_OBJECTS = $(am_libmpeginfo_la_OBJECTS)
#>+ 1
libmpeginfo_la_OBJECTS = k3bmpeginfo.lo
-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
+DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
am__depfiles_maybe = depfiles
#>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -451,8 +451,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
tags: TAGS
@@ -464,8 +464,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -475,13 +475,12 @@
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
- here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
Modified: kde-extras/k3b/branches/upstream/current/libk3b/projects/videodvd/Makefile.in
===================================================================
--- kde-extras/k3b/branches/upstream/current/libk3b/projects/videodvd/Makefile.in 2008-06-03 01:21:42 UTC (rev 10848)
+++ kde-extras/k3b/branches/upstream/current/libk3b/projects/videodvd/Makefile.in 2008-06-03 01:26:01 UTC (rev 10849)
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
# KDE tags expanded automatically by am_edit - $Revision: 483858 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -57,7 +57,7 @@
k3bvideodvdimager.lo
@KDE_USE_FINAL_FALSE at libvideodvd_la_OBJECTS = $(libvideodvd_la_nofinal_OBJECTS)
@KDE_USE_FINAL_TRUE at libvideodvd_la_OBJECTS = $(libvideodvd_la_final_OBJECTS)
-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
+DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
am__depfiles_maybe = depfiles
#>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -502,8 +502,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
tags: TAGS
@@ -515,8 +515,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -526,13 +526,12 @@
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
- here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
Modified: kde-extras/k3b/branches/upstream/current/libk3b/scripts/Makefile.in
===================================================================
--- kde-extras/k3b/branches/upstream/current/libk3b/scripts/Makefile.in 2008-06-03 01:21:42 UTC (rev 10848)
+++ kde-extras/k3b/branches/upstream/current/libk3b/scripts/Makefile.in 2008-06-03 01:26:01 UTC (rev 10849)
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
# KDE tags expanded automatically by am_edit - $Revision: 483858 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
Modified: kde-extras/k3b/branches/upstream/current/libk3b/tools/Makefile.in
===================================================================
--- kde-extras/k3b/branches/upstream/current/libk3b/tools/Makefile.in 2008-06-03 01:21:42 UTC (rev 10848)
+++ kde-extras/k3b/branches/upstream/current/libk3b/tools/Makefile.in 2008-06-03 01:26:01 UTC (rev 10849)
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
# KDE tags expanded automatically by am_edit - $Revision: 483858 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -90,7 +90,7 @@
libk3btools_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
$(CXXFLAGS) $(KDE_CXXFLAGS) $(libk3btools_la_LDFLAGS) $(LDFLAGS) -o $@
-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
+DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
am__depfiles_maybe = depfiles
#>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -681,8 +681,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
tags: TAGS
@@ -707,8 +707,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -718,13 +718,12 @@
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
- here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
Modified: kde-extras/k3b/branches/upstream/current/libk3b/tools/k3blistview.cpp
===================================================================
--- kde-extras/k3b/branches/upstream/current/libk3b/tools/k3blistview.cpp 2008-06-03 01:21:42 UTC (rev 10848)
+++ kde-extras/k3b/branches/upstream/current/libk3b/tools/k3blistview.cpp 2008-06-03 01:26:01 UTC (rev 10849)
@@ -1,6 +1,6 @@
-/*
+/*
*
- * $Id: k3blistview.cpp 619556 2007-01-03 17:38:12Z trueg $
+ * $Id: k3blistview.cpp 768493 2008-01-30 08:44:05Z trueg $
* Copyright (C) 2003 Sebastian Trueg <trueg at k3b.org>
*
* This file is part of the K3b project.
@@ -99,25 +99,25 @@
K3bListViewItem::K3bListViewItem(QListView *parent)
: KListViewItem( parent )
-{
+{
init();
}
K3bListViewItem::K3bListViewItem(QListViewItem *parent)
: KListViewItem( parent )
-{
+{
init();
}
K3bListViewItem::K3bListViewItem(QListView *parent, QListViewItem *after)
: KListViewItem( parent, after )
-{
+{
init();
}
K3bListViewItem::K3bListViewItem(QListViewItem *parent, QListViewItem *after)
: KListViewItem( parent, after )
-{
+{
init();
}
@@ -128,7 +128,7 @@
const QString& s5, const QString& s6,
const QString& s7, const QString& s8)
: KListViewItem( parent, s1, s2, s3, s4, s5, s6, s7, s8 )
-{
+{
init();
}
@@ -139,7 +139,7 @@
const QString& s5, const QString& s6,
const QString& s7, const QString& s8)
: KListViewItem( parent, s1, s2, s3, s4, s5, s6, s7, s8 )
-{
+{
init();
}
@@ -150,7 +150,7 @@
const QString& s5, const QString& s6,
const QString& s7, const QString& s8)
: KListViewItem( parent, after, s1, s2, s3, s4, s5, s6, s7, s8 )
-{
+{
init();
}
@@ -161,7 +161,7 @@
const QString& s5, const QString& s6,
const QString& s7, const QString& s8)
: KListViewItem( parent, after, s1, s2, s3, s4, s5, s6, s7, s8 )
-{
+{
init();
}
@@ -368,7 +368,7 @@
if( isSelected() &&
(col == 0 || listView()->allColumnsShowFocus()) &&
info->margin > 0 ) {
-
+
p->fillRect( 0, 0, info->margin, height(),
cgh.brush( QColorGroup::Highlight ) );
p->fillRect( width-info->margin, 0, info->margin, height(),
@@ -426,7 +426,7 @@
if( K3bListView* lv = dynamic_cast<K3bListView*>(listView()) )
lv->paintEmptyArea( &dbPainter, r );
else
- dbPainter.fillRect( 0, 0, width, height(),
+ dbPainter.fillRect( 0, 0, width, height(),
cgh.brush( QPalette::backgroundRoleFromMode(listView()->viewport()->backgroundMode()) ) );
// we want a little additional margin
@@ -724,7 +724,7 @@
case K3bListViewItem::COMBO:
if( !m_editorComboBox ) {
m_editorComboBox = new QComboBox( viewport() );
- connect( m_editorComboBox, SIGNAL(activated(const QString&)),
+ connect( m_editorComboBox, SIGNAL(activated(const QString&)),
this, SLOT(slotEditorComboBoxActivated(const QString&)) );
m_editorComboBox->installEventFilter( this );
}
@@ -983,7 +983,7 @@
m_editorMsfEdit->setText( m_currentEditItem->text( m_currentEditColumn ) );
break;
}
- }
+ }
}
@@ -1014,11 +1014,11 @@
bool K3bListView::eventFilter( QObject* o, QEvent* e )
{
- if( e->type() == QEvent::KeyPress ) {
+ if( e->type() == QEvent::KeyPress ) {
QKeyEvent* ke = static_cast<QKeyEvent*>(e);
if( ke->key() == Key_Tab ) {
- if( o == m_editorLineEdit ||
- o == d->msfEditLineEdit ||
+ if( o == m_editorLineEdit ||
+ o == d->msfEditLineEdit ||
o == d->spinBoxLineEdit ) {
K3bListViewItem* lastEditItem = m_currentEditItem;
@@ -1038,7 +1038,7 @@
viewport()->setFocus();
// search for the next editable item
- while( K3bListViewItem* nextItem =
+ while( K3bListViewItem* nextItem =
dynamic_cast<K3bListViewItem*>( lastEditItem->nextSibling() ) ) {
// edit first column
col = 0;
@@ -1048,7 +1048,7 @@
editItem( nextItem, col );
break;
}
-
+
lastEditItem = nextItem;
}
}
@@ -1057,14 +1057,15 @@
return true;
}
}
- if( ke->key() == Key_Return ) {
- if( o == m_editorLineEdit ||
- o == d->msfEditLineEdit ||
+ if( ke->key() == Key_Return ||
+ ke->key() == Key_Enter ) {
+ if( o == m_editorLineEdit ||
+ o == d->msfEditLineEdit ||
o == d->spinBoxLineEdit ) {
K3bListViewItem* lastEditItem = m_currentEditItem;
doRename();
- if( K3bListViewItem* nextItem =
+ if( K3bListViewItem* nextItem =
dynamic_cast<K3bListViewItem*>( lastEditItem->nextSibling() ) )
editItem( nextItem, currentEditColumn() );
else {
@@ -1078,8 +1079,8 @@
}
}
else if( ke->key() == Key_Escape ) {
- if( o == m_editorLineEdit ||
- o == d->msfEditLineEdit ||
+ if( o == m_editorLineEdit ||
+ o == d->msfEditLineEdit ||
o == d->spinBoxLineEdit ) {
hideEditor();
@@ -1111,8 +1112,8 @@
if( item != m_currentEditItem || m_currentEditColumn != col ) {
doRename();
if( K3bListViewItem* k3bItem = dynamic_cast<K3bListViewItem*>(item) ) {
- if( me->pos().x() > item->depth()*treeStepSize() &&
- item->isEnabled() &&
+ if( me->pos().x() > item->depth()*treeStepSize() &&
+ item->isEnabled() &&
(m_lastClickedItem == item || !m_doubleClickForEdit) )
showEditor( k3bItem, col );
else {
@@ -1137,8 +1138,8 @@
}
else if( e->type() == QEvent::FocusOut ) {
- if( o == m_editorLineEdit ||
- o == d->msfEditLineEdit ||
+ if( o == m_editorLineEdit ||
+ o == d->msfEditLineEdit ||
o == d->spinBoxLineEdit ||
o == m_editorComboBox ) {
// make sure we did not lose the focus to one of the edit widgets' children
@@ -1175,25 +1176,25 @@
bgPix.height() < m_backgroundPixmap.height() ) {
QPixmap newBgPix( m_backgroundPixmap.convertToImage().scale( bgPix.size(), QImage::ScaleMin ) );
if( m_backgroundPixmapPosition == TOP_LEFT )
- bitBlt( &bgPix, 0, 0,
- &newBgPix, 0, 0,
+ bitBlt( &bgPix, 0, 0,
+ &newBgPix, 0, 0,
newBgPix.width(), newBgPix.height() );
else {
int dx = bgPix.width() / 2 - m_backgroundPixmap.width() /2;
int dy = bgPix.height() / 2 - m_backgroundPixmap.height() /2;
- bitBlt( &bgPix, dx, dy, &newBgPix, 0, 0,
+ bitBlt( &bgPix, dx, dy, &newBgPix, 0, 0,
newBgPix.width(), newBgPix.height() );
}
}
else {
if( m_backgroundPixmapPosition == TOP_LEFT )
- bitBlt( &bgPix, 0, 0,
- &m_backgroundPixmap, 0, 0,
+ bitBlt( &bgPix, 0, 0,
+ &m_backgroundPixmap, 0, 0,
m_backgroundPixmap.width(), m_backgroundPixmap.height() );
else {
int dx = bgPix.width() / 2 - m_backgroundPixmap.width() /2;
int dy = bgPix.height() / 2 - m_backgroundPixmap.height() /2;
- bitBlt( &bgPix, dx, dy, &m_backgroundPixmap, 0, 0,
+ bitBlt( &bgPix, dx, dy, &m_backgroundPixmap, 0, 0,
m_backgroundPixmap.width(), m_backgroundPixmap.height() );
}
}
@@ -1234,7 +1235,7 @@
}
// now we should have a range top->bottom which includes all visible items
-
+
// there are two situations in which we fade the pixmap on the top or the bottom:
// 1. there are invisible items above (below) the visible
// 2. the range is way too big
Modified: kde-extras/k3b/branches/upstream/current/libk3b/tools/libisofs/Makefile.in
===================================================================
--- kde-extras/k3b/branches/upstream/current/libk3b/tools/libisofs/Makefile.in 2008-06-03 01:21:42 UTC (rev 10848)
+++ kde-extras/k3b/branches/upstream/current/libk3b/tools/libisofs/Makefile.in 2008-06-03 01:26:01 UTC (rev 10849)
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
# KDE tags expanded automatically by am_edit - $Revision: 483858 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -51,7 +51,7 @@
#>- libisofs_la_OBJECTS = $(am_libisofs_la_OBJECTS)
#>+ 1
libisofs_la_OBJECTS = isofs.lo
-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
+DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
am__depfiles_maybe = depfiles
#>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -452,8 +452,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
tags: TAGS
@@ -465,8 +465,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -476,13 +476,12 @@
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
- here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
Modified: kde-extras/k3b/branches/upstream/current/libk3b/videodvd/Makefile.in
===================================================================
--- kde-extras/k3b/branches/upstream/current/libk3b/videodvd/Makefile.in 2008-06-03 01:21:42 UTC (rev 10848)
+++ kde-extras/k3b/branches/upstream/current/libk3b/videodvd/Makefile.in 2008-06-03 01:26:01 UTC (rev 10849)
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
# KDE tags expanded automatically by am_edit - $Revision: 483858 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -57,7 +57,7 @@
k3bvideodvdvideostream.lo
@KDE_USE_FINAL_FALSE at libvideodvd_la_OBJECTS = $(libvideodvd_la_nofinal_OBJECTS)
@KDE_USE_FINAL_TRUE at libvideodvd_la_OBJECTS = $(libvideodvd_la_final_OBJECTS)
-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
+DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
am__depfiles_maybe = depfiles
#>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -501,8 +501,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
tags: TAGS
@@ -514,8 +514,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -525,13 +525,12 @@
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
- here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
Modified: kde-extras/k3b/branches/upstream/current/libk3bdevice/Makefile.in
===================================================================
--- kde-extras/k3b/branches/upstream/current/libk3bdevice/Makefile.in 2008-06-03 01:21:42 UTC (rev 10848)
+++ kde-extras/k3b/branches/upstream/current/libk3bdevice/Makefile.in 2008-06-03 01:26:01 UTC (rev 10849)
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
# KDE tags expanded automatically by am_edit - $Revision: 483858 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -94,7 +94,7 @@
libk3bdevice_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
$(CXXFLAGS) $(KDE_CXXFLAGS) $(libk3bdevice_la_LDFLAGS) $(LDFLAGS) -o $@
-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
+DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
am__depfiles_maybe = depfiles
#>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -477,8 +477,8 @@
@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
if test -f $$p; then \
f=$(am__strip_dir) \
- echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
- $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
else :; fi; \
done
@@ -486,8 +486,8 @@
@$(NORMAL_UNINSTALL)
@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
p=$(am__strip_dir) \
- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
done
clean-libLTLIBRARIES:
@@ -570,8 +570,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
tags: TAGS
@@ -583,8 +583,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -594,13 +594,12 @@
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
- here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
Modified: kde-extras/k3b/branches/upstream/current/libk3bdevice/k3bhalconnection.cpp
===================================================================
--- kde-extras/k3b/branches/upstream/current/libk3bdevice/k3bhalconnection.cpp 2008-06-03 01:21:42 UTC (rev 10848)
+++ kde-extras/k3b/branches/upstream/current/libk3bdevice/k3bhalconnection.cpp 2008-06-03 01:26:01 UTC (rev 10849)
@@ -1,4 +1,4 @@
-/*
+/*
*
* $Id: sourceheader,v 1.3 2005/01/19 13:03:46 trueg Exp $
* Copyright (C) 2005-2007 Sebastian Trueg <trueg at k3b.org>
@@ -79,9 +79,9 @@
LibHalContext* halContext;
DBusConnection* connection;
DBusQt::Connection* dBusQtConnection;
-
+
bool bOpen;
-
+
QMap<QCString, QString> udiDeviceMap;
QMap<QString, QCString> deviceUdiMap;
@@ -145,14 +145,14 @@
setupDBusQtConnection( d->connection );
libhal_ctx_set_dbus_connection( d->halContext, d->connection );
-
+
libhal_ctx_set_device_added( d->halContext, halDeviceAdded );
libhal_ctx_set_device_removed( d->halContext, halDeviceRemoved );
libhal_ctx_set_device_new_capability( d->halContext, 0 );
libhal_ctx_set_device_lost_capability( d->halContext, 0 );
libhal_ctx_set_device_property_modified( d->halContext, 0 );
libhal_ctx_set_device_condition( d->halContext, 0 );
-
+
if( !libhal_ctx_init( d->halContext, 0 ) ) {
k3bDebug() << "(K3bDevice::HalConnection) Failed to init HAL context!" << endl;
return false;
@@ -291,7 +291,7 @@
const char* lockComment = "Locked by the K3b libraries";
- if( !dbus_message_append_args( dmesg,
+ if( !dbus_message_append_args( dmesg,
DBUS_TYPE_STRING, &lockComment,
DBUS_TYPE_INVALID ) ) {
k3bDebug() << "(K3bDevice::HalConnection) lock failed for " << udi << ": could not append args to dbus message\n";
@@ -311,7 +311,7 @@
ret = org_freedesktop_Hal_DeviceAlreadyLocked;
else if( !strcmp(error.name, "org.freedesktop.Hal.PermissionDenied" ) )
ret = org_freedesktop_Hal_PermissionDenied;
-
+
dbus_error_free( &error );
}
else
@@ -348,7 +348,7 @@
return org_freedesktop_Hal_CommunicationError;
}
- if( !dbus_message_append_args( dmesg,
+ if( !dbus_message_append_args( dmesg,
DBUS_TYPE_INVALID ) ) {
k3bDebug() << "(K3bDevice::HalConnection) unlock failed for " << udi << ": could not append args to dbus message\n";
dbus_message_unref( dmesg );
@@ -381,8 +381,8 @@
}
-int K3bDevice::HalConnection::mount( K3bDevice::Device* dev,
- const QString& mountPoint,
+int K3bDevice::HalConnection::mount( K3bDevice::Device* dev,
+ const QString& mountPoint,
const QString& fstype,
const QStringList& options )
{
@@ -396,7 +396,7 @@
if( !d->deviceUdiMap.contains( dev->blockDeviceName() ) )
return org_freedesktop_Hal_NoSuchDevice;
-
+
if( !d->deviceMediumUdiMap.contains( d->deviceUdiMap[dev->blockDeviceName()] ) )
return org_freedesktop_Hal_Device_Volume_NoSuchDevice;
@@ -411,12 +411,12 @@
char** poptions = qstringListToArray( options );
- const char* strMountPoint = mountPoint.local8Bit().data();
- const char* strFstype = fstype.local8Bit().data();
+ QByteArray strMountPoint = mountPoint.local8Bit();
+ QByteArray strFstype = fstype.local8Bit();
- if( !dbus_message_append_args( dmesg,
- DBUS_TYPE_STRING, &strMountPoint,
- DBUS_TYPE_STRING, &strFstype,
+ if( !dbus_message_append_args( dmesg,
+ DBUS_TYPE_STRING, strMountPoint.data(),
+ DBUS_TYPE_STRING, strFstype.data(),
DBUS_TYPE_ARRAY, DBUS_TYPE_STRING, &poptions, options.count(),
DBUS_TYPE_INVALID ) ) {
k3bDebug() << "(K3bDevice::HalConnection) mount failed for " << mediumUdi << ": could not append args to dbus message\n";
@@ -476,7 +476,7 @@
if( !d->deviceUdiMap.contains( dev->blockDeviceName() ) )
return org_freedesktop_Hal_NoSuchDevice;
-
+
if( !d->deviceMediumUdiMap.contains( d->deviceUdiMap[dev->blockDeviceName()] ) )
return org_freedesktop_Hal_Device_Volume_NoSuchDevice;
@@ -491,7 +491,7 @@
char** poptions = qstringListToArray( options );
- if( !dbus_message_append_args( dmesg,
+ if( !dbus_message_append_args( dmesg,
DBUS_TYPE_ARRAY, DBUS_TYPE_STRING, &poptions, options.count(),
DBUS_TYPE_INVALID ) ) {
k3bDebug() << "(K3bDevice::HalConnection) unmount failed for " << mediumUdi << ": could not append args to dbus message\n";
@@ -533,8 +533,8 @@
return ret;
}
-
-int K3bDevice::HalConnection::eject( K3bDevice::Device* dev,
+
+int K3bDevice::HalConnection::eject( K3bDevice::Device* dev,
const QStringList& options )
{
//
@@ -547,7 +547,7 @@
if( !d->deviceUdiMap.contains( dev->blockDeviceName() ) )
return org_freedesktop_Hal_NoSuchDevice;
-
+
if( !d->deviceMediumUdiMap.contains( d->deviceUdiMap[dev->blockDeviceName()] ) )
return org_freedesktop_Hal_Device_Volume_NoSuchDevice;
@@ -562,7 +562,7 @@
char** poptions = qstringListToArray( options );
- if( !dbus_message_append_args( dmesg,
+ if( !dbus_message_append_args( dmesg,
DBUS_TYPE_ARRAY, DBUS_TYPE_STRING, &poptions, options.count(),
DBUS_TYPE_INVALID ) ) {
k3bDebug() << "(K3bDevice::HalConnection) eject failed for " << mediumUdi << ": could not append args to dbus message\n";
Modified: kde-extras/k3b/branches/upstream/current/plugins/Makefile.in
===================================================================
--- kde-extras/k3b/branches/upstream/current/plugins/Makefile.in 2008-06-03 01:21:42 UTC (rev 10848)
+++ kde-extras/k3b/branches/upstream/current/plugins/Makefile.in 2008-06-03 01:26:01 UTC (rev 10849)
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
# KDE tags expanded automatically by am_edit - $Revision: 483858 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -466,8 +466,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
tags: TAGS
@@ -492,8 +492,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -503,13 +503,12 @@
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
- here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
Modified: kde-extras/k3b/branches/upstream/current/plugins/audiooutput/Makefile.in
===================================================================
--- kde-extras/k3b/branches/upstream/current/plugins/audiooutput/Makefile.in 2008-06-03 01:21:42 UTC (rev 10848)
+++ kde-extras/k3b/branches/upstream/current/plugins/audiooutput/Makefile.in 2008-06-03 01:26:01 UTC (rev 10849)
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
# KDE tags expanded automatically by am_edit - $Revision: 483858 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -468,8 +468,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
tags: TAGS
@@ -494,8 +494,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -505,13 +505,12 @@
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
- here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
Modified: kde-extras/k3b/branches/upstream/current/plugins/audiooutput/alsa/Makefile.in
===================================================================
--- kde-extras/k3b/branches/upstream/current/plugins/audiooutput/alsa/Makefile.in 2008-06-03 01:21:42 UTC (rev 10848)
+++ kde-extras/k3b/branches/upstream/current/plugins/audiooutput/alsa/Makefile.in 2008-06-03 01:26:01 UTC (rev 10849)
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
# KDE tags expanded automatically by am_edit - $Revision: 483858 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -72,7 +72,7 @@
$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \
$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
$(libk3balsaoutputplugin_la_LDFLAGS) $(LDFLAGS) -o $@
-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
+DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
am__depfiles_maybe = depfiles
#>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -435,8 +435,8 @@
@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
if test -f $$p; then \
f=$(am__strip_dir) \
- echo " $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_moduledir)/$$f'"; \
- $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_moduledir)/$$f"; \
+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_moduledir)/$$f'"; \
+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_moduledir)/$$f"; \
else :; fi; \
done
@@ -444,8 +444,8 @@
@$(NORMAL_UNINSTALL)
@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
p=$(am__strip_dir) \
- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
done
clean-kde_moduleLTLIBRARIES:
@@ -516,8 +516,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
tags: TAGS
@@ -529,8 +529,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -540,13 +540,12 @@
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
- here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
Modified: kde-extras/k3b/branches/upstream/current/plugins/audiooutput/arts/Makefile.in
===================================================================
--- kde-extras/k3b/branches/upstream/current/plugins/audiooutput/arts/Makefile.in 2008-06-03 01:21:42 UTC (rev 10848)
+++ kde-extras/k3b/branches/upstream/current/plugins/audiooutput/arts/Makefile.in 2008-06-03 01:26:01 UTC (rev 10849)
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
# KDE tags expanded automatically by am_edit - $Revision: 483858 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -70,7 +70,7 @@
$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \
$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
$(libk3bartsoutputplugin_la_LDFLAGS) $(LDFLAGS) -o $@
-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
+DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
am__depfiles_maybe = depfiles
#>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -432,8 +432,8 @@
@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
if test -f $$p; then \
f=$(am__strip_dir) \
- echo " $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_moduledir)/$$f'"; \
- $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_moduledir)/$$f"; \
+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_moduledir)/$$f'"; \
+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_moduledir)/$$f"; \
else :; fi; \
done
@@ -441,8 +441,8 @@
@$(NORMAL_UNINSTALL)
@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
p=$(am__strip_dir) \
- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
done
clean-kde_moduleLTLIBRARIES:
@@ -513,8 +513,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
tags: TAGS
@@ -526,8 +526,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -537,13 +537,12 @@
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
- here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
Modified: kde-extras/k3b/branches/upstream/current/plugins/decoder/Makefile.in
===================================================================
--- kde-extras/k3b/branches/upstream/current/plugins/decoder/Makefile.in 2008-06-03 01:21:42 UTC (rev 10848)
+++ kde-extras/k3b/branches/upstream/current/plugins/decoder/Makefile.in 2008-06-03 01:26:01 UTC (rev 10849)
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
# KDE tags expanded automatically by am_edit - $Revision: 483858 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -472,8 +472,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
tags: TAGS
@@ -498,8 +498,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -509,13 +509,12 @@
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
- here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
Modified: kde-extras/k3b/branches/upstream/current/plugins/decoder/ffmpeg/Makefile.in
===================================================================
--- kde-extras/k3b/branches/upstream/current/plugins/decoder/ffmpeg/Makefile.in 2008-06-03 01:21:42 UTC (rev 10848)
+++ kde-extras/k3b/branches/upstream/current/plugins/decoder/ffmpeg/Makefile.in 2008-06-03 01:26:01 UTC (rev 10849)
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
# KDE tags expanded automatically by am_edit - $Revision: 483858 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -74,7 +74,7 @@
libk3bffmpegdecoder_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
$(CXXFLAGS) $(KDE_CXXFLAGS) $(libk3bffmpegdecoder_la_LDFLAGS) $(LDFLAGS) -o $@
-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
+DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
am__depfiles_maybe = depfiles
#>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -437,8 +437,8 @@
@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
if test -f $$p; then \
f=$(am__strip_dir) \
- echo " $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_moduledir)/$$f'"; \
- $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_moduledir)/$$f"; \
+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_moduledir)/$$f'"; \
+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_moduledir)/$$f"; \
else :; fi; \
done
@@ -446,8 +446,8 @@
@$(NORMAL_UNINSTALL)
@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
p=$(am__strip_dir) \
- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
done
clean-kde_moduleLTLIBRARIES:
@@ -519,8 +519,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
tags: TAGS
@@ -532,8 +532,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -543,13 +543,12 @@
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
- here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
Modified: kde-extras/k3b/branches/upstream/current/plugins/decoder/flac/Makefile.in
===================================================================
--- kde-extras/k3b/branches/upstream/current/plugins/decoder/flac/Makefile.in 2008-06-03 01:21:42 UTC (rev 10848)
+++ kde-extras/k3b/branches/upstream/current/plugins/decoder/flac/Makefile.in 2008-06-03 01:26:01 UTC (rev 10849)
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
# KDE tags expanded automatically by am_edit - $Revision: 483858 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -69,7 +69,7 @@
libk3bflacdecoder_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
$(CXXFLAGS) $(KDE_CXXFLAGS) $(libk3bflacdecoder_la_LDFLAGS) $(LDFLAGS) -o $@
-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
+DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
am__depfiles_maybe = depfiles
#>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -431,8 +431,8 @@
@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
if test -f $$p; then \
f=$(am__strip_dir) \
- echo " $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_moduledir)/$$f'"; \
- $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_moduledir)/$$f"; \
+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_moduledir)/$$f'"; \
+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_moduledir)/$$f"; \
else :; fi; \
done
@@ -440,8 +440,8 @@
@$(NORMAL_UNINSTALL)
@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
p=$(am__strip_dir) \
- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
done
clean-kde_moduleLTLIBRARIES:
@@ -512,8 +512,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
tags: TAGS
@@ -525,8 +525,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -536,13 +536,12 @@
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
- here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
Modified: kde-extras/k3b/branches/upstream/current/plugins/decoder/libsndfile/Makefile.in
===================================================================
--- kde-extras/k3b/branches/upstream/current/plugins/decoder/libsndfile/Makefile.in 2008-06-03 01:21:42 UTC (rev 10848)
+++ kde-extras/k3b/branches/upstream/current/plugins/decoder/libsndfile/Makefile.in 2008-06-03 01:26:01 UTC (rev 10849)
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
# KDE tags expanded automatically by am_edit - $Revision: 483858 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -72,7 +72,7 @@
$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \
$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
$(libk3blibsndfiledecoder_la_LDFLAGS) $(LDFLAGS) -o $@
-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
+DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
am__depfiles_maybe = depfiles
#>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -434,8 +434,8 @@
@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
if test -f $$p; then \
f=$(am__strip_dir) \
- echo " $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_moduledir)/$$f'"; \
- $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_moduledir)/$$f"; \
+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_moduledir)/$$f'"; \
+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_moduledir)/$$f"; \
else :; fi; \
done
@@ -443,8 +443,8 @@
@$(NORMAL_UNINSTALL)
@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
p=$(am__strip_dir) \
- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
done
clean-kde_moduleLTLIBRARIES:
@@ -515,8 +515,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
tags: TAGS
@@ -528,8 +528,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -539,13 +539,12 @@
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
- here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
Modified: kde-extras/k3b/branches/upstream/current/plugins/decoder/mp3/Makefile.in
===================================================================
--- kde-extras/k3b/branches/upstream/current/plugins/decoder/mp3/Makefile.in 2008-06-03 01:21:42 UTC (rev 10848)
+++ kde-extras/k3b/branches/upstream/current/plugins/decoder/mp3/Makefile.in 2008-06-03 01:26:01 UTC (rev 10849)
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
# KDE tags expanded automatically by am_edit - $Revision: 483858 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -73,7 +73,7 @@
libk3bmaddecoder_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
$(CXXFLAGS) $(KDE_CXXFLAGS) $(libk3bmaddecoder_la_LDFLAGS) $(LDFLAGS) -o $@
-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
+DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
am__depfiles_maybe = depfiles
#>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -435,8 +435,8 @@
@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
if test -f $$p; then \
f=$(am__strip_dir) \
- echo " $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_moduledir)/$$f'"; \
- $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_moduledir)/$$f"; \
+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_moduledir)/$$f'"; \
+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_moduledir)/$$f"; \
else :; fi; \
done
@@ -444,8 +444,8 @@
@$(NORMAL_UNINSTALL)
@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
p=$(am__strip_dir) \
- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
done
clean-kde_moduleLTLIBRARIES:
@@ -517,8 +517,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
tags: TAGS
@@ -530,8 +530,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -541,13 +541,12 @@
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
- here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
Modified: kde-extras/k3b/branches/upstream/current/plugins/decoder/musepack/Makefile.in
===================================================================
--- kde-extras/k3b/branches/upstream/current/plugins/decoder/musepack/Makefile.in 2008-06-03 01:21:42 UTC (rev 10848)
+++ kde-extras/k3b/branches/upstream/current/plugins/decoder/musepack/Makefile.in 2008-06-03 01:26:01 UTC (rev 10849)
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
# KDE tags expanded automatically by am_edit - $Revision: 483858 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -72,7 +72,7 @@
libk3bmpcdecoder_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
$(CXXFLAGS) $(KDE_CXXFLAGS) $(libk3bmpcdecoder_la_LDFLAGS) $(LDFLAGS) -o $@
-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
+DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
am__depfiles_maybe = depfiles
#>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -438,8 +438,8 @@
@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
if test -f $$p; then \
f=$(am__strip_dir) \
- echo " $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_moduledir)/$$f'"; \
- $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_moduledir)/$$f"; \
+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_moduledir)/$$f'"; \
+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_moduledir)/$$f"; \
else :; fi; \
done
@@ -447,8 +447,8 @@
@$(NORMAL_UNINSTALL)
@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
p=$(am__strip_dir) \
- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
done
clean-kde_moduleLTLIBRARIES:
@@ -520,8 +520,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
tags: TAGS
@@ -533,8 +533,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -544,13 +544,12 @@
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
- here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
Modified: kde-extras/k3b/branches/upstream/current/plugins/decoder/ogg/Makefile.in
===================================================================
--- kde-extras/k3b/branches/upstream/current/plugins/decoder/ogg/Makefile.in 2008-06-03 01:21:42 UTC (rev 10848)
+++ kde-extras/k3b/branches/upstream/current/plugins/decoder/ogg/Makefile.in 2008-06-03 01:26:01 UTC (rev 10849)
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
# KDE tags expanded automatically by am_edit - $Revision: 483858 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -70,7 +70,7 @@
$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \
$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
$(libk3boggvorbisdecoder_la_LDFLAGS) $(LDFLAGS) -o $@
-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
+DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
am__depfiles_maybe = depfiles
#>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -432,8 +432,8 @@
@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
if test -f $$p; then \
f=$(am__strip_dir) \
- echo " $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_moduledir)/$$f'"; \
- $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_moduledir)/$$f"; \
+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_moduledir)/$$f'"; \
+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_moduledir)/$$f"; \
else :; fi; \
done
@@ -441,8 +441,8 @@
@$(NORMAL_UNINSTALL)
@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
p=$(am__strip_dir) \
- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
done
clean-kde_moduleLTLIBRARIES:
@@ -513,8 +513,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
tags: TAGS
@@ -526,8 +526,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -537,13 +537,12 @@
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
- here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
Modified: kde-extras/k3b/branches/upstream/current/plugins/decoder/wave/Makefile.in
===================================================================
--- kde-extras/k3b/branches/upstream/current/plugins/decoder/wave/Makefile.in 2008-06-03 01:21:42 UTC (rev 10848)
+++ kde-extras/k3b/branches/upstream/current/plugins/decoder/wave/Makefile.in 2008-06-03 01:26:01 UTC (rev 10849)
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
# KDE tags expanded automatically by am_edit - $Revision: 483858 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -69,7 +69,7 @@
libk3bwavedecoder_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
$(CXXFLAGS) $(KDE_CXXFLAGS) $(libk3bwavedecoder_la_LDFLAGS) $(LDFLAGS) -o $@
-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
+DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
am__depfiles_maybe = depfiles
#>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -431,8 +431,8 @@
@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
if test -f $$p; then \
f=$(am__strip_dir) \
- echo " $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_moduledir)/$$f'"; \
- $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_moduledir)/$$f"; \
+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_moduledir)/$$f'"; \
+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_moduledir)/$$f"; \
else :; fi; \
done
@@ -440,8 +440,8 @@
@$(NORMAL_UNINSTALL)
@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
p=$(am__strip_dir) \
- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
done
clean-kde_moduleLTLIBRARIES:
@@ -512,8 +512,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
tags: TAGS
@@ -525,8 +525,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -536,13 +536,12 @@
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
- here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
Modified: kde-extras/k3b/branches/upstream/current/plugins/encoder/Makefile.in
===================================================================
--- kde-extras/k3b/branches/upstream/current/plugins/encoder/Makefile.in 2008-06-03 01:21:42 UTC (rev 10848)
+++ kde-extras/k3b/branches/upstream/current/plugins/encoder/Makefile.in 2008-06-03 01:26:01 UTC (rev 10849)
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
# KDE tags expanded automatically by am_edit - $Revision: 483858 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -468,8 +468,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
tags: TAGS
@@ -494,8 +494,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -505,13 +505,12 @@
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
- here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
Modified: kde-extras/k3b/branches/upstream/current/plugins/encoder/external/Makefile.in
===================================================================
--- kde-extras/k3b/branches/upstream/current/plugins/encoder/external/Makefile.in 2008-06-03 01:21:42 UTC (rev 10848)
+++ kde-extras/k3b/branches/upstream/current/plugins/encoder/external/Makefile.in 2008-06-03 01:26:01 UTC (rev 10849)
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
# KDE tags expanded automatically by am_edit - $Revision: 483858 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -77,7 +77,7 @@
$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \
$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(libk3bexternalencoder_la_LDFLAGS) \
$(LDFLAGS) -o $@
-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
+DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
am__depfiles_maybe = depfiles
#>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -446,8 +446,8 @@
@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
if test -f $$p; then \
f=$(am__strip_dir) \
- echo " $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_moduledir)/$$f'"; \
- $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_moduledir)/$$f"; \
+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_moduledir)/$$f'"; \
+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_moduledir)/$$f"; \
else :; fi; \
done
@@ -455,8 +455,8 @@
@$(NORMAL_UNINSTALL)
@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
p=$(am__strip_dir) \
- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
done
clean-kde_moduleLTLIBRARIES:
@@ -529,8 +529,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
tags: TAGS
@@ -542,8 +542,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -553,13 +553,12 @@
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
- here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
Modified: kde-extras/k3b/branches/upstream/current/plugins/encoder/lame/Makefile.in
===================================================================
--- kde-extras/k3b/branches/upstream/current/plugins/encoder/lame/Makefile.in 2008-06-03 01:21:42 UTC (rev 10848)
+++ kde-extras/k3b/branches/upstream/current/plugins/encoder/lame/Makefile.in 2008-06-03 01:26:01 UTC (rev 10849)
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
# KDE tags expanded automatically by am_edit - $Revision: 483858 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -72,7 +72,7 @@
libk3blameencoder_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
$(CXXFLAGS) $(KDE_CXXFLAGS) $(libk3blameencoder_la_LDFLAGS) $(LDFLAGS) -o $@
-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
+DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
am__depfiles_maybe = depfiles
#>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -441,8 +441,8 @@
@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
if test -f $$p; then \
f=$(am__strip_dir) \
- echo " $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_moduledir)/$$f'"; \
- $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_moduledir)/$$f"; \
+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_moduledir)/$$f'"; \
+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_moduledir)/$$f"; \
else :; fi; \
done
@@ -450,8 +450,8 @@
@$(NORMAL_UNINSTALL)
@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
p=$(am__strip_dir) \
- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
done
clean-kde_moduleLTLIBRARIES:
@@ -522,8 +522,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
tags: TAGS
@@ -535,8 +535,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -546,13 +546,12 @@
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
- here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
Modified: kde-extras/k3b/branches/upstream/current/plugins/encoder/ogg/Makefile.in
===================================================================
--- kde-extras/k3b/branches/upstream/current/plugins/encoder/ogg/Makefile.in 2008-06-03 01:21:42 UTC (rev 10848)
+++ kde-extras/k3b/branches/upstream/current/plugins/encoder/ogg/Makefile.in 2008-06-03 01:26:01 UTC (rev 10849)
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
# KDE tags expanded automatically by am_edit - $Revision: 483858 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -75,7 +75,7 @@
$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \
$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
$(libk3boggvorbisencoder_la_LDFLAGS) $(LDFLAGS) -o $@
-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
+DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
am__depfiles_maybe = depfiles
#>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -439,8 +439,8 @@
@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
if test -f $$p; then \
f=$(am__strip_dir) \
- echo " $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_moduledir)/$$f'"; \
- $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_moduledir)/$$f"; \
+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_moduledir)/$$f'"; \
+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_moduledir)/$$f"; \
else :; fi; \
done
@@ -448,8 +448,8 @@
@$(NORMAL_UNINSTALL)
@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
p=$(am__strip_dir) \
- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
done
clean-kde_moduleLTLIBRARIES:
@@ -520,8 +520,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
tags: TAGS
@@ -533,8 +533,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -544,13 +544,12 @@
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
- here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
Modified: kde-extras/k3b/branches/upstream/current/plugins/encoder/sox/Makefile.in
===================================================================
--- kde-extras/k3b/branches/upstream/current/plugins/encoder/sox/Makefile.in 2008-06-03 01:21:42 UTC (rev 10848)
+++ kde-extras/k3b/branches/upstream/current/plugins/encoder/sox/Makefile.in 2008-06-03 01:26:01 UTC (rev 10849)
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
# KDE tags expanded automatically by am_edit - $Revision: 483858 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -72,7 +72,7 @@
libk3bsoxencoder_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
$(CXXFLAGS) $(KDE_CXXFLAGS) $(libk3bsoxencoder_la_LDFLAGS) $(LDFLAGS) -o $@
-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
+DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
am__depfiles_maybe = depfiles
#>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -436,8 +436,8 @@
@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
if test -f $$p; then \
f=$(am__strip_dir) \
- echo " $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_moduledir)/$$f'"; \
- $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_moduledir)/$$f"; \
+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_moduledir)/$$f'"; \
+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_moduledir)/$$f"; \
else :; fi; \
done
@@ -445,8 +445,8 @@
@$(NORMAL_UNINSTALL)
@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
p=$(am__strip_dir) \
- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
done
clean-kde_moduleLTLIBRARIES:
@@ -517,8 +517,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
tags: TAGS
@@ -530,8 +530,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -541,13 +541,12 @@
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
- here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
Modified: kde-extras/k3b/branches/upstream/current/plugins/project/Makefile.in
===================================================================
--- kde-extras/k3b/branches/upstream/current/plugins/project/Makefile.in 2008-06-03 01:21:42 UTC (rev 10848)
+++ kde-extras/k3b/branches/upstream/current/plugins/project/Makefile.in 2008-06-03 01:26:01 UTC (rev 10849)
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
# KDE tags expanded automatically by am_edit - $Revision: 483858 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -466,8 +466,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
tags: TAGS
@@ -492,8 +492,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -503,13 +503,12 @@
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
- here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
Modified: kde-extras/k3b/branches/upstream/current/plugins/project/audiometainforenamer/Makefile.in
===================================================================
--- kde-extras/k3b/branches/upstream/current/plugins/project/audiometainforenamer/Makefile.in 2008-06-03 01:21:42 UTC (rev 10848)
+++ kde-extras/k3b/branches/upstream/current/plugins/project/audiometainforenamer/Makefile.in 2008-06-03 01:26:01 UTC (rev 10849)
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
# KDE tags expanded automatically by am_edit - $Revision: 483858 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -74,7 +74,7 @@
$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
$(libk3baudiometainforenamerplugin_la_LDFLAGS) $(LDFLAGS) -o \
$@
-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
+DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
am__depfiles_maybe = depfiles
#>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -444,8 +444,8 @@
@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
if test -f $$p; then \
f=$(am__strip_dir) \
- echo " $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_moduledir)/$$f'"; \
- $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_moduledir)/$$f"; \
+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_moduledir)/$$f'"; \
+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_moduledir)/$$f"; \
else :; fi; \
done
@@ -453,8 +453,8 @@
@$(NORMAL_UNINSTALL)
@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
p=$(am__strip_dir) \
- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
done
clean-kde_moduleLTLIBRARIES:
@@ -525,8 +525,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
tags: TAGS
@@ -538,8 +538,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -549,13 +549,12 @@
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
- here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
Modified: kde-extras/k3b/branches/upstream/current/plugins/project/audioprojectcddb/Makefile.in
===================================================================
--- kde-extras/k3b/branches/upstream/current/plugins/project/audioprojectcddb/Makefile.in 2008-06-03 01:21:42 UTC (rev 10848)
+++ kde-extras/k3b/branches/upstream/current/plugins/project/audioprojectcddb/Makefile.in 2008-06-03 01:26:01 UTC (rev 10849)
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
# KDE tags expanded automatically by am_edit - $Revision: 483858 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -72,7 +72,7 @@
$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \
$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
$(libk3baudioprojectcddbplugin_la_LDFLAGS) $(LDFLAGS) -o $@
-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
+DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
am__depfiles_maybe = depfiles
#>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -443,8 +443,8 @@
@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
if test -f $$p; then \
f=$(am__strip_dir) \
- echo " $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_moduledir)/$$f'"; \
- $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_moduledir)/$$f"; \
+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_moduledir)/$$f'"; \
+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_moduledir)/$$f"; \
else :; fi; \
done
@@ -452,8 +452,8 @@
@$(NORMAL_UNINSTALL)
@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
p=$(am__strip_dir) \
- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
done
clean-kde_moduleLTLIBRARIES:
@@ -524,8 +524,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
tags: TAGS
@@ -537,8 +537,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -548,13 +548,12 @@
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
- here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
Modified: kde-extras/k3b/branches/upstream/current/src/Makefile.in
===================================================================
--- kde-extras/k3b/branches/upstream/current/src/Makefile.in 2008-06-03 01:21:42 UTC (rev 10848)
+++ kde-extras/k3b/branches/upstream/current/src/Makefile.in 2008-06-03 01:26:01 UTC (rev 10849)
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
# KDE tags expanded automatically by am_edit - $Revision: 483858 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -130,7 +130,7 @@
k3b_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(k3b_LDFLAGS) \
$(LDFLAGS) -o $@
-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
+DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
am__depfiles_maybe = depfiles
#>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -613,8 +613,8 @@
|| test -f $$p1 \
; then \
f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
- echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
- $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
+ echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
+ $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
else :; fi; \
done
@@ -851,8 +851,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
tags: TAGS
@@ -877,8 +877,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -888,13 +888,12 @@
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
- here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
Modified: kde-extras/k3b/branches/upstream/current/src/eventsrc
===================================================================
--- kde-extras/k3b/branches/upstream/current/src/eventsrc 2008-06-03 01:21:42 UTC (rev 10848)
+++ kde-extras/k3b/branches/upstream/current/src/eventsrc 2008-06-03 01:26:01 UTC (rev 10849)
@@ -31,6 +31,7 @@
Name[is]=Velheppnað ferli
Name[it]=Processo riuscito
Name[ja]=プロセス成功
+Name[ka]=პროცესი წარმატებულია
Name[km]=ដំណើរការបានជោគជ័យ
Name[lt]=Procesas pavyko
Name[mk]=Процесот е успешен
@@ -54,7 +55,8 @@
Name[tg]=Бомуваффақият ба анҷом расид
Name[tr]=İşlem başarılı
Name[uk]=Процес успішний
-Name[uz]=Муваффақиятли жараён
+Name[uz]=Muvaffaqiyatli jarayon
+Name[uz at cyrillic]=Муваффақиятли жараён
Name[zh_CN]=处理成功
Name[zh_TW]=處理成功
Comment=Process successfully finished
@@ -81,6 +83,7 @@
Comment[is]=Ferli lauk með góðum árangri
Comment[it]=Processo riuscito e terminato
Comment[ja]=プロセス完了
+Comment[ka]=პროცესი წარმატებით დასრულდა
Comment[km]=បានបញ្ចប់ដំណើរការដោយជោគជ័យ
Comment[lt]=Procesas sėkmingai baigtas
Comment[mk]=Процесот заврши успешно
@@ -104,7 +107,8 @@
Comment[tg]=Амалиёт бомуваффақият ба анҷом расид
Comment[tr]=İşlem başarıyla sonuçlandı
Comment[uk]=Процес успішно завершився
-Comment[uz]=Жараён муваффақиятли тугади
+Comment[uz]=Jarayon muvaffaqiyatli tugadi
+Comment[uz at cyrillic]=Жараён муваффақиятли тугади
Comment[zh_CN]=处理成功完成
Comment[zh_TW]=成功完成處理
default_sound=k3b_success1.wav
@@ -136,6 +140,7 @@
Name[is]=Villa í ferli
Name[it]=Errore di Processo
Name[ja]=プロセスエラー
+Name[ka]=პროცესის შეცდომა
Name[km]=ដំណើរការមានកំហុស
Name[lt]=Proceso klaida
Name[mk]=Грешка во процесот
@@ -159,7 +164,8 @@
Name[tg]=Хатогӣ
Name[tr]=İşlemde hata var
Name[uk]=Помилка процесу
-Name[uz]=Хатоли жараён
+Name[uz]=Xatoli jarayon
+Name[uz at cyrillic]=Хатоли жараён
Name[zh_CN]=处理错误
Name[zh_TW]=處理發生錯誤
Comment=Process finished with errors
@@ -186,6 +192,7 @@
Comment[is]=Ferli lauk með villum
Comment[it]=Processo terminato con errori
Comment[ja]=プロセス未了 (エラー)
+Comment[ka]=პროცესი შეცდომებით დასრულდა
Comment[km]=បានបញ្ចប់ដំណើរការដោយមានកំហុស
Comment[lt]=Procesas baigtas su klaidomis
Comment[mk]=Процесот заврши со грешки
@@ -209,7 +216,8 @@
Comment[tg]=Амалиёт бо хатогӣ ба анҷом расид
Comment[tr]=İşlem hatayla sonuçlandı
Comment[uk]=Процес завершився з помилками
-Comment[uz]=Жараён хатолар билан тугади
+Comment[uz]=Jarayon xatolar bilan tugadi
+Comment[uz at cyrillic]=Жараён хатолар билан тугади
Comment[zh_CN]=处理完成，有错误
Comment[zh_TW]=完成處理，但發生錯誤
default_sound=k3b_error1.wav
@@ -241,6 +249,7 @@
Name[is]=Býð eftir miðli
Name[it]=Si è in attesa di un supporto
Name[ja]=メディアを待っています
+Name[ka]=ველოდები მატარებელს
Name[km]=កំពុងរង់ចាំមេឌៀ
Name[lt]=Laukiama disko
Name[mk]=Исчекување за носач
@@ -264,7 +273,8 @@
Name[tg]=Интизори расона
Name[tr]=Ortam bekleniyor
Name[uk]=Очікування носія
-Name[uz]=Диск кутилмоқда
+Name[uz]=Disk kutilmoqda
+Name[uz at cyrillic]=Диск кутилмоқда
Name[zh_CN]=等待存储介质
Name[zh_TW]=等待插入媒體
Comment=The user needs to insert a medium
@@ -291,6 +301,7 @@
Comment[is]=Notandi verður að setja inn disk
Comment[it]=L'utente deve inserire un supporto
Comment[ja]=メディアを入れてください
+Comment[ka]=მომხმარებელს სჭირდება მატარებლის ჩადება
Comment[km]=អ្នកប្រើត្រូវតែបញ្ចូលឧបករណ៍ផ្ទុកមួយ
Comment[lt]=Naudotojas turi įdėti diską
Comment[mk]=Корисникот треба да внесе носач
@@ -314,7 +325,8 @@
Comment[tg]=Истифодабаранда бояд расонаро барқарор кунад
Comment[tr]=Kullanıcının bir ortam takması gerekiyor
Comment[uk]=Користувач мусить вставити носій
-Comment[uz]=Фойдаланувчи дискни қўйиши керак
+Comment[uz]=Foydalanuvchi diskni qoʻyishi kerak
+Comment[uz at cyrillic]=Фойдаланувчи дискни қўйиши керак
Comment[zh_CN]=用户需要插入存储介质
Comment[zh_TW]=使用者需要插入媒體
default_sound=k3b_wait_media1.wav
Modified: kde-extras/k3b/branches/upstream/current/src/fastscale/Makefile.in
===================================================================
--- kde-extras/k3b/branches/upstream/current/src/fastscale/Makefile.in 2008-06-03 01:21:42 UTC (rev 10848)
+++ kde-extras/k3b/branches/upstream/current/src/fastscale/Makefile.in 2008-06-03 01:26:01 UTC (rev 10849)
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
# KDE tags expanded automatically by am_edit - $Revision: 483858 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -55,7 +55,7 @@
libfastscale_la_nofinal_OBJECTS = scale.lo asm_scale.lo
@KDE_USE_FINAL_FALSE at libfastscale_la_OBJECTS = $(libfastscale_la_nofinal_OBJECTS)
@KDE_USE_FINAL_TRUE at libfastscale_la_OBJECTS = $(libfastscale_la_final_OBJECTS)
-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
+DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
am__depfiles_maybe = depfiles
CPPASCOMPILE = $(CCAS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -500,8 +500,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
tags: TAGS
@@ -513,8 +513,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -524,13 +524,12 @@
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
- here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
Modified: kde-extras/k3b/branches/upstream/current/src/icons/Makefile.in
===================================================================
--- kde-extras/k3b/branches/upstream/current/src/icons/Makefile.in 2008-06-03 01:21:42 UTC (rev 10848)
+++ kde-extras/k3b/branches/upstream/current/src/icons/Makefile.in 2008-06-03 01:26:01 UTC (rev 10849)
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
# KDE tags expanded automatically by am_edit - $Revision: 483858 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -467,8 +467,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
tags: TAGS
@@ -493,8 +493,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -504,13 +504,12 @@
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
- here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
Modified: kde-extras/k3b/branches/upstream/current/src/icons/actions/Makefile.in
===================================================================
--- kde-extras/k3b/branches/upstream/current/src/icons/actions/Makefile.in 2008-06-03 01:21:42 UTC (rev 10848)
+++ kde-extras/k3b/branches/upstream/current/src/icons/actions/Makefile.in 2008-06-03 01:26:01 UTC (rev 10849)
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
# KDE tags expanded automatically by am_edit - $Revision: 483858 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
Modified: kde-extras/k3b/branches/upstream/current/src/k3b.desktop
===================================================================
--- kde-extras/k3b/branches/upstream/current/src/k3b.desktop 2008-06-03 01:21:42 UTC (rev 10848)
+++ kde-extras/k3b/branches/upstream/current/src/k3b.desktop 2008-06-03 01:26:01 UTC (rev 10849)
@@ -29,6 +29,7 @@
GenericName[is]=CD og DVD brennsla
GenericName[it]=Masterizzazione CD e DVD
GenericName[ja]=CD / DVD 作成
+GenericName[ka]=CD-ის და DVD-ის ჩანაწერა
GenericName[km]=ការដុតស៊ីឌី & ឌីវីឌី
GenericName[lt]=CD ir DVD kūrimas
GenericName[mk]=Снимање на CD и DVD
@@ -52,7 +53,8 @@
GenericName[tg]=Сабти CD ва DVD
GenericName[tr]=CD ve DVD Kaydedici
GenericName[uk]=Запис КД та DVD
-GenericName[uz]=CD ва DVD дискларга ёзиш
+GenericName[uz]=CD va DVD disklarga yozish
+GenericName[uz at cyrillic]=CD ва DVD дискларга ёзиш
GenericName[zh_CN]=CD & DVD 烧录程序
GenericName[zh_TW]=CD & DVD 燒錄
Comment=CD writing program
@@ -80,6 +82,7 @@
Comment[is]=CD skrifunarforrit
Comment[it]=Programma di masterizzazione
Comment[ja]=CD 書き込みプログラム
+Comment[ka]=CD-ის ჩამწერი პროგრამა
Comment[km]=កម្មវិធីសរសេរស៊ីឌី
Comment[lt]=CD įrašymo programa
Comment[mk]=Програма за снимање на CD
@@ -103,7 +106,8 @@
Comment[tg]=Барномаи сабти компакт-дискҳо
Comment[tr]=CD yazdırma programı
Comment[uk]=Програма запису КД
-Comment[uz]=Компакт-дискка ёзиш дастури
+Comment[uz]=Kompakt-diskka yozish dasturi
+Comment[uz at cyrillic]=Компакт-дискка ёзиш дастури
Comment[xh]=Ubhalo lwe Cd lodweiso Iwenkqubo
Comment[zh_CN]=CD 刻录程序
Comment[zh_TW]=CD 燒錄程式
Modified: kde-extras/k3b/branches/upstream/current/src/k3bapplication.cpp
===================================================================
--- kde-extras/k3b/branches/upstream/current/src/k3bapplication.cpp 2008-06-03 01:21:42 UTC (rev 10848)
+++ kde-extras/k3b/branches/upstream/current/src/k3bapplication.cpp 2008-06-03 01:26:01 UTC (rev 10849)
@@ -1,6 +1,6 @@
/*
*
- * $Id: k3bapplication.cpp 689561 2007-07-18 15:19:38Z trueg $
+ * $Id: k3bapplication.cpp 802344 2008-04-29 07:45:46Z trueg $
* Copyright (C) 2003-2007 Sebastian Trueg <trueg at k3b.org>
*
* This file is part of the K3b project.
@@ -256,6 +256,7 @@
else if( args->isSet("copycd") ) {
showTips = false;
dialogOpen = true;
+ qApp->processEvents();
m_mainWindow->cdCopy( K3b::urlToDevice( KURL::fromPathOrURL( QFile::decodeName( args->getOption( "copycd" ) ) ) ) );
}
else if( args->isSet("copydvd") ) {
@@ -382,7 +383,7 @@
mediaCache()->buildDeviceList( deviceManager() );
connect( deviceManager(), SIGNAL(changed(K3bDevice::DeviceManager*)),
- mediaCache(), SLOT(buildDeviceList(K3bDevice::DeviceManager*)) );
+ mediaCache(), SLOT(buildDeviceList(K3bDevice::DeviceManager*)) );
}
Modified: kde-extras/k3b/branches/upstream/current/src/k3bmediaselectioncombobox.cpp
===================================================================
--- kde-extras/k3b/branches/upstream/current/src/k3bmediaselectioncombobox.cpp 2008-06-03 01:21:42 UTC (rev 10848)
+++ kde-extras/k3b/branches/upstream/current/src/k3bmediaselectioncombobox.cpp 2008-06-03 01:26:01 UTC (rev 10849)
@@ -283,8 +283,9 @@
K3bMedium medium = k3bappcore->mediaCache()->medium( *it );
- if( showMedium( medium ) )
+ if( showMedium( medium ) ) {
addMedium( *it );
+ }
}
//
Modified: kde-extras/k3b/branches/upstream/current/src/konqi/Makefile.in
===================================================================
--- kde-extras/k3b/branches/upstream/current/src/konqi/Makefile.in 2008-06-03 01:21:42 UTC (rev 10848)
+++ kde-extras/k3b/branches/upstream/current/src/konqi/Makefile.in 2008-06-03 01:26:01 UTC (rev 10849)
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
# KDE tags expanded automatically by am_edit - $Revision: 483858 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
Modified: kde-extras/k3b/branches/upstream/current/src/konqi/k3b_audiocd_rip.desktop
===================================================================
--- kde-extras/k3b/branches/upstream/current/src/konqi/k3b_audiocd_rip.desktop 2008-06-03 01:21:42 UTC (rev 10848)
+++ kde-extras/k3b/branches/upstream/current/src/konqi/k3b_audiocd_rip.desktop 2008-06-03 01:26:01 UTC (rev 10849)
@@ -35,13 +35,14 @@
Name[pl]=Zgraj utwory za pomocą K3b
Name[pt]=Extrair o Áudio Digital com o K3b
Name[pt_BR]=Extrair Áudio Digital com o K3b
-Name[sk]=Vytiahnuť digitálny zvuk pomocou K3b
+Name[sk]=Extrahovať digitálne audio pomocou K3b
Name[sr]=Издвој дигитални звук помоћу K3b-а
Name[sr at Latn]=Izdvoj digitalni zvuk pomoću K3b-a
Name[sv]=Lagra digitalljud med K3b
Name[tr]=K3b ile Sayısal Ses Aktar
Name[uk]=Витягування цифрового аудіо за допомогою K3b
-Name[uz]=K3b ёрдамида қўшиқларни аудио-файлга айлантириш
+Name[uz]=K3b yordamida qoʻshiqlarni audio-faylga aylantirish
+Name[uz at cyrillic]=K3b ёрдамида қўшиқларни аудио-файлга айлантириш
Name[zh_CN]=用 K3b 提取数字音频
Name[zh_TW]=使用 K3b 以數位方式提取音樂
Exec=k3b --cddarip %u
Modified: kde-extras/k3b/branches/upstream/current/src/konqi/k3b_cd_copy.desktop
===================================================================
--- kde-extras/k3b/branches/upstream/current/src/konqi/k3b_cd_copy.desktop 2008-06-03 01:21:42 UTC (rev 10848)
+++ kde-extras/k3b/branches/upstream/current/src/konqi/k3b_cd_copy.desktop 2008-06-03 01:26:01 UTC (rev 10849)
@@ -25,6 +25,7 @@
Name[is]=Afrita geisladisk með K3b
Name[it]=Copia CD con K3b
Name[ja]=K3b で CD をコピー
+Name[ka]=CD-ს ასლი K3b-ით
Name[km]=ចម្លងស៊ីឌីដោយប្រើ K3b
Name[lt]=Kopijuoti CD su K3b
Name[mk]=Копирајте CD со K3b
@@ -43,7 +44,8 @@
Name[sv]=Kopiera cd med K3b
Name[tr]=K3b ile CD Kopyala
Name[uk]=Копіювати КД за допомогою K3b
-Name[uz]=K3b ёрдамида CD'дан нусха олиш
+Name[uz]=K3b yordamida CD'dan nusxa olish
+Name[uz at cyrillic]=K3b ёрдамида CD'дан нусха олиш
Name[zh_CN]=用 K3b 复制 CD
Name[zh_TW]=使用 K3b 複製 CD
Exec=k3b --copycd %u
Modified: kde-extras/k3b/branches/upstream/current/src/konqi/k3b_create_audio_cd.desktop
===================================================================
--- kde-extras/k3b/branches/upstream/current/src/konqi/k3b_create_audio_cd.desktop 2008-06-03 01:21:42 UTC (rev 10848)
+++ kde-extras/k3b/branches/upstream/current/src/konqi/k3b_create_audio_cd.desktop 2008-06-03 01:26:01 UTC (rev 10849)
@@ -30,6 +30,7 @@
Name[is]=Búa til hljóðdisk með K3b...
Name[it]=Crea CD audio con K3b...
Name[ja]=K3b でオーディオ CD を作成...
+Name[ka]=K3b-ით Audio CD-ის ჩაწერა...
Name[km]=បង្កើតស៊ីឌីអូឌីយ៉ូជាមួយនឹង K3b...
Name[lt]=Kurti audio CD su K3b...
Name[mk]=Креирајте аудио-CD со K3b...
@@ -44,7 +45,7 @@
Name[pt]=Criar um CD de Áudio com o K3b...
Name[pt_BR]=Criar CD de Áudio com o K3b...
Name[ru]=Записать аудио компакт-диск, используя K3b...
-Name[sk]=Vytvoriť zvukové CD pomocou K3b...
+Name[sk]=Vytvoriť audio CD pomocou K3b...
Name[sl]=Ustvari avdio CD s K3b ...
Name[sr]=Направи аудио CD помоћу K3b-а...
Name[sr at Latn]=Napravi audio CD pomoću K3b-a...
@@ -53,7 +54,8 @@
Name[tg]=Сабт кардани аудио компакт-диск бо истифодаи K3b...
Name[tr]=K3b ile Ses CD'si oluştur...
Name[uk]=Створити аудіо-КД за допомогою K3b...
-Name[uz]=K3b ёрдамида аудио CD яратиш
+Name[uz]=K3b yordamida audio CD yaratish
+Name[uz at cyrillic]=K3b ёрдамида аудио CD яратиш
Name[xh]=Yenza i CD Yokuvakalayo nge K3b...
Name[zh_CN]=用 K3b 创建音频 CD...
Name[zh_TW]=使用 K3b 建立音樂 CD...
Modified: kde-extras/k3b/branches/upstream/current/src/konqi/k3b_create_data_cd.desktop
===================================================================
--- kde-extras/k3b/branches/upstream/current/src/konqi/k3b_create_data_cd.desktop 2008-06-03 01:21:42 UTC (rev 10848)
+++ kde-extras/k3b/branches/upstream/current/src/konqi/k3b_create_data_cd.desktop 2008-06-03 01:26:01 UTC (rev 10849)
@@ -31,6 +31,7 @@
Name[is]=Búa til gagnadisk með K3b...
Name[it]=Crea CD dati con K3b...
Name[ja]=K3b でデータ CD を作成...
+Name[ka]=K3b-ით მონაცემთა CD-ის ჩაწერა...
Name[km]=បង្កើតស៊ីឌីទិន្ន័យជាមួយនឹង K3b...
Name[lt]=Kurti duomenų CD su K3b...
Name[mk]=Креирајте податочно CD со K3b...
@@ -54,7 +55,8 @@
Name[tg]=Сабт кардани CD бо маълумотҳо,бо истифодабарии K3b...
Name[tr]=K3b ile Veri CD'si oluştur...
Name[uk]=Створити КД з даними за допомогою K3b...
-Name[uz]=K3b ёрдамида маълумот CD яратиш
+Name[uz]=K3b yordamida maʼlumot CD yaratish
+Name[uz at cyrillic]=K3b ёрдамида маълумот CD яратиш
Name[xh]=Yenza i CD yolwazi nge K3b...
Name[zh_CN]=用 K3b 创建数据 CD...
Name[zh_TW]=使用 K3b 建立資料 CD...
Modified: kde-extras/k3b/branches/upstream/current/src/konqi/k3b_create_data_dvd.desktop
===================================================================
--- kde-extras/k3b/branches/upstream/current/src/konqi/k3b_create_data_dvd.desktop 2008-06-03 01:21:42 UTC (rev 10848)
+++ kde-extras/k3b/branches/upstream/current/src/konqi/k3b_create_data_dvd.desktop 2008-06-03 01:26:01 UTC (rev 10849)
@@ -29,6 +29,7 @@
Name[is]=Búa til DVD gagnadisk með K3b...
Name[it]=Crea DVD dati con K3b...
Name[ja]=K3b でデータ DVD を作成...
+Name[ka]=K3b-ით მონაცემთა DVD-ის ჩაწერა...
Name[km]=បង្កើតឌីវីឌីទិន្នន័យដោយប្រើ K3b...
Name[lt]=Kurti duomenų DVD su K3b...
Name[mk]=Креирајте податочно DVD со K3b...
@@ -49,7 +50,8 @@
Name[tg]=Сабт кардани Маълумотҳои CD бо истифодабарии K3b...
Name[tr]=K3b ile Veri DVD'si oluştur...
Name[uk]=Створити DVD з даними у K3b...
-Name[uz]=K3b ёрдамида маълумот DVD яратиш
+Name[uz]=K3b yordamida maʼlumot DVD yaratish
+Name[uz at cyrillic]=K3b ёрдамида маълумот DVD яратиш
Name[zh_CN]=用 K3b 创建数据 DVD...
Name[zh_TW]=使用 K3b 建立資料 DVD...
Icon=k3b
Modified: kde-extras/k3b/branches/upstream/current/src/konqi/k3b_create_video_cd.desktop
===================================================================
--- kde-extras/k3b/branches/upstream/current/src/konqi/k3b_create_video_cd.desktop 2008-06-03 01:21:42 UTC (rev 10848)
+++ kde-extras/k3b/branches/upstream/current/src/konqi/k3b_create_video_cd.desktop 2008-06-03 01:26:01 UTC (rev 10849)
@@ -30,6 +30,7 @@
Name[is]=Búa til vídeódisk með K3b...
Name[it]=Crea Video CD con K3b...
Name[ja]=K3b でビデオ CD を作成...
+Name[ka]=K3b-ით Video CD-ის ჩაწერა...
Name[km]=បង្កើតស៊ីឌីវីដេអូជាមួយនឹង K3b...
Name[lt]=Kurti video CD su K3b...
Name[mk]=Креирајте видео-CD со K3b...
@@ -53,7 +54,8 @@
Name[tg]=Сабт кардани видео компакт-диск бо истифодаи K3b...
Name[tr]=K3b ile Görüntü CD'si oluştur...
Name[uk]=Створити відео-КД за допомогою K3b...
-Name[uz]=K3b ёрдамида видео CD яратиш
+Name[uz]=K3b yordamida video CD yaratish
+Name[uz at cyrillic]=K3b ёрдамида видео CD яратиш
Name[zh_CN]=用 K3b 创建视频 CD...
Name[zh_TW]=使用 K3b 建立 VCD...
Icon=k3b
Modified: kde-extras/k3b/branches/upstream/current/src/konqi/k3b_dvd_copy.desktop
===================================================================
--- kde-extras/k3b/branches/upstream/current/src/konqi/k3b_dvd_copy.desktop 2008-06-03 01:21:42 UTC (rev 10848)
+++ kde-extras/k3b/branches/upstream/current/src/konqi/k3b_dvd_copy.desktop 2008-06-03 01:26:01 UTC (rev 10849)
@@ -25,6 +25,7 @@
Name[is]=Afrita DVD með K3b
Name[it]=Copia DVD con K3b
Name[ja]=K3b で DVD をコピー...
+Name[ka]=DVD-ს ასლი K3b-ით
Name[km]=ចម្លងឌីវីឌីដោយប្រើ K3b
Name[lt]=Kopijuoti DVD su K3b
Name[mk]=Копирајте DVD со K3b...
@@ -43,7 +44,8 @@
Name[sv]=Kopiera dvd med K3b
Name[tr]=K3b ile Veri DVD'si Kopyala
Name[uk]=Копіювати DVD за допомогою K3b
-Name[uz]=K3b ёрдамида DVD'дан нусха олиш
+Name[uz]=K3b yordamida DVD'dan nusxa olish
+Name[uz at cyrillic]=K3b ёрдамида DVD'дан нусха олиш
Name[zh_CN]=用 K3b 复制 DVD
Name[zh_TW]=使用 K3b 複製 DVD
Exec=k3b --copydvd %u
Modified: kde-extras/k3b/branches/upstream/current/src/konqi/k3b_handle_empty_cd.desktop
===================================================================
--- kde-extras/k3b/branches/upstream/current/src/konqi/k3b_handle_empty_cd.desktop 2008-06-03 01:21:42 UTC (rev 10848)
+++ kde-extras/k3b/branches/upstream/current/src/konqi/k3b_handle_empty_cd.desktop 2008-06-03 01:26:01 UTC (rev 10849)
@@ -30,6 +30,7 @@
Name[is]=Búa til gagnadisk með K3b...
Name[it]=Crea CD dati con K3b...
Name[ja]=K3b でデータ CD を作成...
+Name[ka]=K3b-ით მონაცემთა CD-ის ჩაწერა...
Name[km]=បង្កើតស៊ីឌីទិន្ន័យជាមួយនឹង K3b...
Name[lt]=Kurti duomenų CD su K3b...
Name[mk]=Креирајте податочно CD со K3b...
@@ -53,7 +54,8 @@
Name[tg]=Сабт кардани CD бо маълумотҳо,бо истифодабарии K3b...
Name[tr]=K3b ile Veri CD'si oluştur...
Name[uk]=Створити КД з даними за допомогою K3b...
-Name[uz]=K3b ёрдамида маълумот CD яратиш
+Name[uz]=K3b yordamida maʼlumot CD yaratish
+Name[uz at cyrillic]=K3b ёрдамида маълумот CD яратиш
Name[xh]=Yenza i CD yolwazi nge K3b...
Name[zh_CN]=用 K3b 创建数据 CD...
Name[zh_TW]=使用 K3b 建立資料 CD...
@@ -86,6 +88,7 @@
Name[is]=Búa til hljóðdisk með K3b...
Name[it]=Crea CD audio con K3b...
Name[ja]=K3b でオーディオ CD を作成...
+Name[ka]=K3b-ით Audio CD-ის ჩაწერა...
Name[km]=បង្កើតស៊ីឌីអូឌីយ៉ូជាមួយនឹង K3b...
Name[lt]=Kurti audio CD su K3b...
Name[mk]=Креирајте аудио-CD со K3b...
@@ -100,7 +103,7 @@
Name[pt]=Criar um CD de Áudio com o K3b...
Name[pt_BR]=Criar CD de Áudio com o K3b...
Name[ru]=Записать аудио компакт-диск, используя K3b...
-Name[sk]=Vytvoriť zvukové CD pomocou K3b...
+Name[sk]=Vytvoriť audio CD pomocou K3b...
Name[sl]=Ustvari avdio CD s K3b ...
Name[sr]=Направи аудио CD помоћу K3b-а...
Name[sr at Latn]=Napravi audio CD pomoću K3b-a...
@@ -109,7 +112,8 @@
Name[tg]=Сабт кардани аудио компакт-диск бо истифодаи K3b...
Name[tr]=K3b ile Ses CD'si oluştur...
Name[uk]=Створити аудіо-КД за допомогою K3b...
-Name[uz]=K3b ёрдамида аудио CD яратиш
+Name[uz]=K3b yordamida audio CD yaratish
+Name[uz at cyrillic]=K3b ёрдамида аудио CD яратиш
Name[xh]=Yenza i CD Yokuvakalayo nge K3b...
Name[zh_CN]=用 K3b 创建音频 CD...
Name[zh_TW]=使用 K3b 建立音樂 CD...
Modified: kde-extras/k3b/branches/upstream/current/src/konqi/k3b_handle_empty_dvd.desktop
===================================================================
--- kde-extras/k3b/branches/upstream/current/src/konqi/k3b_handle_empty_dvd.desktop 2008-06-03 01:21:42 UTC (rev 10848)
+++ kde-extras/k3b/branches/upstream/current/src/konqi/k3b_handle_empty_dvd.desktop 2008-06-03 01:26:01 UTC (rev 10849)
@@ -30,6 +30,7 @@
Name[is]=Búa til gagnadisk með K3b...
Name[it]=Crea CD dati con K3b...
Name[ja]=K3b でデータ CD を作成...
+Name[ka]=K3b-ით მონაცემთა CD-ის ჩაწერა...
Name[km]=បង្កើតស៊ីឌីទិន្ន័យជាមួយនឹង K3b...
Name[lt]=Kurti duomenų CD su K3b...
Name[mk]=Креирајте податочно CD со K3b...
@@ -53,7 +54,8 @@
Name[tg]=Сабт кардани CD бо маълумотҳо,бо истифодабарии K3b...
Name[tr]=K3b ile Veri CD'si oluştur...
Name[uk]=Створити КД з даними за допомогою K3b...
-Name[uz]=K3b ёрдамида маълумот CD яратиш
+Name[uz]=K3b yordamida maʼlumot CD yaratish
+Name[uz at cyrillic]=K3b ёрдамида маълумот CD яратиш
Name[xh]=Yenza i CD yolwazi nge K3b...
Name[zh_CN]=用 K3b 创建数据 CD...
Name[zh_TW]=使用 K3b 建立資料 CD...
@@ -80,6 +82,7 @@
Name[is]=Búa til DVD gagnadisk með K3b...
Name[it]=Crea DVD dati con K3b...
Name[ja]=K3b でデータ DVD を作成...
+Name[ka]=K3b-ით მონაცემთა DVD-ის ჩაწერა...
Name[km]=បង្កើតឌីវីឌីទិន្នន័យដោយប្រើ K3b...
Name[lt]=Kurti duomenų DVD su K3b...
Name[mk]=Креирајте податочно DVD со K3b...
@@ -100,7 +103,8 @@
Name[tg]=Сабт кардани Маълумотҳои CD бо истифодабарии K3b...
Name[tr]=K3b ile Veri DVD'si oluştur...
Name[uk]=Створити DVD з даними у K3b...
-Name[uz]=K3b ёрдамида маълумот DVD яратиш
+Name[uz]=K3b yordamida maʼlumot DVD yaratish
+Name[uz at cyrillic]=K3b ёрдамида маълумот DVD яратиш
Name[zh_CN]=用 K3b 创建数据 DVD...
Name[zh_TW]=使用 K3b 建立資料 DVD...
Icon=k3b
Modified: kde-extras/k3b/branches/upstream/current/src/konqi/k3b_videodvd_rip.desktop
===================================================================
--- kde-extras/k3b/branches/upstream/current/src/konqi/k3b_videodvd_rip.desktop 2008-06-03 01:21:42 UTC (rev 10848)
+++ kde-extras/k3b/branches/upstream/current/src/konqi/k3b_videodvd_rip.desktop 2008-06-03 01:26:01 UTC (rev 10849)
@@ -34,13 +34,14 @@
Name[pl]=Zgraj filmy z płyty DVD Video za pomocą K3b
Name[pt]=Extrair os Títulos do DVD de Vídeo com o K3b
Name[pt_BR]=Ripar DVD de Vídeo com o K3b
-Name[sk]=Ripovať titulky video DVD pomocou K3b
+Name[sk]=Ripovať video DVD titulky pomocou K3b
Name[sr]=Исчупај титлове са видео DVD-а помоћу K3b-а
Name[sr at Latn]=Isčupaj titlove sa video DVD-a pomoću K3b-a
Name[sv]=Lagra dvd-titlar med K3b
Name[tr]=K3b ile Görüntü DVD'si Başlıklarını Aktar
Name[uk]=Видерти заголовки з відео-DVD за допомогою K3b
-Name[uz]=K3b ёрдамида филмларни видео-файлга айлантириш
+Name[uz]=K3b yordamida filmlarni video-faylga aylantirish
+Name[uz at cyrillic]=K3b ёрдамида филмларни видео-файлга айлантириш
Name[zh_CN]=用 K3b 提取视频 DVD
Name[zh_TW]=使用 K3b 提取視像 DVD Titles
Exec=k3b --videodvdrip %u
Modified: kde-extras/k3b/branches/upstream/current/src/konqi/k3b_write_bin_image.desktop
===================================================================
--- kde-extras/k3b/branches/upstream/current/src/konqi/k3b_write_bin_image.desktop 2008-06-03 01:21:42 UTC (rev 10848)
+++ kde-extras/k3b/branches/upstream/current/src/konqi/k3b_write_bin_image.desktop 2008-06-03 01:26:01 UTC (rev 10849)
@@ -30,6 +30,7 @@
Name[is]=Skrifa diskmynd með K3b...
Name[it]=Scrivi immagine CD con K3b...
Name[ja]=K3b で CD イメージを書き込み...
+Name[ka]=K3b-ით CD-ის გამოსახულების ჩაწერა...
Name[km]=សរសេររូបភាពស៊ីឌីជាមួយនឹង K3b...
Name[lt]=Įrašyti CD atvaizdą su K3b...
Name[mk]=Запишете CD-слика со K3b...
@@ -53,7 +54,8 @@
Name[tg]=Сабт кардани намуди CD бо истифодабарии K3b...
Name[tr]=K3b ile CD Kalıbı Yazdır...
Name[uk]=Записати штамп КД за допомогою K3b...
-Name[uz]=K3b ёрдамида CD тасвирини ёзиш
+Name[uz]=K3b yordamida CD tasvirini yozish
+Name[uz at cyrillic]=K3b ёрдамида CD тасвирини ёзиш
Name[xh]=Bhala Umfanekiso we CD nge K3b...
Name[zh_CN]=用 K3b 刻录 CD 映像...
Name[zh_TW]=使用 K3b 燒錄 CD 影像...
Modified: kde-extras/k3b/branches/upstream/current/src/konqi/k3b_write_iso_image.desktop
===================================================================
--- kde-extras/k3b/branches/upstream/current/src/konqi/k3b_write_iso_image.desktop 2008-06-03 01:21:42 UTC (rev 10848)
+++ kde-extras/k3b/branches/upstream/current/src/konqi/k3b_write_iso_image.desktop 2008-06-03 01:26:01 UTC (rev 10849)
@@ -27,6 +27,7 @@
Name[is]=Skrifa CD eða DVD mynd með K3b...
Name[it]=Scrivi immagine CD o DVD con K3b...
Name[ja]=K3b で CD/DVD イメージを書き込み...
+Name[ka]=K3b-ით CD ან DVD გამოსახულების ჩაწერა...
Name[km]=សរសេររូបភាពស៊ីឌី ឬឌីវីឌីដោយប្រើ K3b...
Name[lt]=Įrašyti CD ar DVD atvaizdą su K3b...
Name[mk]=Запишете CD или DVD-слика со K3b...
@@ -47,7 +48,8 @@
Name[tg]=Сабт кардани тасвири CD ё DVD бо истифодабарии K3b...
Name[tr]=K3b ile CD ya da DVD görüntüsü Yazdır...
Name[uk]=Записати штамп КД або DVD у K3b...
-Name[uz]=K3b ёрдамида CD ёки DVD тасвирини ёзиш
+Name[uz]=K3b yordamida CD yoki DVD tasvirini yozish
+Name[uz at cyrillic]=K3b ёрдамида CD ёки DVD тасвирини ёзиш
Name[zh_CN]=用 K3b 刻录 CD 或 DVD 映像...
Name[zh_TW]=使用 K3b 燒錄 CD 或 DVD 影像...
Icon=k3b
Modified: kde-extras/k3b/branches/upstream/current/src/mimetypes/Makefile.in
===================================================================
--- kde-extras/k3b/branches/upstream/current/src/mimetypes/Makefile.in 2008-06-03 01:21:42 UTC (rev 10848)
+++ kde-extras/k3b/branches/upstream/current/src/mimetypes/Makefile.in 2008-06-03 01:26:01 UTC (rev 10849)
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
# KDE tags expanded automatically by am_edit - $Revision: 483858 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
Modified: kde-extras/k3b/branches/upstream/current/src/mimetypes/x-k3b.desktop
===================================================================
--- kde-extras/k3b/branches/upstream/current/src/mimetypes/x-k3b.desktop 2008-06-03 01:21:42 UTC (rev 10848)
+++ kde-extras/k3b/branches/upstream/current/src/mimetypes/x-k3b.desktop 2008-06-03 01:26:01 UTC (rev 10849)
@@ -27,6 +27,7 @@
Comment[is]=K3b verkefni
Comment[it]=Progetto K3b
Comment[ja]=K3b プロジェクト
+Comment[ka]=K3b-ის პროექტი
Comment[km]=គម្រោង K3b
Comment[lt]=K3b projektas
Comment[mk]=Проект за K3b
@@ -50,7 +51,8 @@
Comment[tg]=Лоиҳаи K3b
Comment[tr]=K3b Projesi
Comment[uk]=Проект K3b
-Comment[uz]=K3b лойиҳаси
+Comment[uz]=K3b loyihasi
+Comment[uz at cyrillic]=K3b лойиҳаси
Comment[xh]=Iprojekti ye K3b
Comment[zh_CN]=K3b 方案
Comment[zh_TW]=K3b 專案
Modified: kde-extras/k3b/branches/upstream/current/src/misc/Makefile.in
===================================================================
--- kde-extras/k3b/branches/upstream/current/src/misc/Makefile.in 2008-06-03 01:21:42 UTC (rev 10848)
+++ kde-extras/k3b/branches/upstream/current/src/misc/Makefile.in 2008-06-03 01:26:01 UTC (rev 10849)
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
# KDE tags expanded automatically by am_edit - $Revision: 483858 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -57,7 +57,7 @@
k3bisoimagewritingdialog.lo k3bblankingdialog.lo
@KDE_USE_FINAL_FALSE at libmisc_la_OBJECTS = $(libmisc_la_nofinal_OBJECTS)
@KDE_USE_FINAL_TRUE at libmisc_la_OBJECTS = $(libmisc_la_final_OBJECTS)
-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
+DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
am__depfiles_maybe = depfiles
#>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -473,8 +473,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
tags: TAGS
@@ -486,8 +486,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -497,13 +497,12 @@
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
- here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
Modified: kde-extras/k3b/branches/upstream/current/src/misc/k3bcdcopydialog.cpp
===================================================================
--- kde-extras/k3b/branches/upstream/current/src/misc/k3bcdcopydialog.cpp 2008-06-03 01:21:42 UTC (rev 10848)
+++ kde-extras/k3b/branches/upstream/current/src/misc/k3bcdcopydialog.cpp 2008-06-03 01:26:01 UTC (rev 10849)
@@ -1,6 +1,6 @@
/*
*
- * $Id: k3bcdcopydialog.cpp 690635 2007-07-21 16:47:29Z trueg $
+ * $Id: k3bcdcopydialog.cpp 733470 2007-11-06 12:10:29Z trueg $
* Copyright (C) 2003 Sebastian Trueg <trueg at k3b.org>
* Klaus-Dieter Krannich <kd at k3b.org>
*
@@ -365,7 +365,7 @@
}
-void K3bCdCopyDialog::slotToggleAll()
+void K3bCdCopyDialog::toggleAll()
{
updateOverrideDevice();
@@ -447,10 +447,12 @@
m_writerSelectionWidget->setOverrideDevice( 0 );
m_writerSelectionWidget->setIgnoreDevice( m_comboSourceDevice->selectedDevice() );
}
- else
+ else {
+ m_writerSelectionWidget->setIgnoreDevice( 0 );
m_writerSelectionWidget->setOverrideDevice( m_comboSourceDevice->selectedDevice(),
i18n("Use the same device for burning"),
i18n("<qt>Use the same device for burning <i>(Or insert another medium)</i>") );
+ }
}
Modified: kde-extras/k3b/branches/upstream/current/src/misc/k3bcdcopydialog.h
===================================================================
--- kde-extras/k3b/branches/upstream/current/src/misc/k3bcdcopydialog.h 2008-06-03 01:21:42 UTC (rev 10848)
+++ kde-extras/k3b/branches/upstream/current/src/misc/k3bcdcopydialog.h 2008-06-03 01:26:01 UTC (rev 10849)
@@ -1,6 +1,6 @@
/*
*
- * $Id: k3bcdcopydialog.h 619556 2007-01-03 17:38:12Z trueg $
+ * $Id: k3bcdcopydialog.h 733470 2007-11-06 12:10:29Z trueg $
* Copyright (C) 2003 Sebastian Trueg <trueg at k3b.org>
* Klaus-Dieter Krannich <kd at k3b.org>
*
@@ -56,12 +56,12 @@
private slots:
void slotStartClicked();
- void slotToggleAll();
void slotSourceMediumChanged( K3bDevice::Device* );
void updateOverrideDevice();
protected:
void init();
+ void toggleAll();
private:
void loadUserDefaults( KConfigBase* );
Modified: kde-extras/k3b/branches/upstream/current/src/misc/k3bdvdcopydialog.cpp
===================================================================
--- kde-extras/k3b/branches/upstream/current/src/misc/k3bdvdcopydialog.cpp 2008-06-03 01:21:42 UTC (rev 10848)
+++ kde-extras/k3b/branches/upstream/current/src/misc/k3bdvdcopydialog.cpp 2008-06-03 01:26:01 UTC (rev 10849)
@@ -1,6 +1,6 @@
/*
*
- * $Id: k3bdvdcopydialog.cpp 690635 2007-07-21 16:47:29Z trueg $
+ * $Id: k3bdvdcopydialog.cpp 733470 2007-11-06 12:10:29Z trueg $
* Copyright (C) 2003 Sebastian Trueg <trueg at k3b.org>
*
* This file is part of the K3b project.
@@ -432,10 +432,10 @@
m_writerSelectionWidget->setIgnoreDevice( m_comboSourceDevice->selectedDevice() );
}
else {
+ m_writerSelectionWidget->setIgnoreDevice( 0 );
m_writerSelectionWidget->setOverrideDevice( m_comboSourceDevice->selectedDevice(),
i18n("Use the same device for burning"),
i18n("<qt>Use the same device for burning <i>(Or insert another medium)</i>") );
- m_writerSelectionWidget->setIgnoreDevice( 0 );
}
}
Modified: kde-extras/k3b/branches/upstream/current/src/option/Makefile.in
===================================================================
--- kde-extras/k3b/branches/upstream/current/src/option/Makefile.in 2008-06-03 01:21:42 UTC (rev 10848)
+++ kde-extras/k3b/branches/upstream/current/src/option/Makefile.in 2008-06-03 01:26:01 UTC (rev 10849)
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
# KDE tags expanded automatically by am_edit - $Revision: 483858 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -63,7 +63,7 @@
k3bexternalbinwidget.lo base_k3bcddboptiontab.lo base_k3bmiscoptiontab.lo base_k3bpluginoptiontab.lo base_k3bthemeoptiontab.lo
@KDE_USE_FINAL_FALSE at liboption_la_OBJECTS = $(liboption_la_nofinal_OBJECTS)
@KDE_USE_FINAL_TRUE at liboption_la_OBJECTS = $(liboption_la_final_OBJECTS)
-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
+DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
am__depfiles_maybe = depfiles
#>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -500,8 +500,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
tags: TAGS
@@ -513,8 +513,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -524,13 +524,12 @@
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
- here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
Modified: kde-extras/k3b/branches/upstream/current/src/pics/73lab/Makefile.in
===================================================================
--- kde-extras/k3b/branches/upstream/current/src/pics/73lab/Makefile.in 2008-06-03 01:21:42 UTC (rev 10848)
+++ kde-extras/k3b/branches/upstream/current/src/pics/73lab/Makefile.in 2008-06-03 01:26:01 UTC (rev 10849)
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
# KDE tags expanded automatically by am_edit - $Revision: 483858 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
Modified: kde-extras/k3b/branches/upstream/current/src/pics/Makefile.in
===================================================================
--- kde-extras/k3b/branches/upstream/current/src/pics/Makefile.in 2008-06-03 01:21:42 UTC (rev 10848)
+++ kde-extras/k3b/branches/upstream/current/src/pics/Makefile.in 2008-06-03 01:26:01 UTC (rev 10849)
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
# KDE tags expanded automatically by am_edit - $Revision: 483858 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -466,8 +466,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
tags: TAGS
@@ -492,8 +492,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -503,13 +503,12 @@
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
- here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
Modified: kde-extras/k3b/branches/upstream/current/src/pics/RobsTheme/Makefile.in
===================================================================
--- kde-extras/k3b/branches/upstream/current/src/pics/RobsTheme/Makefile.in 2008-06-03 01:21:42 UTC (rev 10848)
+++ kde-extras/k3b/branches/upstream/current/src/pics/RobsTheme/Makefile.in 2008-06-03 01:26:01 UTC (rev 10849)
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
# KDE tags expanded automatically by am_edit - $Revision: 483858 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
Modified: kde-extras/k3b/branches/upstream/current/src/pics/crystal/Makefile.in
===================================================================
--- kde-extras/k3b/branches/upstream/current/src/pics/crystal/Makefile.in 2008-06-03 01:21:42 UTC (rev 10848)
+++ kde-extras/k3b/branches/upstream/current/src/pics/crystal/Makefile.in 2008-06-03 01:26:01 UTC (rev 10849)
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
# KDE tags expanded automatically by am_edit - $Revision: 483858 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
Modified: kde-extras/k3b/branches/upstream/current/src/pics/quant/Makefile.in
===================================================================
--- kde-extras/k3b/branches/upstream/current/src/pics/quant/Makefile.in 2008-06-03 01:21:42 UTC (rev 10848)
+++ kde-extras/k3b/branches/upstream/current/src/pics/quant/Makefile.in 2008-06-03 01:26:01 UTC (rev 10849)
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
# KDE tags expanded automatically by am_edit - $Revision: 483858 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
Modified: kde-extras/k3b/branches/upstream/current/src/projects/Makefile.in
===================================================================
--- kde-extras/k3b/branches/upstream/current/src/projects/Makefile.in 2008-06-03 01:21:42 UTC (rev 10848)
+++ kde-extras/k3b/branches/upstream/current/src/projects/Makefile.in 2008-06-03 01:26:01 UTC (rev 10849)
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
# KDE tags expanded automatically by am_edit - $Revision: 483858 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -97,7 +97,7 @@
k3baudiotrackaddingdialog.lo k3bencodingconverter.lo base_k3baudiocdtextwidget.lo base_k3baudiocdtextallfieldswidget.lo base_k3baudiotrackwidget.lo base_k3badvanceddataimagesettings.lo base_k3bbootimageview.lo base_k3bdataimagesettings.lo base_k3bdatavolumedescwidget.lo base_k3bmovixoptionswidget.lo
@KDE_USE_FINAL_FALSE at libprojects_la_OBJECTS = $(libprojects_la_nofinal_OBJECTS)
@KDE_USE_FINAL_TRUE at libprojects_la_OBJECTS = $(libprojects_la_final_OBJECTS)
-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
+DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
am__depfiles_maybe = depfiles
#>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -778,8 +778,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
tags: TAGS
@@ -804,8 +804,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -815,13 +815,12 @@
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
- here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
Modified: kde-extras/k3b/branches/upstream/current/src/projects/k3bfillstatusdisplay.cpp
===================================================================
--- kde-extras/k3b/branches/upstream/current/src/projects/k3bfillstatusdisplay.cpp 2008-06-03 01:21:42 UTC (rev 10848)
+++ kde-extras/k3b/branches/upstream/current/src/projects/k3bfillstatusdisplay.cpp 2008-06-03 01:26:01 UTC (rev 10849)
@@ -1,6 +1,6 @@
/*
*
- * $Id: k3bfillstatusdisplay.cpp 652596 2007-04-11 14:36:40Z trueg $
+ * $Id: k3bfillstatusdisplay.cpp 768504 2008-01-30 08:53:22Z trueg $
* Copyright (C) 2003 Sebastian Trueg <trueg at k3b.org>
*
* This file is part of the K3b project.
@@ -53,7 +53,7 @@
static const int DEFAULT_CD_SIZE_74 = 74*60*75;
-static const int DEFAULT_CD_SIZE_80 = 80*60*74;
+static const int DEFAULT_CD_SIZE_80 = 80*60*75;
static const int DEFAULT_CD_SIZE_100 = 100*60*75;
static const int DEFAULT_DVD_SIZE_4_4 = 2295104;
static const int DEFAULT_DVD_SIZE_8_0 = 4173824;
Modified: kde-extras/k3b/branches/upstream/current/src/projects/kostore/Makefile.in
===================================================================
--- kde-extras/k3b/branches/upstream/current/src/projects/kostore/Makefile.in 2008-06-03 01:21:42 UTC (rev 10848)
+++ kde-extras/k3b/branches/upstream/current/src/projects/kostore/Makefile.in 2008-06-03 01:26:01 UTC (rev 10849)
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
# KDE tags expanded automatically by am_edit - $Revision: 483858 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -54,7 +54,7 @@
libkostore_la_nofinal_OBJECTS = koStore.lo koZipStore.lo koStoreBase.lo
@KDE_USE_FINAL_FALSE at libkostore_la_OBJECTS = $(libkostore_la_nofinal_OBJECTS)
@KDE_USE_FINAL_TRUE at libkostore_la_OBJECTS = $(libkostore_la_final_OBJECTS)
-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
+DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
am__depfiles_maybe = depfiles
#>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -461,8 +461,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
tags: TAGS
@@ -474,8 +474,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -485,13 +485,12 @@
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
- here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
Modified: kde-extras/k3b/branches/upstream/current/src/rip/Makefile.in
===================================================================
--- kde-extras/k3b/branches/upstream/current/src/rip/Makefile.in 2008-06-03 01:21:42 UTC (rev 10848)
+++ kde-extras/k3b/branches/upstream/current/src/rip/Makefile.in 2008-06-03 01:26:01 UTC (rev 10849)
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
# KDE tags expanded automatically by am_edit - $Revision: 483858 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -65,7 +65,7 @@
k3baudioprojectconvertingthread.lo k3baudioripjob.lo base_k3baudiorippingoptionwidget.lo base_k3bcddbpatternwidget.lo
@KDE_USE_FINAL_FALSE at librip_la_OBJECTS = $(librip_la_nofinal_OBJECTS)
@KDE_USE_FINAL_TRUE at librip_la_OBJECTS = $(librip_la_final_OBJECTS)
-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
+DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
am__depfiles_maybe = depfiles
#>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -600,8 +600,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
tags: TAGS
@@ -626,8 +626,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -637,13 +637,12 @@
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
- here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
Modified: kde-extras/k3b/branches/upstream/current/src/rip/videodvd/Makefile.in
===================================================================
--- kde-extras/k3b/branches/upstream/current/src/rip/videodvd/Makefile.in 2008-06-03 01:21:42 UTC (rev 10848)
+++ kde-extras/k3b/branches/upstream/current/src/rip/videodvd/Makefile.in 2008-06-03 01:26:01 UTC (rev 10849)
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
# KDE tags expanded automatically by am_edit - $Revision: 483858 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -59,7 +59,7 @@
k3bvideodvdrippingpreview.lo base_k3bvideodvdrippingwidget.lo
@KDE_USE_FINAL_FALSE at libvideodvdrip_la_OBJECTS = $(libvideodvdrip_la_nofinal_OBJECTS)
@KDE_USE_FINAL_TRUE at libvideodvdrip_la_OBJECTS = $(libvideodvdrip_la_final_OBJECTS)
-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
+DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
am__depfiles_maybe = depfiles
#>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -482,8 +482,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
tags: TAGS
@@ -495,8 +495,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -506,13 +506,12 @@
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
- here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
Modified: kde-extras/k3b/branches/upstream/current/src/sounds/Makefile.in
===================================================================
--- kde-extras/k3b/branches/upstream/current/src/sounds/Makefile.in 2008-06-03 01:21:42 UTC (rev 10848)
+++ kde-extras/k3b/branches/upstream/current/src/sounds/Makefile.in 2008-06-03 01:26:01 UTC (rev 10849)
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
# KDE tags expanded automatically by am_edit - $Revision: 483858 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
More information about the pkg-kde-commits
mailing list