Commit graph

740 commits

Author SHA1 Message Date
Tobias Hammerschmidt 8449e0bbe6 version 2.0.0.14
svn path=/nixpkgs/trunk/; revision=11654
2008-04-17 21:03:32 +00:00
Marc Weber 7e43554ace Updated wireshark (used all-versions/ url now so if version changes url will still be valid in the future) - is this good or bad?
svn path=/nixpkgs/trunk/; revision=11610
2008-04-12 12:44:56 +00:00
Armijn Hemel 1dec7caa10 2.4.0 -> 2.4.1
svn path=/nixpkgs/trunk/; revision=11503
2008-04-09 07:36:06 +00:00
Wouter den Breejen afc76c65c6 Firefox 3.5beta
svn path=/nixpkgs/trunk/; revision=11462
2008-04-04 17:37:57 +00:00
Tobias Hammerschmidt 7cc6405859 firefox 2.0.0.13
svn path=/nixpkgs/trunk/; revision=11294
2008-03-26 23:25:56 +00:00
Tobias Hammerschmidt 26e37033ba version update
svn path=/nixpkgs/trunk/; revision=11283
2008-03-26 07:41:36 +00:00
Michael Raskin 5f2bcdbdb6 Some refactorings in builderDefs. Psi is a simple showcase. TeXLive now works as far as English is concerned, and it is also updated up to newest builderDefs.
svn path=/nixpkgs/trunk/; revision=11235
2008-03-20 15:40:26 +00:00
Michael Raskin b97b16534e Added Psi
svn path=/nixpkgs/trunk/; revision=11214
2008-03-20 09:50:31 +00:00
Michael Raskin 064045cfcd version updates
svn path=/nixpkgs/trunk/; revision=11142
2008-03-16 08:01:31 +00:00
Michael Raskin f87e85c2a8 Added LinuxDC++. Claimed to support newer protocol - claim is by valknut team..
svn path=/nixpkgs/trunk/; revision=11132
2008-03-15 06:11:45 +00:00
Tobias Hammerschmidt 8c5c656fb5 fixed skype, wesnoth updated to version 1.4
svn path=/nixpkgs/trunk/; revision=11033
2008-03-10 13:09:47 +00:00
Armijn Hemel 7c39433e7b 2.6.9 -> 3.0.0
svn path=/nixpkgs/trunk/; revision=11020
2008-03-08 16:36:27 +00:00
Armijn Hemel 93c37882a5 update to 2.4.0
svn path=/nixpkgs/trunk/; revision=10924
2008-03-02 22:54:49 +00:00
Tobias Hammerschmidt 65e80ffb4f thunderbird 2.0.0.12
svn path=/nixpkgs/trunk/; revision=10879
2008-02-27 16:51:29 +00:00
Ludovic Courtès 5f8dd658cb Add BitlBee, an IRC to other chat networks gateway.
svn path=/nixpkgs/trunk/; revision=10715
2008-02-17 15:33:04 +00:00
Eelco Dolstra 9b81f2ae65 * Firefox 3 beta 3.
svn path=/nixpkgs/trunk/; revision=10656
2008-02-13 10:36:53 +00:00
Eelco Dolstra b9681bf5aa * Firefox 2.0.0.12.
svn path=/nixpkgs/trunk/; revision=10557
2008-02-08 16:59:53 +00:00
Yury G. Kudryashov 81aac8d84d meta.homepage added to several packages
svn path=/nixpkgs/trunk/; revision=10417
2008-01-30 19:49:42 +00:00
Yury G. Kudryashov 5bca69ac34 Nix-expr style review
Unneded args.something replaced with
args: with args;
line. After this line args is the only place where we can recieve variables from.

Also removed several
buildInputs = [];
lines.

svn path=/nixpkgs/trunk/; revision=10415
2008-01-30 17:20:48 +00:00
Andres Löh 3479c907ab * added rdesktop
svn path=/nixpkgs/trunk/; revision=10304
2008-01-28 12:28:23 +00:00
Eelco Dolstra a5e0e39cdb * makeWrapper: option --run <CMD> to run a command from the wrapper.
This is so that the Unison wrapper can be generated with
  makeWrapper.
* Use makeWrapper as a buildInput everywhere.
* Updated BitTorrent, cvs2svn.

svn path=/nixpkgs/trunk/; revision=10213
2008-01-18 11:28:41 +00:00
Marc Weber bcc577894a Newest snapshot for i686-linux .. doesn't crash that often here
svn path=/nixpkgs/trunk/; revision=10165
2008-01-16 02:48:18 +00:00
Armijn Hemel 4f792ac2b6 new xchat. Security patches for this release not applied
svn path=/nixpkgs/trunk/; revision=10019
2007-12-31 20:40:05 +00:00
Armijn Hemel ecb1670145 update to 0.8.12
svn path=/nixpkgs/trunk/; revision=10018
2007-12-31 20:34:51 +00:00
Armijn Hemel 3f06850f45 update.
This package is more or less orphaned, it seems, maybe it would be better to delete it from Nixpkgs altogether

