merge r6407-6408 from trunk

diff --git a/debian/control b/debian/control
index dbbde15d3ccc18c1300ba73898491ac089810444..cad6ed4eb913fbbea7e39176047ed6ba7da7b701 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Standards-Version: 3.7.2
 
 Package: openbox
 Architecture: i386
-Depends: libc6 (>= 2.5), libglib2.0-0, libxcursor, libx11-6, libpango1.0-0, libice6, libsm6, libxext6, libxinerama1, libxml2, libstartup-notification0, libxft2
+Depends: libc6 (>= 2.5), libglib2.0-0, libxcursor1, libx11-6, libpango1.0-0, libice6, libsm6, libxext6, libxinerama1, libxml2, libstartup-notification0, libxft2
 Recommends: obconf, x-display-manager, ksmserver | gnome-session, ttf-bitstream-vera
 Suggests: menu
 Conflicts: menu (<< 2.1.12)

diff --git a/makedeb b/makedeb
index 7918d91caf3e782494a905383a03d490ae50202d..78d09d44a57807ce23673d5e19be65e1bcee83b6 100755 (executable)
--- a/makedeb
+++ b/makedeb
@@ -1,17 +1,20 @@
-#!/bin/sh -x
+#!/bin/sh
 
 # get the version from configure.ac
 VERSION=$(grep AC_INIT\(\\\[openbox\\] configure.ac|cut -d [ -f 3-|cut -d ] -f 1)
 
+echo "Building deb for openbox-$VERSION"
+
 TIME="$(date '+%a, %d %B %Y %T %z')"
 
 IN=debian/changelog.in
 OUT=debian/changelog
 
 # make sure configure gets run with the right parameters
-make distclean || rm -f config.status
+make distclean >/dev/null || rm -f config.status
 
 rm -f $OUT
 
 sed -e "s!@time@!$TIME!" -e "s!@version@!$VERSION!" $IN >$OUT && \
-fakeroot debian/rules binary
+fakeroot debian/rules binary && \
+make distclean >/dev/null