--- grub2-1.94.orig/debian/patches/01_fix_grub-install.patch +++ grub2-1.94/debian/patches/01_fix_grub-install.patch @@ -0,0 +1,16 @@ +diff -Nur grub2-1.94/conf/powerpc-ieee1275.rmk grub2-1.94.new/conf/powerpc-ieee1275.rmk +--- grub2-1.94/conf/powerpc-ieee1275.rmk 2006-05-28 20:01:43.000000000 -0300 ++++ grub2-1.94.new/conf/powerpc-ieee1275.rmk 2006-06-07 21:32:59.000000000 -0300 +@@ -26,9 +26,9 @@ + pkgdata_PROGRAMS = kernel.elf + + # Utilities. +-bin_UTILITIES = grub-emu +-sbin_UTILITIES = grub-mkimage +- ++bin_UTILITIES = grub-mkimage ++sbin_UTILITIES = grub-emu ++ + # For grub-mkimage. + grub_mkimage_SOURCES = util/powerpc/ieee1275/grub-mkimage.c util/misc.c \ + util/resolve.c --- grub2-1.94.orig/debian/patches/01_fix_amd64_building.patch +++ grub2-1.94/debian/patches/01_fix_amd64_building.patch @@ -0,0 +1,11 @@ +diff -Nur grub2-1.94/configure.ac grub2-1.94.new/configure.ac +--- grub2-1.94/configure.ac 2006-06-04 09:39:23.000000000 -0300 ++++ grub2-1.94.new/configure.ac 2006-06-05 11:45:25.000000000 -0300 +@@ -42,6 +42,7 @@ + + case "$host_cpu" in + powerpc64) host_m32=1 ;; ++ x86_64) host_m32=1 ;; + esac + + case "$target_cpu" in --- grub2-1.94.orig/debian/control +++ grub2-1.94/debian/control @@ -0,0 +1,25 @@ +Source: grub2 +Section: admin +Priority: extra +Maintainer: GRUB Maintainers +Uploaders: Jason Thomas , Otavio Salvador +Build-Depends: cdbs (>= 0.4.23-1.1), autotools-dev, debhelper (>= 5), patchutils (>= 0.2.25), autoconf, liblzo-dev, ruby, libncurses5-dev, bison, dpkg-dev (>= 1.13.12), libc6-dev-i386 [amd64] +Build-Conflicts: autoconf2.13 +Standards-Version: 3.7.2 + +Package: grub2 +Architecture: any-i386 any-powerpc any-amd64 +Depends: ${shlibs:Depends} +Provides: pupa +Replaces: pupa +Conflicts: pupa +Suggests: bochs +Description: The next generation of GNU GRUB [EXPERIMENTAL] + GRUB2 (also known as PUPA) is the Preliminary Universal Programming + Architecture for GRUB. It is a research project for the next generation of + GNU GRUB. The most important goal is to make GNU GRUB cleaner, safer, more + robust, more powerful, and more portable. + . + This package contains EXPERIMENTAL software which hasn't been properly tested + and doesn't have all the expected features. For a stable and usable + bootloader look at GRUB instead. --- grub2-1.94.orig/debian/dirs +++ grub2-1.94/debian/dirs @@ -0,0 +1,2 @@ +usr/bin +usr/sbin --- grub2-1.94.orig/debian/README.Debian.in +++ grub2-1.94/debian/README.Debian.in @@ -0,0 +1,16 @@ +GRUB2 for Debian +---------------- + +You may generate a core image with: + + $ grub-mkimage -v -d /usr/lib/grub/@cpu@-pc/ -o /tmp/core.img _chain ext2 + +Which can be used to grab a GRUB2 floppy: + + $ dd if=/usr/lib/grub/@cpu@-pc/boot.img of=/dev/fd0 bs=512 count=1 + $ dd if=/tmp/core.img of=/dev/fd0 bs=512 seek=1 + +Or for installing GRUB2 into a device, by using "grub-setup". See --help output +for details. + + -- Otavio Salvador , Wed, 7 Jun 2006 21:25:25 -0300 --- grub2-1.94.orig/debian/control.in +++ grub2-1.94/debian/control.in @@ -0,0 +1,25 @@ +Source: grub2 +Section: admin +Priority: extra +Maintainer: GRUB Maintainers +Uploaders: Jason Thomas , Otavio Salvador +Build-Depends: @cdbs@, autoconf, liblzo-dev, ruby, libncurses5-dev, bison, dpkg-dev (>= 1.13.12), libc6-dev-i386 [amd64] +Build-Conflicts: autoconf2.13 +Standards-Version: 3.7.2 + +Package: grub2 +Architecture: any-i386 any-powerpc any-amd64 +Depends: ${shlibs:Depends} +Provides: pupa +Replaces: pupa +Conflicts: pupa +Suggests: bochs +Description: The next generation of GNU GRUB [EXPERIMENTAL] + GRUB2 (also known as PUPA) is the Preliminary Universal Programming + Architecture for GRUB. It is a research project for the next generation of + GNU GRUB. The most important goal is to make GNU GRUB cleaner, safer, more + robust, more powerful, and more portable. + . + This package contains EXPERIMENTAL software which hasn't been properly tested + and doesn't have all the expected features. For a stable and usable + bootloader look at GRUB instead. --- grub2-1.94.orig/debian/watch +++ grub2-1.94/debian/watch @@ -0,0 +1,2 @@ +version=3 +ftp://alpha.gnu.org/gnu/grub/grub-([0-9.]+).tar.gz debian uupdate --- grub2-1.94.orig/debian/changelog +++ grub2-1.94/debian/changelog @@ -0,0 +1,158 @@ +grub2 (1.94-3) unstable; urgency=low + + * Fix FTBFS in amd64. Closes: 372548 + + -- Otavio Salvador Sat, 10 Jun 2006 19:57:01 -0300 + +grub2 (1.94-2) unstable; urgency=low + + * Update grub images paths in README.Debian + * 01_fix_grub-install.patch: add to fix a problem with PowerPC + installation. Refs: #371069 + * Fix FTBFS in amd64. Closes: #370803 + + -- Otavio Salvador Fri, 9 Jun 2006 09:29:40 -0300 + +grub2 (1.94-1) unstable; urgency=low + + * New upstream release. + - Fix powerpc building. Closes: #370259 + - 01_fix_grub-install.patch: merged upstream. + - Moved modules to /usr/lib/grub since they are architecture + dependent. + * Leave CDBS set debhelper compatibility level. + * Allow amd64 build to happen. Closes: #364956 + * Enforce building in 32bits while running in x86_64 machines. + * Update Standards version to 3.7.2. No changes need. + + -- Otavio Salvador Mon, 5 Jun 2006 12:49:09 -0300 + +grub2 (1.93-1) unstable; urgency=low + + * New upstream release. + - Added support to PowerPC. Closes: #357853 + - 01_fix_grub-install.patch: rediff. + * Update Standards version to 3.6.2. No changes need. + * Start to use new dpkg architecture definition. Closes: #360134 + + -- Otavio Salvador Sat, 1 Apr 2006 10:07:17 -0300 + +grub2 (1.92-2) unstable; urgency=low + + * Add bison on build-depends field. Closes: #346178 + * Add more fixes in 01_fix_grub-install.patch. Closes: #346177 + + -- Otavio Salvador Fri, 6 Jan 2006 09:48:08 -0200 + +grub2 (1.92-1) unstable; urgency=low + + * New upstream release. + - Add support for GPT partition table format. + - Add a new command "play" to play an audio file on PC. + - Add support for Linux/ADFS partition table format. + - Add support for BASH-like scripting. + - Add support for Apple HFS+ filesystems. + * 01_fix_grub-install.patch: Added. Fix grub-install to use + /bin/grub-mkimage instead of /sbin/grub-mkimage. Closes: #338824 + * Do not use CDBS tarball mode anymore. Closes: #344272 + + -- Otavio Salvador Thu, 5 Jan 2006 15:20:40 -0200 + +grub2 (1.91-0) unstable; urgency=low + + * New upstream release. Closes: #331211 + * debian/watch: added. + * debian/control.in, debian/control: Add libncurses5-dev in + Build-Depends. Closes: #304638 + * Remove Robert Millan as uploader; + * Add myself as uploader; + + -- Otavio Salvador Sat, 12 Nov 2005 16:35:18 -0200 + +grub2 (0.6+20050203-2) unstable; urgency=low + + * Disable for powerpc. Reportedly it fails to boot. + + -- Robert Millan Fri, 4 Feb 2005 01:52:09 +0100 + +grub2 (0.6+20050203-1) unstable; urgency=low + + * New upstream snapshot. + * Install moddep.lst properly in a cpu-independant way. (Closes: #264115) + * Use cdbs debian/control autogeneration. + - Set DEB_AUTO_UPDATE_DEBIAN_CONTROL = yes. + - Move control to control.in. + - Add a @cdbs@ tag and replace Architecture with Cpu/System. + * control.in (Build-Depends): Add ruby. + + -- Robert Millan Thu, 3 Feb 2005 22:33:39 +0100 + +grub2 (0.6+20040805-1) unstable; urgency=low + + * New upstream snapshot. + * Uploading to unstable so that powerpc users can be blessed by GRUB too. + * Use type-handling to generate dpkg arch list. + - control.in + - rules + + -- Robert Millan Thu, 5 Aug 2004 20:50:16 +0200 + +grub2 (0.6+20040502-1) experimental; urgency=low + + * New upstream snapshot. + - Fix FTBFS on powerpc. + + -- Robert Millan Sun, 2 May 2004 18:16:29 +0200 + +grub2 (0.6+20040429-1) experimental; urgency=low + + * New upstream snapshot. + - control (Architecture): Add powerpc. + + -- Robert Millan Thu, 29 Apr 2004 20:41:31 +0200 + +grub2 (0.6+20031125-1) experimental; urgency=low + + * New upstream snapshot. + - patches/multiboot.diff: Nuked. + - install,docs: Update directory name. + * control (Maintainer): Set to pkg-grub-devel mailing list. + * control (Uploaders): Add myself. + * control (Architecture): Add freebsd-i386 and netbsd-i386. + + -- Robert Millan Tue, 25 Nov 2003 23:48:18 +0100 + +grub2 (0.6+20031114-1) experimental; urgency=low + + * New upstream snapshot. + - README.Debian: s/fat/ext2/g (We now have ext2fs support). + * Add multiboot support, thanks to Jeroen Dekkers for his patch. + - patches/multiboot.diff: New. + - control (Architecture): Add hurd-i386 (which needed multiboot). + * Rename package to grub2 (to follow upstream tendency). + - control: Ditto. + - README.Debian: Likewise. + * Switch to tarball mode. + - rules: Ditto. + - docs: Prefix paths in order to workaround dh_installdocs bug. + - install: Likewise, but not because of bug (should be in rules, actualy). + * Fix FTBFS. (Closes: #213868) + - control (Build-Depends): Add autoconf. + - control (Build-Conflicts): Add autoconf2.13. + + -- Robert Millan Fri, 14 Nov 2003 13:16:12 +0100 + +pupa (0.6+20031008-1) experimental; urgency=low + + * New upstream snapshot. + * Uploading to experimental. + * debian/control: Add Jason Thomas to Uploaders. + + -- Robert Millan Wed, 8 Oct 2003 13:22:50 +0000 + +pupa (0.6+20030915-1) unstable; urgency=low + + * Initial Release. (Closes: #211030) + + -- Robert Millan Mon, 15 Sep 2003 14:58:42 +0000 + --- grub2-1.94.orig/debian/copyright +++ grub2-1.94/debian/copyright @@ -0,0 +1,13 @@ +This package was debianized by Robert Millan on +Mon, 15 Sep 2003 14:58:42 +0000. + +It was downloaded from http://www.gnu.org/software/grub/ + +Upstream Author: Yoshinori K. Okuji and others. + +Copyright: + +You are free to distribute this software under the terms of +the GNU General Public License. +On Debian systems, the complete text of the GNU General +Public License can be found in /usr/share/common-licenses/GPL file. --- grub2-1.94.orig/debian/docs +++ grub2-1.94/debian/docs @@ -0,0 +1,3 @@ +build-tree/*/NEWS +build-tree/*/README +build-tree/*/TODO --- grub2-1.94.orig/debian/rules +++ grub2-1.94/debian/rules @@ -0,0 +1,27 @@ +#!/usr/bin/make -f +# This file is PUBLIC DOMAIN. + +DEB_AUTO_UPDATE_DEBIAN_CONTROL := yes +DEB_AUTO_CLEANUP_RCS := yes +package := grub2 + +include /usr/share/cdbs/1/class/autotools.mk +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/rules/simple-patchsys.mk + +install/$(package):: common-install-prehook-arch + install -m 644 $(DEB_SRCDIR)/moddep.lst \ + debian/$(package)/usr/lib/grub/$(DEB_HOST_ARCH_CPU)-*/ + +clean:: + sed -e "s/@cpu@/$(DEB_HOST_GNU_CPU)/g" < debian/README.Debian.in \ + > debian/README.Debian + +# Grab fixes from CVS using our version as reference. +cvs-sync: + cvs -d:pserver:anonymous@cvs.savannah.gnu.org:/cvsroot/grub checkout -d grub2-cvs grub2; \ + UVERSION=$$(dpkg-parsechangelog | grep Version \ + | sed 's,Version: ,,g;s,-[0-9]*$$,,g;s,\.,_,g'); \ + cd grub2-cvs && \ + cvs diff -uN -r release_$$UVERSION -r HEAD > ../debian/patches/00_cvs-sync.patch; \ + cd .. && rm -rf grub2-cvs --- grub2-1.94.orig/debian/README.Debian +++ grub2-1.94/debian/README.Debian @@ -0,0 +1,16 @@ +GRUB2 for Debian +---------------- + +You may generate a core image with: + + $ grub-mkimage -v -d /usr/lib/grub/i486-pc/ -o /tmp/core.img _chain ext2 + +Which can be used to grab a GRUB2 floppy: + + $ dd if=/usr/lib/grub/i486-pc/boot.img of=/dev/fd0 bs=512 count=1 + $ dd if=/tmp/core.img of=/dev/fd0 bs=512 seek=1 + +Or for installing GRUB2 into a device, by using "grub-setup". See --help output +for details. + + -- Otavio Salvador , Wed, 7 Jun 2006 21:25:25 -0300