diff options
| -rw-r--r-- | Utility/Yesod.hs | 1 | ||||
| -rw-r--r-- | debian/changelog | 4 | ||||
| -rw-r--r-- | debian/copyright | 39 | ||||
| -rw-r--r-- | standalone/licences.gz | bin | 60519 -> 60598 bytes |
4 files changed, 26 insertions, 18 deletions
diff --git a/Utility/Yesod.hs b/Utility/Yesod.hs index 2853b3369..6d38ba4ed 100644 --- a/Utility/Yesod.hs +++ b/Utility/Yesod.hs @@ -28,6 +28,7 @@ import Yesod as Y #else import Yesod as Y hiding (Html) #endif +import Assistant.WebApp.Bootstrap3 as Y hiding (bfs) #ifndef __NO_TH__ import Yesod.Default.Util import Language.Haskell.TH.Syntax (Q, Exp) diff --git a/debian/changelog b/debian/changelog index 2e6909e9f..9ed7d0ffd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,11 +1,13 @@ git-annex (5.20140422) UNRELEASED; urgency=medium + * webapp: Switched to bootstrap 3. + Thanks, Sören Brunk. * Standalone builds now check gpg signatures before upgrading. * Simplified repository description line format. The remote name, if any, is always in square brackets after the description. * assistant: Clean up stale tmp files on startup. - -- Joey Hess <joeyh@debian.org> Wed, 23 Apr 2014 12:43:39 -0400 + -- Joey Hess <joeyh@debian.org> Fri, 02 May 2014 15:28:53 -0300 git-annex (5.20140421) unstable; urgency=medium diff --git a/debian/copyright b/debian/copyright index 22bb1193f..12d2f8dcd 100644 --- a/debian/copyright +++ b/debian/copyright @@ -88,23 +88,28 @@ License: MIT or GPL-2 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -Files: static/bootstrap* static/glyphicons-halflings* -Copyright: 2012 Twitter, Inc. -License: Apache-2.0 - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - . - http://www.apache.org/licenses/LICENSE-2.0 - . - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - . - The complete text of the Apache License is distributed in - /usr/share/common-licenses/Apache-2.0 on Debian systems. +Files: static/*/bootstrap* static/*/glyphicons-halflings* +Copyright: 2012-2014 Twitter, Inc. +License: MIT + Copyright (c) 2011-2014 Twitter, Inc + . + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated documentation files (the "Software"), to deal + in the Software without restriction, including without limitation the rights + to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + copies of the Software, and to permit persons to whom the Software is + furnished to do so, subject to the following conditions: + . + The above copyright notice and this permission notice shall be included in + all copies or substantial portions of the Software. + . + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + THE SOFTWARE. License: GPL-3+ The full text of version 3 of the GPL is distributed as doc/license/GPL in diff --git a/standalone/licences.gz b/standalone/licences.gz Binary files differindex 422f84225..e97ea95d0 100644 --- a/standalone/licences.gz +++ b/standalone/licences.gz |