Merge pull request #117 from dobey/drop-ccby-artwork

Remove the legacy CC-BY 3.0 licensed works
maliit · Apr 4, 2022 · c0c092d · c0c092d
2 parents 06517b0 + 31bbd3d
commit c0c092d
Show file tree

Hide file tree

Showing 44 changed files with 1 addition and 935 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -393,7 +393,7 @@ endif()
 
 # Installation
 
-install(FILES COPYING COPYING.BSD COPYING.CC-BY README.md
+install(FILES COPYING COPYING.BSD README.md
         DESTINATION ${CMAKE_INSTALL_DATADIR}/doc/maliit-keyboard)
 
 install(TARGETS maliit-keyboard-plugin maliit-keyboard
@@ -405,8 +405,6 @@ install(DIRECTORY qml/keys qml/languages
 install(FILES qml/ActionsToolbar.qml qml/FloatingActions.qml qml/Keyboard.qml qml/KeyboardContainer.qml qml/WordRibbon.qml
         DESTINATION ${MALIIT_KEYBOARD_QML_DIR})
 
-install(DIRECTORY qml/images
-        DESTINATION ${MALIIT_KEYBOARD_DATA_DIR})
 install(DIRECTORY data/sounds
         DESTINATION ${MALIIT_KEYBOARD_DATA_DIR})
 install(DIRECTORY data/themes

diff --git a/COPYING.CC-BY b/COPYING.CC-BY
diff --git a/README.md b/README.md
@@ -14,5 +14,3 @@ The majority of individual files in `src` are under a BSD license as written in
 The majority of individual files in `qml` are under LGPL-3.0-only. New contributions in that directory should be licensed under LGPL-3.0-or-later or aforementioned BSD license.
 
 All new code outside the `qml` directory should be licensed as defined in `COPYING.BSD`.
-
-Artwork is licensed under Creative Commons Attribution 3.0 license. See `COPYING.CC-BY`.
diff --git a/data/sounds/keyboard_tick2_quiet.wav b/data/sounds/keyboard_tick2_quiet.wav
diff --git a/qml/images/[email protected] b/qml/images/[email protected]
diff --git a/qml/images/[email protected] b/qml/images/[email protected]
diff --git a/qml/images/[email protected] b/qml/images/[email protected]
diff --git a/qml/images/[email protected] b/qml/images/[email protected]
diff --git a/qml/images/b2.png b/qml/images/b2.png
diff --git a/qml/images/border_bottom.png b/qml/images/border_bottom.png
diff --git a/qml/images/border_top.png b/qml/images/border_top.png
diff --git a/qml/images/[email protected] b/qml/images/[email protected]
diff --git a/qml/images/[email protected] b/qml/images/[email protected]
diff --git a/qml/images/[email protected] b/qml/images/[email protected]
diff --git a/qml/images/[email protected] b/qml/images/[email protected]
diff --git a/qml/images/[email protected] b/qml/images/[email protected]
diff --git a/qml/images/[email protected] b/qml/images/[email protected]
diff --git a/qml/images/[email protected] b/qml/images/[email protected]
diff --git a/qml/images/[email protected] b/qml/images/[email protected]
diff --git a/qml/images/[email protected] b/qml/images/[email protected]
diff --git a/qml/images/[email protected] b/qml/images/[email protected]
diff --git a/qml/images/[email protected] b/qml/images/[email protected]
diff --git a/qml/images/[email protected] b/qml/images/[email protected]
diff --git a/qml/images/[email protected] b/qml/images/[email protected]
diff --git a/qml/images/[email protected] b/qml/images/[email protected]
diff --git a/qml/images/keyboard-caps-disabled.svg b/qml/images/keyboard-caps-disabled.svg
Original file line number	Diff line number	Diff line change
Expand Up		@@ -14,5 +14,3 @@ The majority of individual files in `src` are under a BSD license as written in
		The majority of individual files in `qml` are under LGPL-3.0-only. New contributions in that directory should be licensed under LGPL-3.0-or-later or aforementioned BSD license.

		All new code outside the `qml` directory should be licensed as defined in `COPYING.BSD`.

		Artwork is licensed under Creative Commons Attribution 3.0 license. See `COPYING.CC-BY`.