[pkg-fso-commits] [SCM] Debian packaging for uboot-envtools branch, udeb, updated. debian/20081215-2-10-g1ede6b8

[Per Andersson]

The following commit has been merged in the udeb branch:
commit 1ede6b81fd125cfa5751062d4ec798832638b554
Author: Per Andersson <avtobiff at gmail.com>
Date:   Wed Jun 23 23:36:09 2010 +0200

    configuration question is priority medium
    
    Conflicts:
    
    	debian/uboot-envtools.config

diff --git a/debian/TODO b/debian/TODO
index c94ea7e..0d8dc07 100644
--- a/debian/TODO
+++ b/debian/TODO
@@ -1,4 +1,3 @@
-* Use debconf to select /etc/fw_env.config from examples.
 * Spawn editor to edit environment. (Avoids problem with escaping
   characters on the commandline.)
 * Keep order of entries
diff --git a/debian/changelog b/debian/changelog
index 0aec6e8..cbc138f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,18 @@
+uboot-envtools (20081215-3) UNRELEASED; urgency=low
+
+  * debian/control: improved language in description.
+  * debian/control: bumped standards-version to 3.8.2.
+  * added templates for uboot-envtools configuration.
+  * added automatic configuration of uboot-envtools.
+  * lsmipsel.config: corrected device name (Closes: #540361).
+  * uboot-envtools.postinst: corrected Linkstation 2 name.
+  * Added directories to be created.
+  * Updated templates for uboot-envtools.
+  * Changed priority of automatic configuration question.
+  * Switched to semi-automatic configuration of machine.
+
+ -- Per Andersson <avtobiff at gmail.com>  Wed, 12 Aug 2009 14:58:18 +0200
+
 uboot-envtools (20081215-2) unstable; urgency=low
 
   * debian/control:
diff --git a/debian/po/POTFILES.in b/debian/po/POTFILES.in
index 8306e46..2dde745 100644
--- a/debian/po/POTFILES.in
+++ b/debian/po/POTFILES.in
@@ -1 +1,2 @@
+[type: gettext/rfc822deb] uboot-envtools.templates
 [type: gettext/rfc822deb] uboot-envtools-udeb.templates
diff --git a/debian/po/templates.pot b/debian/po/templates.pot
index 8ec40cf..8bf747e 100644
--- a/debian/po/templates.pot
+++ b/debian/po/templates.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: uboot-envtools at packages.debian.org\n"
-"POT-Creation-Date: 2009-07-30 13:43+0200\n"
+"POT-Creation-Date: 2010-06-23 21:04+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -16,6 +16,27 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#. Type: select
+#. Description
+#: ../uboot-envtools.templates:1001
+msgid "Device to automaticatically configure for"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../uboot-envtools.templates:1001
+msgid ""
+"The U-Boot boot loader has an environment stored on flash. The U-Boot "
+"environment tools needs to be configured in order to be able to read and "
+"modify this environment."
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../uboot-envtools.templates:1001
+msgid "Depending on device, automatic configuration can be possible."
+msgstr ""
+
 #. Type: text
 #. Description
 #: ../uboot-envtools-udeb.templates:1001
diff --git a/debian/rules b/debian/rules
index 931d0e2..6156979 100755
--- a/debian/rules
+++ b/debian/rules
@@ -45,6 +45,7 @@ binary-arch: build install
 	dh_testdir
 	dh_testroot
 	dh_installchangelogs
+	dh_installdebconf
 	dh_installdocs README
 	dh_installexamples
 	dh_install
diff --git a/debian/uboot-envtools-examples/lsmipsel.config b/debian/uboot-envtools-examples/lsmipsel.config
index 1ddddde..cb424c6 100644
--- a/debian/uboot-envtools-examples/lsmipsel.config
+++ b/debian/uboot-envtools-examples/lsmipsel.config
@@ -3,4 +3,4 @@
 # environment sector is assumed present.
 
 # MTD device name   Device offset   Env. size   Flash sector size
-/dev/mtd3           0x30000         0x10000     0x10000
+/dev/mtd0           0x30000         0x10000     0x10000
diff --git a/debian/uboot-envtools.config b/debian/uboot-envtools.config
new file mode 100644
index 0000000..5228061
--- /dev/null
+++ b/debian/uboot-envtools.config
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+set -e
+
+. /usr/share/debconf/confmodule
+
+[ ! -f /etc/fw_env.config ] || exit 0 # bail if already configured
+
+# select machine/file
+db_input medium uboot-envtools/machine || true
+db_go || true
+
+exit 0
diff --git a/debian/uboot-envtools.dirs b/debian/uboot-envtools.dirs
index d674702..5eff758 100644
--- a/debian/uboot-envtools.dirs
+++ b/debian/uboot-envtools.dirs
@@ -1,2 +1,4 @@
+usr/bin
 usr/sbin
 usr/share/doc/uboot-envtools/examples
+usr/share/uboot-envtools

-- 
Debian packaging for uboot-envtools