[Glibc-bsd-commits] r2288 - in trunk/freebsd-utils/debian: . po
aurel32 at alioth.debian.org
aurel32 at alioth.debian.org
Wed Aug 6 18:15:20 UTC 2008
Author: aurel32
Date: 2008-08-06 18:15:20 +0000 (Wed, 06 Aug 2008)
New Revision: 2288
Added:
trunk/freebsd-utils/debian/kbdcontrol.templates
trunk/freebsd-utils/debian/po/
trunk/freebsd-utils/debian/po/POTFILES.in
trunk/freebsd-utils/debian/po/templates.pot
Removed:
trunk/freebsd-utils/debian/kbdcontrol.templates.in
Modified:
trunk/freebsd-utils/debian/changelog
trunk/freebsd-utils/debian/control
trunk/freebsd-utils/debian/copyright
trunk/freebsd-utils/debian/freebsd-utils.init.d
trunk/freebsd-utils/debian/kbdcontrol.config
trunk/freebsd-utils/debian/module-init-tools.templates
trunk/freebsd-utils/debian/rules
Log:
* Build-depends on freebsd-buildutils instead of freebsd6-buildutils.
* debian/*.templates: rewrite short descriptions to comply with
debian-policy.
* debian/*.templates: use po-debconf.
Modified: trunk/freebsd-utils/debian/changelog
===================================================================
--- trunk/freebsd-utils/debian/changelog 2008-08-06 17:42:17 UTC (rev 2287)
+++ trunk/freebsd-utils/debian/changelog 2008-08-06 18:15:20 UTC (rev 2288)
@@ -7,8 +7,12 @@
[ Aurelien Jarno ]
* Depends on ufsutils to make sure it is installed on GNU/kFreeBSD
systems.
+ * Build-depends on freebsd-buildutils instead of freebsd6-buildutils.
+ * debian/*.templates: rewrite short descriptions to comply with
+ debian-policy.
+ * debian/*.templates: use po-debconf.
- -- Aurelien Jarno <aurel32 at debian.org> Wed, 06 Aug 2008 17:29:51 +0200
+ -- Aurelien Jarno <aurel32 at debian.org> Wed, 06 Aug 2008 18:29:00 +0200
freebsd-utils (7.0-2) unreleased; urgency=low
Modified: trunk/freebsd-utils/debian/control
===================================================================
--- trunk/freebsd-utils/debian/control 2008-08-06 17:42:17 UTC (rev 2287)
+++ trunk/freebsd-utils/debian/control 2008-08-06 18:15:20 UTC (rev 2288)
@@ -3,7 +3,7 @@
Priority: important
Maintainer: GNU/kFreeBSD Maintainers <debian-bsd at lists.debian.org>
Uploaders: Aurelien Jarno <aurel32 at debian.org>, Guillem Jover <guillem at debian.org>
-Build-Depends: cdbs, debhelper (>= 4.1.0), quilt, freebsd6-buildutils, libkvm-dev (>=7.0), libbsd-dev (>= 0.0-1.2), libc0.1-dev (>= 2.7-13), flex | flex-old, kfreebsd-kernel-headers (>= 0.29), libfreebsd-dev (>= 0.0-5), libipx-dev, libkiconv-dev, libgeom-dev, libdevstat-dev, libsbuf-dev
+Build-Depends: cdbs, debhelper (>= 4.1.0), quilt, po-debconf, freebsd-buildutils, libkvm-dev (>=7.0), libbsd-dev (>= 0.0-1.2), libc0.1-dev (>= 2.7-13), flex | flex-old, kfreebsd-kernel-headers (>= 0.29), libfreebsd-dev (>= 0.0-5), libipx-dev, libkiconv-dev, libgeom-dev, libdevstat-dev, libsbuf-dev
# libkvm-dev: dmesg
# libgeom-dev : ccdconfig
# libfreebsd (>= 0.0-5): ifconfig
Modified: trunk/freebsd-utils/debian/copyright
===================================================================
--- trunk/freebsd-utils/debian/copyright 2008-08-06 17:42:17 UTC (rev 2287)
+++ trunk/freebsd-utils/debian/copyright 2008-08-06 18:15:20 UTC (rev 2288)
@@ -3,8 +3,86 @@
It was downloaded from http://www.freebsd.org/
-Copyright Holder: The FreeBSD project.
+Upstream author:
+ The FreeBSD project.
+Copyright:
+ Copyright (c) 1980, 1983, 1988, 1989, 1991-1997, 2003
+ The Regents of the University of California. All rights reserved.
+ Copyright (c) 1989, 1997-1999 Carnegie Mellon University
+ Copyright (c) 1989 Stephen Deering
+ Copyright (c) 1990, 1992 Jan-Simon Pendry
+ Copyright (c) 1993, 1994 Christopher G. Demetriou
+ Copyright (c) 1993, 1994, 1995 The Australian National University
+ Copyright (c) 1993-1998 Sun Microsystems, Inc.
+ Copyright (c) 1993 University of Utah
+ Copyright (c) 1994-1995 Søren Schmidt
+ Copyright (c) 1994 Ugen J.S.Antsilevich
+ Copyright (c) 1995, 1996, 1997, 1998, and 1999 WIDE Project
+ Copyright (c) 1995 Eric Rosenquist, Strata Software Limited
+ Copyright (c) 1995 Jason R. Thorpe
+ Copyright (c) 1995 Pedro Roque Marques
+ Copyright (c) 1996-1999 Whistle Communications, Inc.
+ Copyright (c) 1996-2001 Brian Somers <brian at Awfulhak.org>
+ Copyright (c) 1996 Alex Nash, Paul Traina
+ Copyright (c) 1997 Carsten Bormann <cabo at cs.tu-berlin.de>
+ Copyright (c) 1997 Dave Rand <dlr at bungi.com>/<dave_rand at novell.com>
+ Copyright (c) 1997 Doug Rabson
+ Copyright (c) 1997 FreeBSD Inc.
+ Copyright (c) 1997 Gabor Kincses <gabor at acm.org>
+ Copyright (c) 1997 Ian Donaldson <iand at labtam.labtam.oz.au>
+ Copyright (c) 1997 Peter Wemm
+ Copyright (c) 1998-2003 Sony Computer Science Laboratories Inc.
+ Copyright (c) 1998-2007 Bob Beck (beck at openbsd.org>
+ Copyright (c) 1998 Yes Interactive
+ Copyright (c) 1999 Bill Paul <wpaul at ctr.columbia.edu>
+ Copyright (c) 1999 Internet Business Solutions Ltd., Switzerland
+ Copyright (c) 1999, 2000 Semen Ustimenko <semenu at FreeBSD.org>
+ Copyright (c) 1999 Tommi Komulainen <Tommi.Komulainen at iki.fi>
+ Copyright (c) 2000, 2003, 2004, 2005 Robert N. M. Watson
+ Copyright (c) 2000-2004 Niels Provos <provos at citi.umich.edu>
+ Copyright (c) 2000 David Malone
+ Copyright (c) 2000 Dug Song <dugsong at monkey.org>
+ Copyright (c) 2000 Jakob Stoklund Olesen <stoklund at taxidriver.dk>
+ Copyright (c) 1996, 2000, 2003 Poul-Henning Kamp
+ Copyright (c) 2000 Ruslan Ermilov
+ Copyright (c) 2001, 2003 Can Erkin Acar
+ Copyright (c) 2001-2007, by Weongyo Jeong
+ Copyright (c) 2001 Charles Mott <cm at linktel.net>
+ Copyright (c) 2001, 2002 Daniel Hartmeier
+ Copyright (c) 2001 Kjell Wooding
+ Copyright (c) 2001 Markus Friedl
+ Copyright (c) 2001 Networks Associates Technology, Inc.
+ Copyright (c) 2001 Peter Pentchev
+ Copyright (c) 2001 The Aerospace Corporation
+ Copyright (c) 2001 Theo de Raadt
+ Copyright (c) 2001 Tobias Weingartner
+ Copyright (c) 2001 Wasabi Systems, Inc.
+ Copyright (c) 2002, 2003 Henning Brauer <henning at openbsd.org>
+ Copyright (c) 2002-2003 Luigi Rizzo
+ Copyright (c) 2002 Cedric Berger
+ Copyright (c) 2002 Chris Kuethe (ckuethe at ualberta.ca)
+ Copyright (c) 2002 Jeroen Ruigrok van der Werven <asmodai at wxs.nl>
+ Copyright (c) 2002 Matthieu Herrb
+ Copyright (c) 2002 Michael Shalayeff
+ Copyright (c) 2002 Scott Long <scottl at FreeBSD.org>
+ Copyright (c) 2003-2004 Ryan McBride
+ Copyright (c) 2003 Anil Madhavapeddy <anil at recoil.org>
+ Copyright (c) 2003, 2004 Mike Frantzen <frantzen at w4g.org>
+ Copyright (c) 2004, 2005 Camiel Dobbelaar <cd at sentia.nl>
+ Copyright (c) 2004, 2006 Max Laier
+ Copyright (c) 2004 Alfred Perlstein <alfred at FreeBSD.org>
+ Copyright (c) 2004 Ted Unangst and Todd Miller
+ Copyright (c) 2005, 2006 Masanori Ozawa <ozawa at ongs.co.jp>, ONGS Inc.
+ Copyright (c) 2005 Christian S.J. Peron
+ Copyright (c) 2005 DLS Internet Services
+ Copyright (c) 2005 Jean-Sébastien Pédron
+ Copyright (c) 2005 joshua stein <jcs at openbsd.org>
+ Copyright (c) 2005 Nick Mathewson <nickm at freehaven.net>
+ Copyright (c) 2005 NTT Multimedia Communications Laboratories, Inc.
+ Copyright (c) 2006 Daichi Goto <daichi at freebsd.org>
+ Copyright (c) 2007 Bruce M. Simpson <bms at FreeBSD.org>
+
License:
Redistribution and use in source and binary forms, with or without
Modified: trunk/freebsd-utils/debian/freebsd-utils.init.d
===================================================================
--- trunk/freebsd-utils/debian/freebsd-utils.init.d 2008-08-06 17:42:17 UTC (rev 2287)
+++ trunk/freebsd-utils/debian/freebsd-utils.init.d 2008-08-06 18:15:20 UTC (rev 2288)
@@ -10,7 +10,16 @@
# Version: @(#)skeleton 1.9 26-Feb-2001 miquels at cistron.nl
#
-PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
+### BEGIN INIT INFO
+# Provides: freebsd-utils
+# Required-Start: $local_fs
+# Required-Stop:
+# Default-Start: S
+# Default-Stop:
+# Short-Description: FreeBSD kernel specific setup
+### END INIT INFO
+
+PATH=/sbin:/bin:/usr/sbin:/usr/bin
set -e
case "$1" in
Modified: trunk/freebsd-utils/debian/kbdcontrol.config
===================================================================
--- trunk/freebsd-utils/debian/kbdcontrol.config 2008-08-06 17:42:17 UTC (rev 2287)
+++ trunk/freebsd-utils/debian/kbdcontrol.config 2008-08-06 18:15:20 UTC (rev 2288)
@@ -2,7 +2,10 @@
set -e
+choices="be.iso.acc.kbd, be.iso.kbd, bg.bds.ctrlcaps.kbd, bg.phonetic.ctrlcaps.kbd, br275.cp850.kbd, br275.iso.acc.kbd, br275.iso.kbd, by.cp1131.kbd, by.cp1251.kbd, by.iso5.kbd, ce.iso2.kbd, cs.latin2.qwertz.kbd, cz.iso2.kbd, danish.cp865.kbd, danish.iso.kbd, dutch.iso.acc.kbd, el.iso07.kbd, estonian.cp850.kbd, estonian.iso15.kbd, estonian.iso.kbd, finnish.cp850.kbd, finnish.iso.kbd, fr_CA.iso.acc.kbd, fr.dvorak.acc.kbd, fr.dvorak.kbd, fr.iso.acc.kbd, fr.iso.kbd, fr.macbook.acc.kbd, german.cp850.kbd, german.iso.acc.kbd, german.iso.kbd, gr.elot.acc.kbd, gr.us101.acc.kbd, hr.iso.kbd, hu.iso2.101keys.kbd, hu.iso2.102keys.kbd, hy.armscii-8.kbd, icelandic.iso.acc.kbd, icelandic.iso.kbd, it.iso.kbd, iw.iso8.kbd, jp.106.kbd, jp.106x.kbd, jp.pc98.iso.kbd, jp.pc98.kbd, kk.pt154.io.kbd, kk.pt154.kst.kbd, latinamerican.iso.acc.kbd, latinamerican.kbd, lt.iso4.kbd, norwegian.dvorak.kbd, norwegian.iso.kbd, pl_PL.ISO8859-2.kbd, pt.iso.acc.kbd, pt.iso.kbd, ru.cp866.kbd, ru.iso5.kbd, ru.koi8-r.kbd, ru.koi8-r.shift.kbd, ru.koi8-r.win.kbd, si.iso.kbd, sk.iso2.kbd, spanish.iso15.acc.kbd, spanish.iso.acc.kbd, spanish.iso.kbd, swedish.cp850.kbd, swedish.iso.kbd, swissfrench.cp850.kbd, swissfrench.iso.acc.kbd, swissfrench.iso.kbd, swissgerman.cp850.kbd, swissgerman.iso.acc.kbd, swissgerman.iso.kbd, tr.iso9.q.kbd, ua.iso5.kbd, ua.koi8-u.kbd, ua.koi8-u.shift.alt.kbd, uk.cp850-ctrl.kbd, uk.cp850.kbd, uk.iso-ctrl.kbd, uk.iso.kbd, us.dvorak.kbd, us.dvorakl.kbd, us.dvorakr.kbd, us.dvorakx.kbd, us.emacs.kbd, us.iso.acc.kbd, us.iso.kbd, us.pc-ctrl.kbd, us.unix.kbd"
+
. /usr/share/debconf/confmodule
+db_subst kbdcontrol/keymap choices "$choices"
db_input high kbdcontrol/keymap || true
db_go
Added: trunk/freebsd-utils/debian/kbdcontrol.templates
===================================================================
--- trunk/freebsd-utils/debian/kbdcontrol.templates (rev 0)
+++ trunk/freebsd-utils/debian/kbdcontrol.templates 2008-08-06 18:15:20 UTC (rev 2288)
@@ -0,0 +1,9 @@
+Template: kbdcontrol/keymap
+Type: select
+Choices: ${choices}
+Default: none
+Description: Keymap:
+ You can choose a keymap in the list.
+ .
+ Note: If you don't know, don't select any yet. You can always come back to
+ this question with "dpkg-reconfigure kbdcontrol".
Deleted: trunk/freebsd-utils/debian/kbdcontrol.templates.in
===================================================================
--- trunk/freebsd-utils/debian/kbdcontrol.templates.in 2008-08-06 17:42:17 UTC (rev 2287)
+++ trunk/freebsd-utils/debian/kbdcontrol.templates.in 2008-08-06 18:15:20 UTC (rev 2288)
@@ -1,9 +0,0 @@
-Template: kbdcontrol/keymap
-Type: select
-Choices: none, @choices@
-Default: none
-Description: Keymap:
- You can choose a keymap in the list.
- .
- Note: If you don't know, don't select any yet. You can always come back to
- this question with "dpkg-reconfigure kbdcontrol".
Modified: trunk/freebsd-utils/debian/module-init-tools.templates
===================================================================
--- trunk/freebsd-utils/debian/module-init-tools.templates 2008-08-06 17:42:17 UTC (rev 2287)
+++ trunk/freebsd-utils/debian/module-init-tools.templates 2008-08-06 18:15:20 UTC (rev 2288)
@@ -1,7 +1,7 @@
Template: module-init-tools/network
Type: multiselect
Choices: ${choices}
-Description: Select your network card drivers
+_Description: Network card drivers:
Select the appropiate driver for your network cards. You may select more than
one driver, or none at all, depending on the number of cards you have.
.
@@ -12,7 +12,7 @@
Template: module-init-tools/sound
Type: multiselect
Choices: ${choices}
-Description: Select your sound card drivers
+_Description: Sound card drivers:
Select the appropiate driver for your sound cards. You may select more than
one driver, or none at all, depending on the number of cards you have.
.
@@ -23,7 +23,7 @@
Template: module-init-tools/other
Type: multiselect
Choices: ${choices}
-Description: Select other modules
+_Description: Other modules:
Below is a selection of modules that don't fall in either of the previous
cathegories. Select those you find adequate.
.
Added: trunk/freebsd-utils/debian/po/POTFILES.in
===================================================================
--- trunk/freebsd-utils/debian/po/POTFILES.in (rev 0)
+++ trunk/freebsd-utils/debian/po/POTFILES.in 2008-08-06 18:15:20 UTC (rev 2288)
@@ -0,0 +1,2 @@
+[type: gettext/rfc822deb] kbdcontrol.templates
+[type: gettext/rfc822deb] module-init-tools.templates
Added: trunk/freebsd-utils/debian/po/templates.pot
===================================================================
--- trunk/freebsd-utils/debian/po/templates.pot (rev 0)
+++ trunk/freebsd-utils/debian/po/templates.pot 2008-08-06 18:15:20 UTC (rev 2288)
@@ -0,0 +1,85 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL at ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: freebsd-utils at packages.debian.org\n"
+"POT-Creation-Date: 2008-08-06 18:27+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"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: multiselect
+#. Description
+#: ../module-init-tools.templates:1001
+msgid "Network card drivers:"
+msgstr ""
+
+#. Type: multiselect
+#. Description
+#: ../module-init-tools.templates:1001
+msgid ""
+"Select the appropiate driver for your network cards. You may select more "
+"than one driver, or none at all, depending on the number of cards you have."
+msgstr ""
+
+#. Type: multiselect
+#. Description
+#: ../module-init-tools.templates:1001
+msgid ""
+"Note: You most likely don't need any, since default kernels currently "
+"include builtin support for many NICs. You can always come back to this "
+"question later with \"dpkg-reconfigure module-init-tools\"."
+msgstr ""
+
+#. Type: multiselect
+#. Description
+#: ../module-init-tools.templates:2001
+msgid "Sound card drivers:"
+msgstr ""
+
+#. Type: multiselect
+#. Description
+#: ../module-init-tools.templates:2001
+msgid ""
+"Select the appropiate driver for your sound cards. You may select more than "
+"one driver, or none at all, depending on the number of cards you have."
+msgstr ""
+
+#. Type: multiselect
+#. Description
+#: ../module-init-tools.templates:2001
+msgid ""
+"Note: If you don't know, don't select any yet. Later, you can use the "
+"snd_probe command to find it out. You can always come back to this question "
+"with \"dpkg-reconfigure module-init-tools\"."
+msgstr ""
+
+#. Type: multiselect
+#. Description
+#: ../module-init-tools.templates:3001
+msgid "Other modules:"
+msgstr ""
+
+#. Type: multiselect
+#. Description
+#: ../module-init-tools.templates:3001
+msgid ""
+"Below is a selection of modules that don't fall in either of the previous "
+"cathegories. Select those you find adequate."
+msgstr ""
+
+#. Type: multiselect
+#. Description
+#: ../module-init-tools.templates:3001
+msgid ""
+"Note: If you don't know, don't select any yet. You can always come back to "
+"this question with \"dpkg-reconfigure module-init-tools\"."
+msgstr ""
Modified: trunk/freebsd-utils/debian/rules
===================================================================
--- trunk/freebsd-utils/debian/rules 2008-08-06 17:42:17 UTC (rev 2287)
+++ trunk/freebsd-utils/debian/rules 2008-08-06 18:15:20 UTC (rev 2288)
@@ -59,11 +59,11 @@
; do \
$(PMAKE) -C $(DEB_SRCDIR)/$$i ; \
done
- sed -e "s/@choices@/`cd $(DEB_SRCDIR)/share/syscons/keymaps && echo *.kbd | sed -e \"s/ /, /g\"`/g" \
- < debian/kbdcontrol.templates.in > debian/kbdcontrol.templates
+ sed -i -e "s/^choices=.*/choices=\"`cd $(DEB_SRCDIR)/share/syscons/keymaps && echo *.kbd | sed -e 's/ /, /g'`\"/g" \
+ debian/kbdcontrol.config
clean::
- rm -f debian/kbdcontrol.templates debian/stamp-sed
+ rm -f debian/stamp-sed
pre-build:: debian/stamp-sed
debian/stamp-sed: $(_cdbs_tarball_stamps)
More information about the Glibc-bsd-commits
mailing list