tags 644754 + patch thanks Le samedi 08 oct. 2011 à 20:50:30 (+0200 CEST), Julien Valroff a écrit : > It would be great to state the changes to be made to one's configuration > after upgrading to the 3.5 release in NEWS.Debian. [...] > By the way, the 3.5.0-1 package doesn't ship any environment file, but still > contains an autostart.sh file which can be misleading for the end user (at > least, it was for me).
Here is a patch fixing these issues as well as some lintian warnings. Cheers, Julien -- .''`. Julien Valroff ~ <jul...@kirya.net> ~ <jul...@debian.org> : :' : Debian Developer & Free software contributor `. `'` http://www.kirya.net/ `- 4096R/ E1D8 5796 8214 4687 E416 948C 859F EF67 258E 26B1
Index: openbox.install =================================================================== --- openbox.install (révision 19227) +++ openbox.install (copie de travail) @@ -103,8 +103,8 @@ usr/bin/openbox-kde-session usr/bin/gdm-control etc/xdg/openbox/rc.xml -etc/xdg/openbox/menu.xml etc/xdg/openbox/autostart +etc/xdg/openbox/environment usr/lib/openbox/openbox-xdg-autostart usr/lib/openbox/openbox-autostart Index: control =================================================================== --- control (révision 19227) +++ control (copie de travail) @@ -2,7 +2,7 @@ Section: x11 Priority: optional Maintainer: Nico Golde <n...@debian.org> -Build-Depends: debhelper (>= 7.0.50~), gettext, libxft-dev, libstartup-notification0-dev, libxrender-dev, pkg-config, libglib2.0-dev, libxml2-dev (>= 2.6.0), perl, libxt-dev, libxinerama-dev, libxrandr-dev, libpango1.0-dev, quilt, libx11-dev, libxau-dev, autoconf, automake1.9, python-xdg +Build-Depends: debhelper (>= 7.0.50~), gettext, libxft-dev, libstartup-notification0-dev, libxrender-dev, pkg-config, libglib2.0-dev, libxml2-dev (>= 2.6.0), perl, libxt-dev, libxinerama-dev, libxrandr-dev, libpango1.0-dev, libx11-dev, libxau-dev, autoconf, automake1.9, python-xdg Standards-Version: 3.9.2 Homepage: http://www.openbox.org Vcs-Browser: http://svn.debian.org/viewsvn/collab-maint/deb-maint/openbox/trunk Index: openbox.NEWS =================================================================== --- openbox.NEWS (révision 0) +++ openbox.NEWS (révision 0) @@ -0,0 +1,16 @@ +openbox (3.5.0-1.1) unstable; urgency=low + + Be aware of the following changes when upgrading to openbox 3.5 + or later: + + - There is a new config file called environment that you should + copy from /etc/xdg/openbox to ~/.config/openbox + - The config file previously called autostart.sh is now just called + autostart. You should rename yours to remove the .sh from the end + of the name. + - Some of the configuration grammar in rc.xml has changed. While Openbox + appears to understand the old options, it would be wise to compare + your configuration to the one in /etc/xdg/openbox and look for changes + that affect you. + + -- Julien Valroff <jul...@debian.org> Sun, 09 Oct 2011 08:17:33 +0200 Index: openbox.postinst =================================================================== --- openbox.postinst (révision 19227) +++ openbox.postinst (copie de travail) @@ -17,4 +17,9 @@ ;; esac +if dpkg-maintscript-helper supports rm_conffile; then + dpkg-maintscript-helper rm_conffile \ + /etc/xdg/openbox/autostart.sh 3.4.11.2-2 -- "$@" +fi + #DEBHELPER# Index: openbox.preinst =================================================================== --- openbox.preinst (révision 19227) +++ openbox.preinst (copie de travail) @@ -1,9 +1,16 @@ -#!/bin/sh -e +#!/bin/sh +set -e + if [ "$1" = upgrade ]; then update-alternatives --remove x-window-manager /usr/bin/openbox-session fi +if dpkg-maintscript-helper supports rm_conffile; then + dpkg-maintscript-helper rm_conffile \ + /etc/xdg/openbox/autostart.sh 3.4.11.2-2 -- "$@" +fi + #DEBHELPER# exit 0 Index: openbox.doc-base =================================================================== --- openbox.doc-base (révision 0) +++ openbox.doc-base (révision 0) @@ -0,0 +1,7 @@ +Document: openbox +Title: Openbox +Section: Window Managers + +Format: HTML +Index: /usr/share/doc/openbox/toc.html +Files: /usr/share/doc/openbox/*.html Index: changelog =================================================================== --- changelog (révision 19227) +++ changelog (copie de travail) @@ -1,3 +1,16 @@ +openbox (3.5.0-1.1) unstable; urgency=low + + * Non-maintainer upload. + * Ship new environment configuration file + * Remove old autostart.sh conffile + * Add openbox.NEWS to state configuration changes to be made with the new + 3.5.0 release + * Add 'set -e' to openbox preinst script + * Drop useless build-dependency on quilt + * Register HTML documentation via doc-base + + -- Julien Valroff <jul...@debian.org> Sun, 09 Oct 2011 08:43:30 +0200 + openbox (3.5.0-1) unstable; urgency=low [Nico Golde] Index: openbox.postrm =================================================================== --- openbox.postrm (révision 19227) +++ openbox.postrm (copie de travail) @@ -19,4 +19,9 @@ if [ -x /usr/bin/update-menus ]; then update-menus ; fi +if dpkg-maintscript-helper supports rm_conffile; then + dpkg-maintscript-helper rm_conffile \ + /etc/xdg/openbox/autostart.sh 3.4.11.2-2 -- "$@" +fi + #DEBHELPER#
