diff -u openhackware-0.4.1/debian/control openhackware-0.4.1/debian/control --- openhackware-0.4.1/debian/control +++ openhackware-0.4.1/debian/control @@ -2,15 +2,18 @@ Section: misc Priority: optional Maintainer: Guillem Jover -Build-Depends-Indep: debhelper (>= 5.0.0) -Standards-Version: 3.6.2 +Homepage: http://perso.magic.fr/l_indien/OpenHackWare/ +Vcs-Browser: http://git.debian.org/?p=users/guillem/pkg-openhackware.git +Vcs-Git: git://git.debian.org/~guillem/pkg-openhackware.git +Build-Depends: quilt (>= 0.40), debhelper (>= 5.0.0) +Standards-Version: 3.7.3 Package: openhackware Architecture: all Description: OpenFirmware emulator for PowerPC OpenHackWare is an OpenFirmware emulator intended to be used on PowerPC machines. It is not a real OpenFirmware as it knows nothing about Forth. - It emulates the OpenFirmare boot time interface as well as the RTAS + It emulates the OpenFirmware boot time interface as well as the RTAS interface. It also emulates some known "interpret" strings, to make it able to launch known OSes. diff -u openhackware-0.4.1/debian/changelog openhackware-0.4.1/debian/changelog --- openhackware-0.4.1/debian/changelog +++ openhackware-0.4.1/debian/changelog @@ -1,3 +1,24 @@ +openhackware (0.4.1-3) unstable; urgency=low + + * Fix typo in package description. (Closes: #390236) + Thanks to Simon Waters . + * Now using Standards-Version 3.7.3 (no changes needed). + * Error out if the toolchain used to build is not powerpc-linux-gnu. + (Closes: #322300, #339870) + * Support cross-compiling by passing a cross prefix to make when not + building natively. + * Remove commented debhelper commands. + * Do not ignore make errors on 'debian/rules clean'. + * Switch to quilt: + - Remove now unused debian/patch.mk. + - Replace include of patch.mk with quilt.make in debian/rules. + - Add Build-Depends on 'quilt (>= 0.40)'. + * Move debhelper from Build-Depends-Indep to Build-Depends, needed by clean. + * Add Homepage field. + * Add Vcs-Browser and Vcs-Git fields. + + -- Guillem Jover Wed, 12 Dec 2007 08:57:39 +0200 + openhackware (0.4.1-2) unstable; urgency=low * Stop Build-Depending on gcc-2.95, by adding the new missing .rodata.* diff -u openhackware-0.4.1/debian/watch openhackware-0.4.1/debian/watch --- openhackware-0.4.1/debian/watch +++ openhackware-0.4.1/debian/watch @@ -1,4 +1,3 @@ version=3 - http://perso.magic.fr/l_indien/OpenHackWare/ .*/OpenHackWare-([0-9a-z.]*)\.tar\.bz2 reverted: --- openhackware-0.4.1/debian/patch.mk +++ openhackware-0.4.1.orig/debian/patch.mk @@ -1,95 +0,0 @@ -# -*- mode: makefile; coding: utf-8 -*- -# Copyright © 2002,2003 Colin Walters -# -# Modified by Guillem Jover : -# Standalone system -# Honour DPATCHLEVEL -# Exit when trying to revert patches but no stamp-patch exists -# Provide a patch and unpatch targets -# -# Description: A sample patch system which uses separate files in debian/patches -# Patch names must end in .patch, currently. -# -# 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; either version 2, 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. - -DEB_SRCDIR ?= . -DEB_PATCHDIRS = debian/patches -DEB_PATCHES = $(foreach dir,$(DEB_PATCHDIRS),$(shell LC_COLLATE=C echo $(wildcard $(dir)/*.patch) $(wildcard $(dir)/*.diff))) - -patch: apply-patches - -unpatch: reverse-patches - rm -f debian/stamp-patch* - rm -f debian/patches/*.log - -# The patch subsystem -apply-patches: debian/stamp-patched -debian/stamp-patched: $(DEB_PATCHES) -debian/stamp-patched reverse-patches: - @echo "patches: $(DEB_PATCHES)" - @set -e ; reverse=""; patches="$(DEB_PATCHES)"; \ - if [ "$@" = "reverse-patches" ]; then \ - if [ ! -e debian/stamp-patched ]; then \ - echo "Not reversing not applied patches."; \ - exit 0; \ - fi; \ - reverse="-R"; \ - for patch in $$patches; do reversepatches="$$patch $$reversepatches"; done; \ - patches="$$reversepatches"; \ - fi; \ - for patch in $$patches; do \ - level=$$(head $$patch | egrep '^#DPATCHLEVEL=' | cut -f 2 -d '='); \ - reverse=""; \ - if [ "$@" = "reverse-patches" ]; then reverse="-R"; fi; \ - success=""; \ - if [ -z "$$level" ]; then \ - echo -n "Trying "; if test -n "$$reverse"; then echo -n "reversed "; fi; echo -n "patch $$patch at level "; \ - for level in 0 1 2; do \ - if test -z "$$success"; then \ - echo -n "$$level..."; \ - if cat $$patch | patch -d $(DEB_SRCDIR) $$reverse -E --dry-run -p$$level 1>$$patch.level-$$level.log 2>&1; then \ - if cat $$patch | patch -d $(DEB_SRCDIR) $$reverse -E --no-backup-if-mismatch -V never -p$$level 1>$$patch.level-$$level.log 2>&1; then \ - success=yes; \ - touch debian/stamp-patch-$$(basename $$patch); \ - echo "success."; \ - fi; \ - fi; \ - fi; \ - done; \ - if test -z "$$success"; then \ - if test -z "$$reverse"; then \ - echo "failure."; \ - exit 1; \ - else \ - echo "failure (ignored)."; \ - fi \ - fi; \ - else \ - echo -n "Trying patch $$patch at level $$level..."; \ - if cat $$patch | patch -d $(DEB_SRCDIR) $$reverse -E --no-backup-if-mismatch -V never -p$$level 1>$$patch.log 2>&1; then \ - touch debian/stamp-patch-$$(basename $$patch); \ - echo "success."; \ - else \ - echo "failure:"; \ - cat $$patch.log; \ - if test -z "$$reverse"; then exit 1; fi; \ - fi; \ - fi; \ - done - if [ "$@" = "debian/stamp-patched" ]; then touch debian/stamp-patched; fi - -.PHONY: patch clean apply-patches reverse-patches - diff -u openhackware-0.4.1/debian/patches/002_gcc-4.patch openhackware-0.4.1/debian/patches/002_gcc-4.patch --- openhackware-0.4.1/debian/patches/002_gcc-4.patch +++ openhackware-0.4.1/debian/patches/002_gcc-4.patch @@ -1,7 +1,8 @@ -#DPATCHLEVEL=0 ---- src/main.ld 2005-03-31 10:23:33.000000000 +0300 -+++ src/main.ld 2006-03-21 23:26:13.000000000 +0200 -@@ -49,7 +49,7 @@ +Index: b/src/main.ld +=================================================================== +--- a/src/main.ld 2005-03-31 10:23:33.000000000 +0300 ++++ b/src/main.ld 2007-12-12 08:37:04.000000000 +0200 +@@ -49,7 +49,7 @@ SECTIONS _sdata_end = . ; . = ALIGN(4) ; _ro_start = . ; diff -u openhackware-0.4.1/debian/patches/001_build.patch openhackware-0.4.1/debian/patches/001_build.patch --- openhackware-0.4.1/debian/patches/001_build.patch +++ openhackware-0.4.1/debian/patches/001_build.patch @@ -1,8 +1,8 @@ -#DPATCHLEVEL=1 -diff -Naur openhackware-0.4.1.orig/Makefile openhackware-0.4.1/Makefile ---- openhackware-0.4.1.orig/Makefile 2005-03-31 10:23:33.000000000 +0300 -+++ openhackware-0.4.1/Makefile 2005-05-23 22:05:55.071912832 +0300 -@@ -44,12 +44,14 @@ +Index: b/Makefile +=================================================================== +--- a/Makefile 2005-03-31 10:23:33.000000000 +0300 ++++ b/Makefile 2007-12-12 08:36:58.000000000 +0200 +@@ -44,12 +44,14 @@ DISTDIR:= . SRCDIR:= src CC_BASE:= $(shell $(CC) -print-search-dirs | grep install | sed -e 's/.*\ //') @@ -23,7 +23,7 @@ BIOS_IMAGE_BITS:= 19 BIOS_IMAGE_SIZE:= $(shell echo $$(( 1 << $(BIOS_IMAGE_BITS) )) ) -@@ -113,8 +115,8 @@ +@@ -113,8 +115,8 @@ dev_OBJS+= $(addprefix char_, $(chardev_ main.out_OBJS+= $(addprefix $(OBJDIR)/dev_, $(dev_OBJS)) CUR= $(notdir $@) @@ -34,7 +34,7 @@ BIN_TARGETS:= $(OBJDIR)/vectors.bin $(OBJDIR)/main.bin $(OBJDIR)/boot.bin TARGET:= ppc_rom.bin -@@ -156,79 +158,81 @@ +@@ -156,79 +158,81 @@ $(OBJDIR)/%.bin: $(OBJDIR)/%.out $(OBJCOPY) -O binary $($(notdir $@)_OPTIONS) $< $@ $(OBJDIR)/%.out: $(OBJDIR)/%.o $(SRCDIR)/%.ld diff -u openhackware-0.4.1/debian/rules openhackware-0.4.1/debian/rules --- openhackware-0.4.1/debian/rules +++ openhackware-0.4.1/debian/rules @@ -7,6 +7,19 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 +DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) +DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) + +ifneq ($(DEB_BUILD_GNU_TYPE), powerpc-linux-gnu) + $(error "this package needs to be built with a powerpc-linux-gnu toolchain") +endif + +ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE)) + CROSS_PREFIX := "" +else + CROSS_PREFIX := "$(DEB_BUILD_GNU_TYPE)-" +endif + CFLAGS = -Wall -g ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) @@ -15,18 +28,18 @@ CFLAGS += -O2 endif -include debian/patch.mk +include /usr/share/quilt/quilt.make build: patch dh_testdir - $(MAKE) CROSS_COMPILE= CFLAGS="$(CFLAGS)" + $(MAKE) CROSS_COMPILE="$(CROSS_PREFIX)" CFLAGS="$(CFLAGS)" clean: unpatch dh_testdir dh_testroot - -$(MAKE) clean CROSS_COMPILE= + $(MAKE) clean CROSS_COMPILE="$(CROSS_PREFIX)" $(RM) ppc_rom.bin dh_clean @@ -39,15 +52,11 @@ dh_testroot dh_installchangelogs Changelog dh_installdocs -# dh_installexamples dh_install -# dh_installinfo -# dh_installman dh_link dh_strip dh_compress dh_fixperms -# dh_makeshlibs dh_installdeb dh_shlibdeps dh_gencontrol only in patch2: unchanged: --- openhackware-0.4.1.orig/debian/patches/series +++ openhackware-0.4.1/debian/patches/series @@ -0,0 +1,2 @@ +001_build.patch +002_gcc-4.patch