[SCM] vlc/master: Drop upstream applied patch.

bdrung at users.alioth.debian.org bdrung at users.alioth.debian.org
Sat Dec 31 10:55:49 UTC 2011


The following commit has been merged in the master branch:
commit bc8ca84bf9d3bd89f10b991d5f5b0eff6c06c929
Author: Benjamin Drung <bdrung at debian.org>
Date:   Sat Dec 31 11:54:31 2011 +0100

    Drop upstream applied patch.

diff --git a/debian/patches/fix-typo-in-vlc.desktop.patch b/debian/patches/fix-typo-in-vlc.desktop.patch
deleted file mode 100644
index fc11753..0000000
--- a/debian/patches/fix-typo-in-vlc.desktop.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-From: Benjamin Drung <bdrung at debian.org>
-Description: Fix typo in vlc.desktop: Name[nn] -> GenericName[nn].
-Forwarded: yes
-
---- a/share/vlc.desktop
-+++ b/share/vlc.desktop
-@@ -38,7 +38,7 @@
- GenericName[nl]=Mediaspeler
- Comment[nl]=Uw multimediastreams afspelen, opnemen en uitzenden
- Name[nn]=VLC mediespelar
--Name[nn]=Mediespelar
-+GenericName[nn]=Mediespelar
- Comment[nn]=Spel av, ta opp og send ut multimedia
- Name[pa]=VLC ਮੀਡਿਆ ਪਲੇਅਰ
- Comment[pa]=ਆਪਣੀ ਮਲਟੀਮੀਡਿਆ ਸਟਰੀਮ ਪੜ੍ਹੋ, ਕੈਪਚਰ ਤੇ ਬਰਾਡਕਾਸਟ ਕਰੋ 
diff --git a/debian/patches/series b/debian/patches/series
index bba44c3..79caf8c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 200_osdmenu_paths.patch
-fix-typo-in-vlc.desktop.patch

-- 
VLC media player packaging



More information about the pkg-multimedia-commits mailing list