--- plotdrop-0.5.2.orig/droplist.c +++ plotdrop-0.5.2/droplist.c @@ -31,6 +31,8 @@ GtkWidget *errorbarscheck; GtkWidget *gridcheck; GtkWidget *enhancedmodecheck; + GtkWidget *logscaleycheck; + GtkWidget *logscalexcheck; GtkWidget *titleentry; GtkWidget *xlabelentry; GtkWidget *ylabelentry; @@ -196,6 +198,9 @@ droplist.errorbarscheck = glade_xml_get_widget (xml, "ShowErrorbars"); droplist.gridcheck = glade_xml_get_widget (xml, "ShowGrid"); droplist.enhancedmodecheck = glade_xml_get_widget (xml, "EnableSuperSubScripts"); + droplist.logscaleycheck = glade_xml_get_widget (xml, "EnableLogscaleY"); + droplist.logscalexcheck = glade_xml_get_widget (xml, "EnableLogscaleX"); + droplist.xlabelentry = glade_xml_get_widget (xml, "XLabel"); droplist.ylabelentry = glade_xml_get_widget (xml, "YLabel"); @@ -369,6 +374,10 @@ GTK_TOGGLE_BUTTON (droplist.gridcheck)); data->enhancedmode = gtk_toggle_button_get_active ( GTK_TOGGLE_BUTTON (droplist.enhancedmodecheck)); + data->logscaley = gtk_toggle_button_get_active ( + GTK_TOGGLE_BUTTON (droplist.logscaleycheck)); + data->logscalex = gtk_toggle_button_get_active ( + GTK_TOGGLE_BUTTON (droplist.logscalexcheck)); // Captions data->xlabel = gtk_entry_get_text (GTK_ENTRY (droplist.xlabelentry)); --- plotdrop-0.5.2.orig/gnuplot.c +++ plotdrop-0.5.2/gnuplot.c @@ -140,6 +140,12 @@ fprintf (plotscript, "set title \"%s\"\n", escaped); g_free (escaped); } + + // Logscales + if (data->logscaley) + fprintf (plotscript, "set logscale y\n"); + if (data->logscalex) + fprintf (plotscript, "set logscale x\n"); if (data->zeroaxis) fprintf (plotscript, "set zeroaxis\n"); @@ -149,7 +155,7 @@ if (data->extra) fprintf (plotscript, "%s\n", data->extra); - + char *plotcommand = "plot "; fprintf (plotscript, "%s", plotcommand); @@ -170,7 +176,7 @@ if (data->ymaxset) fprintf (plotscript, "%f", data->ymax); fprintf (plotscript, "]"); - + // For cycling through point types "with points pt %d" int ptcounter = 0; --- plotdrop-0.5.2.orig/droplist.glade +++ plotdrop-0.5.2/droplist.glade @@ -962,6 +962,52 @@ + + + + True + Use logarithmic scaling for the y-axis + True + Enable logarithmic y-axis + True + GTK_RELIEF_NORMAL + True + False + False + True + + + 0 + 2 + 5 + 6 + fill + + + + + + + True + Use logarithmic scaling for the x-axis + True + Enable logarithmic x-axis + True + GTK_RELIEF_NORMAL + True + False + False + True + + + 0 + 2 + 6 + 7 + fill + + + --- plotdrop-0.5.2.orig/plotdata.h +++ plotdrop-0.5.2/plotdata.h @@ -27,6 +27,8 @@ unsigned int xminset, xmaxset, yminset, ymaxset; char *extra; unsigned int enhancedmode; + unsigned int logscaley; + unsigned int logscalex; } plotdata; typedef enum { --- plotdrop-0.5.2.orig/Makefile +++ plotdrop-0.5.2/Makefile @@ -14,7 +14,7 @@ all: $(TARGET) $(TARGET): $(OBJECTS) - $(CC) -o $(TARGET) $(CFLAGS) $(LIBS) $(OBJECTS) + $(CC) -o $(TARGET) $(CFLAGS) $(OBJECTS) $(LIBS) clean: rm -f *.o $(TARGET) --- plotdrop-0.5.2.orig/debian/compat +++ plotdrop-0.5.2/debian/compat @@ -0,0 +1 @@ +5 --- plotdrop-0.5.2.orig/debian/plotdrop.xpm +++ plotdrop-0.5.2/debian/plotdrop.xpm @@ -0,0 +1,214 @@ +/* XPM */ +static char * plotdrop_xpm[] = { +"32 32 179 2", +" c None", +". c #0A0A0A", +"+ c #292928", +"@ c #2F2E2D", +"# c #0F0F0F", +"$ c #1E2A1D", +"% c #000B00", +"& c #2D2625", +"* c #B7ACAA", +"= c #CECBC7", +"- c #CECAC7", +"; c #454342", +"> c #444242", +", c #CDC9C7", +"' c #C7CBC1", +") c #A0CE9A", +"! c #4CA22E", +"~ c #1A1600", +"{ c #352120", +"] c #D88784", +"^ c #F0DBD8", +"/ c #EFEBE7", +"( c #EFEAE6", +"_ c #B7B4B1", +": c #E4ECDC", +"< c #C0EFBA", +"[ c #A2F19D", +"} c #AFF0A8", +"| c #5B797F", +"1 c #0D2022", +"2 c #343332", +"3 c #D79D9A", +"4 c #F3B4B1", +"5 c #ECEBE4", +"6 c #C7EEC0", +"7 c #93F38E", +"8 c #AEF0A8", +"9 c #D2EDCB", +"0 c #F0C3BD", +"a c #CD5B67", +"b c #302F32", +"c c #D4C4C1", +"d c #F59F9C", +"e c #F0D9D5", +"f c #A6F1A0", +"g c #72F66E", +"h c #E7EBE0", +"i c #EFE6E2", +"j c #F4A6A3", +"k c #D5B0AD", +"l c #D3CFCC", +"m c #F2C1BD", +"n c #F3ACA9", +"o c #C8EEC1", +"p c #95F390", +"q c #ABF0A6", +"r c #DCECD4", +"s c #F2C2BF", +"t c #F3AAA8", +"u c #D3CECB", +"v c #EFE9E5", +"w c #F59C99", +"x c #F1D3CF", +"y c #EDEBE5", +"z c #BFEFB8", +"A c #87F482", +"B c #D1EDCA", +"C c #F59794", +"D c #F0DBD7", +"E c #F4A4A1", +"F c #A1F19B", +"G c #86F481", +"H c #E4ECDD", +"I c #F3B2AF", +"J c #F2BAB7", +"K c #F1C7C4", +"L c #F4A5A2", +"M c #A9F1A3", +"N c #A9F1A4", +"O c #EBEBE3", +"P c #F2BBB7", +"Q c #EFE5E1", +"R c #F2C0BD", +"S c #ACF1A6", +"T c #8FF38A", +"U c #E6ECDE", +"V c #EFE2DE", +"W c #F49C99", +"X c #F0DFDB", +"Y c #F68B88", +"Z c #F2C3C0", +"` c #D6EDCF", +" . c #A8F1A3", +".. c #F68280", +"+. c #F1D2CE", +"@. c #F1CCC9", +"#. c #F49D9B", +"$. c #DEECD7", +"%. c #9EF199", +"&. c #E5ECDD", +"*. c #F49E9B", +"=. c #F3B6B3", +"-. c #EFE8E4", +";. c #F49A97", +">. c #F2C4C0", +",. c #B1F0AB", +"'. c #91F38C", +"). c #F0DCD8", +"!. c #F68A87", +"~. c #F2C3BF", +"{. c #EFE7E3", +"]. c #F68785", +"^. c #F1CDC9", +"/. c #DFECD7", +"(. c #F59A97", +"_. c #F68E8C", +":. c #F59895", +"<. c #F0D7D3", +"[. c #D9EDD2", +"}. c #9BF295", +"|. c #F4A3A0", +"1. c #F77D7B", +"2. c #F2B8B5", +"3. c #F5908E", +"4. c #F67C7A", +"5. c #F2BDB9", +"6. c #B9F0B3", +"7. c #F67F7D", +"8. c #F95E5D", +"9. c #000000", +"0. c #B2B0AC", +"a. c #DA617D", +"b. c #1E1E1D", +"c. c #7C7A78", +"d. c #D6D2CF", +"e. c #D9D5E9", +"f. c #9A98EF", +"g. c #8684F2", +"h. c #EDE9E7", +"i. c #A3A0EF", +"j. c #B5B2ED", +"k. c #CBC8EB", +"l. c #8D8BF1", +"m. c #E9E5E8", +"n. c #B3B0ED", +"o. c #C7C4EB", +"p. c #9C9AEF", +"q. c #B9B6ED", +"r. c #D7D3E9", +"s. c #7371F4", +"t. c #CFCCEA", +"u. c #8987F1", +"v. c #B5B1ED", +"w. c #EBE7E7", +"x. c #D5D2EA", +"y. c #CBC7EB", +"z. c #8583F1", +"A. c #9F9CEF", +"B. c #EAE6E8", +"C. c #EEEAE7", +"D. c #E7E3E8", +"E. c #C1BEEC", +"F. c #7876F3", +"G. c #AEACED", +"H. c #E0DCE9", +"I. c #AAA7EE", +"J. c #D6D3E9", +"K. c #B8B5ED", +"L. c #9895F0", +"M. c #AFADED", +"N. c #E7E4E8", +"O. c #2D2C2B", +"P. c #B6B3B0", +"Q. c #CDCAC7", +"R. c #9E9BCC", +"S. c #716FD1", +"T. c #8C89B4", +"U. c #23222E", +"V. c #0B0B2B", +". + @ @ @ @ @ @ @ @ @ @ @ @ @ # # @ @ @ @ @ @ @ @ @ @ @ @ @ $ % ", +"& * = = = = = = = = = = = - - ; > , - = = = = = = = = = ' ) ! ~ ", +"{ ] ^ / / / / / / / / / / / ( _ _ ( / / / / / / / / : < [ } | 1 ", +"2 3 4 / / / / / / / / / / / / / / / / / / / / / 5 6 7 8 9 0 a b ", +"2 c d e / / / / / / / / / / / / / / / / / / / : f g h / i j k 2 ", +"2 l m n / / / / / / / / / / / / / / / / / / o p q r / ( s t u 2 ", +"2 l v w x / / / / / / / / / / / / / / / y z A B / / / i C D l 2 ", +"2 l / e E D / / / / / / / / / / / / / / F G H / / / / I J / l 2 ", +"2 l / / K L / / / / / / / / / / / / / M N O / / / / P I / / l 2 ", +"2 l / / Q I R / / / / / / / / / / / S T U / / / / V W e / / l 2 ", +"2 l / / / X Y Z / / / / / / / / / ` .: / / / / e ..+./ / / l 2 ", +"2 l / / / / @.#.Q / / / / / / / $.%.&./ / / / Q *.=.-./ / / l 2 ", +"2 l / / / / / e ;.>./ / / / / / ,.'./ / / / ).!.~.{./ / / / l 2 ", +"2 l / / / / / / Z ].^./ / / / / '././ / / ^.(.I / / / / / / l 2 ", +"2 l / / / / / / / {._.:.<./ / [.}./ / <.|.1.x / / / / / / / l 2 ", +"2 l / / / / / / / / X 2.3.4.5.6.6./ 7.8.C )./ / / / / / / / l 2 ", +"9.9.0./ / / / / / / / / / {.4.a.a.4.{./ / / / / / / / / / 0.9.9.", +"b.c.d./ / / / / / / / / / / / e.f./ / / / / / / / / / / / d.c.b.", +"2 l / / / / / / / / / / / / / / g.h./ / / / / / / / / / / / l 2 ", +"2 l / / / / / / / / / / / / / / i.j./ / / / / / / / / / / / l 2 ", +"2 l / / / / / / / / / / / / / / k.l./ / / / / / / / / / / / l 2 ", +"2 l / / / / / / / / / / / / / / m.n.o./ / / / / / / / / / / l 2 ", +"2 l / / / / / / / / / / / / / / / / p.q./ / / / / / / / / / l 2 ", +"2 l / / / / / / / / / / / / / / / / r.s.t./ / / / / / / / / l 2 ", +"2 l / / / / / / / / / / / / / / / / / / u.v.w./ / / / / / / l 2 ", +"2 l / / / / / / / / / / / / / / / / / / x.l.y.w./ / / / / / l 2 ", +"2 l / / / / / / / / / / / / / / / / / / / / z.A.B.C./ / / / l 2 ", +"2 l / / / / / / / / / / / / / / / / / / / / D.E.F.G./ / / / l 2 ", +"2 l / / / / / / / / / / / / / / / / / / / / / / H.I.j.J./ / l 2 ", +"2 l / / / / / / / / / / / / ( _ _ ( / / / / / / / C.K.L.M.N.l 2 ", +"O.P.= = = = = = = = = = = - , > ; - - = = = = = = = = Q.R.S.T.O.", +". + @ @ @ @ @ @ @ @ @ @ @ @ @ # # @ @ @ @ @ @ @ @ @ @ @ @ U.V.. "}; --- plotdrop-0.5.2.orig/debian/copyright +++ plotdrop-0.5.2/debian/copyright @@ -0,0 +1,27 @@ +Format-Specification: http://dep.debian.net/deps/dep5/ +Name: plotdrop +Maintainer: Jordan Mantha +Source: http://icculus.org/~jcspray/plotdrop/ + +Copyright: 2005 John Spray +License: GPL-2 + 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 can be found in `/usr/share/common-licenses/GPL-2'. + +Files: debian/* +Copyright: 2005-2009 Jordan Mantha +License: GPL-2 --- plotdrop-0.5.2.orig/debian/control +++ plotdrop-0.5.2/debian/control @@ -0,0 +1,21 @@ +Source: plotdrop +Section: math +Priority: optional +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian Science Team +Uploaders: Jordan Mantha +Build-Depends: debhelper (>= 5.0.0), libgtk2.0-dev (>= 2.8.0), libgnomevfs2-dev, libglade2-dev +Standards-Version: 3.8.3 +Homepage: http://icculus.org/~jcspray/plotdrop/ +Vcs-Git: git://git.debian.org/git/debian-science/packages/plotdrop/ +Vcs-Browser: http://git.debian.org/?p=debian-science/packages/plotdrop.git +DM-Upload-Allowed: yes + +Package: plotdrop +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, gnuplot +Description: A minimal GNOME frontend to GNUPlot + PlotDrop is designed for quick simple visualisation of 2D data series. + It is intended to be used in tandem with an external filesystem browser + such as GNOME's nautilus or KDE's konqueror. Files containing data are added + by dragging them from the browser to the file list. --- plotdrop-0.5.2.orig/debian/menu +++ plotdrop-0.5.2/debian/menu @@ -0,0 +1,7 @@ +?package(plotdrop):\ + needs="X11"\ + section="Applications/Science/Mathematics"\ + title="PlotDrop"\ + description="Minimal Gnome frontend to Gnuplot"\ + command="/usr/bin/plotdrop"\ + icon="/usr/share/pixmaps/plotdrop.xpm" --- plotdrop-0.5.2.orig/debian/changelog +++ plotdrop-0.5.2/debian/changelog @@ -0,0 +1,101 @@ +plotdrop (0.5.2-3ubuntu1) oneiric; urgency=low + + * Makefile: Reorder $LIBS placement so that the binary links + correctly. Fixes FTBFS. (LP: #770869) + + -- Daniel T Chen Fri, 16 Sep 2011 16:07:31 -0400 + +plotdrop (0.5.2-3) unstable; urgency=low + + * Added patch from Johannes Marbach to support logarithmic axes + * debian/control: bumped standards version to 3.8.3 + * debian/copyright: updated to newer format + * debian/rules: remove obsoleted dh_desktop call + * Added debian/watch file (Closes: #520531) + + -- Jordan Mantha Fri, 23 Oct 2009 21:55:44 -0400 + +plotdrop (0.5.2-2) unstable; urgency=low + + * debian/control: + - bumped standards version to 3.7.3 (no changes) + - moved homepage URL to Homepage: field + - added Vcs-{Git,Browser} field pointing to debian-science repo + - set Debian Science Team as Maintainer + - move myself to Uploaders + - add DM-Upload-Allowed: yes + * debian/copyright: converted to machine-readable format per + http://wiki.debian.org/Proposals/CopyrightFormat + + -- Jordan Mantha Tue, 08 Jul 2008 13:44:04 -0700 + +plotdrop (0.5.2-1) unstable; urgency=low + + * New Upstream release + * Drop 01_Makefile.dpatch, upstream release fixed issues + * Drop patch system, no longer needed + * Drop man page, included upstream + * debian/control: clean up description, and bump standards version + * Update menu with new sections + * Update maintainer address + + -- Jordan Mantha Mon, 06 Aug 2007 12:24:22 -0700 + +plotdrop (0.5-1) unstable; urgency=low + + * Initial Debian release (closes: bug#347330) + - moved to debhelper 5 + - clean build-stamps + + -- Jordan Mantha Tue, 10 Jan 2006 12:59:58 -0800 + +plotdrop (0.5-0ubuntu1) dapper; urgency=low + + * New upstream release. + - Many UI changes + - Added xfig export + * Fixed debian/copyright and cleaned up debian/rules + + -- Jordan Mantha Sat, 10 Dec 2005 09:44:40 -0800 + +plotdrop (0.4-0ubuntu1) dapper; urgency=low + + * New upstream release. + - Crude error bar support. + - Format selection when exporting. + - Fixed memory leaks + - Added "Show Zero Axes" button + - Fixed some problems for non-english locales + * Tightened GTK+ to >= 2.8 to get prompt for overwriting files + + -- Jordan Mantha Mon, 21 Nov 2005 10:16:14 -0800 + +plotdrop (0.3-0ubuntu4) dapper; urgency=low + + * Install plotdrop.xpm + * Tightened GTK+ build dependency + * Fixed debian/menu + + + -- Jordan Mantha Tue, 8 Nov 2005 18:58:23 -0800 + +plotdrop (0.3-0ubuntu3) dapper; urgency=low + + * Updated Standards-Version to 3.6.2 + * Changed arch to "any" in debian/control + * Fixed install path problem in debian/rules + + -- Jordan Mantha Mon, 7 Nov 2005 20:32:44 -0800 + +plotdrop (0.3-0ubuntu2) dapper; urgency=low + + * Fixed man page location. + + -- Jordan Mantha Mon, 7 Nov 2005 19:28:15 -0800 + +plotdrop (0.3-0ubuntu1) dapper; urgency=low + + * Initial release + + -- Jordan Mantha Sat, 5 Nov 2005 10:50:43 -0800 + --- plotdrop-0.5.2.orig/debian/watch +++ plotdrop-0.5.2/debian/watch @@ -0,0 +1,3 @@ +version=3 +http://icculus.org/~jcspray/plotdrop/ plotdrop-(\d)\.(\d)\.?(\d*)\.tar\.gz + --- plotdrop-0.5.2.orig/debian/rules +++ plotdrop-0.5.2/debian/rules @@ -0,0 +1,47 @@ +#!/usr/bin/make -f + +#include /usr/share/dpatch/dpatch.make + +build: + dh_testdir + $(MAKE) PREFIX="/usr" + touch build-stamp + +clean: + dh_testdir + dh_testroot + + rm -rf build-stamp + $(MAKE) clean + + dh_clean + +install: build + dh_testdir + dh_testroot + dh_clean -k + dh_installdirs + + $(MAKE) install PREFIX=/usr DESTDIR=$(CURDIR)/debian/plotdrop + install -m 0644 debian/plotdrop.xpm $(CURDIR)/debian/plotdrop/usr/share/pixmaps/ + +binary-indep: build install + +binary-arch: build install + dh_testdir + dh_testroot + dh_installchangelogs Changelog + dh_installdocs README TODO + dh_installmenu + dh_installman plotdrop.1 + dh_strip + dh_compress + dh_fixperms + dh_installdeb + dh_shlibdeps + dh_gencontrol + dh_md5sums + dh_builddeb + +binary: binary-arch +.PHONY: build clean binary-indep binary-arch binary install