[SCM] GNU gnutls branch, master, updated. gnutls_3_0_7-8-g6f6bcb4

[Simon Josefsson]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU gnutls".

http://git.savannah.gnu.org/cgit/gnutls.git/commit/?id=6f6bcb4550be5d8ec3eda8744f16e6c0cb150741

The branch, master has been updated
       via  6f6bcb4550be5d8ec3eda8744f16e6c0cb150741 (commit)
       via  152cf1ae8f825b18b306229e728663057844f558 (commit)
       via  4cfcee5210c2255719892a7f9d7a97288b07de03 (commit)
      from  16049f6d71b3fe16058edc8bb88b9f82caa38d1f (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 6f6bcb4550be5d8ec3eda8744f16e6c0cb150741
Author: Simon Josefsson <address@hidden>
Date:   Tue Nov 8 20:19:24 2011 +0100

    Drop openssl API from GnuTLS API manual to avoid build errors.

commit 152cf1ae8f825b18b306229e728663057844f558
Author: Simon Josefsson <address@hidden>
Date:   Tue Nov 8 20:19:05 2011 +0100

    Drop more extra stuff.

commit 4cfcee5210c2255719892a7f9d7a97288b07de03
Author: Simon Josefsson <address@hidden>
Date:   Tue Nov 8 20:17:07 2011 +0100

    Remove obsolete libgnutls-extra stuff.

-----------------------------------------------------------------------

Summary of changes:
 doc/reference/Makefile.am      |    7 +------
 doc/reference/gnutls-docs.sgml |    1 -
 extra/gnutls-extra.pc.in       |   26 --------------------------
 extra/libgnutls-extra.map      |   32 --------------------------------
 4 files changed, 1 insertions(+), 65 deletions(-)
 delete mode 100644 extra/gnutls-extra.pc.in
 delete mode 100644 extra/libgnutls-extra.map

diff --git a/doc/reference/Makefile.am b/doc/reference/Makefile.am
index aa8212e..73aa849 100644
--- a/doc/reference/Makefile.am
+++ b/doc/reference/Makefile.am
@@ -51,8 +51,7 @@ FIXXREF_OPTIONS=
 # e.g. HFILE_GLOB=$(top_srcdir)/gtk/*.h
 # e.g. CFILE_GLOB=$(top_srcdir)/gtk/*.c
 HFILE_GLOB=$(top_srcdir)/lib/includes/gnutls/*.h \
-       $(top_builddir)/lib/includes/gnutls/*.h \
-       $(top_srcdir)/extra/includes/gnutls/*.h
+       $(top_builddir)/lib/includes/gnutls/*.h
 CFILE_GLOB=$(top_srcdir)/lib/*.c \
        $(top_srcdir)/lib/x509/*.c \
        $(top_srcdir)/lib/openpgp/*.c \
@@ -158,10 +157,6 @@ IGNORE_HFILES += \
        x509_int.h \
        x86.h
 
-# find extra -name \*.h -exec basename {} \; | grep -v -e extra.h -e openssl.h 
| sort | uniq | sed -e 's/^/\t/' -e 's/$/ \\/'
-IGNORE_HFILES += \
-       openssl_compat.h
-
 # Images to copy into HTML directory.
 # e.g. HTML_IMAGES=$(top_srcdir)/gtk/stock-icons/stock_about_24.png
 HTML_IMAGES=
diff --git a/doc/reference/gnutls-docs.sgml b/doc/reference/gnutls-docs.sgml
index d4f59ed..90b6162 100644
--- a/doc/reference/gnutls-docs.sgml
+++ b/doc/reference/gnutls-docs.sgml
@@ -28,7 +28,6 @@
     <xi:include href="xml/openpgp.xml"/>
     <xi:include href="xml/crypto.xml"/>
     <xi:include href="xml/dtls.xml"/>
-    <xi:include href="xml/openssl.xml"/>
   </chapter>
 
   <index id="api-index-full">
diff --git a/extra/gnutls-extra.pc.in b/extra/gnutls-extra.pc.in
deleted file mode 100644
index 2eb74ae..0000000
--- a/extra/gnutls-extra.pc.in
+++ /dev/null
@@ -1,26 +0,0 @@
-# Process this file with autoconf to produce a pkg-config metadata file.
-# Copyright (C) 2002, 2003, 2004, 2005, 2006, 2008, 2010 Free Software
-# Foundation, Inc.
-# Author: Simon Josefsson
-# 
-# This file is free software; as a special exception the author gives
-# unlimited permission to copy and/or distribute it, with or without
-# modifications, as long as this notice is preserved.
-# 
-# This file is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
-# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-
address@hidden@
address@hidden@
address@hidden@
address@hidden@
-
-Name: GnuTLS-extra
-Description: Additional add-ons for GnuTLS licensed under GPL
-URL: http://www.gnu.org/software/gnutls/
-Requires: gnutls
-Version: @VERSION@
-Libs: -L${libdir} -lgnutls-extra
-Libs.private: @LIBGNUTLS_EXTRA_LIBS@
-Cflags: -I${includedir}
diff --git a/extra/libgnutls-extra.map b/extra/libgnutls-extra.map
deleted file mode 100644
index f0c7504..0000000
--- a/extra/libgnutls-extra.map
+++ /dev/null
@@ -1,32 +0,0 @@
-# libgnutls-extra.map -- libgnutls-extra linker version script-*- ld-script -*-
-# Copyright (C) 2005, 2007, 2008, 2009, 2010 Free Software Foundation,
-# Inc.
-#
-# Author: Simon Josefsson
-#
-# This file is part of GnuTLS-EXTRA.
-#
-# GnuTLS-extra 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.
-#
-# GnuTLS-extra 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 GnuTLS-EXTRA; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301, USA.
-
-GNUTLS_1_4
-{
-  global:
-    gnutls_extra_check_version;
-    gnutls_global_init_extra;
-
-  local:
-    *;
-};


hooks/post-receive
-- 
GNU gnutls