xfce4-netload-plugin (0.4.0-4) debian-dir only changes

Summary

 debian/changelog                             |  160 +++++++++++++++++++++++++++
 debian/compat                                |    1 
 debian/control                               |   18 +++
 debian/copyright                             |   18 +++
 debian/patches/01_fix-ftbfs-kfreebsd.patch   |   50 ++++++++
 debian/patches/02_fix-tooltips-gtk2.16.patch |   86 ++++++++++++++
 debian/rules                                 |    8 +
 debian/watch                                 |    3 
 8 files changed, 344 insertions(+)

    
download this patch

Patch contents

--- xfce4-netload-plugin-0.4.0.orig/debian/compat
+++ xfce4-netload-plugin-0.4.0/debian/compat
@@ -0,0 +1 @@
+7
--- xfce4-netload-plugin-0.4.0.orig/debian/copyright
+++ xfce4-netload-plugin-0.4.0/debian/copyright
@@ -0,0 +1,18 @@
+This package was debianized by Andrew Lau <netsnipe@users.sourceforge.net> on
+Wed, 29 Oct 2003 15:47:14 +1100.
+
+It was downloaded from <http://download.berlios.de/xfce-goodies/>
+
+Upstream Authors:
+	Benedikt Meurer	<benedikt.meurer@unix-ag.uni-siegen.de>
+© 2003 Bernhard Walle	<bernhard.walle@gmx.de>
+	Hendrik Scholz	<hscholz@raisdorf.net> (Wormulon code base)
+ 
+Copyright:
+ 
+This program is free software; you can redistribute it and/or modify it under
+the terms of the GNU General Public License as published by the Free Software
+Foundation, version 2 only.
+ 
+On Debian systems, the complete text of the GNU General Public License, Version
+2 can be found in the file /usr/share/common-licenses/GPL-2
--- xfce4-netload-plugin-0.4.0.orig/debian/rules
+++ xfce4-netload-plugin-0.4.0/debian/rules
@@ -0,0 +1,8 @@
+#!/usr/bin/make -f
+include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/autotools.mk
+
+binary-post-install/xfce4-netload-plugin::
+	-rm -rf debian/xfce4-netload-plugin/usr/lib/xfce4/panel-plugins/*.a
+	-rm -rf debian/xfce4-netload-plugin/usr/lib/xfce4/panel-plugins/*.la
--- xfce4-netload-plugin-0.4.0.orig/debian/changelog
+++ xfce4-netload-plugin-0.4.0/debian/changelog
@@ -0,0 +1,160 @@
+xfce4-netload-plugin (0.4.0-4) unstable; urgency=low
+
+  * debian/patches:
+    - 01_fix-ftbfs-kfreebsd refreshed, fix FTBFS on kFreeBSD.   closes: #564651
+
+ -- Yves-Alexis Perez <corsac@debian.org>  Mon, 11 Jan 2010 23:36:48 +0100
+
+xfce4-netload-plugin (0.4.0-3) unstable; urgency=low
+
+  [ Yves-Alexis Perez ]
+  * debian/control:
+    - switch to xfce section.
+    - bump standards version to 3.8.3.
+  * debian/watch edited to track Xfce archive reorganisation.
+  * debian/rules:
+    - drop useless removal of config.status, fix ftbfs.         closes: #564344
+
+  [ Evgeni Golov ]
+  * Fix Vcs-* fields, they were missing 'trunk' in the path.
+
+  [ Yves-Alexis Perez ]
+
+ -- Yves-Alexis Perez <corsac@debian.org>  Sat, 09 Jan 2010 15:40:25 +0100
+
+xfce4-netload-plugin (0.4.0-2) unstable; urgency=low
+
+  * debian/patches:
+    - 02_fix-tooltips-gtk2.16 added, fix tooltips not appearing on gtk 2.16.
+  * debian/control:
+    - update standards version to 3.8.1.
+    - update build-deps to Xfce 4.6 and debhelper one to 7.
+  * debian/compat bumped to 7.
+
+ -- Yves-Alexis Perez <corsac@debian.org>  Mon, 25 May 2009 23:19:55 +0200
+
+xfce4-netload-plugin (0.4.0-1) unstable; urgency=low
+
+  [ Simon Huggins ]
+  * debian/control: Move fake Homepage field to a real one now dpkg
+    supports it.
+  * Add Vcs-* headers to debian/control
+
+  [ Yves-Alexis Perez ]
+  * Fake new upstream release to follow package renaming.
+  * debian/control:
+    - update my email address.
+    - remove Rudy and Martin from Uploaders. Thanks to them!
+    - update standards version to 3.8.0.
+    - add dep on ${misc:Depends}. 
+  * debian/copyright: update dates, and license information.
+
+ -- Yves-Alexis Perez <corsac@debian.org>  Sun, 01 Mar 2009 11:39:32 +0100
+
+xfce4-netload-plugin (0.4-3) unstable; urgency=low
+
+  (Stefan Ott)
+  * debian/control: updated the url
+
+  (Yves-Alexis Perez)
+  * debian/control:
+   - removed Jani from uploaders as he's not anymore in the team.
+   - removed gtk from build-dep as it's pulled by xfce4-panel-dev anyway.
+  * debian/patches:
+  	- 01_fix-ftbfs-kfreebsd added, thanks Cyril Brulebois.		closes: #415662
+
+  (Simon Huggins)
+  * Build against latest and greatest xfce.
+
+ -- Yves-Alexis Perez <corsac@corsac.net>  Thu, 19 Apr 2007 18:06:24 +0100
+
+xfce4-netload-plugin (0.4-2) unstable; urgency=low
+
+  * Updated build-deps to 4.3.90.2 (Xfce 4.4 Beta2).
+  * Updated standards version to 3.7.2.
+
+ -- Yves-Alexis Perez <corsac@corsac.net>  Wed, 26 Jul 2006 17:48:23 +0100
+
+xfce4-netload-plugin (0.4-1) unstable; urgency=low
+
+  * New upstream release
+  * Removed explicit dependency on xfce4-panel (managed by shlibs)
+
+ -- Yves-Alexis Perez <corsac@corsac.net>  Wed, 03 May 2006 19:17:15 +0100
+
+xfce4-netload-plugin (0.3.3-1) unstable; urgency=low
+
+  [ Jani Monoses ]
+  * Set Standard policy version to 3.6.2
+
+  [ Rudy Godoy ]
+  * New upstream release
+  * Removed dependency and autotools bootstraping since
+    upstream is using an up to date version
+  * Added patch and rebootstrapped automake files to remove libgtop definition
+    on Makefile.am which should not be used anymore according changelog. 
+    This should fix FTBFS on mips. 
+    (Temporary solution, already forwarded upstream). (Closes: #355840)
+
+ -- Rudy Godoy <rudy@kernel-panik.org>  Sat, 25 Mar 2006 11:17:09 +0000
+
+xfce4-netload-plugin (0.3.2-2) unstable; urgency=high
+
+  * Binary skew blocks testing progression hence urgency high
+  * Add build-depends on >= 4.2.2 (though this won't matter now the
+    autobuilders have actually all installed it but hey)
+
+ -- Simon Huggins <huggie@earth.li>  Thu, 14 Jul 2005 09:38:05 +0100
+
+xfce4-netload-plugin (0.3.2-1) unstable; urgency=low
+
+  * New upstream release
+  * Moving to unstable
+
+ -- Emanuele Rocca <ema@debian.org>  Sat, 18 Jun 2005 17:51:30 +0200
+
+xfce4-netload-plugin (0.3.1-1) experimental; urgency=low
+  
+  * New upstream release
+ 
+ -- Emanuele Rocca <ema@debian.org>  Tue, 29 Mar 2005 21:12:43 +0200
+ 
+xfce4-netload-plugin (0.2.4-1) unstable; urgency=low
+
+  * (Simon Huggins)
+   - Package adopted by the Debian Xfce Maintainers (closes: #245121)
+   - New Upstream Release
+   - Put the cdbs autotool update magic in place and the appropriate
+     build-depends
+   - Change the case on Xfce appropriately
+   - Work around some evil cdbs/autotools defaults which cause the automagic
+     autotool updates not to work. Grmbl
+  * (Rudy Godoy)
+   - Fixed capitalisation on description
+
+ -- Rudy Godoy <rudy@kernel-panik.org>  Tue,  1 Feb 2005 00:49:52 -0500
+
+xfce4-netload-plugin (0.2.2-4) unstable; urgency=low
+
+  * Uploading with maintainer set to QA group
+  * Updated libtool (closes: #239470)
+
+ -- Andrew Pollock <apollock@debian.org>  Sun, 25 Apr 2004 11:13:24 +1000
+
+xfce4-netload-plugin (0.2.2-3) unstable; urgency=low
+
+  * Remove bashism from debian/rules
+
+ -- Andrew Lau <netsnipe@users.sourceforge.net>  Sat,  8 Nov 2003 14:36:52 +1100
+
+xfce4-netload-plugin (0.2.2-2) unstable; urgency=low
+
+  * Remove libtool library and object.
+
+ -- Andrew Lau <netsnipe@users.sourceforge.net>  Fri,  7 Nov 2003 16:16:36 +1100
+
+xfce4-netload-plugin (0.2.2-1) unstable; urgency=low
+
+  * Initial Release.
+
+ -- Andrew Lau <netsnipe@users.sourceforge.net>  Wed, 29 Oct 2003 21:51:30 +1100
--- xfce4-netload-plugin-0.4.0.orig/debian/control
+++ xfce4-netload-plugin-0.4.0/debian/control
@@ -0,0 +1,18 @@
+Source: xfce4-netload-plugin
+Section: xfce
+Priority: optional
+Maintainer: Debian Xfce Maintainers <pkg-xfce-devel@lists.alioth.debian.org>
+Uploaders: Emanuele Rocca <ema@debian.org>, Simon Huggins <huggie@earth.li>,
+ Yves-Alexis Perez <corsac@debian.org>
+Build-Depends: cdbs, debhelper (>= 7), xfce4-panel-dev (>= 4.6.0), libxml2-dev, libxml-parser-perl
+Standards-Version: 3.8.3
+Homepage: http://goodies.xfce.org/
+Vcs-Svn: svn://svn.debian.org/pkg-xfce/goodies/trunk/xfce4-netload-plugin/
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-xfce/goodies/trunk/xfce4-netload-plugin/
+
+Package: xfce4-netload-plugin
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: network load monitor plugin for the Xfce4 panel
+ This plugin displays the current load of the network interfaces of your choice
+ in the panel.
--- xfce4-netload-plugin-0.4.0.orig/debian/watch
+++ xfce4-netload-plugin-0.4.0/debian/watch
@@ -0,0 +1,3 @@
+version=3
+http://archive.xfce.org/src/panel-plugins/xfce4-netload-plugin/([\d\.]+)/ \
+	xfce4-netload-plugin-([\d\.]+)\.tar\.(?:gz|bz2)
--- xfce4-netload-plugin-0.4.0.orig/debian/patches/01_fix-ftbfs-kfreebsd.patch
+++ xfce4-netload-plugin-0.4.0/debian/patches/01_fix-ftbfs-kfreebsd.patch
@@ -0,0 +1,50 @@
+diff --git a/panel-plugin/net.c b/panel-plugin/net.c
+index e49390d..2e835c8 100644
+--- a/panel-plugin/net.c
++++ b/panel-plugin/net.c
+@@ -46,7 +46,7 @@
+ #elif __APPLE__
+ # include "src/macos.h"
+ # include "src/macos.c"
+-#elif __FreeBSD__
++#elif __FreeBSD__ || __FreeBSD_kernel__
+ # include "wormulon/freebsd.h"
+ # include "wormulon/freebsd.c"
+ #elif __linux__
+diff --git a/panel-plugin/net.h b/panel-plugin/net.h
+index ad0c262..4bd20cb 100644
+--- a/panel-plugin/net.h
++++ b/panel-plugin/net.h
+@@ -62,7 +62,7 @@ typedef struct
+ #ifdef __HPUX__
+     int             wait_pcks_counter;
+     nmapi_logstat*  if_ptr;
+-#elif __FreeBSD__
++#elif __FreeBSD__ || __FreeBSD_kernel__
+     int             watchif;
+     int             dev_opened;
+ #elif __NetBSD__
+diff --git a/panel-plugin/os.h b/panel-plugin/os.h
+index 524fefb..e49a356 100644
+--- a/panel-plugin/os.h
++++ b/panel-plugin/os.h
+@@ -72,7 +72,7 @@
+ #include <net/if_media.h>
+ #include <net/if_mib.h>
+ #include <arpa/inet.h>
+-#elif __FreeBSD__           /* F R E E B S D */
++#elif __FreeBSD__ || __FreeBSD_kernel__          /* F R E E B S D */
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <stdarg.h>
+@@ -94,8 +94,10 @@
+ #include <net/if_media.h>
+ #include <net/if_mib.h>
+ #include <arpa/inet.h>
++#if (__FreeBSD_kernel__ < 8) && (__FreeBSD__ < 8)
+ #include <net/ppp_defs.h>
+ #include <net/if_ppp.h>
++#endif
+ #elif __NetBSD__            /* N E T B S D */
+ #include <stdio.h>
+ #include <sys/param.h>
--- xfce4-netload-plugin-0.4.0.orig/debian/patches/02_fix-tooltips-gtk2.16.patch
+++ xfce4-netload-plugin-0.4.0/debian/patches/02_fix-tooltips-gtk2.16.patch
@@ -0,0 +1,86 @@
+--- ./panel-plugin/netload.c.orig	2005-10-09 12:08:01.000000000 +0300
++++ ./panel-plugin/netload.c	2009-05-23 20:50:22.000000000 +0300
+@@ -30,8 +30,6 @@
+ #include <libxfce4panel/xfce-panel-plugin.h>
+ 
+ 
+-static GtkTooltips *tooltips = NULL;
+-
+ #define BORDER 8
+ 
+ /* Defaults */
+@@ -219,7 +217,7 @@
+                     "Incoming: %s kByte/s\nOutgoing: %s kByte/s\nTotal: %s kByte/s"),
+                     get_name(&(global->monitor->data)), ip ? ip : _("no IP address"),
+                     HISTSIZE_CALCULATE, buffer[IN], buffer[OUT], buffer[TOT]);
+-        gtk_tooltips_set_tip(tooltips, GTK_WIDGET(global->ebox), caption, NULL);
++        gtk_widget_set_tooltip_text(GTK_WIDGET(global->ebox), caption);
+     }
+ 
+     return TRUE;
+@@ -237,6 +235,14 @@
+ 
+     if (global->monitor->options.update_interval > 0)
+     {
++#if GLIB_CHECK_VERSION( 2,14,0 )
++        if (global->monitor->options.update_interval % 1000 == 0)
++        {
++            global->timeout_id = g_timeout_add_seconds(global->monitor->
++                options.update_interval / 1000, (GtkFunction)update_monitors, global);
++        }
++	else
++#endif
+         global->timeout_id =  g_timeout_add( global->monitor->options.update_interval, 
+             (GtkFunction)update_monitors, global);
+     }
+@@ -368,11 +374,6 @@
+     global->plugin = plugin;
+     xfce_panel_plugin_add_action_widget (plugin, global->ebox);
+ 
+-    if (!tooltips) 
+-    {
+-        tooltips = gtk_tooltips_new();
+-    }
+-
+     global->monitor = g_new(t_monitor, 1);
+     global->monitor->options.label_text = g_strdup(DEFAULT_TEXT);
+     global->monitor->options.network_device = g_strdup("");
+@@ -819,6 +820,10 @@
+     GtkWidget        *sep1, *sep2;
+     GtkBox           *update_hbox;
+     GtkWidget        *update_label, *update_unit_label;
++#if GLIB_CHECK_VERSION( 2,14,0 )
++    GtkBox           *update_hint_hbox;
++    GtkWidget        *update_hint_label;
++#endif
+     GtkWidget        *color_label[SUM];
+     GtkWidget        *align;
+     GtkBox           *color_hbox[SUM];
+@@ -935,7 +940,7 @@
+     gtk_misc_set_alignment(GTK_MISC(update_label), 0, 0.5);
+     gtk_box_pack_start(GTK_BOX(update_hbox), GTK_WIDGET(update_label), FALSE, FALSE, 0);
+     
+-    global->monitor->update_spinner = gtk_spin_button_new_with_range (0.1, 10.0, 0.05);
++    global->monitor->update_spinner = gtk_spin_button_new_with_range (1.0, 10.0, 0.25);
+     gtk_spin_button_set_digits( GTK_SPIN_BUTTON(global->monitor->update_spinner), 2 );
+     gtk_spin_button_set_value( GTK_SPIN_BUTTON(global->monitor->update_spinner), 
+             global->monitor->options.update_interval / 1000.0 );
+@@ -948,6 +953,18 @@
+     
+     gtk_widget_show_all(GTK_WIDGET(update_hbox));
+     gtk_size_group_add_widget(sg, update_label);
++
++#if GLIB_CHECK_VERSION( 2,14,0 )
++    /* Update interval hint */
++    update_hint_hbox = GTK_BOX(gtk_hbox_new(FALSE, 5));
++    update_hint_label = gtk_label_new(_("Note: Whole seconds are more power-efficient"));
++    gtk_label_set_line_wrap(GTK_LABEL(update_hint_label), TRUE);
++    gtk_box_pack_start(GTK_BOX(update_hint_hbox), GTK_WIDGET(update_hint_label),
++                       FALSE, FALSE, 0);
++    gtk_box_pack_start(GTK_BOX(global->monitor->opt_vbox),
++                       GTK_WIDGET(update_hint_hbox), FALSE, FALSE, 0);
++    gtk_widget_show_all(GTK_WIDGET(update_hint_hbox));
++#endif
+     
+     
+     sep1 = gtk_hseparator_new();