[SCM] vim-addon-manager packaging branch, one-directory-per-addon, updated. v0.4.4-52-geef7258
Antonio Terceiro
terceiro at debian.org
Tue Jan 31 23:33:59 UTC 2012
The following commit has been merged in the one-directory-per-addon branch:
commit f99a5daae4703e3dc0663313b6d19a4a0b32a60d
Author: Antonio Terceiro <terceiro at debian.org>
Date: Thu Jan 26 00:32:41 2012 -0200
Copyright update; debian/copyright in DEP-5
diff --git a/debian/copyright b/debian/copyright
index e60d055..85129e1 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,20 +1,98 @@
-This package was debianized by Stefano Zacchiroli <zack at debian.org> on
-Sun, 28 Jan 2007 21:23:08 +0100.
-
-This package is a native Debian package, its most recent source code is
-available at:
-
- svn://svn.debian.org/svn/pkg-vim/trunk/packages/vim-addon-manager
-
-Upstream Author: Stefano Zacchiroli <zack at debian.org>
+Format: http://dep.debian.net/deps/dep5/
+Source: http://git.debian.org/?p=pkg-vim/vim-addon-manager.git
+Files: *
Copyright: 2007 Stefano Zacchiroli <zack at debian.org>
+ 2012 Antonio Terceiro <terceiro at debian.org>
+License: GPL-3+
+ This program (together with its packaging) is free software; you can
+ redistribute it under the terms of the GNU General Public License as
+ published by the Free Software Foundation, either version 3 of the License,
+ or (at your option) any later version.
+ .
+ See `/usr/share/common-licenses/GPL-3' for the license text.
-License:
-
- This program (together with its packaging) is free software; you can
- redistribute it under the terms of the GNU General Public License as
- published by the Free Software Foundation, either version 3 of the License,
- or (at your option) any later version.
-
- See `/usr/share/common-licenses/GPL' for the license text.
+Files: vendor/vim-pathogen/*
+Copyright: (c) Tim Pope.
+License: vim
+ Distributed under the same terms as Vim itself. See `:help license`.
+Comment: Vim license
+ I) There are no restrictions on distributing unmodified copies of Vim except
+ that they must include this license text. You can also distribute
+ unmodified parts of Vim, likewise unrestricted except that they must
+ include this license text. You are also allowed to include executables
+ that you made from the unmodified Vim sources, plus your own usage
+ examples and Vim scripts.
+ .
+ II) It is allowed to distribute a modified (or extended) version of Vim,
+ including executables and/or source code, when the following four
+ conditions are met:
+ 1) This license text must be included unmodified.
+ 2) The modified Vim must be distributed in one of the following five ways:
+ a) If you make changes to Vim yourself, you must clearly describe in
+ the distribution how to contact you. When the maintainer asks you
+ (in any way) for a copy of the modified Vim you distributed, you
+ must make your changes, including source code, available to the
+ maintainer without fee. The maintainer reserves the right to
+ include your changes in the official version of Vim. What the
+ maintainer will do with your changes and under what license they
+ will be distributed is negotiable. If there has been no negotiation
+ then this license, or a later version, also applies to your changes.
+ The current maintainer is Bram Moolenaar <Bram at vim.org>. If this
+ changes it will be announced in appropriate places (most likely
+ vim.sf.net, www.vim.org and/or comp.editors). When it is completely
+ impossible to contact the maintainer, the obligation to send him
+ your changes ceases. Once the maintainer has confirmed that he has
+ received your changes they will not have to be sent again.
+ b) If you have received a modified Vim that was distributed as
+ mentioned under a) you are allowed to further distribute it
+ unmodified, as mentioned at I). If you make additional changes the
+ text under a) applies to those changes.
+ c) Provide all the changes, including source code, with every copy of
+ the modified Vim you distribute. This may be done in the form of a
+ context diff. You can choose what license to use for new code you
+ add. The changes and their license must not restrict others from
+ making their own changes to the official version of Vim.
+ d) When you have a modified Vim which includes changes as mentioned
+ under c), you can distribute it without the source code for the
+ changes if the following three conditions are met:
+ - The license that applies to the changes permits you to distribute
+ the changes to the Vim maintainer without fee or restriction, and
+ permits the Vim maintainer to include the changes in the official
+ version of Vim without fee or restriction.
+ - You keep the changes for at least three years after last
+ distributing the corresponding modified Vim. When the maintainer
+ or someone who you distributed the modified Vim to asks you (in
+ any way) for the changes within this period, you must make them
+ available to him.
+ - You clearly describe in the distribution how to contact you. This
+ contact information must remain valid for at least three years
+ after last distributing the corresponding modified Vim, or as long
+ as possible.
+ e) When the GNU General Public License (GPL) applies to the changes,
+ you can distribute the modified Vim under the GNU GPL version 2 or
+ any later version.
+ 3) A message must be added, at least in the output of the ":version"
+ command and in the intro screen, such that the user of the modified Vim
+ is able to see that it was modified. When distributing as mentioned
+ under 2)e) adding the message is only required for as far as this does
+ not conflict with the license used for the changes.
+ 4) The contact information as required under 2)a) and 2)d) must not be
+ removed or changed, except that the person himself can make
+ corrections.
+ .
+ III) If you distribute a modified version of Vim, you are encouraged to use
+ the Vim license for your changes and make them available to the
+ maintainer, including the source code. The preferred way to do this is
+ by e-mail or by uploading the files to a server and e-mailing the URL.
+ If the number of changes is small (e.g., a modified Makefile) e-mailing a
+ context diff will do. The e-mail address to be used is
+ <maintainer at vim.org>
+ .
+ IV) It is not allowed to remove this license from the distribution of the Vim
+ sources, parts of it or from a modified version. You may use this
+ license for previous Vim releases instead of the license that they came
+ with, at your option.
+ .
+ On Debian systems the GNU General Public License (GPL) version 2 is located on
+ the filesystem at /usr/share/common-licenses/GPL-2.
diff --git a/lib/vim/addon_manager.rb b/lib/vim/addon_manager.rb
index dff12fe..fd3fdd3 100644
--- a/lib/vim/addon_manager.rb
+++ b/lib/vim/addon_manager.rb
@@ -1,13 +1,11 @@
-# vim-addons: command line manager of Vim addons
+# vim-addons: command line manager of vim addons
#
-# Copyright (C) 2007 Stefano Zacchiroli
+# copyright (c) 2007 stefano zacchiroli
#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
+# this program is free software: you can redistribute it and/or modify
+# it under the terms of the gnu general public license as published by
+# the free software foundation, either version 3 of the license, or
# (at your option) any later version.
-#
-# $Id: addon-manager.rb 866 2007-01-24 21:27:58Z zack $
require 'fileutils'
diff --git a/lib/vim/addon_manager/addon.rb b/lib/vim/addon_manager/addon.rb
index 153c65d..801ca09 100644
--- a/lib/vim/addon_manager/addon.rb
+++ b/lib/vim/addon_manager/addon.rb
@@ -1,3 +1,12 @@
+# vim-addons: command line manager of vim addons
+#
+# copyright (c) 2007 stefano zacchiroli
+#
+# this program is free software: you can redistribute it and/or modify
+# it under the terms of the gnu general public license as published by
+# the free software foundation, either version 3 of the license, or
+# (at your option) any later version.
+
require 'vim/addon_manager/addon_status'
module Vim
diff --git a/lib/vim/addon_manager/addon/directory.rb b/lib/vim/addon_manager/addon/directory.rb
index 1ec4127..01c8801 100644
--- a/lib/vim/addon_manager/addon/directory.rb
+++ b/lib/vim/addon_manager/addon/directory.rb
@@ -1,3 +1,12 @@
+# vim-addons: command line manager of vim addons
+#
+# copyright (c) 2012 Antonio Terceiro <terceiro at debian.org>
+#
+# this program is free software: you can redistribute it and/or modify
+# it under the terms of the gnu general public license as published by
+# the free software foundation, either version 3 of the license, or
+# (at your option) any later version.
+
module Vim
class AddonManager
diff --git a/lib/vim/addon_manager/addon/legacy.rb b/lib/vim/addon_manager/addon/legacy.rb
index 160ef42..3762532 100644
--- a/lib/vim/addon_manager/addon/legacy.rb
+++ b/lib/vim/addon_manager/addon/legacy.rb
@@ -1,3 +1,12 @@
+# vim-addons: command line manager of vim addons
+#
+# copyright (c) 2007 stefano zacchiroli
+#
+# this program is free software: you can redistribute it and/or modify
+# it under the terms of the gnu general public license as published by
+# the free software foundation, either version 3 of the license, or
+# (at your option) any later version.
+
module Vim
class AddonManager
diff --git a/lib/vim/addon_manager/addon_status.rb b/lib/vim/addon_manager/addon_status.rb
index a137266..7aef119 100644
--- a/lib/vim/addon_manager/addon_status.rb
+++ b/lib/vim/addon_manager/addon_status.rb
@@ -1,3 +1,12 @@
+# vim-addons: command line manager of Vim addons
+#
+# Copyright (C) 2007 Stefano Zacchiroli
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+
module Vim
class AddonManager
diff --git a/lib/vim/addon_manager/constants.rb b/lib/vim/addon_manager/constants.rb
index 6fe5d2e..116d238 100644
--- a/lib/vim/addon_manager/constants.rb
+++ b/lib/vim/addon_manager/constants.rb
@@ -6,8 +6,6 @@
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
-#
-# $Id: constants.rb 866 2007-01-24 21:27:58Z zack $
module Vim
diff --git a/lib/vim/addon_manager/logger.rb b/lib/vim/addon_manager/logger.rb
index 54e2d14..b375bb2 100644
--- a/lib/vim/addon_manager/logger.rb
+++ b/lib/vim/addon_manager/logger.rb
@@ -1,3 +1,12 @@
+# vim-addons: command line manager of Vim addons
+#
+# Copyright (C) 2007 Stefano Zacchiroli
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+
module Vim
class AddonManager
diff --git a/lib/vim/addon_manager/registry.rb b/lib/vim/addon_manager/registry.rb
index c9e6d44..2a5ef4a 100644
--- a/lib/vim/addon_manager/registry.rb
+++ b/lib/vim/addon_manager/registry.rb
@@ -6,8 +6,6 @@
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
-#
-# $Id: registry.rb 866 2007-01-24 21:27:58Z zack $
require 'find'
require 'set'
--
vim-addon-manager packaging
More information about the pkg-vim-maintainers
mailing list