Adding debian version 0.5.7-1. debian/0.5.7-1
authorDaniel Baumann <daniel@debian.org>
Fri, 20 Apr 2012 11:51:00 +0000 (13:51 +0200)
committerDaniel Baumann <daniel@debian.org>
Fri, 20 Apr 2012 11:51:25 +0000 (13:51 +0200)
22 files changed:
debian/README.Debian
debian/README.source [deleted file]
debian/changelog
debian/compat
debian/control
debian/copyright
debian/dirs [deleted file]
debian/docs
debian/lxde-x-terminal-emulator.desktop
debian/lxde-x-www-browser.desktop
debian/lxpanel.hints.5 [new file with mode: 0644]
debian/lxpanel.install
debian/lxpanel.lintian-overrides
debian/lxpanel.manpages [new file with mode: 0644]
debian/patches/10_fix_menu.patch [new file with mode: 0644]
debian/patches/batt_status.patch [deleted file]
debian/patches/configure_desktop_number.patch [new file with mode: 0644]
debian/patches/missing_glades.patch
debian/patches/series
debian/rules
debian/source/options [new file with mode: 0644]
debian/watch

index ec9be18..cf5471e 100644 (file)
@@ -4,7 +4,7 @@
 shutdown/reboot/suspend/hibernate via HAL or gdm
 ------------------------------------------------
  If you use lxpanel without GDM, the logout dialog would have ability
- to shutdown/reboot/suspend/hibernate via HAL support. 
+ to shutdown/reboot/suspend/hibernate via HAL support.
  Make sure your account have powerdev group permission.
  eg: adduser user powerdev
 
