Commit graph

179 commits

Author SHA1 Message Date
Cillian de Róiste
a5e48c0f20 Python 3.3 upgrade to 3.3.1rc1 to fix an important bug for Nix
http://bugs.python.org/issue15833

When Python 3.3.0 attempts to compile python bytecode in the system
directories it raises and exception and stops. Since Python 3.3 is
only required by the latest Blender, I hope it's OK to use the RC
until the final release.
2013-03-28 01:10:23 +01:00
Peter Simons
270a0009be python3: update to version 3.3.0 2013-03-26 01:16:15 +01:00
Florian Friesdorf
870f4cca73 fix pythonWrapper for non-gnu ln 2013-03-25 15:13:08 +01:00
Vladimír Čunát
b1eeae8cac Merge branch 'master' into x-updates
Conflicts (easy):
	pkgs/desktops/xfce/core/xfdesktop.nix
	pkgs/development/libraries/cairo/default.nix
	pkgs/development/libraries/pango/default.nix
2013-03-17 11:28:28 +01:00
Florian Friesdorf
94f2013c0c pythonDocs: recurseIntoAttrs does not recurse, bypass problem 2013-03-13 13:16:03 +01:00
Vladimír Čunát
86639d9bb9 Merge branch 'master' into x-updates
Conflicts (taken master versions):
	pkgs/desktops/xfce-4.8/core/libxfcegui4.nix
	pkgs/desktops/xfce/applications/gigolo.nix
	pkgs/desktops/xfce/applications/mousepad.nix
	pkgs/desktops/xfce/applications/ristretto.nix
	pkgs/desktops/xfce/applications/terminal.nix
	pkgs/desktops/xfce/applications/xfce4-mixer.nix
	pkgs/desktops/xfce/applications/xfce4-notifyd.nix
	pkgs/desktops/xfce/applications/xfce4-taskmanager.nix
	pkgs/desktops/xfce/art/xfce4-icon-theme.nix
	pkgs/desktops/xfce/core/exo.nix
	pkgs/desktops/xfce/core/garcon.nix
	pkgs/desktops/xfce/core/gtk-xfce-engine.nix
	pkgs/desktops/xfce/core/libxfce4ui.nix
	pkgs/desktops/xfce/core/libxfce4util.nix
	pkgs/desktops/xfce/core/libxfcegui4.nix
	pkgs/desktops/xfce/core/thunar-volman.nix
	pkgs/desktops/xfce/core/thunar.nix
	pkgs/desktops/xfce/core/tumbler.nix
	pkgs/desktops/xfce/core/xfce4-appfinder.nix
	pkgs/desktops/xfce/core/xfce4-panel.nix
	pkgs/desktops/xfce/core/xfce4-power-manager.nix
	pkgs/desktops/xfce/core/xfce4-session.nix
	pkgs/desktops/xfce/core/xfce4-settings.nix
	pkgs/desktops/xfce/core/xfconf.nix
	pkgs/desktops/xfce/core/xfdesktop.nix
	pkgs/desktops/xfce/core/xfwm4.nix
	pkgs/desktops/xfce/panel-plugins/xfce4-cpufreq-plugin.nix
	pkgs/development/libraries/webkit/default.nix
	pkgs/top-level/all-packages.nix
