From: Dana Jansens <danakj@orodu.net>
Date: Sun, 13 May 2007 00:02:03 +0000 (+0000)
Subject: merge r6410-6411 from trunk
X-Git-Tag: openbox-3_3_991-RELEASE~65
X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=df235aca2eed2a9eaeef7d27f1b142131a4dc922;p=dana%2Fopenbox.git

merge r6410-6411 from trunk
---

diff --git a/Makefile.am b/Makefile.am
index eced1782..afcf690a 100644
--- 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
index ca882bbb..00000000
--- 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
index e845566c..00000000
--- a/debian/docs
+++ /dev/null
@@ -1 +0,0 @@
-README
diff --git a/debian/menu.ex b/debian/menu.ex
index 37a88897..97d2d14c 100644
--- 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 1c35c54e..aa690370 100644
--- 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 4a066a51..641c6b92 100644
--- 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 7f273398..4a8ec9a7 100644
--- 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);