Package: mbr
Version: 1.1.10-2
Please accept the attached patch to have the mbr source package produce a
second binary in addition to mbr called mbr-udeb which is a udeb that
enables use of mbr with the debian-installer.
Details of changes made by the patch:
* debian/control:
- Add mbr-udeb binary package for use with debian-installer.
- Add build-dependency on debhelper.
- Bump standards version to 3.8.2.
* debian/compat: Set to level debhelper compat level 7
* debian/rules: Rewrote to use debhelper.
Cheers,
--
Cody A.W. Somerville
Software Systems Release Engineer
Foundations Team
Custom Engineering Solutions Group
Canonical OEM Services
Phone: +1-781-850-2087
Cell: +1-506-471-8402
Email: [email protected]
diff -u mbr-1.1.10/debian/rules mbr-1.1.10/debian/rules
--- mbr-1.1.10/debian/rules
+++ mbr-1.1.10/debian/rules
@@ -1,8 +1,5 @@
#!/usr/bin/make -f
-package := mbr
-docdir := debian/tmp/usr/share/doc/$(package)
-
KERNEL_ARCH := $(shell linux64 uname -m)
CC := gcc -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
@@ -18,8 +15,7 @@
endif
build:
- $(checkdir)
- ./configure --prefix=/
+ ./configure --exec-prefix=`pwd`/debian/mbr/ --prefix=`pwd`/debian/mbr/usr
$(MAKE) CC="$(CC)" LD="$(LD)" CFLAGS="$(CFLAGS)"
ifneq (,$(findstring x86_64,$(KERNEL_ARCH)))
# Limit the tests on x86_64 kernels
@@ -33,45 +29,30 @@
- $(checkdir)
- rm -f build
- -$(MAKE) distclean
- rm -f harness/Makefile
- rm -f `find . -name "*~"`
- rm -rf debian/tmp debian/files* core debian/substvars
-
-binary-indep: checkroot build
- $(checkdir)
-
-binary-arch: checkroot build
- $(checkdir)
- rm -rf debian/tmp
- install -d debian/tmp/DEBIAN $(docdir)
- $(MAKE) install prefix=`pwd`/debian/tmp \
- INSTALL_PROGRAM="$(INSTALL_PROGRAM)"
-# cd debian/tmp && install -d boot
-# install -m 644 mbr.b debian/tmp/boot
- cp -p ChangeLog $(docdir)/changelog
- cp -p debian/changelog $(docdir)/changelog.Debian
- cp -p README NEWS debian/README-1st.Debian debian/copyright $(docdir)
- cp -p AUTHORS $(docdir)
- cd $(docdir) && gzip -9 changelog changelog.Debian
- gzip -r9 debian/tmp/share/man
- mv debian/tmp/share/man debian/tmp/usr/share
- rmdir debian/tmp/share
- dpkg-shlibdeps debian/tmp/sbin/*
- dpkg-gencontrol -isp
- cd debian/tmp && \
- md5sum `find * -type f ! -regex "DEBIAN/.*"` > DEBIAN/md5sums
- chown -R root:root debian/tmp
- chmod -R go=rX debian/tmp
- dpkg --build debian/tmp ..
-
-define checkdir
- test -f $(package).S86 -a -f debian/rules
-endef
+ dh_testdir
+ dh_testroot
+ dh_clean
+ [ ! -f Makefile ] || $(MAKE) distclean
+
+install: build
+ dh_testdir
+ dh_testroot
+ dh_prep
+ dh_installdirs -p mbr-udeb sbin
+ dh_installdocs -p mbr debian/README-1st.Debian NEWS README AUTHORS
+ dh_installchangelogs
+ $(MAKE) install INSTALL_PROGRAM="$(INSTALL_PROGRAM)"
+ cp `pwd`/debian/mbr/sbin/install-mbr `pwd`/debian/mbr-udeb/sbin/
+
+binary-indep: build
+ dh_testdir
+
+binary-arch: build install
+ dh_testdir
+ dh_testroot
+ dh_compress
+ dh_fixperms
+ dh_shlibdeps
+ dh_gencontrol
+ dh_builddeb
binary: binary-indep binary-arch
-checkroot:
- $(checkdir)
- test root = "`whoami`"
-
-.PHONY: binary binary-arch binary-indep clean checkroot
+.PHONY: binary binary-arch binary-indep clean
diff -u mbr-1.1.10/debian/changelog mbr-1.1.10/debian/changelog
--- mbr-1.1.10/debian/changelog
+++ mbr-1.1.10/debian/changelog
@@ -1,3 +1,14 @@
+mbr (1.1.10-3) unstable; urgency=low
+
+ * debian/control:
+ - Add mbr-udeb binary package for use with debian-installer.
+ - Add build-dependency on debhelper.
+ - Bump standards version to 3.8.2.
+ * debian/compat: Set to level debhelper compat level 7
+ * debian/rules: Rewrote to use debhelper.
+
+ -- Cody A.W. Somerville <[email protected]> Mon, 29 Jun 2009 14:15:51 -0300
+
mbr (1.1.10-2) unstable; urgency=low
* Added patch from upstream, thanks to Loïc for reporting and sending
diff -u mbr-1.1.10/debian/control mbr-1.1.10/debian/control
--- mbr-1.1.10/debian/control
+++ mbr-1.1.10/debian/control
@@ -2,8 +2,8 @@
Section: admin
Priority: optional
Maintainer: Santiago Garcia Mantinan <[email protected]>
-Standards-Version: 3.7.3
-Build-Depends: bin86, util-linux (>= 2.13) | linux32
+Standards-Version: 3.8.2
+Build-Depends: debhelper(>= 7), bin86, util-linux (>= 2.13) | linux32
Package: mbr
Architecture: i386 amd64 lpia
@@ -14,0 +15,10 @@
+
+Package: mbr-udeb
+Architecture: i386 amd64 lpia
+Depends: ${shlibs:Depends}
+Priority: extra
+Section: debian-installer
+XC-Package-Type: udeb
+XB-Installer-Menu-Item: 99999
+Description: Master Boot Record for IBM-PC compatible computers
+
only in patch2:
unchanged:
--- mbr-1.1.10.orig/debian/compat
+++ mbr-1.1.10/debian/compat
@@ -0,0 +1 @@
+7
