← Back to branch summary

~ubuntu-branches/ubuntu/trusty/k3b/trusty

« back to all changes in this revision

Viewing changes to src/k3bsystemproblemdialog.cpp

  • Committer: Package Import Robot
  • Author(s): Jonathan Riddell
  • Date: 2013-11-12 10:36:01 UTC
  • mfrom: (2.1.20 sid)
  • Revision ID: package-import@ubuntu.com-20131112103601-q6vvln9lv3mg7qxh
Tags: 2.0.2-7ubuntu1
* Merge with Debian, remaining changes:
  - Suggest, not recommend libk3b6-extracodecs (Cannot be on the CD)
  - Do not ship k3b documentation, it's for the KDE3 version.
  - Do not install unused scalable icons to save space
  - Keep kubuntu_02_kubuntu_restricted.diff
  - Keep kubuntu_03_no_missing_mp3_warn.diff
  - Keep kubuntu_05_no_system_settings.diff
  - Keep kubuntu_07_quicklists.diff
  - Disable 111_advice_debian_libk3b3-extracodes.diff and
    112_dont_require_mp3.diff which aren't required due to our mp3 patches.
  - swap kubuntu_06_libav_0.7.diff for Debian's
    Fixed_compilation_with_new_FFMPEG.patch

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/k3bsystemproblemdialog.cpp
530
530
                                                "due to the missing libmad). Some distributions allow installation of MP3 support "
531
531
                                                "via an online update tool.") ) );
532
532
    }
533
 
    */
534
533
 
535
534
#ifdef HAVE_ICONV_H
536
535
    char* codec = nl_langinfo( CODESET );
569
568
#endif
570
569
                                           ) );
571
570
    }
 
571
    */
572
572
 
573
573
 
574
574
    kDebug() << "(K3b::Core) System problems:";