Package: openbox Version: 3.5.0-2 Severity: normal Tags: patch User: ubuntu-de...@lists.ubuntu.com Usertags: origin-ubuntu precise ubuntu-patch
*** /tmp/tmprI34q9 In Ubuntu, the attached patch was applied to achieve the following: * debian/control: - Remove libxft-dev and libxau-dev build-depends, not needed anymore. - Add depends on libimlib2-dev for openbox-dev, needed to build against openbox-dev. - Build-depends on dh-autoreconf and autopoint. * debian/openbox-dev.install - Install directly .so files. * debian/openbox-dev.links: - Remove since the .so files are installed. * debian/openbox.install - Install all locales and all themes. - Install .desktop and pixmap files. - Install menu.xml. * debian/rules: - Use CFLAGS += instead of CFLAGS =. - Use dh_install --list-missing. - Use --with autoreconf, needed by 90_fix_link_obt.patch. * debian/patches: - 90_fix_link_obt.patch : From upstream, fix linker issue with libobt. * debian/*.symbols: - Add symbols files. * debian/README.source - Remove, not needed with source format 3.0 (quilt). Thanks for considering the patch. -- System Information: Debian Release: wheezy/sid APT prefers oneiric-updates APT policy: (500, 'oneiric-updates'), (500, 'oneiric-security'), (500, 'oneiric') Architecture: amd64 (x86_64) Kernel: Linux 3.0.0-10-generic (SMP w/8 CPU cores) Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash
diff -Nru openbox-3.5.0/debian/changelog openbox-3.5.0/debian/changelog diff -Nru openbox-3.5.0/debian/control openbox-3.5.0/debian/control --- openbox-3.5.0/debian/control 2011-10-30 16:17:00.000000000 +0100 +++ openbox-3.5.0/debian/control 2011-11-06 21:11:03.000000000 +0100 @@ -1,8 +1,8 @@ Source: openbox Section: x11 Priority: optional Maintainer: Nico Golde <n...@debian.org> -Build-Depends: debhelper (>= 7.0.50~), gettext, libxft-dev, libstartup-notification0-dev, libxrender-dev, pkg-config, libglib2.0-dev, libxml2-dev (>= 2.6.0), perl, libxt-dev, libxinerama-dev, libxrandr-dev, libpango1.0-dev, libx11-dev, libxau-dev, autoconf, automake1.9, python-xdg, libimlib2-dev +Build-Depends: debhelper (>= 7.0.50~), 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, automake1.9, python-xdg, libimlib2-dev, dh-autoreconf, autopoint Standards-Version: 3.9.2 Homepage: http://www.openbox.org Vcs-Browser: http://svn.debian.org/viewsvn/collab-maint/deb-maint/openbox/trunk @@ -99,7 +100,7 @@ Package: openbox-dev Section: libdevel Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, libobrender27 (= ${binary:Version}), libobt0 (= ${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, libxft-dev, libpango1.0-dev, libimlib2-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 -Nru openbox-3.5.0/debian/libobrender27.symbols openbox-3.5.0/debian/libobrender27.symbols --- openbox-3.5.0/debian/libobrender27.symbols 1970-01-01 01:00:00.000000000 +0100 +++ openbox-3.5.0/debian/libobrender27.symbols 2011-11-06 21:33:13.000000000 +0100 @@ -0,0 +1,75 @@ +libobrender.so.27 libobrender27 #MINVER# + DrawRGBA@Base 3.5.0 + 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 + RrColorAllocateGC@Base 3.5.0 + RrColorBlue@Base 3.5.0 + 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 diff -Nru openbox-3.5.0/debian/libobt0.symbols openbox-3.5.0/debian/libobt0.symbols --- openbox-3.5.0/debian/libobt0.symbols 1970-01-01 01:00:00.000000000 +0100 +++ openbox-3.5.0/debian/libobt0.symbols 2011-11-06 21:33:17.000000000 +0100 @@ -0,0 +1,111 @@ +libobt.so.0 libobt0 #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 + 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 + 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_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_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 + 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 diff -Nru openbox-3.5.0/debian/openbox-dev.install openbox-3.5.0/debian/openbox-dev.install --- openbox-3.5.0/debian/openbox-dev.install 2011-10-30 16:16:59.000000000 +0100 +++ openbox-3.5.0/debian/openbox-dev.install 2011-11-03 15:39:30.000000000 +0100 @@ -1,5 +1,7 @@ usr/lib/libobt.a +usr/lib/libobt.so usr/lib/libobrender.a +usr/lib/libobrender.so usr/lib/pkgconfig/obrender-3.5.pc usr/lib/pkgconfig/obt-3.5.pc usr/include/openbox/3.5/* diff -Nru openbox-3.5.0/debian/openbox-dev.links openbox-3.5.0/debian/openbox-dev.links --- openbox-3.5.0/debian/openbox-dev.links 2011-10-30 16:16:59.000000000 +0100 +++ openbox-3.5.0/debian/openbox-dev.links 1970-01-01 01:00:00.000000000 +0100 @@ -1,2 +0,0 @@ -/usr/lib/libobparser.so.27.0.1 /usr/lib/libobparser.so -/usr/lib/libobt.so.0.0.1 /usr/lib/libobt.so diff -Nru openbox-3.5.0/debian/openbox.install openbox-3.5.0/debian/openbox.install --- openbox-3.5.0/debian/openbox.install 2011-10-30 16:17:00.000000000 +0100 +++ openbox-3.5.0/debian/openbox.install 2011-11-03 15:45:00.000000000 +0100 @@ -1,80 +1,7 @@ -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/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/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_BR/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/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 -usr/share/themes/Bear2/openbox-3/desk_toggled.xbm -usr/share/themes/Bear2/openbox-3/desk.xbm -usr/share/themes/Bear2/openbox-3/iconify_pressed.xbm -usr/share/themes/Bear2/openbox-3/iconify.xbm -usr/share/themes/Bear2/openbox-3/max_pressed.xbm -usr/share/themes/Bear2/openbox-3/max_toggled.xbm -usr/share/themes/Bear2/openbox-3/max.xbm -usr/share/themes/Bear2/openbox-3/shade_pressed.xbm -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 -usr/share/themes/Mikachu/openbox-3/desk.xbm -usr/share/themes/Mikachu/openbox-3/iconify.xbm -usr/share/themes/Mikachu/openbox-3/max.xbm -usr/share/themes/Mikachu/openbox-3/themerc -usr/share/themes/Natura/openbox-3/close_hover.xbm -usr/share/themes/Natura/openbox-3/close.xbm -usr/share/themes/Natura/openbox-3/desk_toggled.xbm -usr/share/themes/Natura/openbox-3/desk_hover.xbm -usr/share/themes/Natura/openbox-3/desk.xbm -usr/share/themes/Natura/openbox-3/iconify_hover.xbm -usr/share/themes/Natura/openbox-3/iconify.xbm -usr/share/themes/Natura/openbox-3/max_hover.xbm -usr/share/themes/Natura/openbox-3/max_toggled.xbm -usr/share/themes/Natura/openbox-3/max.xbm -usr/share/themes/Natura/openbox-3/shade.xbm -usr/share/themes/Natura/openbox-3/shade_hover.xbm -usr/share/themes/Natura/openbox-3/themerc -usr/share/themes/Onyx/openbox-3/themerc -usr/share/themes/Onyx-Citrus/openbox-3/themerc -usr/share/themes/Orang/openbox-3/themerc -usr/share/themes/Syscrash/openbox-3/max_disabled.xbm -usr/share/themes/Syscrash/openbox-3/max_pressed.xbm -usr/share/themes/Syscrash/openbox-3/max_toggled.xbm -usr/share/themes/Syscrash/openbox-3/max.xbm -usr/share/themes/Syscrash/openbox-3/themerc +usr/share/applications/openbox.desktop +usr/share/pixmaps/openbox.png +usr/share/locale/ +usr/share/themes/ usr/share/doc/openbox/menu.xsd usr/share/doc/openbox/xbm/bullet.xbm usr/share/doc/openbox/xbm/close.xbm @@ -103,6 +30,7 @@ usr/bin/openbox-kde-session usr/bin/gdm-control etc/xdg/openbox/rc.xml +etc/xdg/openbox/menu.xml etc/xdg/openbox/autostart etc/xdg/openbox/environment usr/lib/openbox/openbox-xdg-autostart diff -Nru openbox-3.5.0/debian/patches/90_fix_link_obt.patch openbox-3.5.0/debian/patches/90_fix_link_obt.patch --- openbox-3.5.0/debian/patches/90_fix_link_obt.patch 1970-01-01 01:00:00.000000000 +0100 +++ openbox-3.5.0/debian/patches/90_fix_link_obt.patch 2011-11-04 08:00:14.000000000 +0100 @@ -0,0 +1,22 @@ +From: Fryderyk Dziarmagowski <fdziarmagow...@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. +--- + +diff --git a/Makefile.am b/Makefile.am +index 7146908..4f60bd0 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -80,6 +80,7 @@ obrender_libobrender_la_CPPFLAGS = \ + 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.0/debian/patches/series openbox-3.5.0/debian/patches/series --- openbox-3.5.0/debian/patches/series 2011-10-30 16:16:59.000000000 +0100 +++ openbox-3.5.0/debian/patches/series 2011-11-04 07:56:22.000000000 +0100 @@ -4,3 +4,4 @@ 01_rc.xml.patch 05_simplify_gnome_session.patch 07_fix_xml_load_file.patch +90_fix_link_obt.patch \ Pas de fin de ligne à la fin du fichier. diff -Nru openbox-3.5.0/debian/README.source openbox-3.5.0/debian/README.source --- openbox-3.5.0/debian/README.source 2011-10-30 16:16:59.000000000 +0100 +++ openbox-3.5.0/debian/README.source 1970-01-01 01:00:00.000000000 +0100 @@ -1,2 +0,0 @@ -This packages uses quilt to manage all modifications to the upstream source code. Please refer to /usr/share/doc/quilt/README.source for usage instructions. --- Nico Golde <n...@debian.org> Sa Jan 02 14:57:47 CET 2010 diff -Nru openbox-3.5.0/debian/rules openbox-3.5.0/debian/rules --- openbox-3.5.0/debian/rules 2011-10-30 16:16:59.000000000 +0100 +++ openbox-3.5.0/debian/rules 2011-11-06 20:29:13.000000000 +0100 @@ -2,7 +2,7 @@ #export DH_VERBOSE= -CFLAGS=-Wall -g +CFLAGS +=-Wall -g -fPIC ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) CFLAGS += -O0 else @@ -12,7 +12,7 @@ VERSION=$(shell awk '/^PACKAGE_VERSION/ { print $$2 }' "FS='" configure) %: - dh $@ + dh $@ --with autoreconf override_dh_auto_build: pod2man --section=1 --release=$(VERSION) --center \ @@ -28,6 +28,9 @@ dh_auto_build +override_dh_install: + dh_install --list-missing + override_dh_auto_clean: rm -f openbox.1 #rm -f kdetrayproxy.1