Fix debhelper files to ensure each package gets the right thing.

diff --git a/debian/changelog b/debian/changelog
index af558083263da70185659466c18729ad550d460e..b133664ceb332bee48ba1053042f1df43aac56c5 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,9 @@ grub2 (1.95+20070507-1) unstable; urgency=low
 
   * New CVS snapshot.
     - patches/build_neq_src.diff: Remove (merged).
+  * Fix debhelper files to ensure each package gets the right thing.
 
- -- Robert Millan <rmh@aybabtu.com>  Mon,  7 May 2007 11:28:44 +0200
+ -- Robert Millan <rmh@aybabtu.com>  Mon,  7 May 2007 21:41:01 +0200
 
 grub2 (1.95+20070505.1-3) unstable; urgency=low
 

diff --git a/debian/dirs b/debian/dirs
deleted file mode 100644 (file)
index b9793d6..0000000
--- a/debian/dirs
+++ /dev/null
@@ -1,3 +0,0 @@
-usr/bin
-usr/sbin
-usr/share/bug/grub

diff --git a/debian/dirs.in b/debian/dirs.in
new file mode 100644 (file)
index 0000000..b9793d6
--- /dev/null
+++ b/debian/dirs.in
@@ -0,0 +1,3 @@
+usr/bin
+usr/sbin
+usr/share/bug/grub

diff --git a/debian/docs b/debian/docs
deleted file mode 100644 (file)
index 6961690..0000000
--- a/debian/docs
+++ /dev/null
@@ -1,3 +0,0 @@
-build-tree/*/NEWS
-build-tree/*/README
-build-tree/*/TODO

diff --git a/debian/docs.in b/debian/docs.in
new file mode 100644 (file)
index 0000000..6961690
--- /dev/null
+++ b/debian/docs.in
@@ -0,0 +1,3 @@
+build-tree/*/NEWS
+build-tree/*/README
+build-tree/*/TODO

diff --git a/debian/grub-efi.install b/debian/grub-efi.install
index 5726d3dc08a25530a13a52609da6c96e7e7be955..f1efd1ffc5b28ab6c8450ef286d0e695ed3ff5d4 100644 (file)
--- a/debian/grub-efi.install
+++ b/debian/grub-efi.install
@@ -1 +1,3 @@
 debian/grub-install    usr/sbin
+debian/presubj         usr/share/bug/grub
+debian/default         etc

diff --git a/debian/grub-of.install b/debian/grub-of.install
new file mode 100644 (file)
index 0000000..152e873
--- /dev/null
+++ b/debian/grub-of.install
@@ -0,0 +1,2 @@
+debian/presubj         usr/share/bug/grub
+debian/default         etc

diff --git a/debian/grub-pc.install b/debian/grub-pc.install
new file mode 100644 (file)
index 0000000..152e873
--- /dev/null
+++ b/debian/grub-pc.install
@@ -0,0 +1,2 @@
+debian/presubj         usr/share/bug/grub
+debian/default         etc

diff --git a/debian/grub2.templates b/debian/grub2.templates
new file mode 100644 (file)
index 0000000..fefec01
--- /dev/null
+++ b/debian/grub2.templates
@@ -0,0 +1,16 @@
+Template: grub2/numbering_scheme_transition
+Type: note
+Description: GRUB 1.95 numbering scheme transition.
+ As of version 1.95, GRUB 2 has changed its numbering scheme.  Partitions are
+ now counted starting from 1 rather than 0.  This is to make it consistent with
+ device names of Linux and the other kernels used in Debian.  For example, when
+ using Linux as the kernel, "(hd0,1)" refers to the same partition as the
+ /dev/sda1 device node.
+ .
+ Because of this, there's a chance your system becomes unbootable if
+ update-grub(8) is run before GRUB is updated, generating a grub.cfg file that
+ your installed GRUB won't yet be able to parse correctly.  To ensure your
+ system will be able to boot, you have to:
+ .
+  - Reinstall GRUB (typicaly, by running grub-install).
+  - Rerun update-grub to generate a new grub.cfg.

diff --git a/debian/install b/debian/install
deleted file mode 100644 (file)
index 152e873..0000000
--- a/debian/install
+++ /dev/null
@@ -1,2 +0,0 @@
-debian/presubj         usr/share/bug/grub
-debian/default         etc

diff --git a/debian/manpages b/debian/manpages
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/debian/rules b/debian/rules
index 81120bf7d78fcee661afbf6d708cbcd12d083633..684804660dd0bb5f89ba2b173fa3db93a5d88b11 100644 (file)
--- a/debian/rules
+++ b/debian/rules
@@ -31,7 +31,9 @@ build/grub-pc build/grub-efi build/grub-of::
 
 install/grub-pc install/grub-efi install/grub-of::
        $(MAKE) -C $(subst install/,build/,$@) install DESTDIR=$(CURDIR)/debian/$(subst install/,,$@)/
-       cp debian/postinst.in debian/$(subst install/,,$@).postinst
+       for i in postinst docs dirs ; do \
+               cp debian/$$i.in debian/$(subst install/,,$@).$$i ; \
+       done
 
 clean::
        sed -e "s/@cpu@/$(grub_cpu)/g" < debian/README.Debian.in \

diff --git a/debian/templates b/debian/templates
deleted file mode 100644 (file)
index fefec01..0000000
--- a/debian/templates
+++ /dev/null
@@ -1,16 +0,0 @@
-Template: grub2/numbering_scheme_transition
-Type: note
-Description: GRUB 1.95 numbering scheme transition.
- As of version 1.95, GRUB 2 has changed its numbering scheme.  Partitions are
- now counted starting from 1 rather than 0.  This is to make it consistent with
- device names of Linux and the other kernels used in Debian.  For example, when
- using Linux as the kernel, "(hd0,1)" refers to the same partition as the
- /dev/sda1 device node.
- .
- Because of this, there's a chance your system becomes unbootable if
- update-grub(8) is run before GRUB is updated, generating a grub.cfg file that
- your installed GRUB won't yet be able to parse correctly.  To ensure your
- system will be able to boot, you have to:
- .
-  - Reinstall GRUB (typicaly, by running grub-install).
-  - Rerun update-grub to generate a new grub.cfg.