--- xoscope-2.0.orig/debian/docs +++ xoscope-2.0/debian/docs @@ -0,0 +1,5 @@ +NEWS +README +README.f51 +TODO +TODO.old --- xoscope-2.0.orig/debian/bitxoscope.1 +++ xoscope-2.0/debian/bitxoscope.1 @@ -0,0 +1,39 @@ +.\" bitxoscope - configuration tool for xoscope +.\" Copyright (c) 2005 Timothy D. Witham +.\" +.\" This manual page 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; either version 2 of the License, or +.\" (at your option) any later version. +.\" +.\" This program 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 program; if not, write to the Free Software +.\" Foundation, Inc.,59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +.\" +.\" This manual page is written especially for Debian GNU/Linux. +.\" +.TH BITXOSCOPE "1" "November 21, 2005" BITXOSCOPE "Configuration tool for xoscope" +.SH NAME +bitxoscope \- configuration tool for xoscope +.SH SYNOPSIS +.B bitxoscope +.SH DESCRIPTION +This manual page documents briefly the +.B bitxoscope +program. +.PP +.\" TeX users may be more comfortable with the \fB\fP and +.\" \fI\fP escape sequences to invode bold face and italics, +.\" respectively. + \fBbitxoscope\fP is the configuration tool for xoscope which + starts the dialog to configure the xoscope settings. +.SH AUTHOR +bitxoscope was written by Timothy D. Witham +.PP +This manual page was written by Steffen Joeris , +for the Debian project (but may be used by others). --- xoscope-2.0.orig/debian/watch +++ xoscope-2.0/debian/watch @@ -0,0 +1,3 @@ +version=3 +http://sf.net/xoscope/xoscope-(.*)\.tgz + --- xoscope-2.0.orig/debian/control +++ xoscope-2.0/debian/control @@ -0,0 +1,20 @@ +Source: xoscope +Section: x11 +Priority: optional +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Bhavani Shankar +Build-Depends: cdbs, debhelper (>= 5), autotools-dev, libgtk2.0-dev, quilt, libcomedi-dev, libesd0-dev +Standards-Version: 3.8.3 +DM-Upload-Allowed: yes +Homepage: http://xoscope.sourceforge.net/ + +Package: xoscope +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, pulseaudio-esound-compat +Description: digital oscilloscope + Xoscope is a oscilloscope using input from a + sound card or EsounD and/or a ProbeScope/osziFOX and will soon support + Bitscope hardware. Includes 8 signal displays, variable time scale, + math, memory, measurements, and file save/load. + + --- xoscope-2.0.orig/debian/changelog +++ xoscope-2.0/debian/changelog @@ -0,0 +1,123 @@ +xoscope (2.0-3.1ubuntu3) quantal; urgency=low + + * Update depends to include pulseaudio-esound-compat. (LP: #993867) + + -- Angelo Compagnucci Mon, 21 May 2012 08:28:33 +0200 + +xoscope (2.0-3.1ubuntu2) precise; urgency=low + + * debian/patches/99-esd_pa_fixes.patch: + - Fix padsp ioctl type mismatch, and use esd record mode by default. + * Update build-depends to include libesd-dev. + * The above changes combined fix LP: #881695. + + -- Angelo Compagnucci Wed, 09 Nov 2011 00:21:22 +0100 + +xoscope (2.0-3.1ubuntu1) oneiric; urgency=low + + * Fix FTBFS, building with deprecated gdk/gtk stuff again. + LP: #755956. Closes: #622002. + + -- Matthias Klose Mon, 12 Sep 2011 11:02:52 +0200 + +xoscope (2.0-3.1) unstable; urgency=medium + + * Non-maintainer upload. + * debian/patches/02-deprecated_GTK.patch: + - Replace deprecated GTK macro with related function (Closes: #577306). + + -- Luca Falavigna Sat, 08 May 2010 02:06:34 +0200 + +xoscope (2.0-3) unstable; urgency=low + + * Upload to unstable. + * Add build-dep on libcomedi-dev Closes: #508694 + * Bump standards-version to 3.8.3. No other Changes. + * Remove 01-xoscope_pointer_fix.patch as per Gudjon's request + * Rename 02-comedi_compile.patch to 01-comedi_compile.patch + + -- Bhavani Shankar Wed, 19 Aug 2009 19:20:20 +0530 + +xoscope (2.0-2) experimental; urgency=low + + * Remove encoding key from desktop entry as its depreceated. + * Base package on quilt patch system. + * Readd modified 01-xoscope_pointer_fix.patch (Since package is moved + to quilt.) + * Really compile with comedi support. Thanks to Gudjon I. Gudjonsson + for the intimation. + + Add 02-comedi_compile.patch + + -- Bhavani Shankar Sun, 16 Aug 2009 21:14:31 +0530 + +xoscope (2.0-1) unstable; urgency=medium + + * Adopting the package with steffen's blessings. Closes: #446445 + * New upstream version Closes: #515989 #537291 + * debian/control: + + Add myself as maintainer + + Change build dep from libgtk-dev to libgtk2.0-dev to fix FTBFS. + Closes: #534060 + + Bump up standards version to 3.8.2 and move homepage from package + description to homepage field + + Add build depend on autotools-dev. Thanks to Lintian + * debian/copyright: + + Added Brent Baccala to authors + * Minimize debian/rules (Thanks to onkar shinde for help on this) + * Update debian/menu to use Applications/Education + * Update bitxoscope manpage description + * Clean up debian/docs to remove reference to non existant files. + * Remove 01-xoscope_pointer_fix.patch as no longer its applicable. + * Add watch file + * Update desktop file. + + -- Bhavani Shankar Wed, 12 Aug 2009 13:20:43 +0530 + +xoscope (1.12-5) unstable; urgency=low + + * Upload to unstable + + -- Steffen Joeris Mon, 23 Apr 2007 07:24:03 +1000 + +xoscope (1.12-4) experimental; urgency=low + + * New experimental patch release (Closes: #342148) + * Including 01-xoscope_pointer_fix.patch, + thanks to Gudjon I. Gudjonsson for the patch + - Fixes pointer handling and let it compile on 64 bit architectures + - Adjusting debian/rules file and using simple-patchsys + * Change my maintainer address + + + -- Steffen Joeris Thu, 15 Feb 2007 20:37:41 +1100 + +xoscope (1.12-3) unstable; urgency=low + + * Remove libsvga1-dev as build-depends to make sure that the package + builds an all the 32 bit archs again + * Don't build oscope anymore (Closes: #397243) + + -- Steffen Joeris Mon, 13 Nov 2006 23:14:46 +1100 + +xoscope (1.12-2.1) unstable; urgency=medium + + * Non-maintainer upload. + * Added missing dependency on libsvga1-dev needed to compile oscope. + (Closes: #397243) + * Bumped compat to 5. + * Bumped Standards-Version to 3.7.2, no changes required. + + -- Ana Beatriz Guerrero Lopez Fri, 10 Nov 2006 23:07:26 +0100 + +xoscope (1.12-2) unstable; urgency=low + + * Rename binary bitscope to bitxoscope (Closes: #341297) + + -- Steffen Joeris Wed, 30 Nov 2005 11:29:49 +0100 + +xoscope (1.12-1) unstable; urgency=low + + * Initial release (Closes: #282012) + + -- Steffen Joeris Mon, 21 Nov 2005 13:36:36 +0100 + --- xoscope-2.0.orig/debian/manpages +++ xoscope-2.0/debian/manpages @@ -0,0 +1 @@ +debian/bitxoscope.1 --- xoscope-2.0.orig/debian/copyright +++ xoscope-2.0/debian/copyright @@ -0,0 +1,43 @@ +This package was first debianized by Steffen Joeris +on Mon, 21 Nov 2005 13:36:36 +0100. Since Fri, 14 Aug 2009 13:52:41 +0200 +it is maintained by Bhavani Shankar . + +It was downloaded from http://xoscope.sourceforge.net/ + +Copyright Holder: Timothy D. Witham + Main Developer + + Philip vanBaren + Copyright (C) 1995 + List of files: +realfft.c +patch.f51 + + Samuel Vincent + Copyright (C) 1996 + List of files: +svasync.h +svasync.c +svasync.doc + + Brent Baccala + List of files: +comedi.c + +License: + + This program is free software; you can redistribute it and/or + modify it under the terms of the GNU General Public License, version 2 + as published by the Free Software Foundation. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANDABILITY of FITNESS FOR A PARTICULAR PURPOSE. + See the GNU General Public License for 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'. --- xoscope-2.0.orig/debian/compat +++ xoscope-2.0/debian/compat @@ -0,0 +1 @@ +5 --- xoscope-2.0.orig/debian/rules +++ xoscope-2.0/debian/rules @@ -0,0 +1,10 @@ +#!/usr/bin/make -f + +include /usr/share/cdbs/1/class/autotools.mk +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/rules/patchsys-quilt.mk + +common-install-arch:: + install -D -m 644 $(CURDIR)/debian/xoscope.desktop $(CURDIR)/debian/xoscope/usr/share/applications/xoscope.desktop + + --- xoscope-2.0.orig/debian/xoscope.desktop +++ xoscope-2.0/debian/xoscope.desktop @@ -0,0 +1,10 @@ +[Desktop Entry] +Version=1.0 +Name=Xoscope +Name[en_GB]=Xoscope +GenericName=digital oscilloscope +GenericName[en_GB]=digital oscilloscope +Exec=/usr/bin/xoscope +Type=Application +Terminal=false +Categories=Science;Education;Electronics; --- xoscope-2.0.orig/debian/menu +++ xoscope-2.0/debian/menu @@ -0,0 +1,6 @@ +?package(xoscope):needs="X11" \ + section="Applications/Education" \ + hints="GNOME" \ + title="Xoscope" \ + longtitle="digital oscilloscope" \ + command="/usr/bin/xoscope" --- xoscope-2.0.orig/debian/patches/01-comedi_compile.patch +++ xoscope-2.0/debian/patches/01-comedi_compile.patch @@ -0,0 +1,34 @@ +Index: xoscope-2.0/comedi.c +=================================================================== +--- xoscope-2.0.orig/comedi.c ++++ xoscope-2.0/comedi.c +@@ -27,7 +27,7 @@ + #include + #include + #include +-#include ++//#include + #include + #include "oscope.h" /* program defaults */ + #include "func.h" +@@ -184,7 +184,9 @@ + * avoid the bug. This is the only reason we need in + * our include list. + */ +- comedi_bufsize = (comedi_bufsize + PAGE_SIZE - 1) & PAGE_MASK; ++ //comedi_bufsize = (comedi_bufsize + PAGE_SIZE - 1) & PAGE_MASK; ++ comedi_bufsize = (comedi_bufsize + sysconf(_SC_PAGE_SIZE) - 1) & ++ (sysconf(_SC_PAGE_SIZE) - 1); + ret = comedi_set_buffer_size(comedi_dev, comedi_subdevice, comedi_bufsize); + if (ret < 0) { + comedi_error = comedi_errno(); +@@ -505,7 +507,7 @@ + unsigned int chan; + int ret; + +- ret = comedi_get_cmd_generic_timed(comedi_dev, comedi_subdevice, &cmd, 0); ++ ret = comedi_get_cmd_generic_timed(comedi_dev, comedi_subdevice, &cmd, 0, 1); + + if (ret >= 0) { + chan = CR_PACK(4,0,AREF_DIFF); + --- xoscope-2.0.orig/debian/patches/02-deprecated_GTK.patch +++ xoscope-2.0/debian/patches/02-deprecated_GTK.patch @@ -0,0 +1,49 @@ +Index: xoscope-2.0/gtkdatabox-0.6.0.0/gtk/gtkdatabox.c +=================================================================== +--- xoscope-2.0.orig/gtkdatabox-0.6.0.0/gtk/gtkdatabox.c 2010-05-08 02:06:19.060429808 +0200 ++++ xoscope-2.0/gtkdatabox-0.6.0.0/gtk/gtkdatabox.c 2010-05-08 02:06:14.624423484 +0200 +@@ -661,7 +661,7 @@ + static void + gtk_databox_calculate_hcanvas (GtkDatabox *box) + { +- if (!GTK_WIDGET_VISIBLE (box)) ++ if (!gtk_widget_get_visible (box)) + return; + + if (box->priv->adjX->page_size == 1.0) +@@ -698,7 +698,7 @@ + static void + gtk_databox_calculate_vcanvas (GtkDatabox *box) + { +- if (!GTK_WIDGET_VISIBLE (box)) ++ if (!gtk_widget_get_visible (box)) + return; + + if (box->priv->adjY->page_size == 1.0) +@@ -780,7 +780,7 @@ + gtk_databox_draw (box, event); + + gdk_draw_drawable (widget->window, +- widget->style->fg_gc[GTK_WIDGET_STATE (widget)], ++ widget->style->fg_gc[gtk_widget_get_state (widget)], + box->priv->canvas.pixmap, event->area.x, event->area.y, + event->area.x, event->area.y, event->area.width, + event->area.height); +@@ -940,7 +940,7 @@ + GtkWidget *widget = GTK_WIDGET (box); + + g_return_if_fail (GTK_IS_DATABOX (box)); +- g_return_if_fail (GTK_WIDGET_VISIBLE (widget)); ++ g_return_if_fail (gtk_widget_get_visible (widget)); + + gdk_draw_rectangle (box->priv->canvas.pixmap, widget->style->bg_gc[0], + TRUE, 0, 0, +@@ -1150,7 +1150,7 @@ + /* Copy a part of the pixmap to the screen */ + if (pixmapCopyRect) + gdk_draw_drawable (widget->window, +- widget->style->fg_gc[GTK_WIDGET_STATE (box)], ++ widget->style->fg_gc[gtk_widget_get_state (box)], + box->priv->canvas.pixmap, + pixmapCopyRect->x, + pixmapCopyRect->y, --- xoscope-2.0.orig/debian/patches/series +++ xoscope-2.0/debian/patches/series @@ -0,0 +1,3 @@ +01-comedi_compile.patch +02-deprecated_GTK.patch +99-esd_pa_fixes.patch --- xoscope-2.0.orig/debian/patches/99-esd_pa_fixes.patch +++ xoscope-2.0/debian/patches/99-esd_pa_fixes.patch @@ -0,0 +1,22 @@ +=== modified file 'sc_linux.c' +--- x/sc_linux.c 2009-08-12 13:20:43 +0000 ++++ x/sc_linux.c 2011-11-08 23:36:06 +0000 +@@ -39,7 +39,7 @@ + + #ifdef HAVE_LIBESD + static int esdblock = 0; /* 1 to block ESD; 0 to non-block */ +-static int esdrecord = 0; /* 1 to use ESD record mode; 0 to use ESD monitor mode */ ++static int esdrecord = 1; /* 1 to use ESD record mode; 0 to use ESD monitor mode */ + #endif + + static int sc_chans = 0; +@@ -87,7 +87,7 @@ + + /* show system error and close sound device if given ioctl status is bad */ + static void +-check_status_ioctl(int d, int request, void *argp, int line) ++check_status_ioctl(int d, unsigned int request, void *argp, int line) + { + if (ioctl(d, request, argp) < 0) { + snd_errormsg1 = "sound ioctl"; + --- xoscope-2.0.orig/gtkdatabox-0.6.0.0/gtk/Makefile.in +++ xoscope-2.0/gtkdatabox-0.6.0.0/gtk/Makefile.in @@ -193,10 +193,6 @@ AM_CFLAGS = \ -O2\ -Wall -pedantic\ - -DG_DISABLE_DEPRECATED\ - -DGDK_DISABLE_DEPRECATED\ - -DGDK_PIXBUF_DISABLE_DEPRECATED\ - -DGTK_DISABLE_DEPRECATED\ `pkg-config gtk+-2.0 --cflags` all: all-am --- xoscope-2.0.orig/gtkdatabox-0.6.0.0/gtk/Makefile.am +++ xoscope-2.0/gtkdatabox-0.6.0.0/gtk/Makefile.am @@ -30,8 +30,4 @@ AM_CFLAGS =\ -O2\ -Wall -pedantic\ - -DG_DISABLE_DEPRECATED\ - -DGDK_DISABLE_DEPRECATED\ - -DGDK_PIXBUF_DISABLE_DEPRECATED\ - -DGTK_DISABLE_DEPRECATED\ `pkg-config gtk+-2.0 --cflags`