diff -Nru openbox-3.5.2/debian/NEWS.Debian openbox-3.5.2/debian/NEWS.Debian
--- openbox-3.5.2/debian/NEWS.Debian	2013-03-27 13:53:21.000000000 +0000
+++ openbox-3.5.2/debian/NEWS.Debian	2013-09-26 09:53:10.000000000 +0000
@@ -1,3 +1,11 @@
+openbox (3.5.2-1) unstable; urgency=low
+
+  - The 3.5.2 release has SVG icon support and correctly 
+    interfaces with the latest gnome-session for Gnome/Openbox X 
+    sessions.
+
+ -- Mateusz Łukasik <mati75@linuxmint.pl>  Thu, 15 Aug 2013 22:15:10 +0200
+
 openbox (3.5.0-1) unstable; urgency=low
 
   Be aware of the following changes when upgrading to openbox 3.5
diff -Nru openbox-3.5.2/debian/changelog openbox-3.5.2/debian/changelog
--- openbox-3.5.2/debian/changelog	2013-08-28 22:47:29.000000000 +0000
+++ openbox-3.5.2/debian/changelog	2013-10-07 12:58:20.000000000 +0000
@@ -1,28 +1,63 @@
-openbox (3.5.2-0ubuntu1) saucy; urgency=low
+openbox (3.5.2-3) unstable; urgency=low
 
