debian/0000755000000000000000000000000012236500337007167 5ustar debian/rules0000755000000000000000000000152711732471772010266 0ustar #!/usr/bin/make -f export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed %: dh $@ --with autoreconf override_dh_autoreconf: dh_autoreconf --as-needed override_dh_auto_configure: [ -f po/en.po ] || mv po/en_GB.po po/en.po [ -f po/es.po ] || mv po/es_ES.po po/es.po [ -f po/fi.po ] || mv po/fi_FI.po po/fi.po [ -f po/fr.po ] || mv po/fr_FR.po po/fr.po ./configure --prefix=/usr --enable-dnotify --enable-startup-notification --enable-nls --enable-acpi-linux override_dh_clean: [ -f po/en_GB.po ] || mv po/en.po po/en_GB.po [ -f po/es_ES.po ] || mv po/es.po po/es_ES.po [ -f po/fi_FI.po ] || mv po/fi.po po/fi_FI.po [ -f po/fr_FR.po ] || mv po/fr.po po/fr_FR.po dh_clean override_dh_install: -rm debian/matchbox-panel/usr/bin/mb-applet-xterm-wrapper.sh -rm debian/matchbox-panel/usr/share/applications/mb-launcher-term.desktop dh_installdebian/control0000644000000000000000000000147211732456530010603 0ustar Source: matchbox-panel Section: embedded Priority: optional Maintainer: Moray Allan Build-Depends: debhelper (>= 9.0), dh-autoreconf (>= 5), pkg-config, linux-kernel-headers, libmatchbox-dev (>= 1.8), libstartup-notification0-dev, libiw-dev, libx11-dev, autotools-dev Standards-Version: 3.9.1 Package: matchbox-panel Architecture: any Depends: ${shlibs:Depends}, matchbox-common, ${misc:Depends} Replaces: matchbox (<< 1:0.8.2) Recommends: matchbox-panel-manager Description: desktop panel for resource-limited systems Matchbox is a base environment for the X Window System running on non-desktop embedded platforms such as handhelds, set-top boxes, kiosks and anything else for which screen space, input mechanisms or system resources are limited. . This package contains the Matchbox desktop panel. debian/mb-applet-wireless.10000644000000000000000000000136211706334343012772 0ustar .\" mb-applet-wireless.1 .\" Copyright 2004 Moray Allan .TH mb-applet-wireless 1 "Jul 17 2004" "" .SH NAME mb-applet-wireless \- a wireless monitor panel applet .SH SYNOPSIS .B mb-applet-wireless .SH DESCRIPTION .B mb-applet-wireless is a panel applet which displays the wireless networking signal strength. At maximum signal strength four bars are shown lit up brightly, while at minimum strength the four bars are all shown dimmed out. Matchbox is a base environment for the X Window System running on non-desktop embedded platforms such as handhelds, set-top boxes, kiosks and anything else for which screen space, input mechanisms or system resources are limited. .SH AUTHOR .B mb-applet-wireless was written by Matthew Allum . debian/mb-applet-system-monitor.10000644000000000000000000000146511706334343014152 0ustar .\" mb-applet-system-monitor.1 .\" Copyright 2004 Moray Allan .TH mb-applet-system-monitor 1 "Jul 17 2004" "" .SH NAME mb-applet-system-monitor \- a system monitor panel applet .SH SYNOPSIS .B mb-applet-system-monitor .SH DESCRIPTION .B mb-applet-system-monitor is a panel applet which displays the current utilisation of system resources. A graph is shown with two bars. The left-hand bar shows the amount of memory being used, and the right-hand bar shows the amount of processor time being used. Matchbox is a base environment for the X Window System running on non-desktop embedded platforms such as handhelds, set-top boxes, kiosks and anything else for which screen space, input mechanisms or system resources are limited. .SH AUTHOR .B mb-applet-system-monitor was written by Matthew Allum . debian/mb-applet-menu-launcher.10000644000000000000000000000142411706334343013677 0ustar .\" mb-applet-menu-launcher.1 .\" Copyright 2004 Moray Allan .TH mb-applet-menu-launcher 1 "Jul 17 2004" "" .SH NAME mb-applet-menu-launcher \- a launcher menu panel applet .SH SYNOPSIS .B mb-applet-menu-launcher [\fIoptions\fR] .SH DESCRIPTION .B mb-applet-menu-launcher is a panel applet which provides a menu of applications installed on the system. Applications can be launched by choosing them from the menu. Matchbox is a base environment for the X Window System running on non-desktop embedded platforms such as handhelds, set-top boxes, kiosks and anything else for which screen space, input mechanisms or system resources are limited. .SH OPTIONS .TP .B \-display X display to connect to .SH AUTHOR .B mb-applet-menu-launcher was written by Matthew Allum . debian/mb-applet-launcher.10000644000000000000000000000311511706334343012734 0ustar .\" mb-applet-launcher.1 .\" Copyright 2004 Moray Allan .TH mb-applet-launcher 1 "Jul 17 2004" "" .SH NAME mb-applet-launcher \- an application launcher panel applet .SH SYNOPSIS .B mb-applet-launcher [\fIoptions\fR] [\fIaction\fR] \fIimage_file\fR \fIapplication\fR .SH DESCRIPTION .B mb-applet-launcher is a panel applet which can be used to start a given application. The applet displays the PNG or XPM file given on the command line as an icon, and when the user clicks on the icon the application is started. Matchbox is a base environment for the X Window System running on non-desktop embedded platforms such as handhelds, set-top boxes, kiosks and anything else for which screen space, input mechanisms or system resources are limited. .\" .SH OPTIONS .TP .BI \-display\ display X display to connect to .TP .BI \-\-title\ title .TP .BI \-\-no\-animation Disable any animations .TP .B \-\-start, \-s Start application immediately .TP The default action is to iconize/uniconize the selected application. Other actions can be specified as command-line options: .TP .B \-\-kill, \-k Destroy the application .TP .B \-\-respawn, \-l Respawn multiple instances of the application .TP .B \-\-message, \-m Display output from the application as a message from the panel .TP Alternatively, a valid \.desktop file can be given: .TP .BI \-\-desktop\ \.desktop_file Any actions given with this option will have no effect. Similar behaviour can be achieved by including a `SingleInstance=True' key pair in the \.desktop file. .\" .SH AUTHOR .B mb-applet-launcher was written by Matthew Allum . debian/source/0000755000000000000000000000000011732452125010470 5ustar debian/source/format0000644000000000000000000000001411732452125011676 0ustar 3.0 (quilt) debian/changelog0000644000000000000000000000717012236477633011062 0ustar matchbox-panel (0.9.3-8.1) unstable; urgency=low * Non-maintainer upload. * Fix "FTBFS: ld: mb-applet-menu-launcher.o: undefined reference to symbol 'XInternAtom'": update patch linking-fix: links against some more libs. (Closes: #713728) -- gregor herrmann Wed, 06 Nov 2013 18:42:50 +0100 matchbox-panel (0.9.3-8) unstable; urgency=low * Restore patch for src/Makefile.am and src/Makefile.in. -- Moray Allan Sat, 24 Mar 2012 21:45:57 +0000 matchbox-panel (0.9.3-7) unstable; urgency=low * Move from cdbs to dh 9. * Switch to 3.0 (quilt) source format. -- Moray Allan Wed, 21 Mar 2012 22:21:11 +0000 matchbox-panel (0.9.3-6) unstable; urgency=low * Fix use of memset in panel.c (patch from Silvio Cesare). Closes: #609085. -- Moray Allan Fri, 20 Jan 2012 18:57:58 +0000 matchbox-panel (0.9.3-5) unstable; urgency=low * Apply patch for mb-applet-system-monitor.c memory display from gregor herrmann . Closes: #551305. -- Moray Allan Sun, 08 May 2011 14:18:57 +0100 matchbox-panel (0.9.3-4) unstable; urgency=low * Add libraries to LDADD settings. Closes: #555589, #615751. -- Moray Allan Sat, 07 May 2011 22:56:05 +0100 matchbox-panel (0.9.3-3) unstable; urgency=low * Include battery and wireless applets in package. Closes: #339678. * Remove unnecessary country parts from translation file names. Closes: #336799. -- Moray Allan Mon, 24 Mar 2008 14:53:18 +0100 matchbox-panel (0.9.3-2) unstable; urgency=low * Add check for invalid panel app icon size. Closes: #337632. -- Moray Allan Sat, 22 Apr 2006 21:24:15 +0100 matchbox-panel (0.9.3-1) unstable; urgency=low * New upstream release. -- Moray Allan Sun, 12 Mar 2006 00:03:58 +0000 matchbox-panel (0.9.2-3) unstable; urgency=low * Tighten libmatchbox dependency, since the newer version should give this package fewer direct dependencies. -- Moray Allan Sun, 15 Jan 2006 11:57:48 +0000 matchbox-panel (0.9.2-2) unstable; urgency=low * Update autotools files. -- Moray Allan Sat, 14 Jan 2006 22:13:02 +0000 matchbox-panel (0.9.2-1) unstable; urgency=low * New upstream release. -- Moray Allan Sun, 5 Jun 2005 19:42:07 +0100 matchbox-panel (0.9.1-1) unstable; urgency=high * New upstream release. * Fix removal of unwanted files. Closes #295629. * Patch configure script to remove error when miniapm is disabled. -- Moray Allan Mon, 28 Mar 2005 20:08:49 +0100 matchbox-panel (0.9-2) unstable; urgency=low * Update watch file. * Tighten libmatchbox-dev build-depends. -- Moray Allan Mon, 10 Jan 2005 02:53:23 +0000 matchbox-panel (0.9-1) unstable; urgency=medium * New upstream release. -- Moray Allan Fri, 7 Jan 2005 16:50:59 +0000 matchbox-panel (0.8.3-1) unstable; urgency=low * New upstream release -- Moray Allan Sat, 27 Nov 2004 19:08:04 +0000 matchbox-panel (0.8.2-1) unstable; urgency=low * New upstream release -- Moray Allan Thu, 29 Jul 2004 02:17:05 +0100 matchbox-panel (0.8.1-2) unstable; urgency=low * Add libstartup-notification0-dev to Build-Depends. -- Moray Allan Wed, 21 Jul 2004 00:38:27 +0100 matchbox-panel (0.8.1-1) unstable; urgency=low * Split out from monolithic matchbox package. * New maintainer for Matchbox packages. -- Moray Allan Fri, 16 Jul 2004 02:19:55 +0100 debian/compat0000644000000000000000000000000211732452052010365 0ustar 9 debian/patches/0000755000000000000000000000000012236500311010606 5ustar debian/patches/linking-fix0000644000000000000000000000307312236500311012753 0ustar Description: FTBFS with binutils-gold (#555589) FTBFS again, underlinked (#713728) Last-Update: 2013-11-06 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -6,7 +6,7 @@ bin_PROGRAMS = matchbox-panel -matchbox_panel_LDADD = $(LIBMB_LIBS) +matchbox_panel_LDADD = $(LIBMB_LIBS) -lX11 -lXext matchbox_panel_SOURCES = \ panel.c panel_app.c panel_menu.c panel_util.c session.c msg.c \ --- a/src/Makefile.in +++ b/src/Makefile.in @@ -168,7 +168,7 @@ PKGDATADIR = $(datadir)/matchbox DATADIR = $(datadir) INCLUDES = -DDATADIR=\"$(DATADIR)\" -DPKGDATADIR=\"$(PKGDATADIR)\" -DPREFIX=\"$(PREFIXDIR)\" $(LIBMB_CFLAGS) -matchbox_panel_LDADD = $(LIBMB_LIBS) +matchbox_panel_LDADD = $(LIBMB_LIBS) -lX11 -lXext matchbox_panel_SOURCES = \ panel.c panel_app.c panel_menu.c panel_util.c session.c msg.c \ panel.h panel_app.h panel_menu.h panel_util.h session.h msg.h --- a/applets/Makefile.am +++ b/applets/Makefile.am @@ -37,9 +37,11 @@ mb_applet_clock_SOURCES = mb-applet-clock.c mb_applet_menu_launcher_SOURCES = mb-applet-menu-launcher.c +mb_applet_menu_launcher_LDADD = $(LIBMB_LIBS) $(SN_LIBS) -lX11 mb_applet_wireless_SOURCES = mb-applet-wireless.c -mb_applet_wireless_LDADD = $(LIBMB_LIBS) $(SN_LIBS) $(WIRELESS_LIBS) +mb_applet_wireless_LDADD = $(LIBMB_LIBS) $(SN_LIBS) $(WIRELESS_LIBS) -lm mb_applet_launcher_SOURCES = mb-applet-launcher.c +mb_applet_launcher_LDADD = $(LIBMB_LIBS) $(SN_LIBS) -lX11 mb_applet_system_monitor_SOURCES = mb-applet-system-monitor.c debian/patches/translation-language-codes-fix0000644000000000000000000000157511732455717016562 0ustar Description: Fix translation's language codes -- also see debian/rules (#336799) Using a country part in a translation file is a discouraged practice except in very few cases (pt_BR, zh_CN, zh_TW). -- Christian Perrier Author: Moray Allan Last-Update: 2012-03-21 --- a/configure.ac +++ b/configure.ac @@ -95,7 +95,7 @@ if test x$enable_nls = xyes; then - LINGUAS="en_GB es_ES fi_FI de cs fr_FR zh_TW" + LINGUAS="en es fi de cs fr zh_TW" AC_CHECK_FUNC(gettext, [HAVEGETTEXT="yes"], AC_CHECK_LIB(intl, gettext, [INTLIBS="-lintl" HAVEGETTEXT="yes"], --- a/po/Makefile.am +++ b/po/Makefile.am @@ -3,7 +3,7 @@ CLEANFILES = $(CATALOGS) matchbox.pot # keep this sorted -EXTRA_DIST = en_GB.po es_ES.po fi_FI.po de.po cs.po fr_FR.po zh_TW.po +EXTRA_DIST = en.po es.po fi.po de.po cs.po fr.po zh_TW.po POTFILES = \ $(top_builddir)/src/panel_menu.c \ debian/patches/mb-applet-battery-desktop-file0000644000000000000000000000051311732473013016455 0ustar Description: Enable installation of mb-applet-battery.desktop --- a/applets/dotdesktop/Makefile.am +++ b/applets/dotdesktop/Makefile.am @@ -11,6 +11,9 @@ if WANT_APM files += mb-applet-battery.desktop endif +if WANT_ACPI + files += mb-applet-battery.desktop +endif if WANT_WIFI files += mb-applet-wireless.desktop debian/patches/mb-applet-wireless-patch0000644000000000000000000000072111732474271015361 0ustar --- a/applets/mb-applet-wireless.c +++ b/applets/mb-applet-wireless.c @@ -356,10 +356,10 @@ if (Mwd.iface != NULL && WInfo.has_stats == 1) return 0; - if(iw_get_range_info(Wfd, Mwd.iface, &(WInfo.range)) >= 0) + if(iw_get_range_info(Wfd, ifname, &(WInfo.range)) >= 0) WInfo.has_range = 1; - if (iw_get_stats(Wfd, Mwd.iface, + if (iw_get_stats(Wfd, ifname, &(WInfo.stats), &(WInfo.range), WInfo.has_range) >= 0) WInfo.has_stats = 1; debian/patches/memset-fix0000644000000000000000000000075111732453154012626 0ustar Description: Fix incorrect use of memset count/value (#609085) In ./matchbox-panel_0.9.3/src/panel.c memset(panel, sizeof(MBPanel), 0); This should be memset(panel, 0, sizeof(MBPanel)) Author: Silvio Cesare Last-Update: 2011-01-06 --- a/src/panel.c +++ b/src/panel.c @@ -1599,7 +1599,7 @@ XSetErrorHandler(util_handle_xerror); panel = NEW(MBPanel); - memset(panel, sizeof(MBPanel), 0); + memset(panel, 0, sizeof(MBPanel)); /* defualts */ debian/patches/series0000644000000000000000000000026511733440077012043 0ustar memset-fix ram-display-fix invalid-icon-size-fix translation-language-codes-fix mb-applet-battery-fix mb-applet-battery-desktop-file enable-png mb-applet-wireless-patch linking-fix debian/patches/mb-applet-battery-fix0000644000000000000000000000037311732462047014666 0ustar Description: Fix build of mb-applet-battery.c --- a/applets/mb-applet-battery.c +++ b/applets/mb-applet-battery.c @@ -177,7 +177,7 @@ unsigned long present_rate; }; - static int + int line_parse(char *line, struct entry *e) { char *ptr; debian/patches/ram-display-fix0000644000000000000000000000431611732453721013557 0ustar Description: Improvements for mb-applet-system-monitor's RAM display (#551305) mb-applet-system-monitor's memory part is not really useful; its assumptions about /proc/meminfo don't fit neither on my desktop machine nor on my openmoko (where I'm using it), and the calculations are also debatable. Author: gregor herrmann Last-Update: 2009-10-17 --- a/applets/mb-applet-system-monitor.c +++ b/applets/mb-applet-system-monitor.c @@ -55,9 +55,6 @@ /* memory data */ u_int64_t mem_used; u_int64_t mem_max; - u_int64_t swap_used; - u_int64_t swap_max; - unsigned int swap_percent; /* swap used, in percent */ unsigned int mem_percent; /* memory used, in percent */ } msd; @@ -132,7 +129,6 @@ cache_total, cache_free, cache_used, uneeded = 0; u_int64_t my_mem_used, my_mem_max; - u_int64_t my_swap_max; static int mem_delay = 0; FILE *mem; @@ -158,22 +154,25 @@ fscanf (mem, "%*s %Ld %*s", &mfree); fscanf (mem, "%*s %Ld %*s", &buffers); fscanf (mem, "%*s %Ld %*s", &cached); - fscanf (mem, "%*s %Ld %*s", &shared); - fscanf (mem, "%*s %Ld %*s", &used); + + fscanf (mem, "%*s %Ld %*s", &uneeded); + fscanf (mem, "%*s %Ld %*s", &uneeded); fscanf (mem, "%*s %Ld %*s", &uneeded); fscanf (mem, "%*s %Ld %*s", &uneeded); fscanf (mem, "%*s %Ld %*s", &uneeded); fscanf (mem, "%*s %Ld %*s", &uneeded); fscanf (mem, "%*s %Ld %*s", &uneeded); + fscanf (mem, "%*s %Ld %*s", &uneeded); + fscanf (mem, "%*s %Ld %*s", &uneeded); + fscanf (mem, "%*s %Ld %*s", &cache_total); fscanf (mem, "%*s %Ld %*s", &cache_free); total = total * 1024; mfree = mfree * 1024; + used = total - mfree; buffers = buffers * 1024; cached = cached * 1024; - used = used * 1024; - shared = shared * 1024; cache_total = cache_total * 1024; cache_used = cache_total - (cache_free * 1024); } @@ -192,8 +191,7 @@ mem_delay = 25; /* calculate it */ - my_mem_max = total; - my_swap_max = cache_total; + my_mem_max = cache_total + total; my_mem_used = cache_used + used - cached - buffers; msd.mem_used = my_mem_used; msd.mem_max = my_mem_max; debian/patches/invalid-icon-size-fix0000644000000000000000000000077111732454110014653 0ustar Description: Fix crash with invalid panel app icon size (#337632) Author: Moray Allan Last-Update: 2006-04-22 --- a/src/panel_app.c +++ b/src/panel_app.c @@ -167,7 +167,7 @@ &type, &format, &n_items, &bytes_after, (unsigned char **)&data); - if (result != Success || data == NULL) + if (result != Success || data == NULL || data[0] == 0 || data[1] == 0) { if (data) XFree (data); DBG("%s() failed for %s (XID: %li)\n", __func__, papp->name, papp->win); debian/patches/enable-png0000644000000000000000000000052111732467704012561 0ustar Description: Fix check for enabling PNG support --- a/configure.ac +++ b/configure.ac @@ -160,7 +160,7 @@ dnl ---- Png Support ------------------------------------------------------- -if $PKG_CONFIG --libs libmb | grep png ; then +if $PKG_CONFIG --libs --static libmb | grep png ; then found_png="yes" else found_png="no" debian/mb-applet-clock.10000644000000000000000000000107511706334343012231 0ustar .\" mb-applet-clock.1 .\" Copyright 2004 Moray Allan .TH mb-applet-clock 1 "Jul 17 2004" "" .SH NAME mb-applet-clock \- a clock panel applet .SH SYNOPSIS .B mb-applet-clock .SH DESCRIPTION .B mb-applet-clock is a panel applet which displays the current time. Matchbox is a base environment for the X Window System running on non-desktop embedded platforms such as handhelds, set-top boxes, kiosks and anything else for which screen space, input mechanisms or system resources are limited. .SH AUTHOR .B mb-applet-clock was written by Matthew Allum . debian/copyright0000644000000000000000000000154511706334343011132 0ustar This package was debianised by Moray Allan on Mon, 12 Jul 2004 20:39:00 +0100. It was downloaded from http://matchbox.handhelds.org/sources/ Upstream author: Matthew Allum Copyright: Copyright (C) 2004 Matthew Allum This package 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; version 2 dated June, 1991. This package 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. On Debian GNU/Linux systems, the complete text of the GNU General Public License can be found in '/usr/share/common-licenses/GPL-2'. debian/watch0000644000000000000000000000017011706334343010221 0ustar version=2 http://projects.o-hand.com/matchbox/sources/matchbox-panel/0.9/matchbox-panel-(.*)\.tar.gz \ debian uupdate debian/matchbox-panel.manpages0000644000000000000000000000030711706334343013611 0ustar debian/matchbox-panel.1 debian/mb-applet-battery.1 debian/mb-applet-clock.1 debian/mb-applet-launcher.1 debian/mb-applet-menu-launcher.1 debian/mb-applet-system-monitor.1 debian/mb-applet-wireless.1 debian/matchbox-panel.10000644000000000000000000000305711706334343012163 0ustar .\" matchbox-panel.1 .\" Copyright 2004 Moray Allan .TH matchbox-panel 1 "Jul 17 2004" "" .SH NAME matchbox-panel \- a desktop panel for resource-limited systems .SH SYNOPSIS .B matchbox-panel [\fIoptions\fR] .SH DESCRIPTION .B matchbox-panel is a desktop panel, which can hold small `applets' such as a clock, system monitor and wireless monitor. Matchbox is a base environment for the X Window System running on non-desktop embedded platforms such as handhelds, set-top boxes, kiosks and anything else for which screen space, input mechanisms or system resources are limited. .SH OPTIONS .TP .BI \-display\ display X display to connect to .TP .BI \-geometry\ geometry Use \fB\-\-size\fR/\fB\-\-orientation\fR instead .TP .BI \-\-id\ int Panel number .TP .BI \-\-size\ int ,\ \-s\ int Width/height of panel in pixels .TP .BI \-\-orientation\ north|east|south|west .TP .BI \-\-default\-apps\ app\ list ,\ \-da\ app\ list Comma-separated list of apps to add to a panel when no session starts .TP .BI \-\-margin-start\ +int Initial app offset in pixels (panel start) .TP .BI \-\-margin-end\ +int Initial app offset in pixels (panel end) .TP .B \-\-titlebar Request panel in titlebar .TP .B \-\-no\-session, \-ns Disable automatic session saving .TP .B \-\-no\-menu, \-nm Disable popup menu .TP .B \-\-no\-flip, \-nf Disable automatic panel rotation when display is rotated .TP .B \-\-overide\-bubbles, \-o Set override\-redirect attribute on popup information windows .TP \fB\-\-help\fR help .SH AUTHOR .B matchbox-panel was written by Matthew Allum . debian/mb-applet-battery.10000644000000000000000000000114511706334343012606 0ustar .\" mb-applet-battery.1 .\" Copyright 2008 Moray Allan .TH mb-applet-battery 1 "Mar 24 2008" "" .SH NAME mb-applet-battery \- a battery status panel applet .SH SYNOPSIS .B mb-applet-battery .SH DESCRIPTION .B mb-applet-battery is a panel applet which displays the amount of battery charge remaining. Matchbox is a base environment for the X Window System running on non-desktop embedded platforms such as handhelds, set-top boxes, kiosks and anything else for which screen space, input mechanisms or system resources are limited. .SH AUTHOR .B mb-applet-battery was written by Matthew Allum .