r23793: fixed incorrect v2-only licensing template for debian packaging files

(This used to be commit 5b65d85a24e93cc01870f330dfe5c21bb4abee7e)

3 files changed, 15 insertions, 18 deletions

diff --git a/packaging/Debian/debian-sarge/copyright b/packaging/Debian/debian-sarge/copyright
index 78dbaf25c6..6a6b5572b7 100644
--- a/packaging/Debian/debian-sarge/copyright
+++ b/packaging/Debian/debian-sarge/copyright
@@ -14,17 +14,16 @@ Copyright:
 
    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.
-
+   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, 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/>.
 
 On Debian GNU/Linux systems, the complete text of the GNU General
 Public License can be found in `/usr/share/common-licenses/GPL'.
diff --git a/packaging/Debian/debian-unstable/copyright b/packaging/Debian/debian-unstable/copyright
index f4529a826f..35056e2bb3 100644
--- a/packaging/Debian/debian-unstable/copyright
+++ b/packaging/Debian/debian-unstable/copyright
@@ -13,17 +13,16 @@ Copyright:
 
    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.
-
+   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, 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/>.
 
 On Debian GNU/Linux systems, the complete text of the GNU General
 Public License can be found in `/usr/share/common-licenses/GPL'.
diff --git a/packaging/Debian/debian-woody/copyright b/packaging/Debian/debian-woody/copyright
index e74a64fa5b..54d90eb9cc 100644
--- a/packaging/Debian/debian-woody/copyright
+++ b/packaging/Debian/debian-woody/copyright
@@ -12,17 +12,16 @@ Copyright:
 
    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.
-
+   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, 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/>.
 
 On Debian GNU/Linux systems, the complete text of the GNU General
 Public License can be found in `/usr/share/common-licenses/GPL'.