--- ygraph-0.16~cvs20090218.orig/src/ygraph.c
+++ ygraph-0.16~cvs20090218/src/ygraph.c
@@ -316,7 +316,7 @@
      NULL
     },
     {"frame_integrate",
-     (char)NULL,
+     (char)0,
      POPT_ARG_NONE,
      &option_f_int,
      0,
@@ -324,7 +324,7 @@
      NULL
     },
     {"time_integrate",
-     (char)NULL,
+     (char)0,
      POPT_ARG_NONE,
      &option_t_int,
      0,
@@ -332,7 +332,7 @@
      NULL
     },
     {"font_size_factor",
-     (char)NULL,
+     (char)0,
      POPT_ARG_STRING,
      &option_font_size_factor,
      0,
--- ygraph-0.16~cvs20090218.orig/src/ygraph.h
+++ ygraph-0.16~cvs20090218/src/ygraph.h
@@ -36,6 +36,7 @@
 #endif
 
 #ifndef __GTK_H__
+#  define GTK_ENABLE_BROKEN 1
 #  include <gtk/gtk.h>
 #endif
 
@@ -699,6 +700,7 @@
 gint dataset_read_from_file (gchar* fname, gint skip);
 void time_list_merge(DataSet* data_set);
 void time_list_build(void);
+int check_for_nan(gchar* str);
 
 /* scape_panel.c */
 void scale_panel_create(Plot* plot, gint action, GtkItem* range_set_button);
@@ -732,6 +734,8 @@
 void string_to_columns(gchar* range_string);
 gdouble* string_to_range(gchar* range_string);
 gchar* get_font(const char* font, gint font_size);
+void set_global_column_format_string();
+gint find_equal(gchar* s, gint len);
 
 #endif /* __YGRAPH_H__ */
 
--- ygraph-0.16~cvs20090218.orig/src/read_data.c
+++ ygraph-0.16~cvs20090218/src/read_data.c
@@ -166,11 +166,10 @@
 void
 dataset_set_label(DataSet* data_set, gchar* label)
 {
-  gchar* s;
   gint v;
   v = find_equal(label, strlen(label));
   if (v>-1)
-    data_set->name = g_strdup(g_strstrip(s));
+    data_set->name = g_strdup(g_strstrip(label + v));
   else
     data_set->name = NULL;
 }
--- ygraph-0.16~cvs20090218.orig/src/util.c
+++ ygraph-0.16~cvs20090218/src/util.c
@@ -399,13 +399,13 @@
     if ((c==global_x_column) || (c==global_y_column))
     {
       tmp=format;
-      format=g_strconcat(format, " %s", 0L);
+      format=g_strconcat(format, " %s", NULL);
       g_free(tmp);
     }
     else
     {
       tmp=format;
-      format=g_strconcat(format, " %*s", 0L);
+      format=g_strconcat(format, " %*s", NULL);
       g_free(tmp);
     }
   }
