diff --git a/debian/changelog b/debian/changelog index 915e438..341aeb6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,5 @@ -moonlight (1.2.1-1) UNRELEASED; urgency=low +moonlight-qt (1.2.1-1) UNRELEASED; urgency=low * Initial release. - -- Cameron Gutman Mon, 03 Feb 2020 15:08:49 -0800 + -- Cameron Gutman Thu, 12 Mar 2020 22:23:56 -0700 \ No newline at end of file diff --git a/debian/control b/debian/control index 22e748d..a531fea 100644 --- a/debian/control +++ b/debian/control @@ -1,11 +1,11 @@ -Source: moonlight +Source: moonlight-qt Maintainer: Cameron Gutman Section: misc Priority: optional Standards-Version: 4.3.0 Build-Depends: debhelper (>= 10), libssl-dev, qtbase5-dev, qtquickcontrols2-5-dev, qtdeclarative5-dev, libqt5svg5-dev, libxkbcommon-dev, libopus-dev, libgbm-dev, libdrm-dev, libfreetype6-dev, libasound2-dev, libdbus-1-dev, libegl1-mesa-dev, libgl1-mesa-dev, libgles2-mesa-dev, libglu1-mesa-dev, libibus-1.0-dev, libpulse-dev, libudev-dev, libx11-dev, libxcursor-dev, libxext-dev, libxi-dev, libxinerama-dev, libxrandr-dev, libxss-dev, libxt-dev, libxv-dev, libxxf86vm-dev, libwayland-dev [amd64], wayland-protocols [amd64], libva-dev [amd64], libvdpau-dev [amd64], libraspberrypi-dev [armhf] | rbp-userland-dev-osmc [armhf], libnvmpi1.0.0 [arm64] -Package: moonlight +Package: moonlight-qt Architecture: any Depends: libraspberrypi0 [armhf] | rbp-userland-osmc [armhf], qml-module-qtquick2, qml-module-qtquick-controls2, qml-module-qtquick-layouts, qml-module-qtquick-window2, ${shlibs:Depends}, ${misc:Depends} Description: NVIDIA GameStream client diff --git a/debian/rules b/debian/rules index 0d34532..b061060 100755 --- a/debian/rules +++ b/debian/rules @@ -2,3 +2,10 @@ export QT_SELECT := qt5 %: dh $@ + +override_dh_install: + dh_install + + # Rename moonlight to moonlight-qt to avoid conflicting with moonlight-embedded + mv debian/moonlight-qt/usr/bin/moonlight debian/moonlight-qt/usr/bin/moonlight-qt + sed -i 's/Exec=moonlight/Exec=moonlight-qt/g' debian/moonlight-qt/usr/share/applications/com.moonlight_stream.Moonlight.desktop diff --git a/scripts/build-package.sh b/scripts/build-package.sh index d6d6a8b..3f88557 100755 --- a/scripts/build-package.sh +++ b/scripts/build-package.sh @@ -21,13 +21,13 @@ git -c user.name="Docker Build" -c user.email="docker@build" commit -m "Remove p scripts/generate-src.sh # Move the tarball into the build directory -mv build/source/MoonlightSrc-$VERSION.tar.gz /opt/build/moonlight_$VERSION.orig.tar.gz +mv build/source/MoonlightSrc-$VERSION.tar.gz /opt/build/moonlight-qt_$VERSION.orig.tar.gz # Extract the tarball into the appropriate directory cd /opt/build -mkdir moonlight-$VERSION -cd moonlight-$VERSION -tar xvf ../moonlight_$VERSION.orig.tar.gz +mkdir moonlight-qt-$VERSION +cd moonlight-qt-$VERSION +tar xvf ../moonlight-qt_$VERSION.orig.tar.gz # Copy the debian directory into the build directory cp -r /opt/debian . @@ -38,7 +38,7 @@ debuild -us -uc # Copy the output to the out directory cd /opt/build shopt -s extglob -cp -v -r !(moonlight-$VERSION) /out +cp -v -r !(moonlight-qt-$VERSION) /out # Done! echo "Build successful!" \ No newline at end of file