GNOME.org
 

seahorse r2177 - in plugins/trunk: . bonobo libseahorse src tests

Author: nnielsen
Date: Thu Apr 17 18:36:30 2008
New Revision: 2177
URL: http://svn.gnome.org/viewvc/seahorse?rev=2177&view=rev

Log:
Initial moving to seahorse-plugins and removing of some unneeded 
directories


Added:
   plugins/trunk/ChangeLog.pre-split
      - copied unchanged from r2175, /plugins/trunk/ChangeLog
Removed:
   plugins/trunk/ChangeLog.pre-0.6
   plugins/trunk/ChangeLog.pre-1.0
   plugins/trunk/TODO
   plugins/trunk/bonobo/
   plugins/trunk/seahorse.spec.in
   plugins/trunk/src/
   plugins/trunk/tests/calc-dsa.py
   plugins/trunk/tests/calc-rsa.py
Modified:
   plugins/trunk/BUGS
   plugins/trunk/ChangeLog
   plugins/trunk/HACKING
   plugins/trunk/INSTALL
   plugins/trunk/Makefile.am
   plugins/trunk/README
   plugins/trunk/autogen.sh
   plugins/trunk/configure.in
   plugins/trunk/libseahorse/Makefile.am

Modified: plugins/trunk/BUGS
==============================================================================
--- plugins/trunk/BUGS	(original)
+++ plugins/trunk/BUGS	Thu Apr 17 18:36:30 2008
@@ -1,2 +1,2 @@
-Open bugs can be found under the 'seahorse' component at:
+Open bugs can be found under the 'seahorse-plugins' component at:
 http://bugzilla.gnome.org/

Modified: plugins/trunk/HACKING
==============================================================================
--- plugins/trunk/HACKING	(original)
+++ plugins/trunk/HACKING	Thu Apr 17 18:36:30 2008
@@ -1,5 +1,5 @@
 If you want to hack or commit something to seahorse, please first send patches to 
-seahorse-devel lists sourceforge net or submitted on bugzilla.gnome.org if possible.
+seahorse-list gnome org or submitted on bugzilla.gnome.org if possible.
 
 For a todo list, first check bugzilla, then look at TODO. Bugzilla is also updated 
 with possible enhancements and any current bugs.
@@ -34,8 +34,6 @@
  
  o plugins/applet: Clipboard encryption panel applet
 
- o src: The key manager program. This currently includes the main window & dialogs.
-
 
 USING THE GPG EXECUTABLE DIRECTLY
 
@@ -69,7 +67,7 @@
    - libseahorse/seahorse-gpgmex.c
 
 
-DEBUGGING SEAHORSE
+DEBUGGING SEAHORSE-PLUGINS
 
 There are a couple of configure switches that you can enable which add
 debugging helpers etc...

Modified: plugins/trunk/INSTALL
==============================================================================
--- plugins/trunk/INSTALL	(original)
+++ plugins/trunk/INSTALL	Thu Apr 17 18:36:30 2008
@@ -1,54 +1,19 @@
---------------------------------------------------------------------------------
-                          SEAHORSE INSTALLATION
---------------------------------------------------------------------------------
+Installation Instructions
+*************************
 
-Version 2.19.x
-
-Required Dependencies
-=====================
-
-   Make sure you have the following installed before you try and install 
-Seahorse. You may need to install 'devel' or 'dev' versions of these packages
-if your distro requires this.
-
- - GTK 2.10 (or a later 2.x version)
- - DBUS 0.35 (or later)
- - GPGME 1.x 
- - GnuPG 1.2.x or 1.4.x 
- - libgnome 2.14 (or later)
- - libgnomeui 2.x 
- - libglade 2.x 
- - GConf 2.x 
- - GnomeVFS 2.x
- - gnome-keyring 2.19.4 (or later)
-
-Optional Dependencies
-=====================
-
-   These are not required for a basic install of Seahorse, but additional 
-features will be enabled if these are present on your system. Again you may need
-to install 'devel' or 'dev' versions of these packages if your distro requires.
-
- - OpenLDAP 2.x (client libraries) 
- - Gedit 2.6 (or later 2.x version) 
- - libnautilus-extension 2.9 (or a later 2.x version)
- - gnome-keyring
- - libsoup 2.4
- - libpanelapplet
- - Avahi 0.6 (or later)
- - libnotify 0.3 (or later)
- - OpenSSH 
- - Gecko (from Firefox 1.5 or later)
- - Epiphany 2.14 (or later)
- 
-A summary of which features are enabled will be displayed after you run 
-'./configure' (see below).
+Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
+2006 Free Software Foundation, Inc.
 
