From: Christian Hofstaedtler Date: Mon, 8 Aug 2011 19:49:11 +0000 (+0200) Subject: grml-live-compat: copy files from Debian packages X-Git-Tag: v0.17.0~3 X-Git-Url: http://git.grml.org/?p=grml-live-grml.git;a=commitdiff_plain;h=76cff38f0f1f7b948bac78e61580bf97ecc476a2 grml-live-compat: copy files from Debian packages --- diff --git a/debian/compat b/debian/compat index 7ed6ff8..7f8f011 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -5 +7 diff --git a/debian/control b/debian/control index d288bb1..804831e 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: grml Priority: extra Maintainer: Michael Prokop Uploaders: Christian Hofstaedtler -Build-Depends: debhelper (>= 5) +Build-Depends: debhelper (>= 7), pciutils, memtest86+, syslinux-common, ipxe, grub-pc-bin Standards-Version: 3.9.2 Homepage: http://grml.org/grml-live/ Vcs-git: git://git.grml.org/grml-live-grml.git @@ -23,8 +23,8 @@ Description: templates/boot/addons for grml-live Package: grml-live-compat Architecture: all -Depends: ${misc:Depends} -Recommends: grml-live, grml-live-addons +Depends: ${misc:Depends}, grml-live-addons +Recommends: grml-live Conflicts: grml-live-addons (<< 0.15.1~) Description: templates/boot/addons unstable binaries for grml-live This package provides files from unstable, to allow building diff --git a/debian/copyright b/debian/copyright index 561e36f..4058e8d 100644 --- a/debian/copyright +++ b/debian/copyright @@ -25,13 +25,6 @@ License: along with this package; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -License information for the syslinux files shipped as -/usr/share/grml-live/templates/boot/isolinux/: - - Downloaded from . - Upstream Author: H. Peter Anvin - Copyright (C) 1994-2007 H. Peter Anvin - License information for the bsd4grml files shipped as /usr/share/grml-live/templates/boot/addons/bsd4grml: @@ -40,6 +33,15 @@ License information for the bsd4grml files shipped as See /usr/share/grml-live/templates/boot/addons/bsd4grml/LICENCE.TXT for details. +The grml-live-compat provides copies of various files from other packages to +make them available to Debian stable users. Please see the copyright files of +these packages: + grub-pc-bin + syslinux-common + ipxe + memtest86+ + pciutils + On Debian systems, the complete text of the GNU General Public License can be found in `/usr/share/common-licenses/GPL'. diff --git a/debian/grml-live-compat.install b/debian/grml-live-compat.install index f23cc1e..3d79a3c 100644 --- a/debian/grml-live-compat.install +++ b/debian/grml-live-compat.install @@ -1 +1 @@ -templates/boot/isolinux usr/share/grml-live/templates/boot/ +templates/compat/ usr/share/grml-live/templates/ diff --git a/debian/rules b/debian/rules index a209a25..a32c210 100755 --- a/debian/rules +++ b/debian/rules @@ -9,7 +9,11 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 -build: build-stamp +build: build-arch build-indep + +build-arch: build-stamp + +build-indep: build-stamp build-stamp: dh_testdir @@ -29,9 +33,30 @@ install: build dh_testroot dh_prep dh_installdirs + # grub files + install -d debian/tmp/templates/compat/grub + cp -a /usr/lib/grub/*-pc/*.mod debian/tmp/templates/compat/grub/ + cp -a /usr/lib/grub/*-pc/*.o debian/tmp/templates/compat/grub/ + cp -a /usr/lib/grub/*-pc/*.lst debian/tmp/templates/compat/grub/ + cp -a /usr/share/grub/ascii.pf2 debian/tmp/templates/compat/grub/ + /usr/bin/grub-mkimage -d /usr/lib/grub/*-pc -o \ + debian/tmp/templates/compat/grub/core.img biosdisk iso9660 --format=i386-pc + # isolinux base files + install -d debian/tmp/templates/compat/isolinux + for file in isolinux.bin ifcpu64.c32 vesamenu.c32; do \ + cp -a "/usr/lib/syslinux/$${file}" debian/tmp/templates/compat/isolinux/ ; \ + done + # others + install -d debian/tmp/templates/compat/addons + cp -a /usr/lib/ipxe/ipxe.lkrn debian/tmp/templates/compat/addons/ + cp -a /usr/share/misc/pci.ids debian/tmp/templates/compat/addons/ + cp -a /boot/memtest86+.bin debian/tmp/templates/compat/addons/ + for file in memdisk chain.c32 hdt.c32 menu.c32; do \ + cp -a "/usr/lib/syslinux/$${file}" debian/tmp/templates/compat/addons/ ; \ + done -# Build architecture-dependent files here. -binary-arch: build install +# Build architecture-independent files here. +binary-indep: build install dh_testdir dh_testroot dh_install @@ -47,8 +72,5 @@ binary-arch: build install dh_md5sums dh_builddeb -# Build architecture-independent files here. -binary-indep: build install - binary: binary-indep binary-arch .PHONY: build clean binary-indep binary-arch binary install diff --git a/templates/boot/isolinux/ifcpu64.c32 b/templates/boot/isolinux/ifcpu64.c32 deleted file mode 100644 index ce4f89c..0000000 Binary files a/templates/boot/isolinux/ifcpu64.c32 and /dev/null differ diff --git a/templates/boot/isolinux/isolinux.bin b/templates/boot/isolinux/isolinux.bin deleted file mode 100644 index e289da7..0000000 Binary files a/templates/boot/isolinux/isolinux.bin and /dev/null differ diff --git a/templates/boot/isolinux/logo.16 b/templates/boot/isolinux/logo.16 deleted file mode 100644 index 6069d49..0000000 Binary files a/templates/boot/isolinux/logo.16 and /dev/null differ diff --git a/templates/boot/isolinux/vesamenu.c32 b/templates/boot/isolinux/vesamenu.c32 deleted file mode 100644 index 9bcc4f3..0000000 Binary files a/templates/boot/isolinux/vesamenu.c32 and /dev/null differ