[SCM] VLC media player packaging branch, sid, updated. debian/0.9.8a-2-10-gdc9dcb1

xtophe-guest at users.alioth.debian.org xtophe-guest at users.alioth.debian.org
Fri Mar 13 10:12:58 UTC 2009


The following commit has been merged in the sid branch:
commit dc9dcb19a867090c4d2b47b2cc383f51793e0444
Author: Christophe Mutricy <xtophe at videolan.org>
Date:   Thu Mar 12 14:32:15 2009 +0100

    Prune doc/fortunes.txt from personnal attack (closes: #401560, #518300)

diff --git a/debian/patches/402_fortune_pruning.diff b/debian/patches/402_fortune_pruning.diff
new file mode 100644
index 0000000..7bffa1e
--- /dev/null
+++ b/debian/patches/402_fortune_pruning.diff
@@ -0,0 +1,34 @@
+commit 7bbb46c1e2d22e7a144bcca18f6e0ca1e0eaf8e2
+Author: Jean-Baptiste Kempf <jb at videolan.org>
+Date:   Thu Mar 5 12:11:43 2009 +0100
+
+    Remove insult in the fortunes...
+    
+    This doesn't mean I don't share the opinion, but let's try to ease the work for packagers that get bugs on that part.
+    And of course VLC + debian-multimedia in debian is still completly broken...
+
+diff --git a/doc/fortunes.txt b/doc/fortunes.txt
+index 9406996..2ee386f 100644
+--- a/doc/fortunes.txt
++++ b/doc/fortunes.txt
+@@ -76,20 +76,6 @@
+ 
+   -- #videolan
+ %
+-<sam> CHRISTIAN
+-<sam> MARILLAT
+-<sam> IS
+-<sam> A
+-<sam> COMPLETE
+-<sam>  ____ ___ ____ _  ___   _ _____    _    ____    _ 
+-<sam> |  _ \_ _/ ___| |/ / | | | ____|  / \  |  _ \  | |
+-<sam> | | | | | |   | ' /| |_| |  _|   / _ \ | | | | | |
+-<sam> | |_| | | |___| . \|  _  | |___ / ___ \| |_| | |_|
+-<sam> |____/___\____|_|\_\_| |_|_____/_/   \_\____/  (_)
+-<sam> 
+-
+-  -- #videolan
+-%
+ <bozo> you really shouldn't have touched a computer when you were a little boy
+ <stef> _it_ came to me
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 78d8472..34766b0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,4 @@
 200_osdmenu_paths.diff
 300_manpage_syntax.diff
 401_detect_xinerama_fullscreen.diff
+402_fortune_pruning.diff

-- 
VLC media player packaging



More information about the pkg-multimedia-commits mailing list