Package: openbox
Version: 3.4.11.2-2
Openbox 3.5.0 has been released and it is coming with some new features, as
well as many bug fixes.
I managed to get a working 3.5.0 package for my distribution, so I'm sharing
the diff between the current 3.4.11.2-2 and the source package of 3.5.0
updated by me.
These are the changes I've made:
* New upstream release
* debian/patches:
- Disabled 03_place_windows_in_quadrants.patch
- Updated 01_rc.xml.patch and 06_fix_swap_byte_order.patch
- Removed 04_fix_ftbfs_no-add-needed.patch and 20_24bits_support.patch
* debian/control:
- Build-Depends: removed libxau-dev, libxft-dev and python-xdg;
added libimlib2-dev
- openbox Suggests: added python-xdg
- libobrender21 renamed to libobrender27
- libobparser21 renamed to libobt0
* debian/rules:
- Rewrote using a simpler debhelper syntax
- Moved the install pass to openbox.install
* debian/*.{install,links,dirs}:
- Updated.
* debian/openbox.xsession:
- Removed. Openbox now ships it by default.
The removed patches (04_fix_ftbfs_no-add-needed.patch and
20_24bits_support.patch) are not needed anymore -- see [1] and [2].
I've tried to port the disabled patch (03_place_windows_in_quadrants.patch)
to 3.5.0 but without success. Also, I see that the Ubuntu maintainer has
made the same thing [3].
Thank you in advance for considering my patch,
Ciao,
Eugenio
-----
[1]
http://git.openbox.org/?p=dana/openbox.git;a=blobdiff;f=Makefile.am;h=f59d3e7e6942f3cc1630348dcdd214f60d1257c8;hp=c3feae6c1989820b90fefe4462be03e4a32aa013;hb=cc4e44e8376f5b76cb23f8cd642f32e0e41b9150;hpb=65315ca4377a8b034fffbcbd0965e2b332cdb1ba
[2]
http://git.openbox.org/?p=dana/openbox.git;a=blobdiff;f=render/color.c;h=5e3f2169bad9a1d6ace43eb649ba4cbf4413d058;hp=41fcc7102f2ad3e92dee21738e222aa2dec5006c;hb=263833450d3fb1ca0bfffef302c4b204a3133766;hpb=d69530a45a42efab0d34dcdb35b0f6fc887dafac
[3] https://launchpad.net/ubuntu/+source/openbox/3.5.0-0ubuntu1
diff -ruN openbox-3.4.11.2/debian/changelog openbox-3.5.0/debian/changelog
--- openbox-3.4.11.2/debian/changelog 2011-05-25 16:51:23.000000000 +0200
+++ openbox-3.5.0/debian/changelog 2011-08-21 16:02:03.000000000 +0200
@@ -1,3 +1,26 @@
+openbox (3.5.0-1~semplice0) emily; urgency=low
+
+ * New upstream release
+ * debian/patches:
+ - Disabled 03_place_windows_in_quadrants.patch
+ - Updated 01_rc.xml.patch and 06_fix_swap_byte_order.patch
+ - Removed 04_fix_ftbfs_no-add-needed.patch and 20_24bits_support.patch
+ * debian/control:
+ - Build-Depends: removed libxau-dev, libxft-dev and python-xdg;
+ added libimlib2-dev
+ - openbox Suggests: added python-xdg
+ - libobrender21 renamed to libobrender27
+ - libobparser21 renamed to libobt0
+ * debian/rules:
+ - Rewrote using a simpler debhelper syntax
+ - Moved the install pass to openbox.install
+ * debian/*.{install,links,dirs}:
+ - Updated.
+ * debian/openbox.xsession:
+ - Removed. Openbox now ships it by default.
+
+ -- Eugenio Paolantonio (g7) <m...@medesimo.eu> Sun, 21 Aug 2011 12:29:12 +0200
+
openbox (3.4.11.2-2) unstable; urgency=low
* Remove gnome-panel-control files from openbox binary package
diff -ruN openbox-3.4.11.2/debian/control openbox-3.5.0/debian/control
--- openbox-3.4.11.2/debian/control 2011-05-22 21:45:19.000000000 +0200
+++ openbox-3.5.0/debian/control 2011-08-21 15:59:56.000000000 +0200
@@ -2,8 +2,9 @@
Section: x11
Priority: optional
Maintainer: Nico Golde <n...@debian.org>
-Build-Depends: debhelper (>= 7), 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), 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, quilt, libx11-dev, libimlib2-dev, autoconf, automake1.9
Standards-Version: 3.9.2
+X-Python-Version: >= 2.6
Homepage: http://www.openbox.org
Vcs-Browser: http://svn.debian.org/viewsvn/collab-maint/deb-maint/openbox/trunk
Vcs-Svn: svn://svn.debian.org/svn/collab-maint/deb-maint/openbox
@@ -13,7 +14,7 @@
Provides: x-window-manager, x-session-manager
Depends: ${shlibs:Depends}, ${misc:Depends}
Recommends: openbox-themes, obconf
-Suggests: menu, ttf-dejavu, python, libxml2-dev
+Suggests: menu, ttf-dejavu, libxml2-dev, python, python-xdg
Breaks: menu (<< 2.1.12)
Description: standards compliant, fast, light-weight, extensible window manager
Openbox works with your applications, and makes your desktop easier to manage.
@@ -48,7 +49,7 @@
menu from the command line. This is originally a helper utility of openbox
since gnome-panel is no longer managing its own key bindings.
-Package: libobparser21
+Package: libobt0
Section: libs
Architecture: any
Conflicts: libobparser15, libobparser16
@@ -72,7 +73,7 @@
This package contains the libobparser library files used by openbox
to load and parse configuration and theme files of openbox.
-Package: libobrender21
+Package: libobrender27
Section: libs
Architecture: any
Conflicts: libobrender15, libobrender16
@@ -99,7 +100,7 @@
Package: openbox-dev
Section: libdevel
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libobrender21 (= ${binary:Version}), libobparser21 (= ${binary:Version}), libxml2-dev, libglib2.0-dev, libxft-dev, libpango1.0-dev
+Depends: ${shlibs:Depends}, ${misc:Depends}, libobrender27 (= ${binary:Version}), libobt0 (= ${binary:Version}), libxml2-dev, libglib2.0-dev, libpango1.0-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
diff -ruN openbox-3.4.11.2/debian/libobparser21.docs openbox-3.5.0/debian/libobparser21.docs
--- openbox-3.4.11.2/debian/libobparser21.docs 2011-05-22 19:27:32.000000000 +0200
+++ openbox-3.5.0/debian/libobparser21.docs 1970-01-01 01:00:00.000000000 +0100
@@ -1,2 +0,0 @@
-AUTHORS
-README
diff -ruN openbox-3.4.11.2/debian/libobparser21.install openbox-3.5.0/debian/libobparser21.install
--- openbox-3.4.11.2/debian/libobparser21.install 2011-05-22 20:05:42.000000000 +0200
+++ openbox-3.5.0/debian/libobparser21.install 1970-01-01 01:00:00.000000000 +0100
@@ -1,2 +0,0 @@
-usr/lib/libobparser.so.21.0.9
-usr/lib/libobparser.so.21
diff -ruN openbox-3.4.11.2/debian/libobrender21.docs openbox-3.5.0/debian/libobrender21.docs
--- openbox-3.4.11.2/debian/libobrender21.docs 2011-05-22 19:27:32.000000000 +0200
+++ openbox-3.5.0/debian/libobrender21.docs 1970-01-01 01:00:00.000000000 +0100
@@ -1,2 +0,0 @@
-AUTHORS
-README
diff -ruN openbox-3.4.11.2/debian/libobrender21.install openbox-3.5.0/debian/libobrender21.install
--- openbox-3.4.11.2/debian/libobrender21.install 2011-05-22 20:05:44.000000000 +0200
+++ openbox-3.5.0/debian/libobrender21.install 1970-01-01 01:00:00.000000000 +0100
@@ -1,2 +0,0 @@
-usr/lib/libobrender.so.21.0.9
-usr/lib/libobrender.so.21
diff -ruN openbox-3.4.11.2/debian/libobrender27.docs openbox-3.5.0/debian/libobrender27.docs
--- openbox-3.4.11.2/debian/libobrender27.docs 1970-01-01 01:00:00.000000000 +0100
+++ openbox-3.5.0/debian/libobrender27.docs 2011-05-22 19:27:32.000000000 +0200
@@ -0,0 +1,2 @@
+AUTHORS
+README
diff -ruN openbox-3.4.11.2/debian/libobrender27.install openbox-3.5.0/debian/libobrender27.install
--- openbox-3.4.11.2/debian/libobrender27.install 1970-01-01 01:00:00.000000000 +0100
+++ openbox-3.5.0/debian/libobrender27.install 2011-08-21 13:18:27.000000000 +0200
@@ -0,0 +1,2 @@
+usr/lib/libobrender.so.27.0.1
+usr/lib/libobrender.so.27
diff -ruN openbox-3.4.11.2/debian/libobt0.docs openbox-3.5.0/debian/libobt0.docs
--- openbox-3.4.11.2/debian/libobt0.docs 1970-01-01 01:00:00.000000000 +0100
+++ openbox-3.5.0/debian/libobt0.docs 2011-05-22 19:27:32.000000000 +0200
@@ -0,0 +1,2 @@
+AUTHORS
+README
diff -ruN openbox-3.4.11.2/debian/libobt0.install openbox-3.5.0/debian/libobt0.install
--- openbox-3.4.11.2/debian/libobt0.install 1970-01-01 01:00:00.000000000 +0100
+++ openbox-3.5.0/debian/libobt0.install 2011-08-21 13:17:00.000000000 +0200
@@ -0,0 +1,2 @@
+usr/lib/libobt.so.0.0.1
+usr/lib/libobt.so.0
diff -ruN openbox-3.4.11.2/debian/openbox-dev.install openbox-3.5.0/debian/openbox-dev.install
--- openbox-3.4.11.2/debian/openbox-dev.install 2011-05-22 21:27:46.000000000 +0200
+++ openbox-3.5.0/debian/openbox-dev.install 2011-08-21 13:09:27.000000000 +0200
@@ -1,5 +1,5 @@
-usr/lib/libobparser.a
+usr/lib/libobt.a
usr/lib/libobrender.a
-usr/lib/pkgconfig/obrender-3.0.pc
-usr/lib/pkgconfig/obparser-3.0.pc
-usr/include/openbox/3.4.11.2/openbox/*
+usr/lib/pkgconfig/obrender-3.5.pc
+usr/lib/pkgconfig/obt-3.5.pc
+usr/include/openbox/3.5/*
diff -ruN openbox-3.4.11.2/debian/openbox.dirs openbox-3.5.0/debian/openbox.dirs
--- openbox-3.4.11.2/debian/openbox.dirs 2011-05-22 19:27:32.000000000 +0200
+++ openbox-3.5.0/debian/openbox.dirs 2011-08-21 12:58:50.000000000 +0200
@@ -1,2 +1,3 @@
usr/share/pixmaps
usr/share/applications
+var/lib/openbox
diff -ruN openbox-3.4.11.2/debian/openbox.install openbox-3.5.0/debian/openbox.install
--- openbox-3.4.11.2/debian/openbox.install 2011-05-25 16:49:41.000000000 +0200
+++ openbox-3.5.0/debian/openbox.install 2011-08-21 13:44:26.000000000 +0200
@@ -1,27 +1,37 @@
-usr/share/locale/zh_TW/LC_MESSAGES/openbox.mo
-usr/share/locale/zh_CN/LC_MESSAGES/openbox.mo
+usr/share/locale/ar/LC_MESSAGES/openbox.mo
+usr/share/locale/bn_IN/LC_MESSAGES/openbox.mo
+usr/share/locale/ca/LC_MESSAGES/openbox.mo
+usr/share/locale/cs/LC_MESSAGES/openbox.mo
+usr/share/locale/da/LC_MESSAGES/openbox.mo
usr/share/locale/de/LC_MESSAGES/openbox.mo
+usr/share/locale/en@boldquot/LC_MESSAGES/openbox.mo
+usr/share/locale/en@quot/LC_MESSAGES/openbox.mo
usr/share/locale/es/LC_MESSAGES/openbox.mo
-usr/share/locale/ca/LC_MESSAGES/openbox.mo
-usr/share/locale/sv/LC_MESSAGES/openbox.mo
-usr/share/locale/sk/LC_MESSAGES/openbox.mo
-usr/share/locale/no/LC_MESSAGES/openbox.mo
+usr/share/locale/et/LC_MESSAGES/openbox.mo
+usr/share/locale/eu/LC_MESSAGES/openbox.mo
+usr/share/locale/fi/LC_MESSAGES/openbox.mo
usr/share/locale/fr/LC_MESSAGES/openbox.mo
-usr/share/locale/ru/LC_MESSAGES/openbox.mo
+usr/share/locale/hr/LC_MESSAGES/openbox.mo
+usr/share/locale/hu/LC_MESSAGES/openbox.mo
+usr/share/locale/it/LC_MESSAGES/openbox.mo
+usr/share/locale/ja/LC_MESSAGES/openbox.mo
+usr/share/locale/lt/LC_MESSAGES/openbox.mo
+usr/share/locale/lv/LC_MESSAGES/openbox.mo
+usr/share/locale/nl/LC_MESSAGES/openbox.mo
+usr/share/locale/no/LC_MESSAGES/openbox.mo
usr/share/locale/pl/LC_MESSAGES/openbox.mo
-usr/share/locale/pt/LC_MESSAGES/openbox.mo
usr/share/locale/pt_BR/LC_MESSAGES/openbox.mo
-usr/share/locale/fi/LC_MESSAGES/openbox.mo
-usr/share/locale/en@quot/LC_MESSAGES/openbox.mo
-usr/share/locale/en@boldquot/LC_MESSAGES/openbox.mo
-usr/share/locale/et/LC_MESSAGES/openbox.mo
-usr/share/locale/cs/LC_MESSAGES/openbox.mo
-usr/share/locale/nl/LC_MESSAGES/openbox.mo
-usr/share/locale/ar/LC_MESSAGES/openbox.mo
-usr/share/locale/bn_IN/LC_MESSAGES/openbox.mo
-usr/share/locale/it/LC_MESSAGES/openbox.mo
+usr/share/locale/pt/LC_MESSAGES/openbox.mo
+usr/share/locale/ru/LC_MESSAGES/openbox.mo
+usr/share/locale/sk/LC_MESSAGES/openbox.mo
+usr/share/locale/sr@latin/LC_MESSAGES/openbox.mo
+usr/share/locale/sr/LC_MESSAGES/openbox.mo
+usr/share/locale/sv/LC_MESSAGES/openbox.mo
+usr/share/locale/tr/LC_MESSAGES/openbox.mo
+usr/share/locale/uk/LC_MESSAGES/openbox.mo
usr/share/locale/vi/LC_MESSAGES/openbox.mo
-usr/share/locale/ja/LC_MESSAGES/openbox.mo
+usr/share/locale/zh_CN/LC_MESSAGES/openbox.mo
+usr/share/locale/zh_TW/LC_MESSAGES/openbox.mo
usr/share/themes/Artwiz-boxed/openbox-3/themerc
usr/share/themes/Bear2/openbox-3/close_pressed.xbm
usr/share/themes/Bear2/openbox-3/close.xbm
@@ -36,6 +46,7 @@
usr/share/themes/Bear2/openbox-3/shade.xbm
usr/share/themes/Bear2/openbox-3/themerc
usr/share/themes/Clearlooks/openbox-3/themerc
+usr/share/themes/Clearlooks-3.4/openbox-3/themerc
usr/share/themes/Clearlooks-Olive/openbox-3/themerc
usr/share/themes/Mikachu/openbox-3/bullet.xbm
usr/share/themes/Mikachu/openbox-3/close.xbm
@@ -93,5 +104,9 @@
usr/bin/gdm-control
etc/xdg/openbox/rc.xml
etc/xdg/openbox/menu.xml
-etc/xdg/openbox/autostart.sh
-usr/lib/openbox/xdg-autostart
+etc/xdg/openbox/autostart
+usr/lib/openbox/openbox-xdg-autostart
+usr/lib/openbox/openbox-autostart
+
+debian/menu.xml etc/xdg/openbox
+debian/openbox.xpm usr/share/pixmaps/
diff -ruN openbox-3.4.11.2/debian/openbox.xsession openbox-3.5.0/debian/openbox.xsession
--- openbox-3.4.11.2/debian/openbox.xsession 2011-05-22 19:27:32.000000000 +0200
+++ openbox-3.5.0/debian/openbox.xsession 1970-01-01 01:00:00.000000000 +0100
@@ -1,7 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Name=Openbox Session
-Comment=Use this session to run Openbox as your desktop environment
-Exec=openbox-session
-Icon=
-Type=Application
diff -ruN openbox-3.4.11.2/debian/patches/01_rc.xml.patch openbox-3.5.0/debian/patches/01_rc.xml.patch
--- openbox-3.4.11.2/debian/patches/01_rc.xml.patch 2011-05-22 20:35:55.000000000 +0200
+++ openbox-3.5.0/debian/patches/01_rc.xml.patch 2011-08-21 12:25:26.000000000 +0200
@@ -1,23 +1,35 @@
by Nico Golde <n...@debian.org>
-execute gnome-screenshot on pressing print
+updated for 3.5.0 by Eugenio Paolantonio <m...@medesimo.eu>
+
+add screenshot support using gnome-screenshot;
+ensure that the Debian system menu is listed in <menu>
Index: openbox-3.4.11.1/data/rc.xml
===================================================================
---- openbox-3.4.11.1.orig/data/rc.xml 2010-04-23 16:45:13.000000000 +0200
-+++ openbox-3.4.11.1/data/rc.xml 2010-04-23 16:46:21.000000000 +0200
-@@ -235,6 +235,12 @@
+--- 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>
-+ <keybind key="Print">
-+ <action name="Execute"><execute>gnome-screenshot</execute></action>
-+ </keybind>
++ <!-- Take a screenshot of the current window with gnome-screenshot when Alt+Print are pressed -->
+ <keybind key="A-Print">
-+ <action name="Execute"><execute>gnome-screenshot -w</execute></action>
++ <action name="Execute"><command>gnome-screenshot -w</command></action>
+ </keybind>
<!-- Keybindings for window switching -->
<keybind key="A-Tab">
-@@ -621,6 +627,9 @@
+@@ -308,6 +312,10 @@
+ <command>kfmclient openProfile filemanagement</command>
+ </action>
+ </keybind>
++ <!-- Launch gnome-screenshot when Print is pressed -->
++ <keybind key="Print">
++ <action name="Execute"><command>gnome-screenshot</command></action>
++ </keybind>
+ </keyboard>
+
+ <mouse>
+@@ -621,6 +629,9 @@
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/) -->
@@ -27,12 +39,12 @@
<file>menu.xml</file>
<hideDelay>200</hideDelay>
<!-- if a press-release lasts longer than this setting (in milliseconds), the
-@@ -643,7 +643,7 @@
+@@ -634,7 +645,7 @@
submenu will not be shown until it is clicked on -->
<submenuHideDelay>400</submenuHideDelay>
<!-- time to delay before hiding a submenu when selecting another
- entry in parent menu -->
-+ entry in parent menu.
++ entry in parent menu
if this is a negative value, then the delay is infinite and the
submenu will not be hidden until a different submenu is opened -->
<applicationIcons>yes</applicationIcons>
diff -ruN openbox-3.4.11.2/debian/patches/04_fix_ftbfs_no-add-needed.patch openbox-3.5.0/debian/patches/04_fix_ftbfs_no-add-needed.patch
--- openbox-3.4.11.2/debian/patches/04_fix_ftbfs_no-add-needed.patch 2011-05-22 19:41:08.000000000 +0200
+++ openbox-3.5.0/debian/patches/04_fix_ftbfs_no-add-needed.patch 1970-01-01 01:00:00.000000000 +0100
@@ -1,31 +0,0 @@
-Description: Fix FTBFS with ld --no-add-needed.
-Author: Felix Geyer <debfx-...@fobos.de>
-Bug: http://bugzilla.icculus.org/show_bug.cgi?id=4871
-
---- openbox-3.4.11.1.orig/configure.ac
-+++ openbox-3.4.11.1/configure.ac
-@@ -82,6 +82,10 @@ PKG_CHECK_MODULES(XFT, [xft])
- AC_SUBST(XFT_CFLAGS)
- AC_SUBST(XFT_LIBS)
-
-+PKG_CHECK_MODULES(XAU, [xau])
-+AC_SUBST(XAU_CFLAGS)
-+AC_SUBST(XAU_LIBS)
-+
- PKG_CHECK_MODULES(XML, [libxml-2.0 >= 2.6.0])
- AC_SUBST(XML_CFLAGS)
- AC_SUBST(XML_LIBS)
---- openbox-3.4.11.1.orig/Makefile.am
-+++ openbox-3.4.11.1/Makefile.am
-@@ -303,9 +303,11 @@ tools_obxprop_obxprop_SOURCES = \
- ## gdm-control ##
-
- tools_gdm_control_gdm_control_CPPFLAGS = \
-+ $(XAU_CFLAGS) \
- $(X_CFLAGS) \
- $(GLIB_CFLAGS)
- tools_gdm_control_gdm_control_LDADD = \
-+ $(XAU_LIBS) \
- $(X_LIBS) \
- $(GLIB_LIBS)
- tools_gdm_control_gdm_control_SOURCES = \
diff -ruN openbox-3.4.11.2/debian/patches/06_fix_swap_byte_order.patch openbox-3.5.0/debian/patches/06_fix_swap_byte_order.patch
--- openbox-3.4.11.2/debian/patches/06_fix_swap_byte_order.patch 2011-05-22 21:38:07.000000000 +0200
+++ openbox-3.5.0/debian/patches/06_fix_swap_byte_order.patch 2011-08-21 12:16:03.000000000 +0200
@@ -1,10 +1,11 @@
-Index: openbox-3.4.11.2/render/color.c
+Index: openbox-3.5.0/obrender/color.c
by Nico Golde <n...@debian.org>
+updated for 3.5.0 by Eugenio Paolantonio <m...@medesimo.eu>
Fix nested loop to properly loop through the complete image
===================================================================
---- openbox-3.4.11.2.orig/render/color.c 2011-05-22 21:11:25.000000000 +0200
-+++ openbox-3.4.11.2/render/color.c 2011-05-22 21:11:45.000000000 +0200
-@@ -212,7 +212,7 @@
+--- a/obrender/color.c
++++ b/obrender/color.c
+@@ -234,7 +234,7 @@
di = 0;
for (y = 0; y < im->height; ++y) {
diff -ruN openbox-3.4.11.2/debian/patches/20_24bits_support.patch openbox-3.5.0/debian/patches/20_24bits_support.patch
--- openbox-3.4.11.2/debian/patches/20_24bits_support.patch 2011-05-22 21:01:29.000000000 +0200
+++ openbox-3.5.0/debian/patches/20_24bits_support.patch 1970-01-01 01:00:00.000000000 +0100
@@ -1,48 +0,0 @@
-commit 263833450d3fb1ca0bfffef302c4b204a3133766
-Author: Mikael Magnusson <mika...@gmail.com>
-Date: Sat Jun 6 11:12:06 2009 +0200
-
- Add support for 24bit
-
-diff --git a/render/color.c b/render/color.c
-index 41fcc71..5e3f216 100644
---- a/render/color.c
-+++ b/render/color.c
-@@ -143,6 +143,28 @@ void RrReduceDepth(const RrInstance *inst, RrPixel32 *data, XImage *im)
- }
- } else im->data = (gchar*) data;
- break;
-+ case 24:
-+ {
-+ /* reverse the ordering, shifting left 16bit should be the first byte
-+ out of three, etc */
-+ const guint roff = (16 - RrRedOffset(inst)) / 8;
-+ const guint goff = (16 - RrGreenOffset(inst)) / 8;
-+ const guint boff = (16 - RrBlueOffset(inst)) / 8;
-+ gint outx;
-+ for (y = 0; y < im->height; y++) {
-+ for (x = 0, outx = 0; x < im->width; x++, outx += 3) {
-+ r = (data[x] >> RrDefaultRedOffset) & 0xFF;
-+ g = (data[x] >> RrDefaultGreenOffset) & 0xFF;
-+ b = (data[x] >> RrDefaultBlueOffset) & 0xFF;
-+ p8[outx+roff] = r;
-+ p8[outx+goff] = g;
-+ p8[outx+boff] = b;
-+ }
-+ data += im->width;
-+ p8 += im->bytes_per_line;
-+ }
-+ break;
-+ }
- case 16:
- for (y = 0; y < im->height; y++) {
- for (x = 0; x < im->width; x++) {
-@@ -191,7 +213,7 @@ void RrReduceDepth(const RrInstance *inst, RrPixel32 *data, XImage *im)
- }
- break;
- default:
-- g_error("Your bit depth is currently unhandled\n");
-+ g_error("This image bit depth (%i) is currently unhandled", im->bits_per_pixel);
-
- }
- }
diff -ruN openbox-3.4.11.2/debian/patches/series openbox-3.5.0/debian/patches/series
--- openbox-3.4.11.2/debian/patches/series 2011-05-22 21:17:50.000000000 +0200
+++ openbox-3.5.0/debian/patches/series 2011-08-21 12:27:08.000000000 +0200
@@ -1,7 +1,5 @@
-03_place_windows_in_quadrants.patch
+#03_place_windows_in_quadrants.patch ## Needs to be ported on 3.5.0
02_fix_freedesktop_compliance.patch
01_rc.xml.patch
-04_fix_ftbfs_no-add-needed.patch
05_simplify_gnome_session.patch
06_fix_swap_byte_order.patch
-20_24bits_support.patch
diff -ruN openbox-3.4.11.2/debian/rules openbox-3.5.0/debian/rules
--- openbox-3.4.11.2/debian/rules 2011-05-22 19:41:08.000000000 +0200
+++ openbox-3.5.0/debian/rules 2011-08-21 15:48:44.000000000 +0200
@@ -1,7 +1,6 @@
#!/usr/bin/make -f
#export DH_VERBOSE=
-include /usr/share/quilt/quilt.make
CFLAGS=-Wall -g
ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
@@ -12,17 +11,10 @@
VERSION=$(shell awk '/^PACKAGE_VERSION/ { print $$2 }' "FS='" configure)
-build: build-stamp
-build-stamp: patch
- dh_testdir
-
- #remove upstream debian/ stuff
- -rm -f debian/changelog.in debian/menu debian/conffiles debian/post*
- autoconf
- automake-1.9
- CFLAGS="$(CFLAGS)" ./configure --prefix=/usr --sysconfdir=/etc
- $(MAKE)
+%:
+ dh $@
+override_dh_auto_build:
pod2man --section=1 --release=$(VERSION) --center \
"Openbox documentation" debian/openbox.pod > openbox.1
#pod2man --section=1 --release=$(VERSION) --center \
@@ -33,64 +25,13 @@
pod2man --section=1 --release=$(VERSION) --center \
"Openbox documentation" debian/gdm-control.pod > \
gdm-control.1
- touch build-stamp
-
-clean: unpatch
- dh_testdir
- dh_testroot
- rm -f build-stamp install-stamp
-
- [ ! -f Makefile ] || $(MAKE) distclean
-
- rm -rf tools/gnome-panel-control/.libs
- rm -rf tools/kdetrayproxy/.libs
- rm -rf openbox/.libs
- rm -rf debian/conffiles
+
+ dh_auto_build
+override_dh_auto_clean:
rm -f openbox.1
#rm -f kdetrayproxy.1
rm -f gnome-panel-control.1
-
- dh_clean
-
-install: install-stamp
-install-stamp: build-stamp
- dh_testdir
- dh_testroot
- dh_prep
- dh_installdirs
-
- $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
-
- dh_install --sourcedir=debian/tmp -a
-
- install -m0644 debian/menu.xml $(CURDIR)/debian/openbox/etc/xdg/openbox
- install -m0664 debian/openbox.xpm $(CURDIR)/debian/openbox/usr/share/pixmaps/
- install -m0664 debian/openbox.xsession $(CURDIR)/debian/openbox/usr/share/xsessions/openbox.desktop
- install -m0664 debian/openbox.xsession $(CURDIR)/debian/openbox/usr/share/applications/openbox.desktop
- mkdir -p $(CURDIR)/debian/openbox/var/lib/openbox
- touch install-stamp
-
-binary-indep: build install
-
-binary-arch: build install
- dh_testdir
- dh_testroot
- dh_installchangelogs CHANGELOG
- dh_installdocs
- dh_installmenu
- dh_installman -A
- dh_link
- dh_strip
- dh_compress
- dh_fixperms
- dh_makeshlibs
- dh_installdeb
- dh_shlibdeps
- dh_gencontrol
- dh_md5sums
- dh_builddeb
-
-binary: binary-indep binary-arch
-
-.PHONY: build clean binary-indep binary-arch binary install configure
+ rm -f gdm-control.1
+
+ dh_auto_clean