2013-03-09 17:55:37 +01:00
Florian Friesdorf
b345bca3af pythonDocs: group in subfolders pythonXY/TYPE
I got it now - promised.
2013-03-05 12:41:30 +01:00
Florian Friesdorf
2e21e4fadc fix pythondocs (missing lib, doc instead of docs) 2013-03-05 12:28:48 +01:00
Florian Friesdorf
930e4d5391 pythonDocs: add meta.maintainers, subgroup attrset by doctype 2013-03-03 06:48:05 +01:00
Florian Friesdorf
06e4059f80 fix pythonDocs install path 2013-03-02 16:01:42 +01:00
Florian Friesdorf
0314b8b00f add python docs 2013-03-02 05:42:26 +01:00
Lluís Batlle i Rossell
bcbf9472ea Merge remote-tracking branch 'central/master' into x-updates 2013-02-18 13:49:11 +01:00
Vladimír Čunát
b3ce50d88a add python33 (needed by new blender) 2013-02-16 18:11:32 +01:00
Vladimír Čunát
dbcdc27e03 python3: fix libPrefix passthru 2013-02-16 18:10:43 +01:00
Florian Friesdorf
1a52c7659d python: fix linkme-wrapper 2013-02-15 06:14:58 +01:00
Florian Friesdorf
906be2ea98 python-linkme-wrapper: optimize some escaping 2013-02-05 20:12:28 +01:00
Florian Friesdorf
a63bb419f2 remove pythonhome-wrapper, python-linkme-wrapper is more flexible 2013-01-22 15:28:30 +01:00
Florian Friesdorf
1fa2e7f9a9 python-linkme-wrapper 2013-01-22 15:28:30 +01:00
Florian Friesdorf
212b4df91c recursivePthLoader included via wrapper, not propagated by modules 2013-01-11 09:53:28 +01:00
Florian Friesdorf
ee0204d2c8 for some reason the python2.6 manpage is not gzipped 2013-01-09 08:27:39 +01:00
Florian Friesdorf
723d5a5581 fix python-2.6 build: purity for systems with stdenv.gcc.libc
On other systems python26 will continue to look for
/usr/include/netinet/in.h among others. I don't know whether/what to
do about that.
2013-01-09 08:26:15 +01:00
Florian Friesdorf
16e2a9133f python-2.6.8: long overdue 2013-01-09 08:06:46 +01:00
Florian Friesdorf
838761cad2 python manpages as python2.6, python2.7 and python
see #68
2012-12-22 03:26:26 +01:00
Florian Friesdorf
3665e02901 python: make pdb.py available as bin/pdb and bin/pdb${python.majorVersion} 2012-07-20 21:43:14 +02:00
Eelco Dolstra
356ce12cd0 * Python 2.7.3 (including various security fixes).
svn path=/nixpkgs/branches/stdenv-updates/; revision=34008
2012-05-07 20:08:10 +00:00
Peter Simons
27de563164 Updated Python 3.x.
- updated to version 3.2.3
 - fixed version numbers in setup-hook.sh
 - sort input variable list alphabetically
 - tk support needs x11 support as well
 - deleted obsolete version 3.1

Furthermore, all CPPFLAGS and LDFLAGS required to find the build inputs are now
explicitly passed to ./configure. The python 3.x build systems tries to ignore
the environment as much as possible to provide deterministic builds. This means
that our magic environment variable stuff won't work, and previously built
python3 binaries lacked all kinds of extensions, such as zlib, etc.

svn path=/nixpkgs/trunk/; revision=33937
2012-04-27 08:20:46 +00:00
Ludovic Courtès
04600bbec1 Darwin: Add mig', lipo', etc. to `stdenvNative'.
Consequently, remove `darwinLipoUtility', `darwinArchUtility', etc.

svn path=/nixpkgs/trunk/; revision=33893
2012-04-23 15:47:31 +00:00
Eelco Dolstra
934ef8e3fc * Fix evaluation of pythonPackages.bugz.
svn path=/nixpkgs/trunk/; revision=33815
2012-04-17 15:31:44 +00:00
Yury G. Kudryashov
92f1b06907 This is sha256, not md5
svn path=/nixpkgs/branches/stdenv-updates/; revision=32715
2012-03-01 07:19:01 +00:00
Eelco Dolstra
b14a737a4d * Since we're rebuilding everything that depends on Python anyway, we
may as well update Python to the latest stable version.

svn path=/nixpkgs/branches/stdenv-updates/; revision=32675
2012-02-28 11:09:36 +00:00
Florian Friesdorf
ff37a57373 Revert "remove empty readonly site-packages"
This reverts commit 92b56e5686b06237c23ba41b6b8918ea643781dc.

svn path=/nixpkgs/branches/stdenv-updates/; revision=32674
2012-02-28 10:31:28 +00:00
Florian Friesdorf
4956884de5 Revert "do not propagate makeWrapper via pythonXYFull"
This reverts commit 3ee2667e4c60c2ed850da8538cf135fe7f716f30.

svn path=/nixpkgs/branches/stdenv-updates/; revision=32656
2012-02-28 00:07:33 +00:00
Florian Friesdorf
bf1fe3aa09 Revert "pysite support for pythonXYFull wrapper"
This reverts commit f77b9a16a9ef52951a601997593dc557a42660b9.

