merge r6410-6411 from trunk

diff --git a/Makefile.am b/Makefile.am
index eced1782de41dc10d21de0115607cdb46a83b347..afcf690ad3cb6960e51ee537279ae2e01e0dcacd 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -379,8 +379,6 @@ dist_noinst_DATA = \
        debian/compat \
        debian/control \
        debian/copyright \
-       debian/dirs \
-       debian/docs \
        debian/menu.ex \
        debian/openbox-default.ex \
        debian/openbox.doc-base.EX \

diff --git a/debian/dirs b/debian/dirs
deleted file mode 100644 (file)
index ca882bb..0000000
--- a/debian/dirs
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/bin
-usr/sbin

diff --git a/debian/docs b/debian/docs
deleted file mode 100644 (file)
index e845566..0000000
--- a/debian/docs
+++ /dev/null
@@ -1 +0,0 @@
-README

diff --git a/debian/menu.ex b/debian/menu.ex
index 37a88897f9b915eb22b65595a133127b9b84d1dc..97d2d14cf0e995ec2c618d087007f94f91ed1ee8 100644 (file)
--- a/debian/menu.ex
+++ b/debian/menu.ex
@@ -1,2 +1,6 @@
-?package(openbox):needs="X11|text|vc|wm" section="Apps/see-menu-manual"\
-  title="openbox" command="/usr/bin/openbox"
+?package(openbox):\
+  needs="wm"\
+  section="WindowManagers"\
+  title="Openbox"\
+  command="/usr/bin/openbox"\
+  icon="/usr/share/pixmaps/openbox.png"

diff --git a/debian/postinst.ex b/debian/postinst.ex
index 1c35c54e88ff9019ff5040c029b9898603820264..aa690370261d9d33ea37379c2b81528f7e197fe9 100644 (file)
--- a/debian/postinst.ex
+++ b/debian/postinst.ex
@@ -20,6 +20,7 @@ set -e
 
 case "$1" in
     configure)
+        if [ -x /usr/bin/update-menus ]; then update-menus; fi
     ;;
 
     abort-upgrade|abort-remove|abort-deconfigure)

diff --git a/debian/postrm.ex b/debian/postrm.ex
index 4a066a51c3ab6007b45605eaac9ed598165d81d1..641c6b9237bf248dfb76a3f56258f121c16a74cf 100644 (file)
--- a/debian/postrm.ex
+++ b/debian/postrm.ex
@@ -18,9 +18,13 @@ set -e
 # for details, see http://www.debian.org/doc/debian-policy/ or
 # the debian-policy package
 
-
 case "$1" in
-    purge|remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
+    purge)
+    ;;
+    remove)
+        if [ -x /usr/bin/update-menus ]; then update-menus ; fi
+    ;;
+    upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
     ;;
 
     *)

diff --git a/parser/parse.h b/parser/parse.h
index 7f27339869eaec872be2be1c57c22141b57b3bee..4a8ec9a7ae0f2993cbfd5ab6452a265fb34291d0 100644 (file)
--- a/parser/parse.h
+++ b/parser/parse.h
@@ -41,7 +41,7 @@ void parse_shutdown(ObParseInst *inst);
 gboolean parse_load_rc(const gchar *type, xmlDocPtr *doc, xmlNodePtr *root);
 /* Loads an Openbox menu, from the normal paths */
 gboolean parse_load_menu(const gchar *file, xmlDocPtr *doc, xmlNodePtr *root);
-/* Loads an Openbox menu, from the normal paths */
+/* Loads an Openbox theme, from the normal paths */
 gboolean parse_load_theme(const gchar *name, xmlDocPtr *doc, xmlNodePtr *root,
                           gchar **path);