Merge pull request #114 from jcorporation/devel

Merge devel into master for 5.3.1 release

CMakeLists.txt

@@ -6,7 +6,7 @@ project (mympd)
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${PROJECT_SOURCE_DIR}/cmake/")
 set(CPACK_PACKAGE_VERSION_MAJOR "5")
 set(CPACK_PACKAGE_VERSION_MINOR "3")
-set(CPACK_PACKAGE_VERSION_PATCH "0")
+set(CPACK_PACKAGE_VERSION_PATCH "1")
 
 if("${CMAKE_INSTALL_PREFIX}" MATCHES "/usr")
   set(SUBDIR "/${PROJECT_NAME}")
@@ -15,11 +15,7 @@ else()
 endif()
 
 if(CMAKE_BUILD_TYPE MATCHES RELEASE)
-    if("${CMAKE_INSTALL_PREFIX}" STREQUAL "../debian/tmp")
-        set(ASSETS_PATH "/usr/share/${PROJECT_NAME}/htdocs")
-    else()
-        set(ASSETS_PATH "${CMAKE_INSTALL_PREFIX}/share${SUBDIR}/htdocs")
-    endif()
+    set(ASSETS_PATH "${CMAKE_INSTALL_PREFIX}/share${SUBDIR}/htdocs")
     set(DEBUG "OFF")
 else()
     set(ASSETS_PATH "${PROJECT_SOURCE_DIR}/htdocs")

Dockerfile

@@ -16,9 +16,9 @@ RUN ninja -C output install
 WORKDIR /
 RUN tar -czvf /libmpdclient-master.tar.gz -C /libmpdclient-dist .
 COPY . /myMPD/
-ENV MYMPD_INSTALL_PREFIX=/myMPD-dist/usr
+ENV DESTDIR=/myMPD-dist
 ENV DOCKER=true
-RUN mkdir -p $MYMPD_INSTALL_PREFIX
+RUN mkdir -p $DESTDIR
 WORKDIR /myMPD
 RUN ./mkrelease.sh
 WORKDIR /

PKGBUILD

@@ -4,7 +4,7 @@
 
 pkgname=mympd
 _pkgname=myMPD
-pkgver=5.3.0
+pkgver=5.3.1
 pkgrel=1
 pkgdesc="myMPD is a standalone and mobile friendly web mpdclient."
 arch=('x86_64' 'armv7h' 'aarch64')

contrib/myMPD.spec

@@ -4,7 +4,7 @@
 # (c) 2018-2019 Juergen Mang <[email protected]>
 
 Name:           myMPD
-Version:        5.3.0
+Version:        5.3.1
 Release:        0 
 License:        GPL-2.0 
 Group:          Productivity/Multimedia/Sound/Players

debian/changelog

@@ -1,5 +1,5 @@
-mympd (5.3.0-1) stable; urgency=medium
+mympd (5.3.1-1) stable; urgency=medium
 
   * Release from master
 
- -- Juergen Mang <[email protected]>  Thu, 25 Apr 2019 21:04:48 +0200
+ -- Juergen Mang <[email protected]>  Fri, 26 Apr 2019 21:04:28 +0200

debian/rules

@@ -5,22 +5,16 @@ BUILDDIR = release
 
 build:
 	mkdir $(BUILDDIR)
-	cd $(BUILDDIR); cmake -DCMAKE_INSTALL_PREFIX:PATH=../debian/tmp -DCMAKE_BUILD_TYPE=RELEASE ..
+	cd $(BUILDDIR); cmake -DCMAKE_INSTALL_PREFIX:PATH=/usr -DCMAKE_BUILD_TYPE=RELEASE ..
 	make -C $(BUILDDIR)
 
 binary: binary-indep binary-arch
 
 binary-indep:
 
 binary-arch:
-	cd $(BUILDDIR); cmake -P cmake_install.cmake
+	cd $(BUILDDIR); make install DESTDIR=../debian/tmp
 	mkdir -p debian/tmp/DEBIAN
-	mv debian/debian/tmp/var debian/tmp/var
-	mkdir -p debian/tmp/usr/
-	mv debian/debian/tmp/bin debian/tmp/usr
-	mv debian/debian/tmp/share debian/tmp/usr/
-	mv debian/debian/tmp/etc debian/tmp/
-	rm -rf debian/debian
 	cp debian/postinst debian/tmp/DEBIAN
 	cp debian/postrm debian/tmp/DEBIAN
 	dpkg-gencontrol -pmympd