[kernel] r8172 - in dists/trunk/utils/mkvmlinuz/mkvmlinuz: . debian debian/kernel-image

Sat Jan 13 20:06:00 CET 2007

Author: ag-guest
Date: Sat Jan 13 20:06:00 2007
New Revision: 8172

Added:
   dists/trunk/utils/mkvmlinuz/mkvmlinuz/debian/kernel-image/
   dists/trunk/utils/mkvmlinuz/mkvmlinuz/debian/kernel-image/postinst
      - copied unchanged from r8170, dists/trunk/utils/mkvmlinuz/mkvmlinuz/debian/kernel-image.postinst
   dists/trunk/utils/mkvmlinuz/mkvmlinuz/debian/kernel-image/postrm
      - copied unchanged from r8170, dists/trunk/utils/mkvmlinuz/mkvmlinuz/debian/kernel-image.postrm
   dists/trunk/utils/mkvmlinuz/mkvmlinuz/debian/lintian.overrides
Removed:
   dists/trunk/utils/mkvmlinuz/mkvmlinuz/debian/kernel-image.postinst
   dists/trunk/utils/mkvmlinuz/mkvmlinuz/debian/kernel-image.postrm
Modified:
   dists/trunk/utils/mkvmlinuz/mkvmlinuz/debian/changelog
   dists/trunk/utils/mkvmlinuz/mkvmlinuz/debian/control
   dists/trunk/utils/mkvmlinuz/mkvmlinuz/debian/dirs
   dists/trunk/utils/mkvmlinuz/mkvmlinuz/debian/postinst
   dists/trunk/utils/mkvmlinuz/mkvmlinuz/debian/rules
   dists/trunk/utils/mkvmlinuz/mkvmlinuz/mkvmlinuz
