summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenedikt Meurer <benny@xfce.org>2004-09-30 12:59:22 +0000
committerBenedikt Meurer <benny@xfce.org>2004-09-30 12:59:22 +0000
commit810baea68e1326297c18174c220807bd6a82e849 (patch)
tree06107e6a7cb260462d2b76fb4f8a5932ecc76807
parent11406d3d268e0ce3efa02dd8d882bc3285f037a9 (diff)
downloadxfce4-session-810baea68e1326297c18174c220807bd6a82e849.tar.gz
Update version to 4.1.90.
(Old svn revision: 4676)
-rwxr-xr-xconfigure22
-rw-r--r--configure.ac2
-rw-r--r--docs/C/.cvsignore1
-rw-r--r--docs/C/images/.cvsignore1
-rw-r--r--icons/scalable/.cvsignore1
-rw-r--r--xfce4-session.rc1
-rw-r--r--xfce4-session/Makefile.in4
7 files changed, 18 insertions, 14 deletions
diff --git a/configure b/configure
index 2c09df0e..cdfa5a96 100755
--- a/configure
+++ b/configure
@@ -1,7 +1,7 @@
#! /bin/sh
-# From configure.ac Id: configure.ac,v 1.73 2004/09/23 21:36:59 pollux Exp .
+# From configure.ac Id: configure.ac,v 1.74 2004/09/26 13:40:49 benny Exp .
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for xfce4-session 4.1.16.
+# Generated by GNU Autoconf 2.59 for xfce4-session 4.1.90.
#
# Report bugs to <xfce4-dev@xfce.org>.
#
@@ -429,8 +429,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
# Identity of this package.
PACKAGE_NAME='xfce4-session'
PACKAGE_TARNAME='xfce4-session'
-PACKAGE_VERSION='4.1.16'
-PACKAGE_STRING='xfce4-session 4.1.16'
+PACKAGE_VERSION='4.1.90'
+PACKAGE_STRING='xfce4-session 4.1.90'
PACKAGE_BUGREPORT='xfce4-dev@xfce.org'
# Factoring default headers for most tests.
@@ -959,7 +959,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures xfce4-session 4.1.16 to adapt to many kinds of systems.
+\`configure' configures xfce4-session 4.1.90 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1029,7 +1029,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of xfce4-session 4.1.16:";;
+ short | recursive ) echo "Configuration of xfce4-session 4.1.90:";;
esac
cat <<\_ACEOF
@@ -1191,7 +1191,7 @@ fi
test -n "$ac_init_help" && exit 0
if $ac_init_version; then
cat <<\_ACEOF
-xfce4-session configure 4.1.16
+xfce4-session configure 4.1.90
generated by GNU Autoconf 2.59
Copyright (C) 2003 Free Software Foundation, Inc.
@@ -1210,7 +1210,7 @@ cat >&5 <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by xfce4-session $as_me 4.1.16, which was
+It was created by xfce4-session $as_me 4.1.90, which was
generated by GNU Autoconf 2.59. Invocation command line was
$ $0 $@
@@ -1549,7 +1549,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
-XFSM_VERSION=4.1.16
+XFSM_VERSION=4.1.90
am__api_version="1.8"
ac_aux_dir=
for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
@@ -25299,7 +25299,7 @@ _ASBOX
} >&5
cat >&5 <<_CSEOF
-This file was extended by xfce4-session $as_me 4.1.16, which was
+This file was extended by xfce4-session $as_me 4.1.90, which was
generated by GNU Autoconf 2.59. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -25362,7 +25362,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-xfce4-session config.status 4.1.16
+xfce4-session config.status 4.1.90
configured by $0, generated by GNU Autoconf 2.59,
with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
diff --git a/configure.ac b/configure.ac
index 27d3cb74..7dc8ca71 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl
dnl Version information
m4_define([xfsm_version_major], [4])
m4_define([xfsm_version_minor], [1])
-m4_define([xfsm_version_micro], [16])
+m4_define([xfsm_version_micro], [90])
m4_define([xfsm_version], [xfsm_version_major.xfsm_version_minor.xfsm_version_micro])
dnl Initialize autoconf
diff --git a/docs/C/.cvsignore b/docs/C/.cvsignore
new file mode 100644
index 00000000..f3c7a7c5
--- /dev/null
+++ b/docs/C/.cvsignore
@@ -0,0 +1 @@
+Makefile
diff --git a/docs/C/images/.cvsignore b/docs/C/images/.cvsignore
new file mode 100644
index 00000000..f3c7a7c5
--- /dev/null
+++ b/docs/C/images/.cvsignore
@@ -0,0 +1 @@
+Makefile
diff --git a/icons/scalable/.cvsignore b/icons/scalable/.cvsignore
new file mode 100644
index 00000000..f3c7a7c5
--- /dev/null
+++ b/icons/scalable/.cvsignore
@@ -0,0 +1 @@
+Makefile
diff --git a/xfce4-session.rc b/xfce4-session.rc
index 5208c39d..c336e81b 100644
--- a/xfce4-session.rc
+++ b/xfce4-session.rc
@@ -2,6 +2,7 @@
[General]
SessionName=Default
+SessionName[de]=Standard
DisableTcp=True
[Failsafe Session]
diff --git a/xfce4-session/Makefile.in b/xfce4-session/Makefile.in
index 44f9141a..90a88844 100644
--- a/xfce4-session/Makefile.in
+++ b/xfce4-session/Makefile.in
@@ -330,14 +330,14 @@ xfce4_session_CFLAGS = \
-DXFSM_SHUTDOWN_HELPER=\"$(libexecdir)/xfsm-shutdown-helper\"
xfce4_session_LDADD = \
+ libxfsm.la \
@GNOME_LIBS@ \
@LIBSM_LDFLAGS@ \
@LIBSM_LIBS@ \
@LIBX11_LDFLAGS@ \
@LIBX11_LIBS@ \
@LIBXFCE4MCS_CLIENT_LIBS@ \
- @LIBXFCEGUI4_LIBS@ \
- libxfsm.la
+ @LIBXFCEGUI4_LIBS@
xfce4_session_DEPENDENCIES = \
libxfsm.la