--- faumachine-20120707.orig/debian/changelog +++ faumachine-20120707/debian/changelog @@ -0,0 +1,358 @@ +faumachine (20120707-3) unstable; urgency=low + + * Use absolute path in desktop file and faum-script: + + debian/patches/absolute_path.patch (Closes: #727095). + + -- Stefan Potyra Sun, 27 Oct 2013 14:57:25 +0100 + +faumachine (20120707-2) unstable; urgency=low + + * debian/rules: Add minimalistic patch system. + * debian/patches/mayhem.patch: Add backported patch from upstream + to fix mayhem bug reports (Volkmar Sieh). Closes: #715889, #715890. + * debian/control: + + Update Standards-Version to 3.9.4. + + Declare Built-Using on libfauhdli-dev (statically linked). + + -- Stefan Potyra Fri, 12 Jul 2013 21:02:38 +0200 + +faumachine (20120707-1) unstable; urgency=low + + * Acknowledge NMUs: Thanks a lot! + * New upstream release, highlights: + + Fix build failures with gcc-4.7 (See DBTS: #667162). + + New camera component. + + Suspend/Resume functionality for interactive use. + + As always: Many code cleanups and bug fixes. + * debian/control: + + No longer force gcc-4.6. + + Update standards-version to 3.9.3 (no changes necessary). + + Force newer FAUcc, since the BIOS build system has been extended + to make use of the new capabilities. + * debian/rules: + + add build-arch/build-indep rules. + + -- Stefan Potyra Sat, 07 Jul 2012 22:03:09 +0200 + +faumachine (20110812-1.2) unstable; urgency=low + + * Fix the workaround from the previous NMU on i386 (Closes: #678415) + + -- Adam Conrad Thu, 21 Jun 2012 11:11:39 -0600 + +faumachine (20110812-1.1) unstable; urgency=low + + * Work around build failure with GCC 4.7. Closes: #667162. + + -- Matthias Klose Mon, 28 May 2012 09:52:10 +0000 + +faumachine (20110812-1) unstable; urgency=low + + * New upstream release, highlights: + + Fix build failure with binutils-gold (Closes: #618074). + + Add camera component. + + Support 64-bit mainboard. + + New handling of virtual media. + + And many other bugfixes and improvements. + * debian/rules: Drop patch logic, no longer needed. + * debian/patches/*, debian/README.source: removed, all upstream. + * debian/control: + + update standards-version to 3.9.2, no changes needed. + + drop build-dependency on etherboot (Closes: #634041). The code + that made use of the copied ROM file has been gone for a while. + + tighten build-dependency against libfauhdli-dev and dependency + against fauhdlc to accommodate the changed ABI of the intermediate + code. + + change section to misc. + + -- Stefan Potyra Fri, 12 Aug 2011 23:12:57 +0200 + +faumachine (20100527-2) unstable; urgency=medium + + * Cherry-pick debian/patches/fix_dsdt.patch from cvs to fix + FTBFS (Closes: #591142). + * debian/rules: Add minimal patch system. Should go away again with + next upload. + * Drop Conflicts/Replaces of the -data package against the faumachine + package: There never was a file conflict in the first place, since + the ROMs used to live in /usr/lib and were moved to /usr/share. + * Update Standards-Version to 3.9.1 (only change needed is the one + mentioned above). + + -- Stefan Potyra Sun, 01 Aug 2010 16:24:38 +0200 + +faumachine (20100527-1) unstable; urgency=low + + * New upstream bugfix version: Fix bashism in configure.ac + (Closes: #582986). + + -- Stefan Potyra Thu, 27 May 2010 11:07:40 +0200 + +faumachine (20100421-1) unstable; urgency=low + + * New upstream bugfix version: Fix BIOS problems with newer gcc. + + -- Stefan Potyra Wed, 21 Apr 2010 13:04:01 +0200 + +faumachine (20100324-1) unstable; urgency=low + + * New upstream version, highlights: + + many cleanups and bug fixes. + + fix build failure with gcc-4.5 prerelease (Closes: #564985). + * debian/control: + + Bump standards-version. + + Update build-dependency to match new libfauhdli-dev + version. Update dependency of faumachine against fauhdlc to newer + version. + + add ${misc:Depends} to faumachine-data. + + Update operator for Conflicts/Replaces relationship. + * debian/source/format: explicitly select 1.0. + + -- Stefan Potyra Wed, 24 Mar 2010 11:48:13 +0100 + +faumachine (20091119-1) unstable; urgency=low + + * New upstream version, highlights: + + Support multilevel cow files. + + Allow fault injection for CD. + + New media handling for CDs, DVDs and floppies. + + Properly invalidate code chaches on DMA access. + + Improve fault injection dialog. + + Add SMART capabilities and fault injection support to hard disk. + + And many other bugfixes. + * debian/rules: Fix clean target. + * Add missing conflicts/replaces of faumachine-data against older + faumachine (as the ROM files moved to faumachine-data). + * Bump build-dependency of libfauhli-dev again due to complete API + rewrite. + + -- Stefan Potyra Thu, 19 Nov 2009 16:20:17 +0100 + +faumachine (20090922-1) unstable; urgency=low + + * New upstream version. + * debian/control: + + adjust section to otherosfs instead of devel. + + Bump Standards-Version to 3.8.3, no changes needed. + + Drop ghostscript build-dependency, not needed. + + Update version of libfauhdli-dev build-dependency, as the API + changed. + + Update version of the faumachine's fauhdlc Dependency, as the + ABI of the intermediate code changed as well. + + Add DM-Upload-Allowed field. + * debian/faumachine-data.install: Install ROMs in the data-package + (as these moved from lib to share). + * debian/faumachine.install: Remove usr/lib entry, there are no files + in usr/lib any longer. + * debian/rules: remove deprecated dh_desktop call. + + -- Stefan Potyra Tue, 22 Sep 2009 15:06:34 +0200 + +faumachine (20090512-1) unstable; urgency=low + + * New upstream version, highlights: + + allow selection of CPU architecture via faum-script + + improved keyboard simulation + + lots of bug fixes + * debian/control: + + add hard dependency on faumachine-data to faumachine. + + add lpia to Architecture field. + + bump [build]-dependencies on libfauhdli-dev, fauhdlc for current + upstream release, since the API changed. + + -- Stefan Potyra Tue, 12 May 2009 18:16:55 +0200 + +faumachine (20090302-1) unstable; urgency=low + + * New upstream bugfix release, highlights: + + many bug fixes in ide disk simulator. + + bug fixes in FAUmachine's bios. + * debian/copyright: + + no longer mention dropped files + + refer to copyright holders as legal entities, thanks to Steve + Langasek. + + -- Stefan Potyra Mon, 02 Mar 2009 11:32:37 +0100 + +faumachine (20090219-1) unstable; urgency=low + + * Initial upload to unstable (Closes: #489236). + * New upstream version, highlights: + + using FAUcc compiler for compiling 16bit BIOS + + using VHDL compiler/interpreter fauhdl[ci] + + using VHDL sources as setup + + many bugfixes + + -- Stefan Potyra Fri, 20 Feb 2009 14:41:41 +0100 + +faumachine (0.20061117.1) unstable; urgency=low + + * improved timing support + * original Award BIOS support + + -- FAUmachine Team Fri, 17 Nov 2006 10:00:00 +0200 + +faumachine (0.20060918.1) unstable; urgency=low + + * x86_64 guest support + * x86_64 host support + * cirrus support + * many bugfixes + * support for FedoraCore-5 + * support for SuSE-10.1 + + -- FAUmachine Team Mon, 18 Sep 2006 10:00:00 +0200 + +faumachine (0.20060310.1) unstable; urgency=low + + * new acceleration kernel module + * ACPI support + + -- FAUmachine Team Fri, 10 Mar 2006 09:59:13 +0200 + +faumachine (0.20051010.1) unstable; urgency=low + + * improved logo + * improved BIOS startup screens + * improved USB support + * 1MB BIOS support + * several bug fixes in floppy support + * floppy controller / floppy device separated + * new config file format + * improved chipset (power management and SMBus device support) + * improved patternmatcher + + -- FAUmachine Team Thu, 06 Oct 2005 09:59:13 +0200 + +faumachine (0.20050728.1) unstable; urgency=low + + * New logo + * enhanced IDE DMA support + * enhanced USB support + * bugfixes + * gcc-4 support + * enhanced timing + + -- FAUmachine Team Thu, 28 Jul 2005 09:30:32 +0200 + +faumachine (0.20050720.1) unstable; urgency=low + + * QEMU simulation method is now default + * enhanced IDE DMA support + * most components now connected via signals + * BIOS mouse support + * bugfixes + * floppy disk support + * more test cases + + -- FAUmachine Team Tue, 12 Jul 2005 15:49:32 +0200 + +faumachine (0.20050303.1) unstable; urgency=low + + * experimental Windows XP support using the QEMU simulator + + -- FAUmachine Team Thu, 03 Mar 2005 14:31:23 +0100 + +faumachine (0.20050222.1) unstable; urgency=low + + * Bugfixes + * DMA mode for IDE controller + * GTK fullscreen support + * QEMU cpu support + * SuSE-9.2 support + * Source package split + + -- FAUmachine Team Tue, 22 Feb 2005 11:18:24 +0100 + +faumachine (0.20041116.1) unstable; urgency=low + + * BIOS and JIT can be changed without recompilation + * BIOS and VGA BIOS now built using gcc + * improved PCI support + * OPENBSD support + * improved SuSE-9.0, SuSE-9.1 support + * DOS, FreeDOS, DR-DOS support + * more test cases + + -- FAUmachine Team Tue, 16 Nov 2004 09:54:29 +0100 + +faumachine (0.20040805.1) unstable; urgency=low + + * Bugfixes + + -- FAUmachine Team Thu, 5 Aug 2004 15:41:47 +0200 + +faumachine (0.20040723.1) unstable; urgency=low + + * SuSE-9.0, SuSE-9.1 support (but very slow up to now) + * JIT improved and enabled by default + * GTK frontend + * eepro100 NIC support + * Hayes compatible serial modem support + * VHDL configuration improved: modem, eepro100, virtual time support + * IDE subsystem interface seperation (no extern changes visible) + * It's now possible to specify the geometrie of a hardisk using media.chs file + * General cleanup, Bugfixes + + -- FAUmachine Team Fri, 23 Jul 2004 09:38:28 +0200 + +faumachine (0.20040218.1) unstable; urgency=low + + * Changes for linux-2.6.* + * New JIT (not enabled by default) + * VHDL procedures improved + * new user interface: remote access, console in calling tty, + multiple UI for one FAUmachine. + * sound support + * New configuration format for nodes! You may have to remove your + previous ~/.FAUmachine directory and your old nodes. + + -- FAUmachine Team Tue, 18 Feb 2004 16:34:57 +0100 + +faumachine (0.20040119.1) unstable; urgency=low + + * Bugfixes + + * testautomation: serial interface supports real serial ports with + cross over cabling now, this affords controlling real machines + over serial interface. + + -- FAUmachine Team Mon, 19 Jan 2004 09:43:10 +0100 + +faumachine (0.20031110.1) unstable; urgency=low + + * Speed improvements + * Cleanup + + -- FAUmachine Team Mon, 10 Nov 2003 10:53:31 +0100 + +faumachine (0.20030905.1) unstable; urgency=low + + * Bugfix release + + -- Martin Waitz Tue, 05 Sep 2003 13:59:44 +0200 + +faumachine (0.20030715.1) unstable; urgency=low + + * Bugfix release + + -- Martin Waitz Tue, 15 Jul 2003 13:59:44 +0200 + +faumachine (0.20030708.1) unstable; urgency=low + + * First public snapshot + + -- Martin Waitz Tue, 8 Jul 2003 08:53:34 +0200 + +faumachine (0.20030701.1) unstable; urgency=low + + * new CVS Snapshot + + -- Martin Waitz Fri, 1 Jul 2003 17:06:52 +0200 + +faumachine (0.20030617.1) unstable; urgency=low + + * Initial Release. + + -- Martin Waitz Mon, 23 Jun 2003 10:01:58 +0200 + --- faumachine-20120707.orig/debian/compat +++ faumachine-20120707/debian/compat @@ -0,0 +1 @@ +5 --- faumachine-20120707.orig/debian/control +++ faumachine-20120707/debian/control @@ -0,0 +1,64 @@ +Source: faumachine +Section: misc +Priority: optional +Maintainer: FAUmachine Team +Uploaders: Volkmar Sieh , + Stefan Potyra +DM-Upload-Allowed: yes +Standards-Version: 3.9.4 +Build-Depends: libx11-dev, + debhelper (>> 5.0), + flex, + bison, + fig2ps, + imagemagick, + libasound2-dev, + libesd0-dev, + libgtk2.0-dev, + libpulse-dev, + libtheora-dev, + xmlto, + automake (>= 1.10), + gcc-multilib [amd64] | libc6-dev-i386 [amd64], + iasl, + libfauhdli-dev (>= 20110812), + faucc (>= 20120707), + python +Built-Using: libfauhdli-dev +Homepage: http://www.faumachine.org + +Package: faumachine +Architecture: i386 amd64 lpia +Depends: ${shlibs:Depends}, + ${misc:Depends}, + faumachine-data (= ${source:Version}), + zenity, + fauhdlc (>= 20110812) +Recommends: slirp +Description: Virtual machine running in user mode + FAUmachine is a virtual machine that can simulate PC hardware like QEMU. + Its main focus is to simulate the real hardware as close as possible. + . + FAUmachine comes with the ability to inject faults to different hardware + simulators, e.g. to inject intermittent or transient faults to the simulated + disk or the simulated memory. + . + FAUmachine also comes with an experiment controller, with which automated + tests, like installing an operating system from an iso image, can be run. + +Package: faumachine-data +Architecture: all +Depends: ${misc:Depends} +Recommends: faumachine +Description: Virtual machine running in user mode -- data files + FAUmachine is a virtual machine that can simulate PC hardware like QEMU. + Its main focus is to simulate the real hardware as close as possible. + . + FAUmachine comes with the ability to inject faults to different hardware + simulators, e.g. to inject intermittent or transient faults to the simulated + disk or the simulated memory. + . + FAUmachine also comes with an experiment controller, with which automated + tests, like installing an operating system from an iso image, can be run. + . + This package contains the architecture independent data files. --- faumachine-20120707.orig/debian/copyright +++ faumachine-20120707/debian/copyright @@ -0,0 +1,239 @@ +FAUmachine's sources are available at . + +All files, including packaging (exceptions see below): + +FAUmachine is + Copyright (C) 2000-2011 Friedrich Alexander University Erlangen-Nuremberg, + Germany - Department of Computer Science 3, + Volkmar Sieh, et al. (See AUTHORS). + + In the project files, as well as the remainder of this document, + the term "FAUmachine Team" is used to denote the persons listed in the + AUTHORS file as copyright holders, together with the Friedrich Alexander + University Elangen-Nuremberg, Germany - Department of Computer Science 3, + since a number of authors worked on FAUmachine as part of the work at + the university. + + FAUmachine comes with ABSOLUTELY NO WARRANTY. + This 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, or (at your option) + any later version. Look at COPYING for details. + +On Debian systems, the full text of the GPL, version 2 can be found at +'/usr/share/common-licenses/GPL-2.' + +In the remainder of this document the following abbreviations are used: + +GPL-2: + 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. + +On Debian systems, see '/usr/share/common-licenses/GPL-2.' for the full text +of the GNU General Public License, version 2. + +GPL-2+: + This program is free software. You can redistribute it and/or modify it + under the terms of the GNU General Public License, either version 2 of + the License, or (at your option) any later version. + +On Debian systems, see '/usr/share/common-licenses/GPL' for the full text +of the GNU General Public License in its latest version. + +LGPL-2+: + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public + License as published by the Free Software Foundation; either + version 2 of the License, or (at your option) any later version. + +On Debian systems, see '/usr/share/common-licenses/LGPL' for the full text +of the GNU Lesser General Public License in its latest version. + +LGPL-2.1+: + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + +On Debian systems, see '/usr/share/common-licenses/LGPL' for the full text +of the GNU Lesser General Public License in its latest version. + +The files have a different license and/or different authors: +* ./lib/font_info.dat, + ./node-pc/simulator/vt102_core_font.c: + + Copyright (c) 2005-2009 by FAUmachine Team + Copyright (c) by Linus Torvalds and others + License: GPL-2. + +* ./lib/glue-audio_alsa1x.c: + + Copyright (c) by FAUmachine Team + Copyright (c) by Alex Beregszaszi + Copyright (c) by MPlayer Team + License: GPL-2+. + +* ./lib/glue-audio_esd.c: + + Copyright (c) by FAUmachine Team + Copyright (c) by Juergen Keil + Copyright (c) by MPlayer Team + License: GPL-2+. + +* ./lib/glue-audio_macosx.c: + + Copyright (c) 2007-2009 by FAUmachine Team + Copyright (c) by MPlayer Team + Copyright (c) 2000 by Timothy J. Wood + License: GPL-2+. + +* ./lib/glue-audio_null.c: + + Copyright (c) by Mplayer Team + Copyright (c) by Tobias Diedrich + License: GPL-2+. + +* ./lib/glue-audio_oss.c: + + Copyright (c) by FAUMachine Team + Copyright (c) by MPlayer Team + License: GPL-2+. + +* ./lib/glue-audio_pulse.c: + + Copyright (c) by FAUmachine Team + Copyright (c) by MPlayer Team + Copyright (c) by Lennart Poettering + License: GPL-2+. + +* ./lib/images/camera.png: + + Copyright (c) 1996-2008 by The K Desktop Environment project + License: GPL-2+. + +* ./lib/images/video.png: + + Copyright (c) 1995 by Spencer Kimball + Copyright (c) 1995 by Peter Mattis + License: GPL-2+. + +* ./lib/images/window.png: + + Copyright (c) 2002 by KDE Artists + License: LGPL-2.1. + +* ./node-pc/simulator/arch_gen_cpu_x86_core_fast.c, + ./node-pc/simulator/qemu/dyngen.c: + + Copyright (c) 2002-2009 by FAUmachine Team + Copyright (c) 2003-2005 by Fabrice Bellard + License: GPL-2+. + +* ./node-pc/simulator/arch_gen_cpu_x86_fpu_fast.c, + ./node-pc/simulator/arch_gen_cpu_x86_fpu_fast.h, + ./node-pc/simulator/arch_gen_cpu_x86_mmu.c, + ./node-pc/simulator/arch_gen_cpu_x86_mmu_fast.c, + ./node-pc/simulator/arch_gen_cpu_x86_mmu_fast.h, + ./node-pc/simulator/arch_gen_cpu_x86_mmu_template.c, + ./node-pc/simulator/arch_gen_cpu_x86_mmu_template.h, + ./node-pc/simulator/arch_gen_cpu_x86_reg_fast.c, + ./node-pc/simulator/arch_gen_cpu_x86_seg.h, + ./node-pc/simulator/arch_gen_cpu_x86_seg_fast.h, + ./node-pc/simulator/arch_gen_cpu_x86_sim_fast.c, + ./node-pc/simulator/arch_gen_cpu_x86_sim_fast.h, + ./node-pc/simulator/arch_gen_cpu_x86_sim_fast_template.h, + ./node-pc/simulator/arch_gen_cpu_x86_state.h, + ./node-pc/simulator/qemu/cpu_jit.h, + ./node-pc/simulator/qemu/cpu_jit_buffer.c, + ./node-pc/simulator/qemu/cpu_jit_compile.c, + ./node-pc/simulator/qemu/cpu_jit_op.c, + ./node-pc/simulator/qemu/cpu_jit_ops_mem.h, + ./node-pc/simulator/qemu/cpu_jit_ops_sse.h, + ./node-pc/simulator/qemu/cpu_jit_ops_template_mem.h, + ./node-pc/simulator/qemu/dyngen.h, + ./node-pc/simulator/qemu/exec-all.h, + ./node-pc/simulator/qemu/libcpu.h: + + Copyright (c) 2005-2009 by FAUmachine Team + Copyright (c) 2003 by Fabrice Bellard + License: LGPL-2+. + +* ./node-pc/simulator/bios/vsprintf.c, + ./node-pc/simulator/vgabios/vsprintf.c: + + Copyright (c) 2004-2009 by FAUmachine Team + Copyright (c) 1991-1992 by Linus Torvalds + License: GPL-2. + +* ./node-pc/simulator/chip_cirrus_gd5446_rop.c, + ./node-pc/simulator/chip_cirrus_gd5446_rop_depth.c: + + Copyright (c) 2005-2009 by FAUmachine Team + Copyright (c) 2004 by Fabrice Bellard + License: + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated documentation files (the "Software"), to deal + in the Software without restriction, including without limitation the rights + to use, copy, modify, merge, publish, distribute, sublicense, andor sell + copies of the Software, and to permit persons to whom the Software is + furnished to do so, subject to the following conditions: + + The above copyright notice and this permission notice shall be included in + all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + THE SOFTWARE.. + +* ./node-pc/simulator/chip_gen_8390.c: + + Copyright (c) 2007-2009 by FAUmachine Team + Copyright (c) 2002 by MandrakeSoft S.A + License: GPL-2+. + +* ./node-pc/simulator/qemu/bswap.h: + + Copyright (c) 2003 by Fabrice Bellard + License: LGPL-2.1+. + +* ./node-pc/simulator/qemu/cpu_jit_opreg_template.h, + ./node-pc/simulator/qemu/cpu_jit_ops_template.h, + ./node-pc/simulator/qemu/exec.h: + + Copyright (c) 2003 by Fabrice Bellard + License: LGPL-2+. + +* ./node-pc/simulator/qemu/elf.h: + + Copyright (c) 2003 by Fabrice Bellard + Copyright (c) 1995-2003 by Free Software Foundation, Inc + License: LGPL-2.1+. + +* ./scripts/faum-tragesym.in: + + Copyright (c) 2008-2009 by FAUmachine Team + Copyright (c) 2001-2007 by Werner Hoch + License: GPL-2+. + +* ./scripts/tunctl.c: + + Copyright (c) 2005-2009 by FAUmachine Team + Copyright (c) 2002 by Jeff Dike + License: GPL-2. + +* ./lib/keymaps/*: + + Based on keymaps from the rdesktop package and modified for FAUmachine. + Copyright (C) FAUmachine team, + Copyright (C) Matthew Chapman 1999-2000. + License: GPL-2, with the following additional exemption: + + This software is released under the GNU General Public License + (reproduced below) with the additional exemption that compiling, + linking, and/or using OpenSSL together with this software is + allowed. --- faumachine-20120707.orig/debian/faumachine-data.install +++ faumachine-20120707/debian/faumachine-data.install @@ -0,0 +1,5 @@ +usr/share/faumachine/vhdl +usr/share/faumachine/keymaps +usr/share/faumachine/png +usr/share/faumachine/experiments +usr/share/faumachine/roms --- faumachine-20120707.orig/debian/faumachine.docs +++ faumachine-20120707/debian/faumachine.docs @@ -0,0 +1,4 @@ +README +STATE +TODO +AUTHORS --- faumachine-20120707.orig/debian/faumachine.install +++ faumachine-20120707/debian/faumachine.install @@ -0,0 +1,5 @@ +usr/share/applications +usr/share/pixmaps +usr/share/icons +usr/bin +usr/share/man --- faumachine-20120707.orig/debian/faumachine.menu +++ faumachine-20120707/debian/faumachine.menu @@ -0,0 +1,5 @@ +?package(faumachine):needs="X11"\ + section="Applications/Emulators"\ + title="FAUmachine"\ + command="/usr/bin/faum"\ + icon="/usr/share/pixmaps/faumachine.xpm" --- faumachine-20120707.orig/debian/patches/absolute_path.patch +++ faumachine-20120707/debian/patches/absolute_path.patch @@ -0,0 +1,109 @@ +Description: Patch taken from upstream CVS to use absolute paths for desktop + file and faum-script for related packages (DBTS: #727095) +Author: Stefan Potyra +Index: doc/faum.desktop.in +=================================================================== +RCS file: doc/faum.desktop.in +diff -N doc/faum.desktop.in +--- /dev/null 1 Jan 1970 00:00:00 -0000 ++++ doc/faum.desktop.in 22 Oct 2013 17:34:11 -0000 1.1 +@@ -0,0 +1,16 @@ ++# Copyright (c) 2009 FAUmachine Team . ++# This program is free software. You can redistribute it and/or modify it ++# under the terms of the GNU General Public License, either version 2 of ++# the License, or (at your option) any later version. See COPYING. ++ ++[Desktop Entry] ++Version=1.0 ++Type=Application ++Name=FAUmachine ++GenericName=Virtual Machine ++Comment=run the virtual machine FAUmachine ++Comment[de_DE]=die virtuelle Maschine FAUmachine starten ++TryExec=@prefix@/bin/faum ++Exec=@prefix@/bin/faum ++Icon=faumachine ++Categories=System;Emulator; +Index: configure.ac +=================================================================== +RCS file: /proj/FAUmachine/src/configure.ac,v +retrieving revision 1.406 +retrieving revision 1.407 +diff -u -r1.406 -r1.407 +--- configure.ac 10 Jun 2013 12:50:10 -0000 1.406 ++++ configure.ac 22 Oct 2013 17:34:10 -0000 1.407 +@@ -1,5 +1,5 @@ + # FAUmachine build configuration +-# $Id: configure.ac,v 1.406 2013/06/10 12:50:10 vrsieh Exp $ ++# $Id: configure.ac,v 1.407 2013/10/22 17:34:10 potyra Exp $ + # + # Copyright (C) 2004-2009 FAUmachine Team . + # This program is free software. You can redistribute it and/or modify it +@@ -526,6 +526,7 @@ + vhdl/Makefile + experiments/Makefile + doc/Makefile ++ doc/faum.desktop + doc/docbook/Makefile + doc/docbook/main.xml + doc/userguide/Makefile +Index: scripts/faum.in +=================================================================== +RCS file: /proj/FAUmachine/src/scripts/faum.in,v +retrieving revision 1.11 +retrieving revision 1.12 +diff -u -r1.11 -r1.12 +--- scripts/faum.in 4 Feb 2011 15:26:42 -0000 1.11 ++++ scripts/faum.in 25 Oct 2013 19:27:16 -0000 1.12 +@@ -1,6 +1,6 @@ + #!/bin/sh + # +-# $Id: faum.in,v 1.11 2011/02/04 15:26:42 potyra Exp $ ++# $Id: faum.in,v 1.12 2013/10/25 19:27:16 potyra Exp $ + # + # Copyright (C) 2009 FAUmachine Team . + # This program is free software. You can redistribute it and/or modify it +@@ -22,8 +22,8 @@ + exit 1; + fi + +- if [ -z $(which fauhdlc) ]; then +- echo "fauhdlc not found. Exiting." ++ if [ -z $(which $PREFIX/bin/fauhdlc) ]; then ++ echo "$PREFIX/bin/fauhdlc not found. Exiting." + exit 1; + fi + } +@@ -172,7 +172,7 @@ + + cat "$HW_TB_VHDL" >> "$IMAGE_PATH/system.vhdl" + +-fauhdlc \ ++$PREFIX/bin/fauhdlc \ + --lib expect "$FAUM_DATA/sigs_and_comps.vhdl" \ + --lib expect "$FAUM_DATA/expect.vhdl" \ + --lib expect "$IMAGE_PATH/system.vhdl" \ +@@ -184,4 +184,4 @@ + + cd "$IMAGE_PATH" + +-faum-node-pc ++$PREFIX/bin/faum-node-pc +Index: doc/faum.desktop +=================================================================== +RCS file: doc/faum.desktop +diff -N doc/faum.desktop +--- doc/faum.desktop 2 Feb 2009 12:23:16 -0000 1.1 ++++ /dev/null 1 Jan 1970 00:00:00 -0000 +@@ -1,11 +0,0 @@ +-[Desktop Entry] +-Version=1.0 +-Type=Application +-Name=FAUmachine +-GenericName=Virtual Machine +-Comment=run the virtual machine FAUmachine +-Comment[de_DE]=die virtuelle Maschine FAUmachine starten +-TryExec=faum +-Exec=faum +-#Icon=faumachine +-Categories=System;Emulator; --- faumachine-20120707.orig/debian/patches/mayhem.patch +++ faumachine-20120707/debian/patches/mayhem.patch @@ -0,0 +1,469 @@ +Description: Fixes mayhem bug reports. Backported from upstream + sources. +Author: Volkmar Sieh +Index: scripts/faum-iso-to-cd.c +=================================================================== +RCS file: /proj/FAUmachine/src/scripts/faum-iso-to-cd.c,v +retrieving revision 1.6 +diff -u -r1.6 faum-iso-to-cd.c +--- scripts/faum-iso-to-cd.c 26 Oct 2009 08:51:03 -0000 1.6 ++++ scripts/faum-iso-to-cd.c 1 Jul 2013 06:35:06 -0000 +@@ -10,7 +10,6 @@ + * the License, or (at your option) any later version. See COPYING. + */ + +-#if 1 + #include + #include + #include +@@ -31,23 +30,6 @@ + void time_stop(void) { } + void time_cont(void) { } + +-#else +-static void +-usage(int retval) +-{ +- fprintf(stderr, "%s [OPTION]...\n", progname); +- fprintf(stderr, "Create a custom Hardware-CD-Image.\n\nOptions:\n" +- "\t-size Useable size of the CD-image in MB\n" +- "\t note that the actual image will be bigger!\n" +- "\t (use values of 180/650/700/800/850)\n" +- "\t-name Filename of the CD-image\n" +- "\t-type Type of the CD-image (W/RW)\n" +- "\t-iso Filename of an ISO which will filled into the image\n" +- ); +- exit(retval); +-} +-#endif +- + static void __attribute__((__noreturn__)) + usage(int retval) + { +@@ -59,7 +41,6 @@ + int + main(int argc, char **argv) + { +-#if 1 + int c; + void *conv; + int out_fd; +@@ -117,7 +98,11 @@ + * Do work. + */ + conv = conv_cd_from_iso_open(in); +- assert(c); ++ if (! conv) { ++ fprintf(stderr, "ERROR: Can't open converter for \"%s\".\n", ++ in); ++ exit(1); ++ } + + out_fd = open(out, O_WRONLY | O_CREAT, 0666); + assert(0 <= out_fd); +@@ -137,350 +122,4 @@ + conv_cd_from_iso_close(conv); + + return 0; +-#else +- int fd; +- int srcfd; +- int ret; +- +- int32_t medium_size = 0; +- int64_t lead_in_size = 0; +- uint8_t msf[3]; +- int option; +- long size = 0; +- const char * filename = NULL; +- const char * isoname = NULL; +- +- struct option longopts[] = { +- /* name, has_arg, flag, val */ +- { "size", 1, NULL, 's' }, +- { "name", 1, NULL, 'n' }, +- { "type", 1, NULL, 't' }, +- { "iso", 1, NULL, 'i' }, +- { NULL, 0, NULL, 0 } +- }; +- +- progname = *argv; +- +- +- /* do some sanity checks, just in case ;) */ +- assert(sizeof(mode1) == 2352); +- +- if (argc == 1) { +- fprintf(stderr, "need parameters!\n"); +- usage(EXIT_FAILURE); +- } +- +- while ((option = getopt_long_only(argc, argv, "", longopts, NULL)) != -1) { +- switch(option) { +- case 's': +- size = strtol(optarg, (char **)NULL, 10); +- if (size < 180 || size > 850) { +- fprintf(stderr, "Is there really a sense using" +- "this size? (%ld)\n", size); +- usage(EXIT_FAILURE); +- } +- switch(size) { +- case 180: +- /* http://www.instantinfo.de/detailcdr.php?ID=809 +- * ATIP-Code: 97m31s07f +- * Hersteller: RITEK Corporation +- * Dye-Type: Phthalocyanine +- * Write-Strategy: 7 - Short Strategy Type +- * Datenkapazitaet: 186.47 MB +- * Audiokapazitaet: 21.15 +- * LBA from ATIP: 95475 +- */ +- +- /* maybe insert scsi-3 mmc table 93 p.73 */ +- media_desc.start_of_leadin_m = 0x61; +- media_desc.start_of_leadin_s = 0x1F; +- media_desc.start_of_leadin_f = 0x07; +- media_desc.total_blocks = 95475; +- medium_size = media_desc.total_blocks; +- break; +- case 650: +- /* http://www.instantinfo.de/detailcdr.php?ID=729 +- */ +- media_desc.start_of_leadin_m = 0x5F; +- media_desc.start_of_leadin_s = 0x1B; +- media_desc.start_of_leadin_f = 0x38; +- media_desc.total_blocks = 333236; +- medium_size = media_desc.total_blocks; +- break; +- case 700: +- /* http://www.instantinfo.de/detailcdr.php?ID=1337 +- */ +- media_desc.start_of_leadin_m = 0x61; +- media_desc.start_of_leadin_s = 0x0F; +- media_desc.start_of_leadin_f = 0x11; +- media_desc.total_blocks = 359848; +- medium_size = media_desc.total_blocks; +- break; +- case 800: +- /* http://www.instantinfo.de/detailcdr.php?ID=2022 +- * has invalid ATIP-Values +- */ +- media_desc.start_of_leadin_m = 0x60; +- media_desc.start_of_leadin_s = 0x2B; +- media_desc.start_of_leadin_f = 0x25; +- media_desc.total_blocks = 359849; +- medium_size = 412160; +- break; +- case 850: +- /* http://www.instantinfo.de/detailcdr.php?ID=1400 +- * has invalid ATIP-Values +- */ +- media_desc.start_of_leadin_m = 0x60; +- media_desc.start_of_leadin_s = 0x2B; +- media_desc.start_of_leadin_f = 0x21; +- media_desc.total_blocks = 359849; +- medium_size = 437760; +- break; +- } +- lba_to_msf(media_desc.total_blocks, msf); +- media_desc.last_possible_start_of_leadout_m = msf[0]; +- media_desc.last_possible_start_of_leadout_s = msf[1]; +- media_desc.last_possible_start_of_leadout_f = msf[2]; +- +- /* add blocks for lead-in */ +- msf_to_lba((uint8_t *)&media_desc.start_of_leadin_m, &lead_in_size); +- medium_size += -1 * lead_in_size; /* -1 because of negative block number */ +- break; +- case 'n': +- filename = optarg; +- break; +- case 't': +- if (strncmp (optarg, "rw", 2) == 0) { +- media_desc.media_type = 1; +- } else { +- media_desc.media_type = 0; +- } +- break; +- case 'i': +- isoname = optarg; +- break; +- default: +- usage(EXIT_FAILURE); +- } +- } +- +- if (argc != optind) { +- fprintf(stderr, "unknown parameter: %s\n", argv[optind]); +- usage(EXIT_FAILURE); +- } +- +- if ( ! filename ) { +- fprintf(stderr, "No FAUM-CD-Image set\n"); +- usage(EXIT_FAILURE); +- } +- +- if ( medium_size == 0 ) { +- fprintf(stderr, "No Medium size set\n"); +- usage(EXIT_FAILURE); +- } +- +- fd = creat(filename, 0666); +- if (fd <= 0) { +- fprintf(stderr, "opening filename %s failed: %s\n", +- filename, strerror(errno)); +- exit(EXIT_FAILURE); +- } +- +- memcpy(media_desc.magic, "\211FAUM-CDIMAGE", 13); +- media_desc.version = FAUM_IMG_VERSION; +- media_desc.offset = 2048; +- media_desc.toc_size = 4096; +- media_desc.unrestricted_use = 1; /* GEMA-Bit, don't care */ +- media_desc.writing_power = 7; /* 12mw */ +- media_desc.reference_speed = 3; /* 8x */ +- media_desc.disc_status = 0; /* empty */ +- media_desc.last_session_status = 0; /* empty */ +- +- /* size must be blocks * 2352 (=block on physical disc) */ +- size = medium_size * 2352; +- +- /* add offset for information */ +- size += media_desc.offset; +- +- /* add blocks for our own toc */ +- size += media_desc.toc_size; +- +- /* create file */ +- /* FIXME maybe use glue_storage directly here as well? */ +- while (0 < size) { +- unsigned int count; +- static const uint8_t buffer[1024*1024]; +- +- if (size < sizeof(buffer)) { +- count = size; +- } else { +- count = sizeof(buffer); +- } +- +- ret = xwrite(fd, buffer, count); +- assert(0 < ret); +- assert(ret <= count); +- +- size -= ret; +- } +- +- /* set seek pointer to start of file */ +- lseek(fd, 0, SEEK_SET); +- +- if (isoname != NULL) { +- mode1 cd_block; +- int sizeoftrack = 0; +- uint8_t tmp_min; +- uint8_t tmp_sec; +- uint8_t tmp_frame; +- toc_session toc; +- +- /* set seek pointer to start of data (after offset and lead-in) */ +- lseek(fd, media_desc.offset + media_desc.toc_size + (-1 * lead_in_size) + 150 * 2352, SEEK_SET); +- +- /* open source-file */ +- srcfd = open(isoname, O_RDONLY); +- if (srcfd <= 0) { +- fprintf(stderr, "opening filename %s failed: %s\n", +- isoname, strerror(errno)); +- exit(EXIT_FAILURE); +- } +- +- cd_block.typeoftrack = 0x6; /* data, recorded uninterrupted */ +- cd_block.datablocktype = 0x8; /* mode 1 */ +- +- /* make sure, image file is not as big as space for payload */ +- while ( 1 ) { +- /* read 2048 byte from source and write 2352 to imagefile */ +- ret = read(srcfd, cd_block.data, sizeof(cd_block.data)); +- if (ret == 0) { +- break; +- } +- ret = write(fd, &cd_block, sizeof(cd_block)); +- sizeoftrack++; +- assert(ret); +- } +- +- close(srcfd); +- +- media_desc.disc_status = 2; /* complete */ +- media_desc.last_session_status = 3; /* complete */ +- /* generate TOC */ +- tmp_min = media_desc.start_of_leadin_m; +- tmp_sec = media_desc.start_of_leadin_s; +- tmp_frame = media_desc.start_of_leadin_f; +- +- toc.x01.ctrl = 0x6; /* data, recorded uninterrupted */ +- toc.x01.adr = 1; +- toc.x01.tno = 0; +- toc.x01.point = 1; +- toc.x01.min = tmp_min; +- toc.x01.sec = tmp_sec; +- toc.x01.frame = tmp_frame; +- toc.x01.zero = 0; +- toc.x01.pmin = 0; +- toc.x01.psec = 0; +- toc.x01.pframe = 0; +- toc.x01.blkcount = sizeoftrack; +- toc.x01.datablocktype = 0x8; /* mode 1 */ +- +- /* FIXME whats with the values x02 -> x63 ? */ +- /* should they be filled with min sec frame, too? */ +- tmp_frame++; +- if ((tmp_frame % 75) == 0) { +- tmp_sec++; +- tmp_frame = 0; +- } +- if ((tmp_sec % 60) == 0) { +- tmp_min++; +- tmp_sec++; +- } +- +- toc.xA0.ctrl = 0x6; /* data, recorded uninterrupted */ +- toc.xA0.adr = 1; +- toc.xA0.tno = 0; +- toc.xA0.point = 0xA0; +- toc.xA0.min = tmp_min; +- toc.xA0.sec = tmp_sec; +- toc.xA0.frame = tmp_frame; +- toc.xA0.zero = 0; +- toc.xA0.pmin = 1; /* first track number */ +- toc.xA0.psec = media_desc.media_type; +- toc.xA0.pframe = 0; +- +- tmp_frame++; +- if ((tmp_frame % 75) == 0) { +- tmp_sec++; +- tmp_frame = 0; +- } +- if ((tmp_sec % 60) == 0) { +- tmp_min++; +- tmp_sec++; +- } +- +- toc.xA1.ctrl = 4; +- toc.xA1.adr = 1; +- toc.xA1.tno = 0; +- toc.xA1.point = 0xA1; +- toc.xA1.min = tmp_min; +- toc.xA1.sec = tmp_sec; +- toc.xA1.frame = tmp_frame; +- toc.xA1.zero = 0; +- toc.xA1.pmin = 1; /* last track number */ +- toc.xA1.psec = 0; +- toc.xA1.pframe = 0; +- +- tmp_frame++; +- if ((tmp_frame % 75) == 0) { +- tmp_sec++; +- tmp_frame = 0; +- } +- if ((tmp_sec % 60) == 0) { +- tmp_min++; +- tmp_sec = 0; +- } +- +- toc.xA2.ctrl = 4; +- toc.xA2.adr = 1; +- toc.xA2.tno = 0; +- toc.xA2.point = 0xA2; +- toc.xA2.min = tmp_min; +- toc.xA2.sec = tmp_sec; +- toc.xA2.frame = tmp_frame; +- toc.xA2.zero = 0; +- /* start position of lead-out */ +- toc.xA2.pmin = (sizeoftrack + 150) / ( 60 * 75 ); +- toc.xA2.psec = (sizeoftrack + 150 - (toc.xA2.pmin * 60 * 75)) % 75; +- toc.xA2.pframe = (sizeoftrack + 150 - (toc.xA2.pmin * 60 * 75) - toc.xA2.psec * 75); +- +- tmp_frame++; +- if ((tmp_frame % 75) == 0) { +- tmp_sec++; +- tmp_frame = 0; +- } +- if ((tmp_sec % 60) == 0) { +- tmp_min++; +- tmp_sec++; +- } +- +- /* set seek pointer to start of lead-in */ +- lseek(fd, media_desc.offset, SEEK_SET); +- /* write TOC */ +- ret = write(fd, &toc, sizeof(toc)); +- /* must be completely written */ +- assert(ret = sizeof(toc)); +- +- /* set seek pointer to start of file */ +- lseek(fd, 0, SEEK_SET); +- } +- +- /* write media description to file */ +- ret = write(fd, &media_desc, sizeof(cd_image)); +- /* must be completely written */ +- assert(ret = sizeof(cd_image)); +- +- +- close(fd); +- exit(EXIT_SUCCESS); +-#endif + } +Index: scripts/mergecow.c +=================================================================== +RCS file: /proj/FAUmachine/src/scripts/mergecow.c,v +retrieving revision 1.11 +diff -u -r1.11 mergecow.c +--- scripts/mergecow.c 28 Jan 2009 17:20:10 -0000 1.11 ++++ scripts/mergecow.c 1 Jul 2013 06:35:06 -0000 +@@ -49,12 +49,12 @@ + if(!cow) error("open cow"); + snprintf(name, sizeof(name), "%s.map", src); + map = fopen(name, "r"); +- if(!cow) error("open map"); ++ if(!map) error("open map"); + media = fopen(src, "r"); +- if(!cow) error("open media"); ++ if(!media) error("open media"); + + target = fopen(tgt, "w"); +- if(!cow) error("open target"); ++ if(!target) error("open target"); + + while( !feof(map) ) { + unsigned char block_map; +Index: lib/conv_cd.c +=================================================================== +RCS file: /proj/FAUmachine/src/lib/conv_cd.c,v +retrieving revision 1.12 +diff -u -r1.12 conv_cd.c +--- lib/conv_cd.c 13 Feb 2012 10:01:21 -0000 1.12 ++++ lib/conv_cd.c 1 Jul 2013 06:35:06 -0000 +@@ -206,7 +206,7 @@ + syntax:; + fprintf(stderr, "%s: WARNING: parse error in cue sheet\n", + path); +- free(s); ++ shm_free(s); + return NULL; + } + if (token == PARSE_EOF) { +Index: lib/glue-main.c +=================================================================== +RCS file: /proj/FAUmachine/src/lib/glue-main.c,v +retrieving revision 1.193 +diff -u -r1.193 glue-main.c +--- lib/glue-main.c 29 Jun 2012 22:02:43 -0000 1.193 ++++ lib/glue-main.c 1 Jul 2013 06:35:06 -0000 +@@ -1123,7 +1123,7 @@ + + storage_handle_args(&argc, argv); + +- while ((c = getopt(argc, argv, "B:D:dhls")) != -1) { ++ while ((c = getopt(argc, argv, "B:D:dh")) != -1) { + switch (c) { + case 'B': + basedir = optarg; --- faumachine-20120707.orig/debian/rules +++ faumachine-20120707/debian/rules @@ -0,0 +1,106 @@ +#!/usr/bin/make -f +# (C) 2008-2010 FAUmachine team. GPL-2+. +# +# based on: +# Sample debian/rules that uses debhelper. +# GNU copyright 1997 by Joey Hess. +# +# This version is for a hypothetical package that builds an +# architecture-dependant package, as well as an architecture-independent +# package. + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +TARGET=$(CURDIR)/debian/tmp + + +patch-stamp: + for i in debian/patches/*; do \ + patch -p0 < $$i; \ + done + touch $@ + +unpatch: + if [ -e patch-stamp ]; then \ + for i in debian/patches/*; do \ + patch -p0 < $$i -R; \ + done \ + fi + $(RM) patch-stamp + +configure: configure.ac patch-stamp + dh_testdir + ./autogen.sh + +config.status: configure + dh_testdir + ./configure \ + --prefix=/usr \ + --mandir=/usr/share/man \ + --enable-build-userguide \ + --disable-prefix-search + +build-stamp: config.status + dh_testdir + $(MAKE) + touch $@ + +mrproper: clean + rm -f debian/copyright + +clean: unpatch + dh_testdir + dh_testroot + rm -f build-stamp + cp copyright debian/copyright + if [ -f Makefile ]; then make mrproper; else echo "No Makefile"; fi + rm -rf debian/tmp + dh_clean + +install: build + dh_testdir + dh_testroot + dh_clean + make install DESTDIR=$(TARGET) + +# nothing to do, no arch:all package built. +binary-indep: install + dh_testdir -i + dh_testroot -i + dh_installdocs -i + dh_installchangelogs -i + dh_install -i --sourcedir=debian/tmp + dh_compress -i --exclude=examples --exclude=.pdf + dh_fixperms -i + dh_installdeb -i + dh_shlibdeps -i + dh_gencontrol -i + dh_md5sums -i + dh_builddeb -i + +binary-arch: install + dh_testdir -a + dh_testroot -a + dh_installdocs -a + dh_installman -a + dh_installchangelogs -a NEWS + dh_installmenu -a + dh_install -a --sourcedir=debian/tmp + dh_strip -a + dh_link -a + dh_compress -a --exclude=examples --exclude=.pdf + dh_fixperms -a + dh_installdeb -a + dh_shlibdeps -a + dh_gencontrol -a + dh_md5sums -a + dh_builddeb -a + +build-indep: build-stamp +build-arch: build-stamp +build: build-indep build-arch + +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary install mrproper build-arch +.PHONY: build-indep unpatch --- faumachine-20120707.orig/debian/source/format +++ faumachine-20120707/debian/source/format @@ -0,0 +1 @@ +1.0 --- faumachine-20120707.orig/debian/watch +++ faumachine-20120707/debian/watch @@ -0,0 +1,2 @@ +version=3 +http://www3.informatik.uni-erlangen.de/Research/FAUmachine/downloads/faumachine-([\d]+).tar.gz