[python-debian/master] Update debtags test and example license comments.
John Wright
jsw at debian.org
Thu Sep 11 05:50:54 UTC 2014
These got missed after the relicensing [1] of debtags itself. Enrico
has explicitly agreed [2] to relicense these to GPL-3+, matching the
debtags license.
[1]: http://lists.alioth.debian.org/pipermail/pkg-python-debian-discuss/2007-July/000056.html
[2]: http://lists.alioth.debian.org/pipermail/pkg-python-debian-maint/2014-September/001904.html
---
examples/debtags/pkgwalk | 16 ++++++++++++----
examples/debtags/reverse | 15 +++++++--------
examples/debtags/smartsearch | 15 +++++++--------
examples/debtags/tagminer | 16 ++++++++++++----
examples/debtags/tagsbyrelevance | 15 +++++++--------
examples/debtags/wxssearch | 15 +++++++--------
tests/test_debtags.py | 19 +++++++++----------
7 files changed, 61 insertions(+), 50 deletions(-)
diff --git a/examples/debtags/pkgwalk b/examples/debtags/pkgwalk
index 639d877..faeb848 100755
--- a/examples/debtags/pkgwalk
+++ b/examples/debtags/pkgwalk
@@ -2,10 +2,18 @@
#
# Copyright (C) 2007 Enrico Zini <enrico at debian.org>
#
-# 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 the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later
-# version.
+# 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
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program 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/>.
# Navigate among related Debian packages
diff --git a/examples/debtags/reverse b/examples/debtags/reverse
index 60c46fe..ef97657 100755
--- a/examples/debtags/reverse
+++ b/examples/debtags/reverse
@@ -4,19 +4,18 @@
#
# Copyright (C) 2003--2006 Enrico Zini <enrico at debian.org>
#
-# This program is free software; you can redistribute it and/or modify
+# 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
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
-# This program 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.
+# This program 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, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
from __future__ import print_function
diff --git a/examples/debtags/smartsearch b/examples/debtags/smartsearch
index 5873aa3..29d73e5 100755
--- a/examples/debtags/smartsearch
+++ b/examples/debtags/smartsearch
@@ -4,19 +4,18 @@
#
# Copyright (C) 2003--2006 Enrico Zini <enrico at debian.org>
#
-# This program is free software; you can redistribute it and/or modify
+# 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
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
-# This program 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.
+# This program 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, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
from __future__ import print_function
diff --git a/examples/debtags/tagminer b/examples/debtags/tagminer
index 470fa33..b9b538f 100755
--- a/examples/debtags/tagminer
+++ b/examples/debtags/tagminer
@@ -2,10 +2,18 @@
#
# Copyright (C) 2007 Enrico Zini <enrico at debian.org>
#
-# 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 the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later
-# version.
+# 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
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program 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/>.
# Given a file, search Debian packages that can somehow handle it
diff --git a/examples/debtags/tagsbyrelevance b/examples/debtags/tagsbyrelevance
index d5ef8c2..5c03a48 100644
--- a/examples/debtags/tagsbyrelevance
+++ b/examples/debtags/tagsbyrelevance
@@ -4,19 +4,18 @@
#
# Copyright (C) 2003--2006 Enrico Zini <enrico at debian.org>
#
-# This program is free software; you can redistribute it and/or modify
+# 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
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
-# This program 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.
+# This program 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, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
from __future__ import print_function
diff --git a/examples/debtags/wxssearch b/examples/debtags/wxssearch
index 79ce0a1..2bb4d14 100755
--- a/examples/debtags/wxssearch
+++ b/examples/debtags/wxssearch
@@ -4,19 +4,18 @@
#
# Copyright (C) 2003--2006 Enrico Zini <enrico at debian.org>
#
-# This program is free software; you can redistribute it and/or modify
+# 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
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
-# This program 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.
+# This program 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, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
from __future__ import print_function
diff --git a/tests/test_debtags.py b/tests/test_debtags.py
index d404cd7..b1815bf 100755
--- a/tests/test_debtags.py
+++ b/tests/test_debtags.py
@@ -3,19 +3,18 @@
# Copyright (C) 2006 Enrico Zini <enrico at enricozini.org>
#
-# 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 the Free Software Foundation; version 2
-# dated June, 1991.
+# 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
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
#
-# This program 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.
+# This program 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, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
from __future__ import absolute_import
--
1.9.1
More information about the pkg-python-debian-commits
mailing list