diff -Nru bootcd-3.11/debian/changelog bootcd-3.11ubuntu1/debian/changelog --- bootcd-3.11/debian/changelog 2008-07-29 14:38:01.000000000 +0530 +++ bootcd-3.11ubuntu1/debian/changelog 2008-08-15 10:55:01.000000000 +0530 @@ -1,3 +1,14 @@ +bootcd (3.11ubuntu1) intrepd; urgency=low + + * Merge from debian unstable, remaining changes: (LP: #255609) + * Added 01bootcdmk2diskconf.src.diff patch: + - A lot of changes for dash compatibility (LP: #238761) + * Implement quilt patch system: + - Add quilt as a Build-Depends in debian/control + - Add quilt support in debian/rules + + -- Bhavani Shankar Fri, 15 Aug 2008 10:47:33 +0530 + bootcd (3.11) unstable; urgency=low * the bootcd-ia64.lib is now in bootcd-ia64. This bug was reported by @@ -43,6 +54,18 @@ -- Michael Meskes Sat, 21 Jun 2008 19:39:52 +0200 +bootcd (3.10ubuntu1) intrepid; urgency=low + + * Added 01bootcdmk2diskconf.src.diff patch: + - A lot of changes for dash compatibility (LP: #238761) + * 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 Tue, 10 Jun 2008 16:01:56 -0500 + bootcd (3.10) unstable; urgency=low * Added link to /usr/share/common-licenses/GPL-2 diff -Nru /tmp/9c6AF5lj0a/bootcd-3.11/debian/control /tmp/uQvnbkvFFB/bootcd-3.11ubuntu1/debian/control --- bootcd-3.11/debian/control 2008-07-26 15:13:04.000000000 +0530 +++ bootcd-3.11ubuntu1/debian/control 2008-08-15 10:47:14.000000000 +0530 @@ -1,8 +1,10 @@ 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 +Build-Depends-Indep: debhelper (>= 4) Standards-Version: 3.8.0 Package: bootcd diff -Nru /tmp/9c6AF5lj0a/bootcd-3.11/debian/patches/bootcdmk2diskconf.src.diff /tmp/uQvnbkvFFB/bootcd-3.11ubuntu1/debian/patches/bootcdmk2diskconf.src.diff --- bootcd-3.11/debian/patches/bootcdmk2diskconf.src.diff 1970-01-01 05:30:00.000000000 +0530 +++ bootcd-3.11ubuntu1/debian/patches/bootcdmk2diskconf.src.diff 2008-07-31 03:00:45.000000000 +0530 @@ -0,0 +1,126 @@ +Index: bootcd-3.10/bootcdmk2diskconf.src +=================================================================== +--- bootcd-3.10.orig/bootcdmk2diskconf.src 2008-06-10 16:00:05.000000000 -0500 ++++ bootcd-3.10/bootcdmk2diskconf.src 2008-06-10 16:00:12.000000000 -0500 +@@ -77,7 +77,7 @@ + local T T1 L j i + T="$(cat)" + debug "labelsed INPUT=<$T>" +- L="$(echo "$T" | sed -n "s/.*LABEL=\([^:[:space:]]\+\).*/\1/p" | sort -n)" ++ L="$(echo "$T" | sed -n "s/.*LABEL=\([^:[:space:]]\+\).*/\\1/p" | sort -n)" + for i in $L; do + debug "labelsed search for label <$i>" + j="$(echo "$RILABEL" | grep ":$i$" | awk -F: '{print $1}')" +@@ -114,19 +114,19 @@ + $MNT/boot/boot/grub/grub.conf; do if [ -s $i ]; then cat $i; break; fi; done)" + RILV="$([ "$(type lvdisplay 2>/dev/null)" ] && + (lvdisplay --ignorelockingfailure --units m -C | tail -n +2 | +- sed "s/^[[:space:]]*//" | awk '{printf("%s:%s:%d\n",$1,$2,$4)}'))" ++ sed "s/^[[:space:]]*//" | awk '{printf("%s:%s:%d\\n",$1,$2,$4)}'))" + RIPV="$([ "$(pvdisplay --ignorelockingfailure 2>/dev/null)" ] && + (pvdisplay --ignorelockingfailure -C | tail -n +2 | +- awk '{printf("%s:%s\n",$1,$2)}'))" ++ awk '{printf("%s:%s\\n",$1,$2)}'))" + # read from df + RIDF="$(df -lPm | grep -e "^/dev/" -e "^LABEL=" | grep -v $RIDF_EXCLUDES | +- awk '{printf("%s:%s\n",$1,$2)}')" ++ awk '{printf("%s:%s\\n",$1,$2)}')" + RILABEL="$(for i in $(echo "$RIFSTAB" | +- sed -n "s/.*LABEL=\([^[:space:]]\+\).*/\1/p" | sort -n); do ++ sed -n "s/.*LABEL=\([^[:space:]]\+\).*/\\1/p" | sort -n); do + echo "$(label2dev $i):$i" + done)" + RIPARTITION="$(cat /proc/partitions | tail -n +3| +- awk '{printf("/dev/%s:%d\n",$4,$3/1024)}')" ++ awk '{printf("/dev/%s:%d\\n",$4,$3/1024)}')" + } + + calcinfo() +@@ -138,7 +138,7 @@ + CISWAP="$(echo "$RIFSTAB" | grep -e "^/dev/" -e "^LABEL=" | + grep "\" |awk '{print $1}' | labelsed)" + +- CIFS="$(echo "$RIFSTAB"| eval "$MOUNTGREP" | awk '{printf("%s:%s\n",$1,$2)}' | labelsed )" ++ CIFS="$(echo "$RIFSTAB"| eval "$MOUNTGREP" | awk '{printf("%s:%s\\n",$1,$2)}' | labelsed )" + + # add space for dash ;-) + CIPART="$( (echo "$CIFS" | awk -F: '{print $1}'; echo "$CISWAP"; +@@ -179,7 +179,7 @@ + dsk="$(echo "$i" | awk -F: '{print $2}')" + + T1="$(echo "$T" | sed "s|${dev}p*\>|$dsk|")" +- T="$(echo "$T1" | sed "s|${dev}p*\([[:digit:]]\+\)|${dsk}P\1|")" ++ T="$(echo "$T1" | sed "s|${dev}p*\([[:digit:]]\+\)|${dsk}P\\1|")" + done + echo "$T" + } +@@ -208,7 +208,7 @@ + + checktemplate() + { +- USED="$(template | grep "^[^#[:blank:]]" | sed "s/\(.*\)=.*/\1/")" ++ USED="$(template | grep "^[^#[:blank:]]" | sed "s/\(.*\)=.*/\\1/")" + if [ "$USED" != "$PARAMETERS" ]; then + echo "INTERNAL ERROR: <$PARAMETERS> != <$USED>" >&2 + exit 1 +@@ -226,7 +226,7 @@ + awk ' + /^'$1'=/ {print B} + /^[^#]/ && ! /^ *$/ {B=""} +- /^#/ || /^ *$/ { B=sprintf("%s\n%s",B,$0) } ++ /^#/ || /^ *$/ { B=sprintf("%s\\n%s",B,$0) } + ' | + tail -n +2 + } +@@ -279,7 +279,7 @@ + echo "LVMVOL=\"" + + for i in $RILV; do +- echo "$(echo "$i" | awk -F: '{printf("%s %s %s\n", $1,$3,$2)}')" ++ echo "$(echo "$i" | awk -F: '{printf("%s %s %s\\n", $1,$3,$2)}')" + done + echo "\"" + +@@ -298,7 +298,7 @@ + # m and pm are the same info for the following partition + n=0 + while :; do +- # RIPARTITION="/dev/cciss/c0d0p1:101\n/dev/cciss/c0d0p2:34624" ++ # RIPARTITION="/dev/cciss/c0d0p1:101\\n/dev/cciss/c0d0p2:34624" + # -> n=1, m=2, pn=101, pm=34624 -> n=2, m=3, pn=34624 pm= + let n=n+1 + let m=n+1 +@@ -352,7 +352,7 @@ + printbefore SWAP + echo "SWAP=\"$(echo "$CISWAP" | parttrans)\"" + +- # CIFS=":\n..." ++ # CIFS=":\\n..." + # Sort it with length of for right mount order + SORTCIFS=$(for i in $CIFS; do + echo "$(echo "$i" | awk -F: '{print $2}'|wc -c):$i" | sort -n +@@ -369,7 +369,7 @@ + y="$(echo "$i" | awk -F: '{print $2}')" + echo "tune2fs -L $y $x >/dev/null 2>&1" | parttrans + done +- # SORTCIFS="::\n..." ++ # SORTCIFS="::\\n..." + for i in $SORTCIFS; do + x="$(echo "$i" | awk -F: '{print $2}')" + y="$(echo "$i" | awk -F: '{print $3}')" +@@ -475,11 +475,11 @@ + # //cpio00 + # /etc/bootcd//bootcd2disk.conf (this file) + +- # echo "RESTORECMD=\"(cd /mnt; tar xzf /\\\$(basename \\\$CONFDIR)/backup.tgz)\"" +- # echo "RESTORECMD=\"(cd /mnt; cat \\\$CONFDIR/backup* |gzip -d -c | cpio --null --quiet -idmn)\"" ++ # echo "RESTORECMD=\"(cd /mnt; tar xzf /\\\\\\$(basename \\\\\\$CONFDIR)/backup.tgz)\"" ++ # echo "RESTORECMD=\"(cd /mnt; cat \\\\\\$CONFDIR/backup* |gzip -d -c | cpio --null --quiet -idmn)\"" + echo "RESTORECMD=\"(cd \$BOOTCDMP; +-[ -f \\\$CONFDIR/cpio00 ] && (cat \\\$CONFDIR/cpio* |gzip -d -c | cpio --null --quiet -idmn); +-[ -f \\\$CONFDIR/star00 ] && (cat \\\$CONFDIR/star* |gzip -d -c | star -U -xattr -x -f - );: ++[ -f \\\\\\$CONFDIR/cpio00 ] && (cat \\\\\\$CONFDIR/cpio* |gzip -d -c | cpio --null --quiet -idmn); ++[ -f \\\\\\$CONFDIR/star00 ] && (cat \\\\\\$CONFDIR/star* |gzip -d -c | star -U -xattr -x -f - );: + )\"" + fi + diff -Nru /tmp/9c6AF5lj0a/bootcd-3.11/debian/patches/series /tmp/uQvnbkvFFB/bootcd-3.11ubuntu1/debian/patches/series --- bootcd-3.11/debian/patches/series 1970-01-01 05:30:00.000000000 +0530 +++ bootcd-3.11ubuntu1/debian/patches/series 2008-07-31 03:00:45.000000000 +0530 @@ -0,0 +1 @@ +bootcdmk2diskconf.src.diff diff -Nru /tmp/9c6AF5lj0a/bootcd-3.11/debian/rules /tmp/uQvnbkvFFB/bootcd-3.11ubuntu1/debian/rules --- bootcd-3.11/debian/rules 2008-07-26 15:13:04.000000000 +0530 +++ bootcd-3.11ubuntu1/debian/rules 2008-07-31 03:00:45.000000000 +0530 @@ -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