diff --git a/debian/README.source b/debian/README.source deleted file mode 100644 index d0ee125..0000000 --- a/debian/README.source +++ /dev/null @@ -1,7 +0,0 @@ -openbox-menu for Debian ------------------------ - -Both the "archlinux" directory as well as the Mercuial VCS -files have been removed from the original tarball. - - -- Mateusz Łukasik Fri, 01 Nov 2013 15:59:43 +0100 diff --git a/debian/changelog b/debian/changelog deleted file mode 100644 index 6113748..0000000 --- a/debian/changelog +++ /dev/null @@ -1,24 +0,0 @@ -openbox-menu (0.5.1-2) unstable; urgency=high - - * Add debian/patches/fix_missing_double_quote.patch from upstream - to fix XML parser error. - - -- Mateusz Łukasik Tue, 03 Dec 2013 09:13:30 +0100 - -openbox-menu (0.5.1-1) unstable; urgency=low - - * New upstream release. - * debian/rules: - + install binary to usr/bin. - + disable tests. - * debian/control: - + add depends to packages provides menu files. - * Refresh debian/patches/debian_build.patch. - - -- Mateusz Łukasik Sat, 30 Nov 2013 11:43:27 +0100 - -openbox-menu (0.5.0-1) unstable; urgency=low - - * Initial release. (Closes: #671862) - - -- Mateusz Łukasik Fri, 01 Nov 2013 14:17:43 +0100 diff --git a/debian/compat b/debian/compat deleted file mode 100644 index ec63514..0000000 --- a/debian/compat +++ /dev/null @@ -1 +0,0 @@ -9 diff --git a/debian/control b/debian/control deleted file mode 100644 index 46ee920..0000000 --- a/debian/control +++ /dev/null @@ -1,17 +0,0 @@ -Source: openbox-menu -Section: x11 -Priority: optional -Maintainer: Mateusz Łukasik -Build-Depends: debhelper (>= 9), libgtk2.0-dev, libmenu-cache-dev, libglib2.0-dev -Standards-Version: 3.9.5.0 -Homepage: https://bitbucket.org/fabriceT/openbox-menu -Vcs-Browser: https://github.com/mati75/openbox-menu.git -Vcs-Git: git://github.com/mati75/openbox-menu.git - -Package: openbox-menu -Architecture: any -Depends: ${misc:Depends}, ${shlibs:Depends}, openbox, lxmenu-data | gnome-menus | libgarcon-common -Description: openbox pipe-menu to display entries in *.desktop files - openbox-menu is a pipemenu for the openbox window manager. It provides - a dynamic menu listing of installed applications. Most of the work is - done by the LXDE library menu-cache. diff --git a/debian/copyright b/debian/copyright deleted file mode 100644 index be0e780..0000000 --- a/debian/copyright +++ /dev/null @@ -1,28 +0,0 @@ -Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ -Upstream-Name: openbox-menu -Source: https://bitbucket.org/fabriceT/openbox-menu/downloads - -Files: * -Copyright: 2012-2013, mimas -License: GPL-3+ - -Files: debian/* -Copyright: 2013, Mateusz Łukasik -License: GPL-3+ - -License: GPL-3+ - 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 3 of the License, or (at your option) any later - version. - . - This program is distributed in the hope that it will be useful, but WITHOUT ANY - WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A - PARTICULAR PURPOSE. See the GNU General Public License for more details. - . - You should have received a copy of the GNU General Public License along with - this package; if not, write to the Free Software Foundation, Inc., 51 Franklin - St, Fifth Floor, Boston, MA 02110-1301 USA - . - On Debian systems, the full text of the GNU General Public License version 3 - can be found in the file `/usr/share/common-licenses/GPL-3'. diff --git a/debian/openbox-menu.1 b/debian/openbox-menu.1 deleted file mode 100644 index a496936..0000000 --- a/debian/openbox-menu.1 +++ /dev/null @@ -1,45 +0,0 @@ -.TH OPENBOX-MENU "1" "November 2013" -.SH NAME -openbox-menu \- Openbox pipe-menu to display entries in *.desktop files -.SH DESCRIPTION -.SS "Usage:" -.TP -openbox\-menu [OPTION...] [file.menu] -.SS "Help Options:" -.TP -\fB\-h\fR, \fB\-\-help\fR -Show help options -.SS "Application Options:" -.TP -\fB\-c\fR, \fB\-\-comment\fR -Show generic name instead of application name -.TP -\fB\-t\fR, \fB\-\-terminal\fR=\fIcmd\fR -Terminal command (default xterm \fB\-e\fR) -.TP -\fB\-g\fR, \fB\-\-gnome\fR -Show GNOME entries -.TP -\fB\-k\fR, \fB\-\-kde\fR -Show KDE entries -.TP -\fB\-x\fR, \fB\-\-xfce\fR -Show XFCE entries -.TP -\fB\-r\fR, \fB\-\-rox\fR -Show ROX entries -.TP -\fB\-p\fR, \fB\-\-persistent\fR -stay active -.TP -\fB\-s\fR, \fB\-\-sn\fR -Enable startup notification -.TP -\fB\-o\fR, \fB\-\-output\fR -file to write data to -.TP -\fB\-i\fR, \fB\-\-noicons\fR -Don't display icons in menu -.PP -This manual page was written by Mateusz Łukasik , -for the Debian project (and may be used by others). diff --git a/debian/openbox-menu.dirs b/debian/openbox-menu.dirs deleted file mode 100644 index e772481..0000000 --- a/debian/openbox-menu.dirs +++ /dev/null @@ -1 +0,0 @@ -usr/bin diff --git a/debian/openbox-menu.manpages b/debian/openbox-menu.manpages deleted file mode 100644 index ebcf570..0000000 --- a/debian/openbox-menu.manpages +++ /dev/null @@ -1 +0,0 @@ -debian/openbox-menu.1 diff --git a/debian/patches/debian_build.patch b/debian/patches/debian_build.patch deleted file mode 100644 index 553825e..0000000 --- a/debian/patches/debian_build.patch +++ /dev/null @@ -1,15 +0,0 @@ -Description: Make makefile compatible with Debian's standards. -Author: Mateusz Łukasik -Last-Update: 2013-11-30 - ---- a/Makefile -+++ b/Makefile -@@ -7,7 +7,7 @@ CC=gcc - CFLAGS+=-DWITH_ICONS - # Uncomment this line if Openbox can display SVG icons - # Check SVG support with '$ ldd /usr/bin/openbox | grep svg', librsvg must appear.. --# CFLAGS+=-DWITH_SVG -+CFLAGS+=-DWITH_SVG - - prefix= /usr/local - DESTDIR ?= $(prefix) diff --git a/debian/patches/fix_missing_double_quote.patch b/debian/patches/fix_missing_double_quote.patch deleted file mode 100644 index d8efc3a..0000000 --- a/debian/patches/fix_missing_double_quote.patch +++ /dev/null @@ -1,17 +0,0 @@ -Description: Fix missing double quote -Author: Mateusz Łukasik - -Origin: Upstream, https://bitbucket.org/fabriceT/openbox-menu/commits/2c8ef0cbc8f4500db530e3d005484e0722dd0c64 -Bug: https://bitbucket.org/fabriceT/openbox-menu/issue/3/xml-parser-error - ---- b/ob_display.c -+++ a/ob_display.c -@@ -21,7 +21,7 @@ const gchar *default_template = - "" - "" -+ " xsi:schemaLocation=\"http://openbox.org/\" >" - "%MENU%\n"; - - /****f* ob_display/menu_directory diff --git a/debian/patches/series b/debian/patches/series deleted file mode 100644 index 20fd4e8..0000000 --- a/debian/patches/series +++ /dev/null @@ -1,2 +0,0 @@ -debian_build.patch -fix_missing_double_quote.patch diff --git a/debian/rules b/debian/rules deleted file mode 100755 index ddf4bbe..0000000 --- a/debian/rules +++ /dev/null @@ -1,14 +0,0 @@ -#!/usr/bin/make -f -export DEB_BUILD_OPTIONS=nocheck - -%: - dh $@ - -override_dh_auto_install: - $(MAKE) install BINDIR=$(CURDIR)/debian/openbox-menu/usr/bin - -override_dh_installman: - dh_installman - -override_dh_builddeb: - dh_builddeb -- -Zxz -z9 diff --git a/debian/source/format b/debian/source/format deleted file mode 100644 index 163aaf8..0000000 --- a/debian/source/format +++ /dev/null @@ -1 +0,0 @@ -3.0 (quilt) diff --git a/debian/source/options b/debian/source/options deleted file mode 100644 index 74a452b..0000000 --- a/debian/source/options +++ /dev/null @@ -1,2 +0,0 @@ -compression = "xz" -compression-level = 9 diff --git a/debian/watch b/debian/watch deleted file mode 100644 index a67712f..0000000 --- a/debian/watch +++ /dev/null @@ -1,2 +0,0 @@ -version=3 -https://bitbucket.org/fabriceT/openbox-menu/downloads/openbox-menu-([\d.]+).tar.bz2 diff --git a/menu.c b/menu.c index 0ec6482..7bb706d 100644 --- a/menu.c +++ b/menu.c @@ -56,6 +56,7 @@ gchar *xdg_prefix = getenv("XDG_MENU_PREFIX"); if (xdg_prefix) { + g_warning ("XDG_MENU_PREFIX environment variable set, this could prevent the menu from loading. Unset it if an error happens"); g_snprintf (menu, APPMENU_SIZE, "%sapplications.menu", xdg_prefix); } else diff --git a/ob_display.c b/ob_display.c index 244cc77..423fcc8 100644 --- a/ob_display.c +++ b/ob_display.c @@ -21,7 +21,7 @@ "" "" + " xsi:schemaLocation=\"http://openbox.org/\" >" "%MENU%\n"; /****f* ob_display/menu_directory diff --git a/openbox-menu.h b/openbox-menu.h index be1ffd9..ece598b 100644 --- a/openbox-menu.h +++ b/openbox-menu.h @@ -21,7 +21,7 @@ #define __OPENBOXMENU_APP__ #include -#define VERSION "0.5.1" +#define VERSION "0.7.0" #define APPMENU_SIZE 30 #define TERMINAL_CMD "xterm -e" diff --git a/utils.c b/utils.c index b68331c..b02cb8c 100644 --- a/utils.c +++ b/utils.c @@ -51,7 +51,7 @@ g_string_append (cmd, ">"); break; case '"': - g_string_append (cmd, ""e;"); + g_string_append (cmd, """); break; default: g_string_append_c (cmd, *name); @@ -81,6 +81,9 @@ { gchar *filepath = NULL; const char *exec = menu_cache_app_get_exec (MENU_CACHE_APP(app)); + + g_return_val_if_fail(exec,""); + GString *cmd = g_string_sized_new (64); for (;*exec; ++exec)