summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitignore1
-rw-r--r--Makefile3
-rw-r--r--control11
-rwxr-xr-xcontrol.sh2
4 files changed, 4 insertions, 13 deletions
diff --git a/.gitignore b/.gitignore
index 8ac11b6..e174762 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@ out.bmp
*.swp
*~
.vscode
+camlet.deb
diff --git a/Makefile b/Makefile
index 96d67ae..5560fbd 100644
--- a/Makefile
+++ b/Makefile
@@ -17,7 +17,7 @@ release/setup2:
rm -rf release
meson setup --buildtype=release release
touch release/setup2
-camlet.deb: release control
+camlet.deb: release control.sh
rm -rf tmp
mkdir -p tmp/camlet/usr/bin tmp/camlet/DEBIAN tmp/camlet/usr/share/applications tmp/camlet/usr/share/icons/hicolor/48x48/apps
cp release/camlet tmp/camlet/usr/bin/
@@ -25,6 +25,7 @@ camlet.deb: release control
cp camlet.png tmp/camlet/usr/share/icons/hicolor/48x48/apps
sh control.sh > tmp/camlet/DEBIAN/control
dpkg-deb --build tmp/camlet
+ mv tmp/camlet.deb .
rm -rf tmp
install: release
@[ -w $(INSTALL_PREFIX) ] || { echo "You need permission to write to $(INSTALL_PREFIX). Try running with sudo/as root." && exit 1; }
diff --git a/control b/control
deleted file mode 100644
index 4133802..0000000
--- a/control
+++ /dev/null
@@ -1,11 +0,0 @@
-Package: camlet
-Version: 0.0.0
-Section: video
-Priority: optional
-Architecture: amd64
-Essential: no
-Maintainer: pommicket <pommicket@gmail.com>
-Description: Take pictures and videos with a webcam
-Installed-Size: 156024
-Depends: libsdl2-2.0-0, libv4l-0, libudev1, libsodium23, libfontconfig1, libsdl2-ttf-2.0-0, libjpeg62-turbo, libavcodec59, libavformat59
-Homepage: https://github.com/pommicket/camlet
diff --git a/control.sh b/control.sh
index c2c924c..11ac0b7 100755
--- a/control.sh
+++ b/control.sh
@@ -11,7 +11,7 @@ Architecture: amd64
Essential: no
Maintainer: pommicket <pommicket@gmail.com>
Description: Take pictures and videos with a webcam
-Depends: libsdl2-2.0-0, libv4l-0, libudev1, libsodium23, libfontconfig1, libsdl2-ttf-2.0-0, libjpeg62-turbo, libavcodec59, libavformat59
+Depends: libsdl2-2.0-0, libv4l-0, libudev1, libsodium23, libfontconfig1, libsdl2-ttf-2.0-0, libjpeg62-turbo, libavcodec59 | libavcodec61, libavformat59 | libavformat61
Homepage: https://github.com/pommicket/camlet
EOF
echo 'Installed-Size: '$(wc -c release/camlet camlet.png camlet.desktop | tail -n1 | cut -d' ' -f1 || exit 1)