-  * New upstream release. 
-  * debian/control & debian/*.install:
-   - Update SONAME number.
-  * debian/*.symbols:
-   - Update.
-  * debian/patches:
-   - 04_xsession.desktop_translation.patch: Refresh.
-   - 01_rc.xml.patch: Refresh.
-   - 05_simplify_gnome_session.patch: Refresh.
-   - 07_fix_xml_load_file.patch: Refresh.
-   - 90_fix_link_obt.patch: Remove, merged upstream.
-   - 675991_fix_crash_from_gtk3_apps.patch: Remove, merged upstream.
-   - 666676_wrong_undecorated_window_placement.patch: Remove, merged upstream.
-   - clever-rectangle-picking.patch: Remove, merged upstream.
-   - use-nearest-monitor.patch: Remove, merged upstream.
-   - 704724_fix_refers-to-autostart.sh.patch: Remove, merged upstream.
-   - 91_fix_loose_focus.patch: Remove, merged upstream.
-   - openbox-3.5.0-title-matching.patch: Refresh.
-   - openbox-3.5.0-which-2.20.patch: Refresh.
-   - 658081_fix_kde_menu.patch: Remove, merged upstream.
-   - add_automake1.11_support.patch: Remove, merged upstream.
+  * debian/control:
+    + fix typo in depends openbox-dev package.
+
+ -- Mateusz Łukasik <mati75@linuxmint.pl>  Mon, 07 Oct 2013 14:58:17 +0200
+
+openbox (3.5.2-2) unstable; urgency=low
+
+  * debian/control:
+    + Replace ttf-dejavu with fonts-dejavu and add tint2 in suggests,
+    + Add librsvg2-dev for depends openbox-dev package. (Closes: #724059)
+  * Add lintian overrides for executable-not-elf-or-script.
+  * Add fix_center_window.patch from upstream to add the old center option.
+
+ -- Mateusz Łukasik <mati75@linuxmint.pl>  Thu, 26 Sep 2013 16:37:01 +0200
+
+openbox (3.5.2-1) unstable; urgency=low
+
+  * New upstream release (Closes: #717223):
+    + Fix Stacking of dock doesn't work correctly (Closes: #680664),
+    + Fix Windows do not refresh anymore when lauching epdfview when
+      awn is running (Closes: #683556)
+    + Fix xmodmap freezes openbox in lxde (Closes: #678993).
+  * debian/control:
+    + Rename libobrender27 to libobrender29 to reflect ABI change,
+    + Rename libobt0 to libobt2 to reflect ABI change,
+    + Add librsvg2-dev and libxi-dev to Depends,
+    + Add gnome-panel-control binary package,
+    + Tidy up Build-Depends and Depends.
+    + Fix wording in short description.
+  * Remove from debian/patches:
+    + 04_xsession.desktop_translation.patch,
+    + 05_simplify_gnome_session.patch,
+    + 90_fix_link_obt.patch,
+    + 675991_fix_crash_from_gtk3_apps.patch,
+    + 666676_wrong_undecorated_window_placement.patch,
+    + clever-rectangle-picking.patch,
+    + use-nearest-monitor.patch,
+    + 91_fix_loose_focus.patch,
+    + 658081_fix_kde_menu.patch,
+    + add_automake1.11_support.patch -- All included upstream.
+  * Rename in debian/patches:
+    + 07_fix_xml_load_file.patch to 04_fix_xml_load_file.patch,
+    + openbox-3.5.0-title-matching.patch to
+      05_openbox-3.5.0-title-matching.patch,
+    + openbox-3.5.0-which-2.20.patch to 06_openbox-3.5.0-which-2.20.patch.
+  * Update symbols files. 
+  * debian/rules:
+    + override_dh_auto_configure to configure with librsvg support,
+    + enable all hardening flags.
+  * Add debian/patches/07_update_desktop.patch to provide keywords
+    in desktop file.
+  * Add debian/patches/719620_fix_show_startup_notification.patch
+    (Closes: #719620, LP: #862662).
+  * Update debian/NEWS.Debian.
+  * Add debian/patches/08_fix_causing_submenuShowDelay.patch from
+    upstream.
 
- -- Julien Lavergne <gilir@ubuntu.com>  Thu, 29 Aug 2013 00:47:27 +0200
+ -- Mateusz Łukasik <mati75@linuxmint.pl>  Tue, 03 Sep 2013 13:16:24 +0200
 
 openbox (3.5.0-8) unstable; urgency=low
 
diff -Nru openbox-3.5.2/debian/control openbox-3.5.2/debian/control
--- openbox-3.5.2/debian/control	2013-08-13 21:50:29.000000000 +0000
+++ openbox-3.5.2/debian/control	2013-10-07 12:57:09.000000000 +0000
@@ -1,9 +1,12 @@
 Source: openbox
 Section: x11
 Priority: optional
-Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
-XSBC-Original-Maintainer: Mateusz Łukasik <mati75@linuxmint.pl>
-Build-Depends: debhelper (>= 9), gettext, 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, autoconf, automake (>= 1:1.11), python-xdg, libimlib2-dev, dh-autoreconf, autopoint
+Maintainer: Mateusz Łukasik <mati75@linuxmint.pl>
+Build-Depends: debhelper (>= 9), gettext, 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, 
+ autoconf, automake (>= 1:1.11), python-xdg, libimlib2-dev, dh-autoreconf, 
+ autopoint, librsvg2-dev, libxi-dev
 Standards-Version: 3.9.4
 Homepage: http://www.openbox.org
 Vcs-Browser: https://github.com/mati75/openbox-debian
@@ -15,9 +18,9 @@
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends}, ${misc:Depends}, python-xdg
 Recommends: openbox-themes, obconf
-Suggests: menu, ttf-dejavu, python, libxml2-dev
+Suggests: menu, fonts-dejavu, python, libxml2-dev, tint2
 Breaks: menu (<< 2.1.12)
-Description: standards-compliant, fast, light-weight, extensible window manager
+Description: standards-compliant, fast, light-weight and extensible window manager
  Openbox works with your applications, and makes your desktop easier to manage.
  This is because the approach to its development was the opposite of what seems
  to be the general case for window managers. Openbox was written first to
@@ -42,7 +45,6 @@
   * Multi-head Xinerama support!
   * Pipe menus
 
-
 Package: libobt2
 Section: libs
 Architecture: any
@@ -94,7 +96,9 @@
 Package: openbox-dev
 Section: libdevel
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libobrender29 (= ${binary:Version}), libobt2 (= ${binary:Version}), libxml2-dev, libglib2.0-dev, libpango1.0-dev, libimlib2-dev
+Depends: ${shlibs:Depends}, ${misc:Depends}, libobrender29 (= ${binary:Version}),
+ libobt2 (= ${binary:Version}), libxml2-dev, libglib2.0-dev, libpango1.0-dev,
+ libimlib2-dev, librsvg2-dev
 Description: development files for the openbox window manager
  Openbox works with your applications, and makes your desktop easier to manage.
  This is because the approach to its development was the opposite of what seems
@@ -111,3 +115,13 @@
  that of Blackbox. Openbox 2 was based on the Blackbox 0.65.0 codebase.
  .
  This package contains the development headers for building openbox stuff.
+
+Package: gnome-panel-control
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Replaces: openbox (<< 3.4.11.2)
+Breaks: openbox (<< 3.4.11.2)
+Description: command line utility to invoke GNOME panel run dialog/menu
+ gnome-panel-control can be used to invoke the GNOME panel run or main
+ menu from the command line.  This is originally a helper utility of openbox 
+ since gnome-panel is no longer managing its own key bindings.
diff -Nru openbox-3.5.2/debian/gdm-control.pod openbox-3.5.2/debian/gdm-control.pod
--- openbox-3.5.2/debian/gdm-control.pod	1970-01-01 00:00:00.000000000 +0000
+++ openbox-3.5.2/debian/gdm-control.pod	2013-09-26 09:53:10.000000000 +0000
@@ -0,0 +1,64 @@
+=head1 NAME
+
+Openbox - standards compliant, fast, light-weight, extensible window manager.
+
+=head1 SYNOPSIS
+
+gdm-control <option>
+
+=head1 DESCRIPTION
+
+gdm-control lets you control gdm from within an X session.
+It enables you to change GDM's behaviour for when you end the current sesson.
+For instance, you can tell GDM to reboot, and then immediately log out
+of the current session, and the computer will be rebooted.
+
+=head1 OPTIONS
+
+=over 5
+
+=item B<< --help >>
+
+Display some help and exit.
+
+=item B<< --none >>
+
+Do nothing special when the current session ends.
+
+=item B<< --shutdown >>
+
+Shutdown the computer when the current session ends.
+
+=item B<< --reboot >>
+
+eboot the computer when the current session ends.
+
+=item B<< --suspend >>
+
+Suspend the computer when the current session ends.
+
+=item B<< --switch-user >>
+
+Log in as a new user (this works immediately).
+
+=back
+
+=head1 AUTHORS
+
+Openbox was written by Mikael Magnusson <mangosoft@comhem.se> and Dana Jansens
+<danakj@orodu.net>, aided by several contributors; for a full list read the
+file AUTHORS.
+
+This manual page was written by Nico Golde <nion@debian.org>
+
+=head1 COPYRIGHT
+
+This program is free software; you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation; either version 2, or (at your option) any
+later version.
+
+On Debian GNU/Linux systems, the complete text of the GNU General
+Public License can be found in `/usr/share/common-licenses/GPL'.
+
+=cut
diff -Nru openbox-3.5.2/debian/gnome-panel-control.install openbox-3.5.2/debian/gnome-panel-control.install
--- openbox-3.5.2/debian/gnome-panel-control.install	1970-01-01 00:00:00.000000000 +0000
+++ openbox-3.5.2/debian/gnome-panel-control.install	2013-09-26 09:53:10.000000000 +0000
@@ -0,0 +1 @@
+usr/bin/gnome-panel-control
diff -Nru openbox-3.5.2/debian/gnome-panel-control.manpages openbox-3.5.2/debian/gnome-panel-control.manpages
--- openbox-3.5.2/debian/gnome-panel-control.manpages	1970-01-01 00:00:00.000000000 +0000
+++ openbox-3.5.2/debian/gnome-panel-control.manpages	2013-09-26 09:53:10.000000000 +0000
@@ -0,0 +1 @@
+gnome-panel-control.1
diff -Nru openbox-3.5.2/debian/gnome-panel-control.pod openbox-3.5.2/debian/gnome-panel-control.pod
--- openbox-3.5.2/debian/gnome-panel-control.pod	1970-01-01 00:00:00.000000000 +0000
+++ openbox-3.5.2/debian/gnome-panel-control.pod	2013-09-26 09:53:10.000000000 +0000
@@ -0,0 +1,54 @@
+=head1 NAME
+
+Openbox - standards compliant, fast, light-weight, extensible window manager.
+
+=head1 SYNOPSIS
+
+gnome-panel-control <option>
+
+=head1 DESCRIPTION
+
+As of GNOME 2.4, gnome-panel no longer manages its own key bindings, and
+requires that the window manager provide its own key bindings for showing the
+Main Menu and Run dialog. Openbox does this through the bundled
+B<< gnome-panel-control >> tool, which can be used in keybindings to access the
+gnome-panel. Use the B<< --main-menu >> option to display gnome-panel's menu,
+and the B<< --run-dialog >> to display its Run dialog. 
+
+=head1 OPTIONS
+
+=over 5
+
+=item B<< --help >>
+
+Display some help and exit.
+
+=item B<< --main-menu >>
+
+Show the main menu.
+
+=item B<< --run-dialog >>
+
+Show the run dialog.
+
+=back
+
+=head1 AUTHORS
+
+Openbox was written by Mikael Magnusson <mangosoft@comhem.se> and Ben Jansens
+<ben@openbox.org>, aided by several contributors; for a full list read the
+file AUTHORS.
+
+This manual page was written by Tore Anderson <tore@debian.org>.
+
+=head1 COPYRIGHT
+
+This program is free software; you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation; either version 2, or (at your option) any
+later version.
+
+On Debian GNU/Linux systems, the complete text of the GNU General
+Public License can be found in `/usr/share/common-licenses/GPL'.
+
+=cut
diff -Nru openbox-3.5.2/debian/libobrender29.symbols openbox-3.5.2/debian/libobrender29.symbols
--- openbox-3.5.2/debian/libobrender29.symbols	2013-08-28 22:39:05.000000000 +0000
+++ openbox-3.5.2/debian/libobrender29.symbols	2013-09-26 09:53:10.000000000 +0000
@@ -1,80 +1,82 @@
 libobrender.so.29 libobrender29 #MINVER#
  DestroyImlibLoader@Base 3.5.2
- DrawRGBA@Base 3.5.0
+ DestroyRsvgLoader@Base 3.5.2
+ DrawRGBA@Base 3.5.2
  LoadWithImlib@Base 3.5.2
- RrAppearanceAddTextures@Base 3.5.0
- RrAppearanceClearTextures@Base 3.5.0
- RrAppearanceCopy@Base 3.5.0
- RrAppearanceFree@Base 3.5.0
- RrAppearanceNew@Base 3.5.0
- RrAppearanceRemoveTextures@Base 3.5.0
- RrBlueMask@Base 3.5.0
- RrBlueOffset@Base 3.5.0
- RrBlueShift@Base 3.5.0
+ LoadWithRsvg@Base 3.5.2
+ RrAppearanceAddTextures@Base 3.5.2
+ RrAppearanceClearTextures@Base 3.5.2
+ RrAppearanceCopy@Base 3.5.2
+ RrAppearanceFree@Base 3.5.2
+ RrAppearanceNew@Base 3.5.2
+ RrAppearanceRemoveTextures@Base 3.5.2
+ RrBlueMask@Base 3.5.2
+ RrBlueOffset@Base 3.5.2
+ RrBlueShift@Base 3.5.2
  RrButtonFree@Base 3.5.2
  RrButtonNew@Base 3.5.2
- RrColorAllocateGC@Base 3.5.0
- RrColorBlue@Base 3.5.0
+ RrColorAllocateGC@Base 3.5.2
+ RrColorBlue@Base 3.5.2
  RrColorCopy@Base 3.5.2
- RrColorFree@Base 3.5.0
- RrColorGC@Base 3.5.0
- RrColorGreen@Base 3.5.0
- RrColorHash@Base 3.5.0
- RrColorNew@Base 3.5.0
- RrColorParse@Base 3.5.0
- RrColorPixel@Base 3.5.0
- RrColorRed@Base 3.5.0
- RrColormap@Base 3.5.0
- RrDepth@Base 3.5.0
- RrDisplay@Base 3.5.0
- RrFontClose@Base 3.5.0
- RrFontDraw@Base 3.5.0
- RrFontHeight@Base 3.5.0
- RrFontMeasureString@Base 3.5.0
- RrFontOpen@Base 3.5.0
- RrFontOpenDefault@Base 3.5.0
- RrFontRef@Base 3.5.0
- RrGreenMask@Base 3.5.0
- RrGreenOffset@Base 3.5.0
- RrGreenShift@Base 3.5.0
- RrImageAddFromData@Base 3.5.0
- RrImageCacheNew@Base 3.5.0
- RrImageCacheRef@Base 3.5.0
- RrImageCacheUnref@Base 3.5.0
- RrImageDrawImage@Base 3.5.0
- RrImageDrawRGBA@Base 3.5.0
- RrImageNewFromData@Base 3.5.0
- RrImageNewFromName@Base 3.5.0
- RrImagePicHash@Base 3.5.0
- RrImageRef@Base 3.5.0
- RrImageSetDestroyFunc@Base 3.5.0
- RrImageSetMergeSets@Base 3.5.0
- RrImageUnref@Base 3.5.0
- RrIncreaseDepth@Base 3.5.0
- RrInstanceFree@Base 3.5.0
- RrInstanceNew@Base 3.5.0
- RrMargins@Base 3.5.0
- RrMinHeight@Base 3.5.0
- RrMinSize@Base 3.5.0
- RrMinWidth@Base 3.5.0
- RrPaint@Base 3.5.0
- RrPaintPixmap@Base 3.5.0
- RrPickColor@Base 3.5.0
- RrPixmapMaskCopy@Base 3.5.0
- RrPixmapMaskDraw@Base 3.5.0
- RrPixmapMaskFree@Base 3.5.0
- RrPixmapMaskNew@Base 3.5.0
- RrPixmapToRGBA@Base 3.5.0
- RrPseudoBPC@Base 3.5.0
- RrPseudoColors@Base 3.5.0
- RrRedMask@Base 3.5.0
- RrRedOffset@Base 3.5.0
- RrRedShift@Base 3.5.0
- RrReduceDepth@Base 3.5.0
- RrRender@Base 3.5.0
- RrRootWindow@Base 3.5.0
- RrScreen@Base 3.5.0
- RrThemeFree@Base 3.5.0
- RrThemeNew@Base 3.5.0
- RrVisual@Base 3.5.0
- hashword@Base 3.5.0
+ RrColorFree@Base 3.5.2
+ RrColorGC@Base 3.5.2
+ RrColorGreen@Base 3.5.2
+ RrColorHash@Base 3.5.2
+ RrColorNew@Base 3.5.2
+ RrColorParse@Base 3.5.2
+ RrColorPixel@Base 3.5.2
+ RrColorRed@Base 3.5.2
+ RrColormap@Base 3.5.2
+ RrDepth@Base 3.5.2
+ RrDisplay@Base 3.5.2
+ RrFontClose@Base 3.5.2
+ RrFontDraw@Base 3.5.2
+ RrFontHeight@Base 3.5.2
+ RrFontMeasureString@Base 3.5.2
+ RrFontOpen@Base 3.5.2
+ RrFontOpenDefault@Base 3.5.2
+ RrFontRef@Base 3.5.2
+ RrGreenMask@Base 3.5.2
+ RrGreenOffset@Base 3.5.2
+ RrGreenShift@Base 3.5.2
+ RrImageAddFromData@Base 3.5.2
+ RrImageCacheNew@Base 3.5.2
+ RrImageCacheRef@Base 3.5.2
+ RrImageCacheUnref@Base 3.5.2
+ RrImageDrawImage@Base 3.5.2
+ RrImageDrawRGBA@Base 3.5.2
+ RrImageNewFromData@Base 3.5.2
+ RrImageNewFromName@Base 3.5.2
+ RrImagePicHash@Base 3.5.2
+ RrImageRef@Base 3.5.2
+ RrImageSetDestroyFunc@Base 3.5.2
+ RrImageSetMergeSets@Base 3.5.2
+ RrImageUnref@Base 3.5.2
+ RrIncreaseDepth@Base 3.5.2
+ RrInstanceFree@Base 3.5.2
+ RrInstanceNew@Base 3.5.2
+ RrMargins@Base 3.5.2
+ RrMinHeight@Base 3.5.2
+ RrMinSize@Base 3.5.2
+ RrMinWidth@Base 3.5.2
+ RrPaint@Base 3.5.2
+ RrPaintPixmap@Base 3.5.2
+ RrPickColor@Base 3.5.2
+ RrPixmapMaskCopy@Base 3.5.2
+ RrPixmapMaskDraw@Base 3.5.2
+ RrPixmapMaskFree@Base 3.5.2
+ RrPixmapMaskNew@Base 3.5.2
+ RrPixmapToRGBA@Base 3.5.2
+ RrPseudoBPC@Base 3.5.2
+ RrPseudoColors@Base 3.5.2
+ RrRedMask@Base 3.5.2
+ RrRedOffset@Base 3.5.2
+ RrRedShift@Base 3.5.2
+ RrReduceDepth@Base 3.5.2
+ RrRender@Base 3.5.2
+ RrRootWindow@Base 3.5.2
+ RrScreen@Base 3.5.2
+ RrThemeFree@Base 3.5.2
+ RrThemeNew@Base 3.5.2
+ RrVisual@Base 3.5.2
+ hashword@Base 3.5.2
diff -Nru openbox-3.5.2/debian/libobt2.symbols openbox-3.5.2/debian/libobt2.symbols
--- openbox-3.5.2/debian/libobt2.symbols	2013-08-28 22:30:22.000000000 +0000
+++ openbox-3.5.2/debian/libobt2.symbols	2013-09-26 09:53:10.000000000 +0000
@@ -1,118 +1,117 @@
 libobt.so.2 libobt2 #MINVER#
- callbacks@Base 3.5.0
- gid_cmp@Base 3.5.0
- obt_ddparse_file@Base 3.5.0
- obt_ddparse_group_keys@Base 3.5.0
- obt_display@Base 3.5.0
- obt_display_close@Base 3.5.0
- obt_display_error_occured@Base 3.5.0
- obt_display_extension_randr@Base 3.5.0
- obt_display_extension_randr_basep@Base 3.5.0
- obt_display_extension_shape@Base 3.5.0
- obt_display_extension_shape_basep@Base 3.5.0
- obt_display_extension_sync@Base 3.5.0
- obt_display_extension_sync_basep@Base 3.5.0
- obt_display_extension_xinerama@Base 3.5.0
- obt_display_extension_xinerama_basep@Base 3.5.0
- obt_display_extension_xkb@Base 3.5.0
- obt_display_extension_xkb_basep@Base 3.5.0
- obt_display_ignore_errors@Base 3.5.0
- obt_display_open@Base 3.5.0
- obt_keyboard_context_new@Base 3.5.0
- obt_keyboard_context_ref@Base 3.5.0
- obt_keyboard_context_renew@Base 3.5.0
- obt_keyboard_context_unref@Base 3.5.0
-#MISSING: 3.5.2# obt_keyboard_keyevent_to_modkey@Base 3.5.0
- obt_keyboard_keyevent_to_modmask@Base 3.5.0
- obt_keyboard_keypress_to_keysym@Base 3.5.0
- obt_keyboard_keypress_to_unichar@Base 3.5.0
- obt_keyboard_keysym_to_keycode@Base 3.5.0
- obt_keyboard_modkey_to_modmask@Base 3.5.0
- obt_keyboard_only_modmasks@Base 3.5.0
- obt_keyboard_reload@Base 3.5.0
- obt_keyboard_shutdown@Base 3.5.0
- obt_link_app_categories@Base 3.5.0
- obt_link_from_ddfile@Base 3.5.0
- obt_link_ref@Base 3.5.0
- obt_link_unref@Base 3.5.0
- obt_paths_autostart_dirs@Base 3.5.0
- obt_paths_cache_home@Base 3.5.0
- obt_paths_config_dirs@Base 3.5.0
- obt_paths_config_home@Base 3.5.0
- obt_paths_data_dirs@Base 3.5.0
- obt_paths_data_home@Base 3.5.0
- obt_paths_expand_tilde@Base 3.5.0
- obt_paths_mkdir@Base 3.5.0
- obt_paths_mkdir_path@Base 3.5.0
- obt_paths_new@Base 3.5.0
- obt_paths_ref@Base 3.5.0
- obt_paths_try_exec@Base 3.5.0
- obt_paths_unref@Base 3.5.0
- obt_prop_atom@Base 3.5.0
- obt_prop_erase@Base 3.5.0
- obt_prop_get32@Base 3.5.0
- obt_prop_get_array32@Base 3.5.0
- obt_prop_get_array_text@Base 3.5.0
- obt_prop_get_text@Base 3.5.0
- obt_prop_message@Base 3.5.0
- obt_prop_message_to@Base 3.5.0
- obt_prop_set32@Base 3.5.0
- obt_prop_set_array32@Base 3.5.0
- obt_prop_set_array_text@Base 3.5.0
- obt_prop_set_text@Base 3.5.0
- obt_prop_startup@Base 3.5.0
- obt_signal_add_callback@Base 3.5.0
- obt_signal_listen@Base 3.5.0
- obt_signal_remove_callback@Base 3.5.0
- obt_signal_stop@Base 3.5.0
- obt_xml_attr_bool@Base 3.5.0
- obt_xml_attr_contains@Base 3.5.0
- obt_xml_attr_int@Base 3.5.0
- obt_xml_attr_string@Base 3.5.0
+ callbacks@Base 3.5.2
+ gid_cmp@Base 3.5.2
+ obt_ddparse_file@Base 3.5.2
+ obt_ddparse_group_keys@Base 3.5.2
+ obt_display@Base 3.5.2
+ obt_display_close@Base 3.5.2
+ obt_display_error_occured@Base 3.5.2
+ obt_display_extension_randr@Base 3.5.2
+ obt_display_extension_randr_basep@Base 3.5.2
+ obt_display_extension_shape@Base 3.5.2
+ obt_display_extension_shape_basep@Base 3.5.2
+ obt_display_extension_sync@Base 3.5.2
+ obt_display_extension_sync_basep@Base 3.5.2
+ obt_display_extension_xinerama@Base 3.5.2
+ obt_display_extension_xinerama_basep@Base 3.5.2
+ obt_display_extension_xkb@Base 3.5.2
+ obt_display_extension_xkb_basep@Base 3.5.2
+ obt_display_ignore_errors@Base 3.5.2
+ obt_display_open@Base 3.5.2
+ obt_keyboard_context_new@Base 3.5.2
+ obt_keyboard_context_ref@Base 3.5.2
+ obt_keyboard_context_renew@Base 3.5.2
+ obt_keyboard_context_unref@Base 3.5.2
+ obt_keyboard_keyevent_to_modmask@Base 3.5.2
+ obt_keyboard_keypress_to_keysym@Base 3.5.2
+ obt_keyboard_keypress_to_unichar@Base 3.5.2
+ obt_keyboard_keysym_to_keycode@Base 3.5.2
+ obt_keyboard_modkey_to_modmask@Base 3.5.2
+ obt_keyboard_only_modmasks@Base 3.5.2
+ obt_keyboard_reload@Base 3.5.2
+ obt_keyboard_shutdown@Base 3.5.2
+ obt_link_app_categories@Base 3.5.2
+ obt_link_from_ddfile@Base 3.5.2
+ obt_link_ref@Base 3.5.2
+ obt_link_unref@Base 3.5.2
+ obt_paths_autostart_dirs@Base 3.5.2
+ obt_paths_cache_home@Base 3.5.2
+ obt_paths_config_dirs@Base 3.5.2
+ obt_paths_config_home@Base 3.5.2
+ obt_paths_data_dirs@Base 3.5.2
+ obt_paths_data_home@Base 3.5.2
+ obt_paths_expand_tilde@Base 3.5.2
+ obt_paths_mkdir@Base 3.5.2
+ obt_paths_mkdir_path@Base 3.5.2
+ obt_paths_new@Base 3.5.2
+ obt_paths_ref@Base 3.5.2
+ obt_paths_try_exec@Base 3.5.2
+ obt_paths_unref@Base 3.5.2
+ obt_prop_atom@Base 3.5.2
+ obt_prop_erase@Base 3.5.2
+ obt_prop_get32@Base 3.5.2
+ obt_prop_get_array32@Base 3.5.2
+ obt_prop_get_array_text@Base 3.5.2
+ obt_prop_get_text@Base 3.5.2
+ obt_prop_message@Base 3.5.2
+ obt_prop_message_to@Base 3.5.2
+ obt_prop_set32@Base 3.5.2
+ obt_prop_set_array32@Base 3.5.2
+ obt_prop_set_array_text@Base 3.5.2
+ obt_prop_set_text@Base 3.5.2
+ obt_prop_startup@Base 3.5.2
+ obt_signal_add_callback@Base 3.5.2
+ obt_signal_listen@Base 3.5.2
+ obt_signal_remove_callback@Base 3.5.2
+ obt_signal_stop@Base 3.5.2
+ obt_xml_attr_bool@Base 3.5.2
+ obt_xml_attr_contains@Base 3.5.2
+ obt_xml_attr_int@Base 3.5.2
+ obt_xml_attr_string@Base 3.5.2
  obt_xml_attr_string_unstripped@Base 3.5.2
- obt_xml_close@Base 3.5.0
- obt_xml_doc@Base 3.5.0
- obt_xml_find_node@Base 3.5.0
- obt_xml_instance_new@Base 3.5.0
- obt_xml_instance_ref@Base 3.5.0
- obt_xml_instance_unref@Base 3.5.0
+ obt_xml_close@Base 3.5.2
+ obt_xml_doc@Base 3.5.2
+ obt_xml_find_node@Base 3.5.2
+ obt_xml_instance_new@Base 3.5.2
+ obt_xml_instance_ref@Base 3.5.2
+ obt_xml_instance_unref@Base 3.5.2
  obt_xml_last_error@Base 3.5.2
  obt_xml_last_error_file@Base 3.5.2
  obt_xml_last_error_line@Base 3.5.2
  obt_xml_last_error_message@Base 3.5.2
- obt_xml_load_config_file@Base 3.5.0
- obt_xml_load_data_file@Base 3.5.0
- obt_xml_load_file@Base 3.5.0
- obt_xml_load_mem@Base 3.5.0
- obt_xml_load_theme_file@Base 3.5.0
- obt_xml_node_bool@Base 3.5.0
- obt_xml_node_contains@Base 3.5.0
- obt_xml_node_int@Base 3.5.0
- obt_xml_node_string@Base 3.5.0
+ obt_xml_load_config_file@Base 3.5.2
+ obt_xml_load_data_file@Base 3.5.2
+ obt_xml_load_file@Base 3.5.2
+ obt_xml_load_mem@Base 3.5.2
+ obt_xml_load_theme_file@Base 3.5.2
+ obt_xml_node_bool@Base 3.5.2
+ obt_xml_node_contains@Base 3.5.2
+ obt_xml_node_int@Base 3.5.2
+ obt_xml_node_string@Base 3.5.2
  obt_xml_node_string_unstripped@Base 3.5.2
- obt_xml_register@Base 3.5.0
- obt_xml_root@Base 3.5.0
- obt_xml_save_file@Base 3.5.0
- obt_xml_tree@Base 3.5.0
- obt_xml_tree_from_root@Base 3.5.0
+ obt_xml_register@Base 3.5.2
+ obt_xml_root@Base 3.5.2
+ obt_xml_save_file@Base 3.5.2
+ obt_xml_tree@Base 3.5.2
+ obt_xml_tree_from_root@Base 3.5.2
  obt_xml_unregister@Base 3.5.2
- prop_atoms@Base 3.5.0
- prop_started@Base 3.5.0
- signals_fired@Base 3.5.0
- xqueue_add_callback@Base 3.5.0
- xqueue_destroy@Base 3.5.0
- xqueue_exists@Base 3.5.0
- xqueue_exists_local@Base 3.5.0
- xqueue_init@Base 3.5.0
- xqueue_listen@Base 3.5.0
- xqueue_match_type@Base 3.5.0
- xqueue_match_window@Base 3.5.0
- xqueue_match_window_message@Base 3.5.0
- xqueue_match_window_type@Base 3.5.0
- xqueue_next@Base 3.5.0
- xqueue_next_local@Base 3.5.0
- xqueue_peek@Base 3.5.0
- xqueue_peek_local@Base 3.5.0
- xqueue_pending_local@Base 3.5.0
- xqueue_remove_callback@Base 3.5.0
- xqueue_remove_local@Base 3.5.0
+ prop_atoms@Base 3.5.2
+ prop_started@Base 3.5.2
+ signals_fired@Base 3.5.2
+ xqueue_add_callback@Base 3.5.2
+ xqueue_destroy@Base 3.5.2
+ xqueue_exists@Base 3.5.2
+ xqueue_exists_local@Base 3.5.2
+ xqueue_init@Base 3.5.2
+ xqueue_listen@Base 3.5.2
+ xqueue_match_type@Base 3.5.2
+ xqueue_match_window@Base 3.5.2
+ xqueue_match_window_message@Base 3.5.2
+ xqueue_match_window_type@Base 3.5.2
+ xqueue_next@Base 3.5.2
+ xqueue_next_local@Base 3.5.2
+ xqueue_peek@Base 3.5.2
+ xqueue_peek_local@Base 3.5.2
+ xqueue_pending_local@Base 3.5.2
+ xqueue_remove_callback@Base 3.5.2
+ xqueue_remove_local@Base 3.5.2
diff -Nru openbox-3.5.2/debian/openbox.install openbox-3.5.2/debian/openbox.install
--- openbox-3.5.2/debian/openbox.install	2013-07-17 18:54:49.000000000 +0000
+++ openbox-3.5.2/debian/openbox.install	2013-09-26 09:53:10.000000000 +0000
@@ -23,11 +23,14 @@
 usr/share/xsessions/openbox-gnome.desktop
 usr/share/xsessions/openbox-kde.desktop
 usr/share/xsessions/openbox.desktop
+usr/share/gnome-session/sessions/openbox-gnome.session
+usr/share/gnome-session/sessions/openbox-gnome-fallback.session
 usr/bin/openbox
 usr/bin/obxprop
 usr/bin/openbox-session
 usr/bin/openbox-gnome-session
 usr/bin/openbox-kde-session
+usr/bin/gdm-control
 etc/xdg/openbox/rc.xml
 etc/xdg/openbox/menu.xml
 etc/xdg/openbox/autostart
diff -Nru openbox-3.5.2/debian/openbox.lintian-overrides openbox-3.5.2/debian/openbox.lintian-overrides
--- openbox-3.5.2/debian/openbox.lintian-overrides	1970-01-01 00:00:00.000000000 +0000
+++ openbox-3.5.2/debian/openbox.lintian-overrides	2013-09-26 09:53:10.000000000 +0000
@@ -0,0 +1,2 @@
+openbox: executable-not-elf-or-script etc/xdg/openbox/autostart
+openbox: executable-not-elf-or-script etc/xdg/openbox/environment
diff -Nru openbox-3.5.2/debian/openbox.manpages openbox-3.5.2/debian/openbox.manpages
--- openbox-3.5.2/debian/openbox.manpages	2013-07-17 19:26:38.000000000 +0000
+++ openbox-3.5.2/debian/openbox.manpages	2013-09-26 09:53:10.000000000 +0000
@@ -1 +1,2 @@
 openbox.1
+gdm-control.1
diff -Nru openbox-3.5.2/debian/patches/01_rc.xml.patch openbox-3.5.2/debian/patches/01_rc.xml.patch
--- openbox-3.5.2/debian/patches/01_rc.xml.patch	2013-08-13 21:20:38.000000000 +0000
+++ openbox-3.5.2/debian/patches/01_rc.xml.patch	2013-09-26 09:53:10.000000000 +0000
@@ -3,11 +3,11 @@
 
 add screenshot support using gnome-screenshot;
 ensure that the Debian system menu is listed in <menu>
-Index: openbox-3.5.2/data/rc.xml
+Index: openbox-3.4.11.1/data/rc.xml
 ===================================================================
---- openbox-3.5.2.orig/data/rc.xml	2013-08-13 23:18:36.000000000 +0200
-+++ openbox-3.5.2/data/rc.xml	2013-08-13 23:18:36.000000000 +0200
-@@ -242,6 +242,10 @@
+--- a/data/rc.xml
++++ b/data/rc.xml
+@@ -245,6 +245,10 @@
    <keybind key="A-space">
      <action name="ShowMenu"><menu>client-menu</menu></action>
    </keybind>
@@ -18,7 +18,7 @@
  
    <!-- Keybindings for window switching -->
    <keybind key="A-Tab">
-@@ -305,6 +309,10 @@
+@@ -308,6 +312,10 @@
        <command>kfmclient openProfile filemanagement</command>
      </action>
    </keybind>
@@ -29,7 +29,7 @@
  </keyboard>
  
  <mouse>
-@@ -618,6 +626,8 @@
+@@ -621,6 +629,8 @@
         just don't make menu ids clash or, well, it'll be kind of pointless -->
  
    <!-- default menu file (or custom one in $HOME/.config/openbox/) -->
diff -Nru openbox-3.5.2/debian/patches/04_fix_xml_load_file.patch openbox-3.5.2/debian/patches/04_fix_xml_load_file.patch
--- openbox-3.5.2/debian/patches/04_fix_xml_load_file.patch	1970-01-01 00:00:00.000000000 +0000
+++ openbox-3.5.2/debian/patches/04_fix_xml_load_file.patch	2013-09-26 09:53:10.000000000 +0000
@@ -0,0 +1,25 @@
+by Nico Golde <nion@debian.org>, slightly modified version
+from Eugenio Paolantonio <me@medesimo.eu>
+Do not build filename if a working full path is given.
+Fixes #644756.
+Index: openbox-3.5.0/obt/xml.c
+===================================================================
+--- openbox-3.5.0.orig/obt/xml.c	2011-10-30 14:13:07.000000000 +0100
++++ openbox-3.5.0/obt/xml.c	2011-10-30 14:13:10.000000000 +0100
+@@ -127,10 +127,13 @@
+         gchar *path;
+         struct stat s;
+ 
+-        if (!domain && !filename) /* given a full path to the file */
++        if (!domain && !filename){ /* given a full path to the file */
+             path = g_strdup(it->data);
+-        else
++        } else if(filename && filename[0] == '/' && stat(filename, &s) >= 0) {
++            path = g_strdup(filename);
++        } else {
+             path = g_build_filename(it->data, domain, filename, NULL);
++        }
+ 
+         if (stat(path, &s) >= 0) {
+             /* XML_PARSE_BLANKS is needed apparently, or the tree can end up
+
diff -Nru openbox-3.5.2/debian/patches/04_xsession.desktop_translation.patch openbox-3.5.2/debian/patches/04_xsession.desktop_translation.patch
--- openbox-3.5.2/debian/patches/04_xsession.desktop_translation.patch	2013-08-13 21:17:54.000000000 +0000
+++ openbox-3.5.2/debian/patches/04_xsession.desktop_translation.patch	1970-01-01 00:00:00.000000000 +0000
@@ -1,14 +0,0 @@
-by Séio Cipolla <secipolla@gmail.com>
-http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=627912
-Index: openbox-3.5.2/data/xsession/openbox.desktop.in
-===================================================================
---- openbox-3.5.2.orig/data/xsession/openbox.desktop.in	2013-08-13 23:17:20.000000000 +0200
-+++ openbox-3.5.2/data/xsession/openbox.desktop.in	2013-08-13 23:17:20.000000000 +0200
-@@ -1,6 +1,7 @@
- [Desktop Entry]
- Name=Openbox
- Comment=Log in using the Openbox window manager (without a session manager)
-+Comment[pt_BR]=Use esta sessãpara executar o Openbox como o seu ambiente de trabalho
- Exec=@bindir@/openbox-session
- TryExec=@bindir@/openbox-session
- Icon=openbox
diff -Nru openbox-3.5.2/debian/patches/05_openbox-3.5.0-title-matching.patch openbox-3.5.2/debian/patches/05_openbox-3.5.0-title-matching.patch
--- openbox-3.5.2/debian/patches/05_openbox-3.5.0-title-matching.patch	1970-01-01 00:00:00.000000000 +0000
+++ openbox-3.5.2/debian/patches/05_openbox-3.5.0-title-matching.patch	2013-09-26 09:53:10.000000000 +0000
@@ -0,0 +1,12 @@
+Description: Upstream patch to fix title on java applications
+--- openbox-3.5.0/openbox/client.c    2011-08-01 22:14:58.000000000 +0200
++++ openbox-3.5.0/openbox/client.c    2011-10-22 14:59:56.000000000 +0200
+@@ -883,7 +883,7 @@
+                  !g_pattern_match(app->role,
+                                   strlen(self->role), self->role, NULL))
+             match = FALSE;
+-        else if (app->title &&
++        else if (app->title && self->title &&
+                  !g_pattern_match(app->title,
+                                   strlen(self->title), self->title, NULL))
+             match = FALSE;
diff -Nru openbox-3.5.2/debian/patches/05_simplify_gnome_session.patch openbox-3.5.2/debian/patches/05_simplify_gnome_session.patch
--- openbox-3.5.2/debian/patches/05_simplify_gnome_session.patch	2013-08-13 21:23:47.000000000 +0000
+++ openbox-3.5.2/debian/patches/05_simplify_gnome_session.patch	1970-01-01 00:00:00.000000000 +0000
@@ -1,69 +0,0 @@
-Simplify gnome-session as per Bug#604043.
-The horrible hacks present in openbox upstream may have been necessary for
-gnome upstream, but the simple method of just setting WINDOW_MANAGER has
-always worked in Debian and should continue to work reliably.
-
-Jim Paris <jim@jtan.com>
-
-Index: openbox-3.5.2/data/xsession/openbox-gnome-session.in
-===================================================================
---- openbox-3.5.2.orig/data/xsession/openbox-gnome-session.in	2013-08-13 23:23:37.000000000 +0200
-+++ openbox-3.5.2/data/xsession/openbox-gnome-session.in	2013-08-13 23:23:43.000000000 +0200
-@@ -12,55 +12,8 @@
-       -remove _NET_DESKTOP_NAMES \
-       -remove _NET_CURRENT_DESKTOP 2> /dev/null
- 
--VER=$(gnome-session --version 2>/dev/null | \
--      sed -e 's/[^0-9.]*\([0-9.]\+\)/\1/')
--
--MAJOR=$(echo $VER | cut -d . -f 1)
--MINOR=$(echo $VER | cut -d . -f 2)
--
--# run GNOME with Openbox as its window manager
--
--if test $MAJOR -lt 2 || (test $MAJOR = 2 && test $MINOR -le 22); then
--  # older gnome-session was easy to work with
--  export WINDOW_MANAGER="@bindir@/openbox"
--  exec gnome-session --choose-session=openbox-session "$@"
--elif test $MAJOR -lt 3; then
--  # old gnome-session requires openbox to be set in gconf and an
--  # openbox.desktop to be installed in the applications directory
--
--  SPATH=/desktop/gnome/session
--
--  # get the current default session
--  SESSION=$(gconftool-2 -g $SPATH/default_session 2> /dev/null)
--
--  # make sure openbox is going to be run
--  if test -z "$SESSION"; then
--      # if its empty then just run openbox
--      SESSION="[openbox]"
--  elif ! echo "$SESSION" | grep -q openbox; then
--      # if openbox isn't in the session then append it
--      SESSION="${SESSION%]},openbox]"
--  fi
--
--  # get the current GNOME/Openbox session
--  OB_SESSION=$(gconftool-2 -g $SPATH/openbox_session 2> /dev/null)
--
--  # update the GNOME/Openbox session if needed
--  if test x$OB_SESSION != x$SESSION; then
--      # the default session changed or we didn't run GNOME/Openbox before
--      gconftool-2 -t list --list-type=strings -s $SPATH/openbox_session \
--        "$SESSION" 2> /dev/null
--  fi
--
--  # run GNOME/Openbox
--  exec gnome-session --default-session-key $SPATH/openbox_session "$@"
--else
--  # new gnome-session requires session file installed in
--  # /usr/share/gnome-session/sessions as well as openbox.desktop to be
--  # installed in the applications directory
--
--  exec gnome-session --session=openbox-gnome
--fi
-+export WINDOW_MANAGER=openbox
-+exec gnome-session --session=openbox-gnome
- 
- 
- 
diff -Nru openbox-3.5.2/debian/patches/06_openbox-3.5.0-which-2.20.patch openbox-3.5.2/debian/patches/06_openbox-3.5.0-which-2.20.patch
--- openbox-3.5.2/debian/patches/06_openbox-3.5.0-which-2.20.patch	1970-01-01 00:00:00.000000000 +0000
+++ openbox-3.5.2/debian/patches/06_openbox-3.5.0-which-2.20.patch	2013-09-26 09:53:10.000000000 +0000
@@ -0,0 +1,14 @@
+Description: Fixed load gnome 3 applications
+Index: openbox-3.5.0/data/autostart/autostart.in
+===================================================================
+--- openbox-3.5.0.orig/data/autostart/autostart.in	2013-07-17 17:09:45.000000000 +0200
++++ openbox-3.5.0/data/autostart/autostart.in	2013-07-17 18:32:23.000000000 +0200
+@@ -8,7 +8,7 @@
+ #
+ #if test -x @libexecdir@/gnome-settings-daemon >/dev/null; then
+ #  @libexecdir@/gnome-settings-daemon &
+-#elif which gnome-settings-daemon >/dev/null; then
++#elif which gnome-settings-daemon >/dev/null 2>&1; then
+ #  gnome-settings-daemon &
+ #fi
+ 
diff -Nru openbox-3.5.2/debian/patches/07_fix_xml_load_file.patch openbox-3.5.2/debian/patches/07_fix_xml_load_file.patch
--- openbox-3.5.2/debian/patches/07_fix_xml_load_file.patch	2013-08-13 21:24:22.000000000 +0000
+++ openbox-3.5.2/debian/patches/07_fix_xml_load_file.patch	1970-01-01 00:00:00.000000000 +0000
@@ -1,24 +0,0 @@
-by Nico Golde <nion@debian.org>, slightly modified version
-from Eugenio Paolantonio <me@medesimo.eu>
-Do not build filename if a working full path is given.
-Fixes #644756.
-Index: openbox-3.5.2/obt/xml.c
-===================================================================
---- openbox-3.5.2.orig/obt/xml.c	2013-08-13 23:24:14.000000000 +0200
-+++ openbox-3.5.2/obt/xml.c	2013-08-13 23:24:14.000000000 +0200
-@@ -144,10 +144,13 @@
-         gchar *path;
-         struct stat s;
- 
--        if (!domain && !filename) /* given a full path to the file */
-+        if (!domain && !filename){ /* given a full path to the file */
-             path = g_strdup(it->data);
--        else
-+        } else if(filename && filename[0] == '/' && stat(filename, &s) >= 0) {
-+            path = g_strdup(filename);
-+        } else {
-             path = g_build_filename(it->data, domain, filename, NULL);
-+        }
- 
-         if (stat(path, &s) >= 0) {
-             /* XML_PARSE_BLANKS is needed apparently, or the tree can end up
diff -Nru openbox-3.5.2/debian/patches/07_update_desktop.patch openbox-3.5.2/debian/patches/07_update_desktop.patch
--- openbox-3.5.2/debian/patches/07_update_desktop.patch	1970-01-01 00:00:00.000000000 +0000
+++ openbox-3.5.2/debian/patches/07_update_desktop.patch	2013-09-26 09:53:10.000000000 +0000
@@ -0,0 +1,10 @@
+Description: Add keywords to desktop file.
+Author: Mateusz Łukasik <mati75@linuxmint.pl>
+
+--- a/data/openbox.desktop
++++ b/data/openbox.desktop
+@@ -13,3 +13,4 @@ X-GNOME-Provides=windowmanager
+ X-Ubuntu-Gettext-Domain=openbox
+ # back compat
+ X-GNOME-Autostart-Notify=true
++_Keywords=wm;windowmanager;window;manager;gnome;
diff -Nru openbox-3.5.2/debian/patches/658081_fix_kde_menu.patch openbox-3.5.2/debian/patches/658081_fix_kde_menu.patch
--- openbox-3.5.2/debian/patches/658081_fix_kde_menu.patch	2013-07-17 15:02:16.000000000 +0000
+++ openbox-3.5.2/debian/patches/658081_fix_kde_menu.patch	1970-01-01 00:00:00.000000000 +0000
@@ -1,22 +0,0 @@
-commit a23954ec17c17259f75e0f4e647975bbf4ede058
-Author: Dana Jansens <danakj@orodu.net>
-Date:   Thu Sep 29 12:52:07 2011 -0400
-
-    bug #5253 kde4 is out now, use kde4 menus by default.
-    
-    Startup scripts should export "XDG_MENU_PREFIX=kde-4-" but they export
-    "XDG_MENU_PREFIX=kde-".
-
-diff --git a/data/xsession/openbox-kde-session.in b/data/xsession/openbox-kde-session.in
-index 14e3504..3572279 100644
---- a/data/xsession/openbox-kde-session.in
-+++ b/data/xsession/openbox-kde-session.in
-@@ -8,7 +8,7 @@ if test -n "$1"; then
- fi
- 
- # Set the prefix for the menu layout to use
--export XDG_MENU_PREFIX="kde-"
-+export XDG_MENU_PREFIX="kde-4-"
- 
- # Clean up after GDM
- xprop -root -remove _NET_NUMBER_OF_DESKTOPS \
diff -Nru openbox-3.5.2/debian/patches/666676_wrong_undecorated_window_placement.patch openbox-3.5.2/debian/patches/666676_wrong_undecorated_window_placement.patch
--- openbox-3.5.2/debian/patches/666676_wrong_undecorated_window_placement.patch	2013-03-27 13:53:20.000000000 +0000
+++ openbox-3.5.2/debian/patches/666676_wrong_undecorated_window_placement.patch	1970-01-01 00:00:00.000000000 +0000
@@ -1,133 +0,0 @@
-From: Dana Jansens <danakj@orodu.net>
-Date: Fri, 14 Oct 2011 22:54:32 +0000 (-0400)
-Subject: make undecorated windows place according to their undecorated state (bug #5179)
-X-Git-Url: http://git.openbox.org/?p=dana%2Fopenbox.git;a=commitdiff_plain;h=a0d14c7d4468b6348d906a68bb5dfe3acce0ad64;hp=332280daf9a4bc410544ae7d267092a11ab8c945
-
-make undecorated windows place according to their undecorated state (bug #5179)
-
-splits client_setup_decor_and_functions() into 3 functions.
-
-1. add client_setup_default_decor_and_functions()
-- called from client_get_all() to get the maximum decor/functions that will
-  be available for use by the client.
-2. add client_setup_decor_undecorated()
-- sets up the client's undecorarted decor if the flag is set by the per-app
-  settings or session state.
-- we do this before setting up the frame so the frame reflects the window as it
-  should be when getting placed.
-3. client_setup_decor_and_functions()
-- calls the above 2 to perform the same functions as before.
-- added to client_apply_startup_state() so that we can ensure it was run fully
-  at least once in the mapping process, since it is not called in
-  client_get_all() anymore.
-
---- openbox-3.5.0.orig/openbox/client.c
-+++ openbox-3.5.0/openbox/client.c
-@@ -112,6 +112,8 @@ static gboolean client_can_steal_focus(O
-                                        gboolean allow_other_desktop,
-                                        gboolean request_from_user,
-                                        Time steal_time, Time launch_time);
-+static void client_setup_default_decor_and_functions(ObClient *self);
-+static void client_setup_decor_undecorated(ObClient *self);
- 
- void client_startup(gboolean reconfig)
- {
-@@ -238,6 +240,18 @@ void client_manage(Window window, ObProm
-        that needs to be freed with g_free(). */
-     settings = client_get_settings_state(self);
- 
-+    /* the session should get the last say though */
-+    client_restore_session_state(self);
-+
-+    /* the per-app settings/session may have changed the decorations for
-+       the window, so we setup decorations for that here.  this is a special
-+       case because we want to place the window according to these decoration
-+       changes.
-+       we do this before setting up the frame so that it will reflect the
-+       decorations of the window as it will be placed on screen.
-+    */
-+    client_setup_decor_undecorated(self);
-+
-     /* specify that if we exit, the window should not be destroyed and
-        should be reparented back to root automatically, unless we are managing
-        an internal ObPrompt window  */
-@@ -253,9 +267,6 @@ void client_manage(Window window, ObProm
-        time now */
-     grab_server(FALSE);
- 
--    /* the session should get the last say though */
--    client_restore_session_state(self);
--
-     /* tell startup notification that this app started */
-     launch_time = sn_app_started(self->startup_id, self->class, self->name);
- 
-@@ -1156,11 +1167,8 @@ static void client_get_all(ObClient *sel
-     client_get_type_and_transientness(self);
-     client_update_normal_hints(self);
- 
--    /* set up the decor/functions before getting the state.  the states may
--       affect which functions are available, but we want to know the maximum
--       decor/functions are available to this window, so we can then apply them
--       in client_apply_startup_state() */
--    client_setup_decor_and_functions(self, FALSE);
-+    /* set up the maximum possible decor/functions */
-+    client_setup_default_decor_and_functions(self);
- 
-     client_get_state(self);
- 
-@@ -1704,7 +1712,7 @@ void client_update_normal_hints(ObClient
-         ob_debug("Normal hints: not set");
- }
- 
--void client_setup_decor_and_functions(ObClient *self, gboolean reconfig)
-+static void client_setup_default_decor_and_functions(ObClient *self)
- {
-     /* start with everything (cept fullscreen) */
-     self->decorations =
-@@ -1837,6 +1845,23 @@ void client_setup_decor_and_functions(Ob
-         self->functions &= ~OB_CLIENT_FUNC_MAXIMIZE;
-         self->decorations &= ~OB_FRAME_DECOR_MAXIMIZE;
-     }
-+}
-+
-+/*! Set up decor for a client based on its undecorated state. */
-+static void client_setup_decor_undecorated(ObClient *self)
-+{
-+    /* If the user requested no decorations, then remove all the decorations,
-+       except the border.  But don't add a border if there wasn't one. */
-+    if (self->undecorated)
-+        self->decorations &= (config_theme_keepborder ?
-+                              OB_FRAME_DECOR_BORDER : 0);
-+}
-+
-+void client_setup_decor_and_functions(ObClient *self, gboolean reconfig)
-+{
-+    client_setup_default_decor_and_functions(self);
-+
-+    client_setup_decor_undecorated(self);
- 
-     if (self->max_horz && self->max_vert) {
-         /* once upon a time you couldn't resize maximized windows, that is not
-@@ -1846,12 +1871,6 @@ void client_setup_decor_and_functions(Ob
-         self->decorations &= ~(OB_FRAME_DECOR_HANDLE | OB_FRAME_DECOR_GRIPS);
-     }
- 
--    /* finally, the user can have requested no decorations, which overrides
--       everything (but doesnt give it a border if it doesnt have one) */
--    if (self->undecorated)
--        self->decorations &= (config_theme_keepborder ?
--                              OB_FRAME_DECOR_BORDER : 0);
--
-     /* if we don't have a titlebar, then we cannot shade! */
-     if (!(self->decorations & OB_FRAME_DECOR_TITLEBAR))
-         self->functions &= ~OB_CLIENT_FUNC_SHADE;
-@@ -2783,6 +2802,9 @@ static void client_apply_startup_state(O
-     if (fullscreen)
-         client_fullscreen(self, TRUE);
- 
-+    /* make sure client_setup_decor_and_functions() is called at least once */
-+    client_setup_decor_and_functions(self, FALSE);
-+
-     /* if the window hasn't been configured yet, then do so now, in fact the
-        x,y,w,h may _not_ be the same as the area rect, which can end up
-        meaning that the client isn't properly moved/resized by the fullscreen
diff -Nru openbox-3.5.2/debian/patches/675991_fix_crash_from_gtk3_apps.patch openbox-3.5.2/debian/patches/675991_fix_crash_from_gtk3_apps.patch
--- openbox-3.5.2/debian/patches/675991_fix_crash_from_gtk3_apps.patch	2013-03-27 13:53:20.000000000 +0000
+++ openbox-3.5.2/debian/patches/675991_fix_crash_from_gtk3_apps.patch	1970-01-01 00:00:00.000000000 +0000
@@ -1,20 +0,0 @@
-From 339c19d1b3a7a5139aed8b59bad755ddd0e518ff Mon Sep 17 00:00:00 2001
-From: Mikael Magnusson <mikachu@gmail.com>
-Date: Sun, 3 Jun 2012 20:18:48 +0200
-Subject: [PATCH] Fix crash on unexpected NET_WM_MOVERESIZE_CANCEL messages
-
-gtk+ 3.4 apparently sends these randomly when you select text in a
-GtkEntry. This also fixes bug #5460.
-
---- openbox-3.5.0.orig/openbox/event.c
-+++ openbox-3.5.0/openbox/event.c
-@@ -1488,7 +1488,8 @@ static void event_handle_client(ObClient
-             }
-             else if ((Atom)e->xclient.data.l[2] ==
-                      OBT_PROP_ATOM(NET_WM_MOVERESIZE_CANCEL))
--                moveresize_end(TRUE);
-+                if (moveresize_client)
-+                    moveresize_end(TRUE);
-         } else if (msgtype == OBT_PROP_ATOM(NET_MOVERESIZE_WINDOW)) {
-             gint ograv, x, y, w, h;
- 
diff -Nru openbox-3.5.2/debian/patches/704724_fix_refers-to-autostart.sh.patch openbox-3.5.2/debian/patches/704724_fix_refers-to-autostart.sh.patch
--- openbox-3.5.2/debian/patches/704724_fix_refers-to-autostart.sh.patch	2013-07-23 06:35:24.000000000 +0000
+++ openbox-3.5.2/debian/patches/704724_fix_refers-to-autostart.sh.patch	2013-09-26 09:53:10.000000000 +0000
@@ -4,127 +4,6 @@
 
     Update manpage to current version. (Fix bug 5444)
 
-diff --git a/doc/openbox.1.in b/doc/openbox.1.in
-index d508e8c..bd3747f 100644
---- a/doc/openbox.1.in
-+++ b/doc/openbox.1.in
-@@ -58,11 +58,14 @@ to ~/.config/openbox and edit it to your liking.
- .PP 
- These are the possible options that \fBopenbox\fR accepts: 
- .IP "\fB\-\-help\fP" 10 
--Show a summary of the options available. 
-+Show a summary of the command line options available 
-+and exit. 
- .IP "\fB\-\-version\fP" 10 
--Show the version of the program. 
-+Show the version of the program and exit. 
- .IP "\fB\-\-replace\fP" 10 
- Replace the currently running window manager. 
-+.IP "\fB\-\-config-file FILE\fP" 10 
-+Specify the path to the config file to use. 
- .IP "\fB\-\-reconfigure\fP" 10 
- If Openbox is already running on the display, tell it to 
- reload its configuration. 
-@@ -70,14 +73,20 @@ reload its configuration.
- If Openbox is already running on the display, tell it to 
- restart. This is useful if you have upgraded Openbox and don't 
- want to restart X. 
-+.IP "\fB\-\-exit\fP" 10 
-+Exit Openbox. 
- .IP "\fB\-\-sm-disable\fP" 10 
- Do not connect to the session manager. 
- .IP "\fB\-\-sync\fP" 10 
- Run in synchronous mode (for debugging). 
-+.IP "\fB\-\-startup CMD\fP" 10 
-+Run CMD after starting. 
- .IP "\fB\-\-debug\fP" 10 
- Display debugging output. 
- .IP "\fB\-\-debug-focus\fP" 10 
- Display debugging output for focus handling. 
-+.IP "\fB\-\-debug-session\fP" 10 
-+Display debugging output for session management. 
- .IP "\fB\-\-debug-xinerama\fP" 10 
- Split the display into two fake xinerama regions, if 
- xinerama is not already enabled. This is for debugging 
-@@ -92,4 +101,4 @@ The program's full documentation is available on the website:
- .PP 
- Please report bugs to: \fBhttp://bugzilla.icculus.org/ 
- \fP 
--.\" created by instant / docbook-to-man, Wed 06 Jan 2010, 13:40 
-+.\" created by instant / docbook-to-man, Sun 30 Sep 2012, 17:58 
-diff --git a/doc/openbox.1.sgml b/doc/openbox.1.sgml
-index 275c324..281f2a0 100644
---- a/doc/openbox.1.sgml
-+++ b/doc/openbox.1.sgml
-@@ -106,13 +106,14 @@ manpage.1: manpage.sgml
-       <varlistentry>
-         <term><option>--help</option></term>
-         <listitem>
--          <para>Show a summary of the options available.</para>
-+          <para>Show a summary of the command line options available
-+            and exit.</para>
-         </listitem>
-       </varlistentry>
-       <varlistentry>
-         <term><option>--version</option></term>
-         <listitem>
--          <para>Show the version of the program.</para>
-+          <para>Show the version of the program and exit.</para>
-         </listitem>
-       </varlistentry>
-       <varlistentry>
-@@ -122,6 +123,12 @@ manpage.1: manpage.sgml
-         </listitem>
-       </varlistentry>
-       <varlistentry>
-+        <term><option>--config-file FILE</option></term>
-+        <listitem>
-+          <para>Specify the path to the config file to use.</para>
-+        </listitem>
-+      </varlistentry>
-+      <varlistentry>
-         <term><option>--reconfigure</option></term>
-         <listitem>
-           <para>If Openbox is already running on the display, tell it to
-@@ -137,6 +144,12 @@ manpage.1: manpage.sgml
-         </listitem>
-       </varlistentry>
-       <varlistentry>
-+        <term><option>--exit</option></term>
-+        <listitem>
-+          <para>Exit Openbox.</para>
-+        </listitem>
-+      </varlistentry>
-+      <varlistentry>
-         <term><option>--sm-disable</option></term>
-         <listitem>
-           <para>Do not connect to the session manager.</para>
-@@ -149,6 +162,12 @@ manpage.1: manpage.sgml
-         </listitem>
-       </varlistentry>
-       <varlistentry>
-+        <term><option>--startup CMD</option></term>
-+        <listitem>
-+          <para>Run CMD after starting.</para>
-+        </listitem>
-+      </varlistentry>
-+      <varlistentry>
-         <term><option>--debug</option></term>
-         <listitem>
-           <para>Display debugging output.</para>
-@@ -161,6 +180,12 @@ manpage.1: manpage.sgml
-         </listitem>
-       </varlistentry>
-       <varlistentry>
-+        <term><option>--debug-session</option></term>
-+        <listitem>
-+          <para>Display debugging output for session management.</para>
-+        </listitem>
-+      </varlistentry>
-+      <varlistentry>
-         <term><option>--debug-xinerama</option></term>
-         <listitem>
-           <para>Split the display into two fake xinerama regions, if
 --- a/doc/openbox-session.1.in
 +++ b/doc/openbox-session.1.in
 @@ -12,8 +12,8 @@ to save your state from one log in to th
diff -Nru openbox-3.5.2/debian/patches/719620_fix_show_startup_notification.patch openbox-3.5.2/debian/patches/719620_fix_show_startup_notification.patch
--- openbox-3.5.2/debian/patches/719620_fix_show_startup_notification.patch	1970-01-01 00:00:00.000000000 +0000
+++ openbox-3.5.2/debian/patches/719620_fix_show_startup_notification.patch	2013-09-26 09:53:10.000000000 +0000
@@ -0,0 +1,49 @@
+Description: Fix showing startup notification
+Author: Andrej N. Gritsenko <andrej@rep.kiev.ua>
+Bug-Debian: http://bugs.debian.org/719620
+
+diff --git a/configure.ac b/configure.ac
+index a183309..5d55c56 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -125,7 +125,7 @@ AC_ARG_ENABLE(startup-notification,
+ )
+ 
+ if test "$enable_sn" = yes; then
+-PKG_CHECK_MODULES(LIBSN, [libstartup-notification-1.0 >= 0.8],
++PKG_CHECK_MODULES(LIBSN, [libstartup-notification-1.0 >= 0.8 xi],
+   [
+     AC_DEFINE(USE_LIBSN, [1], [Use startup-notification])
+     AC_SUBST(LIBSN_CFLAGS)
+diff --git a/openbox/screen.c b/openbox/screen.c
+index 33acb4a..ed57f22 100644
+--- a/openbox/screen.c
++++ b/openbox/screen.c
+@@ -40,6 +40,7 @@
+ #include "obt/prop.h"
+ 
+ #include <X11/Xlib.h>
++#include <X11/extensions/XInput2.h>
+ #ifdef HAVE_UNISTD_H
+ #  include <sys/types.h>
+ #  include <unistd.h>
+@@ -1844,12 +1845,15 @@ const Rect* screen_physical_area_primary(gboolean fixed)
+ 
+ void screen_set_root_cursor(void)
+ {
++    int pointer_id;
++    if (!XIGetClientPointer(obt_display, None, &pointer_id))
++        return;
+     if (sn_app_starting())
+-        XDefineCursor(obt_display, obt_root(ob_screen),
+-                      ob_cursor(OB_CURSOR_BUSYPOINTER));
++        XIDefineCursor(obt_display, pointer_id, obt_root(ob_screen),
++                       ob_cursor(OB_CURSOR_BUSYPOINTER));
+     else
+-        XDefineCursor(obt_display, obt_root(ob_screen),
+-                      ob_cursor(OB_CURSOR_POINTER));
++        XIDefineCursor(obt_display, pointer_id, obt_root(ob_screen),
++                       ob_cursor(OB_CURSOR_POINTER));
+ }
+ 
+ guint screen_find_monitor_point(guint x, guint y)
diff -Nru openbox-3.5.2/debian/patches/90_fix_link_obt.patch openbox-3.5.2/debian/patches/90_fix_link_obt.patch
--- openbox-3.5.2/debian/patches/90_fix_link_obt.patch	2013-03-27 13:53:20.000000000 +0000
+++ openbox-3.5.2/debian/patches/90_fix_link_obt.patch	1970-01-01 00:00:00.000000000 +0000
@@ -1,22 +0,0 @@
-From: Fryderyk Dziarmagowski <fdziarmagowski@gmail.com>
-Date: Fri, 14 Oct 2011 21:41:43 +0000 (-0400)
-Subject: Link libobt into libobrender, as it uses things from libobt (bug #5150)
-X-Git-Url: http://git.openbox.org/?p=dana%2Fopenbox.git;a=commitdiff_plain;h=b1039d6142865e3141c831ce75cd9799ce3ceab7
-
-Link libobt into libobrender, as it uses things from libobt (bug #5150)
-
-libobrender uses ObtPaths stuff, so it needs to link in libobt.
----
-
-Index: openbox-3.5.0/Makefile.am
-===================================================================
---- openbox-3.5.0.orig/Makefile.am	2011-08-01 22:14:58.000000000 +0200
-+++ openbox-3.5.0/Makefile.am	2012-06-05 07:03:32.000000000 +0200
-@@ -79,6 +79,7 @@
- obrender_libobrender_la_LDFLAGS = \
- 	-version-info $(RR_CURRENT):$(RR_REVISION):$(RR_AGE)
- obrender_libobrender_la_LIBADD = \
-+	obt/libobt.la \
- 	$(X_LIBS) \
- 	$(PANGO_LIBS) \
- 	$(GLIB_LIBS) \
diff -Nru openbox-3.5.2/debian/patches/91_fix_loose_focus.patch openbox-3.5.2/debian/patches/91_fix_loose_focus.patch
--- openbox-3.5.2/debian/patches/91_fix_loose_focus.patch	2013-06-10 22:03:22.000000000 +0000
+++ openbox-3.5.2/debian/patches/91_fix_loose_focus.patch	1970-01-01 00:00:00.000000000 +0000
@@ -1,115 +0,0 @@
-Commit : https://github.com/danakj/openbox/commit/683749d3f38891c4073a9918381d8f18a9939dc2
-
-Allow windows created by execute actions to steal focus if the user isn't interacting with another window (Fix bug 5419).
-
-When the execute action was run, we would say that the user had used the focused
-at that time. Then when a new window popped up, we'd think the user was busy in
-the current window and prevent the new one from steal focus.
-
-Now the execute action does not update the "user interacted with the focused
-window" timestamp anymore. So, if they aren't currently typing in some window
-when they trigger an execute action, and the window appears, it will steal
-focus.
----
-Index: openbox-3.5.0/openbox/actions.c
-===================================================================
---- openbox-3.5.0.orig/openbox/actions.c	2011-08-01 22:14:58.000000000 +0200
-+++ openbox-3.5.0/openbox/actions.c	2013-06-10 23:56:55.000000000 +0200
-@@ -51,6 +51,7 @@
-     ObActionsDataFreeFunc free;
-     ObActionsRunFunc run;
-     ObActionsShutdownFunc shutdown;
-+    gboolean modifies_focused_window;
- };
- 
- struct _ObActionsAct {
-@@ -103,12 +104,13 @@
-             return NULL;
-     }
- 
--    def = g_slice_new(ObActionsDefinition);
-+    def = g_slice_new0(ObActionsDefinition);
-     def->ref = 1;
-     def->name = g_strdup(name);
-     def->free = free;
-     def->run = run;
-     def->shutdown = NULL;
-+    def->modifies_focused_window = TRUE;
- 
-     registered = g_slist_prepend(registered, def);
-     return def;
-@@ -156,6 +158,22 @@
-     return FALSE;
- }
- 
-+gboolean actions_set_modifies_focused_window(const gchar *name,
-+                                             gboolean modifies)
-+{
-+    GSList *it;
-+    ObActionsDefinition *def;
-+
-+    for (it = registered; it; it = g_slist_next(it)) {
-+        def = it->data;
-+        if (!g_ascii_strcasecmp(name, def->name)) {
-+            def->modifies_focused_window = modifies;
-+            return TRUE;
-+        }
-+    }
-+    return FALSE;
-+}
-+
- static void actions_definition_ref(ObActionsDefinition *def)
- {
-     ++def->ref;
-@@ -340,8 +358,11 @@
-             if (!act->def->run(&data, act->options)) {
-                 if (actions_act_is_interactive(act))
-                     actions_interactive_end_act();
--                if (client && client == focus_client)
-+                if (client && client == focus_client &&
-+                    act->def->modifies_focused_window)
-+                {
-                     update_user_time = TRUE;
-+                }
-             } else {
-                 /* make sure its interactive if it returned TRUE */
-                 g_assert(act->i_input);
-Index: openbox-3.5.0/openbox/actions.h
-===================================================================
---- openbox-3.5.0.orig/openbox/actions.h	2011-08-01 22:14:58.000000000 +0200
-+++ openbox-3.5.0/openbox/actions.h	2013-06-10 23:58:24.000000000 +0200
-@@ -83,6 +83,9 @@
- gboolean actions_set_shutdown(const gchar *name,
-                               ObActionsShutdownFunc shutdown);
- 
-+gboolean actions_set_modifies_focused_window(const gchar *name,
-+                                             gboolean modifies);
-+
- ObActionsAct* actions_parse(xmlNodePtr node);
- ObActionsAct* actions_parse_string(const gchar *name);
- 
-Index: openbox-3.5.0/openbox/actions/execute.c
-===================================================================
---- openbox-3.5.0.orig/openbox/actions/execute.c	2011-08-01 22:14:58.000000000 +0200
-+++ openbox-3.5.0/openbox/actions/execute.c	2013-06-10 23:59:22.000000000 +0200
-@@ -33,6 +33,7 @@
- {
-     actions_register("Execute", setup_func, free_func, run_func);
-     actions_set_shutdown("Execute", shutdown_func);
-+    actions_set_modifies_focused_window("Execute", FALSE);
- 
-     client_add_destroy_notify(client_dest, NULL);
- }
-Index: openbox-3.5.0/openbox/event.h
-===================================================================
---- openbox-3.5.0.orig/openbox/event.h	2011-08-01 22:14:58.000000000 +0200
-+++ openbox-3.5.0/openbox/event.h	2013-06-10 23:59:57.000000000 +0200
-@@ -26,7 +26,7 @@
- 
- /*! The amount of time before a window appears that is checked for user input
-     to determine if the user is working in another window */
--#define OB_EVENT_USER_TIME_DELAY (1000) /* 1.0 seconds */
-+#define OB_EVENT_USER_TIME_DELAY (1000) /* milliseconds */
- 
- /*! The last user-interaction time, as given by the clients */
- extern Time event_last_user_time;
diff -Nru openbox-3.5.2/debian/patches/add_automake1.11_support.patch openbox-3.5.2/debian/patches/add_automake1.11_support.patch
--- openbox-3.5.2/debian/patches/add_automake1.11_support.patch	2013-07-22 15:48:58.000000000 +0000
+++ openbox-3.5.2/debian/patches/add_automake1.11_support.patch	1970-01-01 00:00:00.000000000 +0000
@@ -1,22 +0,0 @@
-commit 5aad740a527e4aa6b1a96dadecbb6d6a29cc7e7c
-Author: Dana Jansens <danakj@orodu.net>
-Date:   Mon Oct 17 15:48:31 2011 -0400
-
-    Quiet build outbut on by default
-
-diff --git a/README.GIT b/README.GIT
-index dfed9c4..a6ad99b 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -1,8 +1,10 @@
- AC_PREREQ([2.54])
- AC_INIT([openbox], [3.5.0], [http://bugzilla.icculus.org])
--AM_INIT_AUTOMAKE
- AC_CONFIG_SRCDIR([openbox/openbox.c])
- 
-+AM_INIT_AUTOMAKE([foreign])
-+AM_SILENT_RULES([yes])
-+
- OB_VERSION=$PACKAGE_VERSION
- AC_SUBST(OB_VERSION)
- 
diff -Nru openbox-3.5.2/debian/patches/clever-rectangle-picking.patch openbox-3.5.2/debian/patches/clever-rectangle-picking.patch
--- openbox-3.5.2/debian/patches/clever-rectangle-picking.patch	2013-03-27 13:53:20.000000000 +0000
+++ openbox-3.5.2/debian/patches/clever-rectangle-picking.patch	1970-01-01 00:00:00.000000000 +0000
@@ -1,195 +0,0 @@
-commit d68116c9c9b2c9a9925d872141eff8e301ef3bb3
-Author: Dana Jansens <danakj@orodu.net>
-Date:   Sat Oct 15 23:04:21 2011 -0400
-
-    Pick the monitor most relevant to a rectangle more cleverly.
-    
-    When monitors overlap (this happens with cloning), we were choosing a monitor
-    to associate with a window, for maximization for example, somewhat arbitrarily.
-    
-    Now we have a more clever algorithm that considers the configured primary
-    monitor first, and that does not prefer monitors based on their sizes, but only
-    how much of the window is in the monitor, excluding parts that were claimed
-    by another monitor already.
-
-Index: openbox-3.5.0/openbox/geom.h
-===================================================================
---- openbox-3.5.0.orig/openbox/geom.h	2013-03-27 13:28:06.462611462 +0100
-+++ openbox-3.5.0/openbox/geom.h	2013-03-27 13:29:09.872687284 +0100
-@@ -65,6 +65,8 @@
- #define RECT_RIGHT(r) ((r).x + (r).width - 1)
- #define RECT_BOTTOM(r) ((r).y + (r).height - 1)
- 
-+#define RECT_AREA(r) ((r).width * (r).height)
-+
- #define RECT_SET_POINT(r, nx, ny) \
-     (r).x = (nx), (r).y = (ny)
- #define RECT_SET_SIZE(r, w, h) \
-Index: openbox-3.5.0/openbox/screen.c
-===================================================================
---- openbox-3.5.0.orig/openbox/screen.c	2013-03-27 13:28:06.462611462 +0100
-+++ openbox-3.5.0/openbox/screen.c	2013-03-27 13:29:09.874687318 +0100
-@@ -1372,6 +1372,14 @@
-         b = MAX(b, (*xin_areas)[i].y + (*xin_areas)[i].height - 1);
-     }
-     RECT_SET((*xin_areas)[*nxin], l, t, r - l + 1, b - t + 1);
-+
-+    for (i = 0; i < *nxin; ++i)
-+        ob_debug("Monitor %d @ %d,%d %dx%d\n", i,
-+                 (*xin_areas)[i].x, (*xin_areas)[i].y,
-+                 (*xin_areas)[i].width, (*xin_areas)[i].height);
-+    ob_debug("Full desktop @ %d,%d %dx%d\n",
-+             (*xin_areas)[i].x, (*xin_areas)[i].y,
-+             (*xin_areas)[i].width, (*xin_areas)[i].height);
- }
- 
- void screen_update_areas(void)
-@@ -1631,27 +1639,135 @@
-     return a;
- }
- 
-+typedef struct {
-+    Rect r;
-+    gboolean subtract;
-+} RectArithmetic;
-+
- guint screen_find_monitor(const Rect *search)
- {
-     guint i;
-     guint most = screen_num_monitors;
--    guint mostv = 0;
-+    guint mostpx = 0;
-+    GSList *counted = NULL;
- 
--    for (i = 0; i < screen_num_monitors; ++i) {
--        const Rect *area = screen_physical_area_monitor(i);
--        if (RECT_INTERSECTS_RECT(*area, *search)) {
--            Rect r;
--            guint v;
--
--            RECT_SET_INTERSECTION(r, *area, *search);
--            v = r.width * r.height;
--
--            if (v > mostv) {
--                mostv = v;
--                most = i;
-+    /* we want to count the number of pixels search has on each monitor, but not
-+       double count.  so if a pixel is counted on monitor A then we should not
-+       count it again on monitor B. in the end we want to return the monitor
-+       that had the most pixels counted under this scheme.
-+
-+       this assumes that monitors earlier in the list are more desirable to be
-+       considered the search area's monitor.  we try the configured primary
-+       monitor first, so it gets the highest preference.
-+
-+       if we have counted an area A, then we want to subtract the intersection
-+       of A with the area on future monitors.
-+       but now consider if we count an area B that intersects A. we want to
-+       subtract the area B from that counted on future monitors, but not
-+       subtract the intersection of A and B twice! so we would add the
-+       intersection of A and B back, to account for it being subtracted both
-+       for A and B.
-+
-+       this is the idea behind the algorithm.  we always subtract the full area
-+       for monitor M intersected with the search area. we'll call that AREA.
-+       but then we go through the list |counted| and for each rectangle in
-+       the list that is being subtracted from future monitors, we insert a
-+       request to add back the intersection of the subtracted rect with AREA.
-+       vice versa for a rect in |counted| that is getting added back.
-+    */
-+
-+    if (config_primary_monitor_index < screen_num_monitors) {
-+        const Rect *monitor;
-+        Rect on_current_monitor;
-+        glong area;
-+
-+        monitor = screen_physical_area_monitor(config_primary_monitor_index);
-+
-+        if (RECT_INTERSECTS_RECT(*monitor, *search)) {
-+            RECT_SET_INTERSECTION(on_current_monitor, *monitor, *search);
-+            area = RECT_AREA(on_current_monitor);
-+
-+            if (area > mostpx) {
-+                mostpx = area;
-+                most = config_primary_monitor_index;
-             }
-+
-+            /* add the intersection rect on the current monitor to the
-+               counted list. that's easy for the first one, we just mark it for
-+               subtraction */
-+            {
-+                RectArithmetic *ra = g_slice_new(RectArithmetic);
-+                ra->r = on_current_monitor;
-+                ra->subtract = TRUE;
-+                counted = g_slist_prepend(counted, ra);
-+            }
-+        }
-+    }
-+
-+    for (i = 0; i < screen_num_monitors; ++i) {
-+        const Rect *monitor;
-+        Rect on_current_monitor;
-+        glong area;
-+        GSList *it;
-+
-+        monitor = screen_physical_area_monitor(i);
-+
-+        if (i == config_primary_monitor_index)
-+            continue;  /* already did this one */
-+        if (!RECT_INTERSECTS_RECT(*monitor, *search))
-+            continue;  /* nothing to see here */
-+
-+        RECT_SET_INTERSECTION(on_current_monitor, *monitor, *search);
-+        area = RECT_AREA(on_current_monitor);
-+
-+        /* remove pixels we already counted on any previous monitors. */
-+        for (it = counted; it; it = g_slist_next(it)) {
-+            RectArithmetic *ra = it->data;
-+            Rect intersection;
-+
-+            RECT_SET_INTERSECTION(intersection, ra->r, *search);
-+            if (ra->subtract) area -= RECT_AREA(intersection);
-+            else area += RECT_AREA(intersection);
-+        }
-+
-+        if (area > mostpx) {
-+            mostpx = area;
-+            most = i;
-+        }
-+
-+        /* add the intersection rect on the current monitor I to the counted
-+           list.
-+           but now we need to compensate for every rectangle R already in the
-+           counted list, and add a new rect R' that is the intersection of
-+           R and I, but with the reverse subtraction/addition operation.
-+        */
-+        for (it = counted; it; it = g_slist_next(it)) {
-+            RectArithmetic *saved = it->data;
-+
-+            if (!RECT_INTERSECTS_RECT(saved->r, on_current_monitor))
-+                continue;
-+            /* we are going to subtract our rect from future monitors, but
-+               part of it may already be being subtracted/added, so compensate
-+               to not double add/subtract. */
-+            RectArithmetic *reverse = g_slice_new(RectArithmetic);
-+            RECT_SET_INTERSECTION(reverse->r, saved->r, on_current_monitor);
-+            reverse->subtract = !saved->subtract;
-+            /* prepend so we can continue thru the list uninterupted */
-+            counted = g_slist_prepend(counted, reverse);
-+        }
-+        {
-+            RectArithmetic *ra = g_slice_new(RectArithmetic);
-+            ra->r = on_current_monitor;
-+            ra->subtract = TRUE;
-+            counted = g_slist_prepend(counted, ra);
-         }
-     }
-+
-+    while (counted) {
-+        g_slice_free(RectArithmetic, counted->data);
-+        counted = g_slist_delete_link(counted, counted);
-+    }
-+
-     return most < screen_num_monitors ? most : screen_monitor_primary(FALSE);
- }
- 
diff -Nru openbox-3.5.2/debian/patches/fix_center_window.patch openbox-3.5.2/debian/patches/fix_center_window.patch
--- openbox-3.5.2/debian/patches/fix_center_window.patch	1970-01-01 00:00:00.000000000 +0000
+++ openbox-3.5.2/debian/patches/fix_center_window.patch	2013-09-26 18:39:17.000000000 +0000
@@ -0,0 +1,319 @@
+Description: Add the old <center> option for the placement policy.
+--- a/data/rc.xml
++++ b/data/rc.xml
+@@ -33,6 +33,9 @@
+ <placement>
+   <policy>Smart</policy>
+   <!-- 'Smart' or 'UnderMouse' -->
++  <center>yes</center>
++  <!-- whether to place windows in the center of the free area found or
++       the top left corner -->
+   <monitor>Primary</monitor>
+   <!-- with Smart placement on a multi-monitor system, try to place new windows
+        on: 'Any' - any monitor, 'Mouse' - where the mouse is, 'Active' - where
+--- a/data/rc.xsd
++++ b/data/rc.xsd
+@@ -70,6 +70,7 @@
+         </xsd:annotation>
+         <xsd:sequence>
+             <xsd:element minOccurs="0" name="policy" type="ob:placementpolicy"/>
++            <xsd:element minOccurs="0" name="center" type="ob:bool"/>
+             <xsd:element minOccurs="0" name="monitor" type="ob:placementmonitor"/>
+             <xsd:element minOccurs="0" name="primaryMonitor" type="ob:primarymonitor"/>
+         </xsd:sequence>
+--- a/openbox/config.c
++++ b/openbox/config.c
+@@ -37,6 +37,7 @@ gboolean config_focus_under_mouse;
+ gboolean config_unfocus_leave;
+ 
+ ObPlacePolicy  config_place_policy;
++gboolean       config_place_center;
+ ObPlaceMonitor config_place_monitor;
+ 
+ guint          config_primary_monitor_index;
+@@ -625,9 +626,13 @@ static void parse_placement(xmlNodePtr node, gpointer d)
+ 
+     node = node->children;
+ 
+-    if ((n = obt_xml_find_node(node, "policy")))
++    if ((n = obt_xml_find_node(node, "policy"))) {
+         if (obt_xml_node_contains(n, "UnderMouse"))
+             config_place_policy = OB_PLACE_POLICY_MOUSE;
++    }
++    if ((n = obt_xml_find_node(node, "center"))) {
++        config_place_center = obt_xml_node_bool(n);
++    }
+     if ((n = obt_xml_find_node(node, "monitor"))) {
+         if (obt_xml_node_contains(n, "active"))
+             config_place_monitor = OB_PLACE_MONITOR_ACTIVE;
+@@ -1055,6 +1060,7 @@ void config_startup(ObtXmlInst *i)
+     obt_xml_register(i, "focus", parse_focus, NULL);
+ 
+     config_place_policy = OB_PLACE_POLICY_SMART;
++    config_place_center = TRUE;
+     config_place_monitor = OB_PLACE_MONITOR_PRIMARY;
+ 
+     config_primary_monitor_index = 1;
+--- a/openbox/config.h
++++ b/openbox/config.h
+@@ -88,6 +88,8 @@ extern gboolean config_unfocus_leave;
+ 
+ /*! The algorithm to use for placing new windows */
+ extern ObPlacePolicy config_place_policy;
++/*! Place windows in the center of the free area */
++extern gboolean config_place_center;
+ /*! Place windows on the active monitor (unless they are part of an application
+   already on another monitor) */
+ extern ObPlaceMonitor config_place_monitor;
+--- a/openbox/place_overlap.c
++++ b/openbox/place_overlap.c
+@@ -1,7 +1,7 @@
+ /* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
+ 
+    overlap.c for the Openbox window manager
+-   Copyright (c) 2011        Ian Zimmerman
++   Copyright (c) 2011, 2013 Ian Zimmerman
+ 
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+@@ -22,15 +22,33 @@
+ 
+ #include <stdlib.h>
+ 
+-static void make_grid(const Rect* client_rects, int n_client_rects,
+-                      const Rect* monitor, int* x_edges, int* y_edges,
++static void make_grid(const Rect* client_rects,
++                      int n_client_rects,
++                      const Rect* monitor,
++                      int* x_edges,
++                      int* y_edges,
+                       int max_edges);
+ 
+ static int best_direction(const Point* grid_point,
+-                          const Rect* client_rects, int n_client_rects,
+-                          const Rect* monitor, const Size* req_size,
++                          const Rect* client_rects,
++                          int n_client_rects,
++                          const Rect* monitor,
++                          const Size* req_size,
+                           Point* best_top_left);
+ 
++static int total_overlap(const Rect* client_rects,
++                         int n_client_rects,
++                         const Rect* proposed_rect);
++
++static void center_in_field(Point* grid_point,
++                            const Size* req_size,
++                            const Rect *monitor,
++                            const Rect* client_rects,
++                            int n_client_rects,
++                            const int* x_edges,
++                            const int* y_edges,
++                            int max_edges);
++
+ /* Choose the placement on a grid with least overlap */
+ 
+ void place_overlap_find_least_placement(const Rect* client_rects,
+@@ -70,16 +88,28 @@ void place_overlap_find_least_placement(const Rect* client_rects,
+         if (overlap == 0)
+             break;
+     }
++    if (config_place_center && overlap == 0) {
++        center_in_field(result,
++                        req_size,
++                        monitor,
++                        client_rects,
++                        n_client_rects,
++                        x_edges,
++                        y_edges,
++                        max_edges);
++    }
+ }
+ 
+-static int compare_ints(const void* a, const void* b)
++static int compare_ints(const void* a,
++                        const void* b)
+ {
+     const int* ia = (const int*)a;
+     const int* ib = (const int*)b;
+     return *ia - *ib;
+ }
+ 
+-static void uniquify(int* edges, int n_edges)
++static void uniquify(int* edges,
++                     int n_edges)
+ {
+     int i = 0;
+     int j = 0;
+@@ -91,12 +121,15 @@ static void uniquify(int* edges, int n_edges)
+             ++j;
+     }
+     /* fill the rest with nonsense */
+-    for (; i < n_edges ; ++i)
++    for (; i < n_edges; ++i)
+         edges[i] = G_MAXINT;
+ }
+ 
+-static void make_grid(const Rect* client_rects, int n_client_rects,
+-                      const Rect* monitor, int* x_edges, int* y_edges,
++static void make_grid(const Rect* client_rects,
++                      int n_client_rects,
++                      const Rect* monitor,
++                      int* x_edges,
++                      int* y_edges,
+                       int max_edges)
+ {
+     int i;
+@@ -121,7 +154,8 @@ static void make_grid(const Rect* client_rects, int n_client_rects,
+     uniquify(y_edges, n_edges);
+ }
+ 
+-static int total_overlap(const Rect* client_rects, int n_client_rects,
++static int total_overlap(const Rect* client_rects,
++                         int n_client_rects,
+                          const Rect* proposed_rect)
+ {
+     int overlap = 0;
+@@ -136,6 +170,129 @@ static int total_overlap(const Rect* client_rects, int n_client_rects,
+     return overlap;
+ }
+ 
++/* Unfortunately, the libc bsearch() function cannot be used to find the
++   position of a value that is not in the array, and glib doesn't
++   provide a binary search function at all.  So, tricky as it is, if we
++   want to avoid linear scan of the edge array, we have to roll our
++   own. */
++static int grid_position(int value,
++                         const int* edges,
++                         int max_edges)
++{
++    int low = 0;
++    int high = max_edges - 1;
++    int mid = low + (high - low) / 2;
++    while (low != mid) {
++        if (value < edges[mid])
++            high = mid;
++        else if (value > edges[mid])
++            low = mid;
++        else                    /* value == edges[mid] */
++            return mid;
++        mid = low + (high - low) / 2;
++    }
++    /* we get here when low == mid.  can have low == high or low == high - 1 */
++    return (value <= edges[low] ? low : high);
++}                         
++
++static void expand_width(Rect* r, int by)
++{
++    r->width += by;
++}
++
++static void expand_height(Rect* r, int by)
++{
++    r->height += by;
++}
++
++typedef void ((*expand_method)(Rect*, int));
++
++/* This structure packs most of the parametars for expand_field() in
++   order to save pushing the same parameters twice. */
++typedef struct _expand_info {
++    const Point* top_left;
++    int orig_width;
++    int orig_height;
++    const Rect* monitor;
++    const Rect* client_rects;
++    int n_client_rects;
++    int max_edges;
++} expand_info;
++
++static int expand_field(int orig_edge_index,
++                        const int* edges,
++                        expand_method exp,
++                        const expand_info* i)
++{
++    Rect field;
++    RECT_SET(field,
++             i->top_left->x,
++             i->top_left->y,
++             i->orig_width,
++             i->orig_height);
++    int edge_index = orig_edge_index;
++    while (edge_index < i->max_edges - 1) {
++        int next_edge_index = edge_index + 1;
++        (*exp)(&field, edges[next_edge_index] - edges[edge_index]);
++        int overlap = total_overlap(i->client_rects, i->n_client_rects, &field);
++        if (overlap != 0 || !RECT_CONTAINS_RECT(*(i->monitor), field))
++            break;
++        edge_index = next_edge_index;
++    }
++    return edge_index;
++}
++
++/* The algortihm used for centering a rectangle in a grid field: First
++   find the smallest rectangle of grid lines that enclose the given
++   rectangle.  By definition, there is no overlap with any of the other
++   windows if the given rectangle is centered within this minimal
++   rectangle.  Then, try extending the minimal rectangle in either
++   direction (x and y) by picking successively further grid lines for
++   the opposite edge.  If the minimal rectangle can be extended in *one*
++   direction (x or y) but *not* the other, extend it as far as possible.
++   Otherwise, just use the minimal one.  */
++
++static void center_in_field(Point* top_left,
++                            const Size* req_size,
++                            const Rect *monitor,
++                            const Rect* client_rects,
++                            int n_client_rects,
++                            const int* x_edges,
++                            const int* y_edges,
++                            int max_edges)
++{
++    /* find minimal rectangle */
++    int orig_right_edge_index =
++        grid_position(top_left->x + req_size->width, x_edges, max_edges);
++    int orig_bottom_edge_index =
++        grid_position(top_left->y + req_size->height, y_edges, max_edges);
++    expand_info i = {
++        .top_left = top_left,
++        .orig_width = x_edges[orig_right_edge_index] - top_left->x,
++        .orig_height = y_edges[orig_bottom_edge_index] - top_left->y,
++        .monitor = monitor,
++        .client_rects = client_rects,
++        .n_client_rects = n_client_rects,
++        .max_edges = max_edges};
++    /* try extending width */
++    int right_edge_index =
++        expand_field(orig_right_edge_index, x_edges, expand_width, &i);
++    /* try extending height */
++    int bottom_edge_index =
++        expand_field(orig_bottom_edge_index, y_edges, expand_height, &i);
++    int final_width = x_edges[orig_right_edge_index] - top_left->x;
++    int final_height = y_edges[orig_bottom_edge_index] - top_left->y;
++    if (right_edge_index == orig_right_edge_index
++        && bottom_edge_index != orig_bottom_edge_index)
++        final_height = y_edges[bottom_edge_index] - top_left->y;
++    else if (right_edge_index != orig_right_edge_index
++             && bottom_edge_index == orig_bottom_edge_index)
++        final_width = x_edges[right_edge_index] - top_left->x;
++    /* Now center the given rectangle within the field */
++    top_left->x += (final_width - req_size->width) / 2;
++    top_left->y += (final_height - req_size->height) / 2;
++}
++
+ /* Given a list of Rect RECTS, a Point PT and a Size size, determine the
+    direction from PT which results in the least total overlap with RECTS
+    if a rectangle is placed in that direction.  Return the top/left
+@@ -145,8 +302,10 @@ static int total_overlap(const Rect* client_rects, int n_client_rects,
+ #define NUM_DIRECTIONS 4
+ 
+ static int best_direction(const Point* grid_point,
+-                          const Rect* client_rects, int n_client_rects,
+-                          const Rect* monitor, const Size* req_size,
++                          const Rect* client_rects,
++                          int n_client_rects,
++                          const Rect* monitor,
++                          const Size* req_size,
+                           Point* best_top_left)
+ {
+     static const Size directions[NUM_DIRECTIONS] = {
diff -Nru openbox-3.5.2/debian/patches/openbox-3.5.0-title-matching.patch openbox-3.5.2/debian/patches/openbox-3.5.0-title-matching.patch
--- openbox-3.5.2/debian/patches/openbox-3.5.0-title-matching.patch	2013-08-13 21:34:53.000000000 +0000
+++ openbox-3.5.2/debian/patches/openbox-3.5.0-title-matching.patch	1970-01-01 00:00:00.000000000 +0000
@@ -1,14 +0,0 @@
-Description: Upstream patch to fix title on java applications
-Index: openbox-3.5.2/openbox/client.c
-===================================================================
---- openbox-3.5.2.orig/openbox/client.c	2013-08-13 23:34:38.000000000 +0200
-+++ openbox-3.5.2/openbox/client.c	2013-08-13 23:34:38.000000000 +0200
-@@ -941,7 +941,7 @@
-                  !g_pattern_match(app->role,
-                                   strlen(self->role), self->role, NULL))
-             match = FALSE;
--        else if (app->title &&
-+        else if (app->title && self->title &&
-                  !g_pattern_match(app->title,
-                                   strlen(self->title), self->title, NULL))
-             match = FALSE;
diff -Nru openbox-3.5.2/debian/patches/openbox-3.5.0-which-2.20.patch openbox-3.5.2/debian/patches/openbox-3.5.0-which-2.20.patch
--- openbox-3.5.2/debian/patches/openbox-3.5.0-which-2.20.patch	2013-08-13 21:35:42.000000000 +0000
+++ openbox-3.5.2/debian/patches/openbox-3.5.0-which-2.20.patch	1970-01-01 00:00:00.000000000 +0000
@@ -1,14 +0,0 @@
-Description: Fixed load gnome 3 applications
-Index: openbox-3.5.2/data/autostart/autostart.in
-===================================================================
---- openbox-3.5.2.orig/data/autostart/autostart.in	2013-08-13 23:35:38.000000000 +0200
-+++ openbox-3.5.2/data/autostart/autostart.in	2013-08-13 23:35:37.000000000 +0200
-@@ -8,7 +8,7 @@
- #
- #if test -x @libexecdir@/gnome-settings-daemon >/dev/null; then
- #  @libexecdir@/gnome-settings-daemon &
--#elif which gnome-settings-daemon >/dev/null; then
-+#elif which gnome-settings-daemon >/dev/null 2>&1; then
- #  gnome-settings-daemon &
- #fi
- 
diff -Nru openbox-3.5.2/debian/patches/series openbox-3.5.2/debian/patches/series
--- openbox-3.5.2/debian/patches/series	2013-08-13 21:55:43.000000000 +0000
+++ openbox-3.5.2/debian/patches/series	2013-09-26 14:36:01.000000000 +0000
@@ -1,9 +1,11 @@
 #03_place_windows_in_quadrants.patch ## Needs to be ported on 3.5.0
-04_xsession.desktop_translation.patch
-02_fix_freedesktop_compliance.patch
 01_rc.xml.patch
-05_simplify_gnome_session.patch
-07_fix_xml_load_file.patch
-openbox-3.5.0-title-matching.patch
-openbox-3.5.0-which-2.20.patch
+02_fix_freedesktop_compliance.patch
+04_fix_xml_load_file.patch
+05_openbox-3.5.0-title-matching.patch
+06_openbox-3.5.0-which-2.20.patch
+07_update_desktop.patch
 644628_fix_autostart.patch
+704724_fix_refers-to-autostart.sh.patch
+719620_fix_show_startup_notification.patch
+fix_center_window.patch
diff -Nru openbox-3.5.2/debian/patches/use-nearest-monitor.patch openbox-3.5.2/debian/patches/use-nearest-monitor.patch
--- openbox-3.5.2/debian/patches/use-nearest-monitor.patch	2013-03-27 13:53:20.000000000 +0000
+++ openbox-3.5.2/debian/patches/use-nearest-monitor.patch	1970-01-01 00:00:00.000000000 +0000
@@ -1,116 +0,0 @@
-commit 01f62ded2fe289fe245f4f05b5825f4bdcbe1dc3
-Author: Dana Jansens <danakj@orodu.net>
-Date:   Sun Sep 30 20:29:45 2012 -0400
-
-    Use the nearest monitor when the search query rect does not intersect any monitor (Fix bug 5500)
-    
-    Previously we would try to find the primary monitor and use that when the search
-    was outside any monitor. However, if the primary monitor is chosen by the mouse
-    position and the mouse is not inside any monitor, we enter infinite recursion
-    trying to find the primary monitor.
-    
-    The nearest monitor is a better metric anyhow, and this ensures
-    screen_find_monitor() is never recursive as it always returns a value without
-    depending on other screen.c methods.
-
-diff --git a/openbox/geom.h b/openbox/geom.h
-index 8ac0e55..8e50834 100644
---- a/openbox/geom.h
-+++ b/openbox/geom.h
-@@ -104,6 +104,25 @@ typedef struct _Rect {
-      (r).height = MIN((a).y + (a).height - 1, \
-                       (b).y + (b).height - 1) - (r).y + 1)
- 
-+/* Returns the shortest manhatten distance between two rects, or 0 if they
-+   intersect. */
-+static inline gint rect_manhatten_distance(Rect r, Rect o)
-+{
-+    if (RECT_INTERSECTS_RECT(r, o))
-+        return 0;
-+
-+    gint min_distance = G_MAXINT;
-+    if (RECT_RIGHT(o) < RECT_LEFT(r))
-+        min_distance = MIN(min_distance, RECT_LEFT(r) - RECT_RIGHT(o));
-+    if (RECT_LEFT(o) > RECT_RIGHT(r))
-+        min_distance = MIN(min_distance, RECT_LEFT(o) - RECT_RIGHT(r));
-+    if (RECT_BOTTOM(o) < RECT_TOP(r))
-+        min_distance = MIN(min_distance, RECT_TOP(r) - RECT_BOTTOM(o));
-+    if (RECT_TOP(o) > RECT_BOTTOM(r))
-+        min_distance = MIN(min_distance, RECT_TOP(o) - RECT_BOTTOM(r));
-+    return min_distance;
-+}
-+
- typedef struct _Strut {
-     int left;
-     int top;
-diff --git a/openbox/screen.c b/openbox/screen.c
-index 35366be..f4031f5 100644
---- a/openbox/screen.c
-+++ b/openbox/screen.c
-@@ -1644,8 +1644,10 @@ typedef struct {
- guint screen_find_monitor(const Rect *search)
- {
-     guint i;
--    guint most = screen_num_monitors;
-+    guint mostpx_index = screen_num_monitors;
-     guint mostpx = 0;
-+    guint closest_distance_index = screen_num_monitors;
-+    guint closest_distance = G_MAXUINT;
-     GSList *counted = NULL;
- 
-     /* we want to count the number of pixels search has on each monitor, but not
-@@ -1686,7 +1688,7 @@ guint screen_find_monitor(const Rect *search)
- 
-             if (area > mostpx) {
-                 mostpx = area;
--                most = config_primary_monitor_index;
-+                mostpx_index = config_primary_monitor_index;
-             }
- 
-             /* add the intersection rect on the current monitor to the
-@@ -1709,10 +1711,21 @@ guint screen_find_monitor(const Rect *search)
- 
-         monitor = screen_physical_area_monitor(i);
- 
-+        if (!RECT_INTERSECTS_RECT(*monitor, *search)) {
-+            /* If we don't intersect then find the distance between the search
-+               rect and the monitor. We'll use the closest monitor from this
-+               metric if none of the monitors intersect. */
-+            guint distance = rect_manhatten_distance(*monitor, *search);
-+
-+            if (distance < closest_distance) {
-+                closest_distance = distance;
-+                closest_distance_index = i;
-+            }
-+            continue;
-+        }
-+
-         if (i == config_primary_monitor_index)
-             continue;  /* already did this one */
--        if (!RECT_INTERSECTS_RECT(*monitor, *search))
--            continue;  /* nothing to see here */
- 
-         RECT_SET_INTERSECTION(on_current_monitor, *monitor, *search);
-         area = RECT_AREA(on_current_monitor);
-@@ -1729,7 +1742,7 @@ guint screen_find_monitor(const Rect *search)
- 
-         if (area > mostpx) {
-             mostpx = area;
--            most = i;
-+            mostpx_index = i;
-         }
- 
-         /* add the intersection rect on the current monitor I to the counted
-@@ -1765,7 +1778,11 @@ guint screen_find_monitor(const Rect *search)
-         counted = g_slist_delete_link(counted, counted);
-     }
- 
--    return most < screen_num_monitors ? most : screen_monitor_primary(FALSE);
-+    if (mostpx_index < screen_num_monitors)
-+        return mostpx_index;
-+
-+    g_assert(closest_distance_index < screen_num_monitors);
-+    return closest_distance_index;
- }
- 
- const Rect* screen_physical_area_all_monitors(void)
diff -Nru openbox-3.5.2/debian/rules openbox-3.5.2/debian/rules
--- openbox-3.5.2/debian/rules	2013-07-17 19:56:50.000000000 +0000
+++ openbox-3.5.2/debian/rules	2013-09-26 09:53:10.000000000 +0000
@@ -1,6 +1,7 @@
 #!/usr/bin/make -f
 
-#export DH_VERBOSE=
+export DEB_LDFLAGS_MAINT_APPEND=-Wl,--as-needed -Wl,-O1 -Wl,-z,defs
+export DEB_BUILD_MAINT_OPTIONS=hardening=+all
 
 CFLAGS +=-Wall -g -fPIC
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
@@ -14,24 +15,29 @@
 %:
 	dh $@ --with autoreconf
 
+override_dh_auto_configure:
+	dh_auto_configure -- --enable-librsvg
+
 override_dh_auto_build:
 	pod2man --section=1 --release=$(VERSION) --center \
 		"Openbox documentation" debian/openbox.pod > openbox.1
 	#pod2man --section=1 --release=$(VERSION) --center \
 	#	"Openbox documentation" debian/kdetrayproxy.pod > kdetrayproxy.1
-	
+	pod2man --section=1 --release=$(VERSION) --center \
+		"Openbox documentation" debian/gnome-panel-control.pod > \
+		gnome-panel-control.1
+	pod2man --section=1 --release=$(VERSION) --center \
+		"Openbox documentation" debian/gdm-control.pod > \
+		gdm-control.1
 	dh_auto_build
 
 override_dh_install:
 	dh_install --list-missing
 	find debian/tmp/usr/lib*/ -name "*.la" -delete
-	rm debian/tmp/usr/bin/gdm-control
-	rm debian/tmp/usr/bin/gnome-panel-control
 
 override_dh_auto_clean:
 	rm -f openbox.1
 	#rm -f kdetrayproxy.1
 	rm -f gnome-panel-control.1
-	rm -f gdm-control.1
-	
+	rm -f gdm-control.1	
 	dh_auto_clean