Skip to content

Commit c55d201

Browse files
jstedfastJeffrey Stedfast
authored andcommitted
Bumped version
2007-02-08 Jeffrey Stedfast <[email protected]> * README: Bumped version * configure.in: Bumped version to 2.2.4 svn path=/trunk/; revision=1051
1 parent 2f6a0de commit c55d201

File tree

124 files changed

+300
-289
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

124 files changed

+300
-289
lines changed

AUTHORS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
Jeffrey Stedfast <fejj@novell.com>
1+
Jeffrey Stedfast <fejj@gnome.org>

ChangeLog

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
2007-02-08 Jeffrey Stedfast <[email protected]>
2+
3+
* README: Bumped version
4+
5+
* configure.in: Bumped version to 2.2.4
6+
17
2007-02-06 Jeffrey Stedfast <[email protected]>
28

39
Fix for bug #394433

PORTING

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,4 +134,4 @@ If you find more trouble spots when porting your code from one version
134134
of GMime to a later version, please feel free to send me additional
135135
notes to add to this porting document.
136136

137-
-- fejj@ximian.com
137+
-- fejj@gnome.org

README

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
GMime, version 2.2.3
2-
by Jeffrey Stedfast <fejj@novell.com>
1+
GMime, version 2.2.4
2+
by Jeffrey Stedfast <fejj@gnome.org>
33

44

55
WHAT IS GMIME
@@ -33,6 +33,7 @@ following RFCs:
3333
Sets, Languages, and Continuations
3434
* 2231: MIME Parameter Value and Encoded Word Extensions: Character
3535
Sets, Languages, and Continuations (Obsoletes rfc2184)
36+
* 2822: Internet Message Format (Obsoletes rfc822)
3637
* 3156: MIME Security with OpenPGP (Updates rfc2015)
3738

3839
Other RFCs of interest:
@@ -62,7 +63,7 @@ Cryptography related RFCs:
6263
LICENSE INFORMATION
6364
-------------------
6465

65-
The GMime library is Copyright (C) 2000-2004 Jeffrey Stedfast.
66+
The GMime library is Copyright (C) 2000-2007 Jeffrey Stedfast.
6667

6768
This library is free software; you can redistribute it and/or modify
6869
it under the terms of the GNU General Public License as published by
@@ -115,11 +116,11 @@ REQUIREMENTS
115116
For proper compilation and functionality of GMime, the following packages
116117
are REQUIRED:
117118

118-
- Glib version 2.0.x
119+
- Glib version 2.x
119120
Glib provides a number of portability-enhancing functions and types.
120121
Glib is included in most GMime-supported operating system
121122
distributions. Glib sources may be obtained from:
122-
ftp://ftp.gtk.org/pub/gtk/v2.0
123+
ftp://ftp.gtk.org/pub/glib
123124

124125

125126
DOCUMENTATION

TODO

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,4 +49,4 @@ InternetAddress with a name of "Joe Bob" and a NULL addr
4949

5050

5151
All questions and comments should be directed toward the author,
52-
Jeffrey Stedfast <fejj@ximian.com>
52+
Jeffrey Stedfast <fejj@gnome.org>

configure.in

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ AM_CONFIG_HEADER(config.h)
1212

1313
GMIME_MAJOR_VERSION=2
1414
GMIME_MINOR_VERSION=2
15-
GMIME_MICRO_VERSION=3
15+
GMIME_MICRO_VERSION=4
1616
GMIME_VERSION=$GMIME_MAJOR_VERSION.$GMIME_MINOR_VERSION.$GMIME_MICRO_VERSION
1717
GMIME_VERSION_INFO=`expr $GMIME_MAJOR_VERSION + $GMIME_MINOR_VERSION`:$GMIME_MICRO_VERSION:$GMIME_MINOR_VERSION
1818

@@ -66,7 +66,7 @@ AM_PROG_CC_STDC
6666
AC_C_INLINE
6767
dnl AC_HEADER_STDC
6868
AC_STDC_HEADERS
69-
AC_ARG_PROGRAM
69+
dnl AC_ARG_PROGRAM
7070
AC_PROG_INSTALL
7171
AC_PROG_LN_S
7272
AC_PROG_MAKE_SET
@@ -105,11 +105,14 @@ dnl Check for working mmap
105105
AC_FUNC_MMAP
106106
AC_CHECK_FUNCS(munmap msync)
107107

108-
dnl ******************************
109-
dnl gtk-doc
110-
dnl ******************************
108+
dnl ************************************
109+
dnl Checks for gtk-doc and docbook-tools
110+
dnl ************************************
111111

112-
GTK_DOC_CHECK([1.0])
112+
GTK_DOC_CHECK([1.4])
113+
114+
AC_CHECK_PROG(DB2HTML, db2html, true, false)
115+
AM_CONDITIONAL(HAVE_DOCBOOK, $DB2HTML)
113116

