From 8c74e8b0df968bc7df0a19223ca3a76d081ba139 Mon Sep 17 00:00:00 2001 From: Kilian Valkhof Date: Sun, 28 Nov 2010 19:53:52 +0100 Subject: [PATCH] update debian stuff, add mandriva to site, add arch logo --- debian/control | 2 +- debian/copyright | 174 ++++++++++++++++++++++++++++++++++++++++++- website/arch.png | Bin 0 -> 1062 bytes website/index.html | 13 +++- website/mandriva.png | Bin 0 -> 1957 bytes 5 files changed, 184 insertions(+), 5 deletions(-) create mode 100644 website/arch.png create mode 100644 website/mandriva.png diff --git a/debian/control b/debian/control index f5e6cc7..68bdb14 100644 --- a/debian/control +++ b/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: Kilian Valkhof Build-Depends: debhelper (>=7), python-support (>=0.8.7), python XS-Python-Version: >=2.6 -Standards-Version: 3.8.0 +Standards-Version: 3.9.1 Homepage: http://trimage.org Package: trimage diff --git a/debian/copyright b/debian/copyright index 9e2d5a8..2a6f587 100644 --- a/debian/copyright +++ b/debian/copyright @@ -2,7 +2,7 @@ This package was debianized by: Kilian Valkhof on Tue, 23 Mar 2010 20:18:17 +0100 -Upstream Author(s): +Upstream Author: Kilian Valkhof @@ -82,3 +82,175 @@ License: (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +ThreadPool is: + + Copyright (c) Morten Holdflod Moeller + +License: + + GNU LESSER GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + + This version of the GNU Lesser General Public License incorporates + the terms and conditions of version 3 of the GNU General Public + License, supplemented by the additional permissions listed below. + + 0. Additional Definitions. + + As used herein, "this License" refers to version 3 of the GNU Lesser + General Public License, and the "GNU GPL" refers to version 3 of the GNU + General Public License. + + "The Library" refers to a covered work governed by this License, + other than an Application or a Combined Work as defined below. + + An "Application" is any work that makes use of an interface provided + by the Library, but which is not otherwise based on the Library. + Defining a subclass of a class defined by the Library is deemed a mode + of using an interface provided by the Library. + + A "Combined Work" is a work produced by combining or linking an + Application with the Library. The particular version of the Library + with which the Combined Work was made is also called the "Linked + Version". + + The "Minimal Corresponding Source" for a Combined Work means the + Corresponding Source for the Combined Work, excluding any source code + for portions of the Combined Work that, considered in isolation, are + based on the Application, and not on the Linked Version. + + The "Corresponding Application Code" for a Combined Work means the + object code and/or source code for the Application, including any data + and utility programs needed for reproducing the Combined Work from the + Application, but excluding the System Libraries of the Combined Work. + + 1. Exception to Section 3 of the GNU GPL. + + You may convey a covered work under sections 3 and 4 of this License + without being bound by section 3 of the GNU GPL. + + 2. Conveying Modified Versions. + + If you modify a copy of the Library, and, in your modifications, a + facility refers to a function or data to be supplied by an Application + that uses the facility (other than as an argument passed when the + facility is invoked), then you may convey a copy of the modified + version: + + a) under this License, provided that you make a good faith effort to + ensure that, in the event an Application does not supply the + function or data, the facility still operates, and performs + whatever part of its purpose remains meaningful, or + + b) under the GNU GPL, with none of the additional permissions of + this License applicable to that copy. + + 3. Object Code Incorporating Material from Library Header Files. + + The object code form of an Application may incorporate material from + a header file that is part of the Library. You may convey such object + code under terms of your choice, provided that, if the incorporated + material is not limited to numerical parameters, data structure + layouts and accessors, or small macros, inline functions and templates + (ten or fewer lines in length), you do both of the following: + + a) Give prominent notice with each copy of the object code that the + Library is used in it and that the Library and its use are + covered by this License. + + b) Accompany the object code with a copy of the GNU GPL and this license + document. + + 4. Combined Works. + + You may convey a Combined Work under terms of your choice that, + taken together, effectively do not restrict modification of the + portions of the Library contained in the Combined Work and reverse + engineering for debugging such modifications, if you also do each of + the following: + + a) Give prominent notice with each copy of the Combined Work that + the Library is used in it and that the Library and its use are + covered by this License. + + b) Accompany the Combined Work with a copy of the GNU GPL and this license + document. + + c) For a Combined Work that displays copyright notices during + execution, include the copyright notice for the Library among + these notices, as well as a reference directing the user to the + copies of the GNU GPL and this license document. + + d) Do one of the following: + + 0) Convey the Minimal Corresponding Source under the terms of this + License, and the Corresponding Application Code in a form + suitable for, and under terms that permit, the user to + recombine or relink the Application with a modified version of + the Linked Version to produce a modified Combined Work, in the + manner specified by section 6 of the GNU GPL for conveying + Corresponding Source. + + 1) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (a) uses at run time + a copy of the Library already present on the user's computer + system, and (b) will operate properly with a modified version + of the Library that is interface-compatible with the Linked + Version. + + e) Provide Installation Information, but only if you would otherwise + be required to provide such information under section 6 of the + GNU GPL, and only to the extent that such information is + necessary to install and execute a modified version of the + Combined Work produced by recombining or relinking the + Application with a modified version of the Linked Version. (If + you use option 4d0, the Installation Information must accompany + the Minimal Corresponding Source and Corresponding Application + Code. If you use option 4d1, you must provide the Installation + Information in the manner specified by section 6 of the GNU GPL + for conveying Corresponding Source.) + + 5. Combined Libraries. + + You may place library facilities that are a work based on the + Library side by side in a single library together with other library + facilities that are not Applications and are not covered by this + License, and convey such a combined library under terms of your + choice, if you do both of the following: + + a) Accompany the combined library with a copy of the same work based + on the Library, uncombined with any other library facilities, + conveyed under the terms of this License. + + b) Give prominent notice with the combined library that part of it + is a work based on the Library, and explaining where to find the + accompanying uncombined form of the same work. + + 6. Revised Versions of the GNU Lesser General Public License. + + The Free Software Foundation may publish revised and/or new versions + of the GNU Lesser General Public License from time to time. Such new + versions will be similar in spirit to the present version, but may + differ in detail to address new problems or concerns. + + Each version is given a distinguishing version number. If the + Library as you received it specifies that a certain numbered version + of the GNU Lesser General Public License "or any later version" + applies to it, you have the option of following the terms and + conditions either of that published version or of any later version + published by the Free Software Foundation. If the Library as you + received it does not specify a version number of the GNU Lesser + General Public License, you may choose any version of the GNU Lesser + General Public License ever published by the Free Software Foundation. + + If the Library as you received it specifies that a proxy can decide + whether future versions of the GNU Lesser General Public License shall + apply, that proxy's public statement of acceptance of any version is + permanent authorization for you to choose that version for the + Library. + diff --git a/website/arch.png b/website/arch.png new file mode 100644 index 0000000000000000000000000000000000000000..fafd033f24d1ece216590ad97a46869afa5f1779 GIT binary patch literal 1062 zcmeAS@N?(olHy`uVBq!ia0y~yV2}Y}4rT@h2G`5_%NQ6K9|!n^xH2#>FfcMQFf%i- zu`{@YGPs5_xP>#gMKA=WGEUyXBBj7(=gsXE#qAx%147X}J~2X-lR&x%Vis1A5=JHl zZeC_#aRvrP1_2QU5lIFSNoG+gW-%!iF)0>t8DP277-74Pyp7Uy$2e!Wdk_Slq(c-NSi2BX~R`8JvQ-odOut z4H>**d3<9S90C}_vO#u*W-~}DG3InI=Jzlb_A-`C60MsdkXXuCJ4d8yGGp6v(T3TK zHFFqi=P=gJ*WO@Udy{e9Ev8jhnO9$BS#ynb%{8_)*SMCS<5_o|cg1=B_1A?q+z{S)Lv-T} zu}wE6H{X<+y-RBA9q9!Jq_^FX*>Y26%PrYeXJyx%ms@v9Zv7>>^_S%~T#?^&U4HWo z`K`C)x89cDc3Xbi9r^8dn(+Cx7Byu_`$%ykWdoj7YvFKRLsc2#vv#y zDlH?gWMppVl8}&=kzW7;g_Tt`wG9i`Z`inb_u*rw&z?Ph0R%2yx_b5MwMUPie*X6D z`>$WW|NQy;_a7X*_`d%v0|VnEPZ!4!jq}L~4ooq-cE#{mFf3lOd9#W#pC@DQj|yJK z7%5pb|FQ!MLmia!-rccy6D6rCtA2KlCFkz2ytg}c8mB$DptVAnYs!&zp&l-0c4YIF zt?dbF^ZJx0oSt~~)Ou0Tgghw=*%hW?bHxw$2S4-W=zBA>*Hzp8Lcej^*|}D^YysIl zR{XP$c^Wr9GJeK703GYrRK_+egSLO2=qSvr!|L%XO7mtsga)drskXom}L>7Mry>HXkndm=Q1d4r6S3j3^P6{Nz literal 0 HcmV?d00001 diff --git a/website/index.html b/website/index.html index 019b47a..6f67ec7 100644 --- a/website/index.html +++ b/website/index.html @@ -89,9 +89,9 @@

Debian (sid)

Trimage is available in the official Debian Sid repositories:

    -
  1. Sudo apt-get install trimage
    2. +
  2. sudo apt-get install trimage
- +

Ubuntu

If you're on maveric, karmic or lucid, type the following commands into your console:

    @@ -100,11 +100,18 @@
  1. sudo apt-get install trimage

If you are still on Jaunty, read this guide on installing PPA's.

-

Arch Linux

+ +

Arch Linux

Trimage is available from AUR, to install, type:
  1. yaourt -S trimage-git
+

Mandriva Linux 2010.1

+ Trimage is available Via two RPMs provided by Mandriva international backports +
    +
  1. Trimage 1.0.5 32bit
    2. +
  2. Trimage 1.0.5 63bit
    3. +

Other *nix

  1. Download the source via git or bzr (see repositories)
    2. diff --git a/website/mandriva.png b/website/mandriva.png new file mode 100644 index 0000000000000000000000000000000000000000..b75f0e7bda8df26e6a9559324c2cd36156e74a1d GIT binary patch literal 1957 zcmeAS@N?(olHy`uVBq!ia0y~yV2}Y}4mJh`h9chkQy3W7b39!fLp+Y(4Xy5p36=eK zuJ-KQoyOMI*8R2iR=e-!&A%;n#?3%fBZOnA$^^G0jzwk?F3B(Ak4brUxcRPHr0|J@ zNh?!J)U;`%vVylK15(gy#vaeIH=|ForF*{u52_Y*65 zH!gcMzm9?5{O1ZDZolQz4*i|*K-=BlLGeh3>5G#oItH(U6@UHuweHOP^K%?de^7W6 z%71rl=g+fJ-$f5;)yAdfdA5hzSyVi0E&uTB|Hb)|+Gyh%P*Uuj}yzn`? zHg>b|&M6$N9f3P~Rdcv8u1$-9C511ZYII#4gvF^($mF{PjN=;0=-ZW9> z*Up>8*S`nMUZcri5WQk?z?bj`IK#QOA~c<48CoZ5`Vk!gkgKx)F(ykd)N%v z6U8>2s-^8elVo){H}@9` zDsUxw1&9WDE!iz(G2OCr*1iAihkt*a{$TfPz3{Ns6g`RL>8(3lrnUwiaJzBs8LRQW zXTEpm%L!FYdC@Yp>EgHcyQ^~7N0}BxZU|fcp~iRpZzj8`YNadIX>@Tj_;R0DSatMz zK^YD|$DJ&xEOyEZ zd=~gU+Az!f-Tti0U%#j7Kl}6UoEU?}5B=PWw*}n}1n6tDRLq=NmGx?pam2ccbaU2v z=F@eh9_xGW9@{Gwo5AC<#lF_99Wz*-HUvm?6o}8?)BYp=_f?^q8Si+MB?8Vb zo%Q95r~6u?4CV<(PfQI@-ZOzI*y+-n-8UT{26}(> z({}o(m?0XK+Zidg$&Ms`0;ldHbPA;lbMS_Y-gVK0m*iKkdDHeCGQi8Edmc zb{o|`x@2D5n|Oa>&h-x`cb;9GexlS}C)Cr8ldUSNu}+Rk5Ht}xf{aXni~QIU|Xt?iAi zzn31laEoPI?Xy=u^Z);NdgRtq!`$Cz_x@Zd8Lbn&?ah3T^ZP%ro!TaEGxy~B{l(tz z-(1%3@ndCjJHJ&rdhPG`I}3FtpFHvJ-@pEMiF@PP3pTr@-TJ5be2=M|?Z*cnPW~yM zrPN{n>CTD6?0qpS{(d@Y&b5Aj`AI43?FqH7R&C4L7_{HQXxi?hpZCZ=<(fLZ`QQQJ zm)|a!cPx?J|Ksk(xm}A=J%6aBqlPQ1(TnB-k-`t*#;Lj(K2Uw5DL3l$S(m=Q0Mv85rS zWAgR;vv+PY_Vl^^@$1KvK_(Yh%-X!OXth&BPJzPI^4D=IlESa^EfGH0wt@3}dQ^Dy z5$20r4=1RFPG#wze`+0%go?%F)oju_rW59G4}Z$t9eDryLO~}7hBfhmuEmoT^`7QR z@<|@ySz%D3^t^l9t;=E)V}vGkMW0Kk*SR=r%d5qYTOGV(RPW~YUNCtSxNL`_@XvE* zpOcD}ukn9TYfFDNXSL>1w|w^ryX{mISyU#UR1o0ESQ_*(EHu}5TBpk`%^r*K2d;cH5d?}Ub4P40Q^czMT*YkNf}c6<%n81Zk( s^PgvVCw`devE}3WIfnfIzyGj~%Xw_|EbvP`0|Nttr>mdKI;Vst04;XqegFUf literal 0 HcmV?d00001