diff options
| -rw-r--r-- | debian/changelog | 12 | ||||
| -rw-r--r-- | debian/control | 2 | ||||
| -rw-r--r-- | debian/patch.mk | 95 | ||||
| -rw-r--r-- | debian/patches/series | 19 | ||||
| -rwxr-xr-x | debian/rules | 4 |
5 files changed, 34 insertions, 98 deletions
diff --git a/debian/changelog b/debian/changelog index daa5768..a9aa533 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,15 @@ +gnumach (1:20060408.dfsg.1-2) UNRELEASED; urgency=low + + * Switch to quilt: + - debian/control: Add quilt (>= 0.40) to Build-Depends. + - debian/patches/series: New file. + - debian/patch.mk: Removed. + - debian/rules: Include '/usr/share/quilt/quilt.make' instead of + 'debian/patch.mk'. Change clean to a single colon target and make it + depend on patch. + + -- Guillem Jover <guillem@debian.org> Sat, 26 Aug 2006 16:52:37 +0300 + gnumach (1:20060408.dfsg.1-1) unstable; urgency=low * New upstream CVS snapshot. diff --git a/debian/control b/debian/control index 1b5b97b..46fc06f 100644 --- a/debian/control +++ b/debian/control @@ -6,7 +6,7 @@ Uploaders: Marcus Brinkmann <brinkmd@debian.org>, Jeff Bailey <jbailey@raspberryginger.com>, Neal H. Walfield <neal@debian.org>, Guillem Jover <guillem@debian.org> Standards-Version: 3.6.2 -Build-Depends: debhelper (>= 5), mig, sharutils +Build-Depends: debhelper (>= 5), quilt (>= 0.40), mig, sharutils Package: gnumach Section: base diff --git a/debian/patch.mk b/debian/patch.mk deleted file mode 100644 index b83ad49..0000000 --- a/debian/patch.mk +++ /dev/null @@ -1,95 +0,0 @@ -# -*- mode: makefile; coding: utf-8 -*- -# Copyright © 2002,2003 Colin Walters <walters@debian.org> -# -# Modified by Guillem Jover <guillem@debian.org>: -# Standalone system -# Honour DPATCHLEVEL -# Exit when trying to revert patches but no stamp-patch exists -# Provide a patch target -# -# 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 - -clean:: 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 --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..b60bf91 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1,19 @@ +00_clean_gfdl.patch -p0 +05_halt_on_panic_flag.patch -p0 +10_cdromlock.patch -p1 +12_sis900.patch -p0 +13_ide_dma.patch -p0 +14_alloc_params.patch -p0 +15_mem_obj_proxy.patch -p1 +22_scsi_inf_loop.patch -p1 +23_ps2_mouse.patch -p1 +24_pci_irq_fix.patch -p1 +41_io_unlock_ioremove.patch -p0 +42_disable_ioperm.patch -p0 +43_debvice_port_fix.patch -p1 +44_more_ports.patch -p1 +45_io_per_task.patch -p0 +46_io_device.patch -p1 +50_mem_limit.patch -p1 +61_vm_resident-zoned.patch -p0 +90_autoconf_autogen.patch -p0 diff --git a/debian/rules b/debian/rules index 9e0c21e..ebdaa48 100755 --- a/debian/rules +++ b/debian/rules @@ -22,7 +22,7 @@ endif include debian/rules.options -include debian/patch.mk +include /usr/share/quilt/quilt.make configure: patch stamp-configure stamp-configure: @@ -59,7 +59,7 @@ build-gnumach-dbg: configure-dbg $(MAKE) -C build-dbg -clean:: +clean: unpatch dh_testdir -rm -f machine stamp-configure |