+This file is free documentation; the Free Software Foundation gives
+unlimited permission to copy, distribute and modify it.
 
 Basic Installation
 ==================
 
-These are generic installation instructions.
+Briefly, the shell commands `./configure; make; make install' should
+configure, build, and install this package.  The following
+more-detailed instructions are generic; see the `README' file for
+instructions specific to this package.
 
    The `configure' shell script attempts to guess correct values for
 various system-dependent variables used during compilation.  It uses
@@ -61,9 +26,9 @@
 
    It can also use an optional file (typically called `config.cache'
 and enabled with `--cache-file=config.cache' or simply `-C') that saves
-the results of its tests to speed up reconfiguring.  (Caching is
+the results of its tests to speed up reconfiguring.  Caching is
 disabled by default to prevent problems with accidental use of stale
-cache files.)
+cache files.
 
    If you need to do unusual things to compile the package, please try
 to figure out how `configure' could check whether to do them, and mail
@@ -73,20 +38,17 @@
 may remove or edit it.
 
    The file `configure.ac' (or `configure.in') is used to create
-`configure' by a program called `autoconf'.  You only need
-`configure.ac' if you want to change it or regenerate `configure' using
-a newer version of `autoconf'.
+`configure' by a program called `autoconf'.  You need `configure.ac' if
+you want to change it or regenerate `configure' using a newer version
+of `autoconf'.
 
 The simplest way to compile this package is:
 
   1. `cd' to the directory containing the package's source code and type
-     `./configure' to configure the package for your system.  If you're
-     using `csh' on an old version of System V, you might need to type
-     `sh ./configure' instead to prevent `csh' from trying to execute
-     `configure' itself.
+     `./configure' to configure the package for your system.
 
-     Running `configure' takes awhile.  While running, it prints some
-     messages telling which features it is checking for.
+     Running `configure' might take a while.  While running, it prints
+     some messages telling which features it is checking for.
 
   2. Type `make' to compile the package.
 
@@ -116,7 +78,7 @@
 by setting variables in the command line or in the environment.  Here
 is an example:
 
-     ./configure CC=c89 CFLAGS=-O2 LIBS=-lposix
+     ./configure CC=c99 CFLAGS=-g LIBS=-lposix
 
    *Note Defining Variables::, for more details.
 
@@ -125,17 +87,15 @@
 
 You can compile the package for more than one kind of computer at the
 same time, by placing the object files for each architecture in their
-own directory.  To do this, you must use a version of `make' that
-supports the `VPATH' variable, such as GNU `make'.  `cd' to the
+own directory.  To do this, you can use GNU `make'.  `cd' to the
 directory where you want the object files and executables to go and run
 the `configure' script.  `configure' automatically checks for the
 source code in the directory that `configure' is in and in `..'.
 
-   If you have to use a `make' that does not support the `VPATH'
-variable, you have to compile the package for one architecture at a
-time in the source code directory.  After you have installed the
-package for one architecture, use `make distclean' before reconfiguring
-for another architecture.
+   With a non-GNU `make', it is safer to compile the package for one
+architecture at a time in the source code directory.  After you have
+installed the package for one architecture, use `make distclean' before
+reconfiguring for another architecture.
 
 Installation Names
 ==================
@@ -228,12 +188,12 @@
      ./configure CC=/usr/local2/bin/gcc
 
 causes the specified `gcc' to be used as the C compiler (unless it is
-overridden in the site shell script).  Here is a another example:
+overridden in the site shell script).
 
-     /bin/bash ./configure CONFIG_SHELL=/bin/bash
+Unfortunately, this technique does not work for `CONFIG_SHELL' due to
+an Autoconf bug.  Until the bug is fixed you can use this workaround:
 
-Here the `CONFIG_SHELL=/bin/bash' operand causes subsequent
-configuration-related scripts to be executed by `/bin/bash'.
+     CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash
 
 `configure' Invocation
 ======================

