tags 724383 + patch thanks Dear maintainer,
I've prepared an NMU for grub (versioned as 0.97-67.1) and uploaded it to DELAYED/10. Please feel free to tell me if I should delay it longer. Regards. -- Eric Dorland <[email protected]> 43CF 1228 F726 FD5B 474C E962 C256 FBD5 0022 1E93
diff -u grub-0.97/debian/changelog grub-0.97/debian/changelog --- grub-0.97/debian/changelog +++ grub-0.97/debian/changelog @@ -1,3 +1,10 @@ +grub (0.97-67.1) unstable; urgency=medium + + * Non-maintainer upload. + * Switch to automake1.11. (Closes: #724383) + + -- Eric Dorland <[email protected]> Sun, 20 Jul 2014 17:40:25 -0400 + grub (0.97-67) unstable; urgency=low * Fix typo in grub-set-default calls when generating /boot/grub/default diff -u grub-0.97/debian/rules grub-0.97/debian/rules --- grub-0.97/debian/rules +++ grub-0.97/debian/rules @@ -65,7 +65,7 @@ dh_testdir # Add here commands to configure the package. - aclocal-1.9 && automake-1.9 && autoconf + aclocal-1.11 && autoheader && automake-1.11 && autoconf LDFLAGS=$(LDFLAGS) ./configure \ --host=$(DEB_HOST_GNU_TYPE) \ --build=$(DEB_BUILD_GNU_TYPE) \ diff -u grub-0.97/debian/control grub-0.97/debian/control --- grub-0.97/debian/control +++ grub-0.97/debian/control @@ -6,7 +6,7 @@ DM-Upload-Allowed: yes Build-Depends: debhelper (>= 5), quilt (>= 0.46-7), - automake1.9, + automake1.11, autoconf, autotools-dev, texinfo, diff -u grub-0.97/debian/patches/series grub-0.97/debian/patches/series --- grub-0.97/debian/patches/series +++ grub-0.97/debian/patches/series @@ -27,0 +28 @@ +automake1.11-fix.patch only in patch2: unchanged: --- grub-0.97.orig/debian/patches/automake1.11-fix.patch +++ grub-0.97/debian/patches/automake1.11-fix.patch @@ -0,0 +1,71 @@ +Index: grub-0.97/configure.ac +=================================================================== +--- grub-0.97.orig/configure.ac 2014-07-20 18:59:18.149134797 -0400 ++++ grub-0.97/configure.ac 2014-07-20 18:59:18.145134831 -0400 +@@ -56,12 +56,11 @@ + + AC_CHECK_TOOL(CC, gcc) + AC_PROG_CC ++AM_PROG_CC_C_O + # We need this for older versions of Autoconf. + _AM_DEPENDENCIES(CC) + +-dnl Because recent automake complains about AS, set it here. +-CCAS="$CC" +-AC_SUBST(CCAS) ++AM_PROG_AS + + AC_ARG_WITH(binutils, + [ --with-binutils=DIR search the directory DIR to find binutils]) +Index: grub-0.97/stage1/Makefile.am +=================================================================== +--- grub-0.97.orig/stage1/Makefile.am 2014-07-20 17:31:07.000000000 -0400 ++++ grub-0.97/stage1/Makefile.am 2014-07-20 19:00:47.408216509 -0400 +@@ -1,7 +1,7 @@ +-pkglibdir = $(libdir)/$(PACKAGE)/$(host_cpu)-$(host_vendor) +-nodist_pkglib_DATA = stage1 ++pkgdatadir = $(libdir)/$(PACKAGE)/$(host_cpu)-$(host_vendor) ++nodist_pkgdata_DATA = stage1 + +-CLEANFILES = $(nodist_pkglib_DATA) ++CLEANFILES = $(nodist_pkgdata_DATA) + + # We can't use builtins or standard includes. + AM_CCASFLAGS = $(STAGE1_CFLAGS) -fno-builtin -nostdinc +Index: grub-0.97/stage2/Makefile.am +=================================================================== +--- grub-0.97.orig/stage2/Makefile.am 2014-07-20 18:59:17.725139149 -0400 ++++ grub-0.97/stage2/Makefile.am 2014-07-20 19:03:45.510389012 -0400 +@@ -27,12 +27,12 @@ + -DUSE_MD5_PASSWORDS=1 -DSUPPORT_SERIAL=1 -DSUPPORT_HERCULES=1 + + # Stage 2 and Stage 1.5's. +-pkglibdir = $(libdir)/$(PACKAGE)/$(host_cpu)-$(host_vendor) ++pkgdatadir = $(libdir)/$(PACKAGE)/$(host_cpu)-$(host_vendor) + + EXTRA_PROGRAMS = nbloader.exec pxeloader.exec diskless.exec + + if DISKLESS_SUPPORT +-pkglib_DATA = stage2 stage2_eltorito e2fs_stage1_5 fat_stage1_5 \ ++pkgdata_DATA = stage2 stage2_eltorito e2fs_stage1_5 fat_stage1_5 \ + ffs_stage1_5 iso9660_stage1_5 jfs_stage1_5 minix_stage1_5 \ + reiserfs_stage1_5 ufs2_stage1_5 vstafs_stage1_5 xfs_stage1_5 \ + nbgrub pxegrub +@@ -43,7 +43,7 @@ + reiserfs_stage1_5.exec ufs2_stage1_5.exec vstafs_stage1_5.exec \ + xfs_stage1_5.exec nbloader.exec pxeloader.exec diskless.exec + else +-pkglib_DATA = stage2 stage2_eltorito e2fs_stage1_5 fat_stage1_5 \ ++pkgdata_DATA = stage2 stage2_eltorito e2fs_stage1_5 fat_stage1_5 \ + ffs_stage1_5 iso9660_stage1_5 jfs_stage1_5 minix_stage1_5 \ + reiserfs_stage1_5 ufs2_stage1_5 vstafs_stage1_5 xfs_stage1_5 + noinst_DATA = pre_stage2 start start_eltorito +@@ -112,7 +112,7 @@ + BUILT_SOURCES = stage2_size.h + endif + +-CLEANFILES = $(pkglib_DATA) $(noinst_DATA) $(BUILT_SOURCES) ++CLEANFILES = $(pkgdata_DATA) $(noinst_DATA) $(BUILT_SOURCES) + + stage2_size.h: pre_stage2 + -rm -f stage2_size.h
signature.asc
Description: Digital signature
