--- a/Solaris/ChangeLog	Thu Jul 20 09:22:45 2006 +0000
+++ b/Solaris/ChangeLog	Thu Jul 20 09:51:45 2006 +0000
@@ -1,3 +1,8 @@
+2006-07-20  Irene Huang <[email protected]>
+
+	* SUNWevolution.spec: Remove manpage evolution-addressbook-export.1
+	* manpages/sman1/evolution-addressbook-export.1: Removed
+
 2006-07-20  Damien Carbery <[email protected]>
 
 	* Solaris.inc: Change version from 2.14.1 to 2.15.4.

--- a/Solaris/SUNWevolution.spec	Thu Jul 20 09:22:45 2006 +0000
+++ b/Solaris/SUNWevolution.spec	Thu Jul 20 09:51:45 2006 +0000
@@ -21,7 +21,6 @@
 %include default-depend.inc
 Source1:       idnkit.pc
 Source2:       evolution.1
-Source3:       evolution-addressbook-export.1
 Patch1:        evolution-01-solaris-ldap.diff
 Patch2:        evolution-02-solaris-sed.diff
 Patch3:        evolution-03-kerberos.diff
@@ -127,7 +126,6 @@
 rm -rf $RPM_BUILD_ROOT%{_mandir}
 install -d $RPM_BUILD_ROOT%{_mandir}/sman1
 install --mode=0644 %SOURCE2 $RPM_BUILD_ROOT%{_mandir}/sman1
-install --mode=0644 %SOURCE3 $RPM_BUILD_ROOT%{_mandir}/sman1
 
 %if %build_l10n
 %else
@@ -250,6 +248,8 @@
 %{_sysconfdir}/gconf/schemas/evolution-mail-2.6.schemas
 
 %changelog
+* Thu Jul 20 2006 - [email protected]
+- remove manpage evolution-addressbook-export.1
 * Fri Jul 14 2006 - [email protected]
 - update %post/%postun/etc scripts to support diskless client setup,
   part of 6448317

