Merge lp://staging/~elementary-apps/pantheon-photos/fix-license-header into lp://staging/~pantheon-photos/pantheon-photos/trunk
Proposed by
Danielle Foré
Status: | Merged | ||||
---|---|---|---|---|---|
Approved by: | Danielle Foré | ||||
Approved revision: | 3109 | ||||
Merged at revision: | 3110 | ||||
Proposed branch: | lp://staging/~elementary-apps/pantheon-photos/fix-license-header | ||||
Merge into: | lp://staging/~pantheon-photos/pantheon-photos/trunk | ||||
Diff against target: |
6407 lines (+3631/-1112) 204 files modified
COPYING (+0/-14) plugins/pantheon-photos-publishing-extras/RESTSupport.vala (+18/-5) plugins/pantheon-photos-publishing-extras/Resources.vala (+18/-5) plugins/pantheon-photos-publishing-extras/TumblrPublishing.vala (+20/-7) plugins/pantheon-photos-publishing-extras/YandexPublishing.vala (+18/-5) plugins/pantheon-photos-publishing-extras/shotwell-publishing-extras.vala (+18/-5) plugins/pantheon-photos-publishing/FacebookPublishing.vala (+18/-5) plugins/pantheon-photos-publishing/FlickrPublishing.vala (+18/-5) plugins/pantheon-photos-publishing/PicasaPublishing.vala (+18/-5) plugins/pantheon-photos-publishing/PiwigoPublishing.vala (+18/-5) plugins/pantheon-photos-publishing/RESTSupport.vala (+18/-5) plugins/pantheon-photos-publishing/Resources.vala (+18/-5) plugins/pantheon-photos-publishing/YouTubePublishing.vala (+18/-5) plugins/pantheon-photos-publishing/shotwell-publishing.vala (+18/-5) plugins/pantheon-photos-transitions/BlindsEffect.vala (+19/-6) plugins/pantheon-photos-transitions/ChessEffect.vala (+19/-6) plugins/pantheon-photos-transitions/CircleEffect.vala (+19/-6) plugins/pantheon-photos-transitions/CirclesEffect.vala (+19/-6) plugins/pantheon-photos-transitions/ClockEffect.vala (+19/-6) plugins/pantheon-photos-transitions/CrumbleEffect.vala (+19/-6) plugins/pantheon-photos-transitions/FadeEffect.vala (+19/-6) plugins/pantheon-photos-transitions/Resources.vala (+18/-5) plugins/pantheon-photos-transitions/SlideEffect.vala (+19/-6) plugins/pantheon-photos-transitions/SquaresEffect.vala (+19/-6) plugins/pantheon-photos-transitions/StripesEffect.vala (+19/-6) plugins/pantheon-photos-transitions/shotwell-transitions.vala (+18/-5) samples/simple-plugin/simple-plugin.vala (+18/-5) src/AppDirs.vala (+18/-5) src/AppWindow.vala (+18/-5) src/Application.vala (+18/-5) src/BatchImport.vala (+18/-5) src/Box.vala (+18/-5) src/CheckerboardLayout.vala (+18/-5) src/CollectionPage.vala (+18/-5) src/ColorTransformation.vala (+18/-5) src/CommandManager.vala (+18/-5) src/Commands.vala (+18/-5) src/CustomComponents.vala (+2/-2) src/Debug.vala (+18/-5) src/DesktopIntegration.vala (+19/-6) src/Dialogs.vala (+18/-5) src/Dimensions.vala (+18/-5) src/DirectoryMonitor.vala (+18/-5) src/Event.vala (+18/-5) src/Exporter.vala (+18/-6) src/International.vala (+18/-5) src/LibraryFiles.vala (+18/-5) src/LibraryMonitor.vala (+18/-5) src/MediaDataRepresentation.vala (+18/-5) src/MediaInterfaces.vala (+18/-5) src/MediaMetadata.vala (+18/-5) src/MediaMonitor.vala (+18/-5) src/MediaPage.vala (+18/-5) src/MediaViewTracker.vala (+18/-5) src/MetadataWriter.vala (+18/-5) src/Orientation.vala (+18/-5) src/Page.vala (+18/-5) src/Photo.vala (+18/-5) src/PhotoMonitor.vala (+18/-5) src/PhotoPage.vala (+18/-5) src/PixbufCache.vala (+18/-5) src/Printing.vala (+18/-5) src/Resources.vala (+18/-5) src/Screensaver.vala (+19/-6) src/SearchFilter.vala (+18/-5) src/SlideshowPage.vala (+18/-5) src/SortedList.vala (+18/-5) src/Tag.vala (+18/-5) src/Thumbnail.vala (+18/-5) src/ThumbnailCache.vala (+18/-5) src/TimedQueue.vala (+18/-5) src/Tombstone.vala (+18/-5) src/UnityProgressBar.vala (+18/-5) src/Upgrades.vala (+18/-5) src/VideoMetadata.vala (+18/-5) src/VideoMonitor.vala (+18/-5) src/VideoSupport.vala (+18/-5) src/camera/Branch.vala (+18/-5) src/camera/Camera.vala (+18/-5) src/camera/CameraTable.vala (+18/-5) src/camera/GPhoto.vala (+18/-5) src/camera/ImportPage.vala (+18/-5) src/config/Config.vala (+18/-5) src/config/ConfigurationInterfaces.vala (+18/-5) src/config/GSettingsEngine.vala (+18/-5) src/core/Alteration.vala (+18/-5) src/core/ContainerSourceCollection.vala (+18/-5) src/core/Core.vala (+18/-5) src/core/DataCollection.vala (+18/-5) src/core/DataObject.vala (+18/-5) src/core/DataSet.vala (+18/-5) src/core/DataSource.vala (+18/-5) src/core/DataSourceTypes.vala (+18/-5) src/core/DataView.vala (+18/-5) src/core/DataViewTypes.vala (+18/-5) src/core/DatabaseSourceCollection.vala (+18/-5) src/core/SourceCollection.vala (+18/-5) src/core/SourceHoldingTank.vala (+18/-5) src/core/SourceInterfaces.vala (+18/-5) src/core/Tracker.vala (+18/-5) src/core/ViewCollection.vala (+18/-5) src/core/util.vala (+18/-5) src/db/DatabaseTable.vala (+18/-5) src/db/Db.vala (+18/-5) src/db/EventTable.vala (+18/-5) src/db/PhotoTable.vala (+18/-5) src/db/SavedSearchDBTable.vala (+18/-5) src/db/TagTable.vala (+18/-5) src/db/TombstoneTable.vala (+18/-5) src/db/VersionTable.vala (+18/-5) src/db/VideoTable.vala (+18/-5) src/direct/Direct.vala (+18/-5) src/direct/DirectPhoto.vala (+18/-5) src/direct/DirectPhotoPage.vala (+18/-5) src/direct/DirectView.vala (+18/-5) src/direct/DirectWindow.vala (+18/-5) src/editing_tools/AdjustTool.vala (+20/-19) src/editing_tools/CropTool.vala (+20/-19) src/editing_tools/EditingTools.vala (+18/-5) src/editing_tools/RedEyeTool.vala (+20/-19) src/editing_tools/StraightenTool.vala (+18/-6) src/events/Branch.vala (+18/-5) src/events/EventDirectoryItem.vala (+18/-5) src/events/EventPage.vala (+18/-5) src/events/Events.vala (+18/-5) src/events/EventsDirectoryPage.vala (+18/-5) src/library/Branch.vala (+18/-5) src/library/FlaggedPage.vala (+18/-5) src/library/FlaggedSidebarEntry.vala (+18/-5) src/library/ImportQueuePage.vala (+18/-5) src/library/ImportQueueSidebarEntry.vala (+18/-5) src/library/LastImportPage.vala (+18/-5) src/library/LastImportSidebarEntry.vala (+18/-5) src/library/Library.vala (+18/-5) src/library/LibraryWindow.vala (+18/-5) src/library/OfflinePage.vala (+18/-5) src/library/OfflineSidebarEntry.vala (+18/-5) src/library/PhotosPage.vala (+18/-5) src/library/RawsPage.vala (+18/-5) src/library/TopDisplay.vala (+17/-16) src/library/TrashPage.vala (+18/-5) src/library/TrashSidebarEntry.vala (+18/-5) src/library/VideosPage.vala (+18/-5) src/main.vala (+18/-5) src/photos/BmpSupport.vala (+18/-5) src/photos/GRaw.vala (+18/-5) src/photos/GdkSupport.vala (+18/-5) src/photos/GifSupport.vala (+18/-5) src/photos/JfifSupport.vala (+18/-5) src/photos/PhotoFileAdapter.vala (+18/-5) src/photos/PhotoFileFormat.vala (+18/-5) src/photos/PhotoFileSniffer.vala (+18/-5) src/photos/PhotoMetadata.vala (+18/-5) src/photos/Photos.vala (+18/-5) src/photos/PngSupport.vala (+18/-5) src/photos/RawSupport.vala (+18/-5) src/photos/TiffSupport.vala (+18/-5) src/plugins/ManifestWidget.vala (+18/-5) src/plugins/Plugins.vala (+18/-5) src/plugins/PublishingInterfaces.vala (+18/-5) src/plugins/SpitInterfaces.vala (+18/-5) src/plugins/StandardHostInterface.vala (+18/-5) src/plugins/TransitionsInterfaces.vala (+18/-5) src/publishing/APIGlue.vala (+19/-5) src/publishing/Publishing.vala (+18/-5) src/publishing/PublishingPluginHost.vala (+18/-5) src/publishing/PublishingUI.vala (+18/-5) src/searches/Branch.vala (+19/-6) src/searches/SavedSearchDialog.vala (+18/-5) src/searches/SavedSearchPage.vala (+18/-5) src/searches/SearchBoolean.vala (+18/-5) src/searches/Searches.vala (+18/-5) src/sidebar/Branch.vala (+18/-5) src/sidebar/EditableTitle.vala (+20/-20) src/sidebar/Entry.vala (+18/-5) src/sidebar/Sidebar.vala (+18/-5) src/sidebar/Tree.vala (+18/-5) src/sidebar/common.vala (+18/-5) src/sidebar/metadata/BasicProperties.vala (+18/-5) src/sidebar/metadata/ExtendedProperties.vala (+18/-5) src/sidebar/metadata/LibraryProperties.vala (+18/-5) src/sidebar/metadata/MetadataSidebar.vala (+2/-3) src/sidebar/metadata/Properties.vala (+3/-4) src/slideshow/Slideshow.vala (+18/-5) src/slideshow/TransitionEffects.vala (+19/-6) src/tags/Branch.vala (+18/-5) src/tags/HierarchicalTagIndex.vala (+18/-5) src/tags/HierarchicalTagUtilities.vala (+18/-5) src/tags/TagPage.vala (+18/-5) src/tags/Tags.vala (+18/-5) src/threads/BackgroundJob.vala (+18/-5) src/threads/Semaphore.vala (+18/-5) src/threads/Threads.vala (+18/-5) src/threads/Workers.vala (+18/-6) src/unit/Unit.vala (+18/-5) src/unit/rc/template.vala (+18/-7) src/util/KeyValueMap.vala (+18/-5) src/util/Util.vala (+18/-5) src/util/file.vala (+18/-5) src/util/image.vala (+18/-5) src/util/misc.vala (+18/-5) src/util/string.vala (+18/-5) src/util/system.vala (+18/-5) src/util/ui.vala (+18/-5) |
||||
To merge this branch: | bzr merge lp://staging/~elementary-apps/pantheon-photos/fix-license-header | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Neal Gompa (community) | Approve | ||
Photos Devs | Pending | ||
Review via email:
|
Commit message
Update license headers to pass licensecheck
Description of the change
Creative Commons licenses removed from COPYING because we don't ship those 3rd party assets any longer
Re-licensed elementary-owned GPL3 files as LGPL 2.1
To post a comment you must log in.
License check is considerably happier now. Looks good to me.