summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog2
-rw-r--r--debian/control16
-rw-r--r--debian/copyright63
3 files changed, 80 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index f24326dd2..29dccb4c4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ git-annex (3.20120722) UNRELEASED; urgency=low
* initremote: Avoid recording remote's description before checking
that its config is valid.
+ * init: If no description is provided for a new repository, one will
+ automatically be generated, like "joey@gnu:~/foo"
* unused, status: Avoid crashing when ran in bare repo.
* Avoid crashing when "git annex get" fails to download from one
location, and falls back to downloading from a second location.
diff --git a/debian/control b/debian/control
index 79702ed29..89ca89283 100644
--- a/debian/control
+++ b/debian/control
@@ -22,6 +22,22 @@ Build-Depends:
libghc-edit-distance-dev,
libghc-hinotify-dev [linux-any],
libghc-stm-dev (>= 2.3),
+ libghc-dbus-dev,
+ libghc-yesod-dev,
+ libghc-yesod-static-dev,
+ libghc-yesod-default-dev,
+ libghc-case-insensitive-dev,
+ libghc-http-types-dev,
+ libghc-transformers-dev,
+ libghc-wai-dev,
+ libghc-wai-logger-dev,
+ libghc-warp-dev,
+ libghc-blaze-builder-dev,
+ libghc-blaze-html-dev,
+ libghc-blaze-markup-dev,
+ libghc-crypto-api-dev,
+ libghc-hamlet-dev,
+ libghc-clientsession-dev,
ikiwiki,
perlmagick,
git,
diff --git a/debian/copyright b/debian/copyright
index de1e08e1c..4e7345fd8 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -8,8 +8,69 @@ License: GPL-3+
this package's source, or in /usr/share/common-licenses/GPL-3 on
Debian systems.
-Files: doc/logo.png doc/logo_small.png doc/favicon.png
+Files: Utility/Mounts.hsc
+Copyright: Volker Wysk <hsss@volker-wysk.de>
+License: LGPL-2.1+
+ The full text of version 2.1 of the LGPL is distributed as doc/LGPL
+ in this package's source, or in /usr/share/common-licences/LGPL-2.1
+ on Debian systems.
+
+Files: Utility/libmounts.c
+Copyright: 1980, 1989, 1993, 1994 The Regents of the University of California
+ 2001 David Rufino <daverufino@btinternet.com>
+ 2012 Joey Hess <joey@kitenet.net>
+License: BSD-3-clause
+ The full text of the 3 clause BSD license is distributed inside
+ Utility/libmounts.c in this package's source, or in
+ /usr/share/common-licenses/BSD on Debian systems.
+
+Files: doc/logo.png doc/logo_small.png */favicon.ico
Copyright: 2007 Henrik Nyh <http://henrik.nyh.se/>
2010 Joey Hess <joey@kitenet.net>
License: other
Free to modify and redistribute with due credit, and obviously free to use.
+
+Files: static/jquery*
+Copyright: © 2005-2011 by John Resig, Branden Aaron & Jörn Zaefferer
+ © 2011 The Dojo Foundation
+License: MIT or GPL-2
+ The full text of version 2 of the GPL is distributed in
+ /usr/share/common-licenses/GPL-2 on Debian systems. The text of the MIT
+ license follows:
+ .
+ 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.
+
+Files: static/*/bootstrap*
+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.