gck: Dump major version number due to recent API refactoring.

 * API is not yet stable, but we increase the major version so that we
   don't piss off packagers.

13 files changed, 66 insertions, 21 deletions

diff --git a/configure.ac b/configure.ac
index d53a9efd..8946084d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -14,7 +14,7 @@ dnl  3. If any interfaces have been added since the last public release, then in
 dnl  4. If any interfaces have been removed or changed since the last public release, then set age to 0.
 
 # GCK package versioning
-GCK_MAJOR=0
+GCK_MAJOR=1
 GCK_MINOR=0
 GCK_MICRO=0
 
diff --git a/daemon/Makefile.am b/daemon/Makefile.am
index 7ecfe24f..f6754133 100644
--- a/daemon/Makefile.am
+++ b/daemon/Makefile.am
@@ -45,7 +45,7 @@ gnome_keyring_daemon_LDADD = \
 	$(top_builddir)/pkcs11/gnome2-store/libgkm-gnome2-store.la \
 	$(top_builddir)/pkcs11/xdg-store/libgkm-xdg-store.la \
 	$(top_builddir)/pkcs11/gkm/libgkm.la \
-	$(top_builddir)/gck/libgck.la \
+	$(top_builddir)/gck/libgck-@GCK_MAJOR@.la \
 	$(top_builddir)/egg/libegg-dbus.la \
 	$(DAEMON_LIBS) \
 	$(GOBJECT_LIBS) \
diff --git a/daemon/gpg-agent/Makefile.am b/daemon/gpg-agent/Makefile.am
index 5654b6c2..7f95ace0 100644
--- a/daemon/gpg-agent/Makefile.am
+++ b/daemon/gpg-agent/Makefile.am
@@ -31,7 +31,7 @@ gkd_gpg_agent_standalone_SOURCES = \
 gkd_gpg_agent_standalone_LDADD = \
 	libgkd-gpg-agent.la \
 	$(top_builddir)/ui/libgku-prompt.la \
-	$(top_builddir)/gck/libgck.la \
+	$(top_builddir)/gck/libgck-@GCK_MAJOR@.la \
 	$(top_builddir)/egg/libegg.la \
 	$(GOBJECT_LIBS) \
 	$(GTHREAD_LIBS) \
diff --git a/daemon/login/Makefile.am b/daemon/login/Makefile.am
index a4be5093..119264af 100644
--- a/daemon/login/Makefile.am
+++ b/daemon/login/Makefile.am
@@ -20,6 +20,6 @@ libgkd_login_la_SOURCES = \
 	gkd-login.c gkd-login.h
 
 libgkd_login_la_LIBADD = \
-	$(top_builddir)/gck/libgck.la \
+	$(top_builddir)/gck/libgck-@GCK_MAJOR@.la \
 	$(GOBJECT_LIBS) \
 	$(GLIB_LIBS)
diff --git a/daemon/ssh-agent/Makefile.am b/daemon/ssh-agent/Makefile.am
index f51d7328..8d643b80 100644
--- a/daemon/ssh-agent/Makefile.am
+++ b/daemon/ssh-agent/Makefile.am
@@ -30,7 +30,7 @@ gkd_ssh_agent_standalone_SOURCES = \
 
 gkd_ssh_agent_standalone_LDADD = \
 	libgkd-ssh-agent.la \
-	$(top_builddir)/gck/libgck.la \
+	$(top_builddir)/gck/libgck-@GCK_MAJOR@.la \
 	$(top_builddir)/egg/libegg-buffer.la \
 	$(top_builddir)/egg/libegg-secure.la \
 	$(GOBJECT_LIBS) \
diff --git a/docs/reference/gcr/Makefile.am b/docs/reference/gcr/Makefile.am
index 102a40c7..889dbc88 100644
--- a/docs/reference/gcr/Makefile.am
+++ b/docs/reference/gcr/Makefile.am
@@ -95,7 +95,7 @@ expand_content_files=
 GTKDOC_CFLAGS= -I$(top_srcdir) -I$(top_builddir) $(GOBJECT_CFLAGS) -Wno-error
 GTKDOC_LIBS= $(GOBJECT_LIBS) \
 	$(top_builddir)/$(DOC_MODULE)/libgcr-@GCR_MAJOR@.la \
-	$(top_builddir)/gck/libgck.la
+	$(top_builddir)/gck/libgck-@GCK_MAJOR@.la
 
 # This includes the standard gtk-doc make rules, copied by gtkdocize.
 include $(top_srcdir)/gtk-doc.make
diff --git a/gck/Makefile.am b/gck/Makefile.am
index 917c5e36..70f1f4f9 100644
--- a/gck/Makefile.am
+++ b/gck/Makefile.am
@@ -9,7 +9,7 @@ endif
 
 SUBDIRS = . $(TESTS_DIR)
 
