On Wed, Mar 21, 2012 at 6:57 AM, Gaetan Bisson <[email protected]> wrote: > Date: Wednesday, March 21, 2012 @ 07:57:52 > Author: bisson > Revision: 154007 > > implement FS#27731 and simplify many aspects of the package > > Added: > mpd/trunk/install > (from rev 153512, mpd/trunk/mpd.install) > mpd/trunk/rc.d > (from rev 153645, mpd/trunk/mpd) Just curious- is there any reason to introduce naming changes like this other than personal preference? It is one thing if it is a new package, but this obviously doesn't fall in that category, and it really fuggers anyone's ABS or SVN checkout that has customizations when trying to merge the differences. (PS, the same applies for your huge whitespace changes in the PKGBUILD.)
Don't get me wrong, I appreciate the changes and cleanups, but you threw a lot of other stuff in that didn't seem to fall into that bucket. > Modified: > mpd/trunk/PKGBUILD > Deleted: > mpd/trunk/ChangeLog > mpd/trunk/mpd > mpd/trunk/mpd.install > > -------------+ > ChangeLog | 15 ----------- > PKGBUILD | 79 ++++++++++++++++++++++++++++++---------------------------- > install | 10 +++++++ > mpd | 36 -------------------------- > mpd.install | 18 ------------- > rc.d | 27 +++++++++++++++++++ > 6 files changed, 78 insertions(+), 107 deletions(-) > > Modified: PKGBUILD > =================================================================== > --- PKGBUILD 2012-03-21 10:59:47 UTC (rev 154006) > +++ PKGBUILD 2012-03-21 11:57:52 UTC (rev 154007) > @@ -1,61 +1,64 @@ > # $Id$ > -# Maintainer: Angel Velasquez <[email protected]> > +# Maintainer: Gaetan Bisson <[email protected]> > +# Contributor: Angel Velasquez <[email protected]> > # Contributor: Andrea Scarpino <[email protected]> > # Contributor: Damir Perisa <[email protected]> > # Contributor: Ben <[email protected]> > > pkgname=mpd > pkgver=0.16.7 > -pkgrel=1 > -pkgdesc="Music daemon that plays MP3, FLAC, and Ogg Vorbis files" > +pkgrel=2 > +pkgdesc='Flexible, powerful, server-side application for playing music' > +url='http://mpd.wikia.com/wiki/Music_Player_Daemon_Wiki' > +license=('GPL') > arch=('i686' 'x86_64') > -license=('GPL') > -url="http://mpd.wikia.com/wiki/Server"; > depends=('libao' 'ffmpeg' 'libmodplug' 'audiofile' 'libshout' 'libmad' > 'curl' 'faad2' > 'sqlite3' 'jack' 'libmms' 'wavpack' 'libmpcdec' 'avahi' 'libid3tag' > 'libpulse') > -makedepends=('pkgconfig' 'doxygen') > -install=${pkgname}.install > -changelog=ChangeLog > -source=("http://downloads.sourceforge.net/musicpd/$pkgname-$pkgver.tar.bz2"; > -'mpd') > -md5sums=('3d0e7c36646e80386b32966bd4268e8d' > - 'e5669c2bff4031928531e52475addeb1') > +makedepends=('doxygen') > +source=("http://downloads.sourceforge.net/musicpd/${pkgname}-${pkgver}.tar.bz2"; > + 'rc.d') > +sha1sums=('878f3ce82d4f00f6cbad63a625b2c0274c4a704a' > + '3777bdb4fff4b7911be3b1242aabae9d2912ef18') > > +install=install > + > build() { > - cd "$srcdir/$pkgname-$pkgver" > + cd "${srcdir}/${pkgname}-${pkgver}" > > - ./configure --prefix=/usr \ > - --sysconfdir=/etc \ > - --enable-lastfm \ > - --enable-jack \ > - --enable-pulse \ > - --enable-documentation \ > - --disable-libwrap \ > - --disable-cue \ > - --disable-sidplay \ > - --with-systemdsystemunitdir=/lib/systemd/system > + ./configure \ > + --prefix=/usr \ > + --sysconfdir=/etc \ > + --enable-lastfm \ > + --enable-jack \ > + --enable-pulse \ > + --enable-documentation \ > + --disable-libwrap \ > + --disable-cue \ > + --disable-sidplay \ > + --with-systemdsystemunitdir=/lib/systemd/system > > - make > + make > } > > package() { > - cd "$srcdir/$pkgname-$pkgver" > + cd "${srcdir}/${pkgname}-${pkgver}" > > - make DESTDIR="$pkgdir" install > + make DESTDIR="${pkgdir}" install > > - # set our dirs in mpd.conf file > - sed -i 's|^music_directory.*$|#music_directory > "path_to_your_music_collection"|1' doc/mpdconf.example > - sed -i 's|playlist_directory.*$|playlist_directory > "/var/lib/mpd/playlists"|1' doc/mpdconf.example > - sed -i 's|db_file.*$|db_file "/var/lib/mpd/mpd.db"|1' doc/mpdconf.example > - sed -i 's|log_file.*$|log_file "/var/log/mpd/mpd.log"|1' > doc/mpdconf.example > - sed -i 's|error_file.*$|error_file "/var/log/mpd/mpd.error"|1' > doc/mpdconf.example > - sed -i 's|#pid_file.*$|pid_file "/var/run/mpd/mpd.pid"|1' > doc/mpdconf.example > - sed -i 's|#state_file.*$|state_file "/var/lib/mpd/mpdstate"|1' > doc/mpdconf.example > - sed -i 's|#user.*$|user "mpd"|1' doc/mpdconf.example > + sed \ > + -e '/^#playlist_directory/c playlist_directory > "/var/lib/mpd/playlists"' \ > + -e '/^#db_file/c db_file "/var/lib/mpd/mpd.db"' \ > + -e '/^#pid_file/c pid_file "/run/mpd/mpd.pid"' \ > + -e '/^#state_file/c state_file "/var/lib/mpd/mpdstate"' \ > + -e '/^#user/c user "mpd"' \ > + -i doc/mpdconf.example > > - install -Dm644 "doc/mpdconf.example" > "$pkgdir/usr/share/mpd/mpd.conf.example" > + install -Dm755 ../rc.d "${pkgdir}"/etc/rc.d/mpd > + install -d -g 45 -o 45 "${pkgdir}"/var/lib/mpd/playlists > + install -Dm644 doc/mpdconf.example > "${pkgdir}"/usr/share/mpd/mpd.conf.example > > - install -Dm755 "$srcdir/mpd" "$pkgdir/etc/rc.d/mpd" > - install -d "$pkgdir"/var/{lib/mpd/playlists,log/mpd} > + cd "${pkgdir}"/usr/share/doc/mpd > + tar cfJ api.tar.xz --remove-files api > + rmdir developer protocol user I don't agree with this. Either ship the documentation unzipped, or don't ship it. It is rather useless to people otherwise, IMO. --disable-documentation works quite well as a configure option. > } >
