Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
Ben Morgan committed Mar 20, 2011
2 parents 96cd24f + 04c048b commit 8603b79
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 7 deletions.
9 changes: 6 additions & 3 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
/roadmap export-ignore
.gitignore export-ignore
.gitattributes export-ignore
doc/dev export-ignore
PKGBUILD export-ignore
moped.install export-ignore
TODO export-ignore
.gitignore export-ignore
.gitattributes export-ignore
4 changes: 2 additions & 2 deletions PKGBUILD
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
# Contributor: Ben Morgan <[email protected]>
pkgname=moped
pkgver=2.16
pkgrel=3
pkgrel=7
pkgdesc="An advanced tool to flexibly manipulate MPD playlists"
arch=('any')
url="https://github.com/cassava/Moped"
license=('GPL')
depends=("python>=3.1.2" zenity mpd)
install=moped.install
source=(https://github.com/downloads/cassava/Moped/$pkgname-$pkgver.tar.gz)
md5sums=('8d8eb88d3824e894ab8211c098bd069a')

package() {
cd $srcdir/$pkgname-$pkgver
Expand All @@ -17,4 +18,3 @@ package() {
chmod +x install.sh
./install.sh $pkgdir
}
md5sums=('d42c37424a7aa273121f6935a26f98dc')
2 changes: 1 addition & 1 deletion install.sh.example
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ install -m755 moped.py $DATADIR/

cd $STARTDIR
install -d $DOCDIR
install -m644 BUGS CHANGES README TODO $DOCDIR/
install -m644 BUGS CHANGES README $DOCDIR/

cd $STARTDIR/doc
install -d $DOCDIR/examples
Expand Down
2 changes: 1 addition & 1 deletion src/moped.py
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ def _parse_options(self):
optparser = optparse.OptionParser()

optparser.usage = \
"""\b\b\b\b\b\b\bMoped version %s (%s)""" % version
"""\b\b\b\b\b\b\bMoped version %s""" % version
"""\n"""
"""MPD Moped -- Driving your MPD playlists where they need to go!\n"""
"""Moped is an advanced playlist manipulator for the Music Player Daemon,\n"""
Expand Down

0 comments on commit 8603b79

Please sign in to comment.