Hello community,
here is the log from the commit of package xfce4-panel-plugin-netload for
openSUSE:Factory checked in at 2014-11-18 22:46:58
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/xfce4-panel-plugin-netload (Old)
and /work/SRC/openSUSE:Factory/.xfce4-panel-plugin-netload.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xfce4-panel-plugin-netload"
Changes:
--------
---
/work/SRC/openSUSE:Factory/xfce4-panel-plugin-netload/xfce4-panel-plugin-netload.changes
2014-11-04 17:29:25.000000000 +0100
+++
/work/SRC/openSUSE:Factory/.xfce4-panel-plugin-netload.new/xfce4-panel-plugin-netload.changes
2014-11-18 22:48:52.000000000 +0100
@@ -1,0 +2,7 @@
+Sat Nov 15 23:04:25 UTC 2014 - [email protected]
+
+- update to version 1.2.3
+ - fix a small bug reported by JR, with really big values the code
+ segfaulted in the format_byte_humanreadable function
+
+-------------------------------------------------------------------
Old:
----
xfce4-netload-plugin-1.2.2.tar.bz2
New:
----
xfce4-netload-plugin-1.2.3.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xfce4-panel-plugin-netload.spec ++++++
--- /var/tmp/diff_new_pack.1WNmaO/_old 2014-11-18 22:48:53.000000000 +0100
+++ /var/tmp/diff_new_pack.1WNmaO/_new 2014-11-18 22:48:53.000000000 +0100
@@ -20,7 +20,7 @@
%define plugin_name xfce4-netload-plugin
Name: xfce4-panel-plugin-netload
-Version: 1.2.2
+Version: 1.2.3
Release: 0
Summary: Network Load Monitoring Plugin for the Xfce Panel
License: GPL-2.0+
++++++ xfce4-netload-plugin-1.2.2.tar.bz2 -> xfce4-netload-plugin-1.2.3.tar.bz2
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/xfce4-netload-plugin-1.2.2/ChangeLog
new/xfce4-netload-plugin-1.2.3/ChangeLog
--- old/xfce4-netload-plugin-1.2.2/ChangeLog 2014-11-02 17:47:11.000000000
+0100
+++ new/xfce4-netload-plugin-1.2.3/ChangeLog 2014-11-15 23:04:54.000000000
+0100
@@ -1,3 +1,21 @@
+commit 65df9dacc8edc0465350097fba801456a24c6b6f
+Author: Mike Massonnet <[email protected]>
+Date: Sat Nov 15 23:01:09 2014 +0100
+
+ Bump release 1.2.3
+
+commit 4a5dea3435cc6b1e2322240124f18948240cf4b2
+Author: Mike Massonnet <[email protected]>
+Date: Sat Nov 15 23:00:15 2014 +0100
+
+ Fix unit_names index
+
+commit d6d8e31dac274ec73b082da9fcce9247d71e5157
+Author: Mike Massonnet <[email protected]>
+Date: Sat Nov 15 22:59:30 2014 +0100
+
+ Revive commandline.c test program
+
commit ad2168018ad7533e8a5234b98c06b4750f93817c
Author: Mike Massonnet <[email protected]>
Date: Sun Nov 2 17:46:32 2014 +0100
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/xfce4-netload-plugin-1.2.2/NEWS
new/xfce4-netload-plugin-1.2.3/NEWS
--- old/xfce4-netload-plugin-1.2.2/NEWS 2014-11-02 12:50:26.000000000 +0100
+++ new/xfce4-netload-plugin-1.2.3/NEWS 2014-11-15 23:04:21.000000000 +0100
@@ -1,3 +1,21 @@
+1.2.3
+=====
+- Revive commandline.c test program
+- Fix unit_names index
+
+1.2.2
+=====
+- Fix plugin installation path
+
+1.2.1
+=====
+- Build plugin as a module
+- Update build environment
+- Only round to 0 digits for KiB/s values (bug #11152)
+- Pack progress bars inside event box and hide/show (bug #10258)
+- Do not enforce max length for text/device entries (bug #9869)
+- Fix stringsize - 1 (bug #9172)
+
1.2.0
=====
- Some code cleanup and respect the Panel HIG
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/xfce4-netload-plugin-1.2.2/configure
new/xfce4-netload-plugin-1.2.3/configure
--- old/xfce4-netload-plugin-1.2.2/configure 2014-11-02 17:46:37.000000000
+0100
+++ new/xfce4-netload-plugin-1.2.3/configure 2014-11-15 23:01:15.000000000
+0100
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for xfce4-netload-plugin 1.2.2.
+# Generated by GNU Autoconf 2.69 for xfce4-netload-plugin 1.2.3.
#
# Report bugs to <[email protected]>.
#
@@ -590,8 +590,8 @@
# Identity of this package.
PACKAGE_NAME='xfce4-netload-plugin'
PACKAGE_TARNAME='xfce4-netload-plugin'
-PACKAGE_VERSION='1.2.2'
-PACKAGE_STRING='xfce4-netload-plugin 1.2.2'
+PACKAGE_VERSION='1.2.3'
+PACKAGE_STRING='xfce4-netload-plugin 1.2.3'
PACKAGE_BUGREPORT='[email protected]'
PACKAGE_URL=''
@@ -1385,7 +1385,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures xfce4-netload-plugin 1.2.2 to adapt to many kinds of
systems.
+\`configure' configures xfce4-netload-plugin 1.2.3 to adapt to many kinds of
systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1457,7 +1457,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of xfce4-netload-plugin 1.2.2:";;
+ short | recursive ) echo "Configuration of xfce4-netload-plugin 1.2.3:";;
esac
cat <<\_ACEOF
@@ -1574,7 +1574,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-xfce4-netload-plugin configure 1.2.2
+xfce4-netload-plugin configure 1.2.3
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1997,7 +1997,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by xfce4-netload-plugin $as_me 1.2.2, which was
+It was created by xfce4-netload-plugin $as_me 1.2.3, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2926,7 +2926,7 @@
# Define the identity of the package.
PACKAGE='xfce4-netload-plugin'
- VERSION='1.2.2'
+ VERSION='1.2.3'
cat >>confdefs.h <<_ACEOF
@@ -15029,7 +15029,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by xfce4-netload-plugin $as_me 1.2.2, which was
+This file was extended by xfce4-netload-plugin $as_me 1.2.3, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -15095,7 +15095,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //;
s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-xfce4-netload-plugin config.status 1.2.2
+xfce4-netload-plugin config.status 1.2.3
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/xfce4-netload-plugin-1.2.2/configure.ac
new/xfce4-netload-plugin-1.2.3/configure.ac
--- old/xfce4-netload-plugin-1.2.2/configure.ac 2014-11-02 17:46:34.000000000
+0100
+++ new/xfce4-netload-plugin-1.2.3/configure.ac 2014-11-15 23:01:12.000000000
+0100
@@ -12,7 +12,7 @@
dnl Copyright 2014 Mike Massonnet <[email protected]>
dnl
-m4_define([netload_version],[1.2.2])
+m4_define([netload_version],[1.2.3])
AC_INIT([xfce4-netload-plugin], [netload_version],
[[email protected]])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/xfce4-netload-plugin-1.2.2/panel-plugin/Makefile.am
new/xfce4-netload-plugin-1.2.3/panel-plugin/Makefile.am
--- old/xfce4-netload-plugin-1.2.2/panel-plugin/Makefile.am 2014-11-02
17:45:57.000000000 +0100
+++ new/xfce4-netload-plugin-1.2.3/panel-plugin/Makefile.am 2014-11-15
22:03:50.000000000 +0100
@@ -33,6 +33,11 @@
@LIBXFCE4PANEL_LIBS@ \
@LIBXFCE4UI_LIBS@
+check_PROGRAMS = commandline
+commandline_SOURCES = commandline.c utils.c utils.h net.c net.h
+commandline_CFLAGS = @LIBXFCE4PANEL_CFLAGS@
+commandline_LDADD = @LIBXFCE4PANEL_LIBS@
+
# .desktop file
#
# Some automake trickery here. Because we cannot use $(libexecdir) in the
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/xfce4-netload-plugin-1.2.2/panel-plugin/Makefile.in
new/xfce4-netload-plugin-1.2.3/panel-plugin/Makefile.in
--- old/xfce4-netload-plugin-1.2.2/panel-plugin/Makefile.in 2014-11-02
17:46:37.000000000 +0100
+++ new/xfce4-netload-plugin-1.2.3/panel-plugin/Makefile.in 2014-11-15
23:01:15.000000000 +0100
@@ -53,6 +53,7 @@
build_triplet = @build@
host_triplet = @host@
target_triplet = @target@
+check_PROGRAMS = commandline$(EXEEXT)
subdir = panel-plugin
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -103,6 +104,13 @@
libnetload_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CCLD) $(libnetload_la_CFLAGS) \
$(CFLAGS) $(libnetload_la_LDFLAGS) $(LDFLAGS) -o $@
+am_commandline_OBJECTS = commandline-commandline.$(OBJEXT) \
+ commandline-utils.$(OBJEXT) commandline-net.$(OBJEXT)
+commandline_OBJECTS = $(am_commandline_OBJECTS)
+commandline_DEPENDENCIES =
+commandline_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(commandline_CFLAGS) \
+ $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
@@ -129,8 +137,8 @@
AM_V_GEN = $(am__v_GEN_@AM_V@)
am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
am__v_GEN_0 = @echo " GEN " $@;
-SOURCES = $(libnetload_la_SOURCES)
-DIST_SOURCES = $(libnetload_la_SOURCES)
+SOURCES = $(libnetload_la_SOURCES) $(commandline_SOURCES)
+DIST_SOURCES = $(libnetload_la_SOURCES) $(commandline_SOURCES)
am__can_run_installinfo = \
case $$AM_UPDATE_INFO_DIR in \
n|no|NO) false;; \
@@ -334,6 +342,9 @@
@LIBXFCE4PANEL_LIBS@ \
@LIBXFCE4UI_LIBS@
+commandline_SOURCES = commandline.c utils.c utils.h net.c net.h
+commandline_CFLAGS = @LIBXFCE4PANEL_CFLAGS@
+commandline_LDADD = @LIBXFCE4PANEL_LIBS@
# .desktop file
#
@@ -422,12 +433,27 @@
libnetload.la: $(libnetload_la_OBJECTS) $(libnetload_la_DEPENDENCIES)
$(EXTRA_libnetload_la_DEPENDENCIES)
$(AM_V_CCLD)$(libnetload_la_LINK) -rpath $(plugindir)
$(libnetload_la_OBJECTS) $(libnetload_la_LIBADD) $(LIBS)
+clean-checkPROGRAMS:
+ @list='$(check_PROGRAMS)'; test -n "$$list" || exit 0; \
+ echo " rm -f" $$list; \
+ rm -f $$list || exit $$?; \
+ test -n "$(EXEEXT)" || exit 0; \
+ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
+ echo " rm -f" $$list; \
+ rm -f $$list
+commandline$(EXEEXT): $(commandline_OBJECTS) $(commandline_DEPENDENCIES)
$(EXTRA_commandline_DEPENDENCIES)
+ @rm -f commandline$(EXEEXT)
+ $(AM_V_CCLD)$(commandline_LINK) $(commandline_OBJECTS)
$(commandline_LDADD) $(LIBS)
+
mostlyclean-compile:
-rm -f *.$(OBJEXT)
distclean-compile:
-rm -f *.tab.c
+@AMDEP_TRUE@@am__include@
@am__quote@./$(DEPDIR)/commandline-commandline.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/commandline-net.Po@am__quote@
+@AMDEP_TRUE@@am__include@
@am__quote@./$(DEPDIR)/commandline-utils.Po@am__quote@
@AMDEP_TRUE@@am__include@
@am__quote@./$(DEPDIR)/libnetload_la-monitor-label.Plo@am__quote@
@AMDEP_TRUE@@am__include@
@am__quote@./$(DEPDIR)/libnetload_la-net.Plo@am__quote@
@AMDEP_TRUE@@am__include@
@am__quote@./$(DEPDIR)/libnetload_la-netload.Plo@am__quote@
@@ -482,6 +508,48 @@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE)
$(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC
$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS)
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS)
$(libnetload_la_CFLAGS) $(CFLAGS) -c -o libnetload_la-net.lo `test -f 'net.c'
|| echo '$(srcdir)/'`net.c
+commandline-commandline.o: commandline.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(AM_CPPFLAGS) $(CPPFLAGS) $(commandline_CFLAGS) $(CFLAGS) -MT
commandline-commandline.o -MD -MP -MF $(DEPDIR)/commandline-commandline.Tpo -c
-o commandline-commandline.o `test -f 'commandline.c' || echo
'$(srcdir)/'`commandline.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv)
$(DEPDIR)/commandline-commandline.Tpo $(DEPDIR)/commandline-commandline.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='commandline.c'
object='commandline-commandline.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE)
$(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES)
$(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(commandline_CFLAGS) $(CFLAGS) -c -o
commandline-commandline.o `test -f 'commandline.c' || echo
'$(srcdir)/'`commandline.c
+
+commandline-commandline.obj: commandline.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(AM_CPPFLAGS) $(CPPFLAGS) $(commandline_CFLAGS) $(CFLAGS) -MT
commandline-commandline.obj -MD -MP -MF $(DEPDIR)/commandline-commandline.Tpo
-c -o commandline-commandline.obj `if test -f 'commandline.c'; then
$(CYGPATH_W) 'commandline.c'; else $(CYGPATH_W) '$(srcdir)/commandline.c'; fi`
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv)
$(DEPDIR)/commandline-commandline.Tpo $(DEPDIR)/commandline-commandline.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='commandline.c'
object='commandline-commandline.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE)
$(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES)
$(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(commandline_CFLAGS) $(CFLAGS) -c -o
commandline-commandline.obj `if test -f 'commandline.c'; then $(CYGPATH_W)
'commandline.c'; else $(CYGPATH_W) '$(srcdir)/commandline.c'; fi`
+
+commandline-utils.o: utils.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(AM_CPPFLAGS) $(CPPFLAGS) $(commandline_CFLAGS) $(CFLAGS) -MT
commandline-utils.o -MD -MP -MF $(DEPDIR)/commandline-utils.Tpo -c -o
commandline-utils.o `test -f 'utils.c' || echo '$(srcdir)/'`utils.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/commandline-utils.Tpo
$(DEPDIR)/commandline-utils.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='utils.c'
object='commandline-utils.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE)
$(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES)
$(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(commandline_CFLAGS) $(CFLAGS) -c -o
commandline-utils.o `test -f 'utils.c' || echo '$(srcdir)/'`utils.c
+
+commandline-utils.obj: utils.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(AM_CPPFLAGS) $(CPPFLAGS) $(commandline_CFLAGS) $(CFLAGS) -MT
commandline-utils.obj -MD -MP -MF $(DEPDIR)/commandline-utils.Tpo -c -o
commandline-utils.obj `if test -f 'utils.c'; then $(CYGPATH_W) 'utils.c'; else
$(CYGPATH_W) '$(srcdir)/utils.c'; fi`
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/commandline-utils.Tpo
$(DEPDIR)/commandline-utils.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='utils.c'
object='commandline-utils.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE)
$(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES)
$(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(commandline_CFLAGS) $(CFLAGS) -c -o
commandline-utils.obj `if test -f 'utils.c'; then $(CYGPATH_W) 'utils.c'; else
$(CYGPATH_W) '$(srcdir)/utils.c'; fi`
+
+commandline-net.o: net.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(AM_CPPFLAGS) $(CPPFLAGS) $(commandline_CFLAGS) $(CFLAGS) -MT
commandline-net.o -MD -MP -MF $(DEPDIR)/commandline-net.Tpo -c -o
commandline-net.o `test -f 'net.c' || echo '$(srcdir)/'`net.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/commandline-net.Tpo
$(DEPDIR)/commandline-net.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='net.c'
object='commandline-net.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE)
$(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES)
$(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(commandline_CFLAGS) $(CFLAGS) -c -o
commandline-net.o `test -f 'net.c' || echo '$(srcdir)/'`net.c
+
+commandline-net.obj: net.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(AM_CPPFLAGS) $(CPPFLAGS) $(commandline_CFLAGS) $(CFLAGS) -MT
commandline-net.obj -MD -MP -MF $(DEPDIR)/commandline-net.Tpo -c -o
commandline-net.obj `if test -f 'net.c'; then $(CYGPATH_W) 'net.c'; else
$(CYGPATH_W) '$(srcdir)/net.c'; fi`
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/commandline-net.Tpo
$(DEPDIR)/commandline-net.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='net.c'
object='commandline-net.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE)
$(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES)
$(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(commandline_CFLAGS) $(CFLAGS) -c -o
commandline-net.obj `if test -f 'net.c'; then $(CYGPATH_W) 'net.c'; else
$(CYGPATH_W) '$(srcdir)/net.c'; fi`
+
mostlyclean-libtool:
-rm -f *.lo
@@ -592,6 +660,7 @@
fi; \
done
check-am: all-am
+ $(MAKE) $(AM_MAKEFLAGS) $(check_PROGRAMS)
check: check-am
all-am: Makefile $(LTLIBRARIES) $(DATA)
installdirs:
@@ -631,8 +700,8 @@
@echo "it deletes files that may require special tools to rebuild."
clean: clean-am
-clean-am: clean-generic clean-libtool clean-pluginLTLIBRARIES \
- mostlyclean-am
+clean-am: clean-checkPROGRAMS clean-generic clean-libtool \
+ clean-pluginLTLIBRARIES mostlyclean-am
distclean: distclean-am
-rm -rf ./$(DEPDIR)
@@ -700,22 +769,23 @@
uninstall-am: uninstall-desktopDATA uninstall-pluginLTLIBRARIES
-.MAKE: install-am install-strip
+.MAKE: check-am install-am install-strip
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
- clean-libtool clean-pluginLTLIBRARIES ctags distclean \
- distclean-compile distclean-generic distclean-libtool \
- distclean-tags distdir dvi dvi-am html html-am info info-am \
- install install-am install-data install-data-am \
- install-desktopDATA install-dvi install-dvi-am install-exec \
- install-exec-am install-html install-html-am install-info \
- install-info-am install-man install-pdf install-pdf-am \
- install-pluginLTLIBRARIES install-ps install-ps-am \
- install-strip installcheck installcheck-am installdirs \
- maintainer-clean maintainer-clean-generic mostlyclean \
- mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
- pdf pdf-am ps ps-am tags uninstall uninstall-am \
- uninstall-desktopDATA uninstall-pluginLTLIBRARIES
+.PHONY: CTAGS GTAGS all all-am check check-am clean \
+ clean-checkPROGRAMS clean-generic clean-libtool \
+ clean-pluginLTLIBRARIES ctags distclean distclean-compile \
+ distclean-generic distclean-libtool distclean-tags distdir dvi \
+ dvi-am html html-am info info-am install install-am \
+ install-data install-data-am install-desktopDATA install-dvi \
+ install-dvi-am install-exec install-exec-am install-html \
+ install-html-am install-info install-info-am install-man \
+ install-pdf install-pdf-am install-pluginLTLIBRARIES \
+ install-ps install-ps-am install-strip installcheck \
+ installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-compile \
+ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+ tags uninstall uninstall-am uninstall-desktopDATA \
+ uninstall-pluginLTLIBRARIES
@INTLTOOL_DESKTOP_RULE@
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/xfce4-netload-plugin-1.2.2/panel-plugin/commandline.c
new/xfce4-netload-plugin-1.2.3/panel-plugin/commandline.c
--- old/xfce4-netload-plugin-1.2.2/panel-plugin/commandline.c 2014-11-02
12:50:26.000000000 +0100
+++ new/xfce4-netload-plugin-1.2.3/panel-plugin/commandline.c 2014-11-15
22:59:23.000000000 +0100
@@ -33,9 +33,6 @@
#include "net.h"
#include "utils.h"
-/* This is not good style, but it works for testing and simplifies compilation
*/
-#include "net.c"
-#include "utils.c"
netdata data;
@@ -76,9 +73,9 @@
for (;;)
{
get_current_netload(&data, &in, &out, &tot);
- format_with_thousandssep(bufIn, 20, (double)in, 2);
- format_with_thousandssep(bufOut, 20, (double)in, 2);
- format_with_thousandssep(bufTot, 20, (double)in, 2);
+ format_byte_humanreadable(bufIn, 20, (double)in, 0);
+ format_byte_humanreadable(bufOut, 20, (double)out, 0);
+ format_byte_humanreadable(bufTot, 20, (double)tot, 0);
printf("Current netload:\nIN : %s\nOUT: %s\nTOT: %s\nIP: %s\n",
bufIn, bufOut, bufTot, get_ip_address(&data));
sleep(1);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/xfce4-netload-plugin-1.2.2/panel-plugin/utils.c
new/xfce4-netload-plugin-1.2.3/panel-plugin/utils.c
--- old/xfce4-netload-plugin-1.2.2/panel-plugin/utils.c 2014-11-02
15:23:49.000000000 +0100
+++ new/xfce4-netload-plugin-1.2.3/panel-plugin/utils.c 2014-11-15
22:57:15.000000000 +0100
@@ -76,7 +76,7 @@
char buffer[BUFSIZ], formatstring[BUFSIZ];
char* bufptr = buffer;
char* unit_names[] = { N_("B"), N_("KiB"), N_("MiB"), N_("GiB") };
- unsigned int uidx = 1;
+ unsigned int uidx = 0;
double number_displayed = number / 1024.0;
unsigned int i;
int numberOfIntegerChars, count;
@@ -97,7 +97,7 @@
}
/* calculate number and appropriate unit size for display */
- while(number_displayed >= 1024.0 && uidx < sizeof(unit_names))
+ while(number_displayed >= 1024.0 && uidx < (sizeof(unit_names) /
sizeof(char*) - 1))
{
number_displayed /= 1024.0;
uidx++;
--
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
