debian/patches/20_interfaces.dpatch

   1 #! /bin/sh -e
   2 ## 20_interfaces.dpatch by  <sam+deb@zoy.org>
   3 ##
   4 ## All lines beginning with `## DP:' are a description of the patch.
   5 ## DP: No description.
   6
   7 if [ $# -lt 1 ]; then
   8     echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
   9     exit 1
  10 fi
  11
  12 [ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
  13 patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}"
  14
  15 case "$1" in
  16     -patch) patch -p1 ${patch_opts} < $0;;
  17     -unpatch) patch -R -p1 ${patch_opts} < $0;;
  18     *)
  19         echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
  20         exit 1;;
  21 esac
  22
  23 exit 0
  24
  25 @DPATCH@
  26 diff -urNad /home/sam/debian/official/vlc/debian/vlc-0.7.2.svn20040826/modules/gui/kde/kde.cpp vlc-0.7.2.svn20040826/modules/gui/kde/kde.cpp
  27 --- /home/sam/debian/official/vlc/debian/vlc-0.7.2.svn20040826/modules/gui/kde/kde.cpp  2004-08-27 01:17:48.000000000 +0200
  28 +++ vlc-0.7.2.svn20040826/modules/gui/kde/kde.cpp       2004-08-27 01:17:56.000000000 +0200
  29 @@ -53,7 +53,7 @@
  30      /* int i = getenv( "DISPLAY" ) == NULL ? 8 : 85; */
  31      set_description( _("KDE interface") );
  32      add_file( "kde-uirc", DATA_PATH "/ui.rc", NULL, N_( "path to ui.rc file" ), NULL, VLC_TRUE );
  33 -    set_capability( "interface", 0 ); /* 0 used to be i, disabled because kvlc not maintained */
  34 +    set_capability( "interface", 1 ); /* 0 used to be i, disabled because kvlc not maintained */
  35      set_program( "kvlc" );
  36      set_callbacks( open, close );
  37  vlc_module_end();
  38 diff -urNad /home/sam/debian/official/vlc/debian/vlc-0.7.2.svn20040826/modules/gui/skins2/src/skin_main.cpp vlc-0.7.2.svn20040826/modules/gui/skins2/src/skin_main.cpp
  39 --- /home/sam/debian/official/vlc/debian/vlc-0.7.2.svn20040826/modules/gui/skins2/src/skin_main.cpp     2004-08-27 01:17:48.000000000 +0200
  40 +++ vlc-0.7.2.svn20040826/modules/gui/skins2/src/skin_main.cpp  2004-08-27 01:17:56.000000000 +0200
  41 @@ -349,7 +349,7 @@
  42  #endif
  43
  44      set_description( _("Skinnable Interface") );
  45 -    set_capability( "interface", 30 );
  46 +    set_capability( "interface", 120 );
  47      set_callbacks( Open, Close );
  48      add_shortcut( "skins" );
  49      set_program( "svlc" );
  50 diff -urNad /home/sam/debian/official/vlc/debian/vlc-0.7.2.svn20040826/src/interface/interface.c vlc-0.7.2.svn20040826/src/interface/interface.c
  51 --- /home/sam/debian/official/vlc/debian/vlc-0.7.2.svn20040826/src/interface/interface.c        2004-08-27 01:17:48.000000000 +0200
  52 +++ vlc-0.7.2.svn20040826/src/interface/interface.c     2004-08-27 01:17:56.000000000 +0200
  53 @@ -306,8 +306,10 @@
  54  {
  55      static char *ppsz_interfaces[] =
  56      {
  57 +/*
  58          "skins2", "Skins 2",
  59          "wxwindows", "wxWindows",
  60 +*/
  61          NULL, NULL
  62      };
  63      char **ppsz_parser;