gnome-keyring r1410 - in trunk: . pkcs11 pkcs11/dot-ssh pkcs11/ssh-keys pkcs11/ssh-keys/tests pkcs11/ssh-keys/tests/test-data

[nnielsen svn gnome org]

Author: nnielsen
Date: Sat Dec 27 03:47:25 2008
New Revision: 1410
URL: http://svn.gnome.org/viewvc/gnome-keyring?rev=1410&view=rev

Log:
	* pkcs11/Makefile.am:
	* pkcs11/dot-ssh/: (moved to ssh-keys)
	* pkcs11/ssh-keys/: (moved from dot-ssh)
	* configure.in: Rename dot-ssh component to ssh-keys


Added:
   trunk/pkcs11/ssh-keys/   (props changed)
      - copied from r1405, /trunk/pkcs11/dot-ssh/
   trunk/pkcs11/ssh-keys/Makefile.am
      - copied, changed from r1406, /trunk/pkcs11/dot-ssh/Makefile.am
   trunk/pkcs11/ssh-keys/gck-ssh-module.c
      - copied unchanged from r1407, /trunk/pkcs11/dot-ssh/gck-ssh-module.c
   trunk/pkcs11/ssh-keys/gck-ssh-module.h
      - copied unchanged from r1406, /trunk/pkcs11/dot-ssh/gck-ssh-module.h
   trunk/pkcs11/ssh-keys/gck-ssh-openssh.c
      - copied unchanged from r1406, /trunk/pkcs11/dot-ssh/gck-ssh-openssh.c
   trunk/pkcs11/ssh-keys/gck-ssh-private-key.c
      - copied unchanged from r1407, /trunk/pkcs11/dot-ssh/gck-ssh-private-key.c
   trunk/pkcs11/ssh-keys/gck-ssh-public-key.c
      - copied unchanged from r1407, /trunk/pkcs11/dot-ssh/gck-ssh-public-key.c
   trunk/pkcs11/ssh-keys/gck-ssh-standalone.c
      - copied unchanged from r1407, /trunk/pkcs11/dot-ssh/gck-ssh-standalone.c
   trunk/pkcs11/ssh-keys/tests/Makefile.am
      - copied, changed from r1407, /trunk/pkcs11/dot-ssh/tests/Makefile.am
   trunk/pkcs11/ssh-keys/tests/p11-tests.conf
      - copied unchanged from r1407, /trunk/pkcs11/dot-ssh/tests/p11-tests.conf
   trunk/pkcs11/ssh-keys/tests/test-data/id_dsa_encrypted.pub
      - copied unchanged from r1407, /trunk/pkcs11/dot-ssh/tests/test-data/id_dsa_encrypted.pub
   trunk/pkcs11/ssh-keys/tests/test-data/id_dsa_plain.pub
      - copied unchanged from r1407, /trunk/pkcs11/dot-ssh/tests/test-data/id_dsa_plain.pub
   trunk/pkcs11/ssh-keys/tests/test-data/id_rsa_encrypted.pub
      - copied unchanged from r1407, /trunk/pkcs11/dot-ssh/tests/test-data/id_rsa_encrypted.pub
   trunk/pkcs11/ssh-keys/tests/test-data/id_rsa_plain.pub
      - copied unchanged from r1407, /trunk/pkcs11/dot-ssh/tests/test-data/id_rsa_plain.pub
Removed:
   trunk/pkcs11/dot-ssh/
Modified:
   trunk/ChangeLog
   trunk/configure.in
   trunk/pkcs11/Makefile.am

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Sat Dec 27 03:47:25 2008
@@ -513,12 +513,12 @@
 pam/Makefile
 pam/tests/Makefile
 pkcs11/Makefile
-pkcs11/dot-ssh/Makefile
-pkcs11/dot-ssh/tests/Makefile
 pkcs11/gck/Makefile
 pkcs11/gck/tests/Makefile
 pkcs11/roots/Makefile
 pkcs11/roots/tests/Makefile
