Skip to content

Commit

Permalink
Merge pull request #94 from jcorporation/devel
Browse files Browse the repository at this point in the history
Merge devel into master for 5.1.0 release
  • Loading branch information
jcorporation authored Feb 22, 2019
2 parents 9b8d75a + ebae3ba commit aee0700
Show file tree
Hide file tree
Showing 22 changed files with 347 additions and 67 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.6)
project (mympd C)
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${PROJECT_SOURCE_DIR}/cmake/")
set(CPACK_PACKAGE_VERSION_MAJOR "5")
set(CPACK_PACKAGE_VERSION_MINOR "0")
set(CPACK_PACKAGE_VERSION_MINOR "1")
set(CPACK_PACKAGE_VERSION_PATCH "0")

if(CMAKE_BUILD_TYPE MATCHES RELEASE)
Expand Down
2 changes: 1 addition & 1 deletion PKGBUILD
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

pkgname=mympd
_pkgname=myMPD
pkgver=5.0.0
pkgver=5.1.0
pkgrel=1
pkgdesc="myMPD is a standalone and mobile friendly web mpdclient."
arch=('x86_64' 'armv7h' 'aarch64')
Expand Down
2 changes: 1 addition & 1 deletion contrib/myMPD.spec
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# (c) 2018 Juergen Mang <mail@jcgames.de>

Name: myMPD
Version: 5.0.0
Version: 5.1.0
Release: 0
License: GPL-2.0
Group: Productivity/Multimedia/Sound/Players
Expand Down
2 changes: 1 addition & 1 deletion contrib/mympd.service
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Requires=network.target local-fs.target mpd.service
After=mpd.service

[Service]
ExecStart=/usr/bin/mympd /etc/mympd/mympd.conf
ExecStart=/usr/bin/mympd
Type=simple

[Install]
Expand Down
5 changes: 3 additions & 2 deletions debian/changelog
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
mympd (5.0.0-1) stable; urgency=medium
mympd (5.1.0-1) stable; urgency=medium

* Release from master

-- Juergen Mang <mail@jcgames.de> Fri, 04 Jan 2019 09:01:07 +0000
-- Juergen Mang <mail@jcgames.de> Thu, 14 Feb 2019 21:02:11 +0000
8 changes: 4 additions & 4 deletions dist/htdocs/css/bootstrap.min.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/htdocs/css/mympd.min.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dist/htdocs/index.html

Large diffs are not rendered by default.

Loading

0 comments on commit aee0700

Please sign in to comment.