diff --git a/debian/README.source b/debian/README.source
deleted file mode 100644 (file)
index 5dde0bf..0000000
+++ /dev/null
@@ -1,58 +0,0 @@
-This package uses quilt to manage all modifications to the upstream
-source.  Changes are stored in the source package as diffs in
-debian/patches and applied during the build.
-
-To configure quilt to use debian/patches instead of patches, you want
-either to export QUILT_PATCHES=debian/patches in your environment
-or use this snippet in your ~/.quiltrc:
-
-    for where in ./ ../ ../../ ../../../ ../../../../ ../../../../../; do
-        if [ -e ${where}debian/rules -a -d ${where}debian/patches ]; then
-                export QUILT_PATCHES=debian/patches
-                break
-        fi
-    done
-
-To get the fully patched source after unpacking the source package, cd to
-the root level of the source package and run:
-
-    quilt push -a
-
-The last patch listed in debian/patches/series will become the current
-patch.
-
-To add a new set of changes, first run quilt push -a, and then run:
-
-    quilt new <patch>
-
-where <patch> is a descriptive name for the patch, used as the filename in
-debian/patches.  Then, for every file that will be modified by this patch,
-run:
-
-    quilt add <file>
-
-before editing those files.  You must tell quilt with quilt add what files
-will be part of the patch before making changes or quilt will not work
-properly.  After editing the files, run:
-
-    quilt refresh
-
-to save the results as a patch.
-
-Alternately, if you already have an external patch and you just want to
-add it to the build system, run quilt push -a and then:
-
-    quilt import -P <patch> /path/to/patch
-    quilt push -a
-
-(add -p 0 to quilt import if needed). <patch> as above is the filename to
-use in debian/patches.  The last quilt push -a will apply the patch to
-make sure it works properly.
-
-To remove an existing patch from the list of patches that will be applied,
-run:
-
-    quilt delete <patch>
-
-You may need to run quilt pop -a to unapply patches first before running
-this command.
index d113596..1374cb0 100644 (file)
@@ -1,21 +1,71 @@
+lxpanel (0.5.7-1) unstable; urgency=low
+
+  * Use debhelper 8
+  * Sorting build-depends.
+  * Wapping build-depends.
+  * Bumped Standard-Version to 3.9.2.
+  * Updating Vcs-Browser and Vcs-Git tags.
+  * Sorting depends.
+  * Removing useless whitespaces at EOL and EOF.
+  * Removing debian/dirs: let upstream makefile do the work.
+  * Removing empty NEWS in debian/docs.
+  * Removing debian/README.source: source format 3.0 (quilt) explains.
+  * Enable dh_auto_test in debian/rules.
+  * Compacting watch file.
+  * Added debian/source/options file.
+  * Merging upstream version 0.5.7:
+    (Cloese: #586352, #631263, #609909, #598824, #588532, #608419)
+    - Fix usage of GtkAllocation
+    - Generate the po/LINGUAS on build time
+    - Apply patch from Debian to fix battery plugin display
+    - Some fixes for GTK3 building
+    - Add flags for GTK3 migration
+    - Add missing X11 to the linker
+    - Use only .ui files instead of glade files
+    - Fix brown bag off-by-one in timer setting exposed by once-per-minute
+      update (Bug3124474)
+    - Battery percentage incorrectly always evaluates as
+      100 percent (Bug3006059)
+    - Fix build issue with symbol "alarm" showing up on F14 (Bug3033293)
+  * FIx escription synopsis starts with article.
+  * Drop batt_status.patch: included in upstream.
+  * Removing useless override_dh_auto_clean in rules file.
+  * Disabling override_dh_auto_test in rules file: check failed in po/.
+  * Use linux-any instead of hardcoded list in control file. (Closes: #634319)
+  * Add [pt_BR] keys in lxde-x-terminal-emulator.desktop
+    and lxde-x-www-browser.desktop. (Closes: 607076)
+    Thanks Sérgio Cipolla <secipolla@gmail.com>.
+  * Add [zh_TW] keys lxde-x-www-browser.desktop.
+  * Added lxpanel.hints.5 from
+    Mats Erik Andersson <mats.andersson@gisladisker.se>. (Closes: #601871)
+  * Apply configure_desktop_number.patch: configuration for
+    desktop number for the pager plugin. (Closes: #608421)
+    Thanks Artur Rona <ari-tczew@tlen.pl>.
+  * Drop redefine-alarm-variable.patch: included in upstream.
+  * Refresh configure_desktop_number.patch.
+  * Refresh missing_glades.patch.
+  * Apply 10_fix_menu.patch: Fix crash on menu plugin. From Julien Lavergne.
+
+ -- Andrew Lee (李健秋) <ajqlee@debian.org>  Fri, 29 Jul 2011 18:22:30 +0800
+
 lxpanel (0.5.6-1) unstable; urgency=low
 
-  * New upstream release (Closes:#555575, #577599, #581980) 
+  * New upstream release (Closes:#555575, #577599, #581980)
     - Reduced unnecessary flickers during resizing icon grid
-    - Fixed uninitialized variable that causes initial panel color 
+    - Fixed uninitialized variable that causes initial panel color
       selector to be wrong
     - Fixed unlikely memory leak in taskbar icon fetch
     - Change alpha default to fully opaque
     - Fixed failure to install CPU Frequency plugin icon
-    - Fixed failure to react to keyboard map changes initiated outside 
+    - Fixed failure to react to keyboard map changes initiated outside
       the plugin
     - Honor Terminal=true in menu and launchbar
     - Implemented lxpanelctl config command
     - Improved clock poll interval for format strings that do not change
       every second
-    - Fixed conditions where on-disk configuration was not in sync with 
+    - Fixed conditions where on-disk configuration was not in sync with
       actual configuration
-    - Replaced show_all with show on toplevel to avoid situation where 
+    - Replaced show_all with show on toplevel to avoid situation where
       plugin loses control of children's visibility
     - Fixed 64-bit clean regressions
     - Fixed some issues with urgency notification
@@ -26,7 +76,7 @@ lxpanel (0.5.6-1) unstable; urgency=low
     - Fixed endianness clean issue in lxpanelctl
     - Fixed segfault if g_locale_to_utf8 fails
     - Fixed handling of "visible" flag in icon_grid_add
-    - Fixed crash following deleting a plugin from the right-click popup 
+    - Fixed crash following deleting a plugin from the right-click popup
       with the configuration dialog open
     - Fixed misoperation when symbol string does not have "+inet(evdev)"
     - Forced group number value into valid range after Xkb query
@@ -34,22 +84,22 @@ lxpanel (0.5.6-1) unstable; urgency=low
     - Fixed buffer overflow in panel_draw_label_text
     - Fixed crash when reconfiguring after tray selection failed
     - Workaround for popup positioning
-    - Fixed CPUFreq plugin 
-    - Changed behavior of strut in Autohide case 
+    - Fixed CPUFreq plugin
+    - Changed behavior of strut in Autohide case
   * Drop patches that included in upstream:
-    - g_locale_to_utf8.patch 
-    - kbled.patch libtool-fix.patch 
-    - panel_draw_label_text.patch 
-    - sort_dirmenu.patch 
-  * Applied redefine-alarm-variable.patch (Closes:#583986) from 
+    - g_locale_to_utf8.patch
+    - kbled.patch libtool-fix.patch
+    - panel_draw_label_text.patch
+    - sort_dirmenu.patch
+  * Applied redefine-alarm-variable.patch (Closes:#583986) from
     Julien Lavergne <gilir@ubuntu.com>
-  * Bumped Standard-version to 3.9.1 
+  * Bumped Standard-version to 3.9.1
 
  -- Andrew Lee (李健秋) <ajqlee@debian.org>  Wed, 28 Jul 2010 16:12:08 -0400
 
 lxpanel (0.5.5-4) unstable; urgency=high
 
-  * Added some backport patches to close bugs on BTS and fix a potential 
+  * Added some backport patches to close bugs on BTS and fix a potential
     buffer overflow problem.
     - sort_dirmenu.patch - sort directory menu (Closes:#493256)
     - batt_status.patch - battery status display (Closes:#580509)
@@ -73,7 +123,7 @@ lxpanel (0.5.5-2) unstable; urgency=low
   * debian/control:
     - Build-depends on libiw-dev for linux only. (Closes:#565636)
     - Build-depends on new libmenu-cache
-  * Applied backport g_locale_to_utf8.patch from upstream to 
+  * Applied backport g_locale_to_utf8.patch from upstream to
     preven crashes. (Closes:#572944)
   * Switch to dpkg-source 3.0 (quilt) format
 
@@ -86,7 +136,7 @@ lxpanel (0.5.5-1) unstable; urgency=low
     - Configuration dialog of launchbar applet become much faster. (quite
       prominent)
     - Translations update
-    - Several minor bug fixes 
+    - Several minor bug fixes
     - Fixed crash problem with libmenu-cache >= 0.3.1
   * Updated upstream url to http://lxde.org
   * Bumped Standard-version to 3.8.4
@@ -97,10 +147,10 @@ lxpanel (0.5.4.1-1) unstable; urgency=low
 
   * New upstream release (Closes: #493253, #534222, #548333, #560843)
     - Fixed crash problem on creating new panel
-    - Fixed segfault when battery is not exist 
-    - Use _NET_SHOWING_DESKTOP to toggle the desktop efficiently in wincmd 
+    - Fixed segfault when battery is not exist
+    - Use _NET_SHOWING_DESKTOP to toggle the desktop efficiently in wincmd
       applet when available
-    - Better checks for EWMH compliant window managers 
+    - Better checks for EWMH compliant window managers
     - Fixed cpufreq plugin, thermal plugin (Closes: #535568)
     - Support recognizing current DE with $XDG_CURRENT_DESKTOP
     - Fixed string format warning in src/misc.c
@@ -131,11 +181,11 @@ lxpanel (0.5.2-1) experimental; urgency=low
   * New upstream release
     - Fixed "Run" dialog hangs problem.
     - Restored the old behavior of taskbar in earlier versions
-    - Hided signal strength display in the icon of the netstatus applet 
+    - Hided signal strength display in the icon of the netstatus applet
       if the monitored iface is not wireless.
-    - Improved application launcher, Available apps are now categorized 
+    - Improved application launcher, Available apps are now categorized
       as they are in applications menu.
-    - The class name of the desktop panels are now changed to 
+    - The class name of the desktop panels are now changed to
       "PanelToplevel". This is compatible with gnome and can be used by
       theme authors to distinguish the panel widgets from others.
     - Reduced program size.
@@ -158,13 +208,13 @@ lxpanel (0.5.0-1) experimental; urgency=low
     - Switch desktop on taskbar button Click and Raise (Bug2028953)
     - Keyboard equivalents on taskbar popup submenu (FR2781949)
     - Repaired bad function signature on focus-out callback
-    - Rewrited WM_STRUT setting so it doesn't update the property 
+    - Rewrited WM_STRUT setting so it doesn't update the property
       unless it changed
     - Fixed the panel transparency colorbox
     - Fixed CPU plugin loses context on a relayout (Patch 2800828, song6song)
     - Added autohide
     - Rewrote battery backend code (based on Linux acpi 1.4)
-    - Added scroll wheel on main icon to adjust volume and middle-click 
+    - Added scroll wheel on main icon to adjust volume and middle-click
       on main icon to adjust mute
     - Use Docbook-XML instead of SGML
     - Added --enable-man for manpage regeneration
@@ -198,29 +248,29 @@ lxpanel (0.4.1+svn20090524-2) unstable; urgency=low
 
 lxpanel (0.4.1+svn20090524-1) unstable; urgency=low
 
-  * New upstream release (Closes: #516603, #511001, #493242, #486284, 
+  * New upstream release (Closes: #516603, #511001, #493242, #486284,
     #515633, #484606, #495924, #517858)
-    - A whole new application menu generated according to 
-      freedesktop.org menu spec. (faster and more standard-compliant. 
+    - A whole new application menu generated according to
+      freedesktop.org menu spec. (faster and more standard-compliant.
       has tooltips for menu items)
     - Enhanced "Run" dialog.
-    - Auto resize of application launcher buttons when panel size gets 
+    - Auto resize of application launcher buttons when panel size gets
       changed.
-    - The problematic netstat plugin is now turned off by default. It 
+    - The problematic netstat plugin is now turned off by default. It
       will be moved to a separate project later.
-    - Building dynamic panel plugins outside the source tree of lxpanel 
+    - Building dynamic panel plugins outside the source tree of lxpanel
       is now possible.
     - Fix icon display problems under 64-bit systems.
-    - Fixes to work with minimization animation provided by window 
+    - Fixes to work with minimization animation provided by window
       manager.
     - Fix RTL problems of the task list.
     - Launch console applications in terminal properly
     - Add new temperature monitor plugin by Daniel Kesler
-    - Size of icons now can automatically be automatically adjusted 
+    - Size of icons now can automatically be automatically adjusted
       according to the height of the panel.
   * debian/control:
     - Build-depends on libmenu-cache0
-    - lxpanel-netstat-plugin become a dummy package to help transition 
+    - lxpanel-netstat-plugin become a dummy package to help transition
       to wicd or network-manage package.
     - Update descriptions. Thanks Phil Miller <phildebian@mailinator.com>
       (Closes: #513009)
@@ -259,7 +309,7 @@ lxpanel (0.3.7-1) unstable; urgency=low
       modified.
   * Bumped Standards-Version to 3.8.0.0
     - Supporting the standardized environment variable `DEB_BUILD_OPTIONS'
-  * Package split for lxpanel-netstat-plugin 
+  * Package split for lxpanel-netstat-plugin
 
  -- Andrew Lee <andrew@linux.org.tw>  Mon, 09 Jun 2008 16:05:48 +0800
 
@@ -290,10 +340,10 @@ lxpanel (0.3.6-1) unstable; urgency=low
     netstat plugin: improve and fix some bugs for Wireless AP Scanning
     netstat plugin: fixed a lot of crashes.
     netstat plugin: hidden AP with encryption will not display
-    netstat plugin: improving IE information handler to support WPA/WPA2 
+    netstat plugin: improving IE information handler to support WPA/WPA2
   * Added lintian-overrides
-  * Suggests: lxnm 
-  * Minor fix in debian/copyright 
+  * Suggests: lxnm
+  * Minor fix in debian/copyright
 
  -- Andrew Lee <andrew@linux.org.tw>  Thu, 29 May 2008 15:52:52 +0800
 
index 7f8f011..45a4fb7 100644 (file)
@@ -1 +1 @@
-7
+8
index 3d90f59..14b75f1 100644 (file)
@@ -3,18 +3,22 @@ Section: x11
 Priority: optional
 Maintainer: Debian LXDE Packaging Team <pkg-lxde-maintainers@lists.alioth.debian.org>
 Uploaders: Andrew Lee (李健秋) <ajqlee@debian.org>
-Build-Depends: debhelper (>= 7.0.50~), autotools-dev, intltool, intltool-debian, libgtk2.0-dev (>=2.6), libglib2.0-dev (>=2.10), libxmu-dev, libxpm-dev, libiw-dev [!kfreebsd-i386 !kfreebsd-amd64], libasound2-dev, libmenu-cache1-dev (>=0.3.2), docbook-xml, docbook-xsl, xsltproc, python
-Standards-Version: 3.9.1
+Build-Depends:
+ debhelper (>= 8), autotools-dev, docbook-xml, docbook-xsl, intltool,
+ intltool-debian, libasound2-dev, libglib2.0-dev (>=2.10),
+ libgtk2.0-dev (>=2.6), libiw-dev [linux-any],
+ libmenu-cache1-dev (>=0.3.2), libxpm-dev, python, xsltproc
+Standards-Version: 3.9.2
 Homepage: http://lxde.org
-Vcs-Git: git://git.debian.org/git/collab-maint/lxpanel.git
-Vcs-Browser: http://git.debian.org/?p=collab-maint/lxpanel.git;a=summary
+Vcs-Git: git://git.debian.org/git/pkg-lxde/lxpanel.git
+Vcs-Browser: http://git.debian.org/?p=pkg-lxde/lxpanel.git
 
 Package: lxpanel
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, lxmenu-data
+Depends: ${misc:Depends}, ${shlibs:Depends}, lxmenu-data
 Recommends: manpages-dev
 Suggests: lxsession-lite (>=0.3.5) | lxsession (>=0.3.2) | menu, www-browser
-Description: lightweight desktop panel for X
+Description: lightweight desktop panel for X
  LXPanel is a lightweight GTK+2 desktop panel derived from fbpanel. Its
  features include:
   * User-friendly application menu automatically generated from .desktop
index d5fb88d..00abfc0 100644 (file)
@@ -3,7 +3,7 @@ Thu, 21 Feb 2008 21:21:11 +0800.
 
 It was downloaded from http://sourceforge.net/projects/lxde/
 
-Upstream Authors and Copyright Holders: 
+Upstream Authors and Copyright Holders:
 
     Hong Jen Yee (PCMan)  <pcman.tw@gmail.com>
     Jim Huang  <jserv.tw@gmail.com>
@@ -61,7 +61,7 @@ License:
 
     You should have received a copy of the GNU General Public License
     along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 
+    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
     02110-1301, USA.
 
 The Debian packaging is (C) 2008, Andrew Lee <andrew@linux.org.tw> and
diff --git a/debian/dirs b/debian/dirs
deleted file mode 100644 (file)
index e772481..0000000
+++ /dev/null
@@ -1 +0,0 @@
-usr/bin
index 50bd824..e845566 100644 (file)
@@ -1,2 +1 @@
-NEWS
 README
index 8e62b84..42294c4 100644 (file)
@@ -2,11 +2,14 @@
 Encoding=UTF-8
 Version=1.0
 Name=Terminal emulator
+Name[pt_BR]=Emulador de terminal
 Name[zh_CN]=终端
 Name[zh_TW]=終端機
 Comment=Terminal Emulator
+Comment[pt_BR]=Emulador de terminal
 Comment[zh_TW]=終端機程式
 GenericName=Terminal Emulator
+GenericName[pt_BR]=Emulador de terminal
 GenericName[zh_TW]=終端機程式
 Exec=/usr/bin/x-terminal-emulator
 Icon=terminal
index 93ab868..2320126 100644 (file)
@@ -1,7 +1,11 @@
 [Desktop Entry]
 Encoding=UTF-8
 Name=Web Browser
+Name[pt_BR]=Navegador web
+Name[zh_TW]=瀏覽器
 GenericName=X Web Browser
+GenericName[pt_BR]=Navegador web gráfico
+GenericName[zh_TW]=網頁瀏覽器
 Exec=/usr/bin/x-www-browser %u
 Terminal=false
 Type=Application
diff --git a/debian/lxpanel.hints.5 b/debian/lxpanel.hints.5
new file mode 100644 (file)
index 0000000..43abc26
--- /dev/null
@@ -0,0 +1,279 @@
+.\" Information collected from source code
+.TH lxpanel.hints 5 "October 2010" "M E Andersson" ""
+
+.SH Name
+lxpanel.hints \- Configuration hints for lxpanel plugins
+
+.SH Description
+.PP
+This text collects some background information for configuration
+of plugins available for \fBlxpanel\fR(1).
+.PP
+The templates below use keywords \fIboolean\fR, \fIinteger\fR,
+and \fIstring\fR to denote the expected type of value for each
+instance.  A few exceptions below are using explicit values in
+order to clearify the common usage.
+.
+The plugins are introduced by name in a semi-random fashion.
+In practice a mixture of different stanzas \fIPlugin\fR are
+written in the order that they are to produce in the actual
+panel on the desktop.
+.
+.SH Available plugins
+.
+.P
+.B menu
+.IP
+Plugin {
+    type = menu
+    Config {
+        name = \fIstring\fR
+        image = \fIstring\fR
+
+        system {
+        }
+
+        separator {
+        }
+
+        item {
+            command = \fIstring\fR
+            image = \fIstring\fR
+        }
+    }
+.br
+}
+
+.P
+.B dirmenu
+.IP
+Plugin {
+    type = dirmenu
+    Config {
+        name = \fIstring\fR
+        image = \fIstring\fR
+        path = \fIstring\fR
+    }
+.br
+}
+
+.P
+.B taskbar
+.IP
+Plugin {
+    type = taskbar
+
+    expand = \fIinteger\fR
+    Config {
+        tooltips = \fIboolean\fR
+        IconsOnly = \fIboolean\fR
+        ShowAllDeska = \fIboolean\fR
+        UseMouseWheel = \fIboolean\fR
+        UseUrgencyHint = \fIboolean\fR
+        FlatButton = \fIboolean\fR
+        GroupedTasks = \fIboolean\fR
+        MaxTaskWidth = \fIinteger\fR
+        spacing = \fIinteger\fR
+    }
+.br
+}
+
+.P
+.B launchbar
+.IP
+Plugin {
+    type = launchbar
+    Button {
+        id = \fIstring\fR
+        image = \fIstring\fR
+        tooltip = \fIstring\fR
+        action = \fIstring\fR
+        terminal = \fIboolean\fR
+    }
+    Button {
+        id = lxde-logout.desktop
+    }
+.br
+}
+
+.P
+.B wincmd
+.IP
+Plugin {
+    type = wincmd
+    Config {
+        image = \fIstring\fR
+        Button1 = \fIstring\fR
+        Button2 = \fIstring\fR
+        Toggle = \fIstring\fR
+    }
+.br
+}
+
+.P
+.B space
+.IP
+Plugin {
+    type = space
+    Config {
+        Size = \fIinteger\fR
+    }
+.br
+}
+
+.P
+.B pager
+.IP
+Plugin {
+    type = pager
+.br
+}
+
+.P
+.B batt
+.IP
+Plugin {
+    type = batt
+    Config {
+        HideIfNoBattery = bool
+        AlarmCommand = \fIstring\fR
+        AlarmTime = \fIinteger\fR
+        BorderWidth = \fIinteger\fR
+        Size = \fIinteger\fR
+        BackgroundColor = \fIstring\fR
+        ChargingColor1 = \fIstring\fR
+        ChargingColor2 = \fIstring\fR
+        DischargingColor1 = \fIstring\fR
+        DischargingColor2 = \fIstring\fR
+    }
+.br
+}
+
+.P
+.B kbled
+.IP
+Plugin {
+    type = kbled
+    Config {
+        ShowCapsLock = \fIinteger\fR
+        ShowNumLock = \fIinteger\fR
+        ShowScrollLock = \fIinteger\fR
+    }
+.br
+}
+
+.P
+.B dclock
+.IP
+Plugin {
+    type = dclock
+    Config {
+        ClockFmt = \fIstring\fR
+        TooltipFmt = \fIstring\fR
+        Action = \fIstring\fR
+        BoldFont = \fIinteger\fR
+        IconOnly = \fIinteger\fR
+    }
+.br
+}
+
+.P
+.B cpu
+.IP
+Plugin {
+    type = cpu
+.br
+}
+
+.P
+.B cpufreq
+.IP
+Plugin {
+    type = cpufreq
+    Config {
+        Frequency = \fIinteger\fR
+        Governor = \fIstring\fR
+        Remember = \fIboolean\fR
+    }
+.br
+}
+
+.P
+.B thermal
+.IP
+Plugin {
+    type = thermal
+    Config {
+        NormalColor = \fIstring\fR
+        Warning1Color = \fIstring\fR
+        Warning2Color = \fIstring\fR
+        Sensor = \fIstring\fR
+        CustomLevels = \fIinteger\fR
+        Warning1Temp = \fIinteger\fR
+        Warning2Temp = \fIinteger\fR
+        AutomaticSensor = \fIinteger\fR
+    }
+.br
+}
+
+.P
+.B deskno
+.IP
+Plugin {
+    type = deskno
+    Config {
+        BoldFont = \fIinteger\fR
+        WMLabels = \fIinteger\fR
+    }
+.br
+}
+
+.P
+.B netstatus
+.IP
+Plugin {
+    type = netstatus
+    Config {
+        iface = \fIstring\fR
+        configtool = \fIstring\fR
+    }
+.br
+}
+
+.P
+.B xkb
+.IP
+Plugin {
+    type = xkb
+    Config {
+        DisplayType = \fIinteger\fR
+        PerAppLayout = \fIinteger\fR
+        DefaultGroup = \fIinteger\fR
+    }
+.br
+}
+.
+.SH "Configuration files"
+.
+.TP
+\fI~/.config/lxpanel/"profile-name"/panels/panel\fR
+User specific panel specification. The name of the panel
+is passed to \fBlxpanel\fR using the switch '--profile'.
+.
+.TP
+\fI/usr/share/lxpanel/profile/"profile-name"/panels/panel\fR
+.
+.TP
+\fI/usr/share/lxpanel/profile/default/panels/panel\fR
+.
+.SH See also
+\fBlxpanel\fR(1), \fBlxpanelctl\fR(1)
+.SH Bugs
+There ought to be some.  Do point them out!
+The Debian package maintainer will take necessary
+steps and actions.
+
+.SH Author
+This text was compiled for Debian GNU/Linux by Mats Erik Andersson.
+It may be used also by others, but the text underlies the same
+licensing as \fBlxpanel\fR itself does.
index 1a9d198..232f275 100644 (file)
@@ -1,3 +1,3 @@
 debian/lxde-x-terminal-emulator.desktop usr/share/applications
 debian/lxde-x-www-browser.desktop usr/share/applications
-debian/lxpanel.lintian-overrides usr/share/lintian/overrides 
+debian/lxpanel.lintian-overrides usr/share/lintian/overrides
index d6f4a9f..14d319a 100644 (file)
@@ -1,5 +1,6 @@
 #
 # The desktop-command-not-in-package bacause that's alternatives command.
 #
-lxpanel: desktop-command-not-in-package /usr/share/applications/lxde-x-www-browser.desktop /usr/bin/x-www-browser
-lxpanel: desktop-command-not-in-package /usr/share/applications/lxde-x-terminal-emulator.desktop /usr/bin/x-terminal-emulator
+lxpanel: desktop-command-not-in-package usr/share/applications/lxde-x-terminal-emulator.desktop usr/bin/x-terminal-emulator
+lxpanel: desktop-command-not-in-package usr/share/applications/lxde-x-www-browser.desktop usr/bin/x-www-browser
+
diff --git a/debian/lxpanel.manpages b/debian/lxpanel.manpages
new file mode 100644 (file)
index 0000000..56ef64a
--- /dev/null
@@ -0,0 +1 @@
+debian/lxpanel.hints.5
diff --git a/debian/patches/10_fix_menu.patch b/debian/patches/10_fix_menu.patch
new file mode 100644 (file)
index 0000000..01aad3e
--- /dev/null
@@ -0,0 +1,25 @@
+commit 200121f93d7c6ac9aadb53c58f45906ecd1e3b7a
+Author: Julien Lavergne <julien.lavergne@gmail.com>
+Date:   Sun Jul 24 15:43:24 2011 +0200
+
+    Fix usage of GtkRequisition
+
+diff --git a/src/plugins/menu.c b/src/plugins/menu.c
+index 59a8dad..6d0ad9c 100644
+--- a/src/plugins/menu.c
++++ b/src/plugins/menu.c
+@@ -142,10 +142,10 @@ menu_pos(GtkMenu *menu, gint *x, gint *y, gboolean *push_in, GtkWidget *widget)
+     gdk_window_get_origin(widget->window, &ox, &oy);
+ #endif
+ #if GTK_CHECK_VERSION(2,20,0)
+-    GtkRequisition *requisition;
+-    gtk_widget_get_requisition(GTK_WIDGET(menu),requisition);
+-    w = requisition->width;
+-    h = requisition->height;
++    GtkRequisition requisition;
++    gtk_widget_get_requisition(GTK_WIDGET(menu), &requisition);
++    w = requisition.width;
++    h = requisition.height;
+ #else
+     w = GTK_WIDGET(menu)->requisition.width;
diff --git a/debian/patches/batt_status.patch b/debian/patches/batt_status.patch
deleted file mode 100644 (file)
index 20f6e63..0000000
+++ /dev/null
@@ -1,49 +0,0 @@
-diff -ur lxpanel-0.5.5-orig//src/plugins/batt/batt_sys.c lxpanel-0.5.5//src/plugins/batt/batt_sys.c
---- lxpanel-0.5.5-orig//src/plugins/batt/batt_sys.c    2010-02-06 20:45:38.000000000 +0100
-+++ lxpanel-0.5.5//src/plugins/batt/batt_sys.c 2010-05-06 14:02:29.000000000 +0200
-@@ -38,6 +38,13 @@
- battery* battery_new() {
-     static int battery_num = 1;
-     battery * b = g_new0 ( battery, 1 );
-+    battery_reset(b);
-+    b->battery_num = battery_num;
-+    battery_num++;
-+    return b;
-+}
-+
-+void battery_reset( battery * b) {
-     b->type_battery = TRUE;
-     b->capacity_unit = "mAh";
-     b->last_capacity_unit = -1;
-@@ -49,12 +56,8 @@
-     b->remaining_capacity = -1;
-     b->present_rate = -1;
-     b->state = NULL;
--    b->battery_num = battery_num;
--    battery_num++;
--    return b;
- }
--
- static gchar* parse_info_file(char *filename)
- {
-     char *buf = NULL;
-@@ -136,6 +139,8 @@
-     };
-     const gchar *sys_file;
-+    battery_reset(b);
-+
-     while ( (sys_file = sys_list[i]) != NULL ) {
-     
-       gchar *file_content;
-@@ -150,7 +155,7 @@
-                   b->state = "available";
-           }
-           else if ( strcmp("energy_now", sys_file ) == 0 ) {
--              b->remaining_capacity = get_unit_value((gchar*) file_content) / 1000;
-+              b->remaining_energy = get_unit_value((gchar*) file_content) / 1000;
-               if (!b->state)
-                   b->state = "available";
-           }
-
diff --git a/debian/patches/configure_desktop_number.patch b/debian/patches/configure_desktop_number.patch
new file mode 100644 (file)
index 0000000..10ab7b7
--- /dev/null
@@ -0,0 +1,95 @@
+Description: Add configuration for desktop number for the pager plugin.
+Author: Julien Lavergne <gilir@ubuntu.com>
+
+--- a/src/plugins/pager.c
++++ b/src/plugins/pager.c
+@@ -811,6 +811,80 @@
+     g_free(pg);
+ }
++/* Callback when the configuration dialog is to be shown. */
++static void deskno_configure(Plugin * p, GtkWindow * parent)
++{
++
++    GdkScreen *screen = gdk_screen_get_default();
++    const char *wm_name = gdk_x11_screen_get_window_manager_name(screen);
++    GError *error = NULL;
++    const gchar *command_line = NULL;
++
++    if(g_strcmp0(wm_name, "Openbox") == 0)
++    {
++        if (g_find_program_in_path("obconf"))
++        {
++            command_line = "obconf --tab 6";
++        }
++    }
++    else if (g_strcmp0(wm_name, "compiz") == 0)
++    {
++         if (g_find_program_in_path("ccsm"))
++         {
++              command_line = "ccsm";
++
++         }
++         else if (g_find_program_in_path("simple-ccsm"))
++         {
++              command_line = "simple-ccsm";
++         }
++    }
++    else
++    {
++    
++        GtkWidget* msg;
++
++        msg = gtk_message_dialog_new( NULL, 
++                                      0, 
++                                      GTK_MESSAGE_ERROR, 
++                                      GTK_BUTTONS_OK, 
++                                      _("Error, only openbox and compiz are supported") );
++        gtk_dialog_run( GTK_DIALOG(msg) );
++        gtk_widget_destroy( msg );
++    
++    }
++
++    if (command_line)
++    {
++        gdk_spawn_command_line_on_screen(screen,
++                                         command_line,
++                                         &error);
++    }
++
++    else
++    {
++    
++        GtkWidget* msg;
++
++        msg = gtk_message_dialog_new( NULL, 
++                                      0, 
++                                      GTK_MESSAGE_ERROR, 
++                                      GTK_BUTTONS_OK, 
++                                      _("Error, you need to install obconf, ccsm of simple-ccsm") );
++        gtk_dialog_run( GTK_DIALOG(msg) );
++        gtk_widget_destroy( msg );
++    
++    }
++
++      if (error)
++      {
++          g_print("%s\n", error->message);
++              
++              g_free (error);
++    }
++
++}
++
+ /* Callback when panel configuration changes. */
+ static void pager_panel_configuration_changed(Plugin * p)
+ {
+@@ -836,7 +910,7 @@
+     constructor : pager_constructor,
+     destructor  : pager_destructor,
+-    config : NULL,
++    config : deskno_configure,
+     save : NULL,
+     panel_configuration_changed : pager_panel_configuration_changed
+ };
index ceab53a..02f6664 100644 (file)
@@ -1,6 +1,5 @@
-diff -urN lxpanel-0.5.5-orig/data/ui/launchbar.glade lxpanel-0.5.5/data/ui/launchbar.glade
---- lxpanel-0.5.5-orig/data/ui/launchbar.glade 1970-01-01 01:00:00.000000000 +0100
-+++ lxpanel-0.5.5/data/ui/launchbar.glade      2010-05-11 13:07:36.000000000 +0200
+--- /dev/null
++++ b/data/ui/launchbar.glade
 @@ -0,0 +1,196 @@
 +<?xml version="1.0"?>
 +<interface>
@@ -198,14 +197,12 @@ diff -urN lxpanel-0.5.5-orig/data/ui/launchbar.glade lxpanel-0.5.5/data/ui/launc
 +    </action-widgets>
 +  </object>
 +</interface>
-diff -urN lxpanel-0.5.5-orig/data/ui/launchbar.ui lxpanel-0.5.5/data/ui/launchbar.ui
---- lxpanel-0.5.5-orig/data/ui/launchbar.ui    2010-02-15 02:03:08.000000000 +0100
-+++ lxpanel-0.5.5/data/ui/launchbar.ui 1970-01-01 01:00:00.000000000 +0100
+--- a/data/ui/launchbar.ui
++++ /dev/null
 @@ -1 +0,0 @@
 -<?xml version="1.0"?><interface><object class="GtkListStore" id="defined_store"><columns><column type="GdkPixbuf"/><column type="gchararray"/><column type="gchararray"/><column type="gpointer"/></columns></object><object class="GtkTreeStore" id="menu_store"><columns><column type="GdkPixbuf"/><column type="gchararray"/><column type="gchararray"/><column type="gpointer"/></columns></object><object class="GtkDialog" id="dlg"><property name="border_width">10</property><property name="title" translatable="yes">Application Launch Bar</property><property name="default_width">640</property><property name="default_height">400</property><property name="type_hint">normal</property><property name="has_separator">False</property><child internal-child="vbox"><object class="GtkVBox" id="dialog-vbox"><property name="visible">True</property><property name="orientation">vertical</property><property name="spacing">6</property><child><object class="GtkHBox" id="hbox1"><property name="visible">True</property><property name="spacing">12</property><child><object class="GtkScrolledWindow" id="scroll1"><property name="visible">True</property><property name="can_focus">True</property><property name="hscrollbar_policy">automatic</property><property name="vscrollbar_policy">automatic</property><property name="shadow_type">etched-in</property><child><object class="GtkTreeView" id="defined_view"><property name="visible">True</property><property name="can_focus">True</property><property name="model">defined_store</property><property name="search_column">1</property><child><object class="GtkTreeViewColumn" id="defined_col"><property name="title">Applications</property><property name="expand">True</property></object></child></object></child></object><packing><property name="position">0</property></packing></child><child><object class="GtkVBox" id="vbox1"><property name="visible">True</property><property name="orientation">vertical</property><property name="spacing">6</property><child><object class="GtkButton" id="add"><property name="label">gtk-add</property><property name="visible">True</property><property name="can_focus">True</property><property name="receives_default">True</property><property name="use_stock">True</property></object><packing><property name="expand">False</property><property name="position">0</property></packing></child><child><object class="GtkButton" id="remove"><property name="label">gtk-remove</property><property name="visible">True</property><property name="can_focus">True</property><property name="receives_default">True</property><property name="use_stock">True</property></object><packing><property name="expand">False</property><property name="position">1</property></packing></child><child><object class="GtkButton" id="up"><property name="label">gtk-go-up</property><property name="visible">True</property><property name="can_focus">True</property><property name="receives_default">True</property><property name="use_stock">True</property></object><packing><property name="expand">False</property><property name="position">2</property></packing></child><child><object class="GtkButton" id="down"><property name="label">gtk-go-down</property><property name="visible">True</property><property name="can_focus">True</property><property name="receives_default">True</property><property name="use_stock">True</property></object><packing><property name="expand">False</property><property name="position">3</property></packing></child></object><packing><property name="expand">False</property><property name="position">1</property></packing></child><child><object class="GtkScrolledWindow" id="scroll2"><property name="visible">True</property><property name="can_focus">True</property><property name="hscrollbar_policy">automatic</property><property name="vscrollbar_policy">automatic</property><property name="shadow_type">etched-in</property><child><object class="GtkTreeView" id="menu_view"><property name="visible">True</property><property name="can_focus">True</property><property name="model">menu_store</property><property name="search_column">1</property><child><object class="GtkTreeViewColumn" id="menu_col"><property name="title">Available Applications</property><property name="expand">True</property></object></child></object></child></object><packing><property name="position">2</property></packing></child></object><packing><property name="position">1</property></packing></child><child internal-child="action_area"><object class="GtkHButtonBox" id="dialog-action_area"><property name="visible">True</property><property name="layout_style">end</property><child><object class="GtkButton" id="close"><property name="label">gtk-close</property><property name="visible">True</property><property name="can_focus">True</property><property name="receives_default">True</property><property name="use_stock">True</property></object><packing><property name="expand">False</property><property name="fill">False</property><property name="position">0</property></packing></child></object><packing><property name="expand">False</property><property name="pack_type">end</property><property name="position">0</property></packing></child></object></child><action-widgets><action-widget response="-7">close</action-widget></action-widgets></object></interface>
-diff -urN lxpanel-0.5.5-orig/data/ui/netstatus.glade lxpanel-0.5.5/data/ui/netstatus.glade
---- lxpanel-0.5.5-orig/data/ui/netstatus.glade 1970-01-01 01:00:00.000000000 +0100
-+++ lxpanel-0.5.5/data/ui/netstatus.glade      2010-05-11 13:07:36.000000000 +0200
+--- /dev/null
++++ b/data/ui/netstatus.glade
 @@ -0,0 +1,839 @@
 +<?xml version="1.0"?>
 +<interface>
@@ -1046,14 +1043,12 @@ diff -urN lxpanel-0.5.5-orig/data/ui/netstatus.glade lxpanel-0.5.5/data/ui/netst
 +    </action-widgets>
 +  </object>
 +</interface>
-diff -urN lxpanel-0.5.5-orig/data/ui/netstatus.ui lxpanel-0.5.5/data/ui/netstatus.ui
---- lxpanel-0.5.5-orig/data/ui/netstatus.ui    2010-02-14 08:13:46.000000000 +0100
-+++ lxpanel-0.5.5/data/ui/netstatus.ui 1970-01-01 01:00:00.000000000 +0100
+--- a/data/ui/netstatus.ui
++++ /dev/null
 @@ -1 +0,0 @@
 -<?xml version="1.0"?><interface><requires lib="gtk+" version="2.16"/><object class="GtkDialog" id="network_status_dialog"><property name="border_width">5</property><property name="resizable">False</property><property name="window_position">center</property><property name="default_width">300</property><property name="type_hint">dialog</property><property name="has_separator">False</property><child internal-child="vbox"><object class="GtkVBox" id="dialog-vbox2"><property name="visible">True</property><property name="spacing">2</property><child><object class="GtkNotebook" id="notebook1"><property name="visible">True</property><property name="can_focus">True</property><property name="border_width">5</property><child><object class="GtkVBox" id="vbox1"><property name="visible">True</property><property name="border_width">12</property><property name="spacing">18</property><child><object class="GtkVBox" id="connection_frame"><property name="visible">True</property><property name="spacing">6</property><child><object class="GtkLabel" id="label3"><property name="visible">True</property><property name="xalign">0</property><property name="label" translatable="yes">&lt;b&gt;Connection&lt;/b&gt;</property><property name="use_markup">True</property></object><packing><property name="expand">False</property><property name="fill">False</property><property name="position">0</property></packing></child><child><object class="GtkHBox" id="hbox6"><property name="visible">True</property><child><object class="GtkLabel" id="label43"><property name="visible">True</property><property name="label"></property></object><packing><property name="expand">False</property><property name="fill">False</property><property name="position">0</property></packing></child><child><object class="GtkHBox" id="connection_hbox"><property name="visible">True</property><property name="spacing">12</property><child><object class="GtkTable" id="connection_table"><property name="visible">True</property><property name="n_rows">2</property><property name="n_columns">2</property><property name="column_spacing">12</property><property name="row_spacing">6</property><child><object class="GtkLabel" id="label5"><property name="visible">True</property><property name="xalign">0</property><property name="label" translatable="yes">Status:</property></object><packing><property name="top_attach">1</property><property name="bottom_attach">2</property><property name="x_options">GTK_FILL</property><property name="y_options"></property></packing></child><child><object class="GtkLabel" id="status_label"><property name="visible">True</property><property name="can_focus">True</property><property name="xalign">0</property><property name="selectable">True</property></object><packing><property name="left_attach">1</property><property name="right_attach">2</property><property name="top_attach">1</property><property name="bottom_attach">2</property><property name="x_options">GTK_FILL</property><property name="y_options"></property></packing></child><child><object class="GtkLabel" id="label16"><property name="visible">True</property><property name="xalign">0</property><property name="label" translatable="yes">_Name:</property><property name="use_underline">True</property></object><packing><property name="x_options">GTK_FILL</property><property name="y_options"></property></packing></child><child><object class="GtkComboBoxEntry" id="name_combo"><property name="visible">True</property></object><packing><property name="left_attach">1</property><property name="right_attach">2</property><property name="x_options"></property><property name="y_options"></property></packing></child></object><packing><property name="position">0</property></packing></child><child><placeholder/></child></object><packing><property name="position">1</property></packing></child></object><packing><property name="position">1</property></packing></child></object><packing><property name="expand">False</property><property name="position">0</property></packing></child><child><object class="GtkVBox" id="activity_frame"><property name="visible">True</property><property name="spacing">6</property><child><object class="GtkLabel" id="label4"><property name="visible">True</property><property name="xalign">0</property><property name="label" translatable="yes">&lt;b&gt;Activity&lt;/b&gt;</property><property name="use_markup">True</property></object><packing><property name="expand">False</property><property name="fill">False</property><property name="position">0</property></packing></child><child><object class="GtkHBox" id="hbox8"><property name="visible">True</property><child><object class="GtkLabel" id="label44"><property name="visible">True</property><property name="label"></property></object><packing><property name="expand">False</property><property name="fill">False</property><property name="position">0</property></packing></child><child><object class="GtkTable" id="table2"><property name="visible">True</property><property name="n_rows">2</property><property name="n_columns">2</property><property name="column_spacing">12</property><property name="row_spacing">6</property><child><object class="GtkLabel" id="received_label"><property name="visible">True</property><property name="can_focus">True</property><property name="xalign">0</property><property name="selectable">True</property></object><packing><property name="left_attach">1</property><property name="right_attach">2</property><property name="x_options">GTK_FILL</property><property name="y_options"></property></packing></child><child><object class="GtkLabel" id="sent_label"><property name="visible">True</property><property name="can_focus">True</property><property name="xalign">0</property><property name="selectable">True</property></object><packing><property name="left_attach">1</property><property name="right_attach">2</property><property name="top_attach">1</property><property name="bottom_attach">2</property><property name="x_options">GTK_FILL</property><property name="y_options"></property></packing></child><child><object class="GtkLabel" id="label11"><property name="visible">True</property><property name="xalign">0</property><property name="label" translatable="yes">Received:</property></object><packing><property name="x_options">GTK_FILL</property><property name="y_options"></property></packing></child><child><object class="GtkLabel" id="label12"><property name="visible">True</property><property name="xalign">0</property><property name="label" translatable="yes">Sent:</property></object><packing><property name="top_attach">1</property><property name="bottom_attach">2</property><property name="x_options">GTK_FILL</property><property name="y_options"></property></packing></child></object><packing><property name="position">1</property></packing></child></object><packing><property name="position">1</property></packing></child></object><packing><property name="expand">False</property><property name="position">1</property></packing></child><child><object class="GtkVBox" id="signal_strength_frame"><property name="visible">True</property><property name="spacing">6</property><child><object class="GtkLabel" id="label48"><property name="visible">True</property><property name="xalign">0</property><property name="label" translatable="yes">&lt;b&gt;Signal Strength&lt;/b&gt;</property><property name="use_markup">True</property></object><packing><property name="expand">False</property><property name="fill">False</property><property name="position">0</property></packing></child><child><object class="GtkHBox" id="hbox14"><property name="visible">True</property><child><object class="GtkLabel" id="label49"><property name="visible">True</property><property name="label"></property></object><packing><property name="expand">False</property><property name="fill">False</property><property name="position">0</property></packing></child><child><object class="GtkHBox" id="hbox15"><property name="visible">True</property><property name="spacing">6</property><child><object class="GtkProgressBar" id="signal_strength_bar"><property name="visible">True</property><property name="pulse_step">0.10000000149</property></object><packing><property name="position">0</property></packing></child><child><object class="GtkLabel" id="signal_strength_label"><property name="visible">True</property><property name="label" translatable="yes">0%</property></object><packing><property name="expand">False</property><property name="position">1</property></packing></child></object><packing><property name="position">1</property></packing></child></object><packing><property name="expand">False</property><property name="position">1</property></packing></child></object><packing><property name="expand">False</property><property name="position">2</property></packing></child></object></child><child type="tab"><object class="GtkLabel" id="label1"><property name="visible">True</property><property name="label" translatable="yes">General</property></object><packing><property name="tab_fill">False</property></packing></child><child><object class="GtkVBox" id="vbox2"><property name="visible">True</property><property name="border_width">12</property><property name="spacing">18</property><child><object class="GtkVBox" id="inet4_frame"><property name="visible">True</property><property name="spacing">6</property><child><object class="GtkLabel" id="label25"><property name="visible">True</property><property name="xalign">0</property><property name="label" translatable="yes">&lt;b&gt;Internet Protocol (IPv4)&lt;/b&gt;</property><property name="use_markup">True</property></object><packing><property name="expand">False</property><property name="fill">False</property><property name="position">0</property></packing></child><child><object class="GtkHBox" id="hbox11"><property name="visible">True</property><child><object class="GtkLabel" id="label45"><property name="visible">True</property><property name="label"></property></object><packing><property name="expand">False</property><property name="fill">False</property><property name="position">0</property></packing></child><child><object class="GtkTable" id="inet4_table"><property name="visible">True</property><property name="n_rows">4</property><property name="n_columns">2</property><property name="column_spacing">12</property><property name="row_spacing">6</property><child><object class="GtkLabel" id="inet4_addr_title"><property name="visible">True</property><property name="xalign">0</property><property name="label" translatable="yes">Address:</property></object><packing><property name="x_options">GTK_FILL</property><property name="y_options"></property></packing></child><child><object class="GtkLabel" id="inet4_dest_title"><property name="visible">True</property><property name="xalign">0</property><property name="label" translatable="yes">Destination:</property></object><packing><property name="top_attach">1</property><property name="bottom_attach">2</property><property name="x_options">GTK_FILL</property><property name="y_options"></property></packing></child><child><object class="GtkLabel" id="inet4_bcast_title"><property name="visible">True</property><property name="xalign">0</property><property name="label" translatable="yes">Broadcast:</property></object><packing><property name="top_attach">2</property><property name="bottom_attach">3</property><property name="x_options">GTK_FILL</property><property name="y_options"></property></packing></child><child><object class="GtkLabel" id="inet4_mask_title"><property name="visible">True</property><property name="xalign">0</property><property name="label" translatable="yes">Subnet Mask:</property></object><packing><property name="top_attach">3</property><property name="bottom_attach">4</property><property name="x_options">GTK_FILL</property><property name="y_options"></property></packing></child><child><object class="GtkLabel" id="inet4_addr_label"><property name="visible">True</property><property name="can_focus">True</property><property name="xalign">0</property><property name="selectable">True</property></object><packing><property name="left_attach">1</property><property name="right_attach">2</property><property name="x_options">GTK_FILL</property><property name="y_options"></property></packing></child><child><object class="GtkLabel" id="inet4_dest_label"><property name="visible">True</property><property name="can_focus">True</property><property name="xalign">0</property><property name="selectable">True</property></object><packing><property name="left_attach">1</property><property name="right_attach">2</property><property name="top_attach">1</property><property name="bottom_attach">2</property><property name="x_options">GTK_FILL</property><property name="y_options"></property></packing></child><child><object class="GtkLabel" id="inet4_bcast_label"><property name="visible">True</property><property name="can_focus">True</property><property name="xalign">0</property><property name="selectable">True</property></object><packing><property name="left_attach">1</property><property name="right_attach">2</property><property name="top_attach">2</property><property name="bottom_attach">3</property><property name="x_options">GTK_FILL</property><property name="y_options"></property></packing></child><child><object class="GtkLabel" id="inet4_mask_label"><property name="visible">True</property><property name="can_focus">True</property><property name="xalign">0</property><property name="selectable">True</property></object><packing><property name="left_attach">1</property><property name="right_attach">2</property><property name="top_attach">3</property><property name="bottom_attach">4</property><property name="x_options">GTK_FILL</property><property name="y_options"></property></packing></child></object><packing><property name="position">1</property></packing></child></object><packing><property name="position">1</property></packing></child></object><packing><property name="expand">False</property><property name="position">0</property></packing></child><child><object class="GtkVBox" id="inet6_frame"><property name="spacing">6</property><child><object class="GtkLabel" id="label26"><property name="visible">True</property><property name="xalign">0</property><property name="label" translatable="yes">&lt;b&gt;Internet Protocol (IPv6)&lt;/b&gt;</property><property name="use_markup">True</property></object><packing><property name="expand">False</property><property name="fill">False</property><property name="position">0</property></packing></child><child><object class="GtkHBox" id="hbox12"><property name="visible">True</property><child><object class="GtkLabel" id="label46"><property name="visible">True</property><property name="label"></property></object><packing><property name="expand">False</property><property name="fill">False</property><property name="position">0</property></packing></child><child><object class="GtkTable" id="table5"><property name="visible">True</property><property name="n_rows">2</property><property name="n_columns">2</property><property name="column_spacing">12</property><property name="row_spacing">6</property><child><object class="GtkLabel" id="label39"><property name="visible">True</property><property name="xalign">0</property><property name="label" translatable="yes">Address:</property></object><packing><property name="x_options">GTK_FILL</property><property name="y_options"></property></packing></child><child><object class="GtkLabel" id="label40"><property name="visible">True</property><property name="xalign">0</property><property name="label" translatable="yes">Scope:</property></object><packing><property name="top_attach">1</property><property name="bottom_attach">2</property><property name="x_options">GTK_FILL</property><property name="y_options"></property></packing></child><child><object class="GtkLabel" id="inet6_addr_label"><property name="visible">True</property><property name="can_focus">True</property><property name="xalign">0</property><property name="selectable">True</property></object><packing><property name="left_attach">1</property><property name="right_attach">2</property><property name="x_options">GTK_FILL</property><property name="y_options"></property></packing></child><child><object class="GtkLabel" id="inet6_scope_label"><property name="visible">True</property><property name="can_focus">True</property><property name="xalign">0</property><property name="selectable">True</property></object><packing><property name="left_attach">1</property><property name="right_attach">2</property><property name="top_attach">1</property><property name="bottom_attach">2</property><property name="x_options">GTK_FILL</property><property name="y_options"></property></packing></child></object><packing><property name="position">1</property></packing></child></object><packing><property name="position">1</property></packing></child></object><packing><property name="expand">False</property><property name="position">1</property></packing></child><child><object class="GtkVBox" id="dev_frame"><property name="visible">True</property><property name="spacing">6</property><child><object class="GtkLabel" id="dev_label"><property name="visible">True</property><property name="xalign">0</property><property name="label" translatable="yes">&lt;b&gt;Network Device&lt;/b&gt;</property><property name="use_markup">True</property></object><packing><property name="expand">False</property><property name="fill">False</property><property name="position">0</property></packing></child><child><object class="GtkHBox" id="hbox13"><property name="visible">True</property><child><object class="GtkLabel" id="label47"><property name="visible">True</property><property name="label"></property></object><packing><property name="expand">False</property><property name="fill">False</property><property name="position">0</property></packing></child><child><object class="GtkTable" id="table6"><property name="visible">True</property><property name="n_rows">2</property><property name="n_columns">2</property><property name="column_spacing">12</property><property name="row_spacing">6</property><child><object class="GtkLabel" id="dev_addr_title"><property name="visible">True</property><property name="xalign">0</property><property name="label" translatable="yes">Address:</property></object><packing><property name="top_attach">1</property><property name="bottom_attach">2</property><property name="x_options">GTK_FILL</property><property name="y_options"></property></packing></child><child><object class="GtkLabel" id="dev_addr_label"><property name="visible">True</property><property name="can_focus">True</property><property name="xalign">0</property><property name="selectable">True</property></object><packing><property name="left_attach">1</property><property name="right_attach">2</property><property name="top_attach">1</property><property name="bottom_attach">2</property><property name="x_options">GTK_FILL</property><property name="y_options"></property></packing></child><child><object class="GtkLabel" id="dev_type_label"><property name="visible">True</property><property name="can_focus">True</property><property name="xalign">0</property><property name="selectable">True</property></object><packing><property name="left_attach">1</property><property name="right_attach">2</property><property name="x_options">GTK_FILL</property><property name="y_options"></property></packing></child><child><object class="GtkLabel" id="dev_type_title"><property name="visible">True</property><property name="xalign">0</property><property name="label" translatable="yes">Type:</property></object><packing><property name="x_options">GTK_FILL</property><property name="y_options"></property></packing></child></object><packing><property name="position">1</property></packing></child></object><packing><property name="position">1</property></packing></child></object><packing><property name="expand">False</property><property name="position">2</property></packing></child></object><packing><property name="position">1</property></packing></child><child type="tab"><object class="GtkLabel" id="label2"><property name="visible">True</property><property name="label" translatable="yes">Support</property></object><packing><property name="position">1</property><property name="tab_fill">False</property></packing></child></object><packing><property name="position">1</property></packing></child><child internal-child="action_area"><object class="GtkHButtonBox" id="dialog-action_area2"><property name="visible">True</property><property name="layout_style">end</property><child><object class="GtkButton" id="helpbutton1"><property name="label">gtk-help</property><property name="can_focus">True</property><property name="can_default">True</property><property name="has_default">True</property><property name="receives_default">False</property><property name="use_stock">True</property></object><packing><property name="expand">False</property><property name="fill">False</property><property name="position">0</property></packing></child><child><object class="GtkButton" id="configure_button"><property name="visible">True</property><property name="can_focus">True</property><property name="can_default">True</property><property name="receives_default">False</property><child><object class="GtkAlignment" id="alignment2"><property name="visible">True</property><property name="xscale">0</property><property name="yscale">0</property><child><object class="GtkHBox" id="hbox5"><property name="visible">True</property><property name="spacing">2</property><child><object class="GtkImage" id="image2"><property name="visible">True</property><property name="stock">gtk-preferences</property></object><packing><property name="expand">False</property><property name="fill">False</property><property name="position">0</property></packing></child><child><object class="GtkLabel" id="label42"><property name="visible">True</property><property name="label" translatable="yes">Con_figure</property><property name="use_underline">True</property></object><packing><property name="expand">False</property><property name="fill">False</property><property name="position">1</property></packing></child></object></child></object></child></object><packing><property name="expand">False</property><property name="fill">False</property><property name="position">1</property></packing></child><child><object class="GtkButton" id="close_button"><property name="label">gtk-close</property><property name="visible">True</property><property name="can_focus">True</property><property name="can_default">True</property><property name="has_default">True</property><property name="receives_default">False</property><property name="use_stock">True</property></object><packing><property name="expand">False</property><property name="fill">False</property><property name="position">2</property></packing></child></object><packing><property name="expand">False</property><property name="pack_type">end</property><property name="position">0</property></packing></child></object></child><action-widgets><action-widget response="-11">helpbutton1</action-widget><action-widget response="0">configure_button</action-widget><action-widget response="-7">close_button</action-widget></action-widgets></object></interface>
-diff -urN lxpanel-0.5.5-orig/data/ui/panel-pref.glade lxpanel-0.5.5/data/ui/panel-pref.glade
---- lxpanel-0.5.5-orig/data/ui/panel-pref.glade        1970-01-01 01:00:00.000000000 +0100
-+++ lxpanel-0.5.5/data/ui/panel-pref.glade     2010-05-11 13:07:36.000000000 +0200
+--- /dev/null
++++ b/data/ui/panel-pref.glade
 @@ -0,0 +1,1109 @@
 +<?xml version="1.0"?>
 +<interface>
@@ -2164,8 +2159,33 @@ diff -urN lxpanel-0.5.5-orig/data/ui/panel-pref.glade lxpanel-0.5.5/data/ui/pane
 +    <property name="step_increment">1</property>
 +  </object>
 +</interface>
-diff -urN lxpanel-0.5.5-orig/data/ui/panel-pref.ui lxpanel-0.5.5/data/ui/panel-pref.ui
---- lxpanel-0.5.5-orig/data/ui/panel-pref.ui   2010-02-14 08:13:46.000000000 +0100
-+++ lxpanel-0.5.5/data/ui/panel-pref.ui        1970-01-01 01:00:00.000000000 +0100
+--- a/data/ui/panel-pref.ui
++++ /dev/null
 @@ -1 +0,0 @@
 -<?xml version="1.0"?><interface><object class="GtkListStore" id="liststore1"><columns><column type="gchararray"/></columns><data><row><col id="0" translatable="yes">Dynamic</col></row><row><col id="0" translatable="yes">Pixels</col></row><row><col id="0" translatable="yes">% Percent</col></row></data></object><object class="GtkListStore" id="liststore2"><columns><column type="gchararray"/></columns><data><row><col id="0" translatable="yes">Pixels</col></row></data></object><object class="GtkDialog" id="panel_pref"><property name="visible">True</property><property name="title" translatable="yes">Panel Preferences</property><property name="type_hint">dialog</property><child internal-child="vbox"><object class="GtkVBox" id="dialog-vbox1"><property name="visible">True</property><child><object class="GtkNotebook" id="notebook"><property name="visible">True</property><property name="can_focus">True</property><child><object class="GtkHBox" id="hbox6"><property name="visible">True</property><property name="border_width">6</property><child><object class="GtkFrame" id="frame1"><property name="visible">True</property><property name="label_xalign">0</property><property name="shadow_type">none</property><child><object class="GtkAlignment" id="alignment1"><property name="visible">True</property><property name="left_padding">8</property><child><object class="GtkTable" id="table1"><property name="visible">True</property><property name="n_rows">3</property><property name="n_columns">2</property><property name="row_spacing">2</property><child><object class="GtkLabel" id="label7"><property name="visible">True</property><property name="xalign">0</property><property name="label" translatable="yes">Edge:</property></object><packing><property name="x_options"></property><property name="y_options"></property></packing></child><child><object class="GtkLabel" id="label8"><property name="visible">True</property><property name="xalign">0</property><property name="label" translatable="yes">Alignment:</property></object><packing><property name="top_attach">1</property><property name="bottom_attach">2</property><property name="x_options"></property><property name="y_options"></property></packing></child><child><object class="GtkLabel" id="label9"><property name="visible">True</property><property name="xalign">0</property><property name="label" translatable="yes">Margin:</property></object><packing><property name="top_attach">2</property><property name="bottom_attach">3</property><property name="x_options"></property><property name="y_options"></property></packing></child><child><object class="GtkSpinButton" id="margin"><property name="visible">True</property><property name="can_focus">True</property><property name="invisible_char">&#x2022;</property><property name="adjustment">adjustment4</property><property name="climb_rate">1</property></object><packing><property name="left_attach">1</property><property name="right_attach">2</property><property name="top_attach">2</property><property name="bottom_attach">3</property><property name="x_options"></property><property name="y_options"></property></packing></child><child><object class="GtkVBox" id="vbox7"><property name="visible">True</property><property name="orientation">vertical</property><child><object class="GtkRadioButton" id="edge_bottom"><property name="label" translatable="yes">Bottom</property><property name="visible">True</property><property name="can_focus">True</property><property name="receives_default">False</property><property name="active">True</property><property name="draw_indicator">True</property></object><packing><property name="position">0</property></packing></child><child><object class="GtkRadioButton" id="edge_top"><property name="label" translatable="yes">Top</property><property name="visible">True</property><property name="can_focus">True</property><property name="receives_default">False</property><property name="draw_indicator">True</property><property name="group">edge_bottom</property></object><packing><property name="position">1</property></packing></child><child><object class="GtkRadioButton" id="edge_left"><property name="label" translatable="yes">Left</property><property name="visible">True</property><property name="can_focus">True</property><property name="receives_default">False</property><property name="draw_indicator">True</property><property name="group">edge_bottom</property></object><packing><property name="position">2</property></packing></child><child><object class="GtkRadioButton" id="edge_right"><property name="label" translatable="yes">Right</property><property name="visible">True</property><property name="can_focus">True</property><property name="receives_default">False</property><property name="draw_indicator">True</property><property name="group">edge_bottom</property></object><packing><property name="position">3</property></packing></child></object><packing><property name="left_attach">1</property><property name="right_attach">2</property><property name="y_options">GTK_FILL</property></packing></child><child><object class="GtkVBox" id="vbox9"><property name="visible">True</property><property name="orientation">vertical</property><child><object class="GtkRadioButton" id="alignment_left"><property name="label" translatable="yes">Left</property><property name="visible">True</property><property name="can_focus">True</property><property name="receives_default">False</property><property name="active">True</property><property name="draw_indicator">True</property></object><packing><property name="position">0</property></packing></child><child><object class="GtkRadioButton" id="alignment_center"><property name="label" translatable="yes">Center</property><property name="visible">True</property><property name="can_focus">True</property><property name="receives_default">False</property><property name="draw_indicator">True</property><property name="group">alignment_left</property></object><packing><property name="position">1</property></packing></child><child><object class="GtkRadioButton" id="alignment_right"><property name="label" translatable="yes">Right</property><property name="visible">True</property><property name="can_focus">True</property><property name="receives_default">False</property><property name="draw_indicator">True</property><property name="group">alignment_left</property></object><packing><property name="position">2</property></packing></child></object><packing><property name="left_attach">1</property><property name="right_attach">2</property><property name="top_attach">1</property><property name="bottom_attach">2</property><property name="y_options">GTK_FILL</property></packing></child></object></child></object></child><child type="label"><object class="GtkLabel" id="label5"><property name="visible">True</property><property name="label" translatable="yes">&lt;b&gt;Position&lt;/b&gt;</property><property name="use_markup">True</property></object></child></object><packing><property name="position">0</property></packing></child><child><object class="GtkFrame" id="frame2"><property name="visible">True</property><property name="label_xalign">0</property><property name="shadow_type">none</property><child><object class="GtkAlignment" id="alignment2"><property name="visible">True</property><property name="left_padding">8</property><child><object class="GtkTable" id="table2"><property name="visible">True</property><property name="n_rows">3</property><property name="n_columns">3</property><property name="row_spacing">2</property><child><object class="GtkLabel" id="width_label"><property name="visible">True</property><property name="xalign">0</property><property name="label" translatable="yes">Width:</property></object><packing><property name="x_options"></property><property name="y_options"></property></packing></child><child><object class="GtkLabel" id="height_label"><property name="visible">True</property><property name="xalign">0</property><property name="label" translatable="yes">Height:</property></object><packing><property name="top_attach">1</property><property name="bottom_attach">2</property><property name="x_options"></property><property name="y_options"></property></packing></child><child><object class="GtkComboBox" id="height_unit"><property name="visible">True</property><property name="model">liststore2</property><child><object class="GtkCellRendererText" id="cellrenderertext2"/><attributes><attribute name="text">0</attribute></attributes></child></object><packing><property name="left_attach">2</property><property name="right_attach">3</property><property name="top_attach">1</property><property name="bottom_attach">2</property><property name="x_options"></property><property name="y_options"></property></packing></child><child><object class="GtkSpinButton" id="width"><property name="visible">True</property><property name="can_focus">True</property><property name="invisible_char">&#x2022;</property><property name="adjustment">adjustment3</property><property name="climb_rate">1</property></object><packing><property name="left_attach">1</property><property name="right_attach">2</property><property name="x_options"></property><property name="y_options"></property></packing></child><child><object class="GtkSpinButton" id="height"><property name="visible">True</property><property name="can_focus">True</property><property name="invisible_char">&#x2022;</property><property name="adjustment">adjustment2</property><property name="climb_rate">1</property></object><packing><property name="left_attach">1</property><property name="right_attach">2</property><property name="top_attach">1</property><property name="bottom_attach">2</property><property name="x_options"></property><property name="y_options"></property></packing></child><child><object class="GtkComboBox" id="width_unit"><property name="visible">True</property><property name="model">liststore1</property><child><object class="GtkCellRendererText" id="cellrenderertext1"/><attributes><attribute name="text">0</attribute></attributes></child></object><packing><property name="left_attach">2</property><property name="right_attach">3</property><property name="x_options"></property><property name="y_options"></property></packing></child><child><object class="GtkLabel" id="label11"><property name="visible">True</property><property name="label" translatable="yes">&lt;b&gt;Icon&lt;/b&gt;</property><property name="use_markup">True</property></object><packing><property name="top_attach">2</property><property name="bottom_attach">3</property><property name="y_options"></property></packing></child><child><object class="GtkSpinButton" id="icon_size"><property name="visible">True</property><property name="can_focus">True</property><property name="invisible_char">&#x2022;</property><property name="adjustment">adjustment5</property><property name="climb_rate">1</property></object><packing><property name="left_attach">1</property><property name="right_attach">2</property><property name="top_attach">2</property><property name="bottom_attach">3</property><property name="x_options"></property><property name="y_options">GTK_SHRINK</property></packing></child><child><object class="GtkLabel" id="label14"><property name="visible">True</property><property name="label" translatable="yes">pixels</property></object><packing><property name="left_attach">2</property><property name="right_attach">3</property><property name="top_attach">2</property><property name="bottom_attach">3</property></packing></child></object></child></object></child><child type="label"><object class="GtkLabel" id="label6"><property name="visible">True</property><property name="label" translatable="yes">&lt;b&gt;Size&lt;/b&gt;</property><property name="use_markup">True</property></object></child></object><packing><property name="position">1</property></packing></child></object></child><child type="tab"><object class="GtkLabel" id="label1"><property name="visible">True</property><property name="label" translatable="yes">Geometry</property></object><packing><property name="tab_fill">False</property></packing></child><child><object class="GtkVBox" id="vbox1"><property name="visible">True</property><property name="border_width">6</property><property name="spacing">4</property><child><object class="GtkFrame" id="frame4"><property name="visible">True</property><property name="label_xalign">0</property><property name="shadow_type">none</property><child><object class="GtkAlignment" id="alignment4"><property name="visible">True</property><property name="left_padding">8</property><child><object class="GtkVBox" id="vbox4"><property name="visible">True</property><property name="orientation">vertical</property><property name="spacing">2</property><child><object class="GtkRadioButton" id="bg_none"><property name="label" translatable="yes">System theme</property><property name="visible">True</property><property name="can_focus">True</property><property name="receives_default">False</property><property name="use_underline">True</property><property name="active">True</property><property name="draw_indicator">True</property></object><packing><property name="expand">False</property><property name="fill">False</property><property name="position">0</property></packing></child><child><object class="GtkHBox" id="hbox2"><property name="visible">True</property><property name="spacing">10</property><child><object class="GtkRadioButton" id="bg_transparency"><property name="label" translatable="yes">Solid color (with opacity)</property><property name="visible">True</property><property name="can_focus">True</property><property name="receives_default">False</property><property name="use_underline">True</property><property name="draw_indicator">True</property><property name="group">bg_none</property></object><packing><property name="expand">False</property><property name="fill">False</property><property name="position">0</property></packing></child><child><object class="GtkColorButton" id="tint_clr"><property name="visible">True</property><property name="can_focus">True</property><property name="receives_default">True</property><property name="use_alpha">True</property><property name="color">#000000000000</property></object><packing><property name="expand">False</property><property name="fill">False</property><property name="position">1</property></packing></child></object><packing><property name="expand">False</property><property name="fill">False</property><property name="position">1</property></packing></child><child><object class="GtkHBox" id="hbox4"><property name="visible">True</property><property name="spacing">40</property><child><object class="GtkRadioButton" id="bg_image"><property name="label" translatable="yes">Image</property><property name="visible">True</property><property name="can_focus">True</property><property name="receives_default">False</property><property name="use_underline">True</property><property name="draw_indicator">True</property><property name="group">bg_none</property></object><packing><property name="expand">False</property><property name="fill">False</property><property name="position">0</property></packing></child><child><object class="GtkFileChooserButton" id="img_file"><property name="visible">True</property><property name="title" translatable="yes">Select an image file</property></object><packing><property name="position">1</property></packing></child></object><packing><property name="expand">False</property><property name="fill">False</property><property name="position">2</property></packing></child></object></child></object></child><child type="label"><object class="GtkLabel" id="label18"><property name="visible">True</property><property name="label" translatable="yes">&lt;b&gt;Background&lt;/b&gt;</property><property name="use_markup">True</property></object></child></object><packing><property name="expand">False</property><property name="position">0</property></packing></child><child><object class="GtkFrame" id="frame5"><property name="visible">True</property><property name="label_xalign">0</property><property name="shadow_type">none</property><child><object class="GtkAlignment" id="alignment5"><property name="visible">True</property><property name="left_padding">8</property><child><object class="GtkHBox" id="hbox1"><property name="visible">True</property><property name="spacing">10</property><child><object class="GtkCheckButton" id="use_font_clr"><property name="label" translatable="yes">Custom color</property><property name="visible">True</property><property name="can_focus">True</property><property name="receives_default">False</property><property name="use_underline">True</property><property name="draw_indicator">True</property></object><packing><property name="expand">False</property><property name="fill">False</property><property name="position">0</property></packing></child><child><object class="GtkColorButton" id="font_clr"><property name="visible">True</property><property name="can_focus">True</property><property name="receives_default">True</property><property name="color">#000000000000</property></object><packing><property name="expand">False</property><property name="fill">False</property><property name="position">1</property></packing></child></object></child></object></child><child type="label"><object class="GtkLabel" id="label19"><property name="visible">True</property><property name="label" translatable="yes">&lt;b&gt;Font&lt;/b&gt;</property><property name="use_markup">True</property></object></child></object><packing><property name="expand">False</property><property name="position">1</property></packing></child></object><packing><property name="position">1</property></packing></child><child type="tab"><object class="GtkLabel" id="label10"><property name="visible">True</property><property name="label" translatable="yes">Appearance</property></object><packing><property name="position">1</property><property name="tab_fill">False</property></packing></child><child><object class="GtkHBox" id="hbox5"><property name="visible">True</property><property name="spacing">2</property><child><object class="GtkVBox" id="vbox5"><property name="visible">True</property><child><object class="GtkScrolledWindow" id="scrolledwindow1"><property name="visible">True</property><property name="can_focus">True</property><property name="hscrollbar_policy">automatic</property><property name="vscrollbar_policy">automatic</property><property name="shadow_type">in</property><child><object class="GtkTreeView" id="plugin_list"><property name="visible">True</property><property name="can_focus">True</property><property name="rules_hint">True</property></object></child></object><packing><property name="position">0</property></packing></child><child><object class="GtkLabel" id="plugin_desc"><property name="visible">True</property><property name="can_focus">True</property><property name="xalign">0</property><property name="wrap">True</property><property name="selectable">True</property><property name="ellipsize">end</property></object><packing><property name="expand">False</property><property name="fill">False</property><property name="position">1</property></packing></child></object><packing><property name="position">0</property></packing></child><child><object class="GtkVBox" id="vbox6"><property name="visible">True</property><property name="border_width">2</property><property name="spacing">2</property><child><object class="GtkButton" id="add_btn"><property name="label">gtk-add</property><property name="visible">True</property><property name="can_focus">True</property><property name="receives_default">False</property><property name="use_stock">True</property></object><packing><property name="expand">False</property><property name="fill">False</property><property name="position">0</property></packing></child><child><object class="GtkButton" id="remove_btn"><property name="label">gtk-remove</property><property name="visible">True</property><property name="can_focus">True</property><property name="receives_default">False</property><property name="use_stock">True</property></object><packing><property name="expand">False</property><property name="fill">False</property><property name="position">1</property></packing></child><child><object class="GtkButton" id="edit_btn"><property name="label">gtk-edit</property><property name="visible">True</property><property name="can_focus">True</property><property name="receives_default">False</property><property name="use_stock">True</property></object><packing><property name="expand">False</property><property name="fill">False</property><property name="position">2</property></packing></child><child><object class="GtkButton" id="moveup_btn"><property name="label">gtk-go-up</property><property name="visible">True</property><property name="can_focus">True</property><property name="receives_default">False</property><property name="use_stock">True</property></object><packing><property name="expand">False</property><property name="fill">False</property><property name="position">3</property></packing></child><child><object class="GtkButton" id="movedown_btn"><property name="label">gtk-go-down</property><property name="visible">True</property><property name="can_focus">True</property><property name="receives_default">False</property><property name="use_stock">True</property></object><packing><property name="expand">False</property><property name="fill">False</property><property name="position">4</property></packing></child></object><packing><property name="expand">False</property><property name="position">1</property></packing></child></object><packing><property name="position">2</property></packing></child><child type="tab"><object class="GtkLabel" id="label3"><property name="visible">True</property><property name="label" translatable="yes">Panel Applets</property></object><packing><property name="position">2</property><property name="tab_fill">False</property></packing></child><child><object class="GtkVBox" id="vbox3"><property name="visible">True</property><property name="border_width">6</property><property name="spacing">4</property><child><object class="GtkFrame" id="frame6"><property name="visible">True</property><property name="label_xalign">0</property><property name="shadow_type">none</property><child><object class="GtkAlignment" id="alignment6"><property name="visible">True</property><property name="left_padding">8</property><child><object class="GtkTable" id="table3"><property name="visible">True</property><property name="border_width">2</property><property name="n_rows">3</property><property name="n_columns">2</property><property name="row_spacing">2</property><child><object class="GtkEntry" id="logout"><property name="visible">True</property><property name="can_focus">True</property><property name="invisible_char">&#x25CF;</property></object><packing><property name="left_attach">1</property><property name="right_attach">2</property><property name="top_attach">2</property><property name="bottom_attach">3</property><property name="y_options"></property></packing></child><child><object class="GtkEntry" id="term"><property name="visible">True</property><property name="can_focus">True</property><property name="invisible_char">&#x25CF;</property></object><packing><property name="left_attach">1</property><property name="right_attach">2</property><property name="top_attach">1</property><property name="bottom_attach">2</property><property name="y_options"></property></packing></child><child><object class="GtkEntry" id="file_manager"><property name="visible">True</property><property name="can_focus">True</property><property name="invisible_char">&#x25CF;</property></object><packing><property name="left_attach">1</property><property name="right_attach">2</property><property name="y_options"></property></packing></child><child><object class="GtkLabel" id="logout_label"><property name="visible">True</property><property name="xalign">0</property><property name="label" translatable="yes">Logout Command:</property></object><packing><property name="top_attach">2</property><property name="bottom_attach">3</property><property name="x_options"></property><property name="y_options"></property></packing></child><child><object class="GtkLabel" id="label24"><property name="visible">True</property><property name="xalign">0</property><property name="label" translatable="yes">Terminal Emulator:</property></object><packing><property name="top_attach">1</property><property name="bottom_attach">2</property><property name="x_options"></property><property name="y_options"></property></packing></child><child><object class="GtkLabel" id="label23"><property name="visible">True</property><property name="xalign">0</property><property name="label" translatable="yes">File Manager:</property></object><packing><property name="x_options"></property><property name="y_options"></property></packing></child></object></child></object></child><child type="label"><object class="GtkLabel" id="label22"><property name="visible">True</property><property name="label" translatable="yes">&lt;b&gt;Set Preferred Applications&lt;/b&gt;</property><property name="use_markup">True</property></object></child></object><packing><property name="expand">False</property><property name="position">0</property></packing></child><child><object class="GtkFrame" id="frame3"><property name="visible">True</property><property name="label_xalign">0</property><property name="shadow_type">none</property><child><object class="GtkAlignment" id="alignment3"><property name="visible">True</property><property name="left_padding">8</property><child><object class="GtkVBox" id="vbox2"><property name="visible">True</property><child><object class="GtkCheckButton" id="as_dock"><property name="label" translatable="yes">Make window managers treat the panel as dock</property><property name="visible">True</property><property name="can_focus">True</property><property name="receives_default">False</property><property name="use_underline">True</property><property name="draw_indicator">True</property></object><packing><property name="expand">False</property><property name="fill">False</property><property name="position">0</property></packing></child><child><object class="GtkCheckButton" id="reserve_space"><property name="label" translatable="yes">Reserve space, and not covered by maximized windows</property><property name="visible">True</property><property name="can_focus">True</property><property name="receives_default">False</property><property name="use_underline">True</property><property name="draw_indicator">True</property></object><packing><property name="expand">False</property><property name="fill">False</property><property name="position">1</property></packing></child></object></child></object></child><child type="label"><object class="GtkLabel" id="label15"><property name="visible">True</property><property name="label" translatable="yes">&lt;b&gt;Properties&lt;/b&gt;</property><property name="use_markup">True</property></object></child></object><packing><property name="expand">False</property><property name="position">1</property></packing></child><child><object class="GtkFrame" id="frame7"><property name="visible">True</property><property name="label_xalign">0</property><property name="shadow_type">none</property><child><object class="GtkAlignment" id="alignment7"><property name="visible">True</property><property name="left_padding">12</property><child><object class="GtkAlignment" id="alignment8"><property name="visible">True</property><child><object class="GtkVBox" id="vbox8"><property name="visible">True</property><property name="orientation">vertical</property><property name="homogeneous">True</property><child><object class="GtkCheckButton" id="autohide"><property name="label" translatable="yes">Minimize panel when not in use</property><property name="visible">True</property><property name="can_focus">True</property><property name="receives_default">False</property><property name="draw_indicator">True</property></object><packing><property name="expand">False</property><property name="fill">False</property><property name="position">0</property></packing></child><child><object class="GtkHBox" id="hbox8"><property name="visible">True</property><child><object class="GtkLabel" id="label12"><property name="visible">True</property><property name="xalign">0</property><property name="label" translatable="yes">Size when minimized</property></object><packing><property name="position">0</property></packing></child><child><object class="GtkSpinButton" id="height_when_minimized"><property name="visible">True</property><property name="can_focus">True</property><property name="max_length">2</property><property name="invisible_char">&#x2022;</property><property name="adjustment">adjustment1</property></object><packing><property name="position">1</property></packing></child><child><object class="GtkLabel" id="label2"><property name="visible">True</property><property name="xalign">0.10000000149011612</property><property name="label" translatable="yes">pixels</property></object><packing><property name="position">2</property></packing></child></object><packing><property name="expand">False</property><property name="fill">False</property><property name="position">1</property></packing></child></object></child></object></child></object></child><child type="label"><object class="GtkLabel" id="label13"><property name="visible">True</property><property name="label" translatable="yes">&lt;b&gt;Automatic hiding&lt;/b&gt;</property><property name="use_markup">True</property></object></child></object><packing><property name="expand">False</property><property name="position">2</property></packing></child></object><packing><property name="position">3</property></packing></child><child type="tab"><object class="GtkLabel" id="label4"><property name="visible">True</property><property name="label" translatable="yes">Advanced</property></object><packing><property name="position">3</property><property name="tab_fill">False</property></packing></child></object><packing><property name="position">2</property></packing></child><child internal-child="action_area"><object class="GtkHButtonBox" id="dialog-action_area1"><property name="visible">True</property><property name="layout_style">end</property><child><object class="GtkButton" id="close_btn"><property name="label">gtk-close</property><property name="visible">True</property><property name="can_focus">True</property><property name="can_default">True</property><property name="receives_default">False</property><property name="use_stock">True</property></object><packing><property name="expand">False</property><property name="fill">False</property><property name="position">0</property></packing></child></object><packing><property name="expand">False</property><property name="pack_type">end</property><property name="position">0</property></packing></child></object></child><action-widgets><action-widget response="-7">close_btn</action-widget></action-widgets></object><object class="GtkAdjustment" id="adjustment1"><property name="value">2</property><property name="lower">2</property><property name="upper">10</property><property name="step_increment">1</property></object><object class="GtkAdjustment" id="adjustment2"><property name="upper">100</property><property name="step_increment">1</property></object><object class="GtkAdjustment" id="adjustment3"><property name="upper">100</property><property name="step_increment">1</property></object><object class="GtkAdjustment" id="adjustment4"><property name="upper">32767</property><property name="step_increment">1</property></object><object class="GtkAdjustment" id="adjustment5"><property name="upper">32767</property><property name="step_increment">1</property></object></interface>
+--- a/data/Makefile.am
++++ b/data/Makefile.am
+@@ -8,11 +8,19 @@
+ uidir=$(datadir)/lxpanel/ui
+ ui_in_files= \
+-      ui/panel-pref.ui \
+-      ui/launchbar.ui \
+-      ui/netstatus.ui
++      ui/panel-pref.glade \
++      ui/launchbar.glade \
++      ui/netstatus.glade
+-ui_DATA = $(ui_in_files)
++ui_DATA = $(ui_in_files:.glade=.ui)
++
++# Generate GtkBuilder UI files from Glade files
++%.ui: %.glade
++      cp $< $@
++      $(top_builddir)/src/xml-purge $@
++
++CLEANFILES = \
++      $(ui_DATA)
+ lxpanel_images_DATA = \
+       images/my-computer.png \
index fd6dd49..99cd6de 100644 (file)
@@ -1,4 +1,4 @@
-batt_status.patch
 missing_glades.patch
 default-config.patch
-redefine-alarm-variable.patch
+configure_desktop_number.patch
+10_fix_menu.patch
index 1fea050..dfc8553 100755 (executable)
@@ -8,11 +8,7 @@
        dh $@
 
 override_dh_auto_configure:
-       dh_auto_configure -- --enable-man 
-
-override_dh_auto_clean:
-       rm -f man/lxpanel.1 man/lxpanelctl.1
-       dh_auto_clean
+       dh_auto_configure -- --enable-man
 
 override_dh_auto_test:
-       :       
+       # Disable: check failed in po/.
diff --git a/debian/source/options b/debian/source/options
new file mode 100644 (file)
index 0000000..779dbfd
--- /dev/null
@@ -0,0 +1,2 @@
+compression = "bzip2"
+compression-level = 9
index 11828ec..37a86c4 100644 (file)
@@ -1,12 +1,2 @@
-# Example watch control file for uscan
-# Rename this file to "watch" and then you can run the "uscan" command
-# to check for upstream updates and more.
-# See uscan(1) for format
-
-# Compulsory line, this is a version 3 file
 version=3
-
-# Uncomment to find new files on sourceforge, for debscripts >= 2.9
 http://sf.net/lxde/lxpanel-([\d.]*)\.tar\.gz
-
-