svn path=/nixpkgs/trunk/; revision=10017
2007-12-31 20:32:00 +00:00
Armijn Hemel aae41dd4d4 update to 0.99.7
svn path=/nixpkgs/trunk/; revision=10005
2007-12-31 18:41:30 +00:00
Eelco Dolstra 14b6a2d82d * Chatzilla 0.9.79.
svn path=/nixpkgs/trunk/; revision=9996
2007-12-31 17:50:38 +00:00
Armijn Hemel 480a43d45b update to 2.3.1
svn path=/nixpkgs/trunk/; revision=9995
2007-12-31 17:31:41 +00:00
Eelco Dolstra a98161a0da * Updated Flash, MPlayer plugins.
svn path=/nixpkgs/trunk/; revision=9975
2007-12-30 22:19:07 +00:00
Eelco Dolstra 78e7401dd1 * Firefox 2.0.0.11.
svn path=/nixpkgs/trunk/; revision=9971
2007-12-30 21:47:12 +00:00
Michael Raskin a7fada5648 Added Firefox-3b2 (still no idea why it crashes, though), fixed updated FUSE, made relfs_grant add user if none exists
svn path=/nixpkgs/trunk/; revision=9967
2007-12-25 12:29:02 +00:00
Marc Weber b03e9de694 Unfinished teamspeak client
svn path=/nixpkgs/trunk/; revision=9934
2007-12-14 01:50:19 +00:00
Michael Raskin 6bcfbb2aaa Asserted Linux for Firefox binary.
svn path=/nixpkgs/trunk/; revision=9907
2007-12-11 15:29:22 +00:00
Michael Raskin 4830f9589b Dirty fix for BitTornado; draft support for .nar.bz2 in builder-defs; binary Firefox 3b1 (not that it works well, but a starting point anyway.)
svn path=/nixpkgs/trunk/; revision=9899
2007-12-10 16:56:55 +00:00
Marc Weber 0250bd7bac Opera updated - works now on x64-linux as well
svn path=/nixpkgs/trunk/; revision=9805
2007-11-28 02:10:27 +00:00
Eelco Dolstra 32bdb24a14 * Thunderbird 2.0.0.9.
* Removed Thunderbird 1.5.

svn path=/nixpkgs/trunk/; revision=9796
2007-11-26 14:18:57 +00:00
Michael Raskin 7d7850cf03 Added possibility to make suffixed wrapped firefoxes. Yes, to have beta&release at once.
svn path=/nixpkgs/trunk/; revision=9789
2007-11-24 10:49:52 +00:00
Michael Raskin 0a830a172b Added Firefox 3 beta 1 (Minefield)
svn path=/nixpkgs/trunk/; revision=9773
2007-11-21 22:38:25 +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
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
Yury G. Kudryashov 80ba72a288 Added some features to elinks
svn path=/nixpkgs/trunk/; revision=9630
2007-11-11 15:52:09 +00:00
Michael Raskin 61f4326752 Added possibility to enable SVG in ImageMagick, updated pidgin-latex, added missed xorgserver xkb patch.
svn path=/nixpkgs/trunk/; revision=9623
2007-11-11 07:54:45 +00:00
Eelco Dolstra 1bc214fd59 * Latest MPlayer plugin.
svn path=/nixpkgs/trunk/; revision=9576
2007-11-04 17:16:52 +00:00
Eelco Dolstra c7521fb6d9 * Firefox 2.0.0.9.
svn path=/nixpkgs/trunk/; revision=9572
2007-11-02 11:00:48 +00:00
Marc Weber 458895e930 Opera update - I hope I haven't broken anything? I haven't restarted opera yet :)
svn path=/nixpkgs/trunk/; revision=9556
2007-10-30 01:51:15 +00:00
Eelco Dolstra cdc7562c63 * Firefox 2.0.0.8
svn path=/nixpkgs/trunk/; revision=9489
2007-10-19 15:15:28 +00:00
Michael Raskin dcb59e3541 Worked around fresh ImageMagick misfeature with dvi.
svn path=/nixpkgs/trunk/; revision=9475
2007-10-19 08:00:38 +00:00
Armijn Hemel 7841a05eb1 bump to 2.2.1
svn path=/nixpkgs/trunk/; revision=9400
2007-10-03 15:38:19 +00:00
Eelco Dolstra d4d6b5424d * Chatzilla 0.9.78.1.
svn path=/nixpkgs/trunk/; revision=9374
2007-09-26 18:46:43 +00:00
Armijn Hemel 73e8c01f5c 2.1.1 -> 2.2.0
svn path=/nixpkgs/trunk/; revision=9331
2007-09-18 13:44:40 +00:00
Marc Weber 8945b535d3 I didn't commit the first line..
svn path=/nixpkgs/trunk/; revision=9313
2007-09-12 07:35:11 +00:00
Marc Weber d27d22d32f skype (speech p2p program for non commercial use only) added
svn path=/nixpkgs/trunk/; revision=9312
2007-09-12 07:26:37 +00:00
Eelco Dolstra bd0e895bad * Release notes.
* Linux 2.6.22.6.
* w3m 0.5.2.

svn path=/nixpkgs/trunk/; revision=9305
2007-09-11 20:05:54 +00:00
Eelco Dolstra ea9667ab18 * Fixed some more URLs.
svn path=/nixpkgs/trunk/; revision=9294
2007-09-11 11:15:37 +00:00
Wouter den Breejen 37baf87b57 svn path=/nixpkgs/trunk/; revision=9277 2007-09-07 11:05:02 +00:00
Marc Weber 8544d7313f additionally copying the lib/opera/plugin/libnpp.so into the executable
directory to make plugins work and get rid of the missing library warning

