summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorRoland Reichwein <mail@reichwein.it>2022-12-03 18:21:40 +0100
committerRoland Reichwein <mail@reichwein.it>2022-12-03 18:21:40 +0100
commit9dcb9d553941244da99ad6ceba281f430adb04c6 (patch)
tree5bc6ffdaf78e5de6de54db343ed992b58144d3b1
parent70131428edce8d7c6476a902d015b30b78e5f862 (diff)
whiteboard 1.2: Fixed build on Debian 11v1.2
-rwxr-xr-xMakefile2
-rw-r--r--debian/changelog7
-rw-r--r--qrcode.cpp3
3 files changed, 10 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index e0507bf..5a1b1d2 100755
--- a/Makefile
+++ b/Makefile
@@ -74,7 +74,7 @@ install:
mkdir -p $(DESTDIR)/usr/lib/whiteboard/html
cp -r html/* $(DESTDIR)/usr/lib/whiteboard/html/
- uglifyjs html/whiteboard.js -m -c > $(DESTDIR)/usr/lib/whiteboard/html/whiteboard.js
+ uglifyjs html/whiteboard.js -m -c > $(DESTDIR)/usr/lib/whiteboard/html/whiteboard.js || cp html/whiteboard.js $(DESTDIR)/usr/lib/whiteboard/html/whiteboard.js
htmlmin html/index.html $(DESTDIR)/usr/lib/whiteboard/html/index.html
cleancss -o $(DESTDIR)/usr/lib/whiteboard/html/whiteboard.css html/whiteboard.css
diff --git a/debian/changelog b/debian/changelog
index 1ea5c87..2788840 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+whiteboard (1.2) unstable; urgency=medium
+
+ * Fix build on Debian 11
+ * UglifyJS on best-effort base
+
+ -- Roland Reichwein <mail@reichwein.it> Sat, 03 Dec 2022 17:03:11 +0100
+
whiteboard (1.1) unstable; urgency=medium
* Compress Javascript
diff --git a/qrcode.cpp b/qrcode.cpp
index cd5fab8..5e45afc 100644
--- a/qrcode.cpp
+++ b/qrcode.cpp
@@ -2,7 +2,8 @@
#include <fmt/format.h>
-#include <qrcodegen/qrcodegen.hpp>
+#include <qrcodegen/QrCode.hpp>
+
#include <ImageMagick-6/Magick++.h>
using namespace qrcodegen;