-incdir = $(includedir)/gck
+incdir = $(includedir)/gck-@GCK_MAJOR@/gck
 
 inc_HEADERS = \
 	gck.h
@@ -28,9 +28,9 @@ INCLUDES = \
 BUILT_SOURCES = \
 	gck-marshal.c gck-marshal.h
 
-lib_LTLIBRARIES = libgck.la
+lib_LTLIBRARIES = libgck-@GCK_MAJOR@.la
 
-libgck_la_SOURCES = \
+libgck_@GCK_MAJOR@_la_SOURCES = \
 	gck.h gck-private.h pkcs11.h \
 	gck-attributes.c \
 	gck-call.c \
@@ -45,12 +45,12 @@ libgck_la_SOURCES = \
 	gck-uri.c \
 	$(BUILT_SOURCES)
 
-libgck_la_LDFLAGS = \
+libgck_@GCK_MAJOR@_la_LDFLAGS = \
 	-version-info $(GCK_LT_RELEASE) \
 	-no-undefined \
 	-export-symbols-regex '^gck_*'
 
-libgck_la_LIBADD = \
+libgck_@GCK_MAJOR@_la_LIBADD = \
 	$(top_builddir)/egg/libegg-hex.la \
 	$(P11_KIT_LIBS) \
 	$(GOBJECT_LIBS) \
@@ -64,8 +64,9 @@ libgck_testable_la_SOURCES = \
 	gck-mock.h \
 	gck-test.c \
 	gck-test.h
-libgck_testable_la_LIBADD = $(libgck_la_OBJECTS) $(libgck_la_LIBADD)
-libgck_testable_la_DEPENDENCIES = $(libgck_la_OBJECTS)
+libgck_testable_la_LIBADD = $(libgck_@GCK_MAJOR@_la_OBJECTS) \
+	$(libgck_@GCK_MAJOR@_la_LIBADD)
+libgck_testable_la_DEPENDENCIES = $(libgck_@GCK_MAJOR@_la_OBJECTS)
 
 gck-marshal.h: gck-marshal.list $(GLIB_GENMARSHAL)
 	$(GLIB_GENMARSHAL) $< --header --prefix=_gck_marshal > $@
diff --git a/gck/gck.pc.in b/gck/gck.pc.in
index ef6f5a48..1f0f8acf 100644
--- a/gck/gck.pc.in
+++ b/gck/gck.pc.in
@@ -6,9 +6,9 @@ datarootdir=@datarootdir@
 datadir=@datadir@
 sysconfdir=@sysconfdir@
 
-Name: gck
+Name: gck-@GCK_MAJOR@
 Description: GObject bindings for PKCS#11
 Version: @VERSION@
 Requires: glib-2.0 p11-kit-1
-Libs: -L${libdir} -lgck
-Cflags: -I${includedir}/gck
+Libs: -L${libdir} -lgck-@GCK_MAJOR@
+Cflags: -I${includedir}/gck-@GCK_MAJOR@
diff --git a/gcr/Makefile.am b/gcr/Makefile.am
index a345416e..921f9ae6 100644
--- a/gcr/Makefile.am
+++ b/gcr/Makefile.am
@@ -127,7 +127,7 @@ libgcr_@GCR_MAJOR@_la_LDFLAGS = \
 libgcr_@GCR_MAJOR@_la_LIBADD = \
 	$(top_builddir)/egg/libegg.la \
 	$(top_builddir)/egg/libegg-entry-buffer.la \
-	$(top_builddir)/gck/libgck.la \
+	$(top_builddir)/gck/libgck-@GCK_MAJOR@.la \
 	$(GOBJECT_LIBS) \
 	$(GLIB_LIBS) \
 	$(LIBGCRYPT_LIBS) \
diff --git a/gcr/libgcr.symbols b/gcr/libgcr.symbols
index 93470462..cc0308e5 100644
--- a/gcr/libgcr.symbols
+++ b/gcr/libgcr.symbols
@@ -15,14 +15,17 @@ gcr_certificate_chain_get_status
 gcr_certificate_chain_get_type
 gcr_certificate_chain_new
 gcr_certificate_chain_status_get_type
+gcr_certificate_compare
 gcr_certificate_details_widget_get_certificate
 gcr_certificate_details_widget_get_type
 gcr_certificate_details_widget_new
 gcr_certificate_details_widget_set_certificate
+gcr_certificate_get_columns
 gcr_certificate_get_der_data
 gcr_certificate_get_expiry_date
 gcr_certificate_get_fingerprint
 gcr_certificate_get_fingerprint_hex
+gcr_certificate_get_icon
 gcr_certificate_get_issued_date
 gcr_certificate_get_issuer_cn
 gcr_certificate_get_issuer_dn