svn path=/nixpkgs/trunk/; revision=9244
2007-09-03 15:07:19 +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
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
Armijn Hemel ec9d5c9471 update to 2.1.1
svn path=/nixpkgs/trunk/; revision=9187
2007-08-22 12:29:26 +00:00
Eelco Dolstra b5db5e6e61 * Fix /bin/pwd and /bin/ls so that `firefox <filename>' works on
NixOS.

svn path=/nixpkgs/trunk/; revision=9173
2007-08-20 13:04:14 +00:00
Michael Raskin 282c064669 Moved pidgin-latex to pidgin-plugins, added aggregatable link for pidgin-otr.
svn path=/nixpkgs/trunk/; revision=9147
2007-08-17 09:31:09 +00:00
Armijn Hemel c8c3eb7c18 add Off The Record, encryption plugin for pidgin. Needs a pidgin wrapper to work nicely.
svn path=/nixpkgs/trunk/; revision=9146
2007-08-16 23:16:42 +00:00
Armijn Hemel 813f26af95 move some buildInputs to propagatedBuildInputs, since these are also used by some external Pidgin plugins
svn path=/nixpkgs/trunk/; revision=9145
2007-08-16 23:14:52 +00:00
Armijn Hemel 63aa0fbb30 update to 2.1.0
svn path=/nixpkgs/trunk/; revision=9141
2007-08-16 21:07:45 +00:00
Eelco Dolstra 5ede228a68 * Thunderbird 2.0.0.6.
svn path=/nixpkgs/trunk/; revision=9115
2007-08-14 10:15:49 +00:00
Andres Löh 86874956a5 * be more fault tolerant in the unison wrapper
svn path=/nixpkgs/trunk/; revision=9114
2007-08-13 17:08:14 +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
Eelco Dolstra e9aa891e4a * Pan 0.132.
svn path=/nixpkgs/trunk/; revision=9079
2007-08-09 13:38:19 +00:00
Andres Löh e539c80d47 * add SSL and IMAP support to mutt
svn path=/nixpkgs/trunk/; revision=9056
2007-08-06 12:18:55 +00:00
Andres Löh d1f24e346f * added mutt (almost unusable so far, since no extra stuff is compiled in)
svn path=/nixpkgs/trunk/; revision=9052
2007-08-05 18:23:53 +00:00
Andres Löh 2527df90cd * added irssi
svn path=/nixpkgs/trunk/; revision=9051
2007-08-05 18:22:12 +00:00
Michael Raskin c3529a7a73 Changed hash to match updated download on macromedia site.
svn path=/nixpkgs/trunk/; revision=9032
2007-08-02 21:37:38 +00:00
Eelco Dolstra f643c7bcb8 * Another security critical release.
svn path=/nixpkgs/trunk/; revision=9028
2007-08-01 15:48:26 +00:00
Eelco Dolstra 327ceccecb * Thunderbird 2.0.0.5.
svn path=/nixpkgs/trunk/; revision=9026
2007-07-28 20:21:57 +00:00
Eelco Dolstra 7d5152714e * Some updates.
svn path=/nixpkgs/trunk/; revision=9025
2007-07-28 20:19:33 +00:00
Michael Raskin 6b2b602299 Corrected handling of latex errors.
svn path=/nixpkgs/trunk/; revision=9000
2007-07-18 20:32:51 +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
Michael Raskin ee4bc350af Added pidgin-latex.
svn path=/nixpkgs/trunk/; revision=8957
2007-07-07 19:22:28 +00:00
Michael Raskin 9b43958df5 Version bump. Wireshark.org has already pulled old version off site...
svn path=/nixpkgs/trunk/; revision=8950
2007-07-06 13:07:14 +00:00
Eelco Dolstra ebc3234b5e * Make Thunderbird 2.x the default.
svn path=/nixpkgs/trunk/; revision=8949
2007-07-05 20:33:32 +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
Eelco Dolstra 4c7104113a * Thunderbird 2.0.0.4.
svn path=/nixpkgs/trunk/; revision=8888
2007-06-18 10:25:17 +00:00
Armijn Hemel ad0ec5a27c 2.0.0 -> 2.0.1
svn path=/nixpkgs/trunk/; revision=8871
2007-06-12 12:33:55 +00:00
Eelco Dolstra 803f369435 * Thunderbird 2.0.0.0.
svn path=/nixpkgs/trunk/; revision=8820
2007-06-02 20:32:24 +00:00
Eelco Dolstra 958e4ce394 * Firefox 2.0.0.4.
svn path=/nixpkgs/trunk/; revision=8819
2007-06-02 17:16:54 +00:00
Wouter den Breejen adba260749 removed useless result symlink
svn path=/nixpkgs/trunk/; revision=8788
2007-05-28 14:15:25 +00:00
Wouter den Breejen 2b4220fb88 added putty
svn path=/nixpkgs/trunk/; revision=8787
2007-05-28 14:14:12 +00:00
Eelco Dolstra 840e872e9d * Pan 0.130.
svn path=/nixpkgs/trunk/; revision=8734
2007-05-23 09:45:24 +00:00
Eelco Dolstra ffa7b32970 * Wrapped Firefox: make it evaluate on x86_64-linux.
svn path=/nixpkgs/trunk/; revision=8707
2007-05-16 14:34:27 +00:00
Armijn Hemel 4c113abb5e 0.128 -> 0.129
svn path=/nixpkgs/trunk/; revision=8689
2007-05-14 11:20:18 +00:00
Armijn Hemel d2086b5e53 lynx 2.8.6
svn path=/nixpkgs/trunk/; revision=8687
2007-05-14 01:36:50 +00:00
Armijn Hemel 375526c382 remove gaim, clean up pidgin dependencies a bit
svn path=/nixpkgs/trunk/; revision=8683
2007-05-14 00:51:30 +00:00
Armijn Hemel 2ea67fd385 sylpheed 2.4.1
svn path=/nixpkgs/trunk/; revision=8681
2007-05-14 00:29:30 +00:00
Armijn Hemel 7e4289df47 2.6.8 -> 2.6.9
svn path=/nixpkgs/trunk/; revision=8680
2007-05-14 00:18:13 +00:00
Armijn Hemel eb42cad8ce xchat 2.8.2, cleanups
svn path=/nixpkgs/trunk/; revision=8679
2007-05-14 00:13:48 +00:00
Armijn Hemel c068774f59 cleanups, build graphical frontend too
svn path=/nixpkgs/trunk/; revision=8677
2007-05-14 00:04:39 +00:00
Armijn Hemel 16fc4c0838 ethereal -> wireshark
update to 0.99.5

svn path=/nixpkgs/trunk/; revision=8675
2007-05-13 23:24:34 +00:00
Martin Bravenboer 109a74d558 Pidgin needs libXScrnSaver to make the automatic status changes work
(without this library it will always switch to Away after 5 minutes
and never make you Available again)

Build pidgin for release

Don't build Gaim for release


svn path=/nixpkgs/trunk/; revision=8661
2007-05-13 16:19:46 +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 ac80e8229b * Pan 0.128.
svn path=/nixpkgs/trunk/; revision=8622
2007-04-27 22:41:35 +00:00
Eelco Dolstra 168a93adc5 * Delete some obsolete packages.
* Make sure that every package in all-packages.nix has a unique name.
  Not all of them do, but there are now a few helper functions that
  modify the name of a package for display purposes in nix-env (e.g.,
  you get "zlib-1.2.3" and "zlib-1.2.3-static" in "nix-env -qa").

svn path=/nixpkgs/trunk/; revision=8607
2007-04-26 13:02:30 +00:00
Eelco Dolstra 8ede3fba35 * Firefox 2.0.0.3.
svn path=/nixpkgs/trunk/; revision=8499
2007-03-30 07:28:38 +00:00
Eelco Dolstra b1c3574e7b * Whitespace.
svn path=/nixpkgs/trunk/; revision=8417
2007-03-26 13:41:58 +00:00
Eelco Dolstra 943e0e2f68 * Thunderbird 1.5.0.10.
svn path=/nixpkgs/trunk/; revision=8416
2007-03-26 13:41:15 +00:00
Eelco Dolstra e710cf33b4 * Firefox 2.0.0.2.
svn path=/nixpkgs/trunk/; revision=8139
2007-03-01 19:54:36 +00:00
Eelco Dolstra 714da445bb * pkgconfig 0.21 is now the default.
* Some hackery to get Firefox to build again.

svn path=/nixpkgs/trunk/; revision=8076
2007-02-27 15:15:20 +00:00
Martin Bravenboer c3f8a99b8c Updated gaim to latest beta
Added gdb


svn path=/nixpkgs/trunk/; revision=8019
2007-02-22 16:07:51 +00:00
Eelco Dolstra c036d1d48f * Adobe Reader 7.0.9.
* Renamed the Flash Player directories.

svn path=/nixpkgs/trunk/; revision=7831
2007-02-01 15:07:52 +00:00
Eelco Dolstra f752af2637 * Flash Player 9 final. Also fixed sound support (it needs ALSA).
svn path=/nixpkgs/trunk/; revision=7794
2007-01-24 18:01:00 +00:00
Armijn Hemel 4d2519baad upgrade to 0.96
svn path=/nixpkgs/trunk/; revision=7700
2007-01-16 22:10:29 +00:00
Eelco Dolstra f861c8b66c * makeFlags -> buildFlags in a few places.
svn path=/nixpkgs/trunk/; revision=7503
2006-12-27 18:34:35 +00:00
Eelco Dolstra bbe62e266b * Remove references to dontMakeInstall.
svn path=/nixpkgs/trunk/; revision=7500
2006-12-27 18:24:26 +00:00
Eelco Dolstra eb98a4c328 * Thunderbird 1.5.0.9.
svn path=/nixpkgs/trunk/; revision=7487
2006-12-27 17:00:44 +00:00
Eelco Dolstra b36d027ad7 * Firefox 2.0.0.1.
svn path=/nixpkgs/trunk/; revision=7486
2006-12-27 16:57:53 +00:00
Eelco Dolstra 3ae5939e87 * Thunderbird 1.5.0.8.
svn path=/nixpkgs/trunk/; revision=7355
2006-12-16 01:17:56 +00:00
Eelco Dolstra cca1ba0372 * Latest Flash beta.
svn path=/nixpkgs/trunk/; revision=7292
2006-12-09 17:27:59 +00:00
Eelco Dolstra 71285201cd * Doh! Copy *all* the plugins. No wonder most videos didn't work
anymore...

svn path=/nixpkgs/trunk/; revision=7272
2006-12-07 22:00:10 +00:00
Eelco Dolstra 2f0d625a7a * Flash Player 9 Beta (enabled in the Firefox wrapper).
svn path=/nixpkgs/trunk/; revision=6925
2006-11-01 14:27:20 +00:00
Eelco Dolstra b90781ec21 * Renamed orig-glibc -> orig-libc in some places, and in others, use
the new $NIX_GCC/nix-support/dynamic-linker file to locate the
  dynamic linker directly (don't hardcode ld-linux.so.2).

svn path=/nixpkgs/trunk/; revision=6873
2006-10-27 12:43:32 +00:00
Eelco Dolstra d4578254b0 * Move.
svn path=/nixpkgs/trunk/; revision=6817
2006-10-24 08:07:15 +00:00
Eelco Dolstra f7b32f6bde * Firefox 2.0.
svn path=/nixpkgs/trunk/; revision=6816
2006-10-24 08:06:18 +00:00
Eelco Dolstra 1442e8ec22 * Copy a bunch of files to nix.cs.uu.nl.
svn path=/nixpkgs/trunk/; revision=6711
2006-10-12 13:50:54 +00:00
Eelco Dolstra 368c196a62 * More descriptions.
svn path=/nixpkgs/trunk/; revision=6709
2006-10-12 10:53:16 +00:00
Eelco Dolstra 6006d61835 * Added a bunch of descriptions.
svn path=/nixpkgs/trunk/; revision=6705
2006-10-11 16:45:55 +00:00
Eelco Dolstra 808846b2c9 * Firefox 2.0 RC 1.
svn path=/nixpkgs/trunk/; revision=6655
2006-10-04 13:59:41 +00:00
Eelco Dolstra d4f1a3ef86 * Opera 9.02.
svn path=/nixpkgs/trunk/; revision=6622
2006-09-29 09:06:56 +00:00
Eelco Dolstra 5bfc14d14c * Latest MPlayer plugin.
svn path=/nixpkgs/trunk/; revision=6542
2006-09-17 14:02:52 +00:00
Eelco Dolstra 8bccec9c3d * --enable-canvas, and pass through gtk.
svn path=/nixpkgs/trunk/; revision=6541
2006-09-17 14:00:54 +00:00
Eelco Dolstra 12dc491db5 * --with-system-cairo -> --enable-system-cairo.
svn path=/nixpkgs/trunk/; revision=6538
2006-09-17 09:53:12 +00:00
Eelco Dolstra 7927e7cd1f * Firefox 1.5.0.7, Thunderbird 1.5.0.7.
svn path=/nixpkgs/trunk/; revision=6537
2006-09-17 09:44:36 +00:00
Eelco Dolstra bf1e734f85 * Don't use the subpath operator (~) anymore, it's subsumed by normal
concatenation (+).

svn path=/nixpkgs/trunk/; revision=6080
2006-08-09 15:05:30 +00:00
Eelco Dolstra f587be2b20 * Pan 0.106.
svn path=/nixpkgs/trunk/; revision=6065
2006-08-07 13:27:56 +00:00
Armijn Hemel 6efea74e8e use the right hash :o
svn path=/nixpkgs/trunk/; revision=6038
2006-08-03 21:45:44 +00:00
Armijn Hemel c48c2aa23b firefox 1.5.0.6
svn path=/nixpkgs/trunk/; revision=6037
2006-08-03 18:04:39 +00:00
Eelco Dolstra 0dbb937565 * Thunderbird 1.5.0.5. W00t!
svn path=/nixpkgs/trunk/; revision=6000
2006-07-31 12:13:53 +00:00
Eelco Dolstra 961c6e50e5 * Firefox 1.5.0.5.
svn path=/nixpkgs/trunk/; revision=5986
2006-07-28 13:35:09 +00:00
Eelco Dolstra 3fd28e7851 * Doh!
svn path=/nixpkgs/trunk/; revision=5889
2006-07-24 15:04:37 +00:00
Armijn Hemel ecae366a77 pass the right values for tk. Spotted on NixOS ;)
svn path=/nixpkgs/trunk/; revision=5874
2006-07-22 11:42:53 +00:00
Armijn Hemel d034a7ec00 add amsn
svn path=/nixpkgs/trunk/; revision=5873
2006-07-22 11:34:58 +00:00
Eelco Dolstra 2bda17d23a * Latest XULRunner and Chatzilla.
svn path=/nixpkgs/trunk/; revision=5773
2006-07-19 14:10:03 +00:00
Armijn Hemel f7faaf75f7 upgrade to 2.6.8 (security fixes, other bugfixes)
svn path=/nixpkgs/trunk/; revision=5610
2006-07-06 15:48:34 +00:00
Eelco Dolstra 0176b927c4 * Thunderbird 1.5.0.4.
svn path=/nixpkgs/trunk/; revision=5530
2006-06-27 13:28:43 +00:00
Eelco Dolstra c40a94ad07 * Doh.
svn path=/nixpkgs/trunk/; revision=5375
2006-06-04 13:39:04 +00:00
Eelco Dolstra 79fd001662 * Firefox 1.5.0.4.
svn path=/nixpkgs/trunk/; revision=5374
2006-06-04 12:45:37 +00:00
Armijn Hemel 93957f48c3 ethereal 0.99
svn path=/nixpkgs/trunk/; revision=5291
2006-05-10 22:56:03 +00:00
Eelco Dolstra 405d314395 * Pan 0.96.
svn path=/nixpkgs/trunk/; revision=5280
2006-05-07 21:58:31 +00:00
Eelco Dolstra c63f4278c7 * Firefox 1.5.0.3.
svn path=/nixpkgs/trunk/; revision=5263
2006-05-03 18:35:31 +00:00
Eelco Dolstra 01ca1e7fef * Graphics support in w3m. Must be seen to be believed. Disabled by
default; set graphicsSupport to true in all-packages.nix to enable.

svn path=/nixpkgs/trunk/; revision=5237
2006-04-28 19:02:52 +00:00
Eelco Dolstra b3b9118eab * Firefox 1.5.0.2.
svn path=/nixpkgs/trunk/; revision=5161
2006-04-14 16:08:35 +00:00
Eelco Dolstra 09a9cae715 * Merged the usability branch (from trunk@4749 to branches/usability@5087).
svn path=/nixpkgs/trunk/; revision=5088
2006-03-24 12:25:19 +00:00
Eelco Dolstra baec8f5b38 * stdenv.mkDerivation now takes an optional attribute "meta" that
contains arbitrary information about a package, like this:

  meta = {
    homepage = "http://gcc.gnu.org/";
    license = "GPL/LGPL";
    description = "GNU Compiler Collection, 4.0.x";
  };

  The "meta" attribute is not passed to the actual derivation
  operation, so it's not a dependency --- changes to "meta" attributes
  don't trigger a recompilation.

  Now we have to standardise some useful attributes ;-)

svn path=/nixpkgs/branches/usability/; revision=5024
2006-03-10 16:12:46 +00:00
Eelco Dolstra b06335a835 * Thunderbird updated to 1.5 (it was at 0.8!).
svn path=/nixpkgs/trunk/; revision=4970
2006-03-02 19:08:26 +00:00
Eelco Dolstra dff1c50b1b * Typo: "--enable-swg" -> "--enable-svg".
svn path=/nixpkgs/trunk/; revision=4928
2006-02-28 12:03:35 +00:00
Eelco Dolstra a9efb9d155 * Firefox: don't use internal jpeg, png, zlib, cairo.
svn path=/nixpkgs/trunk/; revision=4819
2006-02-16 08:46:28 +00:00
Eelco Dolstra bbda87fc30 * Fix the title bar icon.
svn path=/nixpkgs/trunk/; revision=4818
2006-02-15 17:15:16 +00:00
Eelco Dolstra 9012efbaef * Make the Firefox build more like xulrunner (e.g., don't using
.mozconfig).
* Optionally build Firefox with official branding (so that it calls
  itself "Firefox" instead of "Deer Park").  This should not be turned
  on for the channel!

svn path=/nixpkgs/trunk/; revision=4817
2006-02-15 17:04:11 +00:00
Martin Bravenboer 04767dfdd9 * Added xulrunner 1.8.0.1
* Added a basic wrapper generator for xulrunner

* Chatzilla running in xulrunner


svn path=/nixpkgs/trunk/; revision=4809
2006-02-15 02:53:01 +00:00
Eelco Dolstra 26f98860c1 * Opera 8.51 (on Linux).
svn path=/nixpkgs/trunk/; revision=4782
2006-02-10 12:15:04 +00:00
Eelco Dolstra 5c11ecb7f1 * Firefox 1.5.0.1.
svn path=/nixpkgs/trunk/; revision=4747
2006-02-07 11:07:18 +00:00
Eelco Dolstra 3389f4bc36 * Copy lots of files to nix.cs.uu.nl.
svn path=/nixpkgs/trunk/; revision=4623
2006-01-30 16:04:03 +00:00
Eelco Dolstra 53c56afcfe * Fix some broken URLs.
svn path=/nixpkgs/trunk/; revision=4622
2006-01-30 15:52:15 +00:00
Armijn Hemel e8488e3b71 add the links browser. This package built immediately, so I believe something is not pure...
svn path=/nixpkgs/trunk/; revision=4440
2005-12-26 16:13:04 +00:00
Eelco Dolstra fd5e5e34a4 * Updated Sylpheed to 2.1.9 and added GPG support (through gpgme).
svn path=/nixpkgs/trunk/; revision=4400
2005-12-19 10:34:01 +00:00
Eelco Dolstra 82e678362f * "." -> "source".
svn path=/nixpkgs/trunk/; revision=4335
2005-12-05 14:11:09 +00:00
Eelco Dolstra c7804cb0e5 * Idem.
svn path=/nixpkgs/trunk/; revision=4324
2005-11-30 05:49:28 +00:00
Eelco Dolstra 8e64101900 * Idem.
svn path=/nixpkgs/trunk/; revision=4323
2005-11-30 05:45:12 +00:00
Eelco Dolstra d17cafb294 * Firefox 1.5.
svn path=/nixpkgs/trunk/; revision=4321
2005-11-30 05:42:29 +00:00
Armijn Hemel 31c615a95d add rsync, untested
svn path=/nixpkgs/trunk/; revision=4309
2005-11-22 22:39:09 +00:00
Armijn Hemel 04d6db0985 pass gtk so the frontend for xchat will be built
svn path=/nixpkgs/trunk/; revision=4303
2005-11-22 12:22:50 +00:00
Armijn Hemel 6ec2dea85c add xchat and tcl
svn path=/nixpkgs/trunk/; revision=4301
2005-11-22 12:05:18 +00:00
Eelco Dolstra 7ba4b74bef * Firefox 1.5rc3.
svn path=/nixpkgs/trunk/; revision=4292
2005-11-19 14:19:39 +00:00
Eelco Dolstra 4bdbf2c8c7 * Firefox 1.5rc2.
svn path=/nixpkgs/trunk/; revision=4288
2005-11-17 11:46:44 +00:00
Eelco Dolstra 0e5659c43a * Firefox 1.5rc1.
svn path=/nixpkgs/trunk/; revision=4219
2005-11-04 12:58:50 +00:00
Armijn Hemel 98efb8f3ab add ethereal
svn path=/nixpkgs/trunk/; revision=4212
2005-11-03 19:55:05 +00:00
Armijn Hemel 0d7780bd71 whoops, this file does not belong here
svn path=/nixpkgs/trunk/; revision=4117
2005-10-22 11:51:53 +00:00
Armijn Hemel 3430d3d8a3 add the mozilla browser. The compilation process is nearly identical
to firefox, but there are some differences:
- don't source in $topsrcdir/browser/config/mozconfig (does not exist
it seems)
- different source tarball (different version that is)
- leave out the postinstall phase

svn path=/nixpkgs/trunk/; revision=4116
2005-10-22 11:51:30 +00:00
Eelco Dolstra 01fd1c1d00 * sylpheed-gtk2 -> sylpheed.
svn path=/nixpkgs/trunk/; revision=4092
2005-10-14 12:30:53 +00:00
Eelco Dolstra 86ca57f4bb * Toss out the old (GTK-1) Sylpheed.
svn path=/nixpkgs/trunk/; revision=4091
2005-10-14 12:27:07 +00:00
Eelco Dolstra 71739165a8 * Sylpheed updated to version 2.1.3, plus a quick hack to get it to build.
svn path=/nixpkgs/trunk/; revision=4090
2005-10-14 12:26:40 +00:00
Eelco Dolstra 1ca2ca9457 * Firefox 1.5beta2.
svn path=/nixpkgs/trunk/; revision=4035
2005-10-08 15:52:03 +00:00
Eelco Dolstra bdabd66a46 * Install ncurses header files in $out/include, not
$out/include/ncurses.  This simplifies many builders.

svn path=/nixpkgs/trunk/; revision=4008
2005-10-04 14:24:19 +00:00
Eelco Dolstra ffd49c15df * Firefox 1.0.7.
svn path=/nixpkgs/trunk/; revision=3933
2005-09-22 05:46:41 +00:00
Eelco Dolstra 138959ae38 * Bah.
svn path=/nixpkgs/trunk/; revision=3842
2005-09-16 09:35:02 +00:00
Eelco Dolstra 5395da12ec * Better purity.
svn path=/nixpkgs/trunk/; revision=3841
2005-09-16 09:18:49 +00:00
Eelco Dolstra 71d7ecd446 * Added w3m.
svn path=/nixpkgs/trunk/; revision=3827
2005-09-14 16:23:02 +00:00
Eelco Dolstra 78c1eb55df * Firefox 1.5beta1.
svn path=/nixpkgs/trunk/; revision=3801
2005-09-09 15:44:15 +00:00
Eelco Dolstra c27109efa0 * Added Valknut.
svn path=/nixpkgs/trunk/; revision=3746
2005-08-30 07:39:38 +00:00
Martin Bravenboer 975db72a72 Added Mozilla NSS, NSPR and Gaim to Nix. Gaim in Nix supports SSL
svn path=/nixpkgs/trunk/; revision=3676
2005-08-24 09:54:42 +00:00
Eelco Dolstra 454707da23 * catamaran.labs.cs.uu.nl -> nix.cs.uu.nl.
svn path=/nixpkgs/trunk/; revision=3660
2005-08-22 08:39:27 +00:00
Eelco Dolstra d42f0b60fa * Firefox 1.0.6.
svn path=/nixpkgs/trunk/; revision=3387
2005-07-20 08:46:47 +00:00
Eelco Dolstra 5c2f2d5325 * Firefox 1.0.5.
svn path=/nixpkgs/trunk/; revision=3337
2005-07-13 22:06:05 +00:00
Eelco Dolstra 0f77007f1a * Disable freetype2 because Thunderbird (like Firefox) doesn't like
Freetype >= 2.1.8.

  https://bugzilla.mozilla.org/show_bug.cgi?id=234035

svn path=/nixpkgs/trunk/; revision=3203
2005-06-18 07:20:10 +00:00
Eelco Dolstra 7e5de2061b * Added Sylpheed 1.9.11 (beta for GTK 2).
svn path=/nixpkgs/trunk/; revision=3149
2005-05-26 20:09:29 +00:00
Eelco Dolstra 7737d06698 * Sylpheed updated to 1.0.4.
svn path=/nixpkgs/trunk/; revision=3148
2005-05-26 19:45:29 +00:00
Eelco Dolstra 6485d5fc09 * Firefox updated to 1.0.4.
svn path=/nixpkgs/trunk/; revision=3039
2005-05-12 14:42:06 +00:00
Eelco Dolstra ba127513df * Firefox updated to 1.0.3.
svn path=/nixpkgs/trunk/; revision=2557
2005-04-16 11:37:43 +00:00
Eelco Dolstra 7775caaa35 * Evacuate tarballs.
svn path=/nixpkgs/trunk/; revision=2527
2005-04-11 13:09:01 +00:00
Eelco Dolstra a2feafba4f * Firefox 1.0.2.
svn path=/nixpkgs/trunk/; revision=2449
2005-03-24 11:32:46 +00:00
Eelco Dolstra f6e91bc9c9 * Merge r2396.
svn path=/nixpkgs/trunk/; revision=2397
2005-03-14 09:22:26 +00:00
Eelco Dolstra a93b037be8 * Added RealPlayer plugin support to Firefox. It's disabled by
default for legal reasons, but you can enabled it by uncommenting it
  in `all-packages-generic.nix', attribute `firefoxWrapper'.