Log:
* Fix arithmetic syntax error. (Closes: #374185)
* Add myself to the Uploaders field.
* Bump Standards-Version to 3.7.2.
* Fix some expressions in long description.
* Fix lintian errors and warnings.


Modified: dists/trunk/utils/mkvmlinuz/mkvmlinuz/debian/changelog
==============================================================================

--- dists/trunk/utils/mkvmlinuz/mkvmlinuz/debian/changelog	(original)
+++ dists/trunk/utils/mkvmlinuz/mkvmlinuz/debian/changelog	Sat Jan 13 20:06:00 2007
@@ -1,3 +1,28 @@
+mkvmlinuz (30) unstable; urgency=low
+
+  * Fix arithmetic syntax error. (Closes: #374185)
+  * Add myself to the Uploaders field.
+  * Bump Standards-Version to 3.7.2.
+  * Fix some expressions in long description.
+  * Fix lintian errors and warnings.
+    + Add po-debconf to the Build-Depends field.
+    + Depend explicitly on bash (>= 3) to avoid a simple dependency
+      on an essential package.
+    + Add dh_strip in debian/rules, because a binary was left
+      unstripped.
+    + Remove debian/conffiles as debhelper (>= 4) adds conffiles
+      under /etc automatically.
+    + Add the #DEBHELPER# token to debian/postinst.
+    + Move debian/kernel-image.postinst to debian/kernel-image/postinst
+      and debian/kernel-image.postrm to debian/kernel-image/postrm,
+      because it prevents lintian from believing they are maintainer
+      scripts for the packaging system.
+    + Add debian/lintian.overrides for debconf-is-not-a-registry,
+      because we need a debconf setting from mkvmlinuz in kernel
+      scripts.
+
+ -- Aurélien GÉRÔME <ag at roxor.cx>  Sat, 13 Jan 2007 19:52:07 +0100
+
 mkvmlinuz (29) unstable; urgency=high
 
   * Added Efika support.

Modified: dists/trunk/utils/mkvmlinuz/mkvmlinuz/debian/control
==============================================================================
--- dists/trunk/utils/mkvmlinuz/mkvmlinuz/debian/control	(original)
+++ dists/trunk/utils/mkvmlinuz/mkvmlinuz/debian/control	Sat Jan 13 20:06:00 2007
@@ -2,21 +2,19 @@
 Section: devel
 Priority: optional
 Maintainer: Debian Kernel Team <debian-kernel at lists.debian.org>
-Uploaders: Sven Luther <luther at debian.org>
-Build-Depends: docbook-to-man, debhelper (>= 4.1.16)
-Standards-Version: 3.6.0
+Uploaders: Sven Luther <luther at debian.org>, Aurélien GÉRÔME <ag at roxor.cx>
+Build-Depends: docbook-to-man, debhelper (>= 4.1.16), po-debconf
+Standards-Version: 3.7.2
 
 Package: mkvmlinuz
 Architecture: powerpc
-Depends: bash, binutils, debconf | debconf-2.0
+Depends: bash (>= 3), binutils, debconf | debconf-2.0
 Description: create a kernel to boot a PowerPC machine from Open Firmware
- .
  This little program takes a PowerPC Linux kernel as an uncompressed
- ELF image file (usually called vmlinux or somesuch) and adds boot
- code and possibly a ramdisk to create a compressed kernel image that
- can be booted directly from Open Firmware, thus eliminating the need
- for a second-stage bootloader such as yaboot or quik.  This is
- especially useful on PowerPC sub-architectures that do not have a
- bootloader at all, but may also come handy for install kernels,
- netboot systems and the like.
-
+ ELF image file (usually called vmlinux or such) and adds a boot code
+ and possibly a ramdisk to create a compressed kernel image that can
+ be booted directly from Open Firmware, thus eliminating the need for
+ a second-stage bootloader such as yaboot or quik. This is especially
+ useful on PowerPC sub-architectures which do not have a bootloader
+ at all, but may also come handy to install kernels, netboot systems,
+ and the likes.

Modified: dists/trunk/utils/mkvmlinuz/mkvmlinuz/debian/dirs
==============================================================================
--- dists/trunk/utils/mkvmlinuz/mkvmlinuz/debian/dirs	(original)
+++ dists/trunk/utils/mkvmlinuz/mkvmlinuz/debian/dirs	Sat Jan 13 20:06:00 2007
@@ -4,3 +4,4 @@
 etc/kernel/postinst.d
 etc/kernel/postrm.d
 usr/lib/mkvmlinuz
+usr/share/lintian/overrides

Added: dists/trunk/utils/mkvmlinuz/mkvmlinuz/debian/lintian.overrides
==============================================================================
--- (empty file)
+++ dists/trunk/utils/mkvmlinuz/mkvmlinuz/debian/lintian.overrides	Sat Jan 13 20:06:00 2007
@@ -0,0 +1,2 @@
+mkvmlinuz: debconf-is-not-a-registry ./etc/kernel/postinst.d/mkvmlinuz
+mkvmlinuz: debconf-is-not-a-registry ./etc/kernel/postrm.d/mkvmlinuz

Modified: dists/trunk/utils/mkvmlinuz/mkvmlinuz/debian/postinst
==============================================================================
--- dists/trunk/utils/mkvmlinuz/mkvmlinuz/debian/postinst	(original)
+++ dists/trunk/utils/mkvmlinuz/mkvmlinuz/debian/postinst	Sat Jan 13 20:06:00 2007
@@ -3,3 +3,5 @@
 set -e
 
 . /usr/share/debconf/confmodule
+
+#DEBHELPER#

Modified: dists/trunk/utils/mkvmlinuz/mkvmlinuz/debian/rules
==============================================================================
--- dists/trunk/utils/mkvmlinuz/mkvmlinuz/debian/rules	(original)
+++ dists/trunk/utils/mkvmlinuz/mkvmlinuz/debian/rules	Sat Jan 13 20:06:00 2007
@@ -1,7 +1,4 @@
 #!/usr/bin/make -f
-# -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# GNU copyright 1997 to 1999 by Joey Hess.
 
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
@@ -9,14 +6,8 @@
 INSTALL_DATA = install -m 644 -o root -g root
 INSTALL_EXEC = install -m 755 -o root -g root
 
-configure: configure-stamp
-configure-stamp:
-	dh_testdir
-	touch configure-stamp
-
 build: build-stamp
-
-build-stamp: configure-stamp mkvmlinuz.8
+build-stamp: mkvmlinuz.8
 	dh_testdir
 	touch build-stamp
 
@@ -29,12 +20,10 @@
 clean:
 	dh_testdir
 	dh_testroot
-	rm -f build-stamp configure-stamp
+	rm -f build-stamp
 
 	rm -f mkvmlinuz.8
-	
 	debconf-updatepo
-
 	make -C boot clean
 
 	dh_clean 
@@ -46,19 +35,17 @@
 	dh_installdirs
 
 	$(INSTALL_EXEC) mkvmlinuz $(CURDIR)/debian/mkvmlinuz/usr/sbin
-	$(INSTALL_EXEC) debian/kernel-image.postinst $(CURDIR)/debian/mkvmlinuz/etc/kernel/postinst.d/mkvmlinuz
-	$(INSTALL_EXEC) debian/kernel-image.postrm $(CURDIR)/debian/mkvmlinuz/etc/kernel/postrm.d/mkvmlinuz
+	$(INSTALL_EXEC) debian/kernel-image/postinst $(CURDIR)/debian/mkvmlinuz/etc/kernel/postinst.d/mkvmlinuz
+	$(INSTALL_EXEC) debian/kernel-image/postrm $(CURDIR)/debian/mkvmlinuz/etc/kernel/postrm.d/mkvmlinuz
+	$(INSTALL_DATA) debian/lintian.overrides $(CURDIR)/debian/mkvmlinuz/usr/share/lintian/overrides/mkvmlinuz
 	$(INSTALL_EXEC) mkvmlinuz $(CURDIR)/debian/mkvmlinuz/usr/sbin
 	$(INSTALL_DATA) mkvmlinuz.8 $(CURDIR)/debian/mkvmlinuz/usr/share/man/man8
 	$(INSTALL_DATA) output $(CURDIR)/debian/mkvmlinuz/etc/mkvmlinuz
 	$(INSTALL_EXEC) boot/addnote $(CURDIR)/debian/mkvmlinuz/usr/lib/mkvmlinuz
 	$(INSTALL_DATA) boot/*.o boot/zImage.lds $(CURDIR)/debian/mkvmlinuz/usr/lib/mkvmlinuz
 
-# Build architecture-independent files here.
 binary-indep: build install
-# We have nothing to do by default.
 
-# Build architecture-dependent files here.
 binary-arch: build install
 	dh_testdir
 	dh_testroot
@@ -66,6 +53,7 @@
 	dh_installdocs
 	dh_installman
 	dh_installdebconf
+	dh_strip
 	dh_compress
 	dh_fixperms
 	dh_installdeb
@@ -74,4 +62,4 @@
 	dh_builddeb
 
 binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure
+.PHONY: build clean binary-indep binary-arch binary install

Modified: dists/trunk/utils/mkvmlinuz/mkvmlinuz/mkvmlinuz
==============================================================================
--- dists/trunk/utils/mkvmlinuz/mkvmlinuz/mkvmlinuz	(original)
+++ dists/trunk/utils/mkvmlinuz/mkvmlinuz/mkvmlinuz	Sat Jan 13 20:06:00 2007
@@ -60,7 +60,7 @@
 esac
 
 # use non-option arguments as release version and kernel image file if needed
-shift $((OPTIND-1))
+shift $(( $OPTIND - 1 ))
 if test -z "$release" -a -n "$1"; then
     release=$1
 fi

