Commit graph

860 commits

Author SHA1 Message Date
Yury G. Kudryashov 597412252a Wrap kde-related packages in kdePackagesFor
This lets hydra build kde packages for all available KDE releases.
Will commit NixOS-fix in a few minutes.

svn path=/nixpkgs/trunk/; revision=28833
2011-08-26 13:49:23 +00:00
Yury G. Kudryashov 5c90976c6a Add meta to kde-4.7 'subdir' pkgs
svn path=/nixpkgs/trunk/; revision=28816
2011-08-25 20:00:55 +00:00
Eelco Dolstra f3d7bcc851 * Fix description.
svn path=/nixpkgs/trunk/; revision=28779
2011-08-23 12:10:08 +00:00
Eelco Dolstra 8c37d99fd9 * Forgot to commit.
svn path=/nixpkgs/trunk/; revision=28778
2011-08-23 12:08:21 +00:00
Eelco Dolstra 8a70005921 * Updated xfce4-power-manager.
svn path=/nixpkgs/trunk/; revision=28763
2011-08-22 23:08:42 +00:00
Eelco Dolstra ffe1af714d * Xfce 4.8.
svn path=/nixpkgs/trunk/; revision=28761
2011-08-22 22:51:23 +00:00
Eelco Dolstra 1475781b19 * Rename xfce-4 to xfce-4.6 in preparation for Xfce 4.8.
svn path=/nixpkgs/trunk/; revision=28757
2011-08-22 17:40:07 +00:00
Eelco Dolstra 0b99612c18 * Layout.
svn path=/nixpkgs/trunk/; revision=28717
2011-08-21 00:13:34 +00:00
Yury G. Kudryashov b815a9ea40 Pass individual packages in kde-4.7
E.g., use
{ ..., marble, ... } : marble
instead of
{ ..., kdeedu, ... } : kdeedu.marble

svn path=/nixpkgs/trunk/; revision=28694
2011-08-19 15:42:58 +00:00
Yury G. Kudryashov 365cb2d262 kde-4.7: let nix-env and hydra find all modules
List of changes:
 * All individual packages moved to the top-level kde47 namespace.
 * Utility functions moved back to kde-package/default.nix

nix-env will not find kde-4.7 modules unless you add something like
'kde4 = pkgs.recurseIntoAttrs pkgs.kde47;' to your packageOverrides.

This is done because kde-4.7.0 on NixOS is not ready yet.

svn path=/nixpkgs/trunk/; revision=28693
2011-08-19 15:37:12 +00:00
Yury G. Kudryashov 25461a3939 kde-runtime-4.7: don't use ntrack as it causes kded4 to consume 100% CPU
svn path=/nixpkgs/trunk/; revision=28654
2011-08-18 12:52:35 +00:00
Yury G. Kudryashov c6458b5269 Do not pass kdebase to kget as buildInput
svn path=/nixpkgs/trunk/; revision=28653
2011-08-18 12:52:29 +00:00
Yury G. Kudryashov 06a34e5825 Use soprano-2.7.0 in kde-4.5.5
svn path=/nixpkgs/trunk/; revision=28601
2011-08-15 20:45:48 +00:00
Yury G. Kudryashov 519f4ea4b8 Add attribute that holds the resulting hierarchy
See comment in the committed code for details

svn path=/nixpkgs/trunk/; revision=28600
2011-08-15 19:28:12 +00:00
Yury G. Kudryashov 8abd44f249 Big kde-4.7.0 update
* Remove a lot of code duplication.
* Package almost all (except for smoke-based bindings).

svn path=/nixpkgs/trunk/; revision=28597
2011-08-15 18:06:26 +00:00
Yury G. Kudryashov 5a70c2dca8 Add samba and ntrack to deps
svn path=/nixpkgs/trunk/; revision=28471
2011-08-10 20:20:00 +00:00
Yury G. Kudryashov 63ea7f8950 Add boost and gpsd to deps
svn path=/nixpkgs/trunk/; revision=28470
2011-08-10 20:19:55 +00:00
Andres Löh ce5ccbb0ea Updating leksah.
svn path=/nixpkgs/trunk/; revision=28376
2011-08-08 07:41:45 +00:00
Karn Kallio d0fa51f709 Fi wrapper kde47 runtime.nix
svn path=/nixpkgs/trunk/; revision=28224
2011-08-07 17:50:45 +00:00
Karn Kallio b2a20db522 Copy kde45 wrap of nepomukservicestub with virtuoso.
svn path=/nixpkgs/trunk/; revision=28223
2011-08-07 17:50:32 +00:00
Karn Kallio a233ebf891 Switch to forward compatibility of kde45 on kde_baseapps.
svn path=/nixpkgs/trunk/; revision=28217
2011-08-07 01:45:26 +00:00
Karn Kallio 875b65ca0e Backwards compatibility on kdebase breaks detection.
svn path=/nixpkgs/trunk/; revision=28216
2011-08-07 01:27:23 +00:00
Karn Kallio cc160e2dc6 Extend kde47 backwards compatibility to include kdebase.
svn path=/nixpkgs/trunk/; revision=28215
2011-08-07 01:14:34 +00:00
Karn Kallio 278cc6dc0b First few programs of kde 4.7 kdeedu.
svn path=/nixpkgs/trunk/; revision=28213
2011-08-07 00:38:11 +00:00
Karn Kallio 37c45263c6 Repair kruler build (phonon is required).
svn path=/nixpkgs/trunk/; revision=28212
2011-08-07 00:37:49 +00:00
Karn Kallio d587e3720b Forgot to move kruler.nix
svn path=/nixpkgs/trunk/; revision=28211
2011-08-07 00:37:32 +00:00
Karn Kallio 7648a6cf65 Set up kdegraphics section in kde 4.7
svn path=/nixpkgs/trunk/; revision=28210
2011-08-07 00:37:14 +00:00
Eelco Dolstra 99ff06be3e * KDE 4.5 needs an older version of shared-desktop-ontologies.
svn path=/nixpkgs/branches/kde-4.7/; revision=28103
2011-08-01 09:08:57 +00:00
Eelco Dolstra 08b9b370a4 * KDE 4.5: use an old ffmpeg.
svn path=/nixpkgs/branches/kde-4.7/; revision=28102
2011-08-01 08:32:20 +00:00
Eelco Dolstra 483bedccda * Disable kdebindings in the old KDE 4.5. It doesn't build anymore
due to changes in Phonon and other packages.  It's not really
  important anyway.

svn path=/nixpkgs/branches/kde-4.7/; revision=28022
2011-07-31 19:12:10 +00:00
Eelco Dolstra 35437ef75b * Updated kdepim-runtime and kdepim.
svn path=/nixpkgs/branches/kde-4.7/; revision=28008
2011-07-29 19:05:52 +00:00
Eelco Dolstra 980b453102 * Fix localisation.
svn path=/nixpkgs/branches/kde-4.7/; revision=28007
2011-07-29 17:48:39 +00:00
Eelco Dolstra 76fffef175 * More stuff.
svn path=/nixpkgs/branches/kde-4.7/; revision=28006
2011-07-29 17:24:59 +00:00
Eelco Dolstra aee4ccdee0 * Updated kdeartwork.
svn path=/nixpkgs/branches/kde-4.7/; revision=28005
2011-07-29 16:09:55 +00:00
Eelco Dolstra d3df8a3085 * Updated kdeaccessibility.
svn path=/nixpkgs/branches/kde-4.7/; revision=28001
2011-07-29 14:30:07 +00:00
Eelco Dolstra 2d4c4ae1bd * Updated kdewebdev.
svn path=/nixpkgs/branches/kde-4.7/; revision=28000
2011-07-29 14:16:12 +00:00
Eelco Dolstra 9650b1283e * Updated kdesdk.
svn path=/nixpkgs/branches/kde-4.7/; revision=27999
2011-07-29 13:50:53 +00:00
Eelco Dolstra e7b76a6db3 * Updated kdetoys.
svn path=/nixpkgs/branches/kde-4.7/; revision=27998
2011-07-29 12:41:31 +00:00
Eelco Dolstra dd8cc506b5 * Update kdeutils.
svn path=/nixpkgs/branches/kde-4.7/; revision=27997
2011-07-29 12:31:07 +00:00
Eelco Dolstra 7d06b01a34 * Fix KDE's fixed-output derivations.
svn path=/nixpkgs/branches/kde-4.7/; revision=27995
2011-07-29 08:43:43 +00:00
Eelco Dolstra 6f8c9ddc39 * KDE 4.7.0.
svn path=/nixpkgs/branches/kde-4.7/; revision=27989
2011-07-28 12:52:15 +00:00
Eelco Dolstra bf229fc985 * Move Phonon out of KDE.
svn path=/nixpkgs/branches/kde-4.7/; revision=27988
2011-07-28 12:20:12 +00:00
Eelco Dolstra 6c4f6ceb4f * Remove the KDE 4.6 RC expressions.
svn path=/nixpkgs/branches/kde-4.7/; revision=27984
2011-07-28 11:18:57 +00:00
Eelco Dolstra 9725e1376f * Updated kdemultimedia.
svn path=/nixpkgs/branches/kde-4.7/; revision=27953
2011-07-25 20:17:36 +00:00
Eelco Dolstra 012e221de9 * kde-workspace requires PAM.
svn path=/nixpkgs/branches/kde-4.7/; revision=27907
2011-07-22 23:59:59 +00:00
Eelco Dolstra a5a9f1fb2e * Fix kpythonpluginfactory.
svn path=/nixpkgs/branches/kde-4.7/; revision=27899
2011-07-22 01:54:04 +00:00
Eelco Dolstra 9379248ef3 * Update kdeadmin and kdegames.
svn path=/nixpkgs/branches/kde-4.7/; revision=27898
2011-07-22 01:28:09 +00:00
Eelco Dolstra 5a03576cb4 * Update kdegames.
svn path=/nixpkgs/branches/kde-4.7/; revision=27894
2011-07-21 21:54:40 +00:00
Eelco Dolstra aa6f8184b5 * Update kdepimlibs.
* Remove unnecessary NIX_LDFLAGS hacks.

svn path=/nixpkgs/branches/kde-4.7/; revision=27887
2011-07-21 19:16:21 +00:00
Eelco Dolstra 439714b3fa * Allow KDE to find the xkeyboard-config files.
svn path=/nixpkgs/branches/kde-4.7/; revision=27871
2011-07-21 12:33:44 +00:00
Eelco Dolstra ef041b7aa3 * Hack to fix evaluation.
svn path=/nixpkgs/branches/kde-4.7/; revision=27869
2011-07-21 11:56:11 +00:00
Eelco Dolstra b32ea60b4e * Remove some obsolete expressions.
svn path=/nixpkgs/branches/kde-4.7/; revision=27868
2011-07-21 11:53:49 +00:00
Eelco Dolstra 7ae6dbd7d6 * Add the GStreamer backend for Phonon.
svn path=/nixpkgs/branches/kde-4.7/; revision=27819
2011-07-18 12:37:50 +00:00
Eelco Dolstra 3c668adea1 * Pass Phonon as a dependency where needed.
svn path=/nixpkgs/branches/kde-4.7/; revision=27815
2011-07-18 10:29:20 +00:00
Eelco Dolstra 9e92839468 * Fix incorrect path to kde4-config in startkde.
svn path=/nixpkgs/branches/kde-4.7/; revision=27812
2011-07-17 15:55:33 +00:00
Eelco Dolstra f3d8b47f22 * Add kde-wallpapers, which contains the default KDE and KDM
wallpaper.

svn path=/nixpkgs/branches/kde-4.7/; revision=27811
2011-07-17 14:24:43 +00:00
Eelco Dolstra e482393ad1 * Add kde-runtime. It requires a newer Phonon than provided by Qt, so
add that as well.  Maybe we should build Qt without Phonon to remove
  potential interference...

svn path=/nixpkgs/branches/kde-4.7/; revision=27810
2011-07-17 14:10:41 +00:00
Eelco Dolstra bc16ee83ae * The NixOS kdm.nix module expects a kdebase_workspace attribute.
svn path=/nixpkgs/branches/kde-4.7/; revision=27794
2011-07-15 09:50:37 +00:00
Eelco Dolstra 298c78ef40 * Build kdm.
svn path=/nixpkgs/branches/kde-4.7/; revision=27772
2011-07-14 08:42:01 +00:00
Eelco Dolstra 71c508f641 * Akonadi updated to 1.6.0.
svn path=/nixpkgs/branches/kde-4.7/; revision=27768
2011-07-13 18:15:57 +00:00
Eelco Dolstra a90c3142ee * KDE 4.7rc2.
svn path=/nixpkgs/branches/kde-4.7/; revision=27759
2011-07-13 13:08:49 +00:00
Eelco Dolstra c3e3111231 * Add kde-workspace.
* Make sure that polkit actions get installed in $out.

svn path=/nixpkgs/branches/kde-4.7/; revision=27737
2011-07-12 13:24:35 +00:00
Eelco Dolstra b39f08ea8e * Added Kamera.
svn path=/nixpkgs/branches/kde-4.7/; revision=27736
2011-07-12 13:14:23 +00:00
Eelco Dolstra 2c35988c77 * More KDE apps.
svn path=/nixpkgs/branches/kde-4.7/; revision=27728
2011-07-11 16:26:17 +00:00
Eelco Dolstra 8cb2e1860f * Add libkipi and libkexiv2.
svn path=/nixpkgs/branches/kde-4.7/; revision=27727
2011-07-11 16:13:40 +00:00
Eelco Dolstra 9bf61690e8 * Added kde-baseapps and Gwenview.
svn path=/nixpkgs/branches/kde-4.7/; revision=27726
2011-07-11 15:33:41 +00:00
Eelco Dolstra 4b02855065 * Added Konsole.
svn path=/nixpkgs/branches/kde-4.7/; revision=27725
2011-07-11 14:47:39 +00:00
Eelco Dolstra dce69134d0 * Added Okular (which is a separate package now).
svn path=/nixpkgs/branches/kde-4.7/; revision=27723
2011-07-11 14:29:27 +00:00
Eelco Dolstra 76ec0dd430 * Update a bunch of dependencies of kdelibs.
svn path=/nixpkgs/branches/kde-4.7/; revision=27702
2011-07-11 10:49:21 +00:00
Eelco Dolstra 22ab3fe1ab * Start of KDE 4.7. Only kdelibs builds currently.
svn path=/nixpkgs/branches/kde-4.7/; revision=27645
2011-07-07 20:48:51 +00:00
Eelco Dolstra 7737d33233 * Use libsoup 2.33 everywhere.
svn path=/nixpkgs/trunk/; revision=27613
2011-07-05 15:14:44 +00:00
Eelco Dolstra b5b7cbb9ea * Removed unused libsoup version.
svn path=/nixpkgs/trunk/; revision=27612
2011-07-05 14:52:15 +00:00
Alexander Tsamutali ff910beca6 desktops/gnome-2.28/desktop/vte: Updated to 0.28.0.
svn path=/nixpkgs/trunk/; revision=27430
2011-06-13 14:08:04 +00:00
Cillian de Roiste 8135f030f0 Adding libgnomecanvasmm, a dependency for Ardour3
svn path=/nixpkgs/trunk/; revision=27074
2011-05-01 13:45:46 +00:00
Shea Levy 30701417c8 Bump libgweather to 2.30.3
svn path=/nixpkgs/trunk/; revision=26922
2011-04-22 17:30:39 +00:00
Shea Levy ad67aa4549 Bump gtkhtml to 3.32.2
svn path=/nixpkgs/trunk/; revision=26921
2011-04-22 17:08:02 +00:00
Michael Raskin cc6ecaeeef Add glib-networking: module to use with TLS
svn path=/nixpkgs/trunk/; revision=26848
2011-04-15 05:24:06 +00:00
Michael Raskin bac6b69e18 Fix build of libsoup 2.31
svn path=/nixpkgs/trunk/; revision=26846
2011-04-14 19:04:39 +00:00
Karn Kallio 422455271c GnuTLS now introduces a dependency on gmp.
-- also removed poorly considered earlier individual patches.

svn path=/nixpkgs/trunk/; revision=26810
2011-04-12 16:59:52 +00:00
Karn Kallio 4453c35785 Pass gmp to libsoup.
svn path=/nixpkgs/trunk/; revision=26807
2011-04-12 16:23:42 +00:00
Ludovic Courtès 5f6260ed3e libsoup: Add missing dependency on libgcrypt.
svn path=/nixpkgs/trunk/; revision=26800
2011-04-12 09:19:54 +00:00
Michael Raskin ac108080c2 libsoup 2.33
svn path=/nixpkgs/trunk/; revision=26415
2011-03-18 08:25:46 +00:00
Michael Raskin 80f5df945d Add libsoup 2.33
svn path=/nixpkgs/trunk/; revision=26412
2011-03-18 08:02:48 +00:00
Eelco Dolstra 27e2e063fb * Enable parallel building of KDE.
svn path=/nixpkgs/branches/x-updates/; revision=26282
2011-03-11 16:41:10 +00:00
Eelco Dolstra eff916e9d9 * Don't do compositing when using the OpenGL software renderer
(NixOS/121).

svn path=/nixpkgs/branches/x-updates/; revision=26281
2011-03-11 16:40:59 +00:00
Yury G. Kudryashov 4a5b7854a8 Move eigen outside of kde-4.x
Michael, sorry for overriding your work but I want to maintain it...

svn path=/nixpkgs/trunk/; revision=26058
2011-02-22 11:54:56 +00:00
Yury G. Kudryashov 0646cfee1e Move strigi outside of kde-4.x
svn path=/nixpkgs/trunk/; revision=26057
2011-02-22 11:54:49 +00:00
Yury G. Kudryashov 78127c3b86 Move qimageblitz outside of kde-4.x
svn path=/nixpkgs/trunk/; revision=26056
2011-02-22 11:54:42 +00:00
Yury G. Kudryashov 68299a0202 Move qca2 outside of kde-4.x
svn path=/nixpkgs/trunk/; revision=26053
2011-02-22 09:53:01 +00:00
Yury G. Kudryashov 75f4d9972d More explicit dependencies
svn path=/nixpkgs/trunk/; revision=26052
2011-02-22 09:52:54 +00:00
Yury G. Kudryashov 513947cf9f polkit-qt-1: add pkgconfig to explicit buildInputs
svn path=/nixpkgs/trunk/; revision=26051
2011-02-22 06:19:21 +00:00
Yury G. Kudryashov db67fc27a3 Explicitly depend on pkgconfig
svn path=/nixpkgs/trunk/; revision=26050
2011-02-22 06:19:17 +00:00
Yury G. Kudryashov 3b3f50e405 Move automoc4 out of kde-4.x/
kde-4.x/ is for software that is released with kde releases,
not for anything hosted on *.kde.org or in kde svn/git.

svn path=/nixpkgs/trunk/; revision=26048
2011-02-22 06:19:05 +00:00
Yury G. Kudryashov a37558d8df Remove unused manifests
svn path=/nixpkgs/trunk/; revision=26039
2011-02-21 07:32:55 +00:00
Yury G. Kudryashov d6199a2ca1 Add kde46.kdelibs.meta
svn path=/nixpkgs/trunk/; revision=26019
2011-02-18 09:02:45 +00:00
Yury G. Kudryashov 0c7c2c5c30 kdepim{,runtime}-4.5.94.1
svn path=/nixpkgs/trunk/; revision=25939
2011-02-13 04:37:08 +00:00
Yury G. Kudryashov 96636f0779 kdepimlibs-4.6.0: add libxslt
svn path=/nixpkgs/trunk/; revision=25938
2011-02-13 04:37:04 +00:00
Yury G. Kudryashov 87c534b7d0 Fix evaluation
svn path=/nixpkgs/trunk/; revision=25937
2011-02-13 04:37:00 +00:00
Yury G. Kudryashov 424c73794d kde-4.6/akonadi-1.5.0
svn path=/nixpkgs/trunk/; revision=25935
2011-02-13 04:36:51 +00:00
Yury G. Kudryashov c1e48180f8 soprano-2.6.0
svn path=/nixpkgs/trunk/; revision=25934
2011-02-13 04:36:47 +00:00
Yury G. Kudryashov ab49679292 KDE-4.6.0 (not ready yet!!)
Mostly automatic changes. Will fix evaluation/compilation later.

svn path=/nixpkgs/trunk/; revision=25933
2011-02-13 04:36:41 +00:00
Yury G. Kudryashov 5e7c026c22 kde-x.y/utils is for kdeutils-x.y.z, not for apps from kde-apps.org
svn path=/nixpkgs/trunk/; revision=25932
2011-02-13 04:34:37 +00:00
Yury G. Kudryashov 525314a0cd librsvg: propagate glib and gtk
svn path=/nixpkgs/trunk/; revision=25866
2011-02-09 21:10:20 +00:00
Yury G. Kudryashov ba15e16195 attica-0.2.0
svn path=/nixpkgs/trunk/; revision=25862
2011-02-09 21:09:36 +00:00
Yury G. Kudryashov d347662b25 soprano-2.5.3
svn path=/nixpkgs/trunk/; revision=25861
2011-02-09 21:09:24 +00:00
Yury G. Kudryashov cd42c8087e akonadi-1.4.3
svn path=/nixpkgs/trunk/; revision=25860
2011-02-09 21:09:10 +00:00
Michael Raskin 7f0c493b1c Add python scripting support to Kig
svn path=/nixpkgs/trunk/; revision=25800
2011-02-08 10:38:52 +00:00
Eelco Dolstra e87f7fdf1b * Doh.
svn path=/nixpkgs/trunk/; revision=25767
2011-02-02 16:44:50 +00:00
Eelco Dolstra 88b1fb3554 * Fix oxygen-icons' outputHash. (OMG is the oxygen-icons tarball
really 278 MB?)

svn path=/nixpkgs/trunk/; revision=25766
2011-02-02 16:41:37 +00:00
Eelco Dolstra cafbcf1391 * Delete KDE 4.4 - obsolete.
svn path=/nixpkgs/trunk/; revision=25762
2011-02-02 14:24:56 +00:00
Eelco Dolstra a3fe61586c * Updated KDE to 4.5.5.
* Removed the KDE version number from all expressions except the
  top-level default.nix.  This makes it easier to upgrade.
* Deleted the old l10n versions since there doesn't seem to be a good
  reason to keep them around. 
* Don't use replaceChars (slow!) but do the name sanitization in
  l10n-manifest.sh.

svn path=/nixpkgs/trunk/; revision=25760
2011-02-02 13:54:35 +00:00
Cillian de Roiste ff52b21fe8 Adding KDE wacom (graphic tablet) configuration tool
svn path=/nixpkgs/trunk/; revision=25708
2011-01-27 21:47:30 +00:00
Evgeny Egorochkin 180205a431 knetwork-manager: package and enable support in KDE to see what is going to break.
svn path=/nixpkgs/trunk/; revision=25375
2011-01-04 00:28:22 +00:00
Eelco Dolstra aa6f43149a * Sync with the trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=25308
2010-12-28 16:42:00 +00:00
Yury G. Kudryashov 1d24f31783 Really exclude kde-4.6 from hydra builds
svn path=/nixpkgs/trunk/; revision=25290
2010-12-26 17:18:19 +00:00
Yury G. Kudryashov e9e22a7238 Rename hupnp to herqq
Don't pass it to kdelibs as it breaks kdelibs build

svn path=/nixpkgs/trunk/; revision=25289
2010-12-26 17:18:13 +00:00
Yury G. Kudryashov ac2b5582e2 kde-l10n-4.5.90
svn path=/nixpkgs/trunk/; revision=25288
2010-12-26 15:27:39 +00:00
Yury G. Kudryashov 14e49759aa kdelibs-4.5.90
svn path=/nixpkgs/trunk/; revision=25287
2010-12-26 15:27:33 +00:00
Yury G. Kudryashov 4f140371a5 akonadi-1.4.90
svn path=/nixpkgs/trunk/; revision=25285
2010-12-26 15:27:20 +00:00
Yury G. Kudryashov b0cbe093ba attica-0.2.0
svn path=/nixpkgs/trunk/; revision=25284
2010-12-26 15:27:15 +00:00
Yury G. Kudryashov 3d73157901 polkit-qt-1-0.99.0
svn path=/nixpkgs/trunk/; revision=25283
2010-12-26 15:27:09 +00:00
Yury G. Kudryashov e27e6a97e5 oxygen-icons-4.5.90
svn path=/nixpkgs/trunk/; revision=25282
2010-12-26 15:27:01 +00:00
Yury G. Kudryashov ea3d59b437 soprano-2.5.63
svn path=/nixpkgs/trunk/; revision=25281
2010-12-26 15:26:52 +00:00
Yury G. Kudryashov a7ddd93631 sed 4.5.4->4.5.90, nothing tested
svn path=/nixpkgs/trunk/; revision=25280
2010-12-26 15:26:42 +00:00
Yury G. Kudryashov 58ca4111ad Start kde-4.6: copy 4.5, remove from release
svn path=/nixpkgs/trunk/; revision=25279
2010-12-26 15:26:01 +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
Yury G. Kudryashov c898090c15 Switch to kde-l10n-4.5.4 by default
svn path=/nixpkgs/trunk/; revision=25115
2010-12-14 10:21:29 +00:00
Yury G. Kudryashov dcdfdf3f59 Fix oxygen-icons output hash
svn path=/nixpkgs/trunk/; revision=25114
2010-12-14 10:21:24 +00:00
Yury G. Kudryashov f960334d72 kde-4.5.4, kdepim-4.4.8: evaluates
svn path=/nixpkgs/trunk/; revision=25113
2010-12-14 10:21:17 +00:00
Lluís Batlle i Rossell ee04ffcb55 Updating from trunk. I resolved simple conflicts.
svn path=/nixpkgs/branches/stdenv-updates/; revision=25061
2010-12-11 12:47:00 +00:00
Yury G. Kudryashov f3d4030979 Remove unused items from manifest.nix
svn path=/nixpkgs/trunk/; revision=24995
2010-12-06 12:04:31 +00:00
Yury G. Kudryashov dc44c0eeeb kde-l10n-4.5.3
svn path=/nixpkgs/trunk/; revision=24994
2010-12-06 12:04:27 +00:00
Yury G. Kudryashov 9d8000c968 Fix l10n manifest generation script
svn path=/nixpkgs/trunk/; revision=24993
2010-12-06 12:04:21 +00:00
Yury G. Kudryashov 1f558f78df There will be no kdepim-4.5.x
svn path=/nixpkgs/trunk/; revision=24992
2010-12-06 12:04:16 +00:00
Lluís Batlle i Rossell 0e4c970d11 Updating from trunk - I hope I fixed the conflict around gettext - I left it as
it was before merging.


svn path=/nixpkgs/branches/stdenv-updates/; revision=24876
2010-11-26 14:40:39 +00:00
Yury G. Kudryashov 0dcd86ef0f Make kdebindings compile with newer sip
svn path=/nixpkgs/trunk/; revision=24838
2010-11-24 10:49:34 +00:00
Lluís Batlle i Rossell 8746de3ae8 Updating from trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=24674
2010-11-11 22:18:14 +00:00
Piotr Pietraszkiewicz 7ce8c4b77e fixed compilation error, debian bug #577368 (implicit decl. of function 'GTK_WIDGET_SENSITIVE'), by bumping gtkhtml to version 3.29.92.1
svn path=/nixpkgs/trunk/; revision=24581
2010-11-02 20:09:15 +00:00
Lluís Batlle i Rossell f4f84af4ab Updating from trunk. I only had to take away the usual stdenv2 in
all-packages.nix


svn path=/nixpkgs/branches/stdenv-updates/; revision=24553
2010-10-31 19:30:31 +00:00
Evgeny Egorochkin 84f61bc6d5 Strigi: bump to 0.7.2
svn path=/nixpkgs/trunk/; revision=24461
2010-10-25 05:20:44 +00:00
Yury G. Kudryashov ac0dea26fb Fix typo
svn path=/nixpkgs/trunk/; revision=24439
2010-10-23 20:50:06 +00:00
Yury G. Kudryashov 6863d3f740 kdepim-4.4.7
svn path=/nixpkgs/trunk/; revision=24436
2010-10-23 18:48:49 +00:00
Yury G. Kudryashov 25869d5553 Fix kdepim-4.5 compilation
svn path=/nixpkgs/trunk/; revision=24435
2010-10-23 18:48:42 +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
Yury G. Kudryashov 0a21ec52e5 Sanitize names, so kde4.l10n.ca_valencia works
svn path=/nixpkgs/trunk/; revision=24395
2010-10-21 06:56:28 +00:00
Yury G. Kudryashov edc04aeef5 kde-l10n-4.5.2; refactor kde-l10n
svn path=/nixpkgs/trunk/; revision=24393
2010-10-20 22:42:48 +00:00
Yury G. Kudryashov 6731bd48ee Restore an accidentially removed patch
svn path=/nixpkgs/trunk/; revision=24392
2010-10-20 21:19:30 +00:00
Yury G. Kudryashov 340b02c7c9 kde-4.5.2
svn path=/nixpkgs/trunk/; revision=24332
2010-10-17 18:44:39 +00:00
Yury G. Kudryashov 586de5566a oxygen-icons-4.5.2
svn path=/nixpkgs/trunk/; revision=24330
2010-10-17 18:43:50 +00:00
Yury G. Kudryashov 88ad6e74c8 cleanup
svn path=/nixpkgs/trunk/; revision=24328
2010-10-17 18:43:38 +00:00
Yury G. Kudryashov 7e03aecb57 Add kde-4.5.2 to manifest
svn path=/nixpkgs/trunk/; revision=24327
2010-10-17 18:43:31 +00:00
Yury G. Kudryashov ca15959e2e Remove phonon from kde-4.5: we use one from qt
svn path=/nixpkgs/trunk/; revision=24326
2010-10-17 18:43:24 +00:00
Eelco Dolstra 1758b488e6 * Some hackery to make the split KDE packages available both
individually and combined.  For instance, you can say

    environment.systemPackages = [ pkgs.kde4.kdesdk.kcachegrind ];

  for just kcachegrind, or 

    environment.systemPackages = [ pkgs.kde4.kdesdk ];

  to get all of kdesdk.  Everything can also be installed by name
  through nix-env.  (There is a name clash between the ColorSchemes
  packages in kdeaccessibility and kdeartwork, though.)

svn path=/nixpkgs/trunk/; revision=24294
2010-10-14 16:49:41 +00:00
Eelco Dolstra 0fcf6e1f40 * Added xfce4-mixer. This requires gstreamer and gst-plugins-base.
* Allow gst-plugins-base to be built with a minimal set of dependencies
  (to prevent dependency bloat in Xfce).
* Updated gstreamer.

svn path=/nixpkgs/trunk/; revision=24207
2010-10-10 22:34:48 +00:00
Lluís Batlle i Rossell e7e103b8eb Updating from trunk (to catch cron changes)
svn path=/nixpkgs/branches/stdenv-updates/; revision=24200
2010-10-10 11:44:28 +00:00
Yury G. Kudryashov 29ddcdb5ad kdepim move
svn path=/nixpkgs/trunk/; revision=24191
2010-10-10 05:03:07 +00:00
Lluís Batlle i Rossell fca582bff0 Updating from trunk. I had to resolve the pcre and some stdenv2 in all-packages
svn path=/nixpkgs/branches/stdenv-updates/; revision=24155
2010-10-07 21:21:31 +00:00
Yury G. Kudryashov 673e66e3a3 Move most kde-extragear apps to top-level
svn path=/nixpkgs/trunk/; revision=24092
2010-10-05 17:44:33 +00:00
Yury G. Kudryashov d7d8f7d64f Force stdenv2 in kde4 scope
svn path=/nixpkgs/trunk/; revision=24090
2010-10-05 17:44:11 +00:00
Yury G. Kudryashov 739f82a526 Digikam-1.4.0, move to all-packages.nix
svn path=/nixpkgs/trunk/; revision=24089
2010-10-05 17:44:05 +00:00
Yury G. Kudryashov bf340ad55a Move kipi-plugins to apps/graphics
svn path=/nixpkgs/trunk/; revision=24088
2010-10-05 17:43:57 +00:00
Yury G. Kudryashov 67b5d732a2 Move kdevplatform and kdevelop to all-packages.nix
svn path=/nixpkgs/trunk/; revision=24063
2010-10-05 05:43:39 +00:00
Yury G. Kudryashov 6aaf62e8d7 Remove kde-l10n-ca@valencia to make hydra happy
svn path=/nixpkgs/trunk/; revision=24048
2010-10-04 11:32:56 +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
Russell O'Connor e99b3198fa Make pulseaudio support in phonon configurable.
svn path=/nixpkgs/trunk/; revision=24027
2010-10-02 23:12:59 +00:00
Yury G. Kudryashov 1361a85331 Add kde-l10n-4.5.1
svn path=/nixpkgs/trunk/; revision=24023
2010-10-02 05:24:06 +00:00
Yury G. Kudryashov b9fb4fee61 Move amarok from kde4. to applications/audio
svn path=/nixpkgs/trunk/; revision=23956
2010-09-26 19:40:30 +00:00
Evgeny Egorochkin c7126b63af Amarok: make scripts work, prettify the builder
svn path=/nixpkgs/trunk/; revision=23936
2010-09-26 06:59:13 +00:00
Evgeny Egorochkin 8a68518454 Samba: option to compile winbind which is used by some apps under Wine
svn path=/nixpkgs/trunk/; revision=23935
2010-09-26 05:07:41 +00:00
Evgeny Egorochkin 80aed14c87 KDE: PIM: make it actually work if you install it, without having to hunt for missing dependencies
svn path=/nixpkgs/trunk/; revision=23903
2010-09-22 22:55:42 +00:00
Yury G. Kudryashov 58c09d0ff2 Move koffice to applications/office
svn path=/nixpkgs/trunk/; revision=23900
2010-09-22 18:04:55 +00:00
Yury G. Kudryashov 57a42bd5ba Use kdepim{,-runtime}-4.4.x in 4.5 till kdepim-4.5 will become stable
svn path=/nixpkgs/trunk/; revision=23895
2010-09-22 18:04:21 +00:00
Evgeny Egorochkin cbda1c23bb KDE: Konq-plugins: packaged
svn path=/nixpkgs/trunk/; revision=23891
2010-09-22 07:53:28 +00:00
Evgeny Egorochkin 748fa38a35 KDE: Solid: compile in bluetooth support
svn path=/nixpkgs/trunk/; revision=23888
2010-09-22 00:39:38 +00:00
Yury G. Kudryashov daa59407c7 Oops.. Wrong name
svn path=/nixpkgs/trunk/; revision=23873
2010-09-20 14:17:54 +00:00
Yury G. Kudryashov b8b2e300be soprano-2.5.2
svn path=/nixpkgs/trunk/; revision=23844
2010-09-17 20:36:25 +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
Yury G. Kudryashov dd37d34e5f kdeadmin-4.5.1, kdeplasma-addons-4.5.1. Have no time to split
svn path=/nixpkgs/trunk/; revision=23805
2010-09-15 05:19:44 +00:00
Yury G. Kudryashov f0418c74b6 kdegames-4.5.1
svn path=/nixpkgs/trunk/; revision=23804
2010-09-15 05:19:35 +00:00
Yury G. Kudryashov ecc9b176b0 kdemultimedia: tunepimp, musicbrainz
svn path=/nixpkgs/trunk/; revision=23798
2010-09-14 14:29:49 +00:00
Yury G. Kudryashov 95b08e5381 kdegraphics-4.5.1
svn path=/nixpkgs/trunk/; revision=23791
2010-09-14 14:29:08 +00:00
Yury G. Kudryashov 76a3eb02d3 kdeutils-4.5.1
svn path=/nixpkgs/trunk/; revision=23790
2010-09-14 14:29:01 +00:00
Yury G. Kudryashov bb568e7467 Delete unused files
svn path=/nixpkgs/trunk/; revision=23789
2010-09-14 14:28:55 +00:00
Michael Raskin b49a2d16b2 Add overridability to gnome
svn path=/nixpkgs/trunk/; revision=23773
2010-09-13 20:54:46 +00:00
Yury G. Kudryashov 75f08dffa6 kdewebdev-4.5.1, splitted
svn path=/nixpkgs/trunk/; revision=23771
2010-09-13 20:14:45 +00:00
Yury G. Kudryashov ddce0423d9 Fix kde-4.5 kscreensaver
svn path=/nixpkgs/trunk/; revision=23768
2010-09-13 17:34:19 +00:00
Yury G. Kudryashov ea18f17f8c kdetoys-4.5.1, splitted
svn path=/nixpkgs/trunk/; revision=23759
2010-09-13 14:23:36 +00:00
Yury G. Kudryashov 20b190b582 kdesdk-4.5.1, splitted
svn path=/nixpkgs/trunk/; revision=23758
2010-09-13 14:23:29 +00:00
Yury G. Kudryashov c4beccaf1a Remove unused patch
svn path=/nixpkgs/trunk/; revision=23757
2010-09-13 14:23:21 +00:00
Yury G. Kudryashov 84040e15cc kdenetwork-4.5.1, kdeedu-4.5.1
svn path=/nixpkgs/trunk/; revision=23756
2010-09-13 14:23:16 +00:00
Yury G. Kudryashov e723e53699 Use new ktorrent in kde44
svn path=/nixpkgs/trunk/; revision=23755
2010-09-13 14:23:08 +00:00
Yury G. Kudryashov d611b0aedb Upgrade&split kdeartwork
svn path=/nixpkgs/trunk/; revision=23752
2010-09-13 14:22:51 +00:00
Yury G. Kudryashov 20a0469f1c kdebase-{runtime,workspace}, kdebindings
svn path=/nixpkgs/trunk/; revision=23751
2010-09-13 14:22:43 +00:00
Yury G. Kudryashov e7c7d6a00d kdepim, kdepim-runtime, kdebase upgrade
svn path=/nixpkgs/trunk/; revision=23707
2010-09-09 20:04:56 +00:00
Yury G. Kudryashov e7ca8b0d84 (un)propagate some buildInputs
svn path=/nixpkgs/trunk/; revision=23706
2010-09-09 20:04:50 +00:00
Yury G. Kudryashov 14a8df0615 kdepimlibs-4.5.1
svn path=/nixpkgs/trunk/; revision=23680
2010-09-08 09:56:40 +00:00
Michael Raskin 7ad068644e Adding GNOME rarian - scrollkeeper replacement
svn path=/nixpkgs/trunk/; revision=23643
2010-09-05 12:48:39 +00:00
Yury G. Kudryashov 99015c8de7 kdeaccessibility-4.5.1, splitted
svn path=/nixpkgs/trunk/; revision=23637
2010-09-04 19:53:39 +00:00
Yury G. Kudryashov 8312b2e5b9 Move kdeutils components into kdeutils. prefix
Now one can use lib.attrValues kde45.kdeutils to install full kdeutils.

