merge r6404-6405 from trunk

diff --git a/Makefile.am b/Makefile.am
index 7460725f77519373bed1b6bd6072198ada90b426..eced1782de41dc10d21de0115607cdb46a83b347 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -345,7 +345,6 @@ dist_rc_DATA = \
        data/menu.xml
 
 edit = $(SED) \
-       -e 's!@time\@!$(shell date "+%a, %d %B %Y %T %z")!' \
        -e 's!@version\@!$(VERSION)!' \
        -e 's!@bindir\@!$(bindir)!'
 
@@ -376,21 +375,21 @@ dist_xsessions_DATA = \
        data/xsession/openbox-kde.desktop
 
 dist_noinst_DATA = \
-       debian/changelog.in
-       debian/compat
-       debian/control
-       debian/copyright
-       debian/dirs
-       debian/docs
-       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/rules
-       debian/watch.ex
+       debian/changelog.in \
+       debian/compat \
+       debian/control \
+       debian/copyright \
+       debian/dirs \
+       debian/docs \
+       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/rules \
+       debian/watch.ex \
        version.h.in \
        data/rc.xsd \
        data/menu.xsd \
@@ -437,10 +436,4 @@ distclean-local:
                done \
        done
 
-deb:   Makefile
-       $(edit) $(srcdir)/debian/changelog.in >$(srcdir)/debian/changelog
-       fakeroot debian/rules binary
-
-#      dpkg-buildpackage -b -rfakeroot -f openbox-$(VERSION).tar.gz
-
-.PHONY: doc deb
+.PHONY: doc

diff --git a/debian/rules b/debian/rules
index f4cf390b6b9784b977f131c3aca0fb8864e3cda1..0d63b6505764475f28443176964ccab4c7960da8 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -27,7 +27,7 @@ endif
 config.status: configure
        dh_testdir
        # Add here commands to configure the package.
-       ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs"
+       ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --sysconfdir=/etc --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs"
 
 
 build: build-stamp

diff --git a/makedeb b/makedeb
new file mode 100755 (executable)
index 0000000..7918d91
--- /dev/null
+++ b/makedeb
@@ -0,0 +1,17 @@
+#!/bin/sh -x
+
+# get the version from configure.ac
+VERSION=$(grep AC_INIT\(\\\[openbox\\] configure.ac|cut -d [ -f 3-|cut -d ] -f 1)
+
+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
+
+rm -f $OUT
+
+sed -e "s!@time@!$TIME!" -e "s!@version@!$VERSION!" $IN >$OUT && \
+fakeroot debian/rules binary