~ubuntu-branches/ubuntu/quantal/totem/quantal

Viewing all changes in revision 200.

  • Committer: Package Import Robot
  • Author(s): Jeremy Bicha
  • Date: 2012-05-29 22:51:06 UTC
  • mfrom: (1.11.14) (2.1.22 experimental) (2.2.28 sid)
  • Revision ID: package-import@ubuntu.com-20120529225106-g0wms0aylgh7x20m
Tags: 3.4.2-1ubuntu1
* Merge with Debian. Remaining changes:
* debian/control.in:
  - Drop build-depends on libepc-ui-dev and libgrilo-0.1-dev
  - Build-depend on libzeitgeist-dev
  - Suggest rather than recommend gstreamer components in universe
  - Add totem-plugins-extra for the components which have depends in universe
  - Add XB-Npp-Description and XB-Npp-Filename header to the 
    totem-mozilla package to improve ubufox/ubuntu plugin db integration 
  - Refer to Firefox in totem-mozilla description instead of Iceweasel
  - Don't have totem-mozilla recommend any particular browser
* debian/totem-common.install, debian/source_totem.py:
  - Install Ubuntu apport debugging hook
* debian/totem-plugins-extra.install:
  - Plugins split out of totem-plugins
* debian/totem-plugins.install:    
  - Simplify the install list and exclude the plugins split to -extra
* debian/totem-common.gsettings-override:
  - Enable the youtube and zeitgeist plugins by default
* debian/patches/01_fake_keypresses.patch:
  - dropped it's an old workaround and should not be required
* debian/patches/91_quicklist_entries.patch:
  - Add static quicklist
* debian/patches/correct_desktop_mimetypes.patch:
  - Don't list the mimetypes after the unity lists
* Dropped Ubuntu patches:
  - 03_default_options.patch: Moved to gsettings override instead
  - youtube-api-gdata9.patch: In new totem release
  - 04_port_to_gobject.patch: In new totem release
  - 90_fix_save_playlist.patch: In new totem release
  - git_commandfix_incorrect_free.patch: In new totem release
  - git_tracks_language.patch: In new totem release
  - git_remote_option_parsing.patch: In new totem release

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: