From eb6612b78787d387a722e224fc5824ee7fffbba3 Mon Sep 17 00:00:00 2001 From: Felix Geyer Date: Sat, 23 Mar 2013 21:50:23 +0100 Subject: [PATCH] Fix database icons license issues. Pull C62_Tux.png, C63_Feather.png, C64_Apple.png, C65_Apple.png and C65_W.png from the latest KeePass 2 version. Replace C68_BlackBerry.png with another icon from openclipart.org. It's unclear where this KeePass 2 icon is from. Closes #69 --- COPYING | 83 +++++++++++++++ LICENSE.CC0 | 128 ++++++++++++++++++++++++ share/icons/database/C62_Tux.png | Bin 411 -> 620 bytes share/icons/database/C63_Feather.png | Bin 542 -> 474 bytes share/icons/database/C64_Apple.png | Bin 359 -> 572 bytes share/icons/database/C65_Apple.png | Bin 516 -> 0 bytes share/icons/database/C65_W.png | Bin 0 -> 470 bytes share/icons/database/C68_BlackBerry.png | Bin 509 -> 525 bytes src/core/DatabaseIcons.cpp | 2 +- 9 files changed, 212 insertions(+), 1 deletion(-) create mode 100644 LICENSE.CC0 delete mode 100644 share/icons/database/C65_Apple.png create mode 100644 share/icons/database/C65_W.png diff --git a/COPYING b/COPYING index c86477777..951d0d624 100644 --- a/COPYING +++ b/COPYING @@ -44,6 +44,68 @@ Files: share/icons/application/*/actions/auto-type.png, share/icons/application/*/actions/entry-edit.png, share/icons/application/*/actions/entry-new.png, share/icons/application/*/actions/password-generate.png + share/icons/database/C00_Password.png + share/icons/database/C01_Package_Network.png + share/icons/database/C02_MessageBox_Warning.png + share/icons/database/C03_Server.png + share/icons/database/C04_Klipper.png + share/icons/database/C05_Edu_Languages.png + share/icons/database/C06_KCMDF.png + share/icons/database/C07_Kate.png + share/icons/database/C08_Socket.png + share/icons/database/C09_Identity.png + share/icons/database/C10_Kontact.png + share/icons/database/C11_Camera.png + share/icons/database/C12_IRKickFlash.png + share/icons/database/C13_KGPG_Key3.png + share/icons/database/C14_Laptop_Power.png + share/icons/database/C15_Scanner.png + share/icons/database/C16_Mozilla_Firebird.png + share/icons/database/C17_CDROM_Unmount.png + share/icons/database/C18_Display.png + share/icons/database/C19_Mail_Generic.png + share/icons/database/C20_Misc.png + share/icons/database/C21_KOrganizer.png + share/icons/database/C22_ASCII.png + share/icons/database/C23_Icons.png + share/icons/database/C24_Connect_Established.png + share/icons/database/C25_Folder_Mail.png + share/icons/database/C26_FileSave.png + share/icons/database/C27_NFS_Unmount.png + share/icons/database/C28_QuickTime.png + share/icons/database/C29_KGPG_Term.png + share/icons/database/C30_Konsole.png + share/icons/database/C31_FilePrint.png + share/icons/database/C32_FSView.png + share/icons/database/C33_Run.png + share/icons/database/C34_Configure.png + share/icons/database/C35_KRFB.png + share/icons/database/C36_Ark.png + share/icons/database/C37_KPercentage.png + share/icons/database/C38_Samba_Unmount.png + share/icons/database/C39_History.png + share/icons/database/C40_Mail_Find.png + share/icons/database/C41_VectorGfx.png + share/icons/database/C42_KCMMemory.png + share/icons/database/C43_EditTrash.png + share/icons/database/C44_KNotes.png + share/icons/database/C45_Cancel.png + share/icons/database/C46_Help.png + share/icons/database/C47_KPackage.png + share/icons/database/C48_Folder.png + share/icons/database/C49_Folder_Blue_Open.png + share/icons/database/C50_Folder_Tar.png + share/icons/database/C51_Decrypted.png + share/icons/database/C52_Encrypted.png + share/icons/database/C53_Apply.png + share/icons/database/C54_Signature.png + share/icons/database/C55_Thumbnail.png + share/icons/database/C56_KAddressBook.png + share/icons/database/C57_View_Text.png + share/icons/database/C58_KGPG.png + share/icons/database/C59_Package_Development.png + share/icons/database/C60_KFM_Home.png + share/icons/database/C61_Services.png Copyright: 2003-2004, David Vignoni License: LGPL-2.1 @@ -79,6 +141,27 @@ Copyright: 2007, Nuno Pinheiro 2007, Riccardo Iaconelli License: LGPL-3+ +Files: share/icons/database/C62_Tux.png + share/icons/database/C63_Feather.png + share/icons/database/C64_Apple.png + share/icons/database/C67_Certificate.png + share/icons/database/C68_BlackBerry.png +Copyright: Mairin Duffy + Sarah Owens + James Birkett + Dominik Reichl +License: CC0 +Comment: C62_Tux.png from https://openclipart.org/detail/103855 + C63_Feather.png from http://openclipart.org/detail/122017 + C64_Apple.png based on http://openclipart.org/detail/24319 + C67_Certificate.png based on https://openclipart.org/detail/16729 + C68_BlackBerry.png from https://openclipart.org/detail/4465 + +Files: share/icons/database/C65_W.png + share/icons/database/C66_Money.png +Copyright: none +License: public-domain + Files: src/crypto/salsa20/* Copyright: is in public domain License: public-domain diff --git a/LICENSE.CC0 b/LICENSE.CC0 new file mode 100644 index 000000000..c771f77ad --- /dev/null +++ b/LICENSE.CC0 @@ -0,0 +1,128 @@ +Creative Commons CC0 1.0 Universal + +CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE +LEGAL SERVICES. DISTRIBUTION OF THIS DOCUMENT DOES NOT CREATE AN +ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS INFORMATION +ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES REGARDING THE +USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS PROVIDED HEREUNDER, AND +DISCLAIMS LIABILITY FOR DAMAGES RESULTING FROM THE USE OF THIS DOCUMENT +OR THE INFORMATION OR WORKS PROVIDED HEREUNDER. + +Statement of Purpose + +The laws of most jurisdictions throughout the world automatically confer +exclusive Copyright and Related Rights (defined below) upon the creator +and subsequent owner(s) (each and all, an "owner") of an original work +of authorship and/or a database (each, a "Work"). + +Certain owners wish to permanently relinquish those rights to a Work for +the purpose of contributing to a commons of creative, cultural and +scientific works ("Commons") that the public can reliably and without +fear of later claims of infringement build upon, modify, incorporate in +other works, reuse and redistribute as freely as possible in any form +whatsoever and for any purposes, including without limitation commercial +purposes. These owners may contribute to the Commons to promote the +ideal of a free culture and the further production of creative, cultural +and scientific works, or to gain reputation or greater distribution for +their Work in part through the use and efforts of others. + +For these and/or other purposes and motivations, and without any +expectation of additional consideration or compensation, the person +associating CC0 with a Work (the "Affirmer"), to the extent that he or +she is an owner of Copyright and Related Rights in the Work, voluntarily +elects to apply CC0 to the Work and publicly distribute the Work under +its terms, with knowledge of his or her Copyright and Related Rights in +the Work and the meaning and intended legal effect of CC0 on those +rights. + +1. Copyright and Related Rights. A Work made available under CC0 may be +protected by copyright and related or neighboring rights ("Copyright and +Related Rights"). Copyright and Related Rights include, but are not +limited to, the following: + +i. the right to reproduce, adapt, distribute, perform, display, +communicate, and translate a Work; + +ii. moral rights retained by the original author(s) and/or performer(s); + +iii. publicity and privacy rights pertaining to a person's image or +likeness depicted in a Work; + +iv. rights protecting against unfair competition in regards to a Work, +subject to the limitations in paragraph 4(a), below; + +v. rights protecting the extraction, dissemination, use and reuse of +data in a Work; + +vi. database rights (such as those arising under Directive 96/9/EC of +the European Parliament and of the Council of 11 March 1996 on the legal +protection of databases, and under any national implementation thereof, +including any amended or successor version of such directive); and + +vii. other similar, equivalent or corresponding rights throughout the +world based on applicable law or treaty, and any national +implementations thereof. + +2. Waiver. To the greatest extent permitted by, but not in contravention +of, applicable law, Affirmer hereby overtly, fully, permanently, +irrevocably and unconditionally waives, abandons, and surrenders all of +Affirmer's Copyright and Related Rights and associated claims and causes +of action, whether now known or unknown (including existing as well as +future claims and causes of action), in the Work (i) in all territories +worldwide, (ii) for the maximum duration provided by applicable law or +treaty (including future time extensions), (iii) in any current or +future medium and for any number of copies, and (iv) for any purpose +whatsoever, including without limitation commercial, advertising or +promotional purposes (the "Waiver"). Affirmer makes the Waiver for the +benefit of each member of the public at large and to the detriment of +Affirmer's heirs and successors, fully intending that such Waiver shall +not be subject to revocation, rescission, cancellation, termination, or +any other legal or equitable action to disrupt the quiet enjoyment of +the Work by the public as contemplated by Affirmer's express Statement +of Purpose. + +3. Public License Fallback. Should any part of the Waiver for any reason +be judged legally invalid or ineffective under applicable law, then the +Waiver shall be preserved to the maximum extent permitted taking into +account Affirmer's express Statement of Purpose. In addition, to the +extent the Waiver is so judged Affirmer hereby grants to each affected +person a royalty-free, non transferable, non sublicensable, non +exclusive, irrevocable and unconditional license to exercise Affirmer's +Copyright and Related Rights in the Work (i) in all territories +worldwide, (ii) for the maximum duration provided by applicable law or +treaty (including future time extensions), (iii) in any current or +future medium and for any number of copies, and (iv) for any purpose +whatsoever, including without limitation commercial, advertising or +promotional purposes (the "License"). The License shall be deemed +effective as of the date CC0 was applied by Affirmer to the Work. Should +any part of the License for any reason be judged legally invalid or +ineffective under applicable law, such partial invalidity or +ineffectiveness shall not invalidate the remainder of the License, and +in such case Affirmer hereby affirms that he or she will not (i) +exercise any of his or her remaining Copyright and Related Rights in the +Work or (ii) assert any associated claims and causes of action with +respect to the Work, in either case contrary to Affirmer's express +Statement of Purpose. + +4. Limitations and Disclaimers. + +a. No trademark or patent rights held by Affirmer are waived, abandoned, +surrendered, licensed or otherwise affected by this document. + +b. Affirmer offers the Work as-is and makes no representations or +warranties of any kind concerning the Work, express, implied, statutory +or otherwise, including without limitation warranties of title, +merchantability, fitness for a particular purpose, non infringement, or +the absence of latent or other defects, accuracy, or the present or +absence of errors, whether or not discoverable, all to the greatest +extent permissible under applicable law. + +c. Affirmer disclaims responsibility for clearing rights of other +persons that may apply to the Work or any use thereof, including without +limitation any person's Copyright and Related Rights in the Work. +Further, Affirmer disclaims responsibility for obtaining any necessary +consents, permissions or other rights required for any use of the Work. + +d. Affirmer understands and acknowledges that Creative Commons is not a +party to this document and has no duty or obligation with respect to +this CC0 or use of the Work. diff --git a/share/icons/database/C62_Tux.png b/share/icons/database/C62_Tux.png index 14f3272f2753f508e5a69d96caa3f72bf8f4b6d6..85392b20456557e9d95cf9c10fbcfee0363f5b68 100644 GIT binary patch delta 589 zcmbQu{Dx(MR=pC#Mh2g}z(<)33=EtF9+AZi40_5S%viD1zKnr^iO18$F{I*F>7=vW zL5U*A&i~yIxLMk`=V6EOiD*ybfX41bFTF!89S;u8a6Map;an>Rv+gFdK!u6Y{~5(4 zbwzxFu5`BvP1~Mf%p1uo9<6foL5$n_d+Wu*k6HKH?k=vscfa@^`?-SwW*kyOJInGNSBLJxOe#%hL!r4zOm}0F5_cTC4N7^-0F$bF?3xq_Q+f zvqix7a;M9pxb^CjJ#Cv`D!;vdu6pmig9!}+Mv}eGjvCWXm+k)hVPUe{lJL|0cf8)c zbK}2xB3s-taZSPg!ur`+HUB;p*MENd_0+fhZ9Zzu4B}!sr@Nc;`i~oI2wYNpbe%@b z;)^rVoNg+dV(UJ-=wJc|3)3W(zG`{)`$320^^Y80zxZOuvdr$Ihc>No^W)K*&dm_D zc3PDe&tV1z-^;o1r?XUPYGgxM3T! z!`d)r2A;zY>@Uq*b@kPe3olC;7TnD{y{TrF7)#@03x*7{*$fV6@^`6 zzj|Zp5B1mTeveQ0{$_u_m}ObU-Ng&tbhNcf%Ql4t9(#6u{<^)@HIJrcd2jFI`xaW+ yBj|SeQEJnH-*;_8g$y2@k=eTGW~#{>ef9keHBvTqGyn#}Rhy+=Lkc z5ech#ISoIGN8I>no%4rZOf4WIb={F`S=xI~c|9%SZLi?ec%(6DvqjO(-yQnVXU^=q z`#r6ViKV02A#l#V*kA2){fy-pUX-k3h?v&u!@_YzSnPJX6hnQQpRmTmNe-9Seay}4 ze_nR*bZDQQa0`!j`Hp@2x5~Z~n_cG?{)(N2E7wK9NhNJ+NP&!cSMKd;LEEC%&gi(M zm(J+0H?Dt1)Gqe(pI2SYnqpL(p_8V$S3z`HWY?qCLlM(H+jQ>h;k?!Meskuu2h0p# zZ!OxS$F@FZO>U3;@95)eitQ!@Q^LGk6FEy zQju^tkd&6;onKoe|5WUi-aP%&P6z+>xivA1&FhYPAD+*%_0~)G6Z!j9CU|?Wi@O1TaS?83{1OP8}q?-T$ diff --git a/share/icons/database/C63_Feather.png b/share/icons/database/C63_Feather.png index de27e959d21f6d3263f01097bda15f83382dee22..cf95a5d19f5d24e9a7c5d4fffa69f4c89824ac75 100644 GIT binary patch delta 442 zcmbQoa*KI_R=pC#Mh2g}z(<)33=EtF9+AZi40_5S%viD1zKnr^vC7lMF{I*Fa>%V0 zhaF^gyxuhF;X`M!MN^{AC0msBEZjfe(XX$eZFgC>3<|55Ir@-kvXickk--tWz3#=L7^7 z)>!bJ4Qjpx;?Q!(C>eEEmJC|(~r>`SlnXz0%X;xp(ga!@-pg@4me)9~yer%X{kkFk^!` zH(TsC8r0SO{B&xP>P4;Joj#j=c+Q+TvN|mxfq|iNdb@M@w{I627#J8lUHx3vIVCg! E0I`AK(*OVf delta 510 zcmcb`Jdb69R{ehl28REg2lOW}Ffd;Bba4!+xRt!8w2saAwYDFhZlI&MSYjQUQ$y$6 zkDot(7LU6V`%z)Z->*$q?eFhZUEt_&(A}%;_3dBxwa@?AF`@APPVcj)S8~_a{_OB( zeq7)7fByT}-!p99-ZDJLTE8#K;8pg<{nsb%I%j6@d*YZ>H!lxQJle$=FB{mZ$Gquw+rt{j|rT^!miZ#?#{-xSv}u%|J7bdIUD~k`)Sm<1NWm_ z@8`z1$1*cBH@o=rEjOP3?tZk@{~JGM#_0dM`Q_!!;9db|6F&JqR&1_n=8KbLh*2~7ZBN)BcK diff --git a/share/icons/database/C64_Apple.png b/share/icons/database/C64_Apple.png index d8db6871c16973c84578b55b998499aca2f1f933..d3b11ee285a50f421e1608d1e397bc5edfb21324 100644 GIT binary patch delta 530 zcmaFPw1;JaX*~mHfk$L91B0G22s2hJwJ&2}V7%k$;uunKD|O=jJSj(kW6#C>?7D;t zb_w%0JTXylarW;Fwrus4Q+U_pQZ-Mh?VRQurP4nvh0@;P3MwMOml>=c^vzAaS+6-w zW}ES?B-3AYziW-TrM9ry&Oa~S-MTY9ee=ydFEcJoW4l}b`_AN`s(I>5d72jdU&_zG z@Zrz%pMUOJ?$PsZW@|Ve-=8S)YoENUAj6j1xyK9th0kx8Ui$lMnbq8NVXF@&G;}Nt zdZ}8;G_TISHBrKK;$sWXNiB&HtFH&PMnMNdMSUq z^U|P?wf9S76VTDAAw^Us;Hg1iI;1sNB_ zt$*IzoO`=Pz=?xFz$xbXR-Nu3E{18Tsmy26HY*>nOz+WL%FtkV%yN2=*3vE4qOvcu zHx%uxVcB+jZP2N0xyS?(J=X`&squW4=|{o~smKxtq5= nYOPYz=9_!|*UiuT$Hdg&Eo_e$Yx5%0+t4@x_h%sEnhr{K=-{}0|(FfiZQe#oFCc6;#;hN@G) zztr4MkK9&VCofaq_xo?1h0LsFH#2STu}(kjdcE}YCb!3d%a111H>}@%_qtx+<6Y|% zTPB}mQJkW}>D2Mq;;@0(dTypQ_pevZYyKCdH~sVU%HM5=zc?dIkmt22WQ%mvv4FO#netmb(A| diff --git a/share/icons/database/C65_Apple.png b/share/icons/database/C65_Apple.png deleted file mode 100644 index c7f39adad0b08715bb22518406414ab4e98a717f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 516 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4kiW$h6xih%orFL*h+%@f*JlZFfjb@JfJ^; zfq`+Sr;B4q#jUMD`?GI5NYoZ`PSN@4xZvCcpF)3u9_uQD8%)ZvF9al;mfq}staCS) ztMM2Ahxvm1rn97$a7{XRVM;&?M{6+W4N0e?SC8!DTXeg0$D%C@z1!;cJbb+G`-9!z z_o;Gr9uMK`*FFC|=lC+UuQmQoeEw}$mfVe-e$>aQtUC7g#>g`fXRO?1Z*MGaOB5;Z zzC3&7CG)vz4HtI{GR*rhb-8wxuX@Xx_3M}~WLNPWaQy6`)AD+k%|nJYZK`5QT#HYp z6#ag?t@g&bYnk%f6ctsMyuA_qb8UCOxX`4dJ+neCZ~1ro--nbH9P{3<{P%r%^jfh7 z1r7!Qr!{S*f4}~Eb$aTp3F?17U4DA&*sZqh}+TWN6+^9 zUN2=lv+ulAnDfPXGLJ1TcU)KcBco<>(*E@O=-=J)-Iu>FKmGTqiSPHgw||viIxRHV zJ$t19hvL;N(E|wvE3Uu(uJSaBEh{K1NOW_{8<|oQ-`|rz1U&dT&&#>-sLx!Vwx$2; c*6wHMJoo8T2LGWs3=9kmp00i_>zopr0N-`|#{d8T diff --git a/share/icons/database/C65_W.png b/share/icons/database/C65_W.png new file mode 100644 index 0000000000000000000000000000000000000000..de84d680b6b8e9e10eda2f64907bb2b432877da6 GIT binary patch literal 470 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4kiW$h6xih%orFL*h+%@f*JlZFfjb@JfJ^; zfq{Xuz$3Dlfk96hgc&QA+LtjfFqV0`IEGZ*+IngK>Pkk5;~&5OomZUqGgPDbqw79HPA+`KQ(gKI_<7S8eVFX4Sg@aEpu0zcr;0ntJTC; zTdbSo(%Z7e1OttZ+}nQ3g=hFJKmIuI`q$TAwLF$zUKzH!N#VrXGHw>80|^EKOM+H1 ztPELoGw0jyT1OU76`}US4~01{Wo>Q9Fwr_ux4*u=p8e3n4}a^#Q?^DuE!vs>NqElr z^!3-debj^zT15N-|y{p a4A)b6Hox#(^pJspfx*+&&t;ucLK6Vk8`azZ literal 0 HcmV?d00001 diff --git a/share/icons/database/C68_BlackBerry.png b/share/icons/database/C68_BlackBerry.png index 6db395484c18e919c19a7ec1d35b4a9b0ee50416..ddb8630a21d919b83d290d08e7e9ab7e941150e5 100644 GIT binary patch delta 510 zcmey%+{-dSvYw5BfkFQB|3n4`2F?PH$YKTtZeb8+WSBKaf`Nf?zo(01h{fsNNgK0+ z14WM2Kfm`q&hyu-88?<`&T6^j)LLe=ZqYP7y+;q`L<$y`f9Nl`aPXu9E4#P(f3~f$ zzJ(cu0-r9aToS4=Jh}J!K_M@p3b`Ex4{QGX*jL*=a|p$j=?#=VQ#R)%z~J?ra`VX{x~xS_PP`6180A_;{rwfxKF7H^f? z|8}mm#?qgkem1x?bbNSrEqB(U4d*6ao7Jd)KSz-^)SpADQT_jLYthmHj zMkxNvBv}QWv#fW{$12vp|6TK{qu( zSNJRYi?Z3(N(zVeY_>?B%y|4TpZq<0<=y2@ZyzeVwDi9(s}y3XiI4V{d!+Ft^3J_O zEQh{+;<|oH`wZuu*!c9DJ5$(a${Q}7-Yz5a_sQ4Q+by13Smu7N+3GLRcCwryTQ^W7 zv1j4!w~yu=mT(qvU2^&5e`}TJGG3ZnuKh2H`=x%4VL^zNqSBKh%S|_Rl$>_P%-eZt z=5!0G-VZkX$vo#QZO$*g{(9jQuf6~svGbpQ)+`HJ+4DGLb*Kx={qN`1zt%H$zMmy# U8nC{efq{X+)78&qol`;+0OC3DJ^%m! delta 494 zcmeBW`O7>(vYv^7fnmbL3^N7>2DXwQzhH*{3=9naI}hkjU|?X}E8T#^gD0IDjy=%UV_H?sbk*^Q2Mm|`xve<0n1_R5e%+_BsHBWZmt^Seq zby;wIU+nC?745RjX1w?J)jt05`OBGw*81<}K6>`-*VotI|JMKRx0JB3-xKb*Z5r!L z7cFWbbRt*t$aO~ilsl4%=^{{|!o|Is~l?Cjav z_xBdB-ygwq=1pPN298Yy8^VJhU;F!Sa_8i~^5?&vzTJP{>OcE-Uh((#|J0A~`1)n? zSL4q~kCxxuv#a*?U30cv-Z@fF>N@MJe@t)v>0Wm9(fl*4vF>_Q{(6|6C`uPn_H9=^p#$;N|o6 z|BP&^zWD|_b4D^hu2+dZEOfg}-lAXU?W=?xS#_eDI2gLVubgn{y!sCY1_lOCS3j3^ HP6