svn path=/nixpkgs/trunk/; revision=2390
2005-03-12 13:35:27 +00:00
Eelco Dolstra 6ece42bad7 * MPlayer plugin 2.80.
svn path=/nixpkgs/trunk/; revision=2383
2005-03-11 14:27:34 +00:00
Eelco Dolstra afdac00409 * Firefox 1.0.1.
svn path=/nixpkgs/trunk/; revision=2298
2005-02-25 11:51:39 +00:00
Eelco Dolstra eeff1fcdd1 * More wrapper generation features. The Firefox wrapper generator is
now just 3 lines.

svn path=/nixpkgs/trunk/; revision=2243
2005-02-16 11:38:52 +00:00
Eelco Dolstra 3bf404a3f2 * Let the Mozilla plugins announce where in their output the actual
plugins are, rather then requiring certain fixed directories.

svn path=/nixpkgs/trunk/; revision=2242
2005-02-16 11:24:40 +00:00
Eelco Dolstra b930967805 * A utility function for the automatic generation of wrapper scripts.
svn path=/nixpkgs/trunk/; revision=2241
2005-02-16 11:13:18 +00:00
Eelco Dolstra e42507d182 * Move tarballs to catamaran so that we are no longer dependent on a
gazillion different servers.  Resurrected some 25 missing files.