@@ -37,10 +40,14 @@ gcr_certificate_get_subject_part
 gcr_certificate_get_subject_raw
 gcr_certificate_get_type
 gcr_certificate_is_issuer
+gcr_certificate_mixin_class_init
+gcr_certificate_mixin_comparable_init
+gcr_certificate_mixin_get_property
 gcr_certificate_renderer_get_attributes
 gcr_certificate_renderer_get_certificate
 gcr_certificate_renderer_get_type
 gcr_certificate_renderer_new
+gcr_certificate_renderer_new_for_attributes
 gcr_certificate_renderer_set_attributes
 gcr_certificate_renderer_set_certificate
 gcr_certificate_widget_get_attributes
@@ -49,6 +56,31 @@ gcr_certificate_widget_get_type
 gcr_certificate_widget_new
 gcr_certificate_widget_set_attributes
 gcr_certificate_widget_set_certificate
+gcr_collection_emit_added
+gcr_collection_emit_removed
+gcr_collection_get_length
+gcr_collection_get_objects
+gcr_collection_get_type
+gcr_collection_model_change_selected
+gcr_collection_model_column_for_selected
+gcr_collection_model_get_selected_objects
+gcr_collection_model_get_type
+gcr_collection_model_is_selected
+gcr_collection_model_iter_for_object
+gcr_collection_model_new
+gcr_collection_model_new_full
+gcr_collection_model_object_for_iter
+gcr_collection_model_set_columns
+gcr_collection_model_set_selected_objects
+gcr_collection_model_toggle_selected
+gcr_combo_selector_get_collection
+gcr_combo_selector_get_selected
+gcr_combo_selector_get_type
+gcr_combo_selector_new
+gcr_combo_selector_set_selected
+gcr_comparable_compare
+gcr_comparable_get_type
+gcr_comparable_memcmp
 gcr_data_error_get_domain
 gcr_error_get_domain
 gcr_importer_get_parser
@@ -103,11 +135,23 @@ gcr_pkcs11_set_trust_store_uri
 gcr_renderer_create
 gcr_renderer_emit_data_changed
 gcr_renderer_get_type
+gcr_renderer_popuplate_popup
 gcr_renderer_register
-gcr_renderer_render
+gcr_renderer_render_view
 gcr_simple_certificate_get_type
 gcr_simple_certificate_new
 gcr_simple_certificate_new_static
+gcr_simple_collection_add
+gcr_simple_collection_contains
+gcr_simple_collection_get_type
+gcr_simple_collection_new
+gcr_simple_collection_remove
+gcr_tree_selector_get_collection
+gcr_tree_selector_get_columns
+gcr_tree_selector_get_selected
+gcr_tree_selector_get_type
+gcr_tree_selector_new
+gcr_tree_selector_set_selected
 gcr_trust_add_pinned_certificate
 gcr_trust_add_pinned_certificate_async
 gcr_trust_add_pinned_certificate_finish
diff --git a/pkcs11/Makefile.am b/pkcs11/Makefile.am
index 3b4d7440..97d0cef0 100644
--- a/pkcs11/Makefile.am
+++ b/pkcs11/Makefile.am
@@ -1,6 +1,6 @@
 
 # TODO: Are we sure this is the best location for these headers?
-incdir = $(includedir)/gck
+incdir = $(includedir)/gck-@GCK_MAJOR@/gck
 
 inc_HEADERS = \
 	pkcs11.h \
diff --git a/tool/Makefile.am b/tool/Makefile.am
index eccd5506..0b517c95 100644
--- a/tool/Makefile.am
+++ b/tool/Makefile.am
@@ -22,7 +22,7 @@ gnome_keyring_@GCR_MAJOR@_CFLAGS = \
 gnome_keyring_@GCR_MAJOR@_LDADD = \
 	$(top_builddir)/gcr/libgcr-@GCR_MAJOR@.la \
 	$(top_builddir)/egg/libegg.la \
-	$(top_builddir)/gck/libgck.la \
+	$(top_builddir)/gck/libgck-@GCK_MAJOR@.la \
 	$(GTHREAD_LIBS) \
 	$(GTK_LIBS) \
 	$(GCRYPT_LIBS) \
diff --git a/ui/Makefile.am b/ui/Makefile.am
index 98246775..54dc8337 100644
--- a/ui/Makefile.am
+++ b/ui/Makefile.am
@@ -72,7 +72,7 @@ gnome_keyring_prompt_@GCR_MAJOR@_LDADD = \
 	$(top_builddir)/egg/libegg-prompt.la \
 	$(top_builddir)/egg/libegg-entry-buffer.la \
 	$(top_builddir)/gcr/libgcr-@GCR_MAJOR@.la \
-	$(top_builddir)/gck/libgck.la \
+	$(top_builddir)/gck/libgck-@GCK_MAJOR@.la \
 	$(LIBGCRYPT_LIBS) \
 	$(GTK_LIBS)