summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDana Jansens <danakj@orodu.net>2007-05-12 21:45:47 +0000
committerDana Jansens <danakj@orodu.net>2007-05-12 21:45:47 +0000
commit9c6f23117e2f2890f4408180aac103ca250d1ac0 (patch)
treed62a947ea3dfa40041c6563474122faac7b2021f
parentea5d04bc533aca0ec9499d078208cec71267d610 (diff)
some changes to the build stuff for debian
-rw-r--r--Makefile.am29
-rw-r--r--debian/changelog.in6
-rw-r--r--debian/control4
-rw-r--r--debian/cron.d.ex4
4 files changed, 36 insertions, 7 deletions
diff --git a/Makefile.am b/Makefile.am
index f6ad6b77..31505897 100644
--- 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
index 00000000..678b1497
--- /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 3eb275ca..f5cf8a44 100644
--- 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
index 8d2f8cb5..00000000
--- a/debian/cron.d.ex
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# Regular cron jobs for the openbox package
-#
-0 4 * * * root openbox_maintenance