svn path=/nixpkgs/trunk/; revision=2237
2005-02-15 14:44:19 +00:00
Eelco Dolstra 50d826abea * Sylpheed updated to 1.0.0. Also fixed OpenSSL support.
svn path=/nixpkgs/trunk/; revision=1986
2005-01-03 20:22:48 +00:00
Eelco Dolstra 17f7a05a97 * Sylpheed 1.0.0 beta 3.
svn path=/nixpkgs/trunk/; revision=1825
2004-12-01 15:36:38 +00:00
Eelco Dolstra 6e7849e362 * Firefox 1.0.
svn path=/nixpkgs/trunk/; revision=1741
2004-11-10 08:31:08 +00:00
Eelco Dolstra 431d07a330 * Firefox 1.0rc2.
svn path=/nixpkgs/trunk/; revision=1702
2004-11-05 15:51:16 +00:00
Eelco Dolstra d72d515068 * Add `--disable-freetype2'.
svn path=/nixpkgs/trunk/; revision=1672
2004-11-03 21:28:50 +00:00
Eelco Dolstra 8961308a07 * Firefox 1.0rc1.
svn path=/nixpkgs/trunk/; revision=1664
2004-11-03 16:27:38 +00:00
Eelco Dolstra bb421a4972 * Pass arguments.
svn path=/nixpkgs/trunk/; revision=1623
2004-10-31 18:58:48 +00:00
Eelco Dolstra 4fbb44e598 * Enable the Java applet plugin (through Blackdown) in Firefox.
svn path=/nixpkgs/trunk/; revision=1567
2004-10-17 14:30:11 +00:00
Eelco Dolstra 8b01d4ef0a * Added the Flash Player plugin.
* Plugins can specify extra directories to be added to LD_LIBRARY_PATH
  by the Firefox wrapper.  The Flash plugin need this since it's
  installed from a binary distribution, and so doesn't set the RPATH
  properly.
* Moved the MPlayer plugin to a plugins directory.

svn path=/nixpkgs/trunk/; revision=1566
2004-10-17 13:56:56 +00:00
Eelco Dolstra c233d6f67c * Wrapper around Firefox to add some default plugins (currently, the
MPlayer plugin).

svn path=/nixpkgs/trunk/; revision=1565
2004-10-17 13:28:28 +00:00
Eelco Dolstra 17257424b1 * Install header files again, they're needed to build plugins.
svn path=/nixpkgs/trunk/; revision=1563
2004-10-17 13:11:44 +00:00
Eelco Dolstra 5ef6c2a34e * Extensions now work properly. The extensions datasource etc. are
now generated at build time (it turns out to be possible to do that
  non-interactively, after all).

* Fixed creation of the bookmarks file (and other stuff) when creating
  a new profile.  When a new profile is created, it's copied from a
  default profile which is part of the Firefox installation.  However,
  since the default profile directory is in the Nix store, it's
  read-only.  Firefox keeps the read-only permission when copying the
  profile, so creating files in it (such as adding the bookmarks file)
  fails.  The `writable-copies' patch is a quick hack that adds write
  permission when copying files/directories.

