-
Committer:
Package Import Robot
-
Author(s):
Harald Sitter
-
Date:
2012-06-05 15:43:51 UTC
-
mfrom:
(2.1.13 experimental)
-
Revision ID:
package-import@ubuntu.com-20120605154351-nbkdf9q1chu7uvh1
Tags: 2:2.6~beta1-1ubuntu1
* Merge from Debian experimental, remaining changes: (LP: 1008645)
- Don't build-depend on libavformat-dev and libofa0-dev as libavcodec*
is not allowed on cd images.
- Don't build-dep on libqt4-opengl-dev on armel and armhf and install
file manually in debian/rules
- build-dep on libmygpo
- Add epoch "2:" to the version number.
- More complete not-installed
- Keep build-dep libmysqld-pic at 5.1.36-2 (new version not yet in archive)
- Do not manually compress with xz, we handle this in pkg-kde and explicitly
doing it prevents global control
* Do not suggest libxine1-ffmpeg as this should have been in the Phonon
backend to begin with and phonon-xine is no longer used anyway.
* amarok-common breaks amarok (<< 2.6~beta1-1ubuntu1~) due to wrongly
packaged desktop files in a previous release
* Drop patches applied upstream:
- kubuntu_Make-OpenGl-a-soft-dependency.diff
- kubuntu_CMake-Move-occurence-of-OPENGL_INCLUDE_DIR-var.diff
- kubuntu_kdelibs4.8_context_view.diff
* Refreshed patch kubuntu_mysql_pic_library_path.diff
* amarok-doc to Break and Replace all previous amarok-help-* packages
having one big package and keep the diff small was deemed more reasonable
on IRC