Debian

Available patches from Ubuntu

To see Ubuntu differences wrt. to Debian, write down a grep-dctrl query identifying the packages you're interested in:
grep-dctrl -n -sPackage Sources.Debian
(e.g. -FPackage linux-ntfs or linux-ntfs)

Modified packages are listed below:

Debian ( Changelog | PTS | Bugs ) Ubuntu ( Changelog | txt | LP | Bugs ) | Diff from Ubuntu

Source: lxpanel

lxpanel (0.9.3-1ubuntu2) artful; urgency=medium * debian/patches/05_bluetooth_applet.patch - Add bluetooth applet support. * debian/images, debian/lxpanel-data.install & debian/source/include-binaries - Install bluetooth applet images. * debian/lxpanel.install - Install bluetooth plugin. -- Julien Lavergne <gilir@ubuntu.com> Wed, 17 May 2017 01:44:55 +0200 lxpanel (0.9.3-1ubuntu1) zesty; urgency=medium * Merge from Debian Sid (LP: #1652879). Remaining changes: - debian/control + Add libindicator-dev build-depends. + Add lxpanel-indicator-applet-plugin binary. + Add build-depends on libicu-dev for weather plugin. + Update Replaces and Breaks on lxpanel-data (LP: #1417244). - debian/lxpanel.install + Install all plugins except indicators. - debian/lxpanel-indicator-applet-plugin.install + Install indicator plugin. - debian/rules + Add --enable-indicator-support flag. + Add dh_install --fail-missing. + Re-enable dh_makeshlibs, FTBFS with lxpanel-indicator-applet-plugin. - debian/patches + 04_disable_gtk3_indicators.patch: Hide incompatible indicators in the preference menu (LP: #1165245). -- Simon Quigley <tsimonq2@ubuntu.com> Fri, 20 Jan 2017 20:30:40 -0600

Modifications :
  1. Download patch .pc/05_bluetooth_applet.patch/po/POTFILES.in

    --- 0.9.3-1/.pc/05_bluetooth_applet.patch/po/POTFILES.in 1970-01-01 00:00:00.000000000 +0000 +++ 0.9.3-1ubuntu2/.pc/05_bluetooth_applet.patch/po/POTFILES.in 2017-01-20 21:38:52.000000000 +0000 @@ -0,0 +1,52 @@ +[encoding: UTF-8] +src/configurator.c +src/panel.c +src/plugin.c +src/gtk-run.c +src/main.c +src/input-button.c +src/space.c +data/ui/launchtaskbar.glade +data/ui/netstatus.glade +data/ui/panel-pref.glade + +# Putting translation of plugins in main catalog is not a good idea... +plugins/cpu/cpu.c +plugins/deskno/deskno.c +plugins/launchtaskbar.c +plugins/task-button.c +plugins/dclock.c +plugins/menu.c +plugins/separator.c +plugins/pager.c +plugins/tray.c +plugins/xkb/xkb-plugin.c +plugins/wincmd.c +plugins/dirmenu.c +plugins/thermal/thermal.c + +plugins/cpufreq/cpufreq.c + +plugins/volumealsa/volumealsa.c + +plugins/netstat/netstat.c +plugins/netstat/passwd_gui.c +plugins/netstat/lxnm_client.c + +plugins/netstatus/netstatus.c +plugins/netstatus/netstatus-dialog.c +plugins/netstatus/netstatus-icon.c +plugins/netstatus/netstatus-iface.c +plugins/netstatus/netstatus-sysdeps.c +plugins/netstatus/netstatus-util.c + +plugins/batt/batt.c + +plugins/kbled/kbled.c + +plugins/indicator/indicator.c + +plugins/monitors/monitors.c + +plugins/weather/weatherwidget.c +plugins/weather/weather.c
  2. Download patch debian/lxpanel-data.install

    --- 0.9.3-1/debian/lxpanel-data.install 2017-01-20 21:46:25.000000000 +0000 +++ 0.9.3-1ubuntu2/debian/lxpanel-data.install 2017-05-06 15:00:38.000000000 +0000 @@ -2,3 +2,5 @@ usr/share/lxpanel usr/share/locale debian/local/source_lxpanel.py usr/share/apport/package-hooks +debian/images/bluetooth-offline.png usr/share/lxpanel/images +debian/images/bluetooth-online.png usr/share/lxpanel/images
  3. Download patch debian/rules

    --- 0.9.3-1/debian/rules 2017-01-20 21:46:25.000000000 +0000 +++ 0.9.3-1ubuntu2/debian/rules 2017-01-21 02:30:40.000000000 +0000 @@ -13,17 +13,21 @@ override_dh_autoreconf: override_dh_auto_configure: ifeq ($(DEB_HOST_ARCH_OS),linux) - dh_auto_configure -- --with-plugins=all --disable-silent-rules + dh_auto_configure -- --with-plugins=all --enable-indicator-support --disable-silent-rules else # omit netstat plugin on non-linux, requires wireless-tools dh_auto_configure -- --with-plugins=all,-netstat --disable-silent-rules --disable-alsa endif +override_dh_install: + dh_install --fail-missing + override_dh_strip: dh_strip --dbg-package=lxpanel-dbg override_dh_makeshlibs: - # package does not provide public shared libs so disable processing + # plugins are not shared libs so disable processing for them + dh_makeshlibs -X/plugins/ # remove unused .la file from the package override_dh_auto_install:
  4. Download patch debian/patches/05_bluetooth_applet.patch
  5. Download patch debian/control

    --- 0.9.3-1/debian/control 2017-01-20 21:46:25.000000000 +0000 +++ 0.9.3-1ubuntu2/debian/control 2017-01-21 02:30:40.000000000 +0000 @@ -1,7 +1,8 @@ Source: lxpanel Section: x11 Priority: optional -Maintainer: Debian LXDE Maintainers <pkg-lxde-maintainers@lists.alioth.debian.org> +Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com> +XSBC-Original-Maintainer: Debian LXDE Maintainers <pkg-lxde-maintainers@lists.alioth.debian.org> Uploaders: Andrew Lee (李健秋) <ajqlee@debian.org>, Andriy Grytsenko <andrej@rep.kiev.ua> @@ -10,7 +11,8 @@ Build-Depends: intltool, libasound2-dev [linux-any], libgtk2.0-dev (>= 2.18), libiw-dev [linux-any], libmenu-cache-dev, libwnck-dev, libfm-gtk-dev (>= 1.2.0), - libxml2-dev, libkeybinder-dev + libxml2-dev, libkeybinder-dev, + libindicator-dev, libicu-dev Standards-Version: 3.9.8 Homepage: http://www.lxde.org/ Vcs-Browser: https://git.lxde.org/gitweb/?p=debian/lxpanel.git @@ -59,8 +61,8 @@ Description: LXDE panel (debug) Package: lxpanel-data Architecture: all Depends: ${misc:Depends} -Breaks: lxpanel (<< 0.7.0) -Replaces: lxpanel (<< 0.7.0) +Breaks: lxpanel (<< 0.8.2-1ubuntu1) +Replaces: lxpanel (<< 0.8.2-1ubuntu1) Description: LXDE panel (data files) LXPanel is a GUI application for the Lightweight X11 Desktop Environment (LXDE). @@ -79,3 +81,16 @@ Description: LXDE panel (plugins develop . This package contains header files required for plugins development and depends on other relevant packages for such task. + +Package: lxpanel-indicator-applet-plugin +Architecture: any +Depends: lxpanel, + ${misc:Depends}, + ${shlibs:Depends} +Suggests: indicator-application-gtk2, + indicator-messages-gtk2, + indicator-sound-gtk2 +Provides: indicator-renderer +Description: lxpanel indicator applet + lxpanel-indicator-applet-plugin is an applet to display information from + various applications consistently in the LXPanel. Binary files 0.9.3-1/debian/images/bluetooth-offline.png and 0.9.3-1ubuntu2/debian/images/bluetooth-offline.png differ Binary files 0.9.3-1/debian/images/bluetooth-online.png and 0.9.3-1ubuntu2/debian/images/bluetooth-online.png differ
  6. Download patch configure.ac

    --- 0.9.3-1/configure.ac 2017-01-20 21:40:02.000000000 +0000 +++ 0.9.3-1ubuntu2/configure.ac 2017-05-17 02:10:49.000000000 +0000 @@ -194,6 +194,7 @@ plugin_volume= plugin_cpu= plugin_deskno= plugin_batt= +plugin_bluetooth= plugin_xkb= plugin_kbled= plugin_thermal= @@ -208,7 +209,7 @@ AC_ARG_WITH(plugins, [ 'all' builds all plugins (default), 'none' builds none ] [ plugins prefixed with '-' are not built] [ Possible plugins are: ] -[ netstatus, netstat, volume, cpu, deskno, batt, kbled,] +[ netstatus, netstat, volume, cpu, deskno, batt, bluetooth, kbled,] [ xkb, thermal, cpufreq, monitors, indicator, weather] , plugins="$withval",[plugins="all"]) @@ -219,7 +220,7 @@ if test x"$plugins" != xall -a x"$plugin fi fi -ALL_PLUGINS_LIST="netstatus netstat volume volumealsa cpu deskno batt kbled xkb thermal cpufreq monitors indicator weather" +ALL_PLUGINS_LIST="netstatus netstat volume volumealsa cpu deskno batt bluetooth kbled xkb thermal cpufreq monitors indicator weather" AC_DEFUN([check_plugin_name],[ plugin_found=false @@ -287,6 +288,7 @@ PLUGINS_LIST="\ $plugin_cpu \ $plugin_deskno \ $plugin_batt \ + $plugin_bluetooth \ $plugin_kbled \ $plugin_xkb \ $plugin_thermal \ @@ -431,6 +433,9 @@ echo Building dynamic plugins: if test x"$plugin_batt" != x; then AC_MSG_RESULT([ batt - Monitor battery status]) fi + if test x"$plugin_bluetooth" != x; then + AC_MSG_RESULT([ bluetooth - Manages Bluetooth devices]) + fi if test x"$plugin_kbled" != x; then AC_MSG_RESULT([ kbled - Indicator for CapsLock, NumLock, and ScrLock]) fi
  7. Download patch .pc/04_disable_gtk3_indicators.patch/plugins/indicator/indicator.c
  8. Download patch .pc/applied-patches

    --- 0.9.3-1/.pc/applied-patches 2017-05-17 02:10:49.195202393 +0000 +++ 0.9.3-1ubuntu2/.pc/applied-patches 2017-05-17 02:10:49.603213491 +0000 @@ -1 +1,3 @@ 01-default-config.patch +04_disable_gtk3_indicators.patch +05_bluetooth_applet.patch
  9. Download patch po/POTFILES.in

    --- 0.9.3-1/po/POTFILES.in 2017-01-20 21:38:52.000000000 +0000 +++ 0.9.3-1ubuntu2/po/POTFILES.in 2017-05-17 02:10:49.000000000 +0000 @@ -42,6 +42,8 @@ plugins/netstatus/netstatus-util.c plugins/batt/batt.c +plugins/bluetooth/bluetooth.c + plugins/kbled/kbled.c plugins/indicator/indicator.c
  10. Download patch plugins/bluetooth/bluetooth.c
  11. Download patch debian/patches/01-default-config.patch

    --- 0.9.3-1/debian/patches/01-default-config.patch 2017-01-20 21:46:25.000000000 +0000 +++ 0.9.3-1ubuntu2/debian/patches/01-default-config.patch 2017-01-21 02:30:40.000000000 +0000 @@ -1,10 +1,11 @@ Author: Andrew Lee (李健秋) <ajqlee@debian.org> Description: Change default terminal and browser. -diff -Naurp lxpanel.orig/data/default/panels/panel.in lxpanel/data/default/panels/panel.in ---- lxpanel.orig/data/default/panels/panel.in 2011-07-29 14:37:01.000000000 +0200 -+++ lxpanel/data/default/panels/panel.in 2012-04-20 14:36:55.535074244 +0200 -@@ -53,10 +53,10 @@ Plugin { +Index: lxpanel-0.9.1/data/default/panels/panel.in +=================================================================== +--- lxpanel-0.9.1.orig/data/default/panels/panel.in 2016-12-27 22:58:30.236662556 -0600 ++++ lxpanel-0.9.1/data/default/panels/panel.in 2016-12-27 22:58:30.232662312 -0600 +@@ -55,10 +55,10 @@ id=pcmanfm.desktop } Button {
  12. Download patch .pc/05_bluetooth_applet.patch/configure.ac
  13. Download patch .pc/05_bluetooth_applet.patch/plugins/Makefile.am
  14. Download patch debian/patches/series

    --- 0.9.3-1/debian/patches/series 2017-01-20 21:46:25.000000000 +0000 +++ 0.9.3-1ubuntu2/debian/patches/series 2017-05-06 14:47:43.000000000 +0000 @@ -1 +1,3 @@ 01-default-config.patch +04_disable_gtk3_indicators.patch +05_bluetooth_applet.patch
  15. Download patch debian/lxpanel-indicator-applet-plugin.install

    --- 0.9.3-1/debian/lxpanel-indicator-applet-plugin.install 1970-01-01 00:00:00.000000000 +0000 +++ 0.9.3-1ubuntu2/debian/lxpanel-indicator-applet-plugin.install 2017-01-21 02:30:40.000000000 +0000 @@ -0,0 +1 @@ +usr/lib/*/lxpanel/plugins/indicator.so
  16. Download patch plugins/Makefile.am

    --- 0.9.3-1/plugins/Makefile.am 2016-11-19 18:28:43.000000000 +0000 +++ 0.9.3-1ubuntu2/plugins/Makefile.am 2017-05-17 02:10:49.000000000 +0000 @@ -59,6 +59,7 @@ pkglib_LTLIBRARIES = $(DYNAMIC_PLUGINS) EXTRA_LTLIBRARIES = \ batt.la \ + bluetooth.la \ cpu.la \ cpufreq.la \ deskno.la \ @@ -80,6 +81,11 @@ batt_la_SOURCES = \ batt/batt_sys.c batt_la_CFLAGS = -I$(srcdir)/batt +# bluetooth +bluetooth_la_SOURCES = \ + bluetooth/bluetooth.c +bluetooth_la_CFLAGS = -DPACKAGE_DATA_DIR=\""$(datadir)/lxpanel"\" -I$(srcdir)/bluetooth + # cpu cpu_la_SOURCES = cpu/cpu.c
  17. Download patch debian/lxpanel.install

    --- 0.9.3-1/debian/lxpanel.install 2017-01-20 21:46:25.000000000 +0000 +++ 0.9.3-1ubuntu2/debian/lxpanel.install 2017-05-06 15:14:46.000000000 +0000 @@ -1,6 +1,18 @@ debian/desktop/* usr/share/applications etc/xdg/lxpanel usr/bin +usr/lib/*/lxpanel/plugins/batt.so +usr/lib/*/lxpanel/plugins/bluetooth.so +usr/lib/*/lxpanel/plugins/cpu.so +usr/lib/*/lxpanel/plugins/cpufreq.so +usr/lib/*/lxpanel/plugins/deskno.so +usr/lib/*/lxpanel/plugins/kbled.so +usr/lib/*/lxpanel/plugins/netstatus.so +usr/lib/*/lxpanel/plugins/thermal.so +usr/lib/*/lxpanel/plugins/volume.so +usr/lib/*/lxpanel/plugins/xkb.so +usr/lib/*/lxpanel/plugins/monitors.so +usr/lib/*/lxpanel/plugins/netstat.so +usr/lib/*/lxpanel/plugins/weather.so usr/lib/*/lxpanel/liblxpanel.so.* -usr/lib/*/lxpanel/plugins usr/share/man
  18. Download patch plugins/indicator/indicator.c

    --- 0.9.3-1/plugins/indicator/indicator.c 2016-02-20 22:26:48.000000000 +0000 +++ 0.9.3-1ubuntu2/plugins/indicator/indicator.c 2017-05-17 02:10:49.000000000 +0000 @@ -863,10 +863,13 @@ static GtkWidget *indicator_configure(LX GtkWidget * dlg = lxpanel_generic_config_dlg(_("Indicator applets"), panel, indicator_apply_configuration, p, _("Indicator Applications"), &indicator->applications, CONF_TYPE_BOOL, +/* Disable configuration of indicator which are not gtk2. +Currently only application and sounds are supported _("Clock Indicator"), &indicator->datetime, CONF_TYPE_BOOL, _("Messaging Menu"), &indicator->messages, CONF_TYPE_BOOL, _("Network Menu"), &indicator->network, CONF_TYPE_BOOL, _("Session Menu"), &indicator->session, CONF_TYPE_BOOL, +*/ _("Sound Menu"), &indicator->sound, CONF_TYPE_BOOL, /* _("Applications menus"), &indicator->appmenu, CONF_TYPE_BOOL,*/ NULL);
  19. Download patch debian/patches/04_disable_gtk3_indicators.patch

    --- 0.9.3-1/debian/patches/04_disable_gtk3_indicators.patch 1970-01-01 00:00:00.000000000 +0000 +++ 0.9.3-1ubuntu2/debian/patches/04_disable_gtk3_indicators.patch 2017-05-01 20:49:26.000000000 +0000 @@ -0,0 +1,18 @@ +Index: lxpanel-0.9.3/plugins/indicator/indicator.c +=================================================================== +--- lxpanel-0.9.3.orig/plugins/indicator/indicator.c 2016-02-20 23:26:48.000000000 +0100 ++++ lxpanel-0.9.3/plugins/indicator/indicator.c 2017-04-21 07:46:00.000000000 +0200 +@@ -863,10 +863,13 @@ + GtkWidget * dlg = lxpanel_generic_config_dlg(_("Indicator applets"), + panel, indicator_apply_configuration, p, + _("Indicator Applications"), &indicator->applications, CONF_TYPE_BOOL, ++/* Disable configuration of indicator which are not gtk2. ++Currently only application and sounds are supported + _("Clock Indicator"), &indicator->datetime, CONF_TYPE_BOOL, + _("Messaging Menu"), &indicator->messages, CONF_TYPE_BOOL, + _("Network Menu"), &indicator->network, CONF_TYPE_BOOL, + _("Session Menu"), &indicator->session, CONF_TYPE_BOOL, ++*/ + _("Sound Menu"), &indicator->sound, CONF_TYPE_BOOL, + /* _("Applications menus"), &indicator->appmenu, CONF_TYPE_BOOL,*/ + NULL);
  20. Download patch debian/source/include-binaries

    --- 0.9.3-1/debian/source/include-binaries 1970-01-01 00:00:00.000000000 +0000 +++ 0.9.3-1ubuntu2/debian/source/include-binaries 2017-05-06 15:11:40.000000000 +0000 @@ -0,0 +1,2 @@ +debian/images/bluetooth-offline.png +debian/images/bluetooth-online.png
  1. lxpanel