diff options
-rw-r--r-- | AUTHORS | 30 | ||||
-rw-r--r-- | NEWS | 4 | ||||
-rw-r--r-- | README | 57 | ||||
-rw-r--r-- | README.devel | 76 | ||||
-rw-r--r-- | configure.ac | 2 | ||||
-rw-r--r-- | mount/README.mount | 3 | ||||
-rw-r--r-- | po/Makevars | 4 | ||||
-rw-r--r-- | po/ca.po | 4 | ||||
-rw-r--r-- | po/cs.po | 4 | ||||
-rw-r--r-- | po/da.po | 4 | ||||
-rw-r--r-- | po/de.po | 4 | ||||
-rw-r--r-- | po/es.po | 4 | ||||
-rw-r--r-- | po/et.po | 4 | ||||
-rw-r--r-- | po/fi.po | 4 | ||||
-rw-r--r-- | po/fr.po | 4 | ||||
-rw-r--r-- | po/id.po | 4 | ||||
-rw-r--r-- | po/it.po | 4 | ||||
-rw-r--r-- | po/ja.po | 4 | ||||
-rw-r--r-- | po/nl.po | 4 | ||||
-rw-r--r-- | po/pt_BR.po | 4 | ||||
-rw-r--r-- | po/ru.po | 4 | ||||
-rw-r--r-- | po/sl.po | 4 | ||||
-rw-r--r-- | po/sv.po | 4 | ||||
-rw-r--r-- | po/tr.po | 4 | ||||
-rw-r--r-- | po/uk.po | 4 | ||||
-rw-r--r-- | po/util-linux-ng.pot (renamed from po/util-linux.pot) | 7 | ||||
-rw-r--r-- | po/vi.po | 4 |
27 files changed, 190 insertions, 69 deletions
@@ -1,6 +1,26 @@ -Maintainer: Adrian Bunk <bunk@stusta.de> -Maintainer of flock: H. Peter Anvin <hpa@zytor.com> -Maintainer of getopt: Frodo Looijaard <frodol@dds.nl> -Maintainer of schedutils: Robert Love <rlove@rlove.org> -Maintainer of simpleinit: Richard Gooch <rgooch@atnf.csiro.au> + utils-linux-ng + (fork of util-linux, based on version 2.13-pre7) + +MAINTAINERS: + + Karel Zak <kzak@redhat.com> + + Maintainer of flock: H. Peter Anvin <hpa@zytor.com> + Maintainer of getopt: Frodo Looijaard <frodol@dds.nl> + Maintainer of schedutils: Robert Love <rlove@rlove.org> + Maintainer of simpleinit: Richard Gooch <rgooch@atnf.csiro.au> + +PAST MAINTAINERS: + + Maintainer of util-linux: Adrian Bunk <bunk@stusta.de> + Maintainer of util-linux: Andries E. Brouwer <aeb@cwi.nl> + + +CONTRIBUTORS: + + Bryan Henderson <bryanh@giraffe-data.com> + - original author of hwclock + + + <your name> <--- send a patch @@ -1,3 +1,7 @@ +util-linux-ng 2.13devel + +* <TODO: the changelog will be generated from git> + util-linux 2.13-pre7 * mount: default to cifs instead of smbfs for sources @@ -1,11 +1,50 @@ -util-linux is a random collection of Linux utilities -The stuff in the subdirectories mount, fdisk, disk-utils, text-utils, -misc-utils, schedutils, sys-utils, getopt-* should be rather -distribution-neutral, and installing it does no harm. -On the other hand, the stuff in login-utils defines initial boot-time -stuff, things that are done in different ways by different distributions. -If you install it, your machine may not boot anymore, or you may be -unable to login. + utils-linux-ng + (fork of util-linux, based on version 2.13-pre7) + + util-linux is a random collection of Linux utilities + + +MAILING LIST: + + E-MAIL: util-linux-ng@vger.kernel.org + URL: http://vger.kernel.org/vger-lists.html#util-linux-ng + + +NEUTRALITY: + + The stuff in util-linux-ng should be rather distribution-neutral. + No RPMs/DEBs/... are provided - get yours from your distributor. + + +DEPRECATED: + + The utils marked as deprecated will be removed in a future version of the + util-linux-ng. Please, prepare your distribution for this change. + + * boot-time stuff + + The stuff in login-utils defines initial boot-time stuff, things that + are done in different ways by different distributions. If you install + it, your machine may not boot anymore, or you may be unable to login. + + <TODO> + + +VERSION SCHEMA: + + Standard releases: + + <major>.<minor>.<maint> + + major = fatal and deep changes + minor = typical release with new fetures + maint = maintenance releases; bug fixes only + + Development releases: + + <major>.<minor><suffix> + + suffix = "devel" or "rc<N>" + -No RPMs are provided - get yours from your distributor. diff --git a/README.devel b/README.devel index 030d64c67..7ea70d5bb 100644 --- a/README.devel +++ b/README.devel @@ -2,20 +2,76 @@ Notes for util-linux-ng developers ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - * generated files are unwanted in SCM (git) and also very unwanted in your - patches. +AUTOTOOLS: - * "./autogen.sh" generates all necessary files (run it after checkout from - git) + * "./autogen.sh" generates all necessary files (run it after checkout from + git) - * "make mrproper" removes all generates files. You have to call "./autogen.sh" - after mrproper. + * "make mrproper" removes all generates files. You have to call autogen.sh + after mrproper. - * "make distclean" is subset of mrproper. It removes all unnecessary files, - but code is still possible recompile by "./configure; make" + * "make distclean" is subset of mrproper. It removes all unnecessary files, + but code is still possible recompile by "./configure; make" - * "make dist-gzip" (or -bzip2) creates tarball which is possible use without - autogen.sh + * "make dist-gzip" (or -bzip2) creates tarball which is possible use without + autogen.sh +PATCHES: + + * send your patches to the mailing list or to upstream maintainer + (see the AUTHORS file) + + * diff -u + + * dont include generated (autotools) stuff to your patches + + * patches are delivered via email only. Downloading them from internet + servers is a pain. + + * one patch per email, with the changelog in the body of the email. + + * Subject: [PATCH] subsystem: description + + * if someone else wrote the patch, they should be credited (and blamed) for it. + To communicate this, add a line: + + From: John Doe <jdoe@wherever.com> + + * add a Signed-off-by line: + + Signed-off-by: Foo Bar <fb@wherever.com> + + * there is a lot of really useful rules. Please, read: + + The perfect patch + http://www.zip.com.au/~akpm/linux/patches/stuff/tpp.txt + + + +SCM (source code management): + + URL: http://git.kernel.org/git/?p=utils/util-linux-ng/util-linux-ng.git + + + * maintenance branch(es) + - created for every <major>.<minor> release, branch name: v<major>.<minor> + + * master branch + - contains what are reasonably tested and ready to next release + - it's source for occasional snapshots or release candidates + - active development does not usually happen on "master" (except trivial + and non-invasive patches). + + * devel branch + - the status of this branch is: "it works for me". It means useful + but not well tested patches. + - for long-term development or invasive changes should be an active + development forked into a separate branch (topic branches) from the + tip of "master". + + * A new tag object is created for: + - every release, tag name: v<version> + - every public snapshot, tag name: s<version>-YYYYMMDD + diff --git a/configure.ac b/configure.ac index 299e50e29..5a0d44eaa 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -AC_INIT(util-linux, 2.13-pre7, bunk@stusta.de) +AC_INIT(util-linux-ng, 2.13devel, kzak@redhat.com) AC_PREREQ(2.59) diff --git a/mount/README.mount b/mount/README.mount index 3c256415c..c7f317c41 100644 --- a/mount/README.mount +++ b/mount/README.mount @@ -5,6 +5,7 @@ H.J. Lu <hlu@eecs.wsu.edu>, Rick Sladkey <jrs@world.std.com>, Stephen Tweedie <sct@dcs.ed.ac.uk>. Andries Brouwer <aeb@cwi.nl> +Adrian Bunk <bunk@stusta.de> -Presently maintained by Adrian Bunk <bunk@stusta.de>. +Presently in util-linux-ng maintained by Karel Zak <kzak@redhat.com>. diff --git a/po/Makevars b/po/Makevars index 03a156659..f6e320c3d 100644 --- a/po/Makevars +++ b/po/Makevars @@ -18,7 +18,7 @@ XGETTEXT_OPTIONS = --keyword=_ --keyword=N_ # or entity, or to disclaim their copyright. The empty string stands for # the public domain; in this case the translators are expected to disclaim # their copyright. -COPYRIGHT_HOLDER = Adrian Bunk <bunk@stusta.de> +COPYRIGHT_HOLDER = Karel Zak <kzak@redhat.com> # This is the email address or URL to which the translators shall report # bugs in the untranslated strings: @@ -34,7 +34,7 @@ COPYRIGHT_HOLDER = Adrian Bunk <bunk@stusta.de> # It can be your email address, or a mailing list address where translators # can write to without being subscribed, or the URL of a web page through # which the translators can contact you. -MSGID_BUGS_ADDRESS = Adrian Bunk <bunk@stusta.de> +MSGID_BUGS_ADDRESS = Karel Zak <kzak@redhat.com> # This is the list of locale categories, beyond LC_MESSAGES, for which the # message catalogs shall be used. It is usually empty. @@ -12,8 +12,8 @@ msgid "" msgstr "" "Project-Id-Version: util-linux 2.13-pre3\n" -"Report-Msgid-Bugs-To: Adrian Bunk <bunk@stusta.de>\n" -"POT-Creation-Date: 2006-03-06 00:12+0100\n" +"Report-Msgid-Bugs-To: Karel Zak <kzak@redhat.com>\n" +"POT-Creation-Date: 2007-01-04 13:19+0100\n" "PO-Revision-Date: 2005-09-17 13:40+0200\n" "Last-Translator: Josep Puigdemont <josep.puigdemont@gmail.com>\n" "Language-Team: Catalan <ca@dodds.net>\n" @@ -4,8 +4,8 @@ msgid "" msgstr "" "Project-Id-Version: util-linux-2.11d\n" -"Report-Msgid-Bugs-To: Adrian Bunk <bunk@stusta.de>\n" -"POT-Creation-Date: 2006-03-06 00:12+0100\n" +"Report-Msgid-Bugs-To: Karel Zak <kzak@redhat.com>\n" +"POT-Creation-Date: 2007-01-04 13:19+0100\n" "PO-Revision-Date: 2001-05-30 15:11+0200\n" "Last-Translator: Jiøí Pavlovský <pavlovsk@ff.cuni.cz>\n" "Language-Team: Czech <cs@li.org>\n" @@ -12,8 +12,8 @@ msgid "" msgstr "" "Project-Id-Version: util-linux 2.11y\n" -"Report-Msgid-Bugs-To: Adrian Bunk <bunk@stusta.de>\n" -"POT-Creation-Date: 2006-03-06 00:12+0100\n" +"Report-Msgid-Bugs-To: Karel Zak <kzak@redhat.com>\n" +"POT-Creation-Date: 2007-01-04 13:19+0100\n" "PO-Revision-Date: 2005-08-15 21:00+0200\n" "Last-Translator: Claus Hindsgaul <claus_h@image.dk>\n" "Language-Team: Danish <dansk@klid.dk>\n" @@ -43,8 +43,8 @@ msgid "" msgstr "" "Project-Id-Version: util-linux 2.13-pre6\n" -"Report-Msgid-Bugs-To: Adrian Bunk <bunk@stusta.de>\n" -"POT-Creation-Date: 2006-03-06 00:12+0100\n" +"Report-Msgid-Bugs-To: Karel Zak <kzak@redhat.com>\n" +"POT-Creation-Date: 2007-01-04 13:19+0100\n" "PO-Revision-Date: 2005-12-05 15:45+0100\n" "Last-Translator: Michael Piefel <piefel@informatik.hu-berlin.de>\n" "Language-Team: German <translation-team-de@lists.sourceforge.net>\n" @@ -12,8 +12,8 @@ msgid "" msgstr "" "Project-Id-Version: util-linux 2.12m\n" -"Report-Msgid-Bugs-To: Adrian Bunk <bunk@stusta.de>\n" -"POT-Creation-Date: 2006-03-06 00:12+0100\n" +"Report-Msgid-Bugs-To: Karel Zak <kzak@redhat.com>\n" +"POT-Creation-Date: 2007-01-04 13:19+0100\n" "PO-Revision-Date: 2004-12-22 01:31+0100\n" "Last-Translator: Santiago Vila Doncel <sanvila@unex.es>\n" "Language-Team: Spanish <es@li.org>\n" @@ -11,8 +11,8 @@ msgid "" msgstr "" "Project-Id-Version: util-linux 2.11r\n" -"Report-Msgid-Bugs-To: Adrian Bunk <bunk@stusta.de>\n" -"POT-Creation-Date: 2006-03-06 00:12+0100\n" +"Report-Msgid-Bugs-To: Karel Zak <kzak@redhat.com>\n" +"POT-Creation-Date: 2007-01-04 13:19+0100\n" "PO-Revision-Date: 2002-05-19 20:04GMT+0300\n" "Last-Translator: Meelis Roos <mroos@linux.ee>\n" "Language-Team: Estonian <et@li.org>\n" @@ -14,8 +14,8 @@ msgid "" msgstr "" "Project-Id-Version: util-linux 2.13-pre1\n" -"Report-Msgid-Bugs-To: Adrian Bunk <bunk@stusta.de>\n" -"POT-Creation-Date: 2006-03-06 00:12+0100\n" +"Report-Msgid-Bugs-To: Karel Zak <kzak@redhat.com>\n" +"POT-Creation-Date: 2007-01-04 13:19+0100\n" "PO-Revision-Date: 2005-08-06 19:35+0300\n" "Last-Translator: Lauri Nurmi <lanurmi@iki.fi>\n" "Language-Team: Finnish <translation-team-fi@lists.sourceforge.net>\n" @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: util-linux 2.13-pre5\n" -"Report-Msgid-Bugs-To: Adrian Bunk <bunk@stusta.de>\n" -"POT-Creation-Date: 2006-03-06 00:12+0100\n" +"Report-Msgid-Bugs-To: Karel Zak <kzak@redhat.com>\n" +"POT-Creation-Date: 2007-01-04 13:19+0100\n" "PO-Revision-Date: 2005-11-08 08:00-0500\n" "Last-Translator: Michel Robitaille <robitail@IRO.UMontreal.CA>\n" "Language-Team: French <traduc@traduc.org>\n" @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: util-linux 2.13-pre1\n" -"Report-Msgid-Bugs-To: Adrian Bunk <bunk@stusta.de>\n" -"POT-Creation-Date: 2006-03-06 00:12+0100\n" +"Report-Msgid-Bugs-To: Karel Zak <kzak@redhat.com>\n" +"POT-Creation-Date: 2007-01-04 13:19+0100\n" "PO-Revision-Date: 2006-02-04 08:30+0700\n" "Last-Translator: Arif E. Nugroho <arif_endro@yahoo.com>\n" "Language-Team: Indonesian <translation-team-id@lists.sourceforge.net>\n" @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: util-linux 2.13-pre6\n" -"Report-Msgid-Bugs-To: Adrian Bunk <bunk@stusta.de>\n" -"POT-Creation-Date: 2006-03-06 00:12+0100\n" +"Report-Msgid-Bugs-To: Karel Zak <kzak@redhat.com>\n" +"POT-Creation-Date: 2007-01-04 13:19+0100\n" "PO-Revision-Date: 2005-11-18 20:20+0000\n" "Last-Translator: Marco Colombo <m.colombo@ed.ac.uk>\n" "Language-Team: Italian <tp@lists.linux.it>\n" @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: util-linux 2.11n\n" -"Report-Msgid-Bugs-To: Adrian Bunk <bunk@stusta.de>\n" -"POT-Creation-Date: 2006-03-06 00:12+0100\n" +"Report-Msgid-Bugs-To: Karel Zak <kzak@redhat.com>\n" +"POT-Creation-Date: 2007-01-04 13:19+0100\n" "PO-Revision-Date: 2001-12-11 22:43+0900\n" "Last-Translator: Daisuke Yamashita <yamad@mb.infoweb.ne.jp>\n" "Language-Team: Japanese <ja@li.org>\n" @@ -19,8 +19,8 @@ msgid "" msgstr "" "Project-Id-Version: util-linux 2.13-pre2\n" -"Report-Msgid-Bugs-To: Adrian Bunk <bunk@stusta.de>\n" -"POT-Creation-Date: 2006-03-06 00:12+0100\n" +"Report-Msgid-Bugs-To: Karel Zak <kzak@redhat.com>\n" +"POT-Creation-Date: 2007-01-04 13:19+0100\n" "PO-Revision-Date: 2005-08-19 20:27+0100\n" "Last-Translator: Luk Claes <luk.claes@ugent.be>\n" "Language-Team: Dutch <vertaling@vrijschrift.org>\n" diff --git a/po/pt_BR.po b/po/pt_BR.po index 123fe5efe..997feb60a 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -13,8 +13,8 @@ msgid "" msgstr "" "Project-Id-Version: util-linux 2.11b\n" -"Report-Msgid-Bugs-To: Adrian Bunk <bunk@stusta.de>\n" -"POT-Creation-Date: 2006-03-06 00:12+0100\n" +"Report-Msgid-Bugs-To: Karel Zak <kzak@redhat.com>\n" +"POT-Creation-Date: 2007-01-04 13:19+0100\n" "PO-Revision-Date: 2001-05-24 16:03-03:00\n" "Last-Translator: Rodrigo Stulzer Lopes <rodrigo@conectiva.com.br>\n" "Language-Team: Brazilian Portuguese <ldp-br@bazar.conectiva.com.br>\n" @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: util-linux-2.13-pre2\n" -"Report-Msgid-Bugs-To: Adrian Bunk <bunk@stusta.de>\n" -"POT-Creation-Date: 2006-03-06 00:12+0100\n" +"Report-Msgid-Bugs-To: Karel Zak <kzak@redhat.com>\n" +"POT-Creation-Date: 2007-01-04 13:19+0100\n" "PO-Revision-Date: 2005-08-16 16:54+0300\n" "Last-Translator: Pavel Maryanov <acid_jack@ukr.net>\n" "Language-Team: Russian <ru@li.org>\n" @@ -12,8 +12,8 @@ msgid "" msgstr "" "Project-Id-Version: util-linux 2.13-pre6\n" -"Report-Msgid-Bugs-To: Adrian Bunk <bunk@stusta.de>\n" -"POT-Creation-Date: 2006-03-06 00:12+0100\n" +"Report-Msgid-Bugs-To: Karel Zak <kzak@redhat.com>\n" +"POT-Creation-Date: 2007-01-04 13:19+0100\n" "PO-Revision-Date: 2006-03-05 12:29+0200\n" "Last-Translator: Simon Mihevc <simonmihevc@email.si>\n" "Language-Team: Slovenian <translation-team-sl@lists.sourceforge.net>\n" @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: util-linux 2.12m\n" -"Report-Msgid-Bugs-To: Adrian Bunk <bunk@stusta.de>\n" -"POT-Creation-Date: 2006-03-06 00:12+0100\n" +"Report-Msgid-Bugs-To: Karel Zak <kzak@redhat.com>\n" +"POT-Creation-Date: 2007-01-04 13:19+0100\n" "PO-Revision-Date: 2004-12-26 20:42+0100\n" "Last-Translator: Christian Rose <menthos@menthos.com>\n" "Language-Team: Swedish <sv@li.org>\n" @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: util-linux 2.13-pre2\n" -"Report-Msgid-Bugs-To: Adrian Bunk <bunk@stusta.de>\n" -"POT-Creation-Date: 2006-03-06 00:12+0100\n" +"Report-Msgid-Bugs-To: Karel Zak <kzak@redhat.com>\n" +"POT-Creation-Date: 2007-01-04 13:19+0100\n" "PO-Revision-Date: 2005-08-17 12:06+0300\n" "Last-Translator: Nilgün Belma Bugüner <nilgun@buguner.name.tr>\n" "Language-Team: Turkish <gnu-tr-u12a@lists.sourceforge.net>\n" @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: util-linux 2.13-pre6\n" -"Report-Msgid-Bugs-To: Adrian Bunk <bunk@stusta.de>\n" -"POT-Creation-Date: 2006-03-06 00:12+0100\n" +"Report-Msgid-Bugs-To: Karel Zak <kzak@redhat.com>\n" +"POT-Creation-Date: 2007-01-04 13:19+0100\n" "PO-Revision-Date: 2005-11-30 10:45+0200\n" "Last-Translator: Maxim V. Dziumanenko <mvd@mylinux.com.ua>\n" "Language-Team: Ukrainian <translation-team-uk@lists.sourceforge.net>\n" diff --git a/po/util-linux.pot b/po/util-linux-ng.pot index 901cf6a4d..5de882ca9 100644 --- a/po/util-linux.pot +++ b/po/util-linux-ng.pot @@ -1,5 +1,6 @@ # SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR Adrian Bunk <bunk@stusta.de> +# Copyright (C) 2005 Adrian Bunk <bunk@stusta.de> +# Copyright (C) 2006 Karel Zak <kzak@redhat.com> # This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. # @@ -7,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: Adrian Bunk <bunk@stusta.de>\n" -"POT-Creation-Date: 2006-03-06 00:12+0100\n" +"Report-Msgid-Bugs-To: Karel Zak <kzak@redhat.com>\n" +"POT-Creation-Date: 2007-01-04 13:19+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -5,8 +5,8 @@ msgid "" msgstr "" "Project-Id-Version: util-linux 2.12q\n" -"Report-Msgid-Bugs-To: Adrian Bunk <bunk@stusta.de>\n" -"POT-Creation-Date: 2006-03-06 00:12+0100\n" +"Report-Msgid-Bugs-To: Karel Zak <kzak@redhat.com>\n" +"POT-Creation-Date: 2007-01-04 13:19+0100\n" "PO-Revision-Date: 2005-04-05 00:53+0400\n" "Last-Translator: Phan Vinh Thinh <teppi82@gmail.com>\n" "Language-Team: Vietnamese <gnomevi-list@lists.sourceforge.net>\n" |