[arch-commits] Commit in vim-tagbar/trunk (LICENSE PKGBUILD)

Levente Polyak anthraxx at archlinux.org
Fri Jan 13 11:16:16 UTC 2017


    Date: Friday, January 13, 2017 @ 11:16:15
  Author: anthraxx
Revision: 207199

upgpkg: vim-tagbar 2.7-1

Modified:
  vim-tagbar/trunk/PKGBUILD
Deleted:
  vim-tagbar/trunk/LICENSE

----------+
 LICENSE  |   82 -------------------------------------------------------------
 PKGBUILD |   20 ++++++--------
 2 files changed, 9 insertions(+), 93 deletions(-)

Deleted: LICENSE
===================================================================
--- LICENSE	2017-01-13 10:42:23 UTC (rev 207198)
+++ LICENSE	2017-01-13 11:16:15 UTC (rev 207199)
@@ -1,82 +0,0 @@
-TAGBAR LICENSE
-
-This is the normal Vim license (see ':h license' in Vim) with the necessary
-replacements for the project and maintainer information.
-
-I)  There are no restrictions on distributing unmodified copies of Tagbar
-    except that they must include this license text.  You can also distribute
-    unmodified parts of Tagbar, likewise unrestricted except that they must
-    include this license text.  You are also allowed to include executables
-    that you made from the unmodified Tagbar sources, plus your own usage
-    examples and scripts.
-
-II) It is allowed to distribute a modified (or extended) version of Tagbar,
-    including executables and/or source code, when the following four
-    conditions are met:
-    1) This license text must be included unmodified.
-    2) The modified Tagbar must be distributed in one of the following five ways:
-       a) If you make changes to Tagbar 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 Tagbar 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 Tagbar.  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 Jan Larres <jan at majutsushi.net>.  If this
-          changes it will be announced in appropriate places (most likely
-          majutsushi.github.io/tagbar and/or github.com/majutsushi/tagbar).
-          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 Tagbar 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 Tagbar 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 Tagbar.
-       d) When you have a modified Tagbar 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 Tagbar maintainer without fee or restriction, and
-            permits the Tagbar maintainer to include the changes in the official
-            version of Tagbar without fee or restriction.
-          - You keep the changes for at least three years after last
-            distributing the corresponding modified Tagbar.  When the
-            maintainer or someone who you distributed the modified Tagbar 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 Tagbar, or as
-            long as possible.
-       e) When the GNU General Public License (GPL) applies to the changes,
-          you can distribute the modified Tagbar under the GNU GPL version 2
-          or any later version.
-    3) A message must be added, at least in the documentation, such that the
-       user of the modified Tagbar 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 Tagbar, you are encouraged to use
-     the Tagbar 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
-     <jan at majutsushi.net>
-
-IV)  It is not allowed to remove this license from the distribution of the
-     Tagbar sources, parts of it or from a modified version.  You may use this
-     license for previous Tagbar releases instead of the license that they
-     came with, at your option.

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-01-13 10:42:23 UTC (rev 207198)
+++ PKGBUILD	2017-01-13 11:16:15 UTC (rev 207199)
@@ -3,8 +3,8 @@
 # Contributor: Patrice Peterson <runiq at archlinux dot us>
 
 pkgname=vim-tagbar
-pkgver=2.6.1
-pkgrel=5
+pkgver=2.7
+pkgrel=1
 pkgdesc='Plugin to browse the tags of the current file and get an overview of its structure'
 url='https://majutsushi.github.io/tagbar/'
 arch=('any')
@@ -11,19 +11,17 @@
 license=('custom:vim')
 depends=('ctags' 'vim')
 groups=('vim-plugins')
-source=(${pkgname}-${pkgver}.tar.gz::https://github.com/majutsushi/tagbar/archive/v${pkgver}.tar.gz
-		    LICENSE)
-sha512sums=('eb0f29dc2f08d943e1ac0c0fe97ed72a49b85e22d105815a5557e205532be379d3ce8429c5303b917c005b465a7385161ff2edc96efc0fc312178155c67a7c22'
-            '01f828e4cf4dee832d2b2976d19163f9e9968089c49a0a33783bd84f3507daf1da0730b12d4dae5bc1edbbf2e419f1ba46adb2347155753c06c94dc30631bf29')
+source=(${pkgname}-${pkgver}.tar.gz::https://github.com/majutsushi/tagbar/archive/v${pkgver}.tar.gz)
+sha512sums=('d964d3055f1679aad86b0756cc444a4857eb29ca22f2bd3567ad6c8d073e75d0c8823109038415f5bd1d269bbf8e36da6f34d70fedee54c10f90535ef79ff3c8')
 
 package() {
   cd ${pkgname#vim-}-${pkgver}
   _installpath="${pkgdir}/usr/share/vim/vimfiles"
-  install -Dm 644 doc/tagbar.txt "${_installpath}/doc/tagbar.txt"
-  install -Dm 644 autoload/tagbar.vim "${_installpath}/autoload/tagbar.vim"
-  install -Dm 644 plugin/tagbar.vim "${_installpath}/plugin/tagbar.vim"
-  install -Dm 644 syntax/tagbar.vim "${_installpath}/syntax/tagbar.vim"
-  install -Dm 644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+  install -Dm 644 doc/tagbar.txt -t "${_installpath}/doc"
+  install -Dm 644 autoload/tagbar.vim -t "${_installpath}/autoload"
+  install -Dm 644 plugin/tagbar.vim -t "${_installpath}/plugin"
+  install -Dm 644 syntax/tagbar.vim -t "${_installpath}/syntax"
+  install -Dm 644 LICENSE -t "${pkgdir}/usr/share/licenses/${pkgname}"
 }
 
 # vim: ts=2 sw=2 et:



More information about the arch-commits mailing list