From 6e53c4f17692101a6fa129c22d9d1a1a9b17d2f2 Mon Sep 17 00:00:00 2001 From: Mikael Magnusson Date: Fri, 26 Mar 2010 02:14:23 +0100 Subject: [PATCH] Bump to 3.4.11.1 and update CHANGELOG, add --config-file to man page --- CHANGELOG | 8 ++++++++ Makefile.am | 1 + configure.ac | 8 ++++---- doc/openbox.1.in | 7 +++++-- doc/openbox.1.sgml | 8 ++++++++ 5 files changed, 26 insertions(+), 6 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 915e315..da5f871 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,11 @@ +3.4.11.1: + * Updated Polish translation. + * Fixed bug #4519 (Incorrect focus in reused windows). + * Lower the default submenu open/hide delay from 200ms to 100ms. + * Fix some more problems with gnome integration. + * Update Clearlooks theme. + * Some other small fixes. + 3.4.11: * Update Hungarian, Japanese, and Latvian translations. * Make xdg-autostart use the OPENBOX environment by default, so you can use diff --git a/Makefile.am b/Makefile.am index f262fb9..e2430e0 100644 --- a/Makefile.am +++ b/Makefile.am @@ -543,6 +543,7 @@ CLEANFILES = \ doc/openbox-session.1 \ doc/openbox-gnome-session.1 \ doc/openbox-kde-session.1 \ + doc/obxprop.1 \ data/xsession/openbox-session \ data/xsession/openbox-gnome-session \ data/xsession/openbox-kde-session \ diff --git a/configure.ac b/configure.ac index 1ed2fd2..ef3c4bb 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ AC_PREREQ([2.54]) -AC_INIT([openbox], [3.4.11], [http://bugzilla.icculus.org]) +AC_INIT([openbox], [3.4.11.1], [http://bugzilla.icculus.org]) AM_INIT_AUTOMAKE AC_CONFIG_SRCDIR([openbox/openbox.c]) @@ -15,9 +15,9 @@ dnl if MAJOR or MINOR version changes, be sure to change AC_INIT above to match dnl OB_MAJOR_VERSION=3 OB_MINOR_VERSION=4 -OB_MICRO_VERSION=28 -OB_INTERFACE_AGE=7 -OB_BINARY_AGE=7 +OB_MICRO_VERSION=29 +OB_INTERFACE_AGE=8 +OB_BINARY_AGE=8 OB_VERSION=$PACKAGE_VERSION AC_SUBST(OB_MAJOR_VERSION) diff --git a/doc/openbox.1.in b/doc/openbox.1.in index d508e8c..89183aa 100644 --- a/doc/openbox.1.in +++ b/doc/openbox.1.in @@ -4,7 +4,7 @@ openbox \(em A minimalistic, highly configurable, next generation window manager with extensive standards support. .SH "SYNOPSIS" .PP -\fBopenbox\fR [\fB\-\-help\fP] [\fB\-\-version\fP] [\fB\-\-replace\fP] [\fB\-\-reconfigure\fP] [\fB\-\-restart\fP] [\fB\-\-sm-disable\fP] [\fB\-\-sync\fP] [\fB\-\-debug\fP] [\fB\-\-debug-focus\fP] [\fB\-\-debug-xinerama\fP] +\fBopenbox\fR [\fB\-\-help\fP] [\fB\-\-version\fP] [\fB\-\-replace\fP] [\fB\-\-reconfigure\fP] [\fB\-\-restart\fP] [\fB\-\-config-file FILE\fP] [\fB\-\-sm-disable\fP] [\fB\-\-sync\fP] [\fB\-\-debug\fP] [\fB\-\-debug-focus\fP] [\fB\-\-debug-xinerama\fP] .SH "DESCRIPTION" .PP Openbox is minimalistic, highly configurable, next generation window @@ -70,6 +70,9 @@ reload its configuration. If Openbox is already running on the display, tell it to restart. This is useful if you have upgraded Openbox and don't want to restart X. +.IP "\fB\-\-config-file FILE\fP" 10 +Use FILE for configuration instead of looking for rc.xml +in the XDG search path. FILE is an absolute path. .IP "\fB\-\-sm-disable\fP" 10 Do not connect to the session manager. .IP "\fB\-\-sync\fP" 10 @@ -92,4 +95,4 @@ The program's full documentation is available on the website: .PP Please report bugs to: \fBhttp://bugzilla.icculus.org/ \fP -.\" created by instant / docbook-to-man, Wed 06 Jan 2010, 13:40 +.\" created by instant / docbook-to-man, Fri 26 Mar 2010, 01:55 diff --git a/doc/openbox.1.sgml b/doc/openbox.1.sgml index 275c324..a06d0cf 100644 --- a/doc/openbox.1.sgml +++ b/doc/openbox.1.sgml @@ -41,6 +41,7 @@ manpage.1: manpage.sgml + @@ -137,6 +138,13 @@ manpage.1: manpage.sgml + + + Use FILE for configuration instead of looking for rc.xml + in the XDG search path. FILE is an absolute path. + + + Do not connect to the session manager. -- 1.9.1