From: Dana Jansens Date: Sun, 13 May 2007 22:07:07 +0000 (+0000) Subject: merge r6480-6482 from trunk X-Git-Tag: openbox-3_3_991-RELEASE~50 X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=1ad88a5bcb0cc08303ce8b665d7153d7d0e5a8f7;p=dana%2Fopenbox.git merge r6480-6482 from trunk --- diff --git a/Makefile.am b/Makefile.am index 63120794..70ddf4ad 100644 --- a/Makefile.am +++ b/Makefile.am @@ -349,41 +349,41 @@ edit = $(SED) \ -e 's!@configdir\@!$(configdir)!' \ -e 's!@bindir\@!$(bindir)!' -data/xsession/openbox-gnome-session: Makefile \ +data/xsession/openbox-gnome-session: \ $(srcdir)/data/xsession/openbox-gnome-session.in @echo make: creating $@ @mkdir data 2>/dev/null || true @mkdir data/xsession 2>/dev/null || true - @$(edit) $(srcdir)/data/xsession/openbox-gnome-session.in >$@ + @$(edit) $< >$@ @chmod a+x $@ -data/xsession/openbox-kde-session: Makefile \ +data/xsession/openbox-kde-session: \ $(srcdir)/data/xsession/openbox-kde-session.in @echo make: creating $@ @mkdir data 2>/dev/null || true @mkdir data/xsession 2>/dev/null || true - @$(edit) $(srcdir)/data/xsession/openbox-kde-session.in >$@ + @$(edit) $< >$@ @chmod a+x $@ -doc/openbox.1.in: Makefile $(srcdir)/doc/openbox.1.sgml +doc/openbox.1.in: $(srcdir)/doc/openbox.1.sgml @echo make: creating $@ @mkdir doc 2>/dev/null || true - @docbook-to-man $(srcdir)/doc/openbox.1.sgml > $@ + @docbook-to-man $< > $@ -doc/openbox.1: Makefile doc/openbox.1.in +doc/openbox.1: doc/openbox.1.in @echo make: creating $@ @mkdir doc 2>/dev/null || true - @$(edit) $(srcdir)/doc/openbox.1.in >$@ + @$(edit) $< >$@ -doc/openbox-gnome-session.1: Makefile doc/openbox-gnome-session.1.sgml +doc/openbox-gnome-session.1: $(srcdir)/doc/openbox-gnome-session.1.sgml @echo make: creating $@ @mkdir doc 2>/dev/null || true - @docbook-to-man $(srcdir)/doc/openbox-gnome-session.1.sgml > $@ + @docbook-to-man $< > $@ -doc/openbox-kde-session.1: Makefile doc/openbox-kde-session.1.sgml +doc/openbox-kde-session.1: $(srcdir)/doc/openbox-kde-session.1.sgml @echo make: creating $@ @mkdir doc 2>/dev/null || true - @docbook-to-man $(srcdir)/doc/openbox-kde-session.1.sgml > $@ + @docbook-to-man $< > $@ dist_gnomewmfiles_DATA = \ data/gnome-wm-properties/openbox.desktop diff --git a/README.SVN b/README.SVN index b310cbd5..5e54472a 100644 --- a/README.SVN +++ b/README.SVN @@ -45,7 +45,6 @@ libxml2-dev libxcursor-dev libstartup-notification0-dev xlibs-dev -docbook-to-man tip: run "update-alternatives --config automake" and select automake1.9 before running ./configure diff --git a/debian/control b/debian/control index a2aff5a1..68b6492f 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: openbox Section: x11 Priority: optional Maintainer: Dana Jansens -Build-Depends: debhelper (>= 5), coreutils, sed, autotools-dev, gcc, automake1.9, autoconf, libtool, pkg-config, libpango1.0-dev, libglib2.0-dev, libxml2-dev, libxcursor-dev, libstartup-notification0-dev, xlibs-dev, libxinerama-dev, libxft2-dev, docbook-to-man +Build-Depends: debhelper (>= 5), coreutils, sed, autotools-dev, gcc, automake1.9, autoconf, libtool, pkg-config, libpango1.0-dev, libglib2.0-dev, libxml2-dev, libxcursor-dev, libstartup-notification0-dev, xlibs-dev, libxinerama-dev, libxft2-dev Standards-Version: 3.7.2 Package: openbox diff --git a/doc/openbox-gnome-session.1 b/doc/openbox-gnome-session.1 new file mode 100644 index 00000000..843801ff --- /dev/null +++ b/doc/openbox-gnome-session.1 @@ -0,0 +1,19 @@ +.TH "OPENBOX" "1" +.SH "NAME" +openbox-gnome-session \(em Run a GNOME session with Openbox as the window manager + +.SH "DESCRIPTION" +.PP +\fBopenbox-gnome-session\fR runs a GNOME session with +Openbox as the window manager. +.SH "SEE ALSO" +.PP +openbox(1), openbox-kde-session (1). + +.PP +The program's full documentation is available on the website: +\fBhttp://openbox.org/\fP +.PP +Please report bugs to: \fBhttp://bugzilla.icculus.org/ +\fP +.\" created by instant / docbook-to-man, Sun 13 May 2007, 17:59 diff --git a/doc/openbox-kde-session.1 b/doc/openbox-kde-session.1 new file mode 100644 index 00000000..1c87fb8c --- /dev/null +++ b/doc/openbox-kde-session.1 @@ -0,0 +1,19 @@ +.TH "OPENBOX" "1" +.SH "NAME" +openbox-kde-session \(em Run a KDE session with Openbox as the window manager + +.SH "DESCRIPTION" +.PP +\fBopenbox-kde-session\fR runs a KDE session with +Openbox as the window manager. +.SH "SEE ALSO" +.PP +openbox(1), openbox-gnome-session (1). + +.PP +The program's full documentation is available on the website: +\fBhttp://openbox.org/\fP +.PP +Please report bugs to: \fBhttp://bugzilla.icculus.org/ +\fP +.\" created by instant / docbook-to-man, Sun 13 May 2007, 17:59 diff --git a/doc/openbox.1.in b/doc/openbox.1.in new file mode 100644 index 00000000..9782d0e3 --- /dev/null +++ b/doc/openbox.1.in @@ -0,0 +1,80 @@ +.TH "OPENBOX" "1" +.SH "NAME" +openbox \(em Next generation, highly configurable window manager + +.SH "SYNOPSIS" +.PP +\fBopenbox\fR [\fB\-\-help\fP] [\fB\-\-version\fP] [\fB\-\-replace\fP] [\fB\-\-reconfigure\fP] [\fB\-\-sm-disable\fP] [\fB\-\-config \fITYPE\fR\fP] [\fB\-\-sync\fP] [\fB\-\-debug\fP] [\fB\-\-debug-focus\fP] +.SH "DESCRIPTION" +.PP +Openbox is a next generation, highly +configurable window manager. Openbox is compliant with the +latest window manager standards. +.PP +You can start Openbox in three ways: +.PP +If you run a display manager such as GDM, you will find 3 entries +in the login session type menu for Openbox: +\fBGNOME/Openbox\fR, \fBKDE/Openbox\fR and \fBOpenbox\fR. If you want to use Openbox +within GNOME or KDE, you can choose the appropriate entry, and it will +launch GNOME or KDE with Openbox as the window manager. +.PP +If you don't want to run Openbox withing a desktop environment, then +it is recommended that you instead set up a ~/.xsession file and +use the \fBDefault\fR session type. The ~/.xsession file +should any applications you want to run at startup, and then run +\fBopenbox\fR at the end, such as: +.PP +.RS +.PP +.nf +xsetroot \-solid grey & +gnome-settings-daemon & +exec \fBopenbox\fR +.fi +.RE +.PP +Lastly, if you use \fBstartx\fR to launch your X +session, you should set up a ~/.xinitrc file, exactly the same as the +above ~/.xsession file. +.PP +You can use the \fBobconf\fR tool to configure Openbox +easily with a graphical interface, however more in-depth configuration +is possible by editing the configuration files by hand. The default +configuration file is installed in @configdir@/openbox/rc.xml, and the +user configuration is placed in ~/.config/openbox/rc.xml. You can copy +the default configuration to ~/.config/openbox and edit it to your +liking. +.SH "OPTIONS" +.PP +These are the possible options that \fBopenbox\fR accepts: +.IP "\fB\-\-help\fP" 10 +Show a summary of the options available. +.IP "\fB\-\-version\fP" 10 +Show the version of the program. +.IP "\fB\-\-replace\fP" 10 +Replace the currently running window manager. +.IP "\fB\-\-reconfigure\fP" 10 +If Openbox is already running on the display, tell it to +reload it's configuration. +.IP "\fB\-\-sm-disable\fP" 10 +Do not connect to the session manager. +.IP "\fB\-\-config\fITYPE\fR\fP" 10 +Specify the configuration profile to use. +.IP "\fB\-\-sync\fP" 10 +Run in synchronous mode (for debugging). +.IP "\fB\-\-debug\fP" 10 +Display debugging output. +.IP "\fB\-\-debug-focus\fP" 10 +Display debugging output for focus handling. +.SH "SEE ALSO" +.PP +obconf (1), openbox-gnome-session (1), openbox-kde-session (1). + +.PP +The program's full documentation is available on the website: +\fBhttp://openbox.org/\fP +.PP +Please report bugs to: \fBhttp://bugzilla.icculus.org/ +\fP +.\" created by instant / docbook-to-man, Sun 13 May 2007, 17:59