From 8660e89916d7e0d0df59939affd07c6ed78a7313 Mon Sep 17 00:00:00 2001
From: Werner Koch <wk@gnupg.org>
Date: Mon, 28 Feb 2011 09:29:57 +0100
Subject: Simplify libassuan.vers

---
 src/ChangeLog      |  4 ++++
 src/libassuan.vers | 10 +++-------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/ChangeLog b/src/ChangeLog
index fbb3797..a12b9cb 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2011-02-28  Werner Koch  <wk@g10code.com>
+
+	* libassuan.vers: Fold LIBASSUAN_1.1 block into LIBASSUAN_1.0.
+
 2011-02-28  Ben Kibbey  <bjk@luxsci.net>
 
 	* assuan-handler.c (assuan_register_pre_cmd_notify): Pass command
diff --git a/src/libassuan.vers b/src/libassuan.vers
index 261e0e7..6311ff1 100644
--- a/src/libassuan.vers
+++ b/src/libassuan.vers
@@ -20,13 +20,6 @@
 # Please remember to add new functions also to libassuan.def
 #-----------------------------------------------------------
 
-LIBASSUAN_1.1 {
-  global:
-    __assuan_socket;
-    __assuan_connect;
-    assuan_register_pre_cmd_notify;
-};
-
 LIBASSUAN_1.0 {
   global:
     assuan_accept;
@@ -72,6 +65,7 @@ LIBASSUAN_1.0 {
     assuan_register_input_notify;
     assuan_register_option_handler;
     assuan_register_output_notify;
+    assuan_register_pre_cmd_notify;
     assuan_register_post_cmd_notify;
     assuan_register_reset_notify;
     assuan_release;
@@ -111,6 +105,8 @@ LIBASSUAN_1.0 {
     __assuan_socketpair;
     __assuan_spawn;
     __assuan_usleep;
+    __assuan_socket;
+    __assuan_connect;
 
   local:
     *;
-- 
cgit v1.2.3