Modified: plugins/trunk/Makefile.am
==============================================================================
--- plugins/trunk/Makefile.am	(original)
+++ plugins/trunk/Makefile.am	Thu Apr 17 18:36:30 2008
@@ -10,7 +10,6 @@
 
 SUBDIRS = libcryptui \
           libseahorse \
-          src \
           po \
           data \
           help \
@@ -32,8 +31,6 @@
     README \
     THANKS \
     TODO \
-    seahorse.spec \
-    seahorse.spec.in \
     intltool-extract.in \
     intltool-merge.in \
     intltool-update.in \

Modified: plugins/trunk/README
==============================================================================
--- plugins/trunk/README	(original)
+++ plugins/trunk/README	Thu Apr 17 18:36:30 2008
@@ -1,5 +1,5 @@
-Seahorse: a Gnome encryption interface.
-This describes version 2.22.0
+seahorse-plugins: plugins and utilities for encryption in GNOME
+This describes version 2.23.0
 
 Seahorse is a graphical interface for managing and using encryption keys. 
 Currently it supports PGP keys (using GPG/GPGME) and SSH keys. Its goal is to 
@@ -18,7 +18,7 @@
 
 See the INSTALL file for instructions on how to install Seahorse.
 
-Homepage: http://seahorse.sourceforge.net
+Homepage: http://www.gnome.org/projects/seahorse/
 
 License: Seahorse is released under the GPL.  See COPYING for more info.
 

Modified: plugins/trunk/autogen.sh
==============================================================================
--- plugins/trunk/autogen.sh	(original)
+++ plugins/trunk/autogen.sh	Thu Apr 17 18:36:30 2008
@@ -4,7 +4,7 @@
 srcdir=`dirname $0`
 test -z "$srcdir" && srcdir=.
 
-PKG_NAME="seahorse"
+PKG_NAME="seahorse-plugins"
 
 (test -f $srcdir/configure.in) || {
     echo -n "**Error**: Directory "\`$srcdir\'" does not look like the"

Modified: plugins/trunk/configure.in
==============================================================================
--- plugins/trunk/configure.in	(original)
+++ plugins/trunk/configure.in	Thu Apr 17 18:36:30 2008
@@ -5,7 +5,7 @@
 dnl ****************************************************************************
 dnl MAIN SEAHORSE VERSION (update after release)
 
-AC_INIT(seahorse, 2.23.0)
+AC_INIT(seahorse-plugins, 2.23.0)
 
 dnl ****************************************************************************
 dnl LIBCRYPTUI libtool versioning
@@ -20,7 +20,7 @@
 
 dnl ****************************************************************************
 
-AC_CONFIG_SRCDIR(src/main.c)
+AC_CONFIG_SRCDIR(daemon/seahorse-daemon.c)
 AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
 AM_CONFIG_HEADER(config.h)
 AM_MAINTAINER_MODE
@@ -848,7 +848,6 @@
 
 AC_OUTPUT([
 Makefile
-seahorse.spec
 libcryptui/cryptui.pc
 libcryptui/Makefile
 libcryptui/tests/Makefile
@@ -860,11 +859,6 @@
 pixmaps/22x22/Makefile
 pixmaps/48x48/Makefile
 pixmaps/scalable/Makefile
-src/Makefile
-src/seahorse.desktop.in
-src/seahorse-pgp-encrypted.desktop.in
-src/seahorse-pgp-keys.desktop.in
-src/seahorse-pgp-signature.desktop.in
 agent/Makefile
 daemon/Makefile
 plugins/Makefile

Modified: plugins/trunk/libseahorse/Makefile.am
==============================================================================
--- plugins/trunk/libseahorse/Makefile.am	(original)
+++ plugins/trunk/libseahorse/Makefile.am	Thu Apr 17 18:36:30 2008
@@ -97,9 +97,7 @@
 	$(HKP_SRCS) \
 	$(SSH_SRCS)
 
-seahorselibexecbin_PROGRAMS = xloadimage seahorse-ssh-askpass
-
-xloadimage_SOURCES = ../src/seahorse-xloadimage.c
+seahorselibexecbin_PROGRAMS = seahorse-ssh-askpass
 
 seahorse_ssh_askpass_SOURCES = seahorse-ssh-askpass.c
 seahorse_ssh_askpass_LDADD = \
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]