--- ygraph-0.16~cvs20090218.orig/debian/rules
+++ ygraph-0.16~cvs20090218/debian/rules
@@ -0,0 +1,112 @@
+#!/usr/bin/make -f
+# Sample debian/rules that uses debhelper.
+# GNU copyright 1997 to 1999 by Joey Hess.
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+# These are used for cross-compiling and for saving the configure script
+# from having to guess our platform (since we know it already)
+DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
+	ygraph_confflags += --build $(DEB_HOST_GNU_TYPE)
+else
+	ygraph_confflags += --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE)
+endif
+		
+
+CFLAGS = -Wall -g
+
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+	CFLAGS += -O0
+else
+	CFLAGS += -O2
+endif
+ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
+	INSTALL_PROGRAM += -s
+endif
+
+config.status: configure
+	dh_testdir
+
+	if test -f config.sub; then \
+		mv config.sub config.sub.debsave; \
+	fi
+	if test -f config.guess; then \
+		mv config.guess config.guess.debsave; \
+	fi
+	ln -sf /usr/share/misc/config.sub .
+	ln -sf /usr/share/misc/config.guess .
+
+	./configure $(ygraph_confflags) --prefix=/usr \
+		--mandir=\$${prefix}/share/man \
+		--infodir=\$${prefix}/share/info
+
+build: build-stamp
+
+build-stamp: config.status
+	dh_testdir
+
+	$(MAKE)
+
+	touch build-stamp
+
+clean: 
+	dh_testdir
+	dh_testroot
+	rm -f build-stamp 
+
+	test ! -f Makefile || $(MAKE) distclean
+
+	if test -L config.sub; then \
+		$(RM) config.sub; \
+		if test -e config.sub.debsave; then \
+			mv config.sub.debsave config.sub; \
+		fi; \
+	fi
+	if test -L config.guess; then \
+		$(RM) config.guess; \
+		if test -e config.guess.debsave; then \
+			mv config.guess.debsave config.guess; \
+		fi; \
+	fi
+
+	dh_clean config.status config.h config.log stamp-h1 po/stamp-po Makefile
+
+install: build
+	dh_testdir
+	dh_testroot
+	dh_prep
+	dh_installdirs
+
+	$(MAKE) install-exec DESTDIR=$(CURDIR)/debian/ygraph/
+
+# Build architecture-independent files here.
+binary-indep: build install
+# We have nothing to do by default.
+
+# Build architecture-dependent files here.
+binary-arch: build install
+	dh_testdir
+	dh_testroot
+	dh_install debian/ygraph.desktop usr/share/applications
+	dh_desktop
+	dh_installdocs
+	dh_installexamples
+	dh_installmenu
+	dh_installman
+	dh_installinfo
+	dh_installchangelogs ChangeLog
+	dh_link
+	dh_strip
+	dh_compress
+	dh_fixperms
+	dh_installdeb
+	dh_shlibdeps
+	dh_gencontrol
+	dh_md5sums
+	dh_builddeb
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install
--- ygraph-0.16~cvs20090218.orig/debian/ygraph.docs
+++ ygraph-0.16~cvs20090218/debian/ygraph.docs
@@ -0,0 +1,2 @@
+NEWS
+README
--- ygraph-0.16~cvs20090218.orig/debian/ygraph.menu
+++ ygraph-0.16~cvs20090218/debian/ygraph.menu
@@ -0,0 +1,2 @@
+?package(ygraph):needs="X11" section="Applications/Science/Data Analysis"\
+  title="YGraph" command="/usr/bin/ygraph"
--- ygraph-0.16~cvs20090218.orig/debian/compat
+++ ygraph-0.16~cvs20090218/debian/compat
@@ -0,0 +1 @@
+7
--- ygraph-0.16~cvs20090218.orig/debian/ygraph.examples
+++ ygraph-0.16~cvs20090218/debian/ygraph.examples
@@ -0,0 +1,2 @@
+test/*.xl
+
--- ygraph-0.16~cvs20090218.orig/debian/control
+++ ygraph-0.16~cvs20090218/debian/control
@@ -0,0 +1,24 @@
+Source: ygraph
+Section: science
+Priority: optional
+Maintainer: Daniel Kobras <kobras@debian.org>
+Build-Depends: debhelper (>= 7.0.0), autotools-dev, libglib2.0-dev, libgtk2.0-dev, libpopt-dev, libjpeg-dev, libpng12-0-dev | libpng-dev, libtiff4-dev | libtiff-dev, zlib1g-dev | libz-dev, libbz2-dev, docbook-utils
+Standards-Version: 3.8.0
+
+Package: ygraph
+Architecture: any
+Depends: ${shlibs:Depends}
+Description: plot and animate data sets
+ The ygraph tool graphs one-dimensional data or displays a time-series of
+ one-dimensional data sets. It is an enhanced alternative to the xgraph
+ utility and supports the same input format as xgraph.  Additionally,
+ ygraph features:
+ .
+  * animating multiple plots simultaneously and synchronously;
+  * stepping back and forth through animations one frame at a time;
+  * zooming, similar to xgraph but without opening a lot of new windows;
+  * plotting derivatives;
+  * subtracting plots;
+  * convergence tests;
+  * reading compressed files;
+  * exporting images and animations.
--- ygraph-0.16~cvs20090218.orig/debian/ygraph.desktop
+++ ygraph-0.16~cvs20090218/debian/ygraph.desktop
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Version=1.0
+Encoding=UTF-8
+Name=ygraph Scientific Data Plotter
+GenericName=Scientific Data Plotter
+Comment=Produce simple xy-plots of scientific data
+Type=Application
+Exec=ygraph
+Icon=ygraph
+Categories=Education;Science;
--- ygraph-0.16~cvs20090218.orig/debian/changelog
+++ ygraph-0.16~cvs20090218/debian/changelog
@@ -0,0 +1,188 @@
+ygraph (0.16~cvs20090218-1.7.201411021641) ucs4-0-0-0; urgency=low
+
+  * UCS auto build. The following patches have been applied to the original source package
+    0001-bump-version-for-ucs400
+
+ -- Univention builddaemon <buildd@univention.de>  Sun, 02 Nov 2014 16:41:21 +0100
+
+ygraph (0.16~cvs20090218-1) unstable; urgency=low
+
+  * Bump version, otherwise the build stamp in UCS 3.2 is higher than the 4.0
+    build (Bug #35387)
+
+ -- Sönke Schwardt-Krummrich <schwardt@univention.de>  Fri, 30 Oct 2014 14:43:23 +0200
+
+ygraph (0.16~cvs20090218-1.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Fix "FTBFS: please build-depend on libjpeg-dev, not libjpeg62-dev |
+    libjpeg-dev": do as the bug title says (closes: #639064).
+
+ -- gregor herrmann <gregoa@debian.org>  Fri, 09 Sep 2011 15:42:55 +0200
+
+ygraph (0.16~cvs20090218-1) unstable; urgency=medium
+
+  * New upstream version 0.16, currently only available in CVS.
+    + No longer uses imlib. Closes: #456139
+    + Ported to Gtk+ 2.0.
+  * Removed all Debian-specific patches to upstream sources:
+    + [10_DESTDIR_fixes] Merged upstream.
+    + [10_document_cmd_redirection] Merged upstream.
+    + [10_separate_windows_fix] Merged upstream.
+    + [10_no_points_fix] Merged upstream.
+    + [10_reload_final_frame_fix] Merged upstream.
+  * src/read_data.c: Fix label generation for datasets.
+  * src/util.c, src/ygraph.c: Fix typing of various function arguments to
+    silence compiler warnings.
+  * src/ygraph.h: Enable broken Gtk+ functions until source is fully ported
+    to Gtk+ 2.0.
+  * src/ygraph.h: Add missing declarations of several convenience functions.
+  * debian/control,debian/rules: Remove dpatch from packaging infrastructure.
+  * debian/control: Remove build-dependency on gdk-imlib, update
+    build-dependencies for GLib and Gtk+ to 2.0.
+  * debian/control: Complies with version 3.8.0 of Debian policy.
+  * debian/control: Slightly reworded package description. Closes: #465513
+  * debian/compat,debian/control,debian/rules: Upgrade to debhelper 7.
+  * debian/copyright: Document CVS download location.
+  * debian/copyright: Use UTF8 encoding.
+  * debian/copyright: Refer to version 2 of the GPL text.
+  * debian/rules: Do not ignore errors from make distclean.
+  * debian/rules: Replace obsolete "dh_clean -k" with dh_prep.
+  * debian/ygraph.menu: Move section to Applications/Science/Data Analysis.
+
+ -- Daniel Kobras <kobras@debian.org>  Thu, 19 Feb 2009 23:40:25 +0100
+
+ygraph (0.15-3.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Removed config.status config.h config.log stamp-h1 po/stamp-po Makefile
+    during clean. Avoids a failure when built two times in a row. Thanks go to
+    Luis Rodrigo Gallardo Cruz for the patch.
+    (Closes: #424088).
+
+ -- Lucas Nussbaum <lucas@lucas-nussbaum.net>  Sun, 13 Jan 2008 13:08:02 +0100
+
+ygraph (0.15-3) unstable; urgency=low
+
+  * debian/control: Complies with version 3.7.2 of Debian policy.
+  * debian/copyright: Update FSF address.
+  * debian/rules, debian/ygraph.desktop: Provide users with a desktop menu
+    entry for ygraph. Thanks to Phil Bull and Ming Hua. Closes: #396673
+
+ -- Daniel Kobras <kobras@debian.org>  Mon,  6 Nov 2006 14:07:18 +0100
+
+ygraph (0.15-2) unstable; urgency=medium
+
+  * Added patches:
+    + [10_reload_final_frame_fix] New.
+      Don't leave a stray final frame when reloading data from a running
+      simulation.
+  * debian/control: Replace obsolete gdk-imlib1-dev with gdk-imlib11-dev
+    in build dependencies.
+  * debian/control: Complies with Debian policy 3.6.2.
+
+ -- Daniel Kobras <kobras@debian.org>  Sat,  8 Oct 2005 16:17:39 +0200
+
+ygraph (0.15-1) unstable; urgency=low
+
+  * New upstream version.
+  * Added patches:
+    + [10_separate_windows_fix]
+      Fix endless busy loop when using -s option.
+    + [10_no_points_fix]
+      Make command line option -p work.
+  * Removed patches:
+    + [10_clean_must_be_local] Merged upstream.
+    + [10_colormap_range_fix] Merged upstream.
+  * Updated patches:
+    + [10_DESTDIR_fixes]
+      Updated to new upstream version.
+  * debian/ygraph.menu: Add ygraph to Debian menus.
+  * debian/copyright: Add upstream co-author, and update download
+    locations.
+  * debian/control: Bump standards version.
+
+ -- Daniel Kobras <kobras@debian.org>  Fri, 24 Sep 2004 17:31:44 +0200
+
+ygraph (0.14+0.15rc2-1) unstable; urgency=medium
+
+  * New upstream version 0.15rc2.
+  * Added patches:
+    + [10_document_cmd_redirection] New.
+      Document command redirection using '<' as a filename prefix.
+      Closes: #200822
+  * Removed patches:
+    + [10_CVS20030611] Obsolete.
+    + [11_CVS-patch_fixup] Obsolete.
+    + [11_disable_help] Fixed upstream.
+    + [20_fix_segv_without_plot_wins] Fixed upstream.
+    + [20_read_from_stdin] Fixed upstream.
+    + [20_string_to_range_fix] Fixed upstream.
+  * debian/control: Build-depend on libtiff4-dev by default.
+    Closes: #262818
+  * debian/ygraph.docs: Do not try to install TODO, was removed upstream.
+
+ -- Daniel Kobras <kobras@debian.org>  Mon,  2 Aug 2004 15:57:38 +0200
+
+ygraph (0.14-4) unstable; urgency=low
+
+  * [20_fix_segv_without_plot_wins.dpatch] Prevent segfaults when clicking
+    on any of the ygraph buttons without an open plot window.
+    Closes: #200821
+  * [20_read_from_stdin.dpatch] 'ygraph -- -' reads data from stdin.
+    Addresss the original request in #200822, but not the more nifty
+    features suggested in the discussion. Bug remains open therefore.
+
+ -- Daniel Kobras <kobras@debian.org>  Thu, 17 Jul 2003 10:49:50 +0200
+
+ygraph (0.14-3) unstable; urgency=low
+
+  * First upload to Debian archives. Closes: #197141
+  * debian/control, debian/rules: Convert to dpatch scheme.
+  * [10_DESTDIR_fixes.dpatch] Converted previous .diff.gz to dpatch.
+  * [10_clean_must_be_local.dpatch] Move custom clean target to
+    clean-local so it isn't shadowed by default automake target.
+  * [10_CVS20030611.dpatch, 11_CVS-patch_fixup.dpatch] Sync with upstream
+    CVS as of 2003-06-11:
+    + Can handle bz2-compressed files.
+    + Grok gnuplot-like syntax '< foo' to read from foo via a pipe.
+    + Add help dialog.
+    + Fix several mem leaks all over the place.
+    + Various fixes for compiler warnings.
+    + Fix out-of-bounds coordinates when zooming.
+    + Fix help output for -l option.
+    + New command line options --frame_integrate, --time_integrate,
+      --font_size_factor.
+    + Support '#' as comment delimiter.
+  * [11_disable_help.dpatch] Disable help dialog as it isn't useful yet.
+  * debian/control: CVS version needs additional build-dep libbz2-dev.
+  * debian/rules, debian/ygraph.manpages, debian/ygraph.examples: Only
+    install executable via upstream makefile. Use debhelper to install
+    those parts of the documentation that make sense for a package.
+  * [20_string_to_range_fix.dpatch] Fix reference to uninitialized
+    variable in string_to_range.
+  * [10_colormap_range_fix.dpatch] Fix calculation of pixel index in
+    color_set_rgb.
+  * debian/control: Bump standards version to 3.5.10.
+  * debian/control: List more features in long description.
+
+ -- Daniel Kobras <kobras@debian.org>  Sat, 14 Jun 2003 17:38:55 +0200
+
+ygraph (0.14-2) local; urgency=low
+
+  * debian/control: Fixed formatting of description.
+  * debian/rules: Upstream copyright.gz is not needed, we ship a custom
+    version.
+
+ -- Daniel Kobras <kobras@debian.org>  Thu, 13 Feb 2003 15:52:08 +0100
+
+ygraph (0.14-1) local; urgency=low
+
+  * Initial Release.
+  * Makefile.*, doc/Makefile.*: Tell install-data-local target to obey
+    DESTDIR. Properly.
+  * debian/rules: Clean up autogenerated doc/ygraph.1, doc/index.html,
+    and doc/manpage.refs.
+
+ -- Daniel Kobras <kobras@debian.org>  Thu, 13 Feb 2003 14:25:39 +0100
+
--- ygraph-0.16~cvs20090218.orig/debian/ygraph.dirs
+++ ygraph-0.16~cvs20090218/debian/ygraph.dirs
@@ -0,0 +1 @@
+usr/share/doc/ygraph
--- ygraph-0.16~cvs20090218.orig/debian/ygraph.manpages
+++ ygraph-0.16~cvs20090218/debian/ygraph.manpages
@@ -0,0 +1 @@
+doc/ygraph.1
--- ygraph-0.16~cvs20090218.orig/debian/copyright
+++ ygraph-0.16~cvs20090218/debian/copyright
@@ -0,0 +1,36 @@
+This package was debianized by Daniel Kobras <kobras@debian.org> on
+Thu,  6 Feb 2003 14:02:50 +0100.
+
+Version 0.16 was downloaded from anonymous CVS, module VizTools/ygraph at
+
+	:pserver:cvs_anon@cvs.cactuscode.org:/cactus
+
+as the usual homepage and download site is currently unavailable.  It used
+to be located at
+
+	http://www.aei.mpg.de/~pollney/ygraph/
+
+Upstream Authors: Denis Pollney <pollney@aei.mpg.de>
+                  Frank Löffler <frank.loeffler@aei.mpg.de>
+
+Copyright:
+   Copyright (C) 2001-2002 Denis Pollney
+
+License:
+   This package is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; version 2 dated June, 1991.
+
+   This package is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this package; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+   02110-1301, USA.
+
+On Debian GNU/Linux systems, the complete text of the GNU General
+Public License, version 2 can be found in `/usr/share/common-licenses/GPL-2'.
+
