summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2024-04-17 05:50:20 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-04-17 05:50:20 +0000
commitf3c1942da3399243494f61223acce8622c6e73cd (patch)
tree1033ca9560c2db9e431b5e2df6fe6bfbceda8b9b
parentMerging upstream version 1.57.0+dfsg. (diff)
downloadublock-origin-f3c1942da3399243494f61223acce8622c6e73cd.tar.xz
ublock-origin-f3c1942da3399243494f61223acce8622c6e73cd.zip
Merging debian version 1.57.0+dfsg-1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
-rw-r--r--debian/changelog6
-rw-r--r--debian/copyright10
2 files changed, 16 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index 817a7d8..961b62c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+ublock-origin (1.57.0+dfsg-1) unstable; urgency=medium
+
+ * New upstream version 1.57.0+dfsg.
+
+ -- Markus Koschany <apo@debian.org> Sat, 06 Apr 2024 16:19:34 +0200
+
ublock-origin (1.55.0+dfsg-1~progress7.99u1) graograman-backports; urgency=medium
* Initial reupload to graograman-backports.
diff --git a/debian/copyright b/debian/copyright
index d83c757..921b8be 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -111,6 +111,16 @@ License: copyleft
.
Copy Left
+Files: src/img/flags-of-the-world/*
+Copyright: no-copyright
+License: public-domain
+ Flag images are in the public domain (exempt from copyright).
+ They are completely free for non-commercial and even commercial use.
+ You can also download all flags."
+
+Files: src/img/fontawesome/*
+Copyright: Dave Gandy
+License: SIL-OFL-1.1
Files: debian/*
Copyright: 2015 Matthew Bekkema <mbekkema97@gmail.com>