[SCM] VLC media player packaging branch, master, updated. debian/1.1.3-2-5-ge47316d

[xtophe-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit ebbd69df3febb892df8d458af4a4aa9f7bf67035
Author: Christophe Mutricy <xtophe at videolan.org>
Date:   Fri Aug 27 22:34:16 2010 +0200

    Remove unneeded patch

diff --git a/debian/patches/104_notify.diff b/debian/patches/104_notify.diff
deleted file mode 100644
index 28e81c2..0000000
--- a/debian/patches/104_notify.diff
+++ /dev/null
@@ -1,24 +0,0 @@
-Description: Fix upstream code. Reflect the new path.
-Author: Christophe Mutricy <xtophe at videolan.org>
-Applied-Upstream: 1.1.1
-
-Index: debian.git/modules/misc/notify/notify.c
-===================================================================
---- debian.git.orig/modules/misc/notify/notify.c	2010-04-13 02:22:27.000000000 +0200
-+++ debian.git/modules/misc/notify/notify.c	2010-06-23 00:46:58.104227185 +0200
-@@ -225,14 +225,7 @@
-     else /* else we show state-of-the art logo */
-     {
-         GError *p_error = NULL;
--        char *psz_pixbuf;
--        char *psz_data = config_GetDataDir( p_this );
--        if( asprintf( &psz_pixbuf, "%s/vlc48x48.png", psz_data ) >= 0 )
--        {
--            pix = gdk_pixbuf_new_from_file( psz_pixbuf, &p_error );
--            free( psz_pixbuf );
--        }
--        free( psz_data );
-+        pix = gdk_pixbuf_new_from_file( "/usr/share/icons/hicolor/48x48/apps/vlc.png", &p_error );
-     }
- 
-     free( psz_arturl );
diff --git a/debian/patches/series b/debian/patches/series
index 5f7d0a7..495457d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
 052_as-needed.diff
-104_notify.diff
 200_osdmenu_paths.diff

-- 
VLC media player packaging