Merge branch 'master' into debian

diff --git a/debian/changelog b/debian/changelog
new file mode 100644 (file)
index 0000000..166b654
--- /dev/null
+++ b/debian/changelog
@@ -0,0 +1,5 @@
+kboot-utils (0.1-1) unstable; urgency=low
+
+  * Initial release (Closes: #641465)
+
+ -- Antonio Ospite <ospite@studenti.unina.it>  Thu, 22 Sep 2011 13:07:17 +0200

diff --git a/debian/compat b/debian/compat
new file mode 100644 (file)
index 0000000..7f8f011
--- /dev/null
+++ b/debian/compat
@@ -0,0 +1 @@
+7

diff --git a/debian/control b/debian/control
new file mode 100644 (file)
index 0000000..58dab66
--- /dev/null
+++ b/debian/control
@@ -0,0 +1,20 @@
+Source: kboot-utils
+Section: admin
+Priority: extra
+Maintainer: Antonio Ospite <ospite@studenti.unina.it>
+Build-Depends: debhelper (>= 7.0.50~)
+Standards-Version: 3.9.2
+Homepage: http://git.ao2.it/kboot-utils.git
+Vcs-Git: git://git.ao2.it/kboot-utils.git
+Vcs-Browser: http://git.ao2.it/kboot-utils.git
+
+Package: kboot-utils
+Architecture: all
+Depends: ${misc:Depends}
+Description: Helper tools to generate a kboot.conf file
+ Helper tools to automatically generate a kboot.conf file from entries in
+ /boot.
+ .
+ The kboot.conf file can be read by the petitboot bootloader which is used
+ for instance on the Sony PlayStation 3 in OtherOS mode in order to list
+ kernels to boot.

diff --git a/debian/copyright b/debian/copyright
new file mode 100644 (file)
index 0000000..d279d79
--- /dev/null
+++ b/debian/copyright
@@ -0,0 +1,29 @@
+Format: http://anonscm.debian.org/viewvc/dep/web/deps/dep5.mdwn?revision=174
+Upstream-Name: kboot-utils
+Source: http://git.ao2.it/kboot-utils.git
+
+Files: *
+Copyright: 2011 Antonio Ospite <ospite@studenti.unina.it>
+License: GPL-3.0+
+
+Files: debian/*
+Copyright: 2011 Antonio Ospite <ospite@studenti.unina.it>
+License: GPL-3.0+
+
+License: GPL-3.0+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+ .
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ .
+ On Debian systems the full text of the GNU General Public
+ License version 3 can be found in the `/usr/share/common-licenses/GPL-3'
+ file.

diff --git a/debian/dirs b/debian/dirs
new file mode 100644 (file)
index 0000000..f6bf4e2
--- /dev/null
+++ b/debian/dirs
@@ -0,0 +1,2 @@
+/etc/default
+/usr/sbin

diff --git a/debian/docs b/debian/docs
new file mode 100644 (file)
index 0000000..c8bc46b
--- /dev/null
+++ b/debian/docs
@@ -0,0 +1,2 @@
+README
+doc/kboot.conf.sample

diff --git a/debian/gbp.conf b/debian/gbp.conf
new file mode 100644 (file)
index 0000000..0a80fe8
--- /dev/null
+++ b/debian/gbp.conf
@@ -0,0 +1,4 @@
+[DEFAULT]
+debian-branch = debian
+upstream-branch = master
+upstream-tag = v%(version)s

diff --git a/debian/install b/debian/install
new file mode 100644 (file)
index 0000000..47bc794
--- /dev/null
+++ b/debian/install
@@ -0,0 +1,3 @@
+debian/update-kboot            usr/sbin
+debian/kernel/zz-update-kboot  etc/kernel/postinst.d
+debian/kernel/zz-update-kboot  etc/kernel/postrm.d

diff --git a/debian/kernel/zz-update-kboot b/debian/kernel/zz-update-kboot
new file mode 100755 (executable)
index 0000000..3247acf
--- /dev/null
+++ b/debian/kernel/zz-update-kboot
@@ -0,0 +1,19 @@
+#! /bin/sh
+set -e
+
+which update-kboot >/dev/null 2>&1 || exit 0
+
+set -- $DEB_MAINT_PARAMS
+mode="${1#\'}"
+mode="${mode%\'}"
+case $0:$mode in
+    # Only run on postinst configure and postrm remove, to avoid wasting
+    # time by calling update-grub multiple times on upgrade and removal.
+    # Also run if we have no DEB_MAINT_PARAMS, in order to work with old
+    # kernel packages.
+    */postinst.d/*:|*/postinst.d/*:configure|*/postrm.d/*:|*/postrm.d/*:remove)
+       exec update-kboot
+       ;;
+esac
+
+exit 0

diff --git a/debian/manpages b/debian/manpages
new file mode 100644 (file)
index 0000000..764213f
--- /dev/null
+++ b/debian/manpages
@@ -0,0 +1,2 @@
+man/kboot-mkconfig.8
+debian/update-kboot.8

diff --git a/debian/postinst b/debian/postinst
new file mode 100644 (file)
index 0000000..5eae712
--- /dev/null
+++ b/debian/postinst
@@ -0,0 +1,28 @@
+#!/bin/sh
+# postinst script for kboot-utils
+#
+# see: dh_installdeb(1)
+
+set -e
+
+case "$1" in
+    configure)
+      # Update the kboot.conf on install
+      update-kboot 3>&-
+    ;;
+
+    abort-upgrade|abort-remove|abort-deconfigure)
+    ;;
+
+    *)
+        echo "postinst called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0

diff --git a/debian/postrm b/debian/postrm
new file mode 100644 (file)
index 0000000..fe32e58
--- /dev/null
+++ b/debian/postrm
@@ -0,0 +1,27 @@
+#!/bin/sh
+# postrm script for kboot-utils
+#
+# see: dh_installdeb(1)
+
+set -e
+
+case "$1" in
+    purge)
+        rm -f /etc/kboot.conf
+    ;;
+
+    remove|upgrade|failed-upgrade|abort-upgrade|abort-install)
+    ;;
+
+    *)
+        echo "postrm called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0

diff --git a/debian/rules b/debian/rules
new file mode 100755 (executable)
index 0000000..79fd842
--- /dev/null
+++ b/debian/rules
@@ -0,0 +1,8 @@
+#!/usr/bin/make -f
+# -*- makefile -*-
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+%:
+       dh $@ 

diff --git a/debian/source/format b/debian/source/format
new file mode 100644 (file)
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)

diff --git a/debian/update-kboot b/debian/update-kboot
new file mode 100755 (executable)
index 0000000..0a34ec1
--- /dev/null
+++ b/debian/update-kboot
@@ -0,0 +1,3 @@
+#!/bin/sh
+set -e
+exec kboot-mkconfig -o /etc/kboot.conf "$@"

diff --git a/debian/update-kboot.8 b/debian/update-kboot.8
new file mode 100644 (file)
index 0000000..94a92cb
--- /dev/null
+++ b/debian/update-kboot.8
@@ -0,0 +1,14 @@
+.\" Copyright 2011 Antonio Ospite
+.\" Lincensed under GPL3+
+.TH UPDATE-KBOOT "8" "April 2011"
+.SH NAME
+update-kboot \- stub for kboot-mkconfig
+.SH SYNOPSIS
+.B update-kboot
+.SH DESCRIPTION
+.B update-kboot
+is a stub for running
+.B kboot-mkconfig -o /etc/kboot.cfg
+to generate a kboot config file.
+.SH "SEE ALSO"
+.BR kboot-mkconfig (8)