← Back to branch summary

~ubuntu-branches/ubuntu/karmic/vlc/karmic

« back to all changes in this revision

Viewing changes to modules/gui/minimal_macosx/intf.h

  • Committer: Bazaar Package Importer
  • Author(s): أحمد المحمودي (Ahmed El-Mahmoudy)
  • 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
Tags: 0.9.9a-1ubuntu1
https://launchpad.net/bugs/356310
https://launchpad.net/bugs/320915
* 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

Show diffs side-by-side

added added

removed removed

Lines of Context:
modules/gui/minimal_macosx/intf.h
2
2
 * intf.h: MacOS X interface module
3
3
 *****************************************************************************
4
4
 * Copyright (C) 2002-2007 the VideoLAN team
5
 
 * $Id$
 
5
 * $Id: 8b4ae0d4307c44d6f610d45f480a757b416ada78 $
6
6
 *
7
7
 * Authors: Jon Lech Johansen <jon-vl@nanocrew.net>
8
8
 *          Christophe Massiot <massiot@via.ecp.fr>