Menu
▾
▴
[fuse-emulator-cvs] SF.net SVN: fuse-emulator: [3492] trunk/debian/fuse-emulator
|
From: <zu...@us...> - 2008-01-15 02:22:39
|
Revision: 3492
http://fuse-emulator.svn.sourceforge.net/fuse-emulator/?rev=3492&view=rev
Author: zubzero
Date: 2008-01-14 18:22:42 -0800 (Mon, 14 Jan 2008)
Log Message:
-----------
* Don't use --datadir, as it didn't work.
* Use dpatch, and add patches:
- 01-configure.dpatch: rename fuse to fuse-emulator.
- 01-noroms: don't distribute the ROMs, as they are non-free.
- 01-man: rename fuse to fuse-emulator in the man page.
* Add build-dependencies on dpatch, flex and bison.
* Make fuse-emulator-common depend on fuse-emulator-roms.
* Remove the reference to the non-free ROMs from the package
description for fuse-emulator-common.
Modified Paths:
--------------
trunk/debian/fuse-emulator/changelog
trunk/debian/fuse-emulator/control
trunk/debian/fuse-emulator/rules
Added Paths:
-----------
trunk/debian/fuse-emulator/patches/
trunk/debian/fuse-emulator/patches/00list
trunk/debian/fuse-emulator/patches/01_configure.dpatch
trunk/debian/fuse-emulator/patches/01_man.dpatch
trunk/debian/fuse-emulator/patches/01_noroms.dpatch
Modified: trunk/debian/fuse-emulator/changelog
===================================================================
--- trunk/debian/fuse-emulator/changelog 2008-01-13 19:38:39 UTC (rev 3491)
+++ trunk/debian/fuse-emulator/changelog 2008-01-15 02:22:42 UTC (rev 3492)
@@ -1,5 +1,19 @@
fuse-emulator (0.9.0-2) unstable; urgency=low
+ * Don't use --datadir, as it didn't work.
+ * Use dpatch, and add patches:
+ - 01-configure.dpatch: rename fuse to fuse-emulator.
+ - 01-noroms: don't distribute the ROMs, as they are non-free.
+ - 01-man: rename fuse to fuse-emulator in the man page.
+ * Add build-dependencies on dpatch, flex and bison.
+ * Make fuse-emulator-common depend on fuse-emulator-roms.
+ * Remove the reference to the non-free ROMs from the package
+ description for fuse-emulator-common.
+
+ -- Stuart Brady <sd...@nt...> Tue, 15 Jan 2008 02:21:05 +0000
+
+fuse-emulator (0.9.0-2) unstable; urgency=low
+
* Remove comments from the rules and control files.
-- Stuart Brady <sd...@nt...> Thu, 10 Jan 2008 15:14:32 +0000
Modified: trunk/debian/fuse-emulator/control
===================================================================
--- trunk/debian/fuse-emulator/control 2008-01-13 19:38:39 UTC (rev 3491)
+++ trunk/debian/fuse-emulator/control 2008-01-15 02:22:42 UTC (rev 3492)
@@ -2,21 +2,23 @@
Section: contrib/otherosfs
Priority: extra
Maintainer: Stuart Brady <sd...@nt...>
-Build-Depends: debhelper (>= 5), autotools-dev, libspectrum-dev (>= 0.4.0), lib765-dev (>= 0.4.1), libdsk-dev (>= 1.2.0), libxml2-dev, libjsw-dev, libsamplerate0-dev, libpng12-dev, libasound2-dev, libgtk2.0-dev, libsdl1.2-dev, libx11-dev
+Build-Depends: debhelper (>= 5), dpatch, autotools-dev, bison, flex, libspectrum-dev (>= 0.4.0), lib765-dev (>= 0.4.1), libdsk-dev (>= 1.2.0), libxml2-dev, libjsw-dev, libsamplerate0-dev, libpng12-dev, libasound2-dev, libgtk2.0-dev, libsdl1.2-dev, libx11-dev
Standards-Version: 3.7.2
Homepage: http://fuse-emulator.sourceforge.net/
Vcs-Svn: https://fuse-emulator.svn.sourceforge.net/svnroot/fuse-emulator/trunk/fuse
Vcs-Browser: http://fuse-emulator.svn.sourceforge.net/viewvc/fuse-emulator/trunk/fuse/
+# fbdev also needs libgpm
+
Package: fuse-emulator-common
Architecture: all
+Depends: fuse-emulator-roms
Description: ZX Spectrum emulator - common files
Fuse is a ZX Spectrum emulator. It emulates the original 16K, 48K, 128K,
+2, +2A and +3 models, the Timex TC2048, TC2068 and TS2068, and several
clones of the ZX Spectrum.
.
- This package contains files common to all user interfaces, and includes the
- necessary (non-free) ROM images.
+ This package contains files common to all user interfaces.
Package: fuse-emulator-gtk
Architecture: any
Added: trunk/debian/fuse-emulator/patches/00list
===================================================================
--- trunk/debian/fuse-emulator/patches/00list (rev 0)
+++ trunk/debian/fuse-emulator/patches/00list 2008-01-15 02:22:42 UTC (rev 3492)
@@ -0,0 +1,3 @@
+01_configure
+01_noroms
+01_man
Added: trunk/debian/fuse-emulator/patches/01_configure.dpatch
===================================================================
--- trunk/debian/fuse-emulator/patches/01_configure.dpatch (rev 0)
+++ trunk/debian/fuse-emulator/patches/01_configure.dpatch 2008-01-15 02:22:42 UTC (rev 3492)
@@ -0,0 +1,22 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 01-configure.dpatch by Stuart Brady <sd...@nt...>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Rename to fuse-emulator, to avoid conflicting with
+## DP: the Filesystem in USErspace packages.
+
+@DPATCH@
+--- fuse-emulator-0.9.0-old/configure.in 2008-01-12 21:02:32.000000000 +0000
++++ fuse-emulator-0.9.0-new/configure.in 2008-01-08 22:15:59.000000000 +0000
+@@ -24,7 +24,7 @@
+ AC_CANONICAL_SYSTEM
+
+ dnl Use automake to produce `Makefile.in'
+-AM_INIT_AUTOMAKE(fuse, 0.9.0)
++AM_INIT_AUTOMAKE(fuse-emulator, 0.9.0)
+
+ dnl Checks for programs.
+ AC_PROG_CC
+ fi
+ fi
+
Added: trunk/debian/fuse-emulator/patches/01_man.dpatch
===================================================================
--- trunk/debian/fuse-emulator/patches/01_man.dpatch (rev 0)
+++ trunk/debian/fuse-emulator/patches/01_man.dpatch 2008-01-15 02:22:42 UTC (rev 3492)
@@ -0,0 +1,94 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 01-man.dpatch by Stuart Brady <sd...@nt...>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Refer to fuse-emulator instead of fuse in the man page, due to the
+## DP: altered binary name (so as not to conflict with the
+## DP: Filesystem in USErspace packages.)
+
+@DPATCH@
+--- fuse-emulator-0.9.0.orig/man/fuse.1
++++ fuse-emulator-0.9.0/man/fuse.1
+@@ -1,6 +1,6 @@
+ .\" -*- nroff -*-
+ .\"
+-.\" fuse.1: Fuse man page
++.\" fuse-emulator.1: Fuse man page
+ .\" Copyright (c) 2001-2007 Russell Marks, Philip Kendall, Darren Salt,
+ .\" Fredrick Meunier, Stuart Brady
+ .\"
+@@ -23,12 +23,12 @@
+ .\" E-mail: phi...@sh...
+ .\"
+ .\"
+-.TH fuse 1 "5th January, 2008" "Version 0.9.0" "Emulators"
++.TH fuse-emulator 1 "5th January, 2008" "Version 0.9.0" "Emulators"
+ .\"
+ .\"------------------------------------------------------------------
+ .\"
+ .SH NAME
+-fuse \- Sinclair ZX Spectrum emulator
++fuse\-emulator \- Sinclair ZX Spectrum emulator
+ .\"
+ .\"------------------------------------------------------------------
+ .\"
+@@ -36,7 +36,7 @@
+ .\" the trend for long-option-using programs is to give a largely
+ .\" generic synopsis, so...
+ .PD 0
+-.B fuse
++.B fuse\-emulator
+ .RI [ options ]
+ .P
+ .PD 1
+@@ -835,11 +835,11 @@
+ .PP
+ Some examples of use:
+ .PP
+-.I fuse \-d alsa09:dev=hw:1
++.I fuse\-emulator \-d alsa09:dev=hw:1
+ .PP
+ causes Fuse to use ALSA 0.9+ output with the second (#1) sound card.
+ .PP
+-.I fuse \-d raw:byteorder=little,file=enigma.raw
++.I fuse\-emulator \-d raw:byteorder=little,file=enigma.raw
+ .PP
+ causes Fuse to save little endian words to
+ .RI ` enigma.raw "'."
+@@ -898,13 +898,13 @@
+ .PP
+ Some examples of use:
+ .PP
+-.I fuse \-d verbose,buffer=2000
++.I fuse\-emulator \-d verbose,buffer=2000
+ .PP
+ causes Fuse to use the default ALSA device with 2000 frame length buffer and
+ report ALSA buffer underruns on
+ .IR stderr .
+ .PP
+-.I fuse \-d tee:plughw:0,\(aq/tmp/aufwm.raw\(aq,raw
++.I fuse\-emulator \-d tee:plughw:0,\(aq/tmp/aufwm.raw\(aq,raw
+ .PP
+ causes Fuse to use the first card and parallel save the raw audio samples
+ into
+@@ -3287,9 +3287,9 @@
+ other than SDL.
+ .PP
+ Attempting to replay an RZX file without an embedded snapshot from the
+-command-line doesn't work if you do `./fuse
++command-line doesn't work if you do `./fuse\-emulator
+ .IR "rzxfile snapshot" '.
+-`./fuse
++`./fuse\-emulator
+ .IR "snapshot rzxfile" '
+ does work though, so use that instead.
+ .PP
+@@ -3322,7 +3322,7 @@
+ .\"
+ .SH SEE ALSO
+ .IR bzip2 "(3),"
+-.IR fuse\-utils "(1),"
++.IR fuse\-emulator\-utils "(1),"
+ .IR gzip "(3),"
+ .IR libspectrum "(3),"
+ .IR ogg123 "(1),"
Added: trunk/debian/fuse-emulator/patches/01_noroms.dpatch
===================================================================
--- trunk/debian/fuse-emulator/patches/01_noroms.dpatch (rev 0)
+++ trunk/debian/fuse-emulator/patches/01_noroms.dpatch 2008-01-15 02:22:42 UTC (rev 3492)
@@ -0,0 +1,16 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 01-noroms.dpatch by Stuart Brady <sd...@nt...>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Don't install the ROMs, as they are non-free.
+
+--- fuse-emulator-0.9.0-old/roms/Makefile.am 2008-01-13 19:31:46.000000000 +0000
++++ fuse-emulator-0.9.0-new/roms/Makefile.am 2008-01-12 22:02:01.000000000 +0000
+@@ -36,6 +36,6 @@
+ if1-1.rom if1-2.rom \
+ plusd.rom
+
+-pkgdata_DATA = $(ROMS)
++#pkgdata_DATA = $(ROMS)
+
+ EXTRA_DIST = $(ROMS)
Modified: trunk/debian/fuse-emulator/rules
===================================================================
--- trunk/debian/fuse-emulator/rules 2008-01-13 19:38:39 UTC (rev 3491)
+++ trunk/debian/fuse-emulator/rules 2008-01-15 02:22:42 UTC (rev 3492)
@@ -9,6 +9,8 @@
# This has to be exported to make some magic below work.
export DH_OPTIONS
+include /usr/share/dpatch/dpatch.make
+
# 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)
@@ -19,10 +21,9 @@
--build=$(DEB_BUILD_GNU_TYPE) \
--prefix=/usr --mandir=\$${prefix}/share/man \
--infodir=\$${prefix}/share/info \
- --datadir=\$${prefix}/share/fuse-emulator \
LDFLAGS="-Wl,-z,defs"
-build: build-arch-gtk build-arch-sdl build-arch-x11 build-indep
+build: patch build-arch-gtk build-arch-sdl build-arch-x11 build-indep
build-arch-gtk: build-arch-gtk-stamp
build-arch-gtk-stamp:
@@ -78,7 +79,7 @@
#$(MAKE) doc
touch $@
-clean:
+clean: unpatch
dh_testdir
dh_testroot
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|