tags 472829 +patch
thanks

Nico Golde wrote:
> Do I miss anything or is the only thing needed to fix this 
> bug:
[skip]

Also need following changes:
- provides: x-session-manager
- create x-window-manager link for openbox
- create x-session-manager link for openbox-session
- remove the wrong openbox-session link from x-window-manager

Please see the attached patch.

-Andrew
diff -u openbox-3.4.6.1/debian/control openbox-3.4.6.1/debian/control
--- openbox-3.4.6.1/debian/control
+++ openbox-3.4.6.1/debian/control
@@ -11,7 +11,7 @@
 
 Package: openbox
 Architecture: any
-Provides: x-window-manager
+Provides: x-window-manager, x-session-manager
 Depends: ${shlibs:Depends}
 Recommends: openbox-themes
 Suggests: obconf, menu, ttf-dejavu, python, libxml2-dev
diff -u openbox-3.4.6.1/debian/openbox.postinst openbox-3.4.6.1/debian/openbox.postinst
--- openbox-3.4.6.1/debian/openbox.postinst
+++ openbox-3.4.6.1/debian/openbox.postinst
@@ -5,9 +5,14 @@
 case "$1" in
 	configure)
 		update-alternatives --install /usr/bin/x-window-manager \
-			x-window-manager /usr/bin/openbox-session 90 --slave \
+			x-window-manager /usr/bin/openbox 90 --slave \
 			/usr/share/man/man1/x-window-manager.1.gz \
 			x-window-manager.1.gz /usr/share/man/man1/openbox.1.gz
+		update-alternatives --install /usr/bin/x-session-manager \
+                        x-session-manager /usr/bin/openbox-session 50 --slave \
+                        /usr/share/man/man1/x-session-manager.1.gz \
+                        x-session-manager.1.gz /usr/share/man/man1/openbox-session.1.gz
+
 			if [ -x /usr/bin/update-menus ]; then update-menus; fi
 		;;
 esac
diff -u openbox-3.4.6.1/debian/openbox.prerm openbox-3.4.6.1/debian/openbox.prerm
--- openbox-3.4.6.1/debian/openbox.prerm
+++ openbox-3.4.6.1/debian/openbox.prerm
@@ -3,10 +3,11 @@
 set -e
 
 case "$1" in
-	remove)
-		update-alternatives --remove x-window-manager /usr/bin/openbox
-		rm -f /var/lib/openbox/debian-menu.xml
-		;;
+    remove)
+	update-alternatives --remove x-window-manager /usr/bin/openbox
+	update-alternatives --remove x-session-manager /usr/bin/openbox-session
+	rm -f /var/lib/openbox/debian-menu.xml
+	;;
 esac
 
 #DEBHELPER#
--- openbox-3.4.6.1.orig/debian/openbox.preinst
+++ openbox-3.4.6.1/debian/openbox.preinst
@@ -0,0 +1,9 @@
+#!/bin/sh -e
+
+if [ "$1" = upgrade ]; then
+    update-alternatives --remove x-window-manager /usr/bin/openbox-session
+fi
+
+#DEBHELPER#
+
+exit 0

Reply via email to