114117
dnl NOTE: We need to use a separate automake conditional for this
115118
dnl to make this work with the tarballs.
@@ -160,7 +163,7 @@ AC_TRY_RUN([
160163
#include "iconv-detect.c"
161164
],[
162165
AC_MSG_RESULT(found)
163-
AC_DEFINE(HAVE_ICONV_DETECT_H)
166+
AC_DEFINE(HAVE_ICONV_DETECT_H, 1, [Define to 1 to use auto-detected iconv-friendly charset names.])
164167
],[
165168
AC_MSG_RESULT([not found
166169
*** The iconv-detect program was unable to determine the
@@ -210,7 +213,7 @@ AC_TRY_LINK([
210213
]
211214
,
212215
AC_MSG_RESULT(yes)
213-
AC_DEFINE(HAVE_FSYNC)
216+
AC_DEFINE(HAVE_FSYNC, 1, [Define to 1 if you have the `fsync' function.])
214217
,
215218
AC_MSG_RESULT(no)
216219
)
@@ -225,7 +228,7 @@ AC_TRY_COMPILE([
225228
,
226229
AC_MSG_RESULT(yes)
227230
,
228-
AC_DEFINE(MAXHOSTNAMELEN, 64)
231+
AC_DEFINE(MAXHOSTNAMELEN, 64, [Define with a value if your <sys/param.h> does not define MAXHOSTNAMELEN])
229232
AC_MSG_RESULT(no; defined as 64)
230233
)
231234

docs/reference/Makefile.am

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,8 +76,6 @@ EXTRA_DIST += \
7676
$(DOC_MODULE)-sections.txt \
7777
gmime.hierarchy
7878

79-
########################################################################
80-
8179
BUILT_EXTRA_DIST =
8280

8381
dist-hook-local: $(BUILT_EXTRA_DIST)

docs/reference/gmime-docs.sgml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,13 +71,13 @@
7171
<surname>Stedfast</surname>
7272
<affiliation>
7373
<address>
74-
<email>fejj@novell.com</email>
74+
<email>fejj@gnome.org</email>
7575
</address>
7676
</affiliation>
7777
</author>
7878
</authorgroup>
7979
<copyright>
80-
<year>2000-2006</year>
80+
<year>2000-2007</year>
8181
<holder>Jeffrey Stedfast</holder>
8282
</copyright>
8383

docs/tutorial/Makefile.am

Lines changed: 18 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,39 @@
1-
EXTRA_DIST = gmime-tut.sgml
1+
.PHONY: html pdf
22

3-
all: html
3+
EXTRA_DIST = gmime-tut.sgml
44

5-
html:
6-
if ENABLE_GTK_DOC
7-
(cd $(srcdir); \
8-
db2html gmime-tut.sgml; \
9-
test -d html && rm -r html; \
10-
mv gmime-tut html)
5+
html:
6+
if HAVE_DOCBOOK
7+
if test -w $(srcdir); then \
8+
(cd $(srcdir); \
9+
db2html gmime-tut.sgml; \
10+
test -d html && rm -r html; \
11+
mv gmime-tut html; \
12+
mkdir html/images; \
13+
cp images/*.png html/images); \
14+
fi
1115
else
1216
echo "***"
1317
echo "*** Warning: Tutorial not built"
1418
echo "***"
1519
endif
1620

1721
pdf:
18-
if ENABLE_GTK_DOC
19-
(cd $(srcdir); db2pdf gmime-tut.sgml)
22+
if HAVE_DOCBOOK
23+
if test -w $(srcdir); then \
24+
(cd $(srcdir); db2pdf gmime-tut.sgml); \
25+
fi
2026
else
2127
echo "***"
2228
echo "*** Warning: Tutorial not built"
2329
echo "***"
2430
endif
2531

2632
dist-hook: html
27-
if ENABLE_GTK_DOC
33+
if HAVE_DOCBOOK
2834
cp -Rp $(srcdir)/html $(distdir)
2935
else
30-
echo "***"
31-
echo "*** Warning: Tutorial not built"
3236
echo "*** DISTRIBUTION IS INCOMPLETE"
3337
echo "***"
3438
endif
39+

gmime/gen-table.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
22
/* GMime
3-
* Copyright (C) 1999-2006 Jeffrey Stedfast
3+
* Copyright (C) 2000-2007 Jeffrey Stedfast
44
*
55
* This program is free software; you can redistribute it and/or modify
66
* it under the terms of the GNU General Public License as published by
@@ -14,7 +14,7 @@
1414
*
1515
* You should have received a copy of the GNU General Public License
1616
* along with this program; if not, write to the Free Software
17-
* Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA.
17+
* Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
1818
*/
1919

2020

0 commit comments

Comments
 (0)