[Pkg-kde-commits] rev 1976 -
branches/kde-3.4.0/packages/kdemultimedia/debian/patches
Christopher Martin
chrsmrtn at costa.debian.org
Sun Oct 16 17:30:00 UTC 2005
Author: chrsmrtn
Date: 2005-10-16 17:29:58 +0000 (Sun, 16 Oct 2005)
New Revision: 1976
Modified:
branches/kde-3.4.0/packages/kdemultimedia/debian/patches/01_kdemultimedia_branch_r471133.diff
branches/kde-3.4.0/packages/kdemultimedia/debian/patches/98_buildprep.diff
Log:
Remove a 'fix' from the branch that breaks the build. Update the buildprep accordingly.
Modified: branches/kde-3.4.0/packages/kdemultimedia/debian/patches/01_kdemultimedia_branch_r471133.diff
===================================================================
--- branches/kde-3.4.0/packages/kdemultimedia/debian/patches/01_kdemultimedia_branch_r471133.diff 2005-10-16 16:29:28 UTC (rev 1975)
+++ branches/kde-3.4.0/packages/kdemultimedia/debian/patches/01_kdemultimedia_branch_r471133.diff 2005-10-16 17:29:58 UTC (rev 1976)
@@ -127,14 +127,3 @@
}
void PlaylistCollection::removeTrack(const QString &playlist, const QStringList &files)
---- Makefile.am.in (.../tags/KDE/3.4.3/kdemultimedia) (revision 471133)
-+++ Makefile.am.in (.../branches/KDE/3.4/kdemultimedia) (revision 471133)
-@@ -4,7 +4,7 @@
- AUTOMAKE_OPTIONS = foreign 1.5
- DISTCLEANFILES = inst-apps
-
--COMPILE_AFTER_arts = noatun krec akode
-+COMPILE_AFTER_arts = noatun krec
- COMPILE_AFTER_mpeglib = mpeglib_artsplug
- COMPILE_AFTER_libkcddb = kaudiocreator kioslave kscd
- COMPILE_AFTER_akode = juk
Modified: branches/kde-3.4.0/packages/kdemultimedia/debian/patches/98_buildprep.diff
===================================================================
--- branches/kde-3.4.0/packages/kdemultimedia/debian/patches/98_buildprep.diff 2005-10-16 16:29:28 UTC (rev 1975)
+++ branches/kde-3.4.0/packages/kdemultimedia/debian/patches/98_buildprep.diff 2005-10-16 17:29:58 UTC (rev 1976)
@@ -3114,7 +3114,7 @@
#endif"
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar KDECONFIG kde_libs_prefix kde_libs_htmldir CONF_FILES CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE WOVERLOADED_VIRTUAL HAVE_GCC_VISIBILITY unsermake_enable_pch_TRUE unsermake_enable_pch_FALSE USE_EXCEPTIONS USE_RTTI CXXCPP NOOPT_CXXFLAGS NOOPT_CFLAGS ENABLE_PERMISSIVE_FLAG LDFLAGS_AS_NEEDED LDFLAGS_NEW_DTAGS KDE_USE_FINAL_TRUE KDE_USE_FINAL_FALSE KDE_USE_CLOSURE_TRUE KDE_USE_CLOSURE_FALSE KDE_NO_UNDEFINED KDE_USE_NMCHECK_TRUE KDE_USE_NMCHECK_FALSE EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB F77 FFLAGS ac_ct_F77 LIBTOOL KDE_PLUGIN MSGFMT GMSGFMT XGETTEXT LIBUTIL LIBCOMPAT LIBCRYPT LIBRESOLV LIB_POLL FRAMEWORK_COREAUDIO LIBSOCKET X_EXTRA_LIBS LIBUCB LIBDL include_x11_TRUE include_x11_FALSE X_PRE_LIBS LIB_X11 LIB_XRENDER LIBSM X_INCLUDES X_LDFLAGS x_includes x_libraries QTE_NORTTI LIB_XEXT LIBPTHREAD USE_THREADS KDE_MT_LDFLAGS KDE_MT_LIBS USER_INCLUDES USER_LDFLAGS LIBZ LIBPNG LIBJPEG qt_libraries qt_includes QT_INCLUDES QT_LDFLAGS PERL MOC UIC UIC_TR LIB_QT LIB_QPE kde_qtver KDE_EXTRA_RPATH KDE_RPATH X_RPATH kde_libraries kde_includes KDE_LDFLAGS KDE_INCLUDES all_includes all_libraries AUTODIRS include_ARTS_TRUE include_ARTS_FALSE MAKEKDEWIDGETS KCONFIG_COMPILER KCFG_DEPENDENCIES DCOPIDLNG DCOPIDL DCOPIDL2CPP DCOP_DEPENDENCIES MCOPIDL ARTSCCONFIG MEINPROC KDE_XSL_STYLESHEET XMLLINT kde_htmldir kde_appsdir kde_icondir kde_sounddir kde_datadir kde_locale kde_confdir kde_kcfgdir kde_mimedir kde_wallpaperdir kde_bindir xdg_appsdir xdg_menudir xdg_directorydir kde_templatesdir kde_servicesdir kde_servicetypesdir kde_moduledir kdeinitdir kde_styledir kde_widgetdir LIB_KDECORE LIB_KDEUI LIB_KIO LIB_KJS LIB_SMB LIB_KAB LIB_KABC LIB_KHTML LIB_KSPELL LIB_KPARTS LIB_KDEPRINT LIB_KUTILS LIB_KDEPIM LIB_KIMPROXY LIB_KNEWSTUFF LIB_KDNSSD LIB_KUNITTEST LIB_KSYCOCA LIB_KFILE LIB_KFM ARCH_TYPE TAGLIB_CONFIG taglib_includes taglib_libs MPEGLIB_ARTS_MAJOR_VERSION MPEGLIB_ARTS_MINOR_VERSION MPEGLIB_ARTS_MICRO_VERSION MPEGLIB_ARTS_VERSION kde_artsplug_compiles ARTSC_INCLUDE ARTSC_LIBS VORBIS_INCS VORBIS_LIBS VORBIS_RPATH VORBISFILE_LIBS VORBISENC_LIBS CDPARANOIA PARANOIA_PRIV install_akode_artsplugin_TRUE install_akode_artsplugin_FALSE LIBFLAC LIBOGGFLAC SPEEXLIBS MADLIBS LIBSAMPLERATE LIBASOUND LIBOSSAUDIO PKG_CONFIG JACK_CFLAGS JACK_LIBADD JACK_LDFLAGS POLYP_CFLAGS POLYP_LIBADD POLYP_LDFLAGS LIBLTDL use_libltdl_TRUE use_libltdl_FALSE include_mpeg_decoder_TRUE include_mpeg_decoder_FALSE include_xiph_decoder_TRUE include_xiph_decoder_FALSE include_src_resampler_TRUE include_src_resampler_FALSE include_alsa_sink_TRUE include_alsa_sink_FALSE include_oss_sink_TRUE include_oss_sink_FALSE include_jack_sink_TRUE include_jack_sink_FALSE include_polyp_sink_TRUE include_polyp_sink_FALSE arts_datadir arts_includes arts_libraries arts_within_KDE_TRUE arts_within_KDE_FALSE ARTS_LIBASOUND LIBAUDIOFILE LIB_ARTS ARTS_CFLAGS link_lib_MB_TRUE link_lib_MB_FALSE GST_CFLAGS GST_LIBS LDADD_GST LDFLAGS_GST include_flac_SUBDIR_TRUE include_flac_SUBDIR_FALSE include_mp3_SUBDIR_TRUE include_mp3_SUBDIR_FALSE include_mpc_SUBDIR_TRUE include_mpc_SUBDIR_FALSE include_ogg_SUBDIR_TRUE include_ogg_SUBDIR_FALSE include_theora_SUBDIR_TRUE include_theora_SUBDIR_FALSE CDPARANOIA_INCS CDPARANOIA_LIBS CDPARANOIA_RPATH include_kioslave_audiocd_TRUE include_kioslave_audiocd_FALSE LAME_INCS LAME_LIBS LAME_RPATH KCM_AUDIOCD include_kcm_audiocd_TRUE include_kcm_audiocd_FALSE compile_ogg_export_TRUE compile_ogg_export_FALSE compile_mp3_export_TRUE compile_mp3_export_FALSE LIBCDAUDIO LIBFPE LIBCDROM LIBALIB LIBAUDIO LIBMME EXTRAINCS EXTRALIBS libwm_with_cdda_TRUE libwm_with_cdda_FALSE THIS_LIB_MAJOR_VERSION THIS_LIB_MINOR_VERSION THIS_LIB_MICRO_VERSION THIS_LIB_VERSION THIS_LIB_NAME OS_TYPE INTELCPPFLAG THIS_LIB_LIBS CCAS CCASFLAGS ARCH_CFLAGS MPG123_PLAT_LIB XINE_CONFIG XINE_CFLAGS XINE_LIBS TOPSUBDIRS arts_SUBDIR_included_TRUE arts_SUBDIR_included_FALSE audiofile_artsplugin_SUBDIR_included_TRUE audiofile_artsplugin_SUBDIR_included_FALSE doc_SUBDIR_included_TRUE doc_SUBDIR_included_FALSE kaboodle_SUBDIR_included_TRUE kaboodle_SUBDIR_included_FALSE kappfinder_data_SUBDIR_included_TRUE kappfinder_data_SUBDIR_included_FALSE kfile_plugins_SUBDIR_included_TRUE kfile_plugins_SUBDIR_included_FALSE kmid_SUBDIR_included_TRUE kmid_SUBDIR_included_FALSE kmix_SUBDIR_included_TRUE kmix_SUBDIR_included_FALSE libkcddb_SUBDIR_included_TRUE libkcddb_SUBDIR_included_FALSE mpeglib_SUBDIR_included_TRUE mpeglib_SUBDIR_included_FALSE mpg123_artsplugin_SUBDIR_included_TRUE mpg123_artsplugin_SUBDIR_included_FALSE oggvorbis_artsplugin_SUBDIR_included_TRUE oggvorbis_artsplugin_SUBDIR_included_FALSE xine_artsplugin_SUBDIR_included_TRUE xine_artsplugin_SUBDIR_included_FALSE akode_SUBDIR_included_TRUE akode_SUBDIR_included_FALSE krec_SUBDIR_included_TRUE krec_SUBDIR_included_FALSE noatun_SUBDIR_included_TRUE noatun_SUBDIR_included_FALSE kscd_SUBDIR_included_TRUE kscd_SUBDIR_included_FALSE kioslave_SUBDIR_included_TRUE kioslave_SUBDIR_included_FALSE kaudiocreator_SUBDIR_included_TRUE kaudiocreator_SUBDIR_included_FALSE mpeglib_artsplug_SUBDIR_included_TRUE mpeglib_artsplug_SUBDIR_included_FALSE juk_SUBDIR_included_TRUE juk_SUBDIR_included_FALSE LIBOBJS LTLIBOBJS'
-+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT KDECONFIG kde_libs_prefix kde_libs_htmldir CONF_FILES CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE WOVERLOADED_VIRTUAL HAVE_GCC_VISIBILITY unsermake_enable_pch_TRUE unsermake_enable_pch_FALSE USE_EXCEPTIONS USE_RTTI CXXCPP NOOPT_CXXFLAGS NOOPT_CFLAGS ENABLE_PERMISSIVE_FLAG LDFLAGS_AS_NEEDED LDFLAGS_NEW_DTAGS KDE_USE_FINAL_TRUE KDE_USE_FINAL_FALSE KDE_USE_CLOSURE_TRUE KDE_USE_CLOSURE_FALSE KDE_NO_UNDEFINED KDE_USE_NMCHECK_TRUE KDE_USE_NMCHECK_FALSE EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB F77 FFLAGS ac_ct_F77 LIBTOOL KDE_PLUGIN MSGFMT GMSGFMT XGETTEXT LIBUTIL LIBCOMPAT LIBCRYPT LIBRESOLV LIB_POLL FRAMEWORK_COREAUDIO LIBSOCKET X_EXTRA_LIBS LIBUCB LIBDL include_x11_TRUE include_x11_FALSE X_PRE_LIBS LIB_X11 LIB_XRENDER LIBSM X_INCLUDES X_LDFLAGS x_includes x_libraries QTE_NORTTI LIB_XEXT LIBPTHREAD USE_THREADS KDE_MT_LDFLAGS KDE_MT_LIBS USER_INCLUDES USER_LDFLAGS LIBZ LIBPNG LIBJPEG qt_libraries qt_includes QT_INCLUDES QT_LDFLAGS PERL MOC UIC UIC_TR LIB_QT LIB_QPE kde_qtver KDE_EXTRA_RPATH KDE_RPATH X_RPATH kde_libraries kde_includes KDE_LDFLAGS KDE_INCLUDES all_includes all_libraries AUTODIRS include_ARTS_TRUE include_ARTS_FALSE MAKEKDEWIDGETS KCONFIG_COMPILER KCFG_DEPENDENCIES DCOPIDLNG DCOPIDL DCOPIDL2CPP DCOP_DEPENDENCIES MCOPIDL ARTSCCONFIG MEINPROC KDE_XSL_STYLESHEET XMLLINT kde_htmldir kde_appsdir kde_icondir kde_sounddir kde_datadir kde_locale kde_confdir kde_kcfgdir kde_mimedir kde_wallpaperdir kde_bindir xdg_appsdir xdg_menudir xdg_directorydir kde_templatesdir kde_servicesdir kde_servicetypesdir kde_moduledir kdeinitdir kde_styledir kde_widgetdir LIB_KDECORE LIB_KDEUI LIB_KIO LIB_KJS LIB_SMB LIB_KAB LIB_KABC LIB_KHTML LIB_KSPELL LIB_KPARTS LIB_KDEPRINT LIB_KUTILS LIB_KDEPIM LIB_KIMPROXY LIB_KNEWSTUFF LIB_KDNSSD LIB_KUNITTEST LIB_KSYCOCA LIB_KFILE LIB_KFM ARCH_TYPE TAGLIB_CONFIG taglib_includes taglib_libs MPEGLIB_ARTS_MAJOR_VERSION MPEGLIB_ARTS_MINOR_VERSION MPEGLIB_ARTS_MICRO_VERSION MPEGLIB_ARTS_VERSION kde_artsplug_compiles ARTSC_INCLUDE ARTSC_LIBS VORBIS_INCS VORBIS_LIBS VORBIS_RPATH VORBISFILE_LIBS VORBISENC_LIBS CDPARANOIA PARANOIA_PRIV install_akode_artsplugin_TRUE install_akode_artsplugin_FALSE LIBFLAC LIBOGGFLAC SPEEXLIBS MADLIBS LIBSAMPLERATE LIBASOUND LIBOSSAUDIO PKG_CONFIG JACK_CFLAGS JACK_LIBADD JACK_LDFLAGS POLYP_CFLAGS POLYP_LIBADD POLYP_LDFLAGS LIBLTDL use_libltdl_TRUE use_libltdl_FALSE include_mpeg_decoder_TRUE include_mpeg_decoder_FALSE include_xiph_decoder_TRUE include_xiph_decoder_FALSE include_src_resampler_TRUE include_src_resampler_FALSE include_alsa_sink_TRUE include_alsa_sink_FALSE include_oss_sink_TRUE include_oss_sink_FALSE include_jack_sink_TRUE include_jack_sink_FALSE include_polyp_sink_TRUE include_polyp_sink_FALSE arts_datadir arts_includes arts_libraries arts_within_KDE_TRUE arts_within_KDE_FALSE ARTS_LIBASOUND LIBAUDIOFILE LIB_ARTS ARTS_CFLAGS link_lib_MB_TRUE link_lib_MB_FALSE GST_CFLAGS GST_LIBS LDADD_GST LDFLAGS_GST include_flac_SUBDIR_TRUE include_flac_SUBDIR_FALSE include_mp3_SUBDIR_TRUE include_mp3_SUBDIR_FALSE include_mpc_SUBDIR_TRUE include_mpc_SUBDIR_FALSE include_ogg_SUBDIR_TRUE include_ogg_SUBDIR_FALSE include_theora_SUBDIR_TRUE include_theora_SUBDIR_FALSE CDPARANOIA_INCS CDPARANOIA_LIBS CDPARANOIA_RPATH include_kioslave_audiocd_TRUE include_kioslave_audiocd_FALSE LAME_INCS LAME_LIBS LAME_RPATH KCM_AUDIOCD include_kcm_audiocd_TRUE include_kcm_audiocd_FALSE compile_ogg_export_TRUE compile_ogg_export_FALSE compile_mp3_export_TRUE compile_mp3_export_FALSE LIBCDAUDIO LIBFPE LIBCDROM LIBALIB LIBAUDIO LIBMME EXTRAINCS EXTRALIBS libwm_with_cdda_TRUE libwm_with_cdda_FALSE THIS_LIB_MAJOR_VERSION THIS_LIB_MINOR_VERSION THIS_LIB_MICRO_VERSION THIS_LIB_VERSION THIS_LIB_NAME OS_TYPE INTELCPPFLAG THIS_LIB_LIBS CCAS CCASFLAGS ARCH_CFLAGS MPG123_PLAT_LIB XINE_CONFIG XINE_CFLAGS XINE_LIBS TOPSUBDIRS akode_SUBDIR_included_TRUE akode_SUBDIR_included_FALSE arts_SUBDIR_included_TRUE arts_SUBDIR_included_FALSE audiofile_artsplugin_SUBDIR_included_TRUE audiofile_artsplugin_SUBDIR_included_FALSE doc_SUBDIR_included_TRUE doc_SUBDIR_included_FALSE kaboodle_SUBDIR_included_TRUE kaboodle_SUBDIR_included_FALSE kappfinder_data_SUBDIR_included_TRUE kappfinder_data_SUBDIR_included_FALSE kfile_plugins_SUBDIR_included_TRUE kfile_plugins_SUBDIR_included_FALSE kmid_SUBDIR_included_TRUE kmid_SUBDIR_included_FALSE kmix_SUBDIR_included_TRUE kmix_SUBDIR_included_FALSE libkcddb_SUBDIR_included_TRUE libkcddb_SUBDIR_included_FALSE mpeglib_SUBDIR_included_TRUE mpeglib_SUBDIR_included_FALSE mpg123_artsplugin_SUBDIR_included_TRUE mpg123_artsplugin_SUBDIR_included_FALSE oggvorbis_artsplugin_SUBDIR_included_TRUE oggvorbis_artsplugin_SUBDIR_included_FALSE xine_artsplugin_SUBDIR_included_TRUE xine_artsplugin_SUBDIR_included_FALSE juk_SUBDIR_included_TRUE juk_SUBDIR_included_FALSE krec_SUBDIR_included_TRUE krec_SUBDIR_included_FALSE noatun_SUBDIR_included_TRUE noatun_SUBDIR_included_FALSE kscd_SUBDIR_included_TRUE kscd_SUBDIR_included_FALSE kioslave_SUBDIR_included_TRUE kioslave_SUBDIR_included_FALSE kaudiocreator_SUBDIR_included_TRUE kaudiocreator_SUBDIR_included_FALSE mpeglib_artsplug_SUBDIR_included_TRUE mpeglib_artsplug_SUBDIR_included_FALSE LIBOBJS LTLIBOBJS'
++ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT KDECONFIG kde_libs_prefix kde_libs_htmldir CONF_FILES CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE WOVERLOADED_VIRTUAL HAVE_GCC_VISIBILITY unsermake_enable_pch_TRUE unsermake_enable_pch_FALSE USE_EXCEPTIONS USE_RTTI CXXCPP NOOPT_CXXFLAGS NOOPT_CFLAGS ENABLE_PERMISSIVE_FLAG LDFLAGS_AS_NEEDED LDFLAGS_NEW_DTAGS KDE_USE_FINAL_TRUE KDE_USE_FINAL_FALSE KDE_USE_CLOSURE_TRUE KDE_USE_CLOSURE_FALSE KDE_NO_UNDEFINED KDE_USE_NMCHECK_TRUE KDE_USE_NMCHECK_FALSE EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB F77 FFLAGS ac_ct_F77 LIBTOOL KDE_PLUGIN MSGFMT GMSGFMT XGETTEXT LIBUTIL LIBCOMPAT LIBCRYPT LIBRESOLV LIB_POLL FRAMEWORK_COREAUDIO LIBSOCKET X_EXTRA_LIBS LIBUCB LIBDL include_x11_TRUE include_x11_FALSE X_PRE_LIBS LIB_X11 LIB_XRENDER LIBSM X_INCLUDES X_LDFLAGS x_includes x_libraries QTE_NORTTI LIB_XEXT LIBPTHREAD USE_THREADS KDE_MT_LDFLAGS KDE_MT_LIBS USER_INCLUDES USER_LDFLAGS LIBZ LIBPNG LIBJPEG qt_libraries qt_includes QT_INCLUDES QT_LDFLAGS PERL MOC UIC UIC_TR LIB_QT LIB_QPE kde_qtver KDE_EXTRA_RPATH KDE_RPATH X_RPATH kde_libraries kde_includes KDE_LDFLAGS KDE_INCLUDES all_includes all_libraries AUTODIRS include_ARTS_TRUE include_ARTS_FALSE MAKEKDEWIDGETS KCONFIG_COMPILER KCFG_DEPENDENCIES DCOPIDLNG DCOPIDL DCOPIDL2CPP DCOP_DEPENDENCIES MCOPIDL ARTSCCONFIG MEINPROC KDE_XSL_STYLESHEET XMLLINT kde_htmldir kde_appsdir kde_icondir kde_sounddir kde_datadir kde_locale kde_confdir kde_kcfgdir kde_mimedir kde_wallpaperdir kde_bindir xdg_appsdir xdg_menudir xdg_directorydir kde_templatesdir kde_servicesdir kde_servicetypesdir kde_moduledir kdeinitdir kde_styledir kde_widgetdir LIB_KDECORE LIB_KDEUI LIB_KIO LIB_KJS LIB_SMB LIB_KAB LIB_KABC LIB_KHTML LIB_KSPELL LIB_KPARTS LIB_KDEPRINT LIB_KUTILS LIB_KDEPIM LIB_KIMPROXY LIB_KNEWSTUFF LIB_KDNSSD LIB_KUNITTEST LIB_KSYCOCA LIB_KFILE LIB_KFM ARCH_TYPE TAGLIB_CONFIG taglib_includes taglib_libs MPEGLIB_ARTS_MAJOR_VERSION MPEGLIB_ARTS_MINOR_VERSION MPEGLIB_ARTS_MICRO_VERSION MPEGLIB_ARTS_VERSION kde_artsplug_compiles ARTSC_INCLUDE ARTSC_LIBS VORBIS_INCS VORBIS_LIBS VORBIS_RPATH VORBISFILE_LIBS VORBISENC_LIBS CDPARANOIA PARANOIA_PRIV install_akode_artsplugin_TRUE install_akode_artsplugin_FALSE LIBFLAC LIBOGGFLAC SPEEXLIBS MADLIBS LIBSAMPLERATE LIBASOUND LIBOSSAUDIO PKG_CONFIG JACK_CFLAGS JACK_LIBADD JACK_LDFLAGS POLYP_CFLAGS POLYP_LIBADD POLYP_LDFLAGS LIBLTDL use_libltdl_TRUE use_libltdl_FALSE include_mpeg_decoder_TRUE include_mpeg_decoder_FALSE include_xiph_decoder_TRUE include_xiph_decoder_FALSE include_src_resampler_TRUE include_src_resampler_FALSE include_alsa_sink_TRUE include_alsa_sink_FALSE include_oss_sink_TRUE include_oss_sink_FALSE include_jack_sink_TRUE include_jack_sink_FALSE include_polyp_sink_TRUE include_polyp_sink_FALSE arts_datadir arts_includes arts_libraries arts_within_KDE_TRUE arts_within_KDE_FALSE ARTS_LIBASOUND LIBAUDIOFILE LIB_ARTS ARTS_CFLAGS link_lib_MB_TRUE link_lib_MB_FALSE GST_CFLAGS GST_LIBS LDADD_GST LDFLAGS_GST include_flac_SUBDIR_TRUE include_flac_SUBDIR_FALSE include_mp3_SUBDIR_TRUE include_mp3_SUBDIR_FALSE include_mpc_SUBDIR_TRUE include_mpc_SUBDIR_FALSE include_ogg_SUBDIR_TRUE include_ogg_SUBDIR_FALSE include_theora_SUBDIR_TRUE include_theora_SUBDIR_FALSE CDPARANOIA_INCS CDPARANOIA_LIBS CDPARANOIA_RPATH include_kioslave_audiocd_TRUE include_kioslave_audiocd_FALSE LAME_INCS LAME_LIBS LAME_RPATH KCM_AUDIOCD include_kcm_audiocd_TRUE include_kcm_audiocd_FALSE compile_ogg_export_TRUE compile_ogg_export_FALSE compile_mp3_export_TRUE compile_mp3_export_FALSE LIBCDAUDIO LIBFPE LIBCDROM LIBALIB LIBAUDIO LIBMME EXTRAINCS EXTRALIBS libwm_with_cdda_TRUE libwm_with_cdda_FALSE THIS_LIB_MAJOR_VERSION THIS_LIB_MINOR_VERSION THIS_LIB_MICRO_VERSION THIS_LIB_VERSION THIS_LIB_NAME OS_TYPE INTELCPPFLAG THIS_LIB_LIBS CCAS CCASFLAGS ARCH_CFLAGS MPG123_PLAT_LIB XINE_CONFIG XINE_CFLAGS XINE_LIBS TOPSUBDIRS arts_SUBDIR_included_TRUE arts_SUBDIR_included_FALSE audiofile_artsplugin_SUBDIR_included_TRUE audiofile_artsplugin_SUBDIR_included_FALSE doc_SUBDIR_included_TRUE doc_SUBDIR_included_FALSE kaboodle_SUBDIR_included_TRUE kaboodle_SUBDIR_included_FALSE kappfinder_data_SUBDIR_included_TRUE kappfinder_data_SUBDIR_included_FALSE kfile_plugins_SUBDIR_included_TRUE kfile_plugins_SUBDIR_included_FALSE kmid_SUBDIR_included_TRUE kmid_SUBDIR_included_FALSE kmix_SUBDIR_included_TRUE kmix_SUBDIR_included_FALSE libkcddb_SUBDIR_included_TRUE libkcddb_SUBDIR_included_FALSE mpeglib_SUBDIR_included_TRUE mpeglib_SUBDIR_included_FALSE mpg123_artsplugin_SUBDIR_included_TRUE mpg123_artsplugin_SUBDIR_included_FALSE oggvorbis_artsplugin_SUBDIR_included_TRUE oggvorbis_artsplugin_SUBDIR_included_FALSE xine_artsplugin_SUBDIR_included_TRUE xine_artsplugin_SUBDIR_included_FALSE akode_SUBDIR_included_TRUE akode_SUBDIR_included_FALSE krec_SUBDIR_included_TRUE krec_SUBDIR_included_FALSE noatun_SUBDIR_included_TRUE noatun_SUBDIR_included_FALSE kscd_SUBDIR_included_TRUE kscd_SUBDIR_included_FALSE kioslave_SUBDIR_included_TRUE kioslave_SUBDIR_included_FALSE kaudiocreator_SUBDIR_included_TRUE kaudiocreator_SUBDIR_included_FALSE mpeglib_artsplug_SUBDIR_included_TRUE mpeglib_artsplug_SUBDIR_included_FALSE juk_SUBDIR_included_TRUE juk_SUBDIR_included_FALSE LIBOBJS LTLIBOBJS'
ac_subst_files=''
# Initialize some variables set by options.
@@ -9265,58 +9265,6 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -44669,6 +44468,16 @@
-
-
-
-+if test "x$akode_SUBDIR_included" = xyes; then
-+ akode_SUBDIR_included_TRUE=
-+ akode_SUBDIR_included_FALSE='#'
-+else
-+ akode_SUBDIR_included_TRUE='#'
-+ akode_SUBDIR_included_FALSE=
-+fi
-+
-+
-+
- if test "x$arts_SUBDIR_included" = xyes; then
- arts_SUBDIR_included_TRUE=
- arts_SUBDIR_included_FALSE='#'
-@@ -44799,12 +44608,12 @@
-
-
-
--if test "x$akode_SUBDIR_included" = xyes; then
-- akode_SUBDIR_included_TRUE=
-- akode_SUBDIR_included_FALSE='#'
-+if test "x$juk_SUBDIR_included" = xyes; then
-+ juk_SUBDIR_included_TRUE=
-+ juk_SUBDIR_included_FALSE='#'
- else
-- akode_SUBDIR_included_TRUE='#'
-- akode_SUBDIR_included_FALSE=
-+ juk_SUBDIR_included_TRUE='#'
-+ juk_SUBDIR_included_FALSE=
- fi
-
-
-@@ -44867,16 +44676,6 @@
- mpeglib_artsplug_SUBDIR_included_FALSE=
- fi
-
--
--
--if test "x$juk_SUBDIR_included" = xyes; then
-- juk_SUBDIR_included_TRUE=
-- juk_SUBDIR_included_FALSE='#'
--else
-- juk_SUBDIR_included_TRUE='#'
-- juk_SUBDIR_included_FALSE=
--fi
--
- ac_config_files="$ac_config_files Makefile"
-
- ac_config_files="$ac_config_files akode/Makefile"
@@ -45320,6 +45119,13 @@
LTLIBOBJS=$ac_ltlibobjs
@@ -9331,48 +9279,6 @@
if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
{ { echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined.
Usually this means the macro was only invoked conditionally." >&5
-@@ -45509,6 +45315,13 @@
- Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
- fi
-+if test -z "${akode_SUBDIR_included_TRUE}" && test -z "${akode_SUBDIR_included_FALSE}"; then
-+ { { echo "$as_me:$LINENO: error: conditional \"akode_SUBDIR_included\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&5
-+echo "$as_me: error: conditional \"akode_SUBDIR_included\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&2;}
-+ { (exit 1); exit 1; }; }
-+fi
- if test -z "${arts_SUBDIR_included_TRUE}" && test -z "${arts_SUBDIR_included_FALSE}"; then
- { { echo "$as_me:$LINENO: error: conditional \"arts_SUBDIR_included\" was never defined.
- Usually this means the macro was only invoked conditionally." >&5
-@@ -45600,10 +45413,10 @@
- Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
- fi
--if test -z "${akode_SUBDIR_included_TRUE}" && test -z "${akode_SUBDIR_included_FALSE}"; then
-- { { echo "$as_me:$LINENO: error: conditional \"akode_SUBDIR_included\" was never defined.
-+if test -z "${juk_SUBDIR_included_TRUE}" && test -z "${juk_SUBDIR_included_FALSE}"; then
-+ { { echo "$as_me:$LINENO: error: conditional \"juk_SUBDIR_included\" was never defined.
- Usually this means the macro was only invoked conditionally." >&5
--echo "$as_me: error: conditional \"akode_SUBDIR_included\" was never defined.
-+echo "$as_me: error: conditional \"juk_SUBDIR_included\" was never defined.
- Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
- fi
-@@ -45649,13 +45462,6 @@
- Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
- fi
--if test -z "${juk_SUBDIR_included_TRUE}" && test -z "${juk_SUBDIR_included_FALSE}"; then
-- { { echo "$as_me:$LINENO: error: conditional \"juk_SUBDIR_included\" was never defined.
--Usually this means the macro was only invoked conditionally." >&5
--echo "$as_me: error: conditional \"juk_SUBDIR_included\" was never defined.
--Usually this means the macro was only invoked conditionally." >&2;}
-- { (exit 1); exit 1; }; }
--fi
-
- : ${CONFIG_STATUS=./config.status}
- ac_clean_files_save=$ac_clean_files
@@ -46399,6 +46205,9 @@
s, at AMTAR@,$AMTAR,;t t
s, at am__tar@,$am__tar,;t t
@@ -9383,35 +9289,6 @@
s, at KDECONFIG@,$KDECONFIG,;t t
s, at kde_libs_prefix@,$kde_libs_prefix,;t t
s, at kde_libs_htmldir@,$kde_libs_htmldir,;t t
-@@ -46684,6 +46493,8 @@
- s, at XINE_CFLAGS@,$XINE_CFLAGS,;t t
- s, at XINE_LIBS@,$XINE_LIBS,;t t
- s, at TOPSUBDIRS@,$TOPSUBDIRS,;t t
-+s, at akode_SUBDIR_included_TRUE@,$akode_SUBDIR_included_TRUE,;t t
-+s, at akode_SUBDIR_included_FALSE@,$akode_SUBDIR_included_FALSE,;t t
- s, at arts_SUBDIR_included_TRUE@,$arts_SUBDIR_included_TRUE,;t t
- s, at arts_SUBDIR_included_FALSE@,$arts_SUBDIR_included_FALSE,;t t
- s, at audiofile_artsplugin_SUBDIR_included_TRUE@,$audiofile_artsplugin_SUBDIR_included_TRUE,;t t
-@@ -46710,8 +46521,8 @@
- s, at oggvorbis_artsplugin_SUBDIR_included_FALSE@,$oggvorbis_artsplugin_SUBDIR_included_FALSE,;t t
- s, at xine_artsplugin_SUBDIR_included_TRUE@,$xine_artsplugin_SUBDIR_included_TRUE,;t t
- s, at xine_artsplugin_SUBDIR_included_FALSE@,$xine_artsplugin_SUBDIR_included_FALSE,;t t
--s, at akode_SUBDIR_included_TRUE@,$akode_SUBDIR_included_TRUE,;t t
--s, at akode_SUBDIR_included_FALSE@,$akode_SUBDIR_included_FALSE,;t t
-+s, at juk_SUBDIR_included_TRUE@,$juk_SUBDIR_included_TRUE,;t t
-+s, at juk_SUBDIR_included_FALSE@,$juk_SUBDIR_included_FALSE,;t t
- s, at krec_SUBDIR_included_TRUE@,$krec_SUBDIR_included_TRUE,;t t
- s, at krec_SUBDIR_included_FALSE@,$krec_SUBDIR_included_FALSE,;t t
- s, at noatun_SUBDIR_included_TRUE@,$noatun_SUBDIR_included_TRUE,;t t
-@@ -46724,8 +46535,6 @@
- s, at kaudiocreator_SUBDIR_included_FALSE@,$kaudiocreator_SUBDIR_included_FALSE,;t t
- s, at mpeglib_artsplug_SUBDIR_included_TRUE@,$mpeglib_artsplug_SUBDIR_included_TRUE,;t t
- s, at mpeglib_artsplug_SUBDIR_included_FALSE@,$mpeglib_artsplug_SUBDIR_included_FALSE,;t t
--s, at juk_SUBDIR_included_TRUE@,$juk_SUBDIR_included_TRUE,;t t
--s, at juk_SUBDIR_included_FALSE@,$juk_SUBDIR_included_FALSE,;t t
- s, at LIBOBJS@,$LIBOBJS,;t t
- s, at LTLIBOBJS@,$LTLIBOBJS,;t t
- CEOF
@@ -46894,11 +46703,6 @@
*) ac_INSTALL=$ac_top_builddir$INSTALL ;;
esac
@@ -9461,30 +9338,6 @@
AC_SUBST(INTELCPPFLAG)
AC_DEFUN([KDE_MPEGLIB_COMPILES],
-@@ -2381,6 +2377,7 @@
- DO_NOT_COMPILE="$DO_NOT_COMPILE xine_artsplugin"
- ])
- KDE_CREATE_SUBDIRSLIST
-+AM_CONDITIONAL(akode_SUBDIR_included, test "x$akode_SUBDIR_included" = xyes)
- AM_CONDITIONAL(arts_SUBDIR_included, test "x$arts_SUBDIR_included" = xyes)
- AM_CONDITIONAL(audiofile_artsplugin_SUBDIR_included, test "x$audiofile_artsplugin_SUBDIR_included" = xyes)
- AM_CONDITIONAL(doc_SUBDIR_included, test "x$doc_SUBDIR_included" = xyes)
-@@ -2394,14 +2391,13 @@
- AM_CONDITIONAL(mpg123_artsplugin_SUBDIR_included, test "x$mpg123_artsplugin_SUBDIR_included" = xyes)
- AM_CONDITIONAL(oggvorbis_artsplugin_SUBDIR_included, test "x$oggvorbis_artsplugin_SUBDIR_included" = xyes)
- AM_CONDITIONAL(xine_artsplugin_SUBDIR_included, test "x$xine_artsplugin_SUBDIR_included" = xyes)
--AM_CONDITIONAL(akode_SUBDIR_included, test "x$akode_SUBDIR_included" = xyes)
-+AM_CONDITIONAL(juk_SUBDIR_included, test "x$juk_SUBDIR_included" = xyes)
- AM_CONDITIONAL(krec_SUBDIR_included, test "x$krec_SUBDIR_included" = xyes)
- AM_CONDITIONAL(noatun_SUBDIR_included, test "x$noatun_SUBDIR_included" = xyes)
- AM_CONDITIONAL(kscd_SUBDIR_included, test "x$kscd_SUBDIR_included" = xyes)
- AM_CONDITIONAL(kioslave_SUBDIR_included, test "x$kioslave_SUBDIR_included" = xyes)
- AM_CONDITIONAL(kaudiocreator_SUBDIR_included, test "x$kaudiocreator_SUBDIR_included" = xyes)
- AM_CONDITIONAL(mpeglib_artsplug_SUBDIR_included, test "x$mpeglib_artsplug_SUBDIR_included" = xyes)
--AM_CONDITIONAL(juk_SUBDIR_included, test "x$juk_SUBDIR_included" = xyes)
- AC_CONFIG_FILES([ Makefile ])
- AC_CONFIG_FILES([ akode/Makefile ])
- AC_CONFIG_FILES([ akode/arts_plugin/Makefile ])
--- doc/artsbuilder/images/Makefile.in
+++ doc/artsbuilder/images/Makefile.in
@@ -201,6 +201,9 @@
@@ -12689,17 +12542,6 @@
#>+ 2
KDE_DIST=asynccddblookuptest.h asynchttplookuptest.h asyncsmtpsubmittest.h Makefile.in asynchttpsubmittest.h Makefile.am
---- Makefile.am
-+++ Makefile.am
-@@ -4,7 +4,7 @@
- AUTOMAKE_OPTIONS = foreign 1.5
- DISTCLEANFILES = inst-apps
-
--# COMPILE_AFTER_arts = noatun krec akode
-+# COMPILE_AFTER_arts = noatun krec
- # COMPILE_AFTER_mpeglib = mpeglib_artsplug
- # COMPILE_AFTER_libkcddb = kaudiocreator kioslave kscd
- # COMPILE_AFTER_akode = juk
--- Makefile.in
+++ Makefile.in
@@ -234,6 +234,9 @@
@@ -12712,15 +12554,6 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -480,7 +483,7 @@
- AUTOMAKE_OPTIONS = foreign 1.5
- DISTCLEANFILES = inst-apps
-
--# COMPILE_AFTER_arts = noatun krec akode
-+# COMPILE_AFTER_arts = noatun krec
- # COMPILE_AFTER_mpeglib = mpeglib_artsplug
- # COMPILE_AFTER_libkcddb = kaudiocreator kioslave kscd
- # COMPILE_AFTER_akode = juk
@@ -494,7 +497,7 @@
.SUFFIXES:
am--refresh:
@@ -15959,26 +15792,6 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
---- subdirs
-+++ subdirs
-@@ -1,3 +1,4 @@
-+akode
- arts
- audiofile_artsplugin
- doc
-@@ -11,11 +12,10 @@
- mpg123_artsplugin
- oggvorbis_artsplugin
- xine_artsplugin
--akode
-+juk
- krec
- noatun
- kscd
- kioslave
- kaudiocreator
- mpeglib_artsplug
--juk
--- xine_artsplugin/Makefile.in
+++ xine_artsplugin/Makefile.in
@@ -274,6 +274,9 @@
More information about the pkg-kde-commits
mailing list