diff -Nru /tmp/jXr00bILaB/bootcd-3.08/debian/changelog /tmp/bQYhB6EQOf/bootcd-3.08ubuntu1/debian/changelog --- /tmp/jXr00bILaB/bootcd-3.08/debian/changelog 2007-10-05 04:02:36.000000000 -0500 +++ /tmp/bQYhB6EQOf/bootcd-3.08ubuntu1/debian/changelog 2007-11-28 01:41:47.000000000 -0500 @@ -1,3 +1,37 @@ +bootcd (3.08ubuntu1) hardy; urgency=low + + * Added 01interpreter_edit.diff patch: + - Changes interpreter from sh to bash (LP: #165030) on: + + bootcd2disk + + bootcdbackup + + bootcdbackupwizard.src + + bootcdbackwiz_extract.src + + bootcdcreate + + bootcddebootstrap.src + + bootcdflopcp + + bootcdinitramfshook + + bootcdmk2diskconf.src + + bootcdmk2diskconf.tst1 + + bootcdmkinitrd + + bootcdmkinitrd + + bootcdmkinitrd + + bootcdmodprobe + + bootcdproberoot + + bootcd-run.lib.tst1 + + bootcd-run.lib.tst2 + + bootcdwrite + + runbootcdmodprobe + + runbootcdproberoot + + S12bootcdram.sh + + S13bootcdflop.sh + * Implement quilt patch system: + - Add quilt as a Build-Depends in debian/control + - Add quilt support in debian/rules + * debian/control: Update maintainer fields according to debian- + maintainer-field spec. + + -- Nicolas Valcárcel Scerpella (aka nxvl) Wed, 28 Nov 2007 01:41:25 -0500 + bootcd (3.08) unstable; urgency=low * Support for more than one kernel. diff -Nru /tmp/jXr00bILaB/bootcd-3.08/debian/control /tmp/bQYhB6EQOf/bootcd-3.08ubuntu1/debian/control --- /tmp/jXr00bILaB/bootcd-3.08/debian/control 2007-10-05 04:02:36.000000000 -0500 +++ /tmp/bQYhB6EQOf/bootcd-3.08ubuntu1/debian/control 2007-11-28 01:38:43.000000000 -0500 @@ -1,8 +1,9 @@ Source: bootcd Section: utils Priority: extra -Maintainer: Bernd Schumacher -Build-Depends: debhelper (>= 4) +Maintainer: Ubuntu MOTU Developers +XSBC-Original-Maintainer: Bernd Schumacher +Build-Depends: debhelper (>= 4), quilt, bash Build-Depends-Indep: debhelper (>= 4) Standards-Version: 3.6.1 diff -Nru /tmp/jXr00bILaB/bootcd-3.08/debian/patches/01interpreter_edit.diff /tmp/bQYhB6EQOf/bootcd-3.08ubuntu1/debian/patches/01interpreter_edit.diff --- /tmp/jXr00bILaB/bootcd-3.08/debian/patches/01interpreter_edit.diff 1969-12-31 19:00:00.000000000 -0500 +++ /tmp/bQYhB6EQOf/bootcd-3.08ubuntu1/debian/patches/01interpreter_edit.diff 2007-11-28 01:37:36.000000000 -0500 @@ -0,0 +1,218 @@ +Index: bootcd-3.08/S12bootcdram.sh +=================================================================== +--- bootcd-3.08.orig/S12bootcdram.sh 2007-11-28 01:37:24.000000000 -0500 ++++ bootcd-3.08/S12bootcdram.sh 2007-11-28 01:37:24.000000000 -0500 +@@ -1,4 +1,4 @@ +-#!/bin/sh ++#!/bin/bash + # bootcdram.sh Necessary steps to boot diskless from cd + # at Boottime /etc -> /ram1/etc -> /etc.ro (also dev, tmp, var, home, root) + +Index: bootcd-3.08/S13bootcdflop.sh +=================================================================== +--- bootcd-3.08.orig/S13bootcdflop.sh 2007-11-28 01:37:25.000000000 -0500 ++++ bootcd-3.08/S13bootcdflop.sh 2007-11-28 01:37:25.000000000 -0500 +@@ -1,4 +1,4 @@ +-#!/bin/sh ++#!/bin/bash + # + # bootcdflop.sh + # +Index: bootcd-3.08/bootcd-run.lib.tst1 +=================================================================== +--- bootcd-3.08.orig/bootcd-run.lib.tst1 2007-11-28 01:37:24.000000000 -0500 ++++ bootcd-3.08/bootcd-run.lib.tst1 2007-11-28 01:37:24.000000000 -0500 +@@ -1,4 +1,4 @@ +-#!/bin/sh ++#!/bin/bash + + RUNLIB=../bootcd/bootcd-run.lib + ERRLOG=/tmp/interactive.tst.log +Index: bootcd-3.08/bootcd-run.lib.tst2 +=================================================================== +--- bootcd-3.08.orig/bootcd-run.lib.tst2 2007-11-28 01:37:24.000000000 -0500 ++++ bootcd-3.08/bootcd-run.lib.tst2 2007-11-28 01:37:24.000000000 -0500 +@@ -1,4 +1,4 @@ +-#!/bin/sh ++#!/bin/bash + # bootcd-run.ib.tst2 - show all kind of examples of using interactive and run + + RUNLIB=../bootcd/bootcd-run.lib +Index: bootcd-3.08/bootcd2disk +=================================================================== +--- bootcd-3.08.orig/bootcd2disk 2007-11-28 01:37:23.000000000 -0500 ++++ bootcd-3.08/bootcd2disk 2007-11-28 01:37:23.000000000 -0500 +@@ -1,4 +1,4 @@ +-#!/bin/sh ++#!/bin/bash + # + # bootcd2disk + # +Index: bootcd-3.08/bootcdbackup +=================================================================== +--- bootcd-3.08.orig/bootcdbackup 2007-11-28 01:37:23.000000000 -0500 ++++ bootcd-3.08/bootcdbackup 2007-11-28 01:37:23.000000000 -0500 +@@ -1,4 +1,4 @@ +-#!/bin/sh ++#!/bin/bash + # + # bootcdbackup + # +Index: bootcd-3.08/bootcdbackupwizard.src +=================================================================== +--- bootcd-3.08.orig/bootcdbackupwizard.src 2007-11-28 01:37:23.000000000 -0500 ++++ bootcd-3.08/bootcdbackupwizard.src 2007-11-28 01:37:23.000000000 -0500 +@@ -1,4 +1,4 @@ +-#!/bin/sh ++#!/bin/bash + # + # $Source: /cvsroot/bootcd/bootcd/bootcdbackupwizard.src,v $ + # $Id: bootcdbackupwizard.src,v 1.53 2007-11-16 16:36:34 bs Exp $ +Index: bootcd-3.08/bootcdbackwiz_extract.src +=================================================================== +--- bootcd-3.08.orig/bootcdbackwiz_extract.src 2007-11-28 01:37:23.000000000 -0500 ++++ bootcd-3.08/bootcdbackwiz_extract.src 2007-11-28 01:37:23.000000000 -0500 +@@ -1,4 +1,4 @@ +-#!/bin/sh ++#!/bin/bash + # + # $Source: /cvsroot/bootcd/bootcd/bootcdbackwiz_extract.src,v $ + # $Id: bootcdbackwiz_extract.src,v 1.4 2007-11-14 12:59:27 bs Exp $ +Index: bootcd-3.08/bootcdcreate +=================================================================== +--- bootcd-3.08.orig/bootcdcreate 2007-11-28 01:37:23.000000000 -0500 ++++ bootcd-3.08/bootcdcreate 2007-11-28 01:37:23.000000000 -0500 +@@ -1,4 +1,4 @@ +-#!/bin/sh ++#!/bin/bash + # + # $Source: /cvsroot/bootcd/bootcd/Attic/bootcdcreate,v $ + # $Id: bootcdcreate,v 1.1 2007-09-13 13:34:58 debdin-guest Exp $ +Index: bootcd-3.08/bootcddebootstrap.src +=================================================================== +--- bootcd-3.08.orig/bootcddebootstrap.src 2007-11-28 01:37:23.000000000 -0500 ++++ bootcd-3.08/bootcddebootstrap.src 2007-11-28 01:37:23.000000000 -0500 +@@ -1,4 +1,4 @@ +-#!/bin/sh ++#!/bin/bash + # + # $Source: /cvsroot/bootcd/bootcd/bootcddebootstrap.src,v $ + # $Id: bootcddebootstrap.src,v 1.18 2007-11-16 14:56:28 bs Exp $ +Index: bootcd-3.08/bootcdflopcp +=================================================================== +--- bootcd-3.08.orig/bootcdflopcp 2007-11-28 01:37:23.000000000 -0500 ++++ bootcd-3.08/bootcdflopcp 2007-11-28 01:37:23.000000000 -0500 +@@ -1,4 +1,4 @@ +-#!/bin/sh ++#!/bin/bash + # bootcdflopcp + # History + # 28.07.2000 - Recognize empty files too. +Index: bootcd-3.08/bootcdinitramfshook +=================================================================== +--- bootcd-3.08.orig/bootcdinitramfshook 2007-11-28 01:37:24.000000000 -0500 ++++ bootcd-3.08/bootcdinitramfshook 2007-11-28 01:37:24.000000000 -0500 +@@ -1,4 +1,4 @@ +-#!/bin/sh ++#!/bin/bash + + # See manpage initramfs-tools(8) + . /usr/share/initramfs-tools/hook-functions +Index: bootcd-3.08/bootcdmk2diskconf.src +=================================================================== +--- bootcd-3.08.orig/bootcdmk2diskconf.src 2007-11-28 01:37:24.000000000 -0500 ++++ bootcd-3.08/bootcdmk2diskconf.src 2007-11-28 01:37:24.000000000 -0500 +@@ -1,4 +1,4 @@ +-#!/bin/sh ++#!/bin/bash + set -u # exit on using unset var + + # name = bootcdmk2diskconf - create bootcd2disk.conf for backup +Index: bootcd-3.08/bootcdmk2diskconf.tst1 +=================================================================== +--- bootcd-3.08.orig/bootcdmk2diskconf.tst1 2007-11-28 01:37:24.000000000 -0500 ++++ bootcd-3.08/bootcdmk2diskconf.tst1 2007-11-28 01:37:24.000000000 -0500 +@@ -1,4 +1,4 @@ +-#!/bin/sh ++#!/bin/bash + + VERBOSE="" # VERBOSE="" means silent; VERBOSE="1" means verbose + +Index: bootcd-3.08/bootcdmkinitrd +=================================================================== +--- bootcd-3.08.orig/bootcdmkinitrd 2007-11-28 01:37:24.000000000 -0500 ++++ bootcd-3.08/bootcdmkinitrd 2007-11-28 01:37:24.000000000 -0500 +@@ -1,4 +1,4 @@ +-#!/bin/sh ++#!/bin/bash + # + # $Source: /cvsroot/bootcd/bootcd/bootcdmkinitrd,v $ + # $Id: bootcdmkinitrd,v 1.26 2006-11-27 15:53:57 bs Exp $ +@@ -185,7 +185,7 @@ + # 50bootcddiscover + F1=/etc/mkinitrd/scripts/50bootcddiscover # see prerm + cat <$F1 +-#!/bin/sh ++#!/bin/bash + F2=\$INITRDDIR/scripts/bootcd + cat <\$F2 + /bin/echo "running /scripts/bootcd" >&2 +@@ -200,7 +200,7 @@ + # 60bootcdproberoot + F1=/etc/mkinitrd/scripts/60bootcdproberoot # see prerm + cat <$F1 +-#!/bin/sh ++#!/bin/bash + + F2=\$INITRDDIR/scripts/getrootdev + cat <\$F2 +Index: bootcd-3.08/bootcdmodprobe +=================================================================== +--- bootcd-3.08.orig/bootcdmodprobe 2007-11-28 01:37:24.000000000 -0500 ++++ bootcd-3.08/bootcdmodprobe 2007-11-28 01:37:24.000000000 -0500 +@@ -1,4 +1,4 @@ +-#!/bin/sh ++#!/bin/bash + # We need CDROM and FLOPPY + + mydiscover1() +Index: bootcd-3.08/bootcdproberoot +=================================================================== +--- bootcd-3.08.orig/bootcdproberoot 2007-11-28 01:37:24.000000000 -0500 ++++ bootcd-3.08/bootcdproberoot 2007-11-28 01:37:24.000000000 -0500 +@@ -1,4 +1,4 @@ +-#!/bin/sh ++#!/bin/bash + # + # $Source: /cvsroot/bootcd/bootcd/bootcdproberoot,v $ + # $Id: bootcdproberoot,v 1.7 2006-11-27 16:36:34 bs Exp $ +Index: bootcd-3.08/bootcdwrite +=================================================================== +--- bootcd-3.08.orig/bootcdwrite 2007-11-28 01:37:24.000000000 -0500 ++++ bootcd-3.08/bootcdwrite 2007-11-28 01:37:24.000000000 -0500 +@@ -1,4 +1,4 @@ +-#!/bin/sh ++#!/bin/bash + # + # $Source: /cvsroot/bootcd/bootcd/bootcdwrite,v $ + # $Id: bootcdwrite,v 1.69 2007-10-11 16:26:51 debdin-guest Exp $ +Index: bootcd-3.08/runbootcdmodprobe +=================================================================== +--- bootcd-3.08.orig/runbootcdmodprobe 2007-11-28 01:37:24.000000000 -0500 ++++ bootcd-3.08/runbootcdmodprobe 2007-11-28 01:37:24.000000000 -0500 +@@ -1,4 +1,4 @@ +-#!/bin/sh ++#!/bin/bash + # runbootcdmodprobe + + # See manpage initramfs-tools(8) +Index: bootcd-3.08/runbootcdproberoot +=================================================================== +--- bootcd-3.08.orig/runbootcdproberoot 2007-11-28 01:37:24.000000000 -0500 ++++ bootcd-3.08/runbootcdproberoot 2007-11-28 01:37:24.000000000 -0500 +@@ -1,4 +1,4 @@ +-#!/bin/sh ++#!/bin/bash + # /etc/initramfs-tools/scripts/init-premount/runbootcdproberoot + # local-top geht nicht weil root=auto nicht nach local kommt + diff -Nru /tmp/jXr00bILaB/bootcd-3.08/debian/patches/series /tmp/bQYhB6EQOf/bootcd-3.08ubuntu1/debian/patches/series --- /tmp/jXr00bILaB/bootcd-3.08/debian/patches/series 1969-12-31 19:00:00.000000000 -0500 +++ /tmp/bQYhB6EQOf/bootcd-3.08ubuntu1/debian/patches/series 2007-11-28 01:38:25.000000000 -0500 @@ -0,0 +1 @@ +01interpreter_edit.diff diff -Nru /tmp/jXr00bILaB/bootcd-3.08/debian/rules /tmp/bQYhB6EQOf/bootcd-3.08ubuntu1/debian/rules --- /tmp/jXr00bILaB/bootcd-3.08/debian/rules 2007-11-07 11:25:20.000000000 -0500 +++ /tmp/bQYhB6EQOf/bootcd-3.08ubuntu1/debian/rules 2007-11-28 01:27:37.000000000 -0500 @@ -3,6 +3,8 @@ # This file is public domain software, originally written by Joey Hess. # +include /usr/share/quilt/quilt.make + # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 @@ -15,7 +17,7 @@ touch build-stamp -clean: +clean: unpatch dh_testdir dh_testroot rm -f build-stamp @@ -27,7 +29,7 @@ dh_clean install: -install: build +install: build patch dh_testdir dh_testroot dh_clean -k