lp:ubuntu/vivid-proposed/kplayer
- Get this branch:
- bzr branch lp:ubuntu/vivid-proposed/kplayer
Branch merges
Branch information
Recent revisions
- 9. By Artur Rona
-
* Merge from Debian testing. Remaining changes:
- debian/control, debian/kplayer*:
+ Keep kplayer-doc and kplayer-data.
+ Don't install files in both kplayer and -data.
* Drop following patches, fixed in Debian:
- kubuntu_01_docbook_ fix.diff -> 06_fix_ dtd_reference. diff
- kubuntu_02_indirect_ linking. diff -> 07_indirect_ linking. diff - 6. By Scott Kitterman
-
Add debian/
patches/ kubuntu_ 02_indirect_ linking. diff to explicitly link
KDE4_SOLID_LIBS to fix FTBFS due to indirect linking - 5. By Rohan Garg
-
* Merge with debian, remaining changes
- Keep kplayer-doc and kplayer-data
- Add kubuntu_01_docbook_ fix.diff to fix docbook build FTBFS
- Add ${misc:Depends} to kplayer-doc and kplayer-data - 4. By Maia Everett
-
* Merged from debian-
multimedia. org, remaining Ubuntu changes:
+ debian/control:
- Depend on mplayer | mplayer-nogui.
- Re-added kplayer-data package.
+ debian/install:
- Split files from kplayer-data to kplayer-data.install.
+ debian/kplayer.1:
- Re-added.
+ debian/kplayer- doc.install:
- Upstream installs files to /usr/share/doc/kde - updated accordingly.
+ debian/rules:
- Re-added dh_installman calls.
+ debian/patches:
- Re-added desktop.patch from -0.1ubuntu1, as 02_desktop.diff. - 2. By Maia Everett
-
* First upload to Ubuntu from debian-
multimedia. org.
* debian/patches/ desktop. patch:
- Remove Encoding key from desktop file.
* debian/control:
- Set maintainer field.
- Build-depend on quilt.
- Build-depend on debhelper >= 5.0.51 (for dh_icons).
- Depend on mplayer | mplayer-nogui.
- Added kplayer-data package.
* debian/rules:
- Specify kde4-config path.
- Fixed path to COPYING file to remove.
- Build with -Wl,--as-needed.
- Call dh_installman, dh_icons and dh_desktop.
- Delete .pc in clean.
* debian/install:
- Moved everything usr/share to kplayer-data.
* debian/kplayer- data.install:
- New file.
- Fixed path to usr/share/apps.
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp:ubuntu/vivid/kplayer