cron: correct copyright on crontab2english.pl (fixes TPH # 199)
This commit is contained in:
parent
ef970bfec6
commit
157554638d
2 changed files with 41 additions and 5 deletions
37
helpers/DATA/cron/license-info-fix.patch
Normal file
37
helpers/DATA/cron/license-info-fix.patch
Normal file
|
|
@ -0,0 +1,37 @@
|
||||||
|
diff --git a/debian/copyright b/debian/copyright
|
||||||
|
index 3c8824f..c6ec81a 100644
|
||||||
|
--- a/debian/copyright
|
||||||
|
+++ b/debian/copyright
|
||||||
|
@@ -38,7 +38,7 @@ License: GPL-2+
|
||||||
|
|
||||||
|
Files: debian/examples/crontab2english.pl
|
||||||
|
Copyright: 2001, Sean M. Burke
|
||||||
|
-License: Artistic
|
||||||
|
+License: GPL-1+ or Artistic
|
||||||
|
|
||||||
|
License: Paul-Vixie's-license
|
||||||
|
Distribute freely, except: don't remove my name from the source or
|
||||||
|
@@ -67,6 +67,23 @@ License: GPL-2+
|
||||||
|
On Debian systems, the complete text of the GNU General
|
||||||
|
Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
|
||||||
|
|
||||||
|
+License: GPL-1+
|
||||||
|
+ This package 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 1 of the License, or
|
||||||
|
+ (at your option) any later version.
|
||||||
|
+ .
|
||||||
|
+ This package 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 this program. If not, see <http://www.gnu.org/licenses/>
|
||||||
|
+ .
|
||||||
|
+ On Debian systems, the complete text of the GNU General
|
||||||
|
+ Public License version 1 can be found in "/usr/share/common-licenses/GPL-1".
|
||||||
|
+
|
||||||
|
License: Artistic
|
||||||
|
This program is free software; you can redistribute it and/or modify it
|
||||||
|
under the terms of the "Artistic License" which comes with Debian.
|
||||||
|
|
@ -17,15 +17,14 @@
|
||||||
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
||||||
#
|
#
|
||||||
|
|
||||||
VERSION=1
|
VERSION=2
|
||||||
|
BUILD_UNTIL=12
|
||||||
|
|
||||||
. ./config
|
. ./config
|
||||||
|
|
||||||
rm debian/examples/crontab2english.pl
|
patch_p1 $DATA/license-info-fix.patch
|
||||||
|
|
||||||
sed '/crontab2english.pl/,/License: Artistic/d;/License: Artistic/,/common-licenses/d' -i debian/copyright
|
changelog "Corrected license info (package-helpers issue #199)"
|
||||||
|
|
||||||
changelog "Removed non-free example #10868"
|
|
||||||
|
|
||||||
package
|
package
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue