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 zcmV-T0eeNQQ~O;000SaNLh0L04^f{04^f|c%?sf0006ENklGf;txVM;E-goxn6m_^Nh(9VSj11+*PQ6P~U z{{a^nEfh>r)Qg4^mbYj#4OtBrTO`@wTt=_nuNGIvJB>ZNbAR67bKVEe!B92`Iu+KQ z#pCf(sYFp!C=`lBB3Day^Z=BiA17auP2j9J%i~Z?cdIOz23oKfDkenjYB~wm&B#wI@2j5b|A1}niucOh3rfG}C!m_MJP7E%W3jkWJmU>DI!vFwH z(^Eq(mjeK+)vC^tD2isYSsRD4K^y?m=`;X1olck~l7A!}4#zQu13;}-0{{%e;6Kuy zs@3Ym(CKslpxtiEvV58r1cBo?0BAOw06@%dyY4x+d_G@3pEsFI9*;-=m7*xISd3wq zXf*2g`#;%!PB(pi=flPoeD%^&e`t8!_@e>@Z!Vmh8|{7n)!3EzC+jCp3{4)#@fj1fl5;$?!s``tZN5-{S-9JR99 bWi;$BC%*uEm5%b(00000NkvXXu0mjf`X3Lr delta 378 zcmV-=0fqkT1e*hpDu4d~0094qz%P&h00B@*L_t(|+I>+yPXa*@eIqAXq8=BH2v)|< zkeEseT%-kN^Mx07*qoM6N<$f-iNXn*aa+ 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 zcmV;r0Y(0v1lj|TDt{sXu>eeNQQ~O;000SaNLh0L04^f{04^f|c%?sf0004cNklc z_%z%Vtzwuqjp6t2H&34M%gZz9>MEbjV8W^TM=ZmxT@1f}KYzP(hhI^VRa=|E%8G%3 z0lN)%U-~gTyZ-tZHDu%)!AB9ISk+6s`b8!`&CY3~!!)`|{=P zwQJfYCQLj$41eL_$``Vc)gUxnykg1l`}zB~Zy(*gt7mG;C@#(r5utoI4$TQr4Yy>Q zeypAFoQ>_>n>YGqW(?};%3Mns4sXNsA=K0V4jz2Z$oS>+XKf=R21iF_uBEtwn}vaa z;g0*7n@&!QGBWBeE)3q@@BqQ7;oa@qA5~S&N=udRRx>c1*@Qo_Fn)gd^2(AW(JK3i kOtVZ3%*@2AW?*0d0C|^(Ls$0p(EtDd07*qoM6N<$g0X?%(*OVf delta 510 zcmVizMe0-~W7y4EELk4($A6{O!<>kG0L8Z(qY=0|dO7w)|Jw-a9{3wlgVg z{Nz&|ZpT>72+?{|Zyj52rryx%M>cgxf4@yk~@ zHE=3R3Gb;?5PN6-`@ENF@Lc{`CwP8;`|%S!l+eKU8&99Eys|<0@27{C_0*I@LPHq- zGyErruHJw6pW%Ofef@ui|3qnkpeq+n{Ac(N07MM++l%-tqyPW_07*qoM6N<$f?rAw AW&i*H 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 zcmV+t0`2|h0=xu}HGcpJa7bBm001r{001r{0eGc9b^rhY+(|@1RCwBDk-u&lK@i60 z7EV5j6L7i{4}jz}AVfn?iBma+O&%cbf<$_rB8JW>oFaAn1aTWnS0E%5Q_}!C;EtVR z*?%dP9JVvsVm11H`+YMD8ngyIpU)SIg}G;Ev)R1qXwa4h-GBSslTvz~C#4L6p#P;0 z008j(=lT5IIlL}Qg9d=dUyorJ`o14U5dgH?ZO3u`SD%2Fb^G;pI-RaotHEG^h^12L zC3ym#em{j_7)6oeI7yO(VOXox5OKHLA>!HD+15fKpqpkA-%je~95 zgb+dq01!f4*R?E*QVIZ;Wn}}*X0s!}IcJP1r2v32#yOW#Dy6j6T5Hn>fO5Hf1h(6) zQp&b%10Vhs=iI!^OeQ9hl+qX)E6%wP!hguRAG^mbUA(_Yl7v!9DK&dU z#QlDsrYU1gYn=^~&juod#BmG&T5BPM3C0-9^7Q+C`0@IuZ$8}+LX=V_l@P+b4FI0! z4M)S%$C>JMI&mDENSyObZQHg{zXdKoT=sfB&Up|7-EOy9ts-Kx*}VULpK1OA0)R^$ UIOm0_01E&B07*qoM6N<$f*Bm}l>h($ delta 315 zcmV-B0mS~i1m^;fHGcsdNkl8ZB6bJCLmJl3V62HNzXoF@jg>+MNNQZ3c zcWc&W5Nf6dSHV@%=pc^jAkA_O$>`v9h@_mvd)#o``~TqXcmM<3x56-VUAJ@i0D8*% z^nBlES+;Y29~^&<`~7}69Ga%tX+7Qrm&--hb<46w<58!@V1IzGyWQ6=j^nznA%v63 z1R<0p2||eDIKwa&uL}aK-`9DbgZ^4Bm-Cl-`-a2!fu7bh?V4^umSuoij^hx&bUvRc zX@+6O!k7Sq!GHoV#;4yC0R%yyUnvLz0*InW2T>Glz3o3xRE6hxx~Zy)7!BLD>EIS< z!R&b^%W_|OIy9ZCPil8G005hhO;HpOLPb%Urb*MZEK5m}R&T3Y<_|NSe5mvu!mj`T N002ovPDHLkV1hwYmb(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 zcmV+f0{i`mP)I!7Jbv2%uD6nBf$ zo2k+_ohE?MyAc4M@Rg@4dQB&Utgo&E&}(`Qz(MmsEQIU2JmCPWh9wpv3Zuzna{KMJ zeb~;{X&<&BAtj{k*jxFni;ou)lEsXgRMWKn+y3xms0g0#ss8t;Tdfv=AP4{uLac^$ z{q_3l%az)YC;al$<=V#Dy-S8+luD)XcpS$ufSO(_m&;-<)O0T9>Ceq1{2V4c$v?~QTl-Qw( zS_W!TYEl)mgzOx3G)?=H@KE6So=QW3#Y~+{hNb_0t-kbZm4{oecS+qVqg zr)PUUuX>((-UQ*5`o)X&GN4>8yId|sQ9K@xWm&qeD~h5hN+y#rP1EgmM zsZ^@jZ1($oK?F%85{JX#6A033wSZ_eD#(7ne}8`m!r}1!eivl5TIF)NXYv!A&u6dK z3rr>xLGt-LV4CK0TC3H@h0A(x63}cmGmWDLsZ@%s%}qdPG`DbFA%E}teCl-hZ7lN_-DH3gUaVI5Wi9)s9ggGv*x9U_0^p$6Z4>ne=yscX zA|S%Nvp8py0ms7*AKpJByLUqE;Uh$ZkMDMQ5(Io-TT33|DD+v}-ogaJ_3{eW$}7wX z++AO1*|}r~nIAEwmxml2{p9tlw>alGIc@WNwNDs^$#(#2Em0I^Bkjqp4VV+_tYJkO)o z>!FlNj!-NX&-3|wrc$Yl<5a6vLe*gdg07*qoM6N<$g5o*w AJ^%m! delta 494 zcmV$;yDE0;FfS?j_DS>UXxb2hQCFgaRjh5DH($&1~4 z_-gg0Q-6+Ko4t649RoHE-@bk0`1AD4p*t_`o#N)^`t|Gg{eSz9IT$!UyjMZCmIawJ ze|D#f+SlJ=R!?94loaE9`R3=j3m4}u*^R7*37Nz2?>ED}JwJalUAgu4>ksA|_dfmp z{fhw=plJB_i}CKrpeeUw&wVt&2z*8&C%fTH0KEBnRBoG(8(x7>^1`@`?XmOwxQ zGc$vMwgfvHvwx1dI5!uYrm_GlD=V4?6i=t5masGZP+$}MEy~8t&3*6Qqp!bM49x6t zYOn~haIjZX)kg7 zZ4I0n1^`e*a^&-3SxQG{@5c=PJ{_n-e5 z7#R5Zx#5BmlJeL!C@aZ)|NcdghmoC)Nk?7m!PC!w{xUpz_Dxem30VWR`BPeigC^0E+jikkZd5_y7O^07*qoM6N<$g7m%wsQ>@~ diff --git a/src/core/DatabaseIcons.cpp b/src/core/DatabaseIcons.cpp index a6667270a..d6e816fb9 100644 --- a/src/core/DatabaseIcons.cpp +++ b/src/core/DatabaseIcons.cpp @@ -88,7 +88,7 @@ const char* const DatabaseIcons::m_indexToName[] = { "C62_Tux.png", "C63_Feather.png", "C64_Apple.png", - "C65_Apple.png", + "C65_W.png", "C66_Money.png", "C67_Certificate.png", "C68_BlackBerry.png"