Package: spectemu
Severity: important
Tags: patch
Hi Colin,
svgalib is scheduled for removal in jessie. Attached patch removes the
spectemu-svga package. (Actually, one could even unify the package
to a single package now, I'll leave that at your discretion)
Cheers,
Moritz
diff -Naur spectemu-0.94a.orig/debian/control spectemu-0.94a/debian/control
--- spectemu-0.94a.orig/debian/control 2013-02-09 20:19:25.000000000 +0100
+++ spectemu-0.94a/debian/control 2013-06-04 22:13:32.000000000 +0200
@@ -3,14 +3,13 @@
Priority: optional
Maintainer: Colin Watson <[email protected]>
Standards-Version: 3.5.6
-Build-Depends: dpkg-dev (>= 1.16.1~), debhelper (>= 8.9.0~), libreadline-dev, libsvga1-dev [amd64 i386], x11proto-core-dev, libx11-dev, libxt-dev, libxext-dev, dh-autoreconf, autotools-dev
-Build-Conflicts: svgalib-dummyg1
+Build-Depends: dpkg-dev (>= 1.16.1~), debhelper (>= 8.9.0~), libreadline-dev, x11proto-core-dev, libx11-dev, libxt-dev, libxext-dev, dh-autoreconf, autotools-dev
Vcs-Bzr: http://anonscm.debian.org/bzr/users/cjwatson/spectemu/trunk
Package: spectemu-common
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
-Suggests: spectemu-x11 | spectemu-svga [amd64 i386]
+Suggests: spectemu-x11
Replaces: xspectemu
Description: Fast 48k ZX Spectrum Emulator (common files)
Spectemu emulates the 48k ZX Spectrum, which uses the Z80 microprocessor.
@@ -43,29 +42,6 @@
Spectrum, which uses the Z80 microprocessor.
.
It emulates the Z80 processor as well as the 48k Spectrum's other
- hardware: keyboard, screen, sound, tape I/O. The emulation is very
- close to the real thing, but it is still quite fast (It was reported
- to be working well on a laptop with 486 at 25MHz!). On the other hand,
- the user interface is not the best.
- .
- Features include:
- - Sound support through Linux kernel sound-card driver.
- - Snapshot saving and loading (.Z80 and .SNA format)
- - Tape emulation: loading from tape files (.TAP and .TZX format)
- - Optional quick loading of tapes.
- - Saving to tape files.
- - Separate utility to save tape files to real tape
- - Configurable with config files and from command line
-
-Package: spectemu-svga
-Architecture: amd64 i386
-Depends: spectemu-common (= ${binary:Version}), spectrum-roms, ${shlibs:Depends}, ${misc:Depends}
-Replaces: xspectemu
-Description: Fast 48k ZX Spectrum Emulator for SVGAlib
- vgaspect is the SVGAlib version of Spectemu which emulates the 48k ZX
- Spectrum, which uses the Z80 microprocessor.
- .
- It emulates the Z80 processor as well as the 48k Spectrum's other
hardware: keyboard, screen, sound, tape I/O. The emulation is very
close to the real thing, but it is still quite fast (It was reported
to be working well on a laptop with 486 at 25MHz!). On the other hand,
diff -Naur spectemu-0.94a.orig/debian/rules spectemu-0.94a/debian/rules
--- spectemu-0.94a.orig/debian/rules 2013-02-09 20:19:17.000000000 +0100
+++ spectemu-0.94a/debian/rules 2013-06-04 22:09:08.000000000 +0200
@@ -3,10 +3,6 @@
tmp = debian/tmp
ctmp = debian/spectemu-common
xtmp = debian/spectemu-x11
-stmp = debian/spectemu-svga
-
-# Put any extra svgalib architectures here.
-svgalib_archs = amd64 i386
DEB_HOST_ARCH := $(shell dpkg-architecture -qDEB_HOST_ARCH)
@@ -49,15 +45,6 @@
# dh_compress won't do these for us, as the package split causes
# them to be broken symlinks.
ln -sf spectemu.1.gz $(xtmp)/usr/share/man/man1/xspect.1.gz
-ifneq (,$(findstring $(DEB_HOST_ARCH),$(svgalib_archs)))
- ln -sf spectemu.1.gz $(stmp)/usr/share/man/man1/vgaspect.1.gz
-endif
override_dh_installdocs:
- dh_installdocs --link-doc=spectemu-common
-
-ifneq (,$(findstring $(DEB_HOST_ARCH),$(svgalib_archs)))
-override_dh_fixperms:
- dh_fixperms
- chmod 4755 $(stmp)/usr/bin/vgaspect
-endif
+ dh_installdocs --link-doc=spectemu-common
\ Kein Zeilenumbruch am Dateiende.
diff -Naur spectemu-0.94a.orig/debian/spectemu-svga.dirs spectemu-0.94a/debian/spectemu-svga.dirs
--- spectemu-0.94a.orig/debian/spectemu-svga.dirs 2008-09-06 14:24:45.000000000 +0200
+++ spectemu-0.94a/debian/spectemu-svga.dirs 1970-01-01 01:00:00.000000000 +0100
@@ -1,2 +0,0 @@
-usr/share/lintian/overrides
-usr/share/man/man1
diff -Naur spectemu-0.94a.orig/debian/spectemu-svga.install spectemu-0.94a/debian/spectemu-svga.install
--- spectemu-0.94a.orig/debian/spectemu-svga.install 2008-09-06 14:24:45.000000000 +0200
+++ spectemu-0.94a/debian/spectemu-svga.install 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-usr/bin/vgaspect
diff -Naur spectemu-0.94a.orig/debian/spectemu-svga.lintian-overrides spectemu-0.94a/debian/spectemu-svga.lintian-overrides
--- spectemu-0.94a.orig/debian/spectemu-svga.lintian-overrides 2008-09-06 14:24:45.000000000 +0200
+++ spectemu-0.94a/debian/spectemu-svga.lintian-overrides 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-spectemu-svga: setuid-binary usr/bin/vgaspect 4755 root/root
diff -Naur spectemu-0.94a.orig/debian/spectemu-svga.menu spectemu-0.94a/debian/spectemu-svga.menu
--- spectemu-0.94a.orig/debian/spectemu-svga.menu 2009-07-26 17:54:02.000000000 +0200
+++ spectemu-0.94a/debian/spectemu-svga.menu 1970-01-01 01:00:00.000000000 +0100
@@ -1,3 +0,0 @@
-?package(spectemu-svga):needs="vc" section="Applications/Emulators" \
- title="Spectemu (SVGA)" longtitle="Spectemu ZX-Spectrum emulator (SVGA)" \
- command="/usr/bin/vgaspect"