svn path=/nixpkgs/branches/stdenv-updates/; revision=32653
2012-02-28 00:07:23 +00:00
Florian Friesdorf
1d2e06e068 pysite support for pythonXYFull wrapper
svn path=/nixpkgs/branches/stdenv-updates/; revision=32593
2012-02-26 17:23:42 +00:00
Florian Friesdorf
1c504b49b4 remove empty readonly site-packages
svn path=/nixpkgs/branches/stdenv-updates/; revision=32590
2012-02-26 17:23:31 +00:00
Florian Friesdorf
95f0b6119c do not propagate makeWrapper via pythonXYFull
svn path=/nixpkgs/branches/stdenv-updates/; revision=32589
2012-02-26 17:23:28 +00:00
Florian Friesdorf
fe9d9530ba symlink python manpage for pythonXYFull
svn path=/nixpkgs/branches/stdenv-updates/; revision=32588
2012-02-26 17:23:25 +00:00
Florian Friesdorf
09ae58fcd7 python wrapper comment
svn path=/nixpkgs/branches/stdenv-updates/; revision=32587
2012-02-26 17:23:22 +00:00
Florian Friesdorf
8e32380a79 add PSFL, update python meta (license, maintainers, unify description)
svn path=/nixpkgs/branches/stdenv-updates/; revision=32585
2012-02-26 17:23:16 +00:00
Eelco Dolstra
f71dd91a43 * Apply r32435 from the trunk (always build Python with SSL support).
Remove .ssl references from some packages missed in that commit.

svn path=/nixpkgs/branches/stdenv-updates/; revision=32469
2012-02-21 23:35:35 +00:00
Eelco Dolstra
c556a6ea46 * "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless
function, so obsolete it.

svn path=/nixpkgs/branches/stdenv-updates/; revision=31644
2012-01-18 20:16:00 +00:00
Florian Friesdorf
0c32d209ca python wrapper that sets PYTHONHOME to the profile it is in
svn path=/nixpkgs/trunk/; revision=29462
2011-09-23 17:00:13 +00:00
Shea Levy
2cc9e52aec python-2.7: Attempt to fix the nixpkgs evaluation error
svn path=/nixpkgs/trunk/; revision=29327
2011-09-17 18:52:28 +00:00
Alexander Tsamutali
cca42b5cc0 development/interpreters/python/2.7: Fix building on Linux 3.x (iirc, that was the problem).
svn path=/nixpkgs/trunk/; revision=29325
2011-09-17 16:29:40 +00:00
Peter Simons
e4033547a3 python-2.7: fix sqlite3 impurity
The build expression for python contains code that patches all occurrences of
impure paths like "/usr" and "/opt" out of "setup.py". The same code must be
run when building a python module, too.

svn path=/nixpkgs/trunk/; revision=27164
2011-05-05 14:41:15 +00:00
Peter Simons
f0f900f41b pkgs/development/interpreters/python/2.7/default.nix: strip trailing whitespace
svn path=/nixpkgs/trunk/; revision=27163
2011-05-05 14:41:08 +00:00
Peter Simons
fa08bf65c4 python-2.7: Don't repeat the version number "2.7" in build instructions. Instead, use the variable ${majorVersion}.
svn path=/nixpkgs/trunk/; revision=27162
2011-05-05 14:41:02 +00:00
Cillian de Roiste
47d86a8371 Adding Python 3.2
svn path=/nixpkgs/trunk/; revision=26893
2011-04-19 18:10:15 +00:00
Eelco Dolstra
cf00c432ae * By popular demand, restore Python 2.6.
svn path=/nixpkgs/trunk/; revision=26726
2011-04-06 21:57:30 +00:00
Eelco Dolstra
566d5ab26e * Hackery to get Python to build on Cygwin.
svn path=/nixpkgs/branches/modular-python/; revision=26694
2011-04-05 14:29:11 +00:00
Eelco Dolstra
b9293b6c20 * `patch' on FreeBSD doesn't like paths with // in them.
svn path=/nixpkgs/branches/modular-python/; revision=26682
2011-04-04 15:48:58 +00:00
Eelco Dolstra
d449c4db98 * Remove Python 2.6, since the only remaining package that used it
(Calibre) also works with 2.7.

svn path=/nixpkgs/branches/modular-python/; revision=26561
2011-03-28 11:50:47 +00:00
Eelco Dolstra
8ca5d5d8b6 * Move python/2.7/modules.nix into python/2.7/default.nix. Also
remove the pythonModules attribute.  The built-in modules are now
  accessible as (e.g.) "python.modules.ssl" or "pythonPackages.ssl".

svn path=/nixpkgs/branches/modular-python/; revision=26559
2011-03-28 09:48:57 +00:00
Eelco Dolstra
a8334929f1 * Delete Python 2.4. It was only used by "zope", which doesn't even
build.

svn path=/nixpkgs/branches/modular-python/; revision=26350
2011-03-16 09:56:19 +00:00
Eelco Dolstra
b3667a1e8f * Sync with the trunk.
svn path=/nixpkgs/branches/modular-python/; revision=26347
2011-03-16 09:39:40 +00:00
Peter Simons
d23005c2f9 pkgs/development/interpreters/python/3.1: major simplification of the expression
This change allows 'python3' to be built with approximately the same features
as 'python27Full'.

svn path=/nixpkgs/trunk/; revision=25757
2011-02-02 11:17:06 +00:00
Peter Simons
775542900b pkgs/development/interpreters/python/3.1: enable parallel building
svn path=/nixpkgs/trunk/; revision=25754
2011-02-02 11:16:53 +00:00
Peter Simons
c60fad3978 pkgs/development/interpreters/python/3.1: added missing meta section attributes
svn path=/nixpkgs/trunk/; revision=25753
2011-02-02 11:16:49 +00:00
Peter Simons
4685f4b74e pkgs/development/interpreters/python/3.1/setup-hook.sh: fixed bogus version number
svn path=/nixpkgs/trunk/; revision=25752
2011-02-02 11:16:45 +00:00
Peter Simons
c80d448a64 pkgs/development/interpreters/python/3.1: updated to version 3.1.3
svn path=/nixpkgs/trunk/; revision=25751
2011-02-02 11:16:41 +00:00
Eelco Dolstra
dc1ac3c5d9 * Add some more Python modules.
svn path=/nixpkgs/branches/modular-python/; revision=25390
2011-01-04 16:10:28 +00:00
Eelco Dolstra
4a5042a1a1 * Python recompiles a Python if the mtime stored *in* the pyc/pyo file
differs from the mtime of the source file.  This doesn't work in Nix
  because Nix changes the mtime of files in the Nix store to 1.  So
  treat that as a special case.

  Yes, this should make Python programs faster.

svn path=/nixpkgs/branches/modular-python/; revision=25387
2011-01-04 15:10:03 +00:00
Eelco Dolstra
b7b1fc322a * Python 2.7: get rid of most dependencies.
svn path=/nixpkgs/branches/modular-python/; revision=25385
2011-01-04 14:47:36 +00:00
Eelco Dolstra
c1eb464f3c * Build those Python modules in the Python distribution that require
additional dependencies (e.g. SQLite, X11, or Tcl/Tk) outside the
  main Python package (i.e., pythonBase).  This makes pythonFull
  unnecessary: you can just pass the additional modules as
  buildInputs to packages that require them, e.g.

    buildInputs = [ pythonModules.sqlite3 ];

svn path=/nixpkgs/branches/modular-python/; revision=25364
2011-01-03 16:25:11 +00:00
Eelco Dolstra
e1309dee31 * Python 2.7.1.
svn path=/nixpkgs/trunk/; revision=25362
2011-01-03 15:52:48 +00:00
Peter Simons
3b94efffe5 pkgs/development/interpreters/python/2.5: removed obsolete python version 2.5
Python 2.5 is unused in nixpkgs -- 2.6 has been the default version for
quite a while.

svn path=/nixpkgs/trunk/; revision=23454
2010-08-26 12:09:42 +00:00
Peter Simons
0b529ff4d7 pkgs/development/interpreters/python/2.7: added various meta attributes
svn path=/nixpkgs/trunk/; revision=23228
2010-08-18 15:03:34 +00:00
Peter Simons
f01ceffb9e pkgs/development/interpreters/python/wrapper.nix: clean up debug code
svn path=/nixpkgs/trunk/; revision=23200
2010-08-17 10:17:32 +00:00
Peter Simons
9670fca780 Added "python-$version-wrapper" expression.
The python wrapper expression expects a list of Python modules, $extraLibs,
which are added to $PYTHONPATH before executing the actual Python interpreter.

svn path=/nixpkgs/trunk/; revision=23194
2010-08-16 17:03:35 +00:00
Peter Simons
3658a8b040 pkgs/development/interpreters/python/2.7/setup-hook.sh: fixed incorrect version number
svn path=/nixpkgs/trunk/; revision=23121
2010-08-11 17:05:44 +00:00
Peter Simons
2b37d181a5 Added Python version 2.7.
svn path=/nixpkgs/trunk/; revision=23117
2010-08-11 15:49:03 +00:00
Peter Simons
1a6039cb45 Enable parallel building of gcc, glibc, gmp, mpfr, ncurses, coreutils, perl, python, git, and qt4.
If a build expressions has set "enableParallelBuilding = true", then the
generic builder may utilize more than one CPU core to build that particular
expression. This feature works out of the box for GNU Make. Expressions that
use other build drivers like Boost.Jam or SCons have to specify appropriate
flags such as "-j${NIX_BUILD_CORES}" themselves.

svn path=/nixpkgs/trunk/; revision=23042
2010-08-08 18:51:42 +00:00
Michael Raskin
7c5e566c5c Cleaned up the unspecified-extra-argument calls where there is no way to access extra arguments. Tarball and full instantiation checks passed.
svn path=/nixpkgs/trunk/; revision=22539
2010-07-08 19:22:50 +00:00
Michael Raskin
ccc497f80d Make WebKit use libsoup 2.31.2 via deepOverride. Edit a few packages that were overridable but did not allow extra arguments. Remove a catch with deepOverride that pkgs.lib had this attribute in a different sense.
svn path=/nixpkgs/trunk/; revision=22529
2010-07-08 13:25:52 +00:00
Marc Weber
3303106e97 python: support ncurses, replace composedArgsAndFun by makeOverridable
because composedArgsAndFun didn't pass values to the builder

svn path=/nixpkgs/trunk/; revision=21686
2010-05-09 14:33:50 +00:00
Peter Simons
bba637c718 pkgs/development/interpreters/python/3.1: renamed this package to "python3"
Python version 3.x is really quite different from 2.x. Using a new name
for the package prevents Nix from performing unintended updates to the
3.x version.

svn path=/nixpkgs/trunk/; revision=21264
2010-04-23 10:42:29 +00:00
Marc Weber
8c0b7e4ad2 - adding experimental python31 build
- cleanup python libraries:
 * moving all python libraries into a attr set into a directory
   so that expressions can be used for both: python 2.5 and 2.6 easily
 * disabling packages which don't build

svn path=/nixpkgs/trunk/; revision=21142
2010-04-17 18:28:25 +00:00
Peter Simons
d791abd982 pkgs/development/interpreters/python/2.6: updated to version 2.6.5
svn path=/nixpkgs/trunk/; revision=20775
2010-03-23 09:34:52 +00:00
Lluís Batlle i Rossell
b14e1f31c9 Fixing the 'platforms' at python 2.6.
svn path=/nixpkgs/trunk/; revision=19602
2010-01-21 16:43:27 +00:00
Rob Vermaas
d8800474f7 x86_64 darwin related changes
svn path=/nixpkgs/trunk/; revision=18665
2009-11-27 10:16:42 +00:00
Peter Simons
4d675a283e pkgs/development/interpreters/python/2.6/default.nix: fixed build on Darwin
svn path=/nixpkgs/trunk/; revision=18136
2009-11-05 13:44:30 +00:00
Peter Simons
f9b71e1c54 pkgs/development/interpreters/python/2.6/default.nix: updated to version 2.6.4
svn path=/nixpkgs/trunk/; revision=18090
2009-11-04 10:29:43 +00:00
Peter Simons
90dd9d14bf python-2.6: fixed build on Darwin
* Dropped "nolongdouble.patch". The patch no longer applies to Python 2.6, and
   apparently isn't required anymore either.

 * Added access to native Darwin arch utility. Python tries to run 'arch' in
   the configure stage, but that binary reside in /usr/bin. To make it
   available to the expression, the small wrapper darwinArchUtility is added as
   a buildInput if appropriate.

 * Don't pass --enable-shared. The build fails if we try to enable building of
   shared libraries, apparently because some required libraries aren't linked,
   i.e. the linker call isn't right.

TODO:

 * Figure out how to enable shared linking.

 * The resulting binary on Darwin seem to lack the binascii module.

svn path=/nixpkgs/trunk/; revision=17894
2009-10-20 12:13:49 +00:00
Peter Simons
0b25624891 python 2.6.3: initial version of python 2.6 support
The build succeeds on i686-linux. Other platforms look good, too,
because there were hardly any changes necessary to update the expression
from 2.5.

svn path=/nixpkgs/trunk/; revision=17889
2009-10-19 23:10:09 +00:00
Eelco Dolstra
257ffc8e73 * Fix broken meta attributes.
svn path=/nixpkgs/trunk/; revision=17773
2009-10-13 09:39:27 +00:00
Ludovic Courtès
cb865a1ac1 Python 2.5: Add `passthru.platforms'.
svn path=/nixpkgs/trunk/; revision=17198
2009-09-16 14:42:56 +00:00
Rob Vermaas
685bb27c64 remove -Wno-long-double flag for python on darwin
svn path=/nixpkgs/trunk/; revision=16456
2009-07-24 14:51:04 +00:00
Marc Weber
2d99612b73 update python 2.4. It's only used by zope and even plone (beeing based
on zope) runs with this python version so it should be fine (?)

