From 0eaa48ba310609504ab8159b752f7c2561ceddb9 Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Wed, 5 Sep 2012 08:35:11 +0100 Subject: [PATCH] Refactor debian/grub-common.install.hurd-i386 into .in files so that it imposes less of a maintenance burden. --- debian/changelog | 2 ++ debian/grub-common.install.hurd-i386 | 35 ------------------------- debian/grub-common.install.hurd-i386.in | 2 ++ debian/grub-common.install.in | 2 -- debian/grub-common.install.kfreebsd.in | 2 ++ debian/grub-common.install.linux.in | 2 ++ 6 files changed, 8 insertions(+), 37 deletions(-) delete mode 100644 debian/grub-common.install.hurd-i386 create mode 100644 debian/grub-common.install.hurd-i386.in create mode 100644 debian/grub-common.install.kfreebsd.in create mode 100644 debian/grub-common.install.linux.in diff --git a/debian/changelog b/debian/changelog index 3b78e0716..8d0bb66e8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -20,6 +20,8 @@ grub2 (2.00-1) UNRELEASED; urgency=low around merges. * Remove pointless debian/grub-mount-udeb.install.hurd-i386; grub-mount-udeb is not built on the Hurd. + * Refactor debian/grub-common.install.hurd-i386 into .in files so that it + imposes less of a maintenance burden. -- Christian Perrier Sat, 02 Jun 2012 19:51:35 +0200 diff --git a/debian/grub-common.install.hurd-i386 b/debian/grub-common.install.hurd-i386 deleted file mode 100644 index 63351aa07..000000000 --- a/debian/grub-common.install.hurd-i386 +++ /dev/null @@ -1,35 +0,0 @@ -../../debian/presubj usr/share/bug/grub-common -../../debian/apport/source_grub2.py usr/share/apport/package-hooks/ -../../debian/grub.d etc - -etc/bash_completion.d -etc/grub.d -usr/bin/grub-editenv -usr/bin/grub-fstest -usr/bin/grub-kbdcomp -usr/bin/grub-menulst2cfg -usr/bin/grub-mkfont -usr/bin/grub-mkimage -usr/bin/grub-mklayout -usr/bin/grub-mkpasswd-pbkdf2 -usr/bin/grub-mkrelpath -usr/bin/grub-script-check -usr/sbin/grub-mkconfig -usr/sbin/grub-mkdevicemap -usr/sbin/grub-probe -usr/share/grub -usr/share/locale -usr/share/man/man1/grub-editenv.1 -usr/share/man/man1/grub-fstest.1 -usr/share/man/man1/grub-menulst2cfg.1 -usr/share/man/man1/grub-mkfont.1 -usr/share/man/man1/grub-mkimage.1 -usr/share/man/man1/grub-mklayout.1 -usr/share/man/man1/grub-mkpasswd-pbkdf2.1 -usr/share/man/man1/grub-mkrelpath.1 -usr/share/man/man1/grub-script-check.1 -usr/share/man/man8/grub-mkconfig.8 -usr/share/man/man8/grub-mkdevicemap.8 -usr/share/man/man8/grub-probe.8 -usr/bin/grub-mkrescue -usr/share/man/man1/grub-mkrescue.1 diff --git a/debian/grub-common.install.hurd-i386.in b/debian/grub-common.install.hurd-i386.in new file mode 100644 index 000000000..f5f3231fd --- /dev/null +++ b/debian/grub-common.install.hurd-i386.in @@ -0,0 +1,2 @@ +usr/bin/grub-mkrescue +usr/share/man/man1/grub-mkrescue.1 diff --git a/debian/grub-common.install.in b/debian/grub-common.install.in index 49fa9b1e9..3acf27efa 100644 --- a/debian/grub-common.install.in +++ b/debian/grub-common.install.in @@ -13,7 +13,6 @@ usr/bin/grub-mkimage usr/bin/grub-mklayout usr/bin/grub-mkpasswd-pbkdf2 usr/bin/grub-mkrelpath -usr/bin/grub-mount usr/bin/grub-script-check usr/sbin/grub-mkconfig usr/sbin/grub-mkdevicemap @@ -28,7 +27,6 @@ usr/share/man/man1/grub-mkimage.1 usr/share/man/man1/grub-mklayout.1 usr/share/man/man1/grub-mkpasswd-pbkdf2.1 usr/share/man/man1/grub-mkrelpath.1 -usr/share/man/man1/grub-mount.1 usr/share/man/man1/grub-script-check.1 usr/share/man/man8/grub-mkconfig.8 usr/share/man/man8/grub-mkdevicemap.8 diff --git a/debian/grub-common.install.kfreebsd.in b/debian/grub-common.install.kfreebsd.in new file mode 100644 index 000000000..a1fc71c47 --- /dev/null +++ b/debian/grub-common.install.kfreebsd.in @@ -0,0 +1,2 @@ +usr/bin/grub-mount +usr/share/man/man1/grub-mount.1 diff --git a/debian/grub-common.install.linux.in b/debian/grub-common.install.linux.in new file mode 100644 index 000000000..a1fc71c47 --- /dev/null +++ b/debian/grub-common.install.linux.in @@ -0,0 +1,2 @@ +usr/bin/grub-mount +usr/share/man/man1/grub-mount.1