[svn] gpg-error - r204 - trunk

[svn author wk]

Author: wk
Date: 2007-12-11 14:34:07 +0100 (Tue, 11 Dec 2007)
New Revision: 204

Modified:
   trunk/COPYING.LIB
   trunk/ChangeLog
   trunk/Makefile.am
Log:
Make sure that COPYING and COPYING.LIB are both distributed


Modified: trunk/COPYING.LIB
===================================================================
--- trunk/COPYING.LIB	2007-10-29 20:05:31 UTC (rev 203)
+++ trunk/COPYING.LIB	2007-12-11 13:34:07 UTC (rev 204)
@@ -3,7 +3,7 @@
                        Version 2.1, February 1999
 
  Copyright (C) 1991, 1999 Free Software Foundation, Inc.
-     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+	51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
@@ -57,7 +57,7 @@
 that what they have is not the original version, so that the original
 author's reputation will not be affected by problems that might be
 introduced by others.
-^L
+
   Finally, software patents pose a constant threat to the existence of
 any free program.  We wish to make sure that a company cannot
 effectively restrict the users of a free program by obtaining a
@@ -113,7 +113,7 @@
 "work based on the library" and a "work that uses the library".  The
 former contains code derived from the library, whereas the latter must
 be combined with the library in order to run.
-^L
+
                   GNU LESSER GENERAL PUBLIC LICENSE
    TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
 
@@ -218,7 +218,7 @@
 ordinary GNU General Public License has appeared, then you can specify
 that version instead if you wish.)  Do not make any other change in
 these notices.
-^L
+
   Once this change is made in a given copy, it is irreversible for
 that copy, so the ordinary GNU General Public License applies to all
 subsequent copies and derivative works made from that copy.
@@ -269,7 +269,7 @@
 distribute the object code for the work under the terms of Section 6.
 Any executables containing that work also fall under Section 6,
 whether or not they are linked directly with the Library itself.
-^L
+
   6. As an exception to the Sections above, you may also combine or
 link a "work that uses the Library" with the Library to produce a
 work containing portions of the Library, and distribute that work
@@ -331,7 +331,7 @@
 accompany the operating system.  Such a contradiction means you cannot
 use both them and the Library together in an executable that you
 distribute.
-^L
+
   7. You may place library facilities that are a work based on the
 Library side-by-side in a single library together with other library
 facilities not covered by this License, and distribute such a combined
@@ -372,7 +372,7 @@
 restrictions on the recipients' exercise of the rights granted herein.
 You are not responsible for enforcing compliance by third parties with
 this License.
-^L
+
   11. If, as a consequence of a court judgment or allegation of patent
 infringement or for any other reason (not limited to patent issues),
 conditions are imposed on you (whether by court order, agreement or
@@ -425,7 +425,7 @@
 the Free Software Foundation.  If the Library does not specify a
 license version number, you may choose any version ever published by
 the Free Software Foundation.
-^L
+
   14. If you wish to incorporate parts of the Library into other free
 programs whose distribution conditions are incompatible with these,
 write to the author to ask for permission.  For software which is
@@ -459,7 +459,7 @@
 DAMAGES.
 
                      END OF TERMS AND CONDITIONS
-^L
+
            How to Apply These Terms to Your New Libraries
 
   If you develop a new library, and you want it to be of the greatest
@@ -490,7 +490,7 @@
 
     You should have received a copy of the GNU Lesser General Public
     License along with this library; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
+    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 Also add information on how to contact you by electronic and paper mail.
 

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2007-10-29 20:05:31 UTC (rev 203)
+++ trunk/ChangeLog	2007-12-11 13:34:07 UTC (rev 204)
@@ -1,3 +1,7 @@
+2007-12-11  Werner Koch  <wk at g10code.com>
+
+	* Makefile.am (EXTRA_DIST): Add COPYING.
+
 2007-10-29  Werner Koch  <wk at g10code.com>
 
 	Released 1.6.

Modified: trunk/Makefile.am
===================================================================
--- trunk/Makefile.am	2007-10-29 20:05:31 UTC (rev 203)
+++ trunk/Makefile.am	2007-12-11 13:34:07 UTC (rev 204)
@@ -20,7 +20,7 @@
 ACLOCAL_AMFLAGS = -I m4
 AUTOMAKE_OPTIONS = dist-bzip2
 
-EXTRA_DIST = autogen.sh config.rpath libgpg-error.spec.in 
+EXTRA_DIST = autogen.sh config.rpath libgpg-error.spec.in COPYING
 
 if LANGUAGES_SOME
 lang_subdirs = lang