Commit 54f0fcb2 authored by Stefan Walter's avatar Stefan Walter

Require automake 1.9

    * autogen.sh: Require automake 1.9
    * Makefile.am:
    * configure.in:
    * xmldocs.make (removed):
    * help/Makefile.am:
    * help/seahorse.omf.in (added):
    * help/C/Makefile.am (removed):
    * help/C/seahorse-C.omf (removed):
    * help/C/seahorse.xml:
    * plugins/applet/docs/Makefile.am:
    * plugins/applet/docs/seahorse-applet.omf.in (added):
    * plugins/applet/C/Makefile.am (removed):
    * plugins/applet/C/seahorse-applet-C.omf (removed): Migrate to
    gnome-doc-utils. Fixes #327441
parent e54066f6
...@@ -18,3 +18,4 @@ compile ...@@ -18,3 +18,4 @@ compile
*.prj *.prj
seahorse-?.?.? seahorse-?.?.?
junk junk
gnome-doc-utils.make
2006-04-14 Nate Nielsen <nielsen@memberwebs.com>
* autogen.sh: Require automake 1.9
* Makefile.am:
* configure.in:
* xmldocs.make (removed):
* help/Makefile.am:
* help/seahorse.omf.in (added):
* help/C/Makefile.am (removed):
* help/C/seahorse-C.omf (removed):
* help/C/seahorse.xml:
* plugins/applet/docs/Makefile.am:
* plugins/applet/docs/seahorse-applet.omf.in (added):
* plugins/applet/C/Makefile.am (removed):
* plugins/applet/C/seahorse-applet-C.omf (removed): Migrate to
gnome-doc-utils. Fixes #327441
2006-04-14 Nate Nielsen <nielsen@memberwebs.com> 2006-04-14 Nate Nielsen <nielsen@memberwebs.com>
* COPYING-LIBCRYPTUI (added): * COPYING-LIBCRYPTUI (added):
......
Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002 Free Software
Foundation, Inc.
-------------------------------------------------------------------------------- This file is free documentation; the Free Software Foundation gives
SEAHORSE INSTALLATION unlimited permission to copy, distribute and modify it.
--------------------------------------------------------------------------------
Version 0.9.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.4 (or a later 2.x version)
- GPGME 1.x
- GnuPG 1.2.x or 1.4.x
- libgnomeui 2.x
- libglade 2.x
- GConf 2.x
- GnomeVFS 2.x
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)
- Bonobo 2.x
- Bonobo Activation 2.x
- libsoup 2.2
- libnotify 0.2 (or later)
- libpanelapplet
- Avahi 0.6 (or later)
- DBUS 0.35 (or later)
- libnotify 0.3 (or later)
- OpenSSH
A summary of which features are enabled will be displayed after you run
'./configure' (see below).
Basic Installation Basic Installation
================== ==================
...@@ -265,3 +226,4 @@ operates. ...@@ -265,3 +226,4 @@ operates.
`configure' also accepts some other, not widely useful, options. Run `configure' also accepts some other, not widely useful, options. Run
`configure --help' for more details. `configure --help' for more details.
Email: jap1@cvs.gnome.org
Email: jsogo@cvs.gnome.org
Email: nielsen@memberwebs.com Email: nielsen@memberwebs.com
...@@ -31,21 +31,29 @@ SUBDIRS = libseahorse \ ...@@ -31,21 +31,29 @@ SUBDIRS = libseahorse \
daemon daemon
EXTRA_DIST = \ EXTRA_DIST = \
AUTHORS \ AUTHORS \
COPYING \ COPYING \
COPYING-DOCS \ COPYING-DOCS \
ChangeLog \ COPYING-LIBCRYPTUI \
HACKING \ ChangeLog \
INSTALL \ HACKING \
MAINTAINERS \ INSTALL \
NEWS \ MAINTAINERS \
README \ NEWS \
THANKS \ README \
TODO \ THANKS \
seahorse.spec \ TODO \
seahorse.spec.in \ seahorse.spec \
intltool-extract.in \ seahorse.spec.in \
intltool-merge.in \ intltool-extract.in \
intltool-update.in \ intltool-merge.in \
xmldocs.make \ intltool-update.in \
omf.make gnome-doc-utils.make \
omf.make \
m4
DISTCLEANFILES = \
gnome-doc-utils.make
DISTCHECK_CONFIGURE_FLAGS = \
--disable-scrollkeeper
seahorse 0.9.1
--------------
* New Tango style icons
* Completely reworked personal key properties dialog
* SSH Key Generation
* Add libcryptui library for standardization of key selection
* DBUS interface for encryption and key management
* Gedit plugin now uses DBUS to do it's work
* Progress dialog while generating keys [Jim Pharis]
* Automatically resize and convert photos that are added
to a key.
* Now uses the GNOME proxy settings when accessing key
servers [Adam Schreiber]
* New UI for signing keys
* HIG fixes for dialogs [chpe]
* Many crasher and stability fixes.
seahorse 0.9.0 seahorse 0.9.0
-------------- --------------
......
Seahorse: a Gnome encryption interface. Seahorse: a Gnome encryption interface.
This describes version 0.9.0 (development version) This describes version 0.9.1 (development version)
Seahorse is a graphical interface for managing and using encryption keys. Seahorse is a graphical interface for managing and using encryption keys.
Currently it supports PGP keys using for Gnu Privacy Guard. Its goal is to Currently it supports PGP keys (using GPG/GPGME) and SSH keys. Its goal is to
provide an easy to use Key Management Tool, along with an easy to use interface provide an easy to use Key Management Tool, along with an easy to use interface
for encryption operations. for encryption operations.
......
...@@ -17,4 +17,4 @@ which gnome-autogen.sh || { ...@@ -17,4 +17,4 @@ which gnome-autogen.sh || {
exit 1 exit 1
} }
REQUIRED_AUTOMAKE_VERSION=1.7 USE_GNOME2_MACROS=1 . gnome-autogen.sh REQUIRED_AUTOMAKE_VERSION=1.9 USE_GNOME2_MACROS=1 . gnome-autogen.sh
...@@ -26,9 +26,9 @@ AM_CONFIG_HEADER(config.h) ...@@ -26,9 +26,9 @@ AM_CONFIG_HEADER(config.h)
AM_MAINTAINER_MODE AM_MAINTAINER_MODE
AC_PROG_INTLTOOL AC_PROG_INTLTOOL
AM_PROG_LIBTOOL AM_PROG_LIBTOOL
AM_GCONF_SOURCE_2 AM_GCONF_SOURCE_2
GNOME_DOC_INIT
dnl Get the off_t size right dnl Get the off_t size right
AC_SYS_LARGEFILE AC_SYS_LARGEFILE
...@@ -669,7 +669,6 @@ libseahorse/Makefile ...@@ -669,7 +669,6 @@ libseahorse/Makefile
bonobo/Makefile bonobo/Makefile
po/Makefile.in po/Makefile.in
help/Makefile help/Makefile
help/C/Makefile
data/Makefile data/Makefile
pixmaps/Makefile pixmaps/Makefile
pixmaps/22x22/Makefile pixmaps/22x22/Makefile
...@@ -681,7 +680,6 @@ daemon/Makefile ...@@ -681,7 +680,6 @@ daemon/Makefile
plugins/Makefile plugins/Makefile
plugins/applet/Makefile plugins/applet/Makefile
plugins/applet/docs/Makefile plugins/applet/docs/Makefile
plugins/applet/docs/C/Makefile
plugins/nautilus/Makefile plugins/nautilus/Makefile
plugins/nautilus-ext/Makefile plugins/nautilus-ext/Makefile
plugins/gedit/Makefile plugins/gedit/Makefile
......
Makefile Makefile
Makefile.in Makefile.in
*.omf
figdir = figures
docname = seahorse
lang = C
omffile = seahorse-C.omf
entities = legal.xml
include $(top_srcdir)/xmldocs.make
dist-hook: app-dist-hook
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
<!ENTITY key "<glossterm>key</glossterm>"> <!ENTITY key "<glossterm>key</glossterm>">
]> ]>
<article id="index" Lang="en"> <article id="index">
<articleinfo> <articleinfo>
<title>&project; Manual V&manrevision;</title> <title>&project; Manual V&manrevision;</title>
<copyright> <copyright>
...@@ -124,7 +124,7 @@ ...@@ -124,7 +124,7 @@
<itemizedlist> <itemizedlist>
<listitem><para><xref linkend="encrypt-te"/></para></listitem> <listitem><para><xref linkend="encrypt-te"/></para></listitem>
<listitem><para><xref linkend="sign-te"/></para></listitem> <listitem><para><xref linkend="sign-te"/></para></listitem>
<listitem><para><xref linkend="decrypt/verify-te"/></para></listitem> <listitem><para><xref linkend="decryptverify-te"/></para></listitem>
</itemizedlist> </itemizedlist>
<!-- note>Most &key; management features can be found in the <xref linkend="key-properties"/>.</note --> <!-- note>Most &key; management features can be found in the <xref linkend="key-properties"/>.</note -->
</sect1> </sect1>
...@@ -215,8 +215,8 @@ ...@@ -215,8 +215,8 @@
Enter your full name in the form Enter your full name in the form
<programlisting>&lt;first&gt; &lt;last&gt;</programlisting> <programlisting>&lt;first&gt; &lt;last&gt;</programlisting>
A middle name or initial is optional. A middle name or initial is optional.
<note>You must enter at least 5 <note><para>You must enter at least 5
characters in this field.</note> characters in this field.</para></note>
</para> </para>
</listitem> </listitem>
</varlistentry> </varlistentry>
...@@ -229,8 +229,8 @@ ...@@ -229,8 +229,8 @@
key server or other key provider. key server or other key provider.
Make sure it is correct before Make sure it is correct before
continuing. continuing.
<note>It should be of the form <note><para>It should be of the form
<programlisting>&lt;user name&gt;@&lt;domain name&gt;</programlisting></note> <programlisting>&lt;user name&gt;@&lt;domain name&gt;</programlisting></para></note>
</para> </para>
</listitem> </listitem>
</varlistentry> </varlistentry>
...@@ -311,9 +311,9 @@ ...@@ -311,9 +311,9 @@
months. You will have to either change the months. You will have to either change the
expiration date or generate a new expiration date or generate a new
key or subkey after this amount of time passes. key or subkey after this amount of time passes.
<note>Sign your new key with your old one <note><para>Sign your new key with your old one
before it expires to preserve your trust before it expires to preserve your trust
status.</note> status.</para></note>
</para> </para>
</listitem> </listitem>
</varlistentry> </varlistentry>
...@@ -379,8 +379,8 @@ ...@@ -379,8 +379,8 @@
</menuchoice> </menuchoice>
. Enter a file name with a valid archive extenision and specify the . Enter a file name with a valid archive extenision and specify the
location to save the archive. location to save the archive.
<note>You can choose any of the archive types <note><para>You can choose any of the archive types
<application>file-roller</application> supports.</note> <application>file-roller</application> supports.</para></note>
</para> </para>
</sect1> </sect1>
<sect1 id="key-properties"> <sect1 id="key-properties">
...@@ -423,7 +423,7 @@ ...@@ -423,7 +423,7 @@
<listitem> <listitem>
<para> <para>
Indicates the length in bits of a key. In general the longer the key, the more security it Indicates the length in bits of a key. In general the longer the key, the more security it
provides.<note>A long key is not enough to make up for the use of a weak passphrase.</note> provides.<note><para>A long key is not enough to make up for the use of a weak passphrase.</para></note>
</para> </para>
</listitem> </listitem>
</varlistentry> </varlistentry>
...@@ -735,9 +735,8 @@ ...@@ -735,9 +735,8 @@
<para> <para>
To verify files, double click on the the detached signature file. To verify files, double click on the the detached signature file.
</para> </para>
<note>Detached signature file names often take the form <note><para>Detached signature file names often take the form
<codelisting> &lt;file name to be verified&gt;.sig</codelisting> &lt;file name to be verified&gt;.sig</para></note>
</note>
</sect2> </sect2>
</sect1> </sect1>
<sect1 id="text-editor"> <sect1 id="text-editor">
...@@ -780,7 +779,7 @@ ...@@ -780,7 +779,7 @@
signed text. signed text.
</para> </para>
</sect2> </sect2>
<sect2 id="decrypt/verify-te"> <sect2 id="decryptverify-te">
<title>Decrypt/Verify Text</title> <title>Decrypt/Verify Text</title>
<para> <para>
To Decrypt and or Verify a selection of text, select the text you want To Decrypt and or Verify a selection of text, select the text you want
...@@ -842,9 +841,9 @@ ...@@ -842,9 +841,9 @@
<para> <para>
Whether the key is an OpenPGP key or a S/MIME certificate. Whether the key is an OpenPGP key or a S/MIME certificate.
</para> </para>
<note> <note><para>
Certificates are not yet supported. Certificates are not yet supported.
</note> </para></note>
</sect3> </sect3>
</sect2> </sect2>
<sect2 id="encryption-settings"> <sect2 id="encryption-settings">
...@@ -859,10 +858,10 @@ ...@@ -859,10 +858,10 @@
Sets whether or not you will be added to the recipients list for Sets whether or not you will be added to the recipients list for
all files encrypted by &app;. all files encrypted by &app;.
</para> </para>
<note> <note><para>
If you don't select this and you don't select yourself as a If you don't select this and you don't select yourself as a
recipient you will be unable to decrypt any files you encrypt. recipient you will be unable to decrypt any files you encrypt.
</note> </para></note>
</sect3> </sect3>
<sect3> <sect3>
<title>Armor Encode Files</title> <title>Armor Encode Files</title>
...@@ -933,10 +932,10 @@ ...@@ -933,10 +932,10 @@
to the remote search dialog. Using these local "key servers" will most to the remote search dialog. Using these local "key servers" will most
likely be faster than accessing remote servers. likely be faster than accessing remote servers.
</para> </para>
<note> <note><para>
To enable key sharing, you must have started <command>mDNSResponder To enable key sharing, you must have started <command>mDNSResponder
</command> before <command>seahorse-daemon</command>. </command> before <command>seahorse-daemon</command>.
</note> </para></note>
</sect2> </sect2>
</sect1> </sect1>
<sect1 id="about"> <sect1 id="about">
......
SUBDIRS = C include $(top_srcdir)/gnome-doc-utils.make
dist-hook: doc-dist-hook
DOC_MODULE = seahorse
DOC_ENTITIES = legal.xml
DOC_INCLUDES =
DOC_FIGURES = \
figures/generate.png \
figures/key-properties.png \
figures/recipients.png \
figures/export.png \
figures/import.png \
figures/passphrase.png \
figures/signature.png \
figures/file-manager.png \
figures/key-manager.png \
figures/preferences.png \
figures/text-editor.png
DOC_LINGUAS =
gnome-doc-utils.m4
Makefile Makefile
Makefile.in Makefile.in
*.omf
figdir =
docname = seahorse-applet
lang = C
omffile = seahorse-applet-C.omf
entities = legal.xml
include $(top_srcdir)/xmldocs.make
dist-hook: app-dist-hook
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
<!ENTITY project "Seahorse Project"> <!ENTITY project "Seahorse Project">
]> ]>
<article id="index" Lang="en"> <article id="index">
<articleinfo> <articleinfo>
<title>&applet; Manual V&manrevision;</title> <title>&applet; Manual V&manrevision;</title>
<copyright> <copyright>
......
SUBDIRS = C include $(top_srcdir)/gnome-doc-utils.make
dist-hook: doc-dist-hook
DOC_MODULE = seahorse-applet
DOC_ENTITIES = legal.xml
DOC_INCLUDES =
DOC_FIGURES =
DOC_LINGUAS =
#
# No modifications of this Makefile should be necessary.
#
# To use this template:
# 1) Define: figdir, docname, lang, omffile, and entities in
# your Makefile.am file for each document directory,
# although figdir, omffile, and entities may be empty
# 2) Make sure the Makefile in (1) also includes
# "include $(top_srcdir)/xmldocs.make" and
# "dist-hook: app-dist-hook".
# 3) Optionally define 'entities' to hold xml entities which
# you would also like installed
# 4) Figures must go under $(figdir)/ and be in PNG format
# 5) You should only have one document per directory
# 6) Note that the figure directory, $(figdir)/, should not have its
# own Makefile since this Makefile installs those figures.
#
# example Makefile.am:
# figdir = figures
# docname = scrollkeeper-manual
# lang = C
# omffile=scrollkeeper-manual-C.omf
# entities = fdl.xml
# include $(top_srcdir)/xmldocs.make
# dist-hook: app-dist-hook
#
# About this file:
# This file was taken from scrollkeeper_example2, a package illustrating
# how to install documentation and OMF files for use with ScrollKeeper
# 0.3.x and 0.4.x. For more information, see:
# http://scrollkeeper.sourceforge.net/
# Version: 0.1.2 (last updated: March 20, 2002)
#
# ************* Begin of section some packagers may need to modify **************
# This variable (docdir) specifies where the documents should be installed.
# This default value should work for most packages.
# docdir = $(datadir)/@PACKAGE@/doc/$(docname)/$(lang)
docdir = $(datadir)/gnome/help/$(docname)/$(lang)
# ************** You should not have to edit below this line *******************
xml_files = $(entities) $(docname).xml
EXTRA_DIST = $(xml_files) $(omffile)
CLEANFILES = omf_timestamp
# If the following file is in a subdir (like help/) you need to add that to the path
include $(top_srcdir)/omf.make
all: omf
$(docname).xml: $(entities)
-ourdir=`pwd`; \
cd $(srcdir); \
cp $(entities) $$ourdir
app-dist-hook:
if test "$(figdir)"; then \
$(mkinstalldirs) $(distdir)/$(figdir); \
for file in $(srcdir)/$(figdir)/*.png; do \
basefile=`echo $$file | sed -e 's,^.*/,,'`; \
$(INSTALL_DATA) $$file $(distdir)/$(figdir)/$$basefile; \
done \
fi
install-data-local: omf
$(mkinstalldirs) $(DESTDIR)$(docdir)
for file in $(xml_files); do \
cp $(srcdir)/$$file $(DESTDIR)$(docdir); \
done
if test "$(figdir)"; then \
$(mkinstalldirs) $(DESTDIR)$(docdir)/$(figdir); \
for file in $(srcdir)/$(figdir)/*.png; do \
basefile=`echo $$file | sed -e 's,^.*/,,'`; \
$(INSTALL_DATA) $$file $(DESTDIR)$(docdir)/$(figdir)/$$basefile; \
done \
fi
install-data-hook: install-data-hook-omf
uninstall-local: uninstall-local-doc uninstall-local-omf
uninstall-local-doc:
-if test "$(figdir)"; then \
for file in $(srcdir)/$(figdir)/*.png; do \
basefile=`echo $$file | sed -e 's,^.*/,,'`; \
rm -f $(docdir)/$(figdir)/$$basefile; \
done; \
rmdir $(DESTDIR)$(docdir)/$(figdir); \
fi
-for file in $(xml_files); do \
rm -f $(DESTDIR)$(docdir)/$$file; \
done
-rmdir $(DESTDIR)$(docdir)
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment