From: Ulrich Dangel Date: Mon, 13 Jun 2011 11:13:09 +0000 (+0200) Subject: Merge branch 'mru/quilt' X-Git-Tag: v3.0_a19-1+grml.00~6 X-Git-Url: http://git.grml.org/?a=commitdiff_plain;h=bc1b3916313d325ce0a2c7b67c1f19498238c44e;hp=86ca4d5797204703c0b577ea2b0d8c965d6fcebc;p=live-boot-grml.git Merge branch 'mru/quilt' * mru/quilt: Remove old manpage live-snapshot.it.1.txt Fix patch offsets for quilt patches Add extra patch for fixing output message and partially revert 2ad3c30d9ef0cc1ea2c7df7e7f0862c4dc6dad5d Revert "Adding live-toram script to copy the running live system to ram and eject the live media." Add extra patch to support dns in initramfs Revert "support DNS in boot environment" Add extra patch to support dns with multiarch. Revert "Do not fail in multiarch environment when installing libnss_dns.so." Add extra patch for Drop installation of localized manpages from upstream Makefile. Revert "Drop installation of localized manpages from upstream Makefile." Use quilt instead of dpatch ---