From: Dana Jansens Date: Wed, 16 May 2007 14:36:51 +0000 (+0000) Subject: updates to build debian and ubuntu debs. make man page say what webpage will probably... X-Git-Url: https://git.dogcows.com/gitweb?a=commitdiff_plain;h=fbae01436c9fd77e628384072eae1ba649d07f00;p=chaz%2Fopenbox updates to build debian and ubuntu debs. make man page say what webpage will probably say. --- diff --git a/debian/control b/debian/control index 68b6492f..0a15a771 100644 --- 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 8743e75b..6796f22e 100644 --- a/doc/openbox.1.sgml +++ b/doc/openbox.1.sgml @@ -30,8 +30,8 @@ manpage.1: manpage.sgml &dhpackage; - Next generation, highly configurable window manager - + A minimalistic, highly configurable, next generation window + manager with extensive standards support. @@ -50,9 +50,8 @@ manpage.1: manpage.sgml DESCRIPTION - Openbox is a next generation, highly - configurable window manager. Openbox is compliant with the - latest window manager standards. + Openbox is minimalistic, highly configurable, next generation window + manager with extensive standards support. You can start Openbox in three ways: diff --git a/makedeb b/makedeb index 9687ccd4..ac5f6de7 100755 --- 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