Commit graph

618 commits

Author SHA1 Message Date
Yury G. Kudryashov 33796f3738 clucene: upgrade, kde4: remove
clucene-core upgraded to 0.9.20
clucene-contrib removed (can't find any version later than 0.9.16a and don't
know whether it's compatible with new clucene-core)
kde4: old staff removed, will add new tonight

svn path=/nixpkgs/trunk/; revision=9679
2007-11-14 23:37:51 +00:00
Yury G. Kudryashov 108d12cceb Strigi removed
I'll add a version from kdesupport trunk today

svn path=/nixpkgs/trunk/; revision=9678
2007-11-14 23:25:32 +00:00
Yury G. Kudryashov 16a5a77587 dbus-glib upgraded to 0.74, meta written
svn path=/nixpkgs/trunk/; revision=9677
2007-11-14 23:23:36 +00:00
Yury G. Kudryashov 7d1f30fd56 xine-lib: upgraded to 1.1.8
svn path=/nixpkgs/trunk/; revision=9676
2007-11-14 23:13:29 +00:00
Yury G. Kudryashov 763f3b0794 chmlib: upgraded to 0.39
svn path=/nixpkgs/trunk/; revision=9675
2007-11-14 23:11:37 +00:00
Yury G. Kudryashov a29cf805b7 Added facile library
svn path=/nixpkgs/trunk/; revision=9674
2007-11-14 23:05:11 +00:00
Yury G. Kudryashov c425763443 libgcrypt-1.3.1
svn path=/nixpkgs/trunk/; revision=9673
2007-11-14 23:03:29 +00:00
Eelco Dolstra 7a424b47f6 * Revert the setup hook changes on the trunk (but they remain on the
stdenv-updates branch).

svn path=/nixpkgs/trunk/; revision=9652
2007-11-12 13:51:46 +00:00
Mart Kolthof 93ce7c7a69 * added Haskell package gtk2hs
svn path=/nixpkgs/trunk/; revision=9651
2007-11-12 13:48:33 +00:00
Michael Raskin b39c62675d Added OpenSSL gmp propagation; libtool dependency to elinks
svn path=/nixpkgs/trunk/; revision=9646
2007-11-11 20:35:21 +00:00
Michael Raskin 86959dbe05 urkud asked to fix a broken meta..
svn path=/nixpkgs/trunk/; revision=9643
2007-11-11 17:20:06 +00:00
Yury G. Kudryashov 4916fc44e3 Added libidn
svn path=/nixpkgs/trunk/; revision=9640
2007-11-11 16:36:11 +00:00
Yury G. Kudryashov d931664daf Upgraded gnutls to 2.1.5
It is unused now, so I've removed the previous version.

svn path=/nixpkgs/trunk/; revision=9639
2007-11-11 16:31:11 +00:00
Yury G. Kudryashov dd9b911673 Added log4cxx library
svn path=/nixpkgs/trunk/; revision=9638
2007-11-11 16:22:29 +00:00
Yury G. Kudryashov 118560335c Added libzip
svn path=/nixpkgs/trunk/; revision=9637
2007-11-11 16:19:00 +00:00
Yury G. Kudryashov 9aea8727be Added lzo library
svn path=/nixpkgs/trunk/; revision=9636
2007-11-11 16:17:21 +00:00
Yury G. Kudryashov 2b07939b70 Openbabel added. There are some TODO's in its nix-expression.
svn path=/nixpkgs/trunk/; revision=9635
2007-11-11 16:15:29 +00:00
Yury G. Kudryashov 6203fa41f7 Added poppler and poppler-data
svn path=/nixpkgs/trunk/; revision=9633
2007-11-11 16:00:51 +00:00
Yury G. Kudryashov 17b0f144f7 qt-4 (kde version) upgrade, added libtiff to qt-4 dependencies
svn path=/nixpkgs/trunk/; revision=9632
2007-11-11 15:56:30 +00:00
Yury G. Kudryashov 913cc6983e speex upgrade, added libogg
svn path=/nixpkgs/trunk/; revision=9631
2007-11-11 15:53:25 +00:00
Yury G. Kudryashov 711180395a Added bzip2 to imlib2
svn path=/nixpkgs/trunk/; revision=9629
2007-11-11 15:49:28 +00:00
Eelco Dolstra 8b3190234c * Build ssmtp with TLS support.
* Added gnutls (but it turns out that ssmtp also builds with openssl,
  so I don't actually use it).

svn path=/nixpkgs/trunk/; revision=9604
2007-11-08 17:48:52 +00:00
Michael Raskin a8db1746a5 Fixed log nesting; added Qi.
svn path=/nixpkgs/trunk/; revision=9601
2007-11-08 14:34:54 +00:00
Eelco Dolstra b7f1b56b18 * X11R7.3.
svn path=/nixpkgs/trunk/; revision=9592
2007-11-05 23:59:55 +00:00
Marc Weber fff1ba967e New proposal on howto library dependencies could be handled.
Just install ghc68_wrapper which will install the required dependencies ghc
(and libraries) itself.
The list libraries given in the wrapper attribute set can be user tuned in the future ?
An alternative would be creating something similar to the gcc/g++ include/ lib/ scheme which
is could be used by ghc to find installed packages..

svn path=/nixpkgs/trunk/; revision=9581
2007-11-05 09:27:36 +00:00
Michael Raskin 7b1c9a7a82 Added Compiz Fusion (main plugins). Also some dependencies, and made wmii build under setup-new-2.sh also.
svn path=/nixpkgs/trunk/; revision=9577
2007-11-05 08:32:20 +00:00
Michael Raskin d352d54b11 Added a new setup proposal, builder is no more derived from shell script (where edit=glibc rebuild), but is composed from a nix attribute set with strings and dependencies - so if you add a function, old expressions ignore it; collateral damage are packages in this style: Fastest Fourier Transform in the West, Audacity sound editor, Falling Sand game. Also added string equality that ignores dependencies to lib. Note that hasSuffixHack is now the more predictable version, but hasSuffix is left to remind us to fix the bug.
svn path=/nixpkgs/trunk/; revision=9549
2007-10-29 10:52:04 +00:00
Michael Raskin 53a6d71842 Added MPFR; will be needed for gfortran, that doesn't work for now.
svn path=/nixpkgs/trunk/; revision=9526
2007-10-26 03:01:44 +00:00
Eelco Dolstra 6679941615 * aspell: hacked up a little patch to allow additional dictionary
directories to be specified through the environment variable
  ASPELL_EXTRA_DICT_DIRS.  This way dictionaries don't have to be
  installed into aspell's prefix.  Instead you can just set
  ASPELL_EXTRA_DICT_DIRS to $HOME/.nix-profile/lib/aspell and install
  dictionaries separately with nix-env (e.g. "nix-env -i
  aspell-dict-nl").
  
* Added a bunch of Aspell dictionaries.  Additional dictionaries can
  be added easily in development/libraries/aspell/dictionaries.nix.

svn path=/nixpkgs/trunk/; revision=9512
2007-10-23 16:33:11 +00:00
Armijn Hemel 183d29946f security update 0.9.8g
svn path=/nixpkgs/trunk/; revision=9510
2007-10-22 20:14:22 +00:00
Marc Weber e87c6a6793 sox, ffmpeg_svn expressions added
ghcPkgUtil defines a function to create setup-hook 
- creating a packagedatabase (nix-support/package.conf)
- adding it to GHC_PACKAGE_PATH
see comments for details

svn path=/nixpkgs/trunk/; revision=9500
2007-10-22 00:51:40 +00:00
Yury G. Kudryashov 4152053259 boost upgraded to 1.34.1
svn path=/nixpkgs/trunk/; revision=9495
2007-10-19 19:17:06 +00:00
Eelco Dolstra eaa4db148d * libxml2 / libxslt: provide a setup hook that prevents xmllint and
xsltproc from downloading DTDs from the network, which is impure.
  This caused a lot of problems with Gnome builds in the build farm,
  because those downloads are slow and would sometimes fail.

  The setup hook also sets up $XML_CATALOG_FILES.

svn path=/nixpkgs/trunk/; revision=9471
2007-10-18 21:08:47 +00:00
Yury G. Kudryashov 51e3a34bdb Added kde-team version for qt4.
KDE4 needs their own version of qt4 (with KDE patches). I've added this version.
You could choose Trolltech version for specific package by
qt4 = qt4_alts.trolltech
or change default in configuration.nix

svn path=/nixpkgs/trunk/; revision=9458
2007-10-12 20:38:39 +00:00
Yury G. Kudryashov 8a0194b4e5 Added OpenEXR and ilmbase. Actually, ilmbase is a part of OpenEXR
svn path=/nixpkgs/trunk/; revision=9457
2007-10-12 20:33:03 +00:00
Yury G. Kudryashov 203c236135 Added slapd to openldap
svn path=/nixpkgs/trunk/; revision=9456
2007-10-12 20:30:19 +00:00
Yury G. Kudryashov b167a71f29 enchant library added
svn path=/nixpkgs/trunk/; revision=9455
2007-10-12 20:27:15 +00:00
Yury G. Kudryashov 7d9d5b1484 Added redland library (also known as librdf)
svn path=/nixpkgs/trunk/; revision=9390
2007-10-01 15:14:50 +00:00
Yury G. Kudryashov 889baf5551 Added exiv2-0.15 library
svn path=/nixpkgs/trunk/; revision=9389
2007-10-01 15:12:41 +00:00
Yury G. Kudryashov ce6aef6574 Added cyrus-sasl-2.1.22 with openssl
svn path=/nixpkgs/trunk/; revision=9388
2007-10-01 15:11:38 +00:00
Yury G. Kudryashov b11756b9e4 Added cppunit (kde4 needs it)
svn path=/nixpkgs/trunk/; revision=9387
2007-10-01 15:09:29 +00:00
Yury G. Kudryashov 82b608d93f Added optional unicode support to pcre. Building old (non-unicode) package by
default.

svn path=/nixpkgs/trunk/; revision=9386
2007-10-01 15:07:55 +00:00
Eelco Dolstra ebacd32b71 * Added libgd.
* gnuplot 4.2.2.

svn path=/nixpkgs/trunk/; revision=9354
2007-09-21 20:43:43 +00:00
Yury G. Kudryashov ffeb95502d Added dbus variant with X support
Default is the old variant (without X).

svn path=/nixpkgs/trunk/; revision=9350
2007-09-20 19:40:22 +00:00
Armijn Hemel 7c1741a1ae update to 1.8.0.8
svn path=/nixpkgs/trunk/; revision=9338
2007-09-18 20:11:27 +00:00
Eelco Dolstra ea9667ab18 * Fixed some more URLs.
svn path=/nixpkgs/trunk/; revision=9294
2007-09-11 11:15:37 +00:00
Eelco Dolstra 105344a44e * Moved hsqldb.
svn path=/nixpkgs/trunk/; revision=9293
2007-09-11 11:06:31 +00:00
Eelco Dolstra 8f4d8573c0 * Fix a bunch of URLs.
svn path=/nixpkgs/trunk/; revision=9292
2007-09-11 10:15:07 +00:00
Eelco Dolstra 5b220fb397 * Some more attempts at getting OpenOffice (2.2.1) to build.
It compiles now, but I haven't figure out how to do the
  equivalent of a "make install".  But you can build with -K
  and then do

  $ cd /tmp/nix-.../OOF680_m18/instsetoo_native/util
  $ dmake openoffice_en-US PKGFORMAT=archive
  
  and you get a big tarball in 

  /tmp/nix-.../OOF680_m18/instsetoo_native/unxlngi6.pro/OpenOffice/archive/install/en-US

  that you can unpack anywhere to get a more-or-less working OpenOffice.

svn path=/nixpkgs/trunk/; revision=9257
2007-09-05 13:56:12 +00:00
Marc Weber 088a6817db added:
dnsmasq, uisp, fltk libixp_for_wmii, acerhk kernel module, reiserfsprogs, radeontools, msmtp,
procmail, pstree, gxemul

changed:
umlutilities to also support building tunctl optionally (needing kernel header files)
wmii updated and wmiimenu added                                                 

svn path=/nixpkgs/trunk/; revision=9242
2007-09-03 12:10:57 +00:00
Yury G. Kudryashov 245655b7a1 Added support for overridable variants of package.
For details read comments near getVersion function, gettext is the current
example.

svn path=/nixpkgs/trunk/; revision=9235
2007-09-01 18:26:13 +00:00
Eelco Dolstra 544cb9cb83 * Rewrite all URLs to GNU mirrors to mirror://gnu/.
svn path=/nixpkgs/trunk/; revision=9201
2007-08-27 13:42:00 +00:00
Eelco Dolstra 607b0d3e80 * Rewrite all the SourceForge URLs to mirror://sourceforge/.
find . -name "*.nix" | while read fn; do sed 's^http://[a-z]*.dl.sourceforge.net/sourceforge/^mirror://sourceforge/^g' < $fn > $fn.new; mv $fn.new $fn; done

svn path=/nixpkgs/trunk/; revision=9198
2007-08-27 13:01:33 +00:00
Eelco Dolstra a0159dee8e * Reverted r6713, r6711, r4623, r3660, r2237. There rewrote fetchurl
URLs to http://nix.cs.uu.nl/dist/tarballs.  With content-addressable
  mirror support (r9190, NIXPKGS-70) this is no longer necessary:
  fetchurl will try to download from that location automatically.  So
  we can keep the original URLs.

svn path=/nixpkgs/trunk/; revision=9192
2007-08-24 12:32:36 +00:00
Eelco Dolstra d0d721b0da * Latest libxml2, libxslt.
svn path=/nixpkgs/trunk/; revision=9186
2007-08-22 10:51:14 +00:00
Eelco Dolstra 38ace454e9 * Wine locates a lot of libraries dynamically through dlopen(). Add
them to the RPATH so that the user doesn't have to set them in
  LD_LIBRARY_PATH.

svn path=/nixpkgs/trunk/; revision=9177
2007-08-21 00:00:23 +00:00
Marc Weber 3e6eebc6e5 fltk-2.0
svn path=/nixpkgs/trunk/; revision=9171
2007-08-20 10:42:09 +00:00
Michael Raskin cfab5a8cf9 Now glibc-NPTL builds...
svn path=/nixpkgs/trunk/; revision=9162
2007-08-18 19:04:19 +00:00
Michael Raskin e6c5500d42 Changed package name to glibc-2.5-nptl ...
svn path=/nixpkgs/trunk/; revision=9160
2007-08-18 16:23:11 +00:00
Eelco Dolstra 9cc12e9f05 * Old work on Glibc with NPTL. No idea if it compiles/works.
svn path=/nixpkgs/trunk/; revision=9157
2007-08-18 16:15:09 +00:00
Michael Raskin 7625cdadfb Added libwmf for handling embedded graphics in .doc files.
svn path=/nixpkgs/trunk/; revision=9153
2007-08-18 09:35:54 +00:00
Armijn Hemel 38871bf455 make libgcrypt propagated
svn path=/nixpkgs/trunk/; revision=9144
2007-08-16 22:05:38 +00:00
Armijn Hemel a42c1d3486 add libgcrypt and libotr
svn path=/nixpkgs/trunk/; revision=9142
2007-08-16 21:44:48 +00:00
Armijn Hemel 8270fbe16c bump some versions
svn path=/nixpkgs/trunk/; revision=9140
2007-08-16 20:58:25 +00:00
Eelco Dolstra fbfed1e2d8 * xine-lib 1.1.7, xine-ui 0.99.5.
svn path=/nixpkgs/trunk/; revision=9118
2007-08-14 12:10:11 +00:00
Andres Löh 3d519c2bed * add unison
- unison uses a wrapper script to add font-schumacher-misc to the local X font path
    if the font isn't already present; this is necessary for it to work, but not terribly
    nice ...
* lablgtk is a dependency of unison
  - handling of library dirs with ocaml is a hack so far; in principle, ocaml needs
    a general setup for library dirs like ghc

svn path=/nixpkgs/trunk/; revision=9094
2007-08-10 08:21:31 +00:00
Michael Raskin 422433d1b9 Added pygame and some of its dependencies. Also added Python Imaging library.
svn path=/nixpkgs/trunk/; revision=9082
2007-08-09 17:33:18 +00:00
Yury G. Kudryashov 33f6eb6b03 Some upgrades needed for kde4:
* alsa-lib: 1.0.12 -> 1.0.14
* alsa-utils: 1.0.13 -> 1.0.14
* strigi: 0.5.1 -> 0.5.3dev
* libgpg-error: 1.0 -> 1.4
* gpgme: 1.0.3 -> 1.1.4
* cmake: 2.4.6 -> 2.4.7

* Some kde4 components added (not compilable yet).
* icu4c-3.6 added
* boost: added unicode support to RegEx, switched to "system" layout

svn path=/nixpkgs/trunk/; revision=9068
2007-08-08 13:20:18 +00:00
Eelco Dolstra db0e9e16c9 * Use a patched ATerm library that fixes another GC bug.
svn path=/nixpkgs/trunk/; revision=9065
2007-08-07 23:27:38 +00:00
Eelco Dolstra b2bff981f3 * ifplugd: program for monitoring the link status of
ethernet interfaces.
* libdaemon: dependency of ifplugd.

svn path=/nixpkgs/trunk/; revision=9061
2007-08-06 18:45:53 +00:00
Yury G. Kudryashov 67d41efde1 Added some parts of kde-4. It doesn't work yet, but I need version control
svn path=/nixpkgs/trunk/; revision=9049
2007-08-05 13:54:42 +00:00
Eelco Dolstra 7d5152714e * Some updates.
svn path=/nixpkgs/trunk/; revision=9025
2007-07-28 20:19:33 +00:00
Armijn Hemel f65b58c081 add clanlib
svn path=/nixpkgs/trunk/; revision=9017
2007-07-22 18:22:46 +00:00
Yury G. Kudryashov 4b33c46279 * ion-3 and elinks added, missprint in qt-4 corrected
svn path=/nixpkgs/trunk/; revision=8993
2007-07-17 19:29:53 +00:00
Yury G. Kudryashov 09d1b78f21 Reverted gettext to 0.14.6
svn path=/nixpkgs/trunk/; revision=8992
2007-07-17 17:10:00 +00:00
Yury G. Kudryashov b65eff8933 Added qt-4
svn path=/nixpkgs/trunk/; revision=8991
2007-07-17 17:08:38 +00:00
Wouter den Breejen 74df4c50c6 Fixed undeclared gettext dependency for libgsf
svn path=/nixpkgs/trunk/; revision=8988
2007-07-17 14:44:40 +00:00
Michael Raskin 474c738642 Updated libpng version. Vulnerability of kind "visit a page with a bad picture, browser fails".
svn path=/nixpkgs/trunk/; revision=8955
2007-07-07 13:33:39 +00:00
Martin Bravenboer 5983f91836 A pkgs/development/libraries/aspell/builder.sh
M    pkgs/development/libraries/aspell/default.nix

aspell comes without any dictionaries, so if you actually want to use
it you need to install additional dictionary packages. I've added the
package for English, but obviously more should be added. Dictionaries
are installed in the prefix of aspell.

M    pkgs/top-level/all-packages.nix

aspell dict package for English needs which

added an option enableMPlayer to wrapFirefox to disable the MPlayer
plugin. It's enabled by default.


svn path=/nixpkgs/trunk/; revision=8944
2007-07-04 01:35:29 +00:00
Michael Raskin 68d6762e0f I hope I disabled ncursesw in Cygwin. Also fixed device-mapper mention in system.nix. Also added pam in the list of sudo dependencies, it should be done anyway, but still only NOPASSWD entries work.
svn path=/nixpkgs/trunk/; revision=8931
2007-06-28 22:14:25 +00:00
Yury G. Kudryashov 40657fbece * ncurses: added symlinks for bynary packages linked against libncurses. Tested
with ghc. I will add 'unicode' option next check in (for cygwin).
* pidgin:  Got rid of builder.sh, added ncurses to the dependencies, so it builds
           finch.
* xorg:    Added glproto and mesaHeaders to xf86videosis dependencies. Now it
           compiles.
* pwgen:   Added.
* device-mapper: Version bump. Added 'static' option for use in initrd.
* lvm2:          Version bump. Added 'static' option for use in initrd.

svn path=/nixpkgs/trunk/; revision=8923
2007-06-28 09:53:12 +00:00
Michael Raskin 42f841bcab Added some descriptions.
svn path=/nixpkgs/trunk/; revision=8920
2007-06-26 11:49:45 +00:00
Yury G. Kudryashov 4512585cd5 * ncurses: builder removed, building ncursesw instead of ncurses (source-compatible).
svn path=/nixpkgs/trunk/; revision=8919
2007-06-26 11:34:05 +00:00
Armijn Hemel 400499686e add boost
svn path=/nixpkgs/trunk/; revision=8874
2007-06-12 15:35:57 +00:00
Eelco Dolstra efba820026 * Quick fix for an incompatibility between libXp and lesstif, which
caused the xpdf build to fail.  Patch from
  http://www.mail-archive.com/debian-bugs-rc@lists.debian.org/msg101592.html

svn path=/nixpkgs/trunk/; revision=8867
2007-06-11 14:33:05 +00:00
Eelco Dolstra 80c7cce4e9 * Use /var.
svn path=/nixpkgs/trunk/; revision=8836
2007-06-05 16:56:10 +00:00
Eelco Dolstra 150b0712cd * Very subtle purity error: on NixOS, wxGTK wasn't being built with
Xinerama support.  It gets libXinerama as an explicit build input,
  but it checks for its existence in /usr/X11/include etc.  This
  caused Bittorrent to fail (NIXPKGS-61).  Backported the builder
  fixes from wxGTK 2.8.

svn path=/nixpkgs/trunk/; revision=8813
2007-05-31 14:02:16 +00:00
Eelco Dolstra d16ae4efcf * Added wxGTK/wxPython 2.8. However this was quite pointless as
Bittorrent is even more broken with wxPython 2.8.

svn path=/nixpkgs/trunk/; revision=8812
2007-05-31 13:43:13 +00:00
Wouter den Breejen 5200276c3b nixpkgs dir: nvidia and libsrvg
svn path=/nixpkgs/trunk/; revision=8785
2007-05-28 14:10:46 +00:00
Eelco Dolstra 659023aa97 * Hack for building zlib on Cygwin (NIXPKGS-28).
svn path=/nixpkgs/trunk/; revision=8768
2007-05-24 16:05:40 +00:00
Eelco Dolstra c62a35fc0c * pcre updated to 7.1 (NIXPKGS-58).
svn path=/nixpkgs/trunk/; revision=8747
2007-05-24 13:41:25 +00:00
Eelco Dolstra bfbdd69b2f * Make a symlink "lib64" to "lib" to fix ldd (which looks for the
dynamic linker in lib64 on x86_64).  (NIXOS-54)

svn path=/nixpkgs/trunk/; revision=8741
2007-05-24 13:33:23 +00:00
Eelco Dolstra 422da176d7 * Fix another bug in Berkeley DB's DB_REGISTER feature (Oracle should
hire me...).  There is a very small race between processes exiting
  the environment and processes entering, such that the entering
  process would incorrectly conclude that the exiting process had
  died and recovery was necessary.  However, this race was triggering
  crashes on a daily basis in our build farm.

svn path=/nixpkgs/trunk/; revision=8712
2007-05-16 19:30:57 +00:00
Eelco Dolstra 41291a5b26 * Fix Mesa-related evaluation errors.
svn path=/nixpkgs/trunk/; revision=8708
2007-05-16 14:49:28 +00:00
Eelco Dolstra 1171d3e22c * Added GemRB, a reimplementation of the Infinity Engine.
svn path=/nixpkgs/trunk/; revision=8695
2007-05-14 21:47:11 +00:00
Armijn Hemel d0b41fda3e libxml2 2.6.27, libxslt 1.1.20
svn path=/nixpkgs/trunk/; revision=8685
2007-05-14 01:18:36 +00:00
Armijn Hemel 7f3a1fa68f 1.4.4 -> 1.4.6
svn path=/nixpkgs/trunk/; revision=8670
2007-05-13 21:45:43 +00:00
Armijn Hemel 7260c4b533 update to 0.6.14
svn path=/nixpkgs/trunk/; revision=8668
2007-05-13 21:07:18 +00:00
Martin Bravenboer 93393a6748 Added aspell
Added gtkspell

Added pidgin, builds but does not run yet:

running pidgin fails to find libX11.so.6. ldd on pidgin reports:

  libX11.so.6 => not found
  ....
  libX11.so.6 => /nix/store/brsva6rh1p2ymjvk7054a90is5panrhf-libX11-1.1.1/lib/libX11.so.6 (0xb7358000)

which looks a bit weird ... Maybe some problem with patchelf? Or just
a build problem and should the library path be set using an
environment variable?


svn path=/nixpkgs/trunk/; revision=8660
2007-05-13 14:22:24 +00:00
Eelco Dolstra d7c12b1a20 * wxGTK-2.6.4.
svn path=/nixpkgs/trunk/; revision=8646
2007-05-02 15:29:57 +00:00