Merge lp://staging/~jeremywootten/pantheon-files/fix-1653412-license-faults into lp://staging/~elementary-apps/pantheon-files/trunk
Proposed by
Jeremy Wootten
| Status: | Merged |
|---|---|
| Approved by: | Cody Garver |
| Approved revision: | 2485 |
| Merged at revision: | 2488 |
| Proposed branch: | lp://staging/~jeremywootten/pantheon-files/fix-1653412-license-faults |
| Merge into: | lp://staging/~elementary-apps/pantheon-files/trunk |
| Diff against target: |
2195 lines (+392/-247) 110 files modified
AUTHORS (+2/-0) HACKING (+2/-0) INSTALL (+2/-0) README (+2/-0) cmake/README (+2/-0) filechooser-module/FileChooserDialog.vala (+2/-2) filechooser-module/Plugin.vala (+2/-2) libcore/AbstractSidebar.vala (+1/-1) libcore/AbstractSlot.vala (+1/-1) libcore/Bookmark.vala (+1/-1) libcore/BookmarkList.vala (+1/-1) libcore/DndHandler.vala (+1/-1) libcore/Enums.vala (+2/-2) libcore/FileUtils.vala (+1/-1) libcore/Plugin.vala (+18/-0) libcore/PluginManager.vala (+1/-1) libcore/SoundManager.vala (+2/-2) libcore/eel-accessibility.c (+3/-3) libcore/eel-accessibility.h (+3/-3) libcore/eel-debug.c (+3/-3) libcore/eel-debug.h (+3/-3) libcore/eel-fcts.c (+3/-3) libcore/eel-fcts.h (+3/-3) libcore/eel-gdk-pixbuf-extensions.c (+3/-3) libcore/eel-gdk-pixbuf-extensions.h (+3/-3) libcore/eel-gio-extensions.c (+1/-1) libcore/eel-gio-extensions.h (+1/-1) libcore/eel-glib-extensions.c (+3/-3) libcore/eel-glib-extensions.h (+1/-1) libcore/eel-gtk-extensions.c (+3/-3) libcore/eel-gtk-extensions.h (+3/-3) libcore/eel-i18n.c (+3/-3) libcore/eel-i18n.h (+3/-3) libcore/eel-pango-extensions.c (+2/-2) libcore/eel-pango-extensions.h (+2/-2) libcore/eel-stock-dialogs.c (+3/-3) libcore/eel-stock-dialogs.h (+3/-3) libcore/eel-string.c (+3/-3) libcore/eel-string.h (+3/-3) libcore/eel-ui.c (+3/-3) libcore/eel-ui.h (+3/-3) libcore/eel-vfs-extensions.c (+3/-3) libcore/eel-vfs-extensions.h (+3/-3) libcore/fm-list-model.c (+3/-3) libcore/fm-list-model.h (+3/-3) libcore/gof-callwhenready.vala (+1/-1) libcore/gof-directory-async.vala (+1/-1) libcore/gof-file.c (+1/-1) libcore/gof-file.h (+4/-3) libcore/gof-preferences.vala (+1/-1) libcore/marlin-exec.c (+1/-1) libcore/marlin-exec.h (+1/-1) libcore/marlin-file-changes-queue.c (+3/-3) libcore/marlin-file-changes-queue.h (+3/-3) libcore/marlin-file-conflict-dialog.c (+3/-3) libcore/marlin-file-conflict-dialog.h (+3/-3) libcore/marlin-file-operations.c (+4/-4) libcore/marlin-file-operations.h (+4/-4) libcore/marlin-file-utilities.c (+3/-3) libcore/marlin-file-utilities.h (+3/-3) libcore/marlin-icon-info.c (+3/-3) libcore/marlin-icon-info.h (+3/-3) libcore/marlin-icons.h (+18/-0) libcore/marlin-intl.h (+18/-0) libcore/marlin-progress-info-manager.c (+3/-3) libcore/marlin-progress-info-manager.h (+3/-3) libcore/marlin-progress-info.c (+3/-3) libcore/marlin-progress-info.h (+3/-3) libcore/marlin-trash-monitor.c (+3/-3) libcore/marlin-trash-monitor.h (+3/-3) libcore/marlin-undostack-manager.c (+3/-3) libcore/marlin-undostack-manager.h (+3/-3) libcore/tests/GOFDirectoryAsyncTests/marlincore-tests-file.c (+3/-3) libcore/tests/GOFDirectoryAsyncTests/marlincore-tests-file.h (+3/-3) libcore/tests/GOFDirectoryAsyncTests/tests.c (+3/-3) libcore/tests/GOFFileTests/marlincore-tests-gof.c (+3/-3) libcore/tests/GOFFileTests/marlincore-tests-gof.h (+3/-3) libcore/tests/GOFFileTests/tests.c (+3/-3) libcore/tests/MarlinIconInfoTests/marlincore-tests-icon-info.c (+4/-4) libcore/tests/MarlinIconInfoTests/marlincore-tests-icon-info.h (+3/-3) libcore/tests/MarlinIconInfoTests/tests.c (+3/-3) libcore/tests/UtilTests/UtilTests.vala (+3/-3) libwidgets/Animations/Animations.vala (+2/-2) libwidgets/Chrome/BasicBreadcrumbsEntry.vala (+2/-2) libwidgets/Chrome/BasicLocationBar.vala (+2/-2) libwidgets/Chrome/BreadcrumbElement.vala (+3/-3) libwidgets/Chrome/BreadcrumbIconList.vala (+17/-0) libwidgets/Welcome.vala (+2/-2) pantheon-files-daemon/client.vala (+16/-0) pantheon-files-daemon/miner.vala (+16/-0) plugins/network-places/plugin.vala (+13/-13) src/ClipboardManager.vala (+2/-2) src/DesktopLauncher.vala (+15/-0) src/Dialogs/AbstractPropertiesDialog.vala (+3/-3) src/Dialogs/ChooseAppDialog.vala (+2/-2) src/Dialogs/PropertiesWindow.vala (+2/-2) src/Dialogs/VolumePropertiesWindow.vala (+2/-2) src/IconRenderer.vala (+2/-2) src/Thumbnailer.vala (+2/-2) src/Utils/Permissions.vala (+2/-2) src/View/DirectoryNotFound.vala (+2/-2) src/View/ViewContainer.vala (+2/-2) src/View/Widgets/BreadcrumbsEntry.vala (+2/-2) src/View/Widgets/DiskRenderer.vala (+2/-2) src/View/Widgets/Label.vala (+2/-2) src/View/Widgets/LocationBar.vala (+2/-2) src/View/Widgets/PermissionButton.vala (+3/-3) src/marlin-connect-server-dialog.c (+2/-2) src/marlin-connect-server-dialog.h (+2/-2) src/marlin-global-preferences.h (+16/-0) |
| To merge this branch: | bzr merge lp://staging/~jeremywootten/pantheon-files/fix-1653412-license-faults |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| elementary Apps team | Pending | ||
|
Review via email:
|
|||
Commit message
Fix licensecheck warnings
Description of the change
This branch fixes a number of license and copyright issues as identified by licensecheck.
* The address of the FSF is corrected where necessary.
* When absent, a copyright notice is inserted (defaulting to Copyright (c) 2015-2017 elementary LLC (http://
* The word "generated" is replaced by "loaded" in a comment in gof-file.h to stop it being wrongly identified as a generated file.
* Where necessary a license notice (GPLv3) was inserted except for text files such as HACKING, INSTALL and README, as it was uncertain whether this is required.
licensecheck -r . | awk -F ": " '{ print $2 }' | sort | uniq -c | sort -gr
52 GPL (v2 or later)
33 LGPL (v3)
29 LGPL (v2 or later)
19 GPL (v3 or later)
6 UNKNOWN
5 LGPL (v3.0)
2 LGPL (v3 or later)
2 GPL (v3)
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
