projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix mangled patch refreshes
[gnulib.git]
/
gnulib-tool
diff --git
a/gnulib-tool
b/gnulib-tool
index
0e1694d
..
2846271
100755
(executable)
--- a/
gnulib-tool
+++ b/
gnulib-tool
@@
-1,6
+1,6
@@
#! /bin/sh
#
#! /bin/sh
#
-# Copyright (C) 2002-201
0
Free Software Foundation, Inc.
+# Copyright (C) 2002-201
1
Free Software Foundation, Inc.
#
# 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
#
# 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
@@
-446,7
+446,7
@@
func_gnulib_dir ()
* ) self_abspathname=`echo "$self_abspathname" | sed -e 's,/[^/]*$,,'`/"$linkval" ;;
esac
done
* ) self_abspathname=`echo "$self_abspathname" | sed -e 's,/[^/]*$,,'`/"$linkval" ;;
esac
done
- gnulib_dir=
`echo "$self_abspathname" | sed -e 's,/[^/]*$,,'`
+ gnulib_dir=
/usr/share/gnulib
}
# func_tmpdir
}
# func_tmpdir
@@
-3855,11
+3855,16
@@
s,^\(.................................................[^ ]*\) *,
yes | 3)
sed_transform_main_lib_file=$sed_transform_main_lib_file'
s/GNU General/GNU Lesser General/g
yes | 3)
sed_transform_main_lib_file=$sed_transform_main_lib_file'
s/GNU General/GNU Lesser General/g
+ s/General Public License/Lesser General Public License/g
+ s/Lesser Lesser General Public License/Lesser General Public License/g
'
;;
2)
sed_transform_main_lib_file=$sed_transform_main_lib_file'
s/GNU General/GNU Lesser General/g
'
;;
2)
sed_transform_main_lib_file=$sed_transform_main_lib_file'
s/GNU General/GNU Lesser General/g
+ s/General Public License/Lesser General Public License/g
+ s/Lesser Lesser General Public License/Lesser General Public License/g
+
s/version [23]\([ ,]\)/version 2.1\1/g
'
;;
s/version [23]\([ ,]\)/version 2.1\1/g
'
;;
@@
-3869,7
+3874,11
@@
s,^\(.................................................[^ ]*\) *,
# Update license.
sed_transform_main_lib_file=$sed_transform_main_lib_file'
s/GNU Lesser General/GNU General/g
# Update license.
sed_transform_main_lib_file=$sed_transform_main_lib_file'
s/GNU Lesser General/GNU General/g
+ s/Lesser General Public License/General Public License/g
+
s/GNU Library General/GNU General/g
s/GNU Library General/GNU General/g
+ s/Library General Public License/General Public License/g
+
s/version 2\(.1\)\{0,1\}\([ ,]\)/version 3\2/g
'
fi
s/version 2\(.1\)\{0,1\}\([ ,]\)/version 3\2/g
'
fi
@@
-3881,7
+3890,11
@@
s,^\(.................................................[^ ]*\) *,
# Update license.
sed_transform_build_aux_file=$sed_transform_build_aux_file'
s/GNU Lesser General/GNU General/g
# Update license.
sed_transform_build_aux_file=$sed_transform_build_aux_file'
s/GNU Lesser General/GNU General/g
+ s/Lesser General Public License/General Public License/g
+
s/GNU Library General/GNU General/g
s/GNU Library General/GNU General/g
+ s/Library General Public License/General Public License/g
+
s/version 2\(.1\)\{0,1\}\([ ,]\)/version 3\2/g
'
fi
s/version 2\(.1\)\{0,1\}\([ ,]\)/version 3\2/g
'
fi
@@
-3892,7
+3905,11
@@
s,^\(.................................................[^ ]*\) *,
# Update license.
sed_transform_testsrelated_lib_file=$sed_transform_testsrelated_lib_file'
s/GNU Lesser General/GNU General/g
# Update license.
sed_transform_testsrelated_lib_file=$sed_transform_testsrelated_lib_file'
s/GNU Lesser General/GNU General/g
+ s/Lesser General Public License/General Public License/g
+
s/GNU Library General/GNU General/g
s/GNU Library General/GNU General/g
+ s/Library General Public License/General Public License/g
+
s/version 2\(.1\)\{0,1\}\([ ,]\)/version 3\2/g
'
fi
s/version 2\(.1\)\{0,1\}\([ ,]\)/version 3\2/g
'
fi