svn path=/nixpkgs/trunk/; revision=23626
2010-09-03 17:41:00 +00:00
Yury G. Kudryashov 2c31d81cdb kdelibs-4.5.1
svn path=/nixpkgs/trunk/; revision=23623
2010-09-03 17:40:45 +00:00
Yury G. Kudryashov b11040eb38 oxygen-icons-4.5.1
svn path=/nixpkgs/trunk/; revision=23622
2010-09-03 17:40:29 +00:00
Lluís Batlle i Rossell ea35aa3836 Making scrollkeeper build in the loongson (config.guess trouble)
svn path=/nixpkgs/branches/stdenv-updates/; revision=23580
2010-09-01 08:36:35 +00:00
Yury G. Kudryashov 6473176133 Split kdeutils, adopt kdePackage
Also migrate existing kdePackage users to new API

svn path=/nixpkgs/trunk/; revision=23525
2010-08-29 21:20:38 +00:00
Lluís Batlle i Rossell cca1cae042 Updating from trunk. I had to do some changes to make it fit.
svn path=/nixpkgs/branches/stdenv-updates/; revision=23500
2010-08-29 11:09:23 +00:00
Lluís Batlle i Rossell 66b325ebbd Revert "Updating kipi-plugins"
I did not mean this to go upstream. This simple change was not enough.

svn path=/nixpkgs/trunk/; revision=23406
2010-08-24 18:12:43 +00:00
Lluís Batlle i Rossell 62f191bf6f Updating kipi-plugins
svn path=/nixpkgs/trunk/; revision=23405
2010-08-24 17:40:40 +00:00
Ludovic Courtès 6ffaf59086 GtkGLExt 1.2.0.
svn path=/nixpkgs/trunk/; revision=23364
2010-08-23 14:52:00 +00:00
Yury G. Kudryashov cbec86d7d1 Propagate gcc.libc in kdelibs-4.4
svn path=/nixpkgs/trunk/; revision=23344
2010-08-21 22:05:03 +00:00
Yury G. Kudryashov 3adcb12100 Fix evaluation error
svn path=/nixpkgs/trunk/; revision=23341
2010-08-21 20:20:34 +00:00
Yury G. Kudryashov 3537d94672 Move yakuake to pkgs
svn path=/nixpkgs/trunk/; revision=23331
2010-08-21 19:30:15 +00:00
Yury G. Kudryashov 682e4ae09e Move konversation to pkgs
svn path=/nixpkgs/trunk/; revision=23330
2010-08-21 19:29:47 +00:00
Yury G. Kudryashov c3948239d7 Remove broken assert in sqlite backend code
svn path=/nixpkgs/trunk/; revision=23328
2010-08-21 19:25:44 +00:00
Yury G. Kudryashov 44b5540bfd More TODOs
svn path=/nixpkgs/trunk/; revision=23294
2010-08-20 21:37:56 +00:00
Yury G. Kudryashov b97b22220f kdebase-workspace: more dependencies, list TODO
svn path=/nixpkgs/trunk/; revision=23293
2010-08-20 21:36:56 +00:00
Yury G. Kudryashov 3beeb6611a Use pkgs. in override, override qjson in kde-4.5
svn path=/nixpkgs/trunk/; revision=23287
2010-08-20 20:13:01 +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
Yury G. Kudryashov 6345fa2d1d kdepim-runtime-4.4.92
svn path=/nixpkgs/trunk/; revision=23265
2010-08-19 22:57:09 +00:00
Yury G. Kudryashov b16167a028 Add kdepim{,-runtime}-4.4.92 to manifest
svn path=/nixpkgs/trunk/; revision=23264
2010-08-19 22:56:06 +00:00
Yury G. Kudryashov c7c210735d Fix symlink. TODO: upstream fix
svn path=/nixpkgs/trunk/; revision=23263
2010-08-19 22:54:38 +00:00
Yury G. Kudryashov e16427a899 Fix broken datadir in 4.5.0 as well
svn path=/nixpkgs/trunk/; revision=23261
2010-08-19 22:52:00 +00:00
Yury G. Kudryashov 2957f9cc11 Now packageOverrides = p: { kde4 = kde45; qt4 = qt47; } should work
svn path=/nixpkgs/trunk/; revision=23241
2010-08-18 23:04:21 +00:00
Yury G. Kudryashov 59e4742a6a kdepim-4.4.5: don't build kleopatra
It doesn't compile with new boost. If someone cares, find a patch in KDE SVN history.

