summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDana Jansens <danakj@orodu.net>2007-05-12 22:14:46 +0000
committerDana Jansens <danakj@orodu.net>2007-05-12 22:14:46 +0000
commit587b0f009b22d2a38850e879e2f1c59d36e379da (patch)
treecaa6833584aeed2f015cca482a8177cdcab667ea
parentcda87c60647951cc9e7fca36f6fc1ea02bf5417d (diff)
debian package works now
-rw-r--r--Makefile.am7
-rw-r--r--debian/control2
2 files changed, 4 insertions, 5 deletions
diff --git a/Makefile.am b/Makefile.am
index 31505897..dbae6678 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -363,7 +363,7 @@ dist_rc_DATA = \
data/menu.xml
edit = $(SED) \
- -e 's!@time\@!`date`!' \
+ -e 's!@time\@!$(shell date "+%a, %d %B %Y %T %z")!' \
-e 's!@version\@!$(VERSION)!' \
-e 's!@bindir\@!$(bindir)!'
@@ -390,7 +390,6 @@ debian/changelog: debian debian/changelog.in
@rm -f $@
@mkdir debian 2>/dev/null || true
@$(edit) $(srcdir)/debian/changelog.in >$@
- @chmod +x $@
dist_gnomewmfiles_DATA = \
data/gnome-wm-properties/openbox.desktop \
@@ -465,8 +464,8 @@ distclean-local:
done \
done
-deb: dist debian/changelog
+deb: dist debian/changelog
fakeroot debian/rules binary
-# dpkg-buildpackage -rfakeroot
+# dpkg-buildpackage -b -rfakeroot -f openbox-$(VERSION).tar.gz
.PHONY: doc deb
diff --git a/debian/control b/debian/control
index f5cf8a44..dbbde15d 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ 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, (ksmserver | gnome-session), 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