diff -u kmediafactory-0.5.2/debian/control kmediafactory-0.5.2/debian/control --- kmediafactory-0.5.2/debian/control +++ kmediafactory-0.5.2/debian/control @@ -3,7 +3,7 @@ Priority: optional Maintainer: Ubuntu MOTU Developers XSBC-Original-Maintainer: Jonathan Patrick Davies -Build-Depends: debhelper (>= 5.0.0), cdbs, kdelibs4-dev (>= 4:3.3.0), libqt3-mt-dev (>= 3:3.3.2), libmagick++9-dev, libtheora-dev, libxine-dev (>= 1.0.2), libdvdread3-dev, libdv4-dev, dvdauthor, mjpegtools, zip, docbook2x +Build-Depends: debhelper (>= 5.0.0), cdbs, kdelibs4-dev (>= 4:3.3.0), libqt3-mt-dev (>= 3:3.3.2), libmagick++-dev, libtheora-dev, libxine-dev (>= 1.0.2), libdvdread-dev, libdv4-dev, dvdauthor, mjpegtools, zip, docbook2x, dvd-slideshow Standards-Version: 3.7.2.2 Package: kmediafactory diff -u kmediafactory-0.5.2/debian/changelog kmediafactory-0.5.2/debian/changelog --- kmediafactory-0.5.2/debian/changelog +++ kmediafactory-0.5.2/debian/changelog @@ -1,3 +1,16 @@ +kmediafactory (0.5.2-0ubuntu5) jaunty; urgency=low + + * debian/control: + - changed build dependency from libdvdread3-dev to libdvdread-dev for + libdvdread 4.x transition (LP: #330684) + - Also changed dependency on libmagick++9-dev to libmagick++-dev for + libmagickcore transition (LP: #348160) + - Added dvd-slideshow support by adding dvd-slideshow in build dependency + - debian/patches/libmagickcore_transition.diff: fix compilation errors + because of new libmagickcore class names and includes + + -- Fabrice Coutadeur Wed, 25 Mar 2009 21:24:41 +0000 + kmediafactory (0.5.2-0ubuntu4) hardy; urgency=low * Rebuild for libmagick9 -> libmagick10 transition. only in patch2: unchanged: --- kmediafactory-0.5.2.orig/debian/patches/libmagickcore_transition.diff +++ kmediafactory-0.5.2/debian/patches/libmagickcore_transition.diff @@ -0,0 +1,44 @@ +--- kmediafactory-0.5.2.orig/lib/color.cpp ++++ kmediafactory-0.5.2/lib/color.cpp +@@ -24,10 +24,10 @@ + + Magick::Color KMF::Color::toMagickColor() const + { +- Magick::ColorRGB rgb(((MagickLib::Quantum)red())/255.0, +- ((MagickLib::Quantum)green())/255.0, +- ((MagickLib::Quantum)blue())/255.0); +- rgb.alphaQuantum((MagickLib::Quantum)(alpha()/255.0)); ++ Magick::ColorRGB rgb(((MagickCore::Quantum)red())/255.0, ++ ((MagickCore::Quantum)green())/255.0, ++ ((MagickCore::Quantum)blue())/255.0); ++ rgb.alphaQuantum((MagickCore::Quantum)(alpha()/255.0)); + return rgb; + } + +--- kmediafactory-0.5.2.orig/plugins/template/kmfwidget.cpp ++++ kmediafactory-0.5.2/plugins/template/kmfwidget.cpp +@@ -137,10 +137,10 @@ + paintWidget(temp, true); + if(m_shadow.type() == KMFShadow::Blur) + { +- MagickLib::ExceptionInfo exceptionInfo; ++ MagickCore::ExceptionInfo exceptionInfo; + GetExceptionInfo(&exceptionInfo); +- MagickLib::Image* newImage = +- BlurImageChannel(temp.image(), MagickLib::AllChannels, ++ MagickCore::Image* newImage = ++ BlurImageChannel(temp.image(), MagickCore::AllChannels, + m_shadow.radius(), m_shadow.sigma(), &exceptionInfo); + temp.replaceImage(newImage); + //throwException(exceptionInfo); +--- kmediafactory-0.5.2.orig/configure ++++ kmediafactory-0.5.2/configure +@@ -34592,6 +34592,7 @@ + done + LIBMAGICK_RPATH=`echo $LIBMAGICK_RPATH | $SED -e "s/-L/-R/g"` + LIBMAGICK_CPPFLAGS="`$MAGICKPP_CONFIG --cppflags`" ++ all_includes="$LIBMAGICK_CPPFLAGS $all_includes" + if test ! "$USE_RPATH" = "yes"; then + LIBMAGICK_RPATH= + fi + only in patch2: unchanged: --- kmediafactory-0.5.2.orig/debian/patches/fix_link_errors_with_ffmpeg.diff +++ kmediafactory-0.5.2/debian/patches/fix_link_errors_with_ffmpeg.diff @@ -0,0 +1,21 @@ +--- kmediafactory-0.5.2.orig/ffmpeg/libavcodec/motion_est_template.c ++++ kmediafactory-0.5.2/ffmpeg/libavcodec/motion_est_template.c +@@ -231,7 +231,7 @@ + return dmin; + } + +-int inline ff_get_mb_score(MpegEncContext * s, int mx, int my, int src_index, ++int ff_get_mb_score(MpegEncContext * s, int mx, int my, int src_index, + int ref_index, int size, int h, int add_rate) + { + // const int check_luma= s->dsp.me_sub_cmp != s->dsp.mb_cmp; +@@ -963,7 +963,7 @@ + } + + //this function is dedicated to the braindamaged gcc +-inline int ff_epzs_motion_search(MpegEncContext * s, int *mx_ptr, int *my_ptr, ++int ff_epzs_motion_search(MpegEncContext * s, int *mx_ptr, int *my_ptr, + int P[10][2], int src_index, int ref_index, int16_t (*last_mv)[2], + int ref_mv_scale, int size, int h) + { +