svn path=/nixpkgs/trunk/; revision=16293
2009-07-09 22:23:54 +00:00
Rob Vermaas
342d9834bf * -msse2 flag for python on i686-darwin
svn path=/nixpkgs/trunk/; revision=15914
2009-06-10 09:18:51 +00:00
Armijn Hemel
7445bc765c update python to 2.5.4
update scummvm to 0.13.1

svn path=/nixpkgs/trunk/; revision=15414
2009-04-30 14:01:25 +00:00
Eelco Dolstra
7689a348c4 * Got rid of a lot of "postInstall=postInstall" and similar lines in
builders.  These are redundant now.
* Inlined some trivial builders.
* Removed a few explicit setup-hook creations.  This is done
  automatically now if setupHook is set.
* Deleted the initscripts package.  NixOS doesn't use it anymore.

svn path=/nixpkgs/branches/stdenv-updates/; revision=15276
2009-04-23 13:31:10 +00:00
Eelco Dolstra
6b9ccbaf78 * setup.sh: turn on nullglob globally.
* setup.sh: removed some obsolete features, specifically some that
  were only used by the old build farm.
* addToSearchPath: removed some parameters that weren't used
  anywhere.

svn path=/nixpkgs/branches/stdenv-updates/; revision=15136
2009-04-18 22:22:51 +00:00
Michael Raskin
d6f1d7acb3 Added Tk support for Python
svn path=/nixpkgs/trunk/; revision=13526
2008-12-01 00:02:25 +00:00
Eelco Dolstra
4192f35202 * unixODBCDrivers needs sqlite.
svn path=/nixpkgs/trunk/; revision=12072
2008-06-13 09:44:43 +00:00
Michael Raskin
99c9108757 OpenSSL support for Python
svn path=/nixpkgs/trunk/; revision=11894
2008-05-26 12:27:17 +00:00
Michael Raskin
9d3b0a2cb7 Added bazaar tools (not installed globally, just copied to share, you have to symlink them to your ~/.bazaar/plugins). Also readline support for python.
svn path=/nixpkgs/trunk/; revision=11893
2008-05-26 11:39:08 +00:00
Michael Raskin
642ff45e22 Added codeville - a distributed revision control system with special efforts spent on merging. Heh, efforts into RCS availability seem to have side effects on Python side, too..
svn path=/nixpkgs/trunk/; revision=11891
2008-05-26 07:47:07 +00:00
Michael Raskin
26bdb2a619 Added option for SQLite support to Python2.5
svn path=/nixpkgs/trunk/; revision=11754
2008-05-06 07:01:34 +00:00
Ludovic Courtès
d0d98958d2 Python 2.5: Add GDBM support.
svn path=/nixpkgs/trunk/; revision=11485
2008-04-08 07:37:49 +00:00
Eelco Dolstra
26a152653d * Adde xpra. Doesn't quite work yet.
* Removed python_alts.

svn path=/nixpkgs/trunk/; revision=11161
2008-03-17 13:45:50 +00:00