--- a/Solaris/manpages/sman1/evolution-addressbook-export.1	Thu Jul 20 09:22:45 2006 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,149 +0,0 @@
-<!DOCTYPE REFENTRY PUBLIC "-//Sun Microsystems//DTD DocBook V3.0-Based SolBook Subset V2.0//EN" [
-<!--ArborText, Inc., 1988-1999, v.4002-->
-<!ENTITY envr-tt "ENVIRONMENT VARIABLES">
-<!ENTITY cmd "evolution-addressbook-export">
-<!ENTITY % commonents SYSTEM "smancommon.ent">
-%commonents;
-<!ENTITY % booktitles SYSTEM "booktitles.ent">
-%booktitles;
-<!ENTITY suncopy "Copyright (c) 2003, Sun Microsystems, Inc. All Rights Reserved.">
-]>
-<?Pub UDT _bookmark _target>
-<?Pub Inc>
-<refentry id="evolution-addressbook-export-1">
-<!-- %Z%%M% %I% %E% SMI; -->
-<refmeta><refentrytitle>evolution-addressbook-export</refentrytitle><manvolnum>
-1</manvolnum>
-<refmiscinfo class="date">15 Apr 2004</refmiscinfo>
-<refmiscinfo class="sectdesc">&man1;</refmiscinfo>
-<refmiscinfo class="software">&release;</refmiscinfo>
-<refmiscinfo class="arch">generic</refmiscinfo>
-<refmiscinfo class="copyright">&suncopy;</refmiscinfo>
-</refmeta>
-<indexterm><primary>evolution-addressbook-export</primary></indexterm><indexterm>
-<primary>Evolution</primary></indexterm>
-<refnamediv id="evolution-addressbook-export-1-name"><refname>evolution-addressbook-export
-</refname><refpurpose>export local address book from Ximian Evolution, Sun
-Microsystems Edition</refpurpose></refnamediv>
-<refsynopsisdiv id="evolution-addressbook-export-1-synp"><title>&synp-tt;</title>
-<cmdsynopsis><command>&cmd;</command><arg choice="opt"><option>-async</option></arg>
-<arg choice="opt"><option>-format=[vcard|csv]</option></arg><arg choice="opt"><option>
--help</option></arg><arg choice="opt"><option>-list-addressbook-folders</option></arg>
-<arg choice="opt"><option>-output=<replaceable>output-file</replaceable></option></arg>
-<arg choice="opt"><option>-size=<replaceable>number</replaceable></option></arg>
-<arg choice="opt"><option>-usage</option></arg><arg choice="opt"><option>
--version</option></arg>
-</cmdsynopsis></refsynopsisdiv>
-<refsect1 id="evolution-addressbook-export-1-desc"><title>&desc-tt;</title>
-<para>Export the local address book to a file.</para>
-</refsect1>
-<refsect1 id="evolution-addressbook-export-1-opts"><title>&opts-tt;</title>
-<para>The following options are supported:</para>
-<variablelist termlength="medium">
-<varlistentry><term><option>-async</option></term><listitem><para>Export in
-asynchronous mode. You can also use <option>a</option> to specify this option.
-</para>
-</listitem></varlistentry>
-<varlistentry><term><option>-format=[vcard|csv]</option></term><listitem>
-<para>Specify the export format:  virtual card (vcard) or comma-separated
-value (csv).</para>
-</listitem></varlistentry>
-<varlistentry><term><option>-help</option></term><listitem><para>Display help
-text. You can also use <option>?</option> to specify this option.</para>
-</listitem></varlistentry>
-<varlistentry><term><option>-list-addressbook-folders</option></term><listitem>
-<para>List the local address-book folders. You can also use <option>l</option>
-to specify this option.</para>
-</listitem></varlistentry>
-<varlistentry><term><option>-output=<replaceable>output-file</replaceable></option></term>
-<listitem><para>Specify the name of the output file to store the exported
-information. If no output file is specified, the exported information is sent
-to standard output.</para>
-</listitem></varlistentry>
-<varlistentry><term><option>-size=<replaceable>number</replaceable></option></term>
-<listitem><para>Specify the number of cards in one output file in asychronous
-mode. The default value is 100.</para>
-</listitem></varlistentry>
-<varlistentry><term><option>-usage</option></term><listitem><para>Display
-brief usage text.</para>
-</listitem></varlistentry>
-<varlistentry><term><option>-version</option></term><listitem><para>Display
-version information.</para>
-</listitem></varlistentry>
-</variablelist></refsect1>
-<refsect1 id="evolution-addressbook-export-1-exam"><title>&exam-tt;</title>
-<example role="example">
-<title>Exporting Local Address Book in Asynchronous Mode and Vcard Format
-<?Pub Caret>to contacts.vcf</title>
-<para><screen>example% <userinput>&cmd; -a --format=vcard --output=contacts.vcf
-</userinput></screen></para>
-</example>
-</refsect1>
-<refsect1 id="evolution-addressbook-export-1-exit"><title>&exit-tt;</title>
-<para>The following exit values are returned:</para>
-<variablelist termlength="xtranarrow">
-<varlistentry><term><returnvalue>0</returnvalue></term><listitem><para>Application
-exited successfully</para>
-</listitem></varlistentry>
-<varlistentry><term><returnvalue>1</returnvalue></term><listitem><para>Application
-exited with failure</para>
-</listitem></varlistentry>
-</variablelist></refsect1>
-<refsect1 id="evolution-addressbook-export-1-file"><title>&file-tt;</title>
-<para>The following files are used by this application:</para>
-<variablelist termlength="wholeline">
-<varlistentry><term><filename>/usr/bin/&cmd;</filename> </term><listitem>
-<para>Executable to export Evolution local address book</para>
-</listitem></varlistentry>
-<varlistentry><term><filename>$HOME/evolution</filename> </term><listitem>
-<para>Per-user configuration files and local storage for Evolution</para>
-</listitem></varlistentry>
-<varlistentry><term><filename>$HOME/evolution/mail/<replaceable>account</replaceable>/<replaceable>
-folders</replaceable></filename> </term><listitem><para>Temporary files for
-Evolution mail</para>
-</listitem></varlistentry>
-<varlistentry><term><filename>$HOME/evolution/sunone/<replaceable>account
-</replaceable>/<replaceable>folders</replaceable></filename> </term><listitem>
-<para>Temporary files for Evolution Sun ONE account</para>
-</listitem></varlistentry>
-</variablelist></refsect1>
-<refsect1 id="evolution-addressbook-export-1-attr"><title>&attr-tt;</title>
-<para>See <olink targetdocent="REFMAN5" localinfo="attributes-5"><citerefentry>
-<refentrytitle>attributes</refentrytitle><manvolnum>5</manvolnum></citerefentry></olink>
-for descriptions of the following attributes:</para>
-<informaltable frame="all">
-<tgroup cols="2" colsep="1" rowsep="1"><colspec colname="COLSPEC0" colwidth="1*">
-<colspec colname="COLSPEC1" colwidth="1*">
-<thead>
-<row><entry align="center" valign="middle">ATTRIBUTE TYPE</entry><entry align="center"
-valign="middle">ATTRIBUTE VALUE</entry></row>
-</thead>
-<tbody>
-<row><entry colname="COLSPEC0"><para>Architecture</para></entry><entry colname="COLSPEC1"><para>
-SPARC</para></entry></row>
-<row><entry><para>Availability</para></entry><entry><para>SUNWevo</para></entry>
-</row>
-<row><entry colname="COLSPEC0"><para>CSI</para></entry><entry colname="COLSPEC1"><para>
-Enabled</para></entry></row>
-<row><entry colname="COLSPEC0"><para>Interface stability</para></entry><entry
-colname="COLSPEC1"><para>Standard</para></entry></row>
-<row><entry colname="COLSPEC0"><para>MT-Level</para></entry><entry colname="COLSPEC1"><para>
-MT safe with Exceptions</para></entry></row>
-</tbody>
-</tgroup>
-</informaltable>
-</refsect1>
-<refsect1 id="evolution-addressbook-export-1-also"><title>&also-tt;</title>
-<!--Reference to another man page-->
-<!--Reference to a Help manual-->
-<!--Reference to a book.-->
-<para><citetitle>Ximian Evolution Sun Microsystems Edition User Guide</citetitle></para>
-<para><citerefentry><refentrytitle>evolution</refentrytitle><manvolnum>1</manvolnum>
-</citerefentry>, <citerefentry><refentrytitle>evolution-address-import</refentrytitle>
-<manvolnum>1</manvolnum></citerefentry></para>
-</refsect1>
-<refsect1 id="evolution-addressbook-export-1-note"><title>&note-tt;</title>
-<para>Written by Steven Zhang, Sun Microsystems Inc., 2004.</para>
-</refsect1>
-</refentry>
-<?Pub *0000007541>