From 3ea00869f7f7fdd633013a52774924a0a31310ef Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Tue, 14 May 2013 16:20:16 +0100 Subject: [PATCH] Install reportbug presubj and script files in all binary packages. --- debian/{presubj => bug-presubj} | 0 debian/{script => bug-script} | 0 debian/changelog | 6 ++++++ debian/dirs.in | 1 - debian/grub-common.install.in | 1 - debian/grub2.dirs | 1 - debian/grub2.install | 2 -- debian/install-bin.in | 3 --- debian/install.in | 2 -- debian/rules | 5 ++++- 10 files changed, 10 insertions(+), 11 deletions(-) rename debian/{presubj => bug-presubj} (100%) rename debian/{script => bug-script} (100%) delete mode 100644 debian/grub2.dirs delete mode 100644 debian/grub2.install diff --git a/debian/presubj b/debian/bug-presubj similarity index 100% rename from debian/presubj rename to debian/bug-presubj diff --git a/debian/script b/debian/bug-script similarity index 100% rename from debian/script rename to debian/bug-script diff --git a/debian/changelog b/debian/changelog index 4c0a25cb4..f86b41038 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +grub2 (2.00-15) UNRELEASED; urgency=low + + * Install reportbug presubj and script files in all binary packages. + + -- Colin Watson Fri, 10 May 2013 01:08:20 +0100 + grub2 (2.00-14) unstable; urgency=low * Merge from Ubuntu: diff --git a/debian/dirs.in b/debian/dirs.in index 22cf9690e..e53f2b0ab 100644 --- a/debian/dirs.in +++ b/debian/dirs.in @@ -1,4 +1,3 @@ usr/bin usr/sbin usr/share/grub -usr/share/bug/@PACKAGE@ diff --git a/debian/grub-common.install.in b/debian/grub-common.install.in index 88b350b33..98c2dfa9a 100644 --- a/debian/grub-common.install.in +++ b/debian/grub-common.install.in @@ -1,4 +1,3 @@ -../../debian/presubj usr/share/bug/grub-common ../../debian/apport/source_grub2.py usr/share/apport/package-hooks/ ../../debian/grub.d etc diff --git a/debian/grub2.dirs b/debian/grub2.dirs deleted file mode 100644 index 796dfd647..000000000 --- a/debian/grub2.dirs +++ /dev/null @@ -1 +0,0 @@ -usr/share/bug/grub2 diff --git a/debian/grub2.install b/debian/grub2.install deleted file mode 100644 index 78d945d4c..000000000 --- a/debian/grub2.install +++ /dev/null @@ -1,2 +0,0 @@ -debian/presubj usr/share/bug/grub2 -debian/script usr/share/bug/grub2 diff --git a/debian/install-bin.in b/debian/install-bin.in index 8ff9fe44f..ef093080c 100644 --- a/debian/install-bin.in +++ b/debian/install-bin.in @@ -1,6 +1,3 @@ -../../debian/presubj usr/share/bug/@PACKAGE@ -../../debian/script usr/share/bug/@PACKAGE@ - usr/lib/grub/@CPU_PLATFORM@/*.img usr/lib/grub/@CPU_PLATFORM@/*.lst usr/lib/grub/@CPU_PLATFORM@/*.mod diff --git a/debian/install.in b/debian/install.in index 424e7430a..f003e410d 100644 --- a/debian/install.in +++ b/debian/install.in @@ -1,4 +1,2 @@ -../../debian/presubj usr/share/bug/@PACKAGE@ -../../debian/script usr/share/bug/@PACKAGE@ ../../debian/kernel/zz-update-grub etc/kernel/postinst.d ../../debian/kernel/zz-update-grub etc/kernel/postrm.d diff --git a/debian/rules b/debian/rules index cba42fd79..6b50ba038 100755 --- a/debian/rules +++ b/debian/rules @@ -321,6 +321,9 @@ override_dh_installdocs: dh_installdocs -pgrub-common -pgrub-rescue-pc -pgrub-firmware-qemu -A AUTHORS NEWS README THANKS TODO dh_installdocs -Ngrub-common -Ngrub-rescue-pc -Ngrub-firmware-qemu --link-doc=grub-common +override_dh_bugfiles: + dh_bugfiles -A + override_dh_strip: dh_strip -X/usr/bin/grub-emu @@ -362,7 +365,7 @@ override_dh_clean: debian/legacy/update-grub debian/grub-extras dh_autoreconf_clean dh_clean - chmod +x debian/{script,grub.d/*,legacy/*,kernel/*} + chmod +x debian/{bug-script,grub.d/*,legacy/*,kernel/*} for i in $(AUTOGEN_DEB_FILES) ; do \ rm -f debian/grub-{pc,efi-*,ieee1275,coreboot,yeeloong,emu}{,-bin,-dbg}.$$i ; \