Viewing all changes in revision 53.
- Committer: Bazaar Package Importer
- Date: 2009-04-06 13:58:06 UTC
- mfrom: (1.1.21 upstream) (3.1.3 squeeze)
- Revision ID: james.westby@ubuntu.com-20090406135806-96lmh2oslltinvi7
* Merge from Debian. (LP: #356310)
* Remaining changes:
  - build against libxul-dev instead of iceape-dev
  - build against libass-dev and libx264-dev
  - build against and install libx264 plugin
  - adjust Vcs-Bzr Headers in debian/control
  - add Xb-Npp header to vlc package
  - debian/patches/301_DVD_media.diff: Change %U to %f
     in VLC .desktop file, cf LP #275043
  - Remove arts from dependencies. (LP: #320915)
    - debian/control:
      - Remove libarts1-dev from build depends
      - Don't build package vlc-plugin-arts
      - Remove all notions of vlc-plugin-arts from packages descriptions
    - debian/rules:
      - Remove --enable-arts from confflags
    - Delete debian/vlc-plugin-arts.install
    - Delete debian/vlc-plugin-arts.links
* Remaining changes:
  - build against libxul-dev instead of iceape-dev
  - build against libass-dev and libx264-dev
  - build against and install libx264 plugin
  - adjust Vcs-Bzr Headers in debian/control
  - add Xb-Npp header to vlc package
  - debian/patches/301_DVD_media.diff: Change %U to %f
     in VLC .desktop file, cf LP #275043
  - Remove arts from dependencies. (LP: #320915)
    - debian/control:
      - Remove libarts1-dev from build depends
      - Don't build package vlc-plugin-arts
      - Remove all notions of vlc-plugin-arts from packages descriptions
    - debian/rules:
      - Remove --enable-arts from confflags
    - Delete debian/vlc-plugin-arts.install
    - Delete debian/vlc-plugin-arts.links
- files added:
- debian/gbp.conf
- files removed:
- compile
- files modified:
- ChangeLog
expand all
collapse all
added
removed