+pkcs11/ssh-keys/Makefile
+pkcs11/ssh-keys/tests/Makefile
 pkcs11/rpc/Makefile
 pkcs11/tests/Makefile
 po/Makefile.in

Modified: trunk/pkcs11/Makefile.am
==============================================================================
--- trunk/pkcs11/Makefile.am	(original)
+++ trunk/pkcs11/Makefile.am	Sat Dec 27 03:47:25 2008
@@ -41,5 +41,5 @@
 TESTS_DIR = 
 endif
 
-SUBDIRS = . rpc gck dot-ssh roots $(TESTS_DIR)
+SUBDIRS = . rpc gck ssh-keys roots $(TESTS_DIR)
 

Copied: trunk/pkcs11/ssh-keys/Makefile.am (from r1406, /trunk/pkcs11/dot-ssh/Makefile.am)
==============================================================================
--- /trunk/pkcs11/dot-ssh/Makefile.am	(original)
+++ trunk/pkcs11/ssh-keys/Makefile.am	Sat Dec 27 03:47:25 2008
@@ -9,12 +9,12 @@
 	
 			
 # ------------------------------------------------------------------------------
-# The dot-ssh component code
+# The ssh-keys component code
 
 noinst_LTLIBRARIES = \
-	libgck-dot-ssh.la
+	libgck-ssh-keys.la
 
-libgck_dot_ssh_la_SOURCES = \
+libgck_ssh_keys_la_SOURCES = \
 	gck-ssh-module.c gck-ssh-module.h \
 	gck-ssh-openssh.c gck-ssh-openssh.h \
 	gck-ssh-private-key.c gck-ssh-private-key.h \
@@ -26,17 +26,17 @@
 moduledir = $(libdir)/gnome-keyring/standalone/
 
 module_LTLIBRARIES = \
-	gck-dot-ssh-module.la
+	gck-ssh-keys-module.la
 
-gck_dot_ssh_module_la_LDFLAGS = \
+gck_ssh_keys_module_la_LDFLAGS = \
 	-module -avoid-version \
 	-no-undefined -export-symbols-regex 'C_GetFunctionList'
 
-gck_dot_ssh_module_la_SOURCES = \
+gck_ssh_keys_module_la_SOURCES = \
 	gck-ssh-standalone.c
 
-gck_dot_ssh_module_la_LIBADD = \
-	libgck-dot-ssh.la \
+gck_ssh_keys_module_la_LIBADD = \
+	libgck-ssh-keys.la \
 	$(top_builddir)/pkcs11/gck/libgck.la \
 	$(top_builddir)/common/libgkr-module-common.la \
 	$(GOBJECT_LIBS) \

Copied: trunk/pkcs11/ssh-keys/tests/Makefile.am (from r1407, /trunk/pkcs11/dot-ssh/tests/Makefile.am)
==============================================================================
--- /trunk/pkcs11/dot-ssh/tests/Makefile.am	(original)
+++ trunk/pkcs11/ssh-keys/tests/Makefile.am	Sat Dec 27 03:47:25 2008
@@ -4,12 +4,12 @@
 UNIT_PROMPT = 
 
 UNIT_LIBS =  \
-	$(top_builddir)/pkcs11/dot-ssh/libgck-dot-ssh.la \
+	$(top_builddir)/pkcs11/ssh-keys/libgck-ssh-keys.la \
 	$(top_builddir)/pkcs11/gck/libgck.la \
 	$(top_builddir)/common/libgkr-module-common.la
 
 include $(top_srcdir)/tests/gtest.make
 
 p11-tests:
-	p11-tests -f p11-tests.conf ../.libs/gck-dot-ssh-module.so
+	p11-tests -f p11-tests.conf ../.libs/gck-ssh-keys-module.so
 	
\ No newline at end of file