some changes to the build stuff for debian

diff --git a/Makefile.am b/Makefile.am
index f6ad6b770ebdb9718245a8355a22fec6a6689a63..31505897aa3608ca2f1ff10d275cd49d3a8f9c99 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -363,6 +363,7 @@ dist_rc_DATA = \
        data/menu.xml
 
 edit = $(SED) \
+       -e 's!@time\@!`date`!' \
        -e 's!@version\@!$(VERSION)!' \
        -e 's!@bindir\@!$(bindir)!'
 
@@ -384,6 +385,13 @@ data/xsession/openbox-kde-session: Makefile data \
        @$(edit) $(srcdir)/data/xsession/openbox-kde-session.in >$@
        @chmod +x $@
 
+debian/changelog: debian debian/changelog.in
+       @echo make: creating $@
+       @rm -f $@
+       @mkdir debian 2>/dev/null || true
+       @$(edit) $(srcdir)/debian/changelog.in >$@
+       @chmod +x $@
+
 dist_gnomewmfiles_DATA = \
        data/gnome-wm-properties/openbox.desktop \
        data/gnome-wm-properties/openbox-gnome.desktop \
@@ -395,6 +403,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
        version.h.in \
        data/rc.xsd \
        data/menu.xsd \
@@ -442,4 +465,8 @@ distclean-local:
                done \
        done
 
-.PHONY: doc
+deb:    dist debian/changelog
+       fakeroot debian/rules binary
+#        dpkg-buildpackage -rfakeroot
+
+.PHONY: doc deb

diff --git a/debian/changelog.in b/debian/changelog.in
new file mode 100644 (file)
index 0000000..678b149
--- /dev/null
+++ b/debian/changelog.in
@@ -0,0 +1,6 @@
+openbox (@version@-0) unstable; urgency=low
+
+  * Upstream release.
+
+ -- Dana Jansens <danakj@orodu.net>  @time@
+

diff --git a/debian/control b/debian/control
index 3eb275ca08802e865832916d98a640642b681e0d..f5cf8a449c981c80ad426a18a5a956e156e69d0e 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -2,13 +2,13 @@ Source: openbox
 Section: x11
 Priority: optional
 Maintainer: Dana Jansens <danakj@orodu.net>
-Build-Depends: debhelper (>= 5), autotools-dev, gcc, automake1.9, autoconf, libtool, pkg-config, libpango1.0-dev, libglib2.0-dev, libxml2-dev, libxcursor-dev, libstartup-notification0-dev, xlibs-dev, libxinerama-dev, libxft2-dev
+Build-Depends: debhelper (>= 5), coreutils, sed, autotools-dev, gcc, automake1.9, autoconf, libtool, pkg-config, libpango1.0-dev, libglib2.0-dev, libxml2-dev, libxcursor-dev, libstartup-notification0-dev, xlibs-dev, libxinerama-dev, libxft2-dev
 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
-Recommends: obconf, x-display-manager, x-session-manager, ttf-bitstream-vera
+Recommends: obconf, x-display-manager, (ksmserver | gnome-session), ttf-bitstream-vera
 Suggests: menu
 Conflicts: menu (<< 2.1.12)
 Provides: x-window-manager

diff --git a/debian/cron.d.ex b/debian/cron.d.ex
deleted file mode 100644 (file)
index 8d2f8cb..0000000
--- a/debian/cron.d.ex
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# Regular cron jobs for the openbox package
-#
-0 4    * * *   root    openbox_maintenance