svn path=/nixpkgs/trunk/; revision=23239
2010-08-18 22:52:59 +00:00
Yury G. Kudryashov 0b8bd11ce3 Add kdeadmin-4.5.0
svn path=/nixpkgs/trunk/; revision=23238
2010-08-18 18:58:53 +00:00
Yury G. Kudryashov 96edbab084 kdewebdev-4.5.0
svn path=/nixpkgs/trunk/; revision=23237
2010-08-18 18:58:02 +00:00
Yury G. Kudryashov 6ba9dcb54c Add kdesdk-4.5.0
svn path=/nixpkgs/trunk/; revision=23236
2010-08-18 18:56:48 +00:00
Yury G. Kudryashov ee6b753bfe kdeplasma-addons-4.5.0
svn path=/nixpkgs/trunk/; revision=23232
2010-08-18 15:55:12 +00:00
Yury G. Kudryashov fc3845c0cd kdeedu-4.5.0
svn path=/nixpkgs/trunk/; revision=23231
2010-08-18 15:54:27 +00:00
Yury G. Kudryashov 0be1e1af98 Add kdenetwork-4.5.0
svn path=/nixpkgs/trunk/; revision=23230
2010-08-18 15:54:10 +00:00
Yury G. Kudryashov f8a0e07815 sort, add kdegames-4.5.0
svn path=/nixpkgs/trunk/; revision=23229
2010-08-18 15:52:58 +00:00
Yury G. Kudryashov ee967575e6 Add kdetoys-4.5.0
svn path=/nixpkgs/trunk/; revision=23198
2010-08-17 09:57:03 +00:00
Yury G. Kudryashov 501117b1c5 Rewrite builsystem fixes in upstream-supported manner
svn path=/nixpkgs/trunk/; revision=23195
2010-08-16 20:37:18 +00:00
Yury G. Kudryashov 6d97359a61 Add kdegraphics-4.5.0
svn path=/nixpkgs/trunk/; revision=23190
2010-08-16 12:40:41 +00:00
Yury G. Kudryashov 737262c779 Add kdeaccessibility-4.5.0
svn path=/nixpkgs/trunk/; revision=23185
2010-08-16 08:23:59 +00:00
Yury G. Kudryashov 1975eefcb4 Add kdemultimedia-4.5.0
svn path=/nixpkgs/trunk/; revision=23172
2010-08-14 09:46:55 +00:00
Yury G. Kudryashov dc831feb4b Add kdeutils-4.5.0
svn path=/nixpkgs/trunk/; revision=23170
2010-08-13 23:50:44 +00:00
Yury G. Kudryashov e7b1d4c69e Add kdebase-runtime-4.5.0
svn path=/nixpkgs/trunk/; revision=23169
2010-08-13 23:14:16 +00:00
Yury G. Kudryashov 794c9dd1d7 Add kdeartwork-4.5.0
svn path=/nixpkgs/trunk/; revision=23163
2010-08-13 14:06:36 +00:00
Yury G. Kudryashov dfd195020a Add eigen to kde-4.5
svn path=/nixpkgs/trunk/; revision=23162
2010-08-13 14:06:29 +00:00
Peter Simons b42dfe40ec Fix akonadi startup failure.
Patch akonadiserver so as to correct the datadir parameter passed to
mysql. Without this patch akonadiserver in KDE 4.4.5 would not start and
consequently kmail would crash during start up.

svn path=/nixpkgs/trunk/; revision=23154
2010-08-12 14:58:02 +00:00
Yury G. Kudryashov ca1914fa1a Remove old patch, add new one
Let other KDE modules install polkit policy files to $out,
not $kdelibs

svn path=/nixpkgs/trunk/; revision=23147
2010-08-12 13:01:06 +00:00
Yury G. Kudryashov 05da3db77f Copy qca from kde-4.5 to make qca2_ossl build
svn path=/nixpkgs/trunk/; revision=23137
2010-08-12 10:39:29 +00:00
Yury G. Kudryashov 2050c3da77 Add kdebase-workspace-4.5.0
svn path=/nixpkgs/trunk/; revision=23123
2010-08-11 17:33:57 +00:00
Yury G. Kudryashov 2449006cb6 Add manifest.nix
svn path=/nixpkgs/trunk/; revision=23122
2010-08-11 17:31:49 +00:00
Yury G. Kudryashov de3531c2d5 Let kdePackage use manifest.nix
svn path=/nixpkgs/trunk/; revision=23120
2010-08-11 16:49:31 +00:00
Yury G. Kudryashov 58ab0bf5bb Add meta.platforms
svn path=/nixpkgs/trunk/; revision=23111
2010-08-11 12:24:12 +00:00
Yury G. Kudryashov 78565c5b5f Add qimageblitz and kdebase-apps-4.5.0
svn path=/nixpkgs/trunk/; revision=23099
2010-08-10 19:57:53 +00:00
Yury G. Kudryashov 8242aa1a46 kdebindings-4.5.0
svn path=/nixpkgs/trunk/; revision=23098
2010-08-10 18:08:31 +00:00
Lluís Batlle i Rossell f9692a7f40 Update from trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=23097
2010-08-10 17:20:15 +00:00
Yury G. Kudryashov c842c3f7e5 kdepimlibs-4.5.0
svn path=/nixpkgs/trunk/; revision=23096
2010-08-10 17:08:47 +00:00
Yury G. Kudryashov dcb79362d3 Upgrade soprano
svn path=/nixpkgs/trunk/; revision=23095
2010-08-10 14:46:39 +00:00