Author: urkud
Date: Thu Jan 26 10:11:47 2012
New Revision: 31848
URL: https://nixos.org/websvn/nix/?rev=31848&sc=1
Log:
svn merge ^/nixpkgs/trunk
Added:
nixpkgs/branches/libpng15/pkgs/desktops/kde-4.8/kdegraphics/kdegraphics-mobipocket.nix
- copied unchanged from r31847,
nixpkgs/trunk/pkgs/desktops/kde-4.8/kdegraphics/kdegraphics-mobipocket.nix
nixpkgs/branches/libpng15/pkgs/desktops/kde-4.8/l10n/manifest-4.8.0.nix
- copied unchanged from r31847,
nixpkgs/trunk/pkgs/desktops/kde-4.8/l10n/manifest-4.8.0.nix
Deleted:
nixpkgs/branches/libpng15/pkgs/desktops/kde-4.8/kde-package/4.7.97.nix
nixpkgs/branches/libpng15/pkgs/desktops/kde-4.8/kdegraphics/mobipocket.nix
nixpkgs/branches/libpng15/pkgs/desktops/kde-4.8/l10n/manifest-4.7.97.nix
Modified:
nixpkgs/branches/libpng15/ (props changed)
Copied:
nixpkgs/branches/libpng15/pkgs/desktops/kde-4.8/kdegraphics/kdegraphics-mobipocket.nix
(from r31847,
nixpkgs/trunk/pkgs/desktops/kde-4.8/kdegraphics/kdegraphics-mobipocket.nix)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++
nixpkgs/branches/libpng15/pkgs/desktops/kde-4.8/kdegraphics/kdegraphics-mobipocket.nix
Thu Jan 26 10:11:47 2012 (r31848, copy of r31847,
nixpkgs/trunk/pkgs/desktops/kde-4.8/kdegraphics/kdegraphics-mobipocket.nix)
@@ -0,0 +1,10 @@
+{ kde, kdelibs, okular }:
+
+kde {
+ buildInputs = [ kdelibs okular ];
+
+ meta = {
+ description = "A collection of plugins to handle mobipocket files";
+ license = "GPLv2";
+ };
+}
Copied: nixpkgs/branches/libpng15/pkgs/desktops/kde-4.8/l10n/manifest-4.8.0.nix
(from r31847, nixpkgs/trunk/pkgs/desktops/kde-4.8/l10n/manifest-4.8.0.nix)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/branches/libpng15/pkgs/desktops/kde-4.8/l10n/manifest-4.8.0.nix
Thu Jan 26 10:11:47 2012 (r31848, copy of r31847,
nixpkgs/trunk/pkgs/desktops/kde-4.8/l10n/manifest-4.8.0.nix)
@@ -0,0 +1,262 @@
+[
+{
+ lang = "ar";
+ saneName = "ar";
+ sha256 = "1payn79mk0xw6laj3l9zymh3a72yhssid4wxw2sg8wqq1557cd1f";
+}
+{
+ lang = "bg";
+ saneName = "bg";
+ sha256 = "01k26c2shw2xxhfgllljqcvrgib6935dbrimrbix7snwdxdip23b";
+}
+{
+ lang = "bs";
+ saneName = "bs";
+ sha256 = "05vfkzqqm6sz0021rh8qhn3345fmcswlilnkdk23kjsb722v0m47";
+}
+{
+ lang = "ca";
+ saneName = "ca";
+ sha256 = "1ac7y69877yisfcz863w5l4ypiwp3dxip08myfwq631a2qhplwir";
+}
+{
+ lang = "ca@valencia";
+ saneName = "ca_valencia";
+ sha256 = "0qj5r4gs1bm2hzds8gq3dzai7h7fw6dw8mssw14g2yb2w833ag6h";
+}
+{
+ lang = "cs";
+ saneName = "cs";
+ sha256 = "0rh0pivdiybp6n20dyhdrcwc6q3xmmv4i83x64qnxsxdh3yxcysv";
+}
+{
+ lang = "da";
+ saneName = "da";
+ sha256 = "04ylcybr3vpk4vja33iq9ysnljdndvk62vvs35rmvb48sqc02gbr";
+}
+{
+ lang = "de";
+ saneName = "de";
+ sha256 = "1rz1qvy7n3p78idpw8kah991r5rs1hgdlr4kh4pfdk31qng6mdhi";
+}
+{
+ lang = "el";
+ saneName = "el";
+ sha256 = "19hhw9csh59hh7ax1g9yi2bqqv712xyirklaxq8j5225xxva6xhx";
+}
+{
+ lang = "en_GB";
+ saneName = "en_GB";
+ sha256 = "08rwnn4bbp3hhj6fw1n1jdm8b3k72wk14qib2jdmwra2n514i9y2";
+}
+{
+ lang = "es";
+ saneName = "es";
+ sha256 = "098nsrsc7s77kkjh6cai7nkw6h0cz10gd5aa6hfqnafc42zjj7jv";
+}
+{
+ lang = "et";
+ saneName = "et";
+ sha256 = "1avv6xvpqcc1q9k3xcszpknbshkcd1gbmx9nrx2a242jkkgbqcm5";
+}
+{
+ lang = "eu";
+ saneName = "eu";
+ sha256 = "14wqf7bfrhmkknrzdn8725rhlphp2czzf65rc7wfsqj3nk0s8iys";
+}
+{
+ lang = "fa";
+ saneName = "fa";
+ sha256 = "1w3zlf70a9hcwkyv8jc2jr7ddlq1bjbbswrw6qaincpk5qpr9lqc";
+}
+{
+ lang = "fi";
+ saneName = "fi";
+ sha256 = "1gwjbx31z3g7p3am003bll763d1jjvz8k3w7k318x18nbsj5nl2h";
+}
+{
+ lang = "fr";
+ saneName = "fr";
+ sha256 = "0a4yfz5c6pnscq5810jirfl0r0asid1fb4bsyh356rbhfqvx3cf8";
+}
+{
+ lang = "ga";
+ saneName = "ga";
+ sha256 = "1214wmwccg6k97c3q5rnazggjv77mq640wwv23xv3lzyiqxq7h45";
+}
+{
+ lang = "gl";
+ saneName = "gl";
+ sha256 = "0s1wjymdprn56pd311cb6g14kfngnqnbcar8yqn93mgcdxrl6s61";
+}
+{
+ lang = "hr";
+ saneName = "hr";
+ sha256 = "1bw997jypbc2rz2wnlvcw9lk6l6kybiivkq6sk4h7kil9xklam2j";
+}
+{
+ lang = "hu";
+ saneName = "hu";
+ sha256 = "086sx9dak8npi5nmiyq0npqc9kj5gaijc98bml42q1p0fg92b1wv";
+}
+{
+ lang = "ia";
+ saneName = "ia";
+ sha256 = "10x59w6ac2bnz7jgypjk98q80bwnwlix18pz9v0xnhw6z5c71bmg";
+}
+{
+ lang = "is";
+ saneName = "is";
+ sha256 = "0znwyagr8xarw3kjybgpzgxgk7dzc1sqvv128g3l5vdf5cn6ab3p";
+}
+{
+ lang = "it";
+ saneName = "it";
+ sha256 = "0w6nwpq0wxglzspswhiv0y6rjvmcg9c3wsiagjqr0ys2ln1kifp5";
+}
+{
+ lang = "ja";
+ saneName = "ja";
+ sha256 = "0d6fhgnzpapb1axnan7jlsyln0ajv9c08zy56mvcgvnprj92ixjh";
+}
+{
+ lang = "kk";
+ saneName = "kk";
+ sha256 = "1f9ys9slbf6n56g29pxi4a2kl8fp8bgfg9r4n4ygxy6mnl2wggn6";
+}
+{
+ lang = "km";
+ saneName = "km";
+ sha256 = "033jyrjfywwg1mibcwbflhblbv17kc9mi6wbyajgnhrypaxdplmn";
+}
+{
+ lang = "ko";
+ saneName = "ko";
+ sha256 = "1w3dxprfdrp4b2ar61jvbgngjm85nwy5jprjmqjzqb74pj9wvnnf";
+}
+{
+ lang = "lt";
+ saneName = "lt";
+ sha256 = "1vmx35g9w6zf6pp6s7k10bmil6hppms4h54647dz27mlqq6kfi8a";
+}
+{
+ lang = "lv";
+ saneName = "lv";
+ sha256 = "0mmhmw4fsaxx44bs1g903cfcn854gqm509j2fiman8mz58nsd8jn";
+}
+{
+ lang = "nb";
+ saneName = "nb";
+ sha256 = "06gmdcxm0cl4yv39xyhz8nkrj2hbiryx2zb5b7zmyq6l94vmbp83";
+}
+{
+ lang = "nds";
+ saneName = "nds";
+ sha256 = "0yagn8bragyqp38186mla31farrd26q77vm4zmhqfrvzbaiaal0c";
+}
+{
+ lang = "nl";
+ saneName = "nl";
+ sha256 = "073cgksqp8gxvscg6v7gkf4rd4va3cqslwssbzdzark3lrm7flkw";
+}
+{
+ lang = "nn";
+ saneName = "nn";
+ sha256 = "0dwvr0779dg380dv2a4613074gk1pqbiv6q8drawgj8asaa54yg2";
+}
+{
+ lang = "pa";
+ saneName = "pa";
+ sha256 = "1z10wi3grj7y2a1lyjc9xvadrfm6b3ydgy827183mp3qfd6r0jd1";
+}
+{
+ lang = "pl";
+ saneName = "pl";
+ sha256 = "0mzbfizgykq20vqq7b1wna3jhvl73qgr2n11f9mjysj5g592mqnm";
+}
+{
+ lang = "pt";
+ saneName = "pt";
+ sha256 = "1bg0p2czkmx2rwznbwqq3w16xdp09k0jajpw2jwpdz84z1y4c4pz";
+}
+{
+ lang = "pt_BR";
+ saneName = "pt_BR";
+ sha256 = "12zzxsdzb80gs671k8dfw84yb7c1pli2jwh1hncr6ajwbckd4q6c";
+}
+{
+ lang = "ro";
+ saneName = "ro";
+ sha256 = "1rzm8y722jp5z8xlms5gv1qsybix0vyfvn5fv18zxkiaidiyzlfh";
+}
+{
+ lang = "ru";
+ saneName = "ru";
+ sha256 = "1bbz8ixlhywnfm50dm91ykn13mf0gr1c46rj8pmzxqlg2klidm5n";
+}
+{
+ lang = "si";
+ saneName = "si";
+ sha256 = "06763cbbw4bh3y6lx01s6gl4yr4jlgrw73qdxjw30r45hqybblx6";
+}
+{
+ lang = "sk";
+ saneName = "sk";
+ sha256 = "1wgzkjq3pmmrs8d7q2b4wkxkyaylypk25i6h6pi7ly5im1fj0zf3";
+}
+{
+ lang = "sl";
+ saneName = "sl";
+ sha256 = "17zmirf67am4730yf1x1kidaylsl89frziiw8jzf42z88qc63x8x";
+}
+{
+ lang = "sr";
+ saneName = "sr";
+ sha256 = "0yg8x6syad3g2j0nlgcb3ypp26l9m1n7wpxgyhnbhb07w3gmvwf1";
+}
+{
+ lang = "sv";
+ saneName = "sv";
+ sha256 = "0a9qil6m5fmbi5x8h2nwj6al0awclk77zgpiz0njv9vdsiylbwzf";
+}
+{
+ lang = "tg";
+ saneName = "tg";
+ sha256 = "0h62wnhc4m6j33r0w6wx5fkwdacd3y1mz6s047jinzzzvyk6zy4p";
+}
+{
+ lang = "th";
+ saneName = "th";
+ sha256 = "0c23p15rbpg8lmcas61d67cpvsx0rcb9s5nccy0jr9gs2bh7i02i";
+}
+{
+ lang = "tr";
+ saneName = "tr";
+ sha256 = "1wddr9zr0fz4g3d80xdk1y7s60yrb700gkw4689m6cn07drixhcr";
+}
+{
+ lang = "uk";
+ saneName = "uk";
+ sha256 = "1k1fg6ymsyb86jzq9pdy77v568pvr9kykdmvjy159qripyr5gyjq";
+}
+{
+ lang = "vi";
+ saneName = "vi";
+ sha256 = "02zqwgjksb7cxsqxwd7fgagza1skjikipknwxaylhb9qc5s5dd2r";
+}
+{
+ lang = "wa";
+ saneName = "wa";
+ sha256 = "084nak660wcqnvfg3zw2pgglpzwkc1mryd575y3xq11a6aqyrwqi";
+}
+{
+ lang = "zh_CN";
+ saneName = "zh_CN";
+ sha256 = "0c18dhjfp72br8ayrn095201ajnk8zbr1cqyni0qmis387w746b7";
+}
+{
+ lang = "zh_TW";
+ saneName = "zh_TW";
+ sha256 = "04n6zljl3yb8fb5lyz4v30ki8h7k7iic0wz05cmfnc8w5x5zdfxy";
+}
+]
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
