Michael Raskin
bbd9f55947
Improve escaping (process backtick) and remove trailing spaces
2014-11-04 13:00:25 +03:00
Georges Dubus
d7af81d2dc
Make travis use "nox-review pr"
...
This should put an end to all the false rebuilds reported by travis.
2014-10-31 14:49:51 +01:00
wmertens
e20e0470bf
travis build: oops
...
Evaluation is too long - shouldn't have removed /dev/nulling
I wish I had a travis test environment :sad:
2014-10-15 18:50:28 +02:00
wmertens
b084b39375
travis build: Revert silly idea
...
nox-review should review against master, it's travis that should check out a hydra-available master commit to set the PR on. Perhaps we could rebase the current HEAD on the hydra-built commitish instead?
2014-10-15 18:45:13 +02:00
wmertens
5e6b6df33e
Travis build: source environment before build
...
💩
2014-10-15 11:52:23 +02:00
Wout Mertens
3de73cb77d
Travis: Make it work with non-PR
2014-10-15 11:23:34 +02:00
Wout Mertens
0083284ad8
Travis: chop build in install and build phases
...
This allows us to see how long install takes.
Also, build from hydra binaries as much as possible.
2014-10-15 11:05:12 +02:00
wmertens
e6d15e9d28
travis build: Silence git
...
Last one I promise 😁
2014-10-14 15:00:56 +02:00
wmertens
e3563e6c23
travis build: More silence
2014-10-14 14:54:14 +02:00
wmertens
9fc5cc6576
travis build: Make curl silent (but report errors)
2014-10-14 14:31:43 +02:00
Michael Raskin
3d75833956
Update vanity counter. Now with GitHub username support
2014-10-12 23:05:27 +04:00
Michael Raskin
6465d684b8
Improve name quoting to correctly handle underscore
2014-10-12 23:05:27 +04:00
Georges Dubus
4d246d00e5
Made the travis build check the metadata
2014-10-07 15:59:37 +02:00
Michael Raskin
81b766bd95
Fix local filename in vanity counter
2014-10-07 16:25:33 +04:00
Aristid Breitkreuz
f7e83a32ad
make vanity script less spammy
2014-10-05 16:16:56 +02:00
Michael Raskin
ca626ea96d
A small vanity counter for finding top-grossing committers
2014-09-30 23:11:19 +04:00
Georges Dubus
af2199e9ad
Fixes to the travis script
...
- Build 4 jobs at a time (might help with the timeout)
- Be quiet with pip (should make the output more readable)
2014-09-23 14:31:01 +02:00
Domen Kožar
363aef7fd0
travis-nox-review: build tarball job as evaluation test
2014-09-23 14:23:01 +02:00
Georges Dubus
5ab79f6090
Review PR in travis with nox-review
2014-09-21 21:17:56 +02:00
Eelco Dolstra
6479d6fea4
Remove broken script
2014-07-30 10:23:05 +02:00
Eelco Dolstra
b6569c8497
copy-tarballs.pl: Create base-32 symlinks
2014-05-22 12:11:53 +02:00
Eelco Dolstra
4de6357776
Remove mysterious line
2014-05-01 10:43:07 +02:00
Eelco Dolstra
bdb658d033
nixpkgs-lint: Tweak
2014-03-31 19:49:01 +02:00
Eelco Dolstra
7a51e17775
Fix updating of the tarball mirror
2014-02-19 13:58:42 +01:00
Eelco Dolstra
3293421dd3
Fix references to pkgs/lib
2013-10-10 13:28:22 +02:00
Eelco Dolstra
2a5098384e
Make eval-release.nix less picky
...
It now only checks that each derivation's drvPath attribute evaluates.
Previously it checked everything (via toXML) but that causes
derivations with dubious passthru attribute to fail (see commit
70fee5da11
).
2013-10-06 00:21:28 +02:00
Bjørn Forsman
decad1fc7d
nixpkgs-lint: add check for meta.platforms attribute
2013-09-07 20:43:07 +02:00
Eelco Dolstra
f3a17b04e6
nixpkgs-lint: Warn against capitalised package names and missing versions
2013-07-30 16:52:12 +02:00
Eelco Dolstra
7c38b9d3bc
nixpkgs-lint: Fix priority check
2013-07-30 16:52:11 +02:00
Eelco Dolstra
74c52ac8ad
nixpkgs-lint: Add support for filtering by maintainer
...
For instance, you can now say "nixpkgs-lint -m alice" to show only
packages maintained by Alice.
Also added command-line parsing.
2013-07-30 12:05:36 +02:00
Eelco Dolstra
6b495e9251
Add nixpkgs-lint
...
This is a simple tool to scan Nixpkgs for violations of the packaging
guidelines, such as multiple packages with the same name, packages
that lack a description or license, and so on.
To use:
$ nix-env -i nixpkgs-lint
$ cd .../nixpkgs
$ nixpkgs-lint
Current statistics:
Number of packages: 8666
Number of missing maintainers: 3711
Number of missing licenses: 6159
Number of missing descriptions: 1337
Number of bad descriptions: 633
Number of name collisions: 277
2013-07-25 23:52:36 +02:00
Eelco Dolstra
01294254a0
nix-generate-from-cpan: Handle META.json
...
Fixes #761 .
2013-07-16 13:45:24 +02:00
Eelco Dolstra
15c1ca9d21
nix-generate-from-cpan: Hack to handle non-UTF-8 META.yml files
2013-06-16 18:34:32 +02:00
Eelco Dolstra
629daa2102
Rewrite the CPAN generator to Perl
...
Also:
- It's now installable by doing "nix-env -i nix-generate-from-cpan".
- It maps dependencies to the correct attribute (e.g. HTML::HeadParser
is mapped to HTMLParser).
- It automatically selects buildPerlPackage or buildPerlModule.
- It's documented in the manual.
2013-06-13 15:56:23 +02:00
Eelco Dolstra
fca2f04bb1
Make the location of the tarballs cache configurable
2013-06-04 12:45:12 +02:00
Shea Levy
f3f3a728f6
generate-cpan-package: Don't hard-code Eelco's environment
...
Signed-off-by: Shea Levy <shea@shealevy.com>
2013-03-27 16:35:42 -04:00
Eelco Dolstra
f135b6e530
Fix comment
2013-03-26 12:09:02 +01:00
Eelco Dolstra
993fc7206d
eval-release.nix: Handle the new job structure
...
Now that we don't need to pass "system" arguments anymore, this thing
is *almost* obsolete. (Except for the need to handle assertion
failures, you could just do "nix-instantiate --eval-only ..." on
release.nix.)
2013-03-26 11:59:00 +01:00
Eelco Dolstra
427b8cacf3
Add very hacky script to generate Perl packages
...
Given the name of Perl module, this script will download the package
containing the module from CPAN, determine its dependencies, and print
a Nix expression suitable for inclusion in perl-packages.nix on
stdout.
Example:
$ ./maintainers/scripts/generate-cpan-package DBIx::Class
DBIxClass = buildPerlPackage {
name = "DBIx-Class-0.08205";
src = fetchurl {
url = mirror://cpan/authors/id/F/FR/FREW/DBIx-Class-0.08205.tar.gz;
sha256 = "16iyrfvwf4y94wxpwlla131grdf10z4xx9q9s6jsi39ycaxdaj6l";
};
buildInputs = [ DBDSQLite PackageStash TestException TestWarn ];
propagatedBuildInputs = [ ClassAccessorGrouped ClassC3Componentised ClassInspector ConfigAny ContextPreserve DataCompare DataDumperConcise DataPage DBI DevelGlobalDestruction HashMerge ModuleFind Moo MROCompat namespaceclean PathClass ScopeGuard SQLAbstract SubName TryTiny ];
meta = {
homepage = http://www.dbix-class.org/ ;
description = "Extensible and flexible object <-> relational mapper.";
license = "perl";
};
};
2013-01-28 12:11:32 +01:00
Eelco Dolstra
f615e304bb
Handle more bad characters
2013-01-15 18:15:33 +01:00
Eelco Dolstra
eeda226b02
Merge branch 'master' into systemd
2013-01-15 12:11:07 +01:00
Eelco Dolstra
ee19b41203
Update the tarball mirroring scripts
2013-01-15 11:18:42 +01:00
Eelco Dolstra
0731cd042c
eval-release.nix: Handle exceptions properly
2013-01-14 23:28:58 +01:00
Eelco Dolstra
72684fb42f
Remove support for the obsolete powerpc-darwin and i686-darwin platforms
2012-11-29 14:10:49 +01:00
Eelco Dolstra
6552ea2ddb
svn path=/nixpkgs/trunk/; revision=32961
2012-03-09 17:53:04 +00:00
Eelco Dolstra
a736ed4e66
* Split off copy-tarball.sh from copy-tarballs.sh. The former mirrors a single URL.
...
svn path=/nixpkgs/trunk/; revision=32960
2012-03-09 17:29:17 +00:00
Yury G. Kudryashov
a41d989a1e
svn merge ^/nixpkgs/trunk
...
svn path=/nixpkgs/branches/stdenv-updates/; revision=32093
2012-02-06 23:08:11 +00:00
Yury G. Kudryashov
5b132f6e96
svn merge ^/nixpkgs/trunk
...
Conflicts: cups, all-packages.nix (gcc45_debug)
svn path=/nixpkgs/branches/stdenv-updates/; revision=31863
2012-01-26 15:27:03 +00:00
Yury G. Kudryashov
954c8cdac1
test-eval-release: handle ENV{VERBOSE}.
...
See test-eval-release.sh for details.
svn path=/nixpkgs/trunk/; revision=31824
2012-01-24 19:10:54 +00:00
Yury G. Kudryashov
0c79434ccb
svn merge ^/nixpkgs/trunk
...
svn path=/nixpkgs/branches/stdenv-updates/; revision=31567
2012-01-14 21:34:37 +00:00
Eelco Dolstra
d62848cd2c
* eval-release.nix: force nix-instantiate to include nested attribute
...
sets.
svn path=/nixpkgs/trunk/; revision=31500
2012-01-12 16:59:58 +00:00
Yury G. Kudryashov
9ee0a9df9b
svn merge ^/nixpkgs/trunk
...
A few trivial conflicts
svn path=/nixpkgs/branches/stdenv-updates/; revision=31434
2012-01-08 16:01:12 +00:00
Yury G. Kudryashov
ac911fce68
Fix XaraLX, add debian-patches.sh
...
svn path=/nixpkgs/trunk/; revision=31358
2012-01-06 18:13:11 +00:00
Yury G. Kudryashov
900c6e18cd
svn merge ^/nixpkgs/trunk
...
Conflicts: openssl, libplist
svn path=/nixpkgs/branches/stdenv-updates/; revision=31337
2012-01-06 01:07:45 +00:00
Yury G. Kudryashov
27e639b5b2
gnome-latest.sh: don't use fetchurl_gnome
...
Output both name and src instead of using fetchurl_gnome
svn path=/nixpkgs/trunk/; revision=31332
2012-01-06 00:54:52 +00:00
Yury G. Kudryashov
b077940b3b
svn merge https://nixos.org/repos/nix/nixpkgs/trunk
...
No conflicts
svn path=/nixpkgs/branches/stdenv-updates/; revision=30916
2011-12-15 19:16:38 +00:00
Ludovic Courtès
de2e9e6ab0
gnupdate: Really select `stdenv' packages when asked for it.
...
* maintainers/scripts/gnu/gnupdate (gnupdate)[selected-gnu-packages]:
Really limit to `stdenv' when ask for it.
svn path=/nixpkgs/trunk/; revision=30869
2011-12-13 16:11:02 +00:00
Eelco Dolstra
eda3fd1730
* Sync with the trunk.
...
svn path=/nixpkgs/branches/stdenv-updates/; revision=30852
2011-12-12 16:54:35 +00:00
Ludovic Courtès
fa135fc655
gnupdate: Remove quirks for GNUnet.
...
* maintainers/scripts/gnu/gnupdate (ftp-server/directory)[quirks]:
Remove GNUnet.
(nixpkgs->gnu-name)[quirks]: Likewise.
svn path=/nixpkgs/trunk/; revision=30724
2011-12-04 13:48:57 +00:00
Ludovic Courtès
dee4d2f6af
gnupdate: Support signatures with expired keys.
...
* maintainers/scripts/gnu/gnupdate (gnupg-verify)[expkeysig-rx]: New
variable. Recognize signatures with expired keys.
(gnupg-status-good-signature?): Recognize `expired-key-signature' as good.
svn path=/nixpkgs/trunk/; revision=30667
2011-12-01 22:44:04 +00:00
Peter Simons
69488d688d
synchronize with trunk
...
svn path=/nixpkgs/branches/stdenv-updates/; revision=30186
2011-11-02 10:28:32 +00:00
Ludovic Courtès
3419ae4fdd
gnupdate: Handle GnuPG-related packages.
...
* maintainers/scripts/gnu/gnupdate (gnu?): Check `gnupg.org'.
(ftp-server/directory)[quirks]: Add libassuan.
svn path=/nixpkgs/trunk/; revision=30176
2011-11-01 22:38:09 +00:00
Ludovic Courtès
573c9178b5
gnupdate: Make `nix-prefetch-url' memoizing.
...
* maintainers/scripts/gnu/gnupdate (memoize): New procedure.
(nix-prefetch-url): Use it.
svn path=/nixpkgs/trunk/; revision=30109
2011-10-30 00:00:20 +00:00
Ludovic Courtès
354b1a12c1
gnupdate: Fix auto-downloading of GPG keys.
...
* maintainers/scripts/gnu/gnupdate (gnupg-verify): Always return STATUS.
svn path=/nixpkgs/trunk/; revision=30108
2011-10-30 00:00:16 +00:00
Ludovic Courtès
2492fba29f
gnupdate: Add `--attribute' option.
...
* maintainers/scripts/gnu/gnupdate (open-nixpkgs): Add optional
ATTRIBUTE parameter; honor it.
(%options)["-A"]: New option.
(gnupdate)[nixpkgs->snix]: Add ATTRIBUTE parameter and pass it down to
`open-nixpkgs'.
[selected-gnu-packages]: New procedure.
Adjust callers accordingly.
svn path=/nixpkgs/trunk/; revision=30107
2011-10-30 00:00:11 +00:00
Eelco Dolstra
3cb8791cf9
* Backport the GCC xlibs dependency fix.
...
svn path=/nixpkgs/branches/stdenv-updates/; revision=30061
2011-10-27 16:50:00 +00:00
Yury G. Kudryashov
03e747c41a
Add a script to generate fetchurl_gnome args
...
svn path=/nixpkgs/trunk/; revision=29397
2011-09-20 16:18:04 +00:00
Ludovic Courtès
8a904741f8
gnupdate: Support `meta.homepage' as a string list.
...
* maintainers/scripts/gnu/gnupdate (gnu?): Improve type-checking of
`meta.homepage'; support string lists.
svn path=/nixpkgs/trunk/; revision=29315
2011-09-17 10:09:26 +00:00
Ludovic Courtès
7f6a997831
gnupdate: Exclude IceCat 3.x variants.
...
* maintainers/scripts/gnu/gnupdate (%ignored-package-attributes):
Augment.
svn path=/nixpkgs/trunk/; revision=29015
2011-09-04 23:06:11 +00:00
Ludovic Courtès
8e29f04bd4
gnupdate: Automatically download missing OpenPGP keys.
...
* maintainers/scripts/gnu/gnupdate (%gpg-command, %openpgp-key-server):
New variables.
(gnupg-verify, gnupg-status-good-signature?,
gnupg-status-missing-key?, gnupg-receive-keys, gnupg-verify*): New
procedures.
(fetch-gnu): Use `gnupg-verify*'.
svn path=/nixpkgs/trunk/; revision=29014
2011-09-04 23:06:07 +00:00
Ludovic Courtès
5545472461
gnupdate: Update the list of ignored packages.
...
* maintainers/scripts/gnu/gnupdate (%ignored-package-attributes):
Update.
svn path=/nixpkgs/trunk/; revision=28756
2011-08-22 17:38:57 +00:00
Ludovic Courtès
2943c2eb78
GNU GRUB 1.99.
...
svn path=/nixpkgs/trunk/; revision=27440
2011-06-13 20:52:32 +00:00
Ludovic Courtès
87a9719a36
gnupdate: Ignore GCC-related attributes.
...
* maintainers/scripts/gnu/gnupdate (%ignored-package-attributes): Add
GCC 4.6 and gfortran/gcj attributes.
svn path=/nixpkgs/trunk/; revision=26796
2011-04-12 08:05:41 +00:00
Ludovic Courtès
91e63f9cae
gnupdate: Handle `repeated' nodes referring to a drv not encountered yet.
...
* maintainers/scripts/gnu/gnupdate (xml-element->snix): Return an
`unresolved' node when the repeated derivation hasn't been encountered
yet.
(resolve): New procedure.
(xml->snix): Use it.
svn path=/nixpkgs/trunk/; revision=26790
2011-04-12 08:05:20 +00:00
Ludovic Courtès
cea90f43e4
gnupdate: Use (ice-9 format).
...
* maintainers/scripts/gnu/gnupdate: Use (ice-9 format).
svn path=/nixpkgs/trunk/; revision=26789
2011-04-12 08:05:16 +00:00
Ludovic Courtès
e0fa94d81f
Remove obsolete version of `gnupdate'.
...
svn path=/nixpkgs/trunk/; revision=26483
2011-03-23 21:56:12 +00:00
Ludovic Courtès
f8b9855727
gnupdate: Add quirks.
...
* maintainers/scripts/gnu/gnupdate (%ignored-package-attributes): Add
`gcc45_real' and `gcc45_realCross'.
(ftp-server/directory)[quirks]: Add `ucommon'.
svn path=/nixpkgs/trunk/; revision=26261
2011-03-10 16:27:43 +00:00
Ludovic Courtès
cc02933305
gnupdate: Improve error handling for pipes.
...
* maintainers/scripts/gnu/gnupdate (pipe-failed?): New procedure.
(nix-prefetch-url): Use it.
(gnupdate)[nixpkgs->snix]: New procedure.
Use it.
svn path=/nixpkgs/trunk/; revision=26160
2011-03-04 13:18:56 +00:00
Ludovic Courtès
918a142f2a
gnupdate: Update the list of ignored attributes.
...
* maintainers/scripts/gnu/gnupdate (%ignored-package-attributes):
Update.
svn path=/nixpkgs/trunk/; revision=26077
2011-02-23 17:36:24 +00:00
Ludovic Courtès
b70494961b
gnupdate: Display FTP exceptions more nicely.
...
* maintainers/scripts/gnu/gnupdate (releases): Display MESSAGE and ARGS
with ~S.
svn path=/nixpkgs/trunk/; revision=26076
2011-02-23 17:36:21 +00:00
Ludovic Courtès
7a99d54ca7
gnupdate: Handle recursive FTP directory structures; handle funky file names.
...
This patch allows projects with per-version sub-directories to be
handled (e.g., MIT Scheme, MyServer, IceCat, etc.) It also makes sure
alpha releases are discarded (e.g., "gnupg-2.1.0beta3") as well as
unrelated files (e.g., "TeXmacs-600dpi-fonts.tar.gz").
* maintainers/scripts/gnu/gnupdate (ftp-list): Return a list of entries
where each entry indicates the file type in addition to the file name.
(releases): Adjust accordingly. Recurse into sub-directories and
return a list of name/directory pairs. Catch `ftp-error' instead
of everything.
[release-rx]: Adjust to work with TeXmacs.
[alpha-rx]: New variable.
[sans-extension]: New procedure.
(latest-release): Adjust accordingly.
(%package-name-rx): New variable.
(package/version): Use it.
(packages-to-update): Adjust accordingly. Use the directory returned
by `latest-release'.
[unpack]: New procedure.
(fetch-gnu): Add a `directory' parameter; use it.
svn path=/nixpkgs/trunk/; revision=26075
2011-02-23 17:36:15 +00:00
Ludovic Courtès
ad32df1795
gnupdate: Add a quirk for Source-Highlight.
...
* maintainers/scripts/gnu/gnupdate (ftp-server/directory)[quirks]: Add
"source-highlight".
svn path=/nixpkgs/trunk/; revision=26074
2011-02-23 17:36:11 +00:00
Ludovic Courtès
e86ac7fc39
gnupdate: Fix the MIT Scheme quirk.
...
* maintainers/scripts/gnu/gnupdate (ftp-server/directory)[quirks]: Fix
the mit-scheme quirk.
svn path=/nixpkgs/trunk/; revision=26073
2011-02-23 17:36:07 +00:00
Ludovic Courtès
542d7424f0
gnupdate: Remove compatibility hack.
...
svn path=/nixpkgs/trunk/; revision=26000
2011-02-16 22:49:57 +00:00
Ludovic Courtès
e201d01ed0
GNUpdate: Add quirks.
...
* maintainers/scripts/gnu/gnupdate (ftp-server/directory)[quirks]: Add
"libzrtpcpp" and "libosip2".
svn path=/nixpkgs/trunk/; revision=25685
2011-01-24 22:29:29 +00:00
Lluís Batlle i Rossell
b48b2a7bb4
Merging from trunk. I solved some trivial merge conflicts.
...
svn path=/nixpkgs/branches/stdenv-updates/; revision=25188
2010-12-17 20:39:58 +00:00
Michael Raskin
ae0da179c7
Adding a script to use callPackage on a package not mentioned in the all-packages.nix
...
svn path=/nixpkgs/trunk/; revision=25138
2010-12-15 07:21:21 +00:00
Lluís Batlle i Rossell
6dc839d344
Merging from trunk. I resolved some conflicts; I hope that well.
...
svn path=/nixpkgs/branches/stdenv-updates/; revision=24429
2010-10-23 14:52:21 +00:00
Rob Vermaas
21de0b5f23
nixpkgs/maintainer/scripts: added hydra_eval_check script. need hydra_eval_jobs from hydra in PATH and should get absolute path to release.nix as argument
...
svn path=/nixpkgs/trunk/; revision=24396
2010-10-21 07:09:47 +00:00
Lluís Batlle i Rossell
cd4b54748a
Updating from trunk
...
svn path=/nixpkgs/branches/stdenv-updates/; revision=24038
2010-10-03 09:25:34 +00:00
Ludovic Courtès
bfbe1fadbd
gnupdate: Add quirks.
...
* maintainers/scripts/gnu/gnupdate (ftp-server/directory)[quirks]: Add
`freefont-ttf' and `gnu-ghostscript'.
svn path=/nixpkgs/trunk/; revision=23876
2010-09-20 20:46:37 +00:00
Lluís Batlle i Rossell
2c5de61327
Updating from trunk.
...
svn path=/nixpkgs/branches/stdenv-updates/; revision=23840
2010-09-17 19:10:21 +00:00
Ludovic Courtès
7ff37213b7
gnupdate: Update to new FFI.
...
* maintainers/scripts/gnu/gnupdate (pointer->procedure): New procedure.
svn path=/nixpkgs/trunk/; revision=23712
2010-09-10 11:50:06 +00:00
Ludovic Courtès
8f5831d26c
gnupdate: Add quirk for GNU Make.
...
* maintainers/scripts/gnu/gnupdate (nixpkgs->gnu-name)[quirks]: Add
`gnumake'.
svn path=/nixpkgs/branches/stdenv-updates/; revision=23276
2010-08-20 15:26:16 +00:00
Lluís Batlle i Rossell
f16353b6f2
Updated from trunk.
...
svn path=/nixpkgs/branches/stdenv-updates/; revision=23275
2010-08-20 13:41:12 +00:00
Ludovic Courtès
a69596b951
gnupdate: Use the latest FFI.
...
* maintainers/scripts/gnu/gnupdate (version-string>?): Use the new
`string->pointer', available in 1.9.12.
svn path=/nixpkgs/trunk/; revision=23253
2010-08-19 16:52:18 +00:00
Eelco Dolstra
7b9d03d596
* strictAttrs: return the original attribute set.
...
svn path=/nixpkgs/trunk/; revision=23252
2010-08-19 15:13:09 +00:00
Eelco Dolstra
1ac9dcd24d
* Fix eval-release.nix by testing whether all attributes of a
...
derivation evaluate inside the tryEval. This catches cases such as
aufs2-util, which fails due to an assertion in its dependency aufs2.
* Explicitly blacklist "xbursttools" because it gives some
evaluation error in cross-OpenSSL. No idea why, probably due to
some pass-through attribute.
svn path=/nixpkgs/trunk/; revision=23247
2010-08-19 12:37:10 +00:00
Michael Raskin
ab8a599e8c
Adding a script to use eval-release.nix for tests
...
svn path=/nixpkgs/trunk/; revision=23234
2010-08-18 16:37:46 +00:00
Lluís Batlle i Rossell
5417c720fd
Merging from trunk.
...
I tried to fix some trivial conflicts.
I don't know if I merged well some more difficult conflicts on openssl/darwin_patch
or haskell-platform.
svn path=/nixpkgs/branches/stdenv-updates/; revision=22878
2010-08-02 15:48:19 +00:00