Package: zmakebas
Version: 1.2-1
Severity: normal
Tags: patch pending
Dear maintainer,
I've prepared an NMU for zmakebas (versioned as 1.2-1.1) and
uploaded it to DELAYED/2. Please feel free to tell me if I
should delay it longer.
Regards.
diff -u zmakebas-1.2/debian/changelog zmakebas-1.2/debian/changelog
--- zmakebas-1.2/debian/changelog
+++ zmakebas-1.2/debian/changelog
@@ -1,3 +1,17 @@
+zmakebas (1.2-1.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Replace yada with debhelper. (Closes: #636895)
+ + Copy debian/copyright from binary package.
+ + debian/control: Update Build-Depends. Add ${misc:Depends} and
+ ${shlibs:Depends} to Depends.
+ + Add debian/zmakebas.{install,manpages,docs,examples}. Examples
+ will now be in 'examples' subdirectory rather than 'example'.
+ + debian/rules: Replace.
+ * Remove Piotr from Uploaders. (Closes: #636746)
+
+ -- Tim Retout <dioc...@debian.org> Mon, 15 Aug 2011 19:43:50 +0100
+
zmakebas (1.2-1) unstable; urgency=low
* New upstream release.
diff -u zmakebas-1.2/debian/rules zmakebas-1.2/debian/rules
--- zmakebas-1.2/debian/rules
+++ zmakebas-1.2/debian/rules
@@ -2,240 +2,5 @@
-# Generated automatically from debian/packages
-# by yada v0.53, of Fri, 4 May 2007
-DEB_HOST_ARCH := $(shell dpkg-architecture -qDEB_HOST_ARCH 2>/dev/null)
-DEB_HOST_ARCH_OS := $(shell dpkg-architecture -qDEB_HOST_ARCH_OS
2>/dev/null)
-DEB_HOST_ARCH_CPU := $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU
2>/dev/null)
-DEB_HOST_GNU_CPU := $(shell dpkg-architecture -qDEB_HOST_GNU_CPU
2>/dev/null)
-DEB_HOST_GNU_TYPE := $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE
2>/dev/null)
-DEB_HOST_GNU_SYSTEM := $(shell dpkg-architecture -qDEB_HOST_GNU_SYSTEM
2>/dev/null)
+%:
+ dh $@
-DEB_BUILD_ARCH := $(shell dpkg-architecture -qDEB_BUILD_ARCH 2>/dev/null)
-DEB_BUILD_ARCH_OS := $(shell dpkg-architecture -qDEB_BUILD_ARCH_OS
2>/dev/null)
-DEB_BUILD_ARCH_CPU := $(shell dpkg-architecture -qDEB_BUILD_ARCH_CPU
2>/dev/null)
-DEB_BUILD_GNU_CPU := $(shell dpkg-architecture -qDEB_BUILD_GNU_CPU
2>/dev/null)
-DEB_BUILD_GNU_TYPE := $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE
2>/dev/null)
-DEB_BUILD_GNU_SYSTEM := $(shell dpkg-architecture -qDEB_BUILD_GNU_SYSTEM
2>/dev/null)
-
-# Take account of old dpkg-architecture output.
-ifeq ($(DEB_HOST_ARCH_CPU),)
- DEB_HOST_ARCH_CPU := $(DEB_HOST_GNU_CPU))
- ifeq ($(DEB_HOST_ARCH_CPU),i486)
- DEB_HOST_ARCH_OS := i386
- else
- ifeq ($(DEB_HOST_ARCH_CPU),x86_64)
- DEB_HOST_ARCH_OS := amd64
- endif
- endif
-endif
-ifeq ($(DEB_HOST_ARCH_OS),)
- DEB_HOST_ARCH_OS := $(subst -gnu,,$(DEB_HOST_GNU_SYSTEM))
- ifeq ($(DEB_HOST_ARCH_OS),gnu)
- DEB_HOST_ARCH_OS := hurd
- endif
-endif
-ifeq ($(DEB_BUILD_ARCH_CPU),)
- DEB_BUILD_ARCH_CPU := $(DEB_BUILD_GNU_CPU))
- ifeq ($(DEB_BUILD_ARCH_CPU),i486)
- DEB_BUILD_ARCH_OS := i386
- else
- ifeq ($(DEB_BUILD_ARCH_CPU),x86_64)
- DEB_BUILD_ARCH_OS := amd64
- endif
- endif
-endif
-ifeq ($(DEB_BUILD_ARCH_OS),)
- DEB_BUILD_ARCH_OS := $(subst -gnu,,$(DEB_BUILD_GNU_SYSTEM))
- ifeq ($(DEB_BUILD_ARCH_OS),gnu)
- DEB_BUILD_ARCH_OS := hurd
- endif
-endif
-
-LEFT_PARENTHESIS:=(
-VERSION:=$(shell head -n1 debian/changelog | sed -e "s/^[0-9a-zA-Z.-]*
$(LEFT_PARENTHESIS)//" -e "s/[^0-9a-zA-Z.:+~-].*//")
-
-SHELL=/bin/bash
-
-.PHONY: default
-default:
- @echo "Specify a target:"; \
- echo " build compile the package"; \
- echo " build-arch compile the architecture-dependent package"; \
- echo " build-indep compile the architecture-independent
package"; \
- echo " binary make all binary packages"; \
- echo " binary-arch make all architecture-dependent binary
packages"; \
- echo " binary-indep make all architecture-independent binary
packages"; \
- echo " clean clean up the source package"; \
- echo; \
- echo " clean-install-tree clean up only under debian/"; \
- echo
-
-# Build the package and prepare the install tree
-
-.PHONY: build-only build
-build-only: debian/build-stamp
-build: build-only
-
-.PHONY: build-arch-only build-arch
-build-arch-only: debian/build-arch-stamp
-build-arch: build-arch-only
-
-.PHONY: build-indep-only build-indep
-build-indep-only: debian/build-indep-stamp
-build-indep: build-indep-only
-
-# Make sure these rules and the control file are up-to-date
-
-.PHONY: rules control templates
-rules: debian/rules
-debian/rules: $(shell which yada) debian/packages-tmp
- yada rebuild rules
-
-control: debian/control
-debian/control: $(shell which yada) debian/packages-tmp
- yada rebuild control
-
-templates: debian/templates debian/po/POTFILES.in
-debian/templates: $(shell which yada) debian/packages-tmp
- yada rebuild templates
-debian/po/POTFILES.in: $(shell which yada) debian/packages-tmp
- yada rebuild templates
-
-debian/build-stamp: debian/build-arch-stamp debian/build-indep-stamp
- @[ -f $(shell which yada) -a -f debian/rules ]
- @umask 022 \
- && export pwd="$$(pwd)" \
- && export TMPROOT="$$(pwd)/debian/tmp" \
- && export SOURCE="zmakebas" \
- && export VERSION="$(VERSION)" \
- && export DEB_HOST_GNU_CPU="$(DEB_HOST_GNU_CPU)" \
- && export DEB_HOST_GNU_TYPE="$(DEB_HOST_GNU_TYPE)" \
- && export DEB_HOST_GNU_SYSTEM="$(DEB_HOST_GNU_SYSTEM)" \
- && export DEB_BUILD_GNU_CPU="$(DEB_BUILD_GNU_CPU)" \
- && export DEB_BUILD_GNU_TYPE="$(DEB_BUILD_GNU_TYPE)" \
- && export DEB_BUILD_GNU_SYSTEM="$(DEB_BUILD_GNU_SYSTEM)" && (\
- echo -E 'eval "yada () { perl $$(which yada) \"\$$@\"; }"; set -e; set
-v';\
- echo -E 'make') | /bin/sh
- touch debian/build-stamp
-
-debian/build-arch-stamp:
- @[ -f $(shell which yada) -a -f debian/rules ]
- touch debian/build-arch-stamp
-
-debian/build-indep-stamp: debian/build-arch-stamp
- @[ -f $(shell which yada) -a -f debian/rules ]
- touch debian/build-indep-stamp
-
-.PHONY: install-tree
-install-tree: install-tree-any
-install-tree-any: \
- debian/tmp-zmakebas/DEBIAN/control
-
-debian/tmp-zmakebas/DEBIAN/control: debian/build-stamp debian/control
- rm -rf debian/tmp-zmakebas
- umask 022 && install -d debian/tmp-zmakebas/DEBIAN
- install -d debian/tmp-zmakebas/usr/share/doc/zmakebas
- umask 022; yada generate copyright \
- > debian/tmp-zmakebas/usr/share/doc/zmakebas/copyright
- install -m 644 -p debian/changelog \
- debian/tmp-zmakebas/usr/share/doc/zmakebas/changelog.Debian
- @umask 022 \
- && export pwd="$$(pwd)" \
- && export ROOT="$$(pwd)/debian/tmp-zmakebas" \
- && export TMPROOT="$$(pwd)/debian/tmp" \
- && export CONTROL="$$(pwd)/debian/tmp-zmakebas/DEBIAN" \
- && export PACKAGE="zmakebas" \
- && export SOURCE="zmakebas" \
- && export VERSION="$(VERSION)" \
- && export DEB_HOST_GNU_CPU="$(DEB_HOST_GNU_CPU)" \
- && export DEB_HOST_GNU_TYPE="$(DEB_HOST_GNU_TYPE)" \
- && export DEB_HOST_GNU_SYSTEM="$(DEB_HOST_GNU_SYSTEM)" \
- && export DEB_BUILD_GNU_CPU="$(DEB_BUILD_GNU_CPU)" \
- && export DEB_BUILD_GNU_TYPE="$(DEB_BUILD_GNU_TYPE)" \
- && export DEB_BUILD_GNU_SYSTEM="$(DEB_BUILD_GNU_SYSTEM)" && (\
- echo -E 'eval "yada () { perl $$(which yada) \"\$$@\"; }"; set -e; set
-v';\
- echo -E 'yada install -bin zmakebas';\
- echo -E 'yada install -doc README';\
- echo -E 'yada copy -doc demo.bas demolbl.bas -subdir example';\
- echo -E 'yada install -man zmakebas.1';\
- echo -E 'yada install -doc ChangeLog -as changelog') | /bin/sh
- @umask 022 \
- && export pwd="$$(pwd)" \
- && export ROOT="$$(pwd)/debian/tmp-zmakebas" \
- && export TMPROOT="$$(pwd)/debian/tmp" \
- && export CONTROL="$$(pwd)/debian/tmp-zmakebas/DEBIAN" \
- && export PACKAGE="zmakebas" \
- && export SOURCE="zmakebas" \
- && export VERSION="$(VERSION)" && (\
- echo -E 'eval "yada () { perl $$(which yada) \"\$$@\"; }"; set -e; set
-v';\
- echo -E 'yada perl';\
- echo -E 'yada python';\
- echo -E 'yada strip';\
- echo -E 'yada shlibdeps') | /bin/sh
- yada compress zmakebas
- yada generate maintscripts zmakebas
- find debian/tmp-zmakebas -type f -print \
- | sed -n 's/^debian\/tmp-zmakebas\(\/etc\/.*\)$$/\1/p' \
- > debian/tmp-zmakebas/DEBIAN/conffiles
- test -s debian/tmp-zmakebas/DEBIAN/conffiles || rm -f
debian/tmp-zmakebas/DEBIAN/conffiles
- yada rebuild control
- yada generate substvars zmakebas
- umask 022 && dpkg-gencontrol -isp -pzmakebas -Pdebian/tmp-zmakebas
-
-# Build package files
-
-.PHONY: binary binary-arch binary-indep
-binary: binary-arch binary-indep
-binary-arch: binary-arch-any
-
-.PHONY: binary-arch-any
-binary-arch-any: \
- binary-package-zmakebas
-binary-indep:
-
-.PHONY: binary-package-zmakebas
-binary-package-zmakebas: check-root debian/tmp-zmakebas/DEBIAN/control
- @[ -f $(shell which yada) -a -f debian/rules ]
- chown -R 0.0 debian/tmp-zmakebas
- chmod -R u=rwX,go=rX debian/tmp-zmakebas
- @if [ -d debian/tmp-zmakebas/usr/doc/zmakebas ]; then \
- echo "*** Yada warning: /usr/doc/zmakebas should be
/usr/share/doc/zmakebas";\
- fi
- dpkg-deb --build debian/tmp-zmakebas ..
-
-.PHONY: check-root
-check-root:
- @[ `id -u` = 0 ] || (echo "You must be root to do this!"; false)
-
-debian/packages-tmp: debian/packages
- yada rebuild packages
-
-## Clean up afterwards
-
-.PHONY: clean clean-install-tree clean-build
-
-clean: clean-install-tree clean-build debian/control debian/rules
- rm -f debian/packages-tmp debian/packages-tmp-new
debian/packages-tmp-include
-
-clean-build:
- @[ -f $(shell which yada) -a -f debian/rules ]
- rm -f debian/build-stamp debian/build-arch-stamp
debian/build-indep-stamp
- @umask 022 \
- && export pwd="$$(pwd)" \
- && export TMPROOT="$$(pwd)/debian/tmp" \
- && export SOURCE="zmakebas" \
- && export VERSION="$(VERSION)" \
- && export DEB_HOST_GNU_CPU="$(DEB_HOST_GNU_CPU)" \
- && export DEB_HOST_GNU_TYPE="$(DEB_HOST_GNU_TYPE)" \
- && export DEB_HOST_GNU_SYSTEM="$(DEB_HOST_GNU_SYSTEM)" \
- && export DEB_BUILD_GNU_CPU="$(DEB_BUILD_GNU_CPU)" \
- && export DEB_BUILD_GNU_TYPE="$(DEB_BUILD_GNU_TYPE)" \
- && export DEB_BUILD_GNU_SYSTEM="$(DEB_BUILD_GNU_SYSTEM)" && (\
- echo -E 'eval "yada () { perl $$(which yada) \"\$$@\"; }"; set -e; set
-v';\
- echo -E 'make clean || true') | /bin/sh
- yada unpatch
- rm -rf debian/tmp
-
-clean-install-tree: debian/rules
- @[ -f $(shell which yada) -a -f debian/rules ]
- rm -f debian/install-tree-stamp
- rm -rf debian/tmp-* debian/files* debian/substvars debian/shlibs.local
debian/ucf
+override_dh_auto_install:
reverted:
--- zmakebas-1.2/debian/packages
+++ zmakebas-1.2.orig/debian/packages
@@ -1,32 +0,0 @@
-## debian/packages for zmakebas
-
-Source: zmakebas
-Section: otherosfs
-Priority: extra
-Maintainer: Krystian Wlosek <tyg...@waw.pdi.net>
-Uploaders: Piotr Roszatycki <dex...@debian.org>
-Standards-Version: 3.7.2
-Upstream-Source:
<URL:ftp://ftp.ibiblio.org/pub/Linux/system/emulators/zx/zmakebas-1.1.tar.gz>
-Home-Page: <URL:http://rus.members.beeb.net/zmakebas.html>
-Description: convert text files into ZX Spectrum Basic programs
-Copyright: .
- Public domain
- .
-Build: sh
- make
-Clean: sh
- make clean || true
-
-Package: zmakebas
-Description: convert text files into ZX Spectrum Basic programs
- zmakebas converts a Spectrum Basic program written as a text file into
- an actual speccy Basic file (as a .TAP file, or optionally a raw
- headerless file).
-Architecture: any
-Install: sh
- yada install -bin zmakebas
- yada install -doc README
- yada copy -doc demo.bas demolbl.bas -subdir example
- yada install -man zmakebas.1
- yada install -doc ChangeLog -as changelog
-
diff -u zmakebas-1.2/debian/control zmakebas-1.2/debian/control
--- zmakebas-1.2/debian/control
+++ zmakebas-1.2/debian/control
@@ -1,13 +1,13 @@
Source: zmakebas
Maintainer: Krystian Wlosek <tyg...@waw.pdi.net>
-Uploaders: Piotr Roszatycki <dex...@debian.org>
Section: otherosfs
Priority: extra
Standards-Version: 3.7.2
-Build-Depends: yada (>= 0.53)
+Build-Depends: debhelper (>= 8)
Package: zmakebas
Architecture: any
+Depends: ${misc:Depends}, ${shlibs:Depends}
Description: convert text files into ZX Spectrum Basic programs
zmakebas converts a Spectrum Basic program written as a text file into
an actual speccy Basic file (as a .TAP file, or optionally a raw
only in patch2:
unchanged:
--- zmakebas-1.2.orig/debian/compat
+++ zmakebas-1.2/debian/compat
@@ -0,0 +1 @@
+8
only in patch2:
unchanged:
--- zmakebas-1.2.orig/debian/zmakebas.docs
+++ zmakebas-1.2/debian/zmakebas.docs
@@ -0,0 +1 @@
+README
only in patch2:
unchanged:
--- zmakebas-1.2.orig/debian/copyright
+++ zmakebas-1.2/debian/copyright
@@ -0,0 +1,15 @@
+This is a prepackaged version of convert text files
+into ZX Spectrum Basic programs. It was Debianised by
+Krystian Wlosek <tyg...@waw.pdi.net>, and uploaded by Piotr
+Roszatycki <dex...@debian.org>, using files obtained from
+<URL:ftp://ftp.ibiblio.org/pub/Linux/system/emulators/zx/zmakebas-1.1.tar.gz>.
+
+More information about convert text files into ZX Spectrum Basic programs
+is available from <URL:http://rus.members.beeb.net/zmakebas.html>
+
+Copyright and licence notice:
+
+ Public domain
+
+
+.
only in patch2:
unchanged:
--- zmakebas-1.2.orig/debian/zmakebas.examples
+++ zmakebas-1.2/debian/zmakebas.examples
@@ -0,0 +1,2 @@
+demo.bas
+demolbl.bas
only in patch2:
unchanged:
--- zmakebas-1.2.orig/debian/zmakebas.manpages
+++ zmakebas-1.2/debian/zmakebas.manpages
@@ -0,0 +1 @@
+zmakebas.1
only in patch2:
unchanged:
--- zmakebas-1.2.orig/debian/zmakebas.install
+++ zmakebas-1.2/debian/zmakebas.install
@@ -0,0 +1 @@
+zmakebas /usr/bin/
--
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
