Fix typo in binary

Origin: vendor
Forwarded: yes
Applied-Upstream: https://github.com/cmus/cmus/commit/f0eb35d

Applied-Upstream: https://github.com/cmus/cmus/commit/f0eb35d
Gbp-Pq: Name 02_fix_typo.diff

Don't FTBFS if config.mk doesn't exist

Origin: vendor
Bug-Debian: http://bugs.debian.org/720781
Forwarded: no

The config.mk file isn't guaranteed to exist (it gets removed by the Makefile's
"distclean" target). Including it with a straight "include" causes cmus to
FTBFS on the initial clean, since it doesn't exist and make aborts because it
can't include it. Instead, include it using "-include", which ignores it if it
doesn't exist.
Forwarded: no
Gbp-Pq: Name 01_config.mk.diff

cmus (2.5.0-7) unstable; urgency=medium

  * Re-introduce Roaraudio support (Closes: #680745):
    - debian/control: Add build-dependency on libroad-dev.
    - debian/rules: Tune dpkg-shlibdeps call to move pulse and roar's
      dependencies to Recommends. Made the whole mechanism slightly more
      elegant.
  * Enable CUE support.
  * The project has moved to github, update the Homepage field accordingly.
  * Update debian/watch, project has moved from sourceforge to github.

[dgit import unpatched cmus 2.5.0-7]

Import cmus_2.5.0-7.debian.tar.gz

[dgit import tarball cmus 2.5.0-7 cmus_2.5.0-7.debian.tar.gz]

Import cmus_2.5.0.orig.tar.bz2

[dgit import orig cmus_2.5.0.orig.tar.bz2]