svn path=/nixpkgs/trunk/; revision=1542
2004-10-05 19:54:56 +00:00
Eelco Dolstra 19249b2d3f * Firefox-1.0pre-PR-0.10.1 (uh...)
svn path=/nixpkgs/trunk/; revision=1539
2004-10-04 15:24:17 +00:00
Eelco Dolstra 7070dc0986 * Allow Firefox to be started again when there already is a running
instance.

svn path=/nixpkgs/trunk/; revision=1464
2004-09-19 15:24:01 +00:00
Eelco Dolstra ee672a7456 * Use browser/config/mozconfig to get a more "standard" Firefox
build.  The find bar now works properly (don't know why).
* Delete developer stuff (header files) after installation.

svn path=/nixpkgs/trunk/; revision=1463
2004-09-19 14:13:24 +00:00
Eelco Dolstra 5808ac7148 * Renamed Martin's linker derivation to `make-symlinks'.
* Propagate name automatically.

svn path=/nixpkgs/trunk/; revision=1409
2004-09-16 12:38:10 +00:00
Martin Bravenboer 4e4cfda97f Added Mozilla Thunderbird
svn path=/nixpkgs/trunk/; revision=1396
2004-09-15 11:06:15 +00:00
Eelco Dolstra a1ad30a00d * Firefox 1.0PR.
svn path=/nixpkgs/trunk/; revision=1395
2004-09-14 16:55:30 +00:00
Eelco Dolstra 45ac835af6 * Finally a real web browser!
svn path=/nixpkgs/trunk/; revision=1180
2004-07-26 10:33:58 +00:00
Eelco Dolstra 5503e2fc33 * Upgraded Glib, GTK, Sylpheed.
* Tried to upgrade Firefox to 0.9, but it's too broken.  It's
  basically impossible to build it automatically.  Firefox must be
  started once as a user with write permission to the Firefox
  directory to generate some files, and this can only be done
  interactively (apparently).  Hopefully 0.10 fixes this.  Firefox
  also barfs with link errors if the flag `--enable-single-profile' is
  not used.

svn path=/nixpkgs/trunk/; revision=1067
2004-06-21 15:49:03 +00:00
Eelco Dolstra b3c93a41c1 * Some changes to get Firefox working (it doesn't work yet, since
the freedesktop.org libXt is broken, but never mind that).

svn path=/nixpkgs/trunk/; revision=885
2004-03-31 09:45:19 +00:00
Eelco Dolstra 24cb251dd0 * Some more updates.
svn path=/nixpkgs/trunk/; revision=884
2004-03-30 17:42:45 +00:00
Eelco Dolstra 00004fa6da * More freedesktop.org X11 modules.
* Cleaned up some packages.

svn path=/nixpkgs/trunk/; revision=883
2004-03-30 17:28:41 +00:00
Eelco Dolstra 5a4de2c5de * Remove builder attributes.
* MPlayer: pass stdenv to w32codecs.

svn path=/nixpkgs/trunk/; revision=882
2004-03-30 15:15:19 +00:00
Eelco Dolstra 12ae5363ea * Remove trivial builders.
* Make builders unexecutable by removing the hash-bang line and
  execute permission.
* Convert calls to `derivation' to `mkDerivation'.
* Remove `system' and `stdenv' attributes from calls to
  `mkDerivation'.  These transformations were all done automatically,
  so it is quite possible I broke stuff.
* Put the `mkDerivation' function in stdenv/generic.

svn path=/nixpkgs/trunk/; revision=874
2004-03-29 17:23:01 +00:00
Eelco Dolstra 2fcc5fdb08 * "!isNull x" -> "x != null". Done automatically. Hope nothing
broke.

svn path=/nixpkgs/trunk/; revision=870
2004-03-29 10:25:25 +00:00
Eelco Dolstra 4f155b0f7a * Upgrades.
svn path=/nixpkgs/trunk/; revision=853
2004-03-27 15:48:19 +00:00
Eelco Dolstra 73049cea22 * Ugh.
svn path=/nixpkgs/trunk/; revision=774
2004-02-10 18:32:42 +00:00
Eelco Dolstra e0f8b5d722 * Updated to 0.9.8a.
svn path=/nixpkgs/trunk/; revision=674
2004-01-20 20:29:57 +00:00
Eelco Dolstra 4e38179977 * Upgrade to Pan 0.14.2.90.
svn path=/nixpkgs/trunk/; revision=562
2003-12-01 16:34:13 +00:00
Eelco Dolstra 026ff9466a * Rename .fix -> .nix.
svn path=/nixpkgs/trunk/; revision=511
2003-11-18 12:12:56 +00:00
Eelco Dolstra 48c3faca51 * Renamed pkgs-ng to pkgs.
svn path=/nixpkgs/trunk/; revision=502
2003-11-14 09:59:13 +00:00