From: Dana Jansens Date: Sun, 13 May 2007 00:16:11 +0000 (+0000) Subject: changes to build.. X-Git-Url: https://git.brokenzipper.com/gitweb?a=commitdiff_plain;h=d676c11881a1df413a6b204e101a378125534920;p=chaz%2Fopenbox changes to build.. --- diff --git a/Makefile.am b/Makefile.am index 6011e04c..3ae2b3dd 100644 --- a/Makefile.am +++ b/Makefile.am @@ -383,9 +383,7 @@ data/xsession/openbox-kde-session: Makefile data \ @chmod +x $@ dist_gnomewmfiles_DATA = \ - data/gnome-wm-properties/openbox.desktop \ - data/gnome-wm-properties/openbox-gnome.desktop \ - data/gnome-wm-properties/openbox-kde.desktop + data/gnome-wm-properties/openbox.desktop dist_xsessions_DATA = \ data/xsession/openbox.desktop \ @@ -397,15 +395,10 @@ dist_noinst_DATA = \ debian/compat \ debian/control \ debian/copyright \ - debian/menu.ex \ - debian/openbox-default.ex \ - debian/openbox.doc-base.EX \ - debian/postinst.ex \ - debian/postrm.ex \ - debian/preinst.ex \ - debian/prerm.ex \ + debian/menu \ + debian/postinst \ + debian/postrm \ debian/rules \ - debian/watch.ex \ version.h.in \ data/rc.xsd \ data/menu.xsd \ diff --git a/data/gnome-wm-properties/openbox-gnome.desktop b/data/gnome-wm-properties/openbox-gnome.desktop deleted file mode 100644 index be8ff35f..00000000 --- a/data/gnome-wm-properties/openbox-gnome.desktop +++ /dev/null @@ -1,9 +0,0 @@ -[Desktop Entry] -Name=Openbox/GNOME -Exec=openbox-gnome - -# name we put on the WM spec check window -X-GNOME-WMName=openbox-gnome - -# our config tool -ConfigExec=obconf diff --git a/data/gnome-wm-properties/openbox-kde.desktop b/data/gnome-wm-properties/openbox-kde.desktop deleted file mode 100644 index 0208c328..00000000 --- a/data/gnome-wm-properties/openbox-kde.desktop +++ /dev/null @@ -1,10 +0,0 @@ -[Desktop Entry] -Name=Openbox/GNOME -Exec=openbox-kde - -# name we put on the WM spec check window -X-GNOME-WMName=openbox-kde - -# our config tool -ConfigExec=obconf - diff --git a/debian/menu.ex b/debian/menu similarity index 100% rename from debian/menu.ex rename to debian/menu diff --git a/debian/openbox-default.ex b/debian/openbox-default.ex deleted file mode 100644 index 7395c1a2..00000000 --- a/debian/openbox-default.ex +++ /dev/null @@ -1,10 +0,0 @@ -# Defaults for openbox initscript -# sourced by /etc/init.d/openbox -# installed at /etc/default/openbox by the maintainer scripts - -# -# This is a POSIX shell fragment -# - -# Additional options that are passed to the Daemon. -DAEMON_OPTS="" diff --git a/debian/openbox.doc-base.EX b/debian/openbox.doc-base.EX deleted file mode 100644 index e3e0931e..00000000 --- a/debian/openbox.doc-base.EX +++ /dev/null @@ -1,22 +0,0 @@ -Document: openbox -Title: Debian openbox Manual -Author: -Abstract: This manual describes what openbox is - and how it can be used to - manage online manuals on Debian systems. -Section: unknown - -Format: debiandoc-sgml -Files: /usr/share/doc/openbox/openbox.sgml.gz - -Format: postscript -Files: /usr/share/doc/openbox/openbox.ps.gz - -Format: text -Files: /usr/share/doc/openbox/openbox.text.gz - -Format: HTML -Index: /usr/share/doc/openbox/html/index.html -Files: /usr/share/doc/openbox/html/*.html - - diff --git a/debian/postinst.ex b/debian/postinst similarity index 100% rename from debian/postinst.ex rename to debian/postinst diff --git a/debian/postrm.ex b/debian/postrm similarity index 100% rename from debian/postrm.ex rename to debian/postrm diff --git a/debian/preinst.ex b/debian/preinst.ex deleted file mode 100644 index 95364624..00000000 --- a/debian/preinst.ex +++ /dev/null @@ -1,37 +0,0 @@ -#!/bin/sh -# preinst script for openbox -# -# see: dh_installdeb(1) - -set -e - -# summary of how this script can be called: -# * `install' -# * `install' -# * `upgrade' -# * `abort-upgrade' -# for details, see http://www.debian.org/doc/debian-policy/ or -# the debian-policy package - - -case "$1" in - install|upgrade) - ;; - - abort-upgrade) - ;; - - *) - echo "preinst called with unknown argument \`$1'" >&2 - exit 1 - ;; -esac - -# dh_installdeb will replace this with shell code automatically -# generated by other debhelper scripts. - -#DEBHELPER# - -exit 0 - - diff --git a/debian/prerm.ex b/debian/prerm.ex deleted file mode 100644 index 11877266..00000000 --- a/debian/prerm.ex +++ /dev/null @@ -1,40 +0,0 @@ -#!/bin/sh -# prerm script for openbox -# -# see: dh_installdeb(1) - -set -e - -# summary of how this script can be called: -# * `remove' -# * `upgrade' -# * `failed-upgrade' -# * `remove' `in-favour' -# * `deconfigure' `in-favour' -# `removing' -# -# for details, see http://www.debian.org/doc/debian-policy/ or -# the debian-policy package - - -case "$1" in - remove|upgrade|deconfigure) - ;; - - failed-upgrade) - ;; - - *) - echo "prerm called with unknown argument \`$1'" >&2 - exit 1 - ;; -esac - -# dh_installdeb will replace this with shell code automatically -# generated by other debhelper scripts. - -#DEBHELPER# - -exit 0 - - diff --git a/debian/rules b/debian/rules index 0d63b650..dea855b2 100755 --- a/debian/rules +++ b/debian/rules @@ -16,7 +16,7 @@ DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) -CFLAGS = -Wall -g +CFLAGS = -g ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) CFLAGS += -O0 @@ -77,10 +77,10 @@ binary-arch: build install dh_testdir dh_testroot dh_installchangelogs CHANGELOG - dh_installdocs - dh_installexamples +# dh_installdocs +# dh_installexamples # dh_install -# dh_installmenu + dh_installmenu # dh_installdebconf # dh_installlogrotate # dh_installemacsen @@ -90,7 +90,7 @@ binary-arch: build install # dh_installinit # dh_installcron # dh_installinfo - dh_installman +# dh_installman dh_link dh_strip dh_compress diff --git a/debian/watch.ex b/debian/watch.ex deleted file mode 100644 index 9934d647..00000000 --- a/debian/watch.ex +++ /dev/null @@ -1,22 +0,0 @@ -# Example watch control file for uscan -# Rename this file to "watch" and then you can run the "uscan" command -# to check for upstream updates and more. -# See uscan(1) for format - -# Compulsory line, this is a version 3 file -version=3 - -# Uncomment to examine a Webpage -# -#http://www.example.com/downloads.php openbox-(.*)\.tar\.gz - -# Uncomment to examine a Webserver directory -#http://www.example.com/pub/openbox-(.*)\.tar\.gz - -# Uncommment to examine a FTP server -#ftp://ftp.example.com/pub/openbox-(.*)\.tar\.gz debian uupdate - -# Uncomment to find new files on sourceforge, for debscripts >= 2.9 -# http://sf.net/openbox/openbox-(.*)\.tar\.gz - - diff --git a/makedeb b/makedeb index 78d09d44..9687ccd4 100755 --- a/makedeb +++ b/makedeb @@ -3,7 +3,9 @@ # 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 TIME="$(date '+%a, %d %B %Y %T %z')" @@ -11,10 +13,10 @@ IN=debian/changelog.in OUT=debian/changelog # make sure configure gets run with the right parameters -make distclean >/dev/null || 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 && \ -make distclean >/dev/null +make distclean > /dev/null