merge r6577-6578 from trunk

diff --git a/debian/control b/debian/control
index 68b6492fa3d92e9c9dcd9ee8e41da87de523c7eb..0a15a7716a025d8e09b85a72b5d7bb425ef1790d 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -7,12 +7,10 @@ Standards-Version: 3.7.2
 
 Package: openbox
 Architecture: i386
-Depends: libc6 (>= 2.5), libglib2.0-0, libxcursor1, libx11-6, libpango1.0-0, libice6, libsm6, libxext6, libxinerama1, libxml2, libstartup-notification0, libxft2
+Depends: libc6, libglib2.0-0, libxcursor1, libx11-6, libpango1.0-0, libice6, libsm6, libxext6, libxinerama1, libxml2, libstartup-notification0, libxft2
 Recommends: obconf, ttf-bitstream-vera
-Suggests: menu, x-display-manager, ksmserver | gnome-session
+Suggests: menu, x-display-manager, ksmserver | gnome-session, kdm | gdm
 Conflicts: menu (<< 2.1.12)
 Provides: x-window-manager
-Description: stuff
- long stuff
- .
- http://openbox.org/
+Description: A minimalistic, highly configurable, next generation window manager with extensive standards support.
+ http://icculus.org/openbox/

diff --git a/doc/openbox.1.sgml b/doc/openbox.1.sgml
index 8743e75be4223f093dc6495945ac0f5153dc0c27..6796f22eb439c3759df6c46168f5ba8b24086422 100644 (file)
--- a/doc/openbox.1.sgml
+++ b/doc/openbox.1.sgml
@@ -30,8 +30,8 @@ manpage.1: manpage.sgml
   <refnamediv>
     <refname>&dhpackage;</refname>
 
-    <refpurpose>Next generation, highly configurable window manager
-      </refpurpose>
+    <refpurpose>A minimalistic, highly configurable, next generation window
+      manager with extensive standards support.</refpurpose>
   </refnamediv>
   <refsynopsisdiv>
     <cmdsynopsis>
@@ -50,9 +50,8 @@ manpage.1: manpage.sgml
   <refsect1>
     <title>DESCRIPTION</title>
 
-    <para>Openbox is a next generation, highly
-      configurable window manager. Openbox is compliant with the
-      latest window manager standards.</para>
+    <para>Openbox is minimalistic, highly configurable, next generation window
+      manager with extensive standards support.</para>
 
     <para>You can start Openbox in three ways:</para>
 

diff --git a/makedeb b/makedeb
index 9687ccd47256a6c85e84bb8e40ce40206411e0a8..ac5f6de71905f5f72e7767e885244531688a7e16 100755 (executable)
--- a/makedeb
+++ b/makedeb
@@ -1,10 +1,21 @@
 #!/bin/sh
 
+if test "$1" = "ubuntu"; then
+    APPEND="ubuntu1";
+else
+    if test "$1" = "debian"; then
+        APPEND="";
+    else
+        echo "Usage: makedeb [ubuntu|debian]";
+        exit 1;
+    fi
+fi
+
 # get the version from configure.ac
 VERSION=$(grep AC_INIT\(\\\[openbox\\] configure.ac|cut -d [ -f 3-|cut -d ] -f 1)
 
 echo
-echo "Building deb for openbox-$VERSION"
+echo "Building deb for openbox-$VERSION$APPEND"
 echo
 
 TIME="$(date '+%a, %d %B %Y %T %z')"
@@ -17,6 +28,6 @@ make distclean > /dev/null || rm -f config.status
 
 rm -f $OUT
 
-sed -e "s!@time@!$TIME!" -e "s!@version@!$VERSION!" $IN >$OUT && \
+sed -e "s!@time@!$TIME!" -e "s!@version@!$VERSION$APPEND!" $IN >$OUT && \
 fakeroot debian/rules binary && \
 make distclean > /dev/null

diff --git a/openbox/client.c b/openbox/client.c
index dba7706be0a057baf15b881bcaff133c1474e919..9bf378e191c2b760a89c23a110f5536e3726ef0d 100644 (file)
--- a/openbox/client.c
+++ b/openbox/client.c
@@ -2339,6 +2339,7 @@ static ObStackingLayer calc_layer(ObClient *self)
     else if ((self->fullscreen ||
               /* no decorations and fills the monitor = oldskool fullscreen */
               (self->frame != NULL &&
+               self->decorations == 0 &&
                (self->frame->size.right == 0 && self->frame->size.left == 0 &&
                 self->frame->size.bottom == 0 && self->frame->size.top == 0 &&
                 RECT_EQUAL(self->area,