Remove license from individual files, consolidate information into AUTHORS and LICENSE

12 years ago · da3d660b50
parent 9ee7906472
commit da3d660b50
10 changed files with 40 additions and 137 deletions
--- a/21
+++ b/21
@ -0,0 +1,21 @@
+The primary authors are:
+
+    Joel Schaerer
+    William Ting
+
+Here is an inevitably incomplete list of much appreciated contributors -- people
+who have submitted patches, reported bugs, maintained packages, and in general
+made autojump that much better (in no particular order):
+
+    Tanguy Ortolo
+    Thibault North
+    Olivier Mehani
+    Fabien Bourgeois
+    Binh Nguyen
+    Neeraj Verma
+    Evan Shelhamer
+    xiannaitong
+    Pierre Gueth
+    Tom Parker
+    Liyang Chang
+    Jez Ng
--- a/14
+++ b/14
@ -1,3 +1,17 @@
+autojump 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.
+
+autojump is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+full GNU General Public License below for more details.
+
+autojump is a small tool that maintains a database of your most
+used directories, and finds the best match to help you jump to
+frequently used places.
+
                    GNU GENERAL PUBLIC LICENSE
                       Version 3, 29 June 2007

--- a/bin/_j
+++ b/bin/_j
@ -1,23 +1,6 @@
 #compdef j
-
-#Copyright Joel Schaerer 2008, 2009
-#This file is part of autojump
-
-#autojump 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.
-#
-#autojump is distributed in the hope that it will be useful,
-#but WITHOUT ANY WARRANTY; without even the implied warranty of
-#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#GNU General Public License for more details.
-#
-#You should have received a copy of the GNU General Public License
-#along with autojump.  If not, see <http://www.gnu.org/licenses/>.
-
 cur=${words[2, -1]}

-autojump --completion ${=cur[*]} | while read i; do 
-    compadd -U "$i"; 
+autojump --completion ${=cur[*]} | while read i; do
+    compadd -U "$i";
 done
--- a/bin/autojump
+++ b/bin/autojump
@ -1,24 +1,4 @@
 #!/usr/bin/env python
-"""Copyright Joel Schaerer 2008-2012
-This file is part of autojump
-
-autojump 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.
-
-autojump is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with autojump.  If not, see <http://www.gnu.org/licenses/>.
-
-Autojump is a small tool that maintains a database of your most
-used directories, and finds the best match to help you jump to
-frequently used places."""
-
 from __future__ import division, print_function

 import argparse
--- a/bin/autojump.bash
+++ b/bin/autojump.bash
@ -1,20 +1,3 @@
-#Copyright Joel Schaerer 2008, 2009
-#This file is part of autojump
-
-#autojump 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.
-#
-#autojump is distributed in the hope that it will be useful,
-#but WITHOUT ANY WARRANTY; without even the implied warranty of
-#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#GNU General Public License for more details.
-#
-#You should have received a copy of the GNU General Public License
-#along with autojump.  If not, see <http://www.gnu.org/licenses/>.
-
-#This shell snippet sets the prompt command and the necessary aliases
 _autojump()
 {
        local cur
--- a/bin/autojump.sh
+++ b/bin/autojump.sh
@ -1,19 +1,4 @@
 # Source autojump on BASH or ZSH depending on the shell
-#Copyright Joel Schaerer 2008, 2009
-#This file is part of autojump
-
-#autojump 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.
-#
-#autojump is distributed in the hope that it will be useful,
-#but WITHOUT ANY WARRANTY; without even the implied warranty of
-#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#GNU General Public License for more details.
-#
-#You should have received a copy of the GNU General Public License
-#along with autojump.  If not, see <http://www.gnu.org/licenses/>.
 if [ "$BASH_VERSION" ] && [ -n "$PS1" ] && echo $SHELLOPTS | grep -v posix >>/dev/null; then
    if [ -f ~/.autojump/etc/profile.d/autojump.bash ]; then
        source ~/.autojump/etc/profile.d/autojump.bash
--- a/bin/autojump.zsh
+++ b/bin/autojump.zsh
@ -1,19 +1,3 @@
-#Copyright Joel Schaerer 2008, 2009
-#This file is part of autojump
-
-#autojump 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.
-#
-#autojump is distributed in the hope that it will be useful,
-#but WITHOUT ANY WARRANTY; without even the implied warranty of
-#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#GNU General Public License for more details.
-#
-#You should have received a copy of the GNU General Public License
-#along with autojump.  If not, see <http://www.gnu.org/licenses/>.
-
 # determine the data directory according to the XDG Base Directory Specification
 if [[ -n ${XDG_DATA_HOME} ]] && [[ ${XDG_DATA_HOME} =~ ${USER} ]]; then
    export AUTOJUMP_DATA_DIR="${XDG_DATA_HOME}/autojump"
--- a/bin/jumpapplet
+++ b/bin/jumpapplet
@ -1,21 +1,4 @@
 #!/usr/bin/env python2
-
-#Copyright Joel Schaerer and Pierre Gueth 2008, 2009
-#This file is part of autojump
-
-#autojump 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.
-#
-#autojump is distributed in the hope that it will be useful,
-#but WITHOUT ANY WARRANTY; without even the implied warranty of
-#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#GNU General Public License for more details.
-#
-#You should have received a copy of the GNU General Public License
-#along with autojump.  If not, see <http://www.gnu.org/licenses/>.
-
 import subprocess
 import cPickle
 import os.path
@ -127,7 +110,7 @@ def popup(sender,button,activation):
    else:
        def collapse_home(path):
            return path
-    
+
    menu=gtk.Menu()
    if defaults["invert"]:
        item=gtk.ImageMenuItem(stock_id=gtk.STOCK_QUIT)
@ -138,7 +121,7 @@ def popup(sender,button,activation):
        menu.append(item)

        menu.append(gtk.SeparatorMenuItem())
-        
+
        for path in reversed(paths):
            actions=get_actions(path)
            if not actions: continue
@ -166,7 +149,7 @@ def popup(sender,button,activation):
            menu.append(item)

        menu.append(gtk.SeparatorMenuItem())
-        
+
        item=gtk.ImageMenuItem(stock_id=gtk.STOCK_PREFERENCES)
        item.connect("activate",settings)
        menu.append(item)
--- a/install.sh
+++ b/install.sh
@ -1,19 +1,4 @@
 #!/usr/bin/env bash
-#Copyright Joel Schaerer 2008-2012
-#This file is part of autojump
-
-#autojump 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.
-#
-#autojump is distributed in the hope that it will be useful,
-#but WITHOUT ANY WARRANTY; without even the implied warranty of
-#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#GNU General Public License for more details.
-#
-#You should have received a copy of the GNU General Public License
-#along with autojump.  If not, see <http://www.gnu.org/licenses/>.

 function add_msg {
    echo
--- a/uninstall.sh
+++ b/uninstall.sh
@ -1,19 +1,4 @@
 #!/usr/bin/env bash
-#Copyright Joel Schaerer 2008-2012
-#This file is part of autojump
-
-#autojump 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.
-#
-#autojump is distributed in the hope that it will be useful,
-#but WITHOUT ANY WARRANTY; without even the implied warranty of
-#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#GNU General Public License for more details.
-#
-#You should have received a copy of the GNU General Public License
-#along with autojump.  If not, see <http://www.gnu.org/licenses/>.

 function help_msg {
    echo "sudo ./uninstall.sh [--prefix /usr/local]"