From 157554638da019a0210004d5b66ec18e70da917b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luis=20Guzm=C3=A1n?= Date: Tue, 17 Jun 2025 00:15:21 -0600 Subject: [PATCH] cron: correct copyright on crontab2english.pl (fixes TPH # 199) --- helpers/DATA/cron/license-info-fix.patch | 37 ++++++++++++++++++++++++ helpers/make-cron | 9 +++--- 2 files changed, 41 insertions(+), 5 deletions(-) create mode 100644 helpers/DATA/cron/license-info-fix.patch diff --git a/helpers/DATA/cron/license-info-fix.patch b/helpers/DATA/cron/license-info-fix.patch new file mode 100644 index 0000000..b6221bd --- /dev/null +++ b/helpers/DATA/cron/license-info-fix.patch @@ -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 ++ . ++ 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. diff --git a/helpers/make-cron b/helpers/make-cron index 3f6c3de..1b70b03 100644 --- a/helpers/make-cron +++ b/helpers/make-cron @@ -17,15 +17,14 @@ # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA # -VERSION=1 +VERSION=2 +BUILD_UNTIL=12 . ./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 "Removed non-free example #10868" +changelog "Corrected license info (package-helpers issue #199)" package