r133 - /web/deps/dep5.mdwn

[vorlon at users.alioth.debian.org]

Author: vorlon
Date: Thu Dec 17 15:26:56 2009
New Revision: 133

URL: http://svn.debian.org/wsvn/dep/?sc=1&rev=133
Log:
fix up the bad examples in the spec to not fail policy and license requiremnts!

Modified:
    web/deps/dep5.mdwn

Modified: web/deps/dep5.mdwn
URL: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?rev=133&op=diff
==============================================================================
--- web/deps/dep5.mdwn (original)
+++ web/deps/dep5.mdwn Thu Dec 17 15:26:56 2009
@@ -397,6 +397,12 @@
 `GPL-2+ with OpenSSL exception`:
 
 		License: GPL-2+ with OpenSSL exception
+		 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.
+		 .
 		 In addition, as a special exception, the author of this
 		 program gives permission to link the code of its 
 		 release with the OpenSSL project's "OpenSSL" library (or
@@ -408,6 +414,21 @@
 		 this exception to your version of the file, but you are
 		 not obligated to do so.  If you do not wish to do so,
 		 delete this exception statement from your 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 package; if not, write to the Free
+		 Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+		 Boston, MA  02110-1301 USA
+		 .
+		 On Debian systems, the full text of the GNU General Public
+		 License version 2 can be found in the file
+		 `/usr/share/common-licenses/GPL-2'.
 
 
 
@@ -427,9 +448,26 @@
 
 		Copyright: 1998, John Doe <jdoe at example.com>
 		License: GPL-2+
-		 On Debian systems the full text of the GNU General Public 
-		 License can be found in the `/usr/share/common-licenses/GPL-2'
-		 file.
+		 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 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 package; if not, write to the Free
+		 Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+		 Boston, MA  02110-1301 USA
+		 .
+		 On Debian systems, the full text of the GNU General Public
+		 License version 2 can be found in the file
+		 `/usr/share/common-licenses/GPL-2'.
 
 		Files: debian/*
 		Copyright: 1998, Jane Smith <jsmith at example.net>
@@ -472,7 +510,7 @@
 
 		Files: planet/vendor/httplib2/*
 		Copyright: 2006, John Brown <brown at example.org>
-		License:
+		License: MIT2
 		 Unspecified MIT style license.
 
 		Files: planet/vendor/feedparser.py
@@ -483,9 +521,26 @@
 		Files: planet/vendor/htmltmpl.py
 		Copyright: 2004, Thomas Brown <coder at example.org>
 		License: GPL-2+
-		 On Debian systems the full text of the GNU General Public
-		 License can be found in the `/usr/share/common-licenses/GPL'
-		 file.
+		 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 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 package; if not, write to the Free
+		 Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+		 Boston, MA  02110-1301 USA
+		 .
+		 On Debian systems, the full text of the GNU General Public
+		 License version 2 can be found in the file
+		 `/usr/share/common-licenses/GPL-2'.
 
 
 ## Appendix: Note about the use of this format in Debian