patches: Removed manpage_typos.dpatch -- included upstream.

diff --git a/debian/changelog b/debian/changelog
index 51752214ef1a32feefdef9ff8059852f24d17369..cd82bc96e712c3accc941cd88bfebb0be7b446b2 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,8 +3,9 @@ ncmpc (0.16.1-1) unstable; urgency=low
   * New upstream release.
   * debian/patches:
     - Removed include_config_h.dpatch -- included upstream.
+    - Removed manpage_typos.dpatch -- included upstream.
 
- -- Sebastian Harl <tokkee@debian.org>  Tue, 19 Jan 2010 21:20:19 +0100
+ -- Sebastian Harl <tokkee@debian.org>  Tue, 19 Jan 2010 21:22:21 +0100
 
 ncmpc (0.16-1) unstable; urgency=low
 

diff --git a/debian/patches/00list b/debian/patches/00list
index 830779dc697cbe19c96a1b6876ba4e10ea582a89..8b137891791fe96927ad78e64b0aad7bded08bdc 100644 (file)
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -1,2 +1 @@
-manpage_typos.dpatch
 

diff --git a/debian/patches/manpage_typos.dpatch b/debian/patches/manpage_typos.dpatch
deleted file mode 100644 (file)
index 5e0fd1a..0000000
--- a/debian/patches/manpage_typos.dpatch
+++ /dev/null
@@ -1,31 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## manpage_typos.dpatch by Sebastian Harl <sh@tokkee.org>
-##
-## DP: doc/ncmpc.1: fixed some typos
-
-@DPATCH@
-
-diff a/doc/ncmpc.1 b/doc/ncmpc.1
---- a/doc/ncmpc.1
-+++ b/doc/ncmpc.1
-@@ -222,9 +222,9 @@ You can view ncmpc's key bindings by pressing '1' (help) when
- ncmpc is running. To edit key bindings use the key editor in ncmpc (press 'K').
- .SH "SONG FORMAT"
- Format of song display for status and the list window.
--The  metadata  delimeters  are: %name%, %artist%, %track%, %time%, %file%, %shortfile%.
-+The  metadata  delimiters  are: %name%, %artist%, %track%, %time%, %file%, %shortfile%.
- 
--The [] operators is used to group output such that if no metadata delimeters are found or matched between '[' and ']', then none of  the  characters between '[' and ']' are outputed. '&' and '|' are logical operators for and and or. '#'  is used to escape characters. 
-+The [] operators is used to group output such that if no metadata delimiters are found or matched between '[' and ']', then none of  the  characters between '[' and ']' are output. '&' and '|' are logical operators for AND and OR. '#'  is used to escape characters. 
- 
- Some  useful examples for format are: 
- 
-@@ -237,7 +237,7 @@ and
- Report bugs on http://www.musicpd.org/mantis/
- .SH "NOTE"
- Since MPD uses UTF\-8, ncmpc needs to convert characters to the 
--charset used by the local system. If you get character conversion errors when your running ncmpc you probably need to set up your locale. This is done by setting any of the LC_CTYPE, LANG or LC_ALL enviroment variables (LC_CTYPE only affects character handling).
-+charset used by the local system. If you get character conversion errors when your running ncmpc you probably need to set up your locale. This is done by setting any of the LC_CTYPE, LANG or LC_ALL environment variables (LC_CTYPE only affects character handling).
- 
- .SH "SEE ALSO"
- mpc(1), mpd(1), locale(5), locale(7)