[Pkg-mpd-commits] [pkg-mpc] 06/08: Drop configure.ac.patch, hyphen-as-minus-sign.patch: applied upstream

Thu Nov 7 21:48:24 UTC 2013

This is an automated email from the git hooks/post-receive script.

fsfs pushed a commit to branch master
in repository pkg-mpc.

commit e0b3bf14265ded7c32e2cd8aa395e36bbc6ee350
Author: Florian Schlichting <fsfs at debian.org>
Date:   Thu Nov 7 22:35:13 2013 +0100

    Drop configure.ac.patch, hyphen-as-minus-sign.patch: applied upstream
---
 debian/patches/Makefile.am.patch          |    2 +-
 debian/patches/configure.ac.patch         |   20 -----
 debian/patches/hyphen-as-minus-sign.patch |  113 -----------------------------
 debian/patches/series                     |    2 -
 4 files changed, 1 insertion(+), 136 deletions(-)

diff --git a/debian/patches/Makefile.am.patch b/debian/patches/Makefile.am.patch
index fff4fab..39f50c0 100644
--- a/debian/patches/Makefile.am.patch
+++ b/debian/patches/Makefile.am.patch
@@ -6,7 +6,7 @@ Forwarded: not-needed
 --- a/Makefile.am
 +++ b/Makefile.am
 @@ -2,9 +2,6 @@
- AUTOMAKE_OPTIONS = foreign 1.10 dist-bzip2
+ AUTOMAKE_OPTIONS = foreign 1.11 dist-bzip2 dist-xz
  
  man_MANS = doc/mpc.1
 -doc_DATA = AUTHORS COPYING NEWS README \
diff --git a/debian/patches/configure.ac.patch b/debian/patches/configure.ac.patch
deleted file mode 100644
index 1cf2d0d..0000000
--- a/debian/patches/configure.ac.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Description: don't link against libnsl unnecessarily
- dpkg-shlibdeps: warning: package could avoid a useless dependency if
- debian/mpc/usr/bin/mpc was not linked against libnsl.so.1 (it uses none
- of the library's symbols)
- .
- This was likely forgotten when the internal libmpdclient was dropped
- in favor of libmpdclient2.
-Author: Florian Schlichting <fsfs at debian.org>
-Forwarded: http://bugs.musicpd.org/view.php?id=3742
-
---- a/configure.ac
-+++ b/configure.ac
-@@ -83,7 +83,6 @@
- dnl
- 
- AC_CHECK_LIB(socket, socket, MPC_LIBS="$MPC_LIBS -lsocket",)
--AC_CHECK_LIB(nsl, gethostbyname, MPC_LIBS="$MPC_LIBS -lnsl",)
- 
- PKG_CHECK_MODULES([LIBMPDCLIENT], [libmpdclient >= 2.2],,
- 	[AC_MSG_ERROR([libmpdclient2 is required])])
diff --git a/debian/patches/hyphen-as-minus-sign.patch b/debian/patches/hyphen-as-minus-sign.patch
deleted file mode 100644
index 23334d0..0000000
--- a/debian/patches/hyphen-as-minus-sign.patch
+++ /dev/null
@@ -1,113 +0,0 @@
-Description: fix hyphen-used-as-minus-sign lintian warning
-Author: Florian Schlichting <fsfs at debian.org>
-Forwarded: http://bugs.musicpd.org/view.php?id=3741
-
---- a/doc/mpc.1
-+++ b/doc/mpc.1
-@@ -12,7 +12,7 @@
- is given, the current status is printed (same as 'mpc status').
- .SH "OPTIONS"
- .TP
--.BI -f,--format
-+.BI \-f,\-\-format
- .br
- Configure the format of song display for status and the playlist.  The metadata delimiters are:
- 
-@@ -68,27 +68,27 @@
- .br
- \\r - carriage return
- .TP
--.BI --wait
-+.BI \-\-wait
- .br
- Wait for operation to finish (e.g. database update).
- .TP
--.BI -q,--quiet,--no-status
-+.BI \-q,\-\-quiet,\-\-no\-status
- .br
- Prevents the current song status from being printed on completion of some of
- the commands.
- .TP
--.BI -v,--verbose
-+.BI \-v,\-\-verbose
- .br
- Verbose output.
- .TP
--.BI -h,--host
-+.BI \-h,\-\-host
- The host to connect to; if not given, the value of the environment variable MPD_HOST is checked before defaulting to localhost.  This default can be changed at compile-time.
- 
- To use a password, provide a value of the form "password at host".
- 
- If you specify an absolute path, mpc attempts a connection via Unix Domain Socket.
- .TP
--.BI -p,--port
-+.BI \-p,\-\-port
- The port to connect to; if not given, the value of the environment variable MPD_PORT is checked before defaulting to 6600.  This default can be changed at compile-time.
- .br
- .SH COMMANDS
-@@ -107,17 +107,17 @@
- .B crop
- Remove all songs except for the currently playing song.
- .TP
--.B current [--wait]
-+.B current [\-\-wait]
- Show the currently playing song
- 
--With --wait, mpc waits until the song changes (or until playback is
-+With \-\-wait, mpc waits until the song changes (or until playback is
- started/stopped) before it queries the current song from the server.
- .TP
- .B crossfade [<seconds>]
- Gets and sets the current amount of crossfading between songs (0 disables crossfading).
- .TP
- .B mixrampdb [<db>]
--Gets and sets the volume level at which songs with MIXRAMP tags will be overlapped. This disables the fading of the crossfade command and simply mixes the songs. -50.0 will effectively remove any gaps, 0.0 will mash tracks together. The amount of overlap is limited by the audio_buffer_size MPD configuration parameter.
-+Gets and sets the volume level at which songs with MIXRAMP tags will be overlapped. This disables the fading of the crossfade command and simply mixes the songs. \-50.0 will effectively remove any gaps, 0.0 will mash tracks together. The amount of overlap is limited by the audio_buffer_size MPD configuration parameter.
- .TP
- .B mixrampdelay [<seconds>]
- +Gets and sets the current amount of extra delay added to the value computed from the MIXRAMP tags. (A negative value disables overlapping with MIXRAMP tags and restores the previous value of crossfade).
-@@ -216,9 +216,9 @@
- Return a list of all tags of given tag <type>.  Optional search
- <type>s/<query>s limit results in a way similar to search.
- .TP
--.B seek [+-][<HH:MM:SS>] or <[+-]<0-100>%>
-+.B seek [+\-][<HH:MM:SS>] or <[+\-]<0-100>%>
- Seeks by hour, minute or seconds, hours or minutes can be omitted.
--If seeking by percentage, seeks within the current song in the specified manner.  If a "+" or "-" is used, the seek is done relative to the current song position. Absolute seeking by default.
-+If seeking by percentage, seeks within the current song in the specified manner.  If a "+" or "\-" is used, the seek is done relative to the current song position. Absolute seeking by default.
- .TP
- .B shuffle
- Shuffles all songs on the playlist.
-@@ -232,18 +232,18 @@
- .B toggle
- Toggles between play and pause. If stopped starts playing. Does not support start playing at song number (use play).
- .TP
--.B update [--wait] [<path>]
-+.B update [\-\-wait] [<path>]
- Scans for updated files in the music directory.  The optional
- parameter <path> (relative to the music directory) may limit the scope
- of the update.
- 
--With --wait, mpc waits until MPD has finished the update.
-+With \-\-wait, mpc waits until MPD has finished the update.
- .TP
- .B version
- Reports the version of MPD.
- .TP
--.B volume [+-]<num>
--Sets the volume to <num> (0-100).  If "+" or "-" is used, then it adjusts
-+.B volume [+\-]<num>
-+Sets the volume to <num> (0-100).  If "+" or "\-" is used, then it adjusts
- the volume relative to the current volume.
- .TP
- .B channels
-@@ -268,7 +268,7 @@
- .SH "EXAMPLES"
- .TP
- .br
--For useful examples of mpc use in playlist parsing, see mpd-m3u-playlist.sh and mpd-pls-playlist.sh.
-+For useful examples of mpc use in playlist parsing, see mpd\-m3u\-playlist.sh and mpd\-pls\-playlist.sh.
- .br
- .SH "BUGS"
- Report bugs on http://www.musicpd.org/mantis/
diff --git a/debian/patches/series b/debian/patches/series
index 8df4332..4b118f5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1 @@
 Makefile.am.patch
-configure.ac.patch
-hyphen-as-minus-sign.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mpd/pkg-mpc.git

