Pisilinux/main
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

change pimcommon and plasma-workspace with new prison remove prison-qt5

Browse Source
This commit is contained in:
groni
2016-12-28 20:53:43 +01:00
parent bd4ad19992
commit 450e7f9f38
8 changed files with 73 additions and 235 deletions
Download Patch File Download Diff File Expand all files Collapse all files
desktop/kde/addon/prison-qt5/actions.py
-19
View File
@@ -1,19 +0,0 @@
#!/usr/bin/python
# -*- coding: utf-8 -*-
#
# Licensed under the GNU General Public License, version 3.
# See the file http://www.gnu.org/licenses/gpl.txt
from pisi.actionsapi import kde5
from pisi.actionsapi import pisitools
def setup():
kde5.configure("-DQT5_BUILD=ON")
def build():
kde5.make()
def install():
kde5.install()
pisitools.dodoc("LICENSE")
desktop/kde/addon/prison-qt5/pspec.xml
-71
View File
@@ -1,71 +0,0 @@
<?xml version="1.0" ?>
<!DOCTYPE PISI SYSTEM "http://www.pisilinux.org/projeler/pisi/pisi-spec.dtd">
<PISI>
<Source>
<Name>prison-qt5</Name>
<Homepage>http://www.kde.org</Homepage>
<Packager>
<Name>Pisi Linux Admins</Name>
<Email>admin@pisilinux.org</Email>
</Packager>
<License>MIT</License>
<IsA>library</IsA>
<Summary>A barcode API to produce QRCode barcodes and DataMatrix barcode</Summary>
<Description>A barcode API to produce QRCode barcodes and DataMatrix barcode.</Description>
<Archive sha1sum="fb5770924f6305f4c5a00e5bac04cea207abd6e7" type="tarxz">http://download.lunar-linux.org/lunar/mirrors/prison-frameworks-1.2.1.tar.xz</Archive>
<BuildDependencies>
<Dependency>qt5-base-devel</Dependency>
<Dependency>libdmtx-devel</Dependency>
<Dependency>qrencode-devel</Dependency>
<Dependency>extra-cmake-modules</Dependency>
<Dependency>mesa-devel</Dependency>
</BuildDependencies>
</Source>
<Package>
<Name>prison-qt5</Name>
<RuntimeDependencies>
<Dependency>qt5-base</Dependency>
<Dependency>libgcc</Dependency>
<Dependency>mesa</Dependency>
<Dependency>libdmtx</Dependency>
<Dependency>qrencode</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="library">/usr/lib/*.so.*</Path>
<Path fileType="library">/usr/lib/qt5/mkspecs/modules</Path>
<Path fileType="doc">/usr/share/doc</Path>
</Files>
</Package>
<Package>
<Name>prison-qt5-devel</Name>
<Summary>Development files for libepoxy</Summary>
<RuntimeDependencies>
<Dependency release="current">prison-qt5</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="header">/usr/include/KF5/prison_version.h</Path>
<Path fileType="header">/usr/include/KF5/PRISON/prison</Path>
<Path fileType="library">/usr/lib/*.so</Path>
<Path fileType="data">/usr/lib/cmake/KF5Prison/*.cmake</Path>
</Files>
</Package>
<History>
<Update release="2">
<Date>2016-05-22</Date>
<Version>1.2.1</Version>
<Comment>Rebuild</Comment>
<Name>Alihan Öztürk</Name>
<Email>alihan@pisilinux.org</Email>
</Update>
<Update release="1">
<Date>2016-01-17</Date>
<Version>1.2.1</Version>
<Comment>First release</Comment>
<Name>Alihan Öztürk</Name>
<Email>alihan@pisilinux.org</Email>
</Update>
</History>
</PISI>
desktop/kde/applications/pimcommon/pspec.xml
+1 -1
View File
@@ -92,7 +92,7 @@
<Dependency>kwidgetsaddons</Dependency>
<Dependency>kdelibs4-support</Dependency>
<Dependency>qt5-phonon</Dependency>
<Dependency>prison-qt5</Dependency>
<Dependency>prison</Dependency>
<Dependency>akonadi</Dependency>
<Dependency>libkdepim</Dependency>
<Dependency>akonadi-contacts</Dependency>
desktop/kde/plasma/plasma-workspace/pspec.xml
+2 -2
View File
@@ -52,7 +52,7 @@
<Dependency>NetworkManager-devel</Dependency>
<Dependency>networkmanager-qt-devel</Dependency>
<Dependency>pam-devel</Dependency>
<Dependency>prison-qt5-devel</Dependency>
<Dependency>prison-devel</Dependency>
<Dependency versionFrom="5.6.2">qt5-base-devel</Dependency>
<Dependency>xorg-app-devel</Dependency>
<Dependency>qt5-sql-mysql</Dependency>
@@ -136,7 +136,7 @@
<Dependency>libXrender</Dependency>
<Dependency>networkmanager-qt</Dependency>
<Dependency>pam</Dependency>
<Dependency>prison-qt5</Dependency>
<Dependency>prison</Dependency>
<Dependency>plasma-framework</Dependency>
<Dependency versionFrom="5.6.2">qt5-base</Dependency>
<Dependency>qt5-declarative</Dependency>
pisi-index.xml
+68 -140
View File
@@ -22634,7 +22634,7 @@
<Description xml:lang="en">GPGME is a library designed to make access to GnuPG easier for applications. It provides a high-Level Crypto application programming interface (API) for encryption, decryption, signing, signature verification and key management.</Description>
<Description xml:lang="tr">GPGME daha kolay uygulanması amacıyla GnuPG ye erişimi sağlamak için tasarlanmış bir kütüphanedir. Şifreleme, şifre çözme, imzalama, imza kontrolü ve anahtar yönetimi için yüksek düzeyde gizli uygulama programlama arayüzü sağlar.</Description>
<Description xml:lang="es">GPGME es una librería diseñada para simplificar el acceso a GnuPG para aplicaciones. Facilita una interfaz de programación de aplicación (API) de alto nivel para encriptación, decriptación, firmas, verificación de firmas y administración de llaves.</Description>
<Archive type="tarbz2" sha1sum="af95d75878200407eb577245eeb0681b1ad313ed">http://gd.tuwien.ac.at/pub/gnupg/gpgme/gpgme-1.7.1.tar.bz2</Archive>
<Archive type="tarbz2" sha1sum="efa043064dbf675fd713228c6fcfcc4116feb221">http://gd.tuwien.ac.at/pub/gnupg/gpgme/gpgme-1.8.0.tar.bz2</Archive>
<BuildDependencies>
<Dependency>gnupg</Dependency>
<Dependency>libgpg-error-devel</Dependency>
@@ -22645,6 +22645,9 @@
<Dependency>python3-devel</Dependency>
<Dependency>python-devel</Dependency>
</BuildDependencies>
<Patches>
<Patch level="1">remove-a-forgotten-instance-of-libsuffix.diff</Patch>
</Patches>
<SourceURI>util/crypt/gpgme/pspec.xml</SourceURI>
</Source>
<Package>
@@ -22655,6 +22658,7 @@
<Dependency>libassuan</Dependency>
<Dependency>libgcc</Dependency>
<Dependency>qt5-base</Dependency>
<Dependency>python3</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="executable">/usr/bin</Path>
@@ -22669,7 +22673,7 @@
<Summary xml:lang="en">Development files for gpgme</Summary>
<Summary xml:lang="tr">gpgme için geliştirme dosyaları</Summary>
<RuntimeDependencies>
<Dependency release="3">gpgme</Dependency>
<Dependency release="4">gpgme</Dependency>
<Dependency>libgpg-error-devel</Dependency>
<Dependency>libassuan-devel</Dependency>
</RuntimeDependencies>
@@ -22680,6 +22684,13 @@
</Files>
</Package>
<History>
<Update release="4">
<Date>2016-12-28</Date>
<Version>1.8.0</Version>
<Comment>Version bump.</Comment>
<Name>Stefan Gronewold</Name>
<Email>groni@pisilinux.org</Email>
</Update>
<Update release="3">
<Date>2016-12-24</Date>
<Version>1.7.1</Version>
@@ -59586,7 +59597,7 @@ thunar-volman is installed and configured properly, and you plug in your digical
<Icon>kontact</Icon>
<Archive type="tarxz" sha1sum="f182605d39755536d57416a3c142b50c31af426c">mirrors://kde/stable/applications/16.12.0/src/kdepim-runtime-16.12.0.tar.xz</Archive>
<BuildDependencies>
<Dependency>kdoctools-devel</Dependency>
<Dependency versionFrom="5.29.0">kdoctools-devel</Dependency>
<Dependency>boost-devel</Dependency>
<Dependency>shared-mime-info</Dependency>
<Dependency>akonadi-devel</Dependency>
@@ -63764,49 +63775,55 @@ thunar-volman is installed and configured properly, and you plug in your digical
<Description xml:lang="en">KDE PIM library providing support for mail applications</Description>
<Archive type="tarxz" sha1sum="72a8249e8193e39466319ab36a3d12ce08a5c3bb">mirrors://kde/stable/applications/16.12.0/src/messagelib-16.12.0.tar.xz</Archive>
<BuildDependencies>
<Dependency>qt5-base-devel</Dependency>
<Dependency>extra-cmake-modules</Dependency>
<Dependency>boost-devel</Dependency>
<Dependency>kdoctools-devel</Dependency>
<Dependency>mailimporter-devel</Dependency>
<Dependency>libgravatar-devel</Dependency>
<Dependency>kdepim-apps-libs-devel</Dependency>
<Dependency>kidentitymanagement-devel</Dependency>
<Dependency>kmailtransport-devel</Dependency>
<Dependency>kmailtransport-devel</Dependency>
<Dependency>kmbox-devel</Dependency>
<Dependency>akonadi-devel</Dependency>
<Dependency>kjobwidgets-devel</Dependency>
<Dependency>solid-devel</Dependency>
<Dependency>kitemmodels-devel</Dependency>
<Dependency>kdelibs4-support-devel</Dependency>
<Dependency>qt5-webkit-devel</Dependency>
<Dependency>kemoticons-devel</Dependency>
<Dependency>kinit-devel</Dependency>
<Dependency>kunitconversion-devel</Dependency>
<Dependency>kmime-devel</Dependency>
<Dependency>kcontacts-devel</Dependency>
<Dependency>kcalcore-devel</Dependency>
<Dependency>kdewebkit-devel</Dependency>
<Dependency>akonadi-calendar-devel</Dependency>
<Dependency>akonadi-search-devel</Dependency>
<Dependency>kpimtextedit-devel</Dependency>
<Dependency>kimap-devel</Dependency>
<Dependency>kldap-devel</Dependency>
<Dependency>grantleetheme-devel</Dependency>
<Dependency>pimcommon-devel</Dependency>
<Dependency>libkleo-devel</Dependency>
<Dependency>libkdepim-devel</Dependency>
<Dependency versionFrom="1.7.1">gpgme-devel</Dependency>
<Dependency>grantlee-qt5-devel</Dependency>
<Dependency>qt5-declarative-devel</Dependency>
<Dependency>qt5-webengine-devel</Dependency>
<Dependency>akonadi-notes-devel</Dependency>
<Dependency>akonadi-mime-devel</Dependency>
<Dependency>akonadi-contacts-devel</Dependency>
<Dependency>syntax-highlighting-devel</Dependency>
<Dependency versionFrom="2.4.41">openldap-client</Dependency>
<Dependency versionFrom="5.1">grantlee-qt5</Dependency>
<Dependency versionFrom="5.1.40">kmime-devel</Dependency>
<Dependency versionFrom="5.26.0">extra-cmake-modules</Dependency>
<Dependency versionFrom="5.26.0">karchive-devel</Dependency>
<Dependency versionFrom="5.26.0">kcodecs-devel</Dependency>
<Dependency versionFrom="5.26.0">kcompletion-devel</Dependency>
<Dependency versionFrom="5.26.0">kconfig-devel</Dependency>
<Dependency versionFrom="5.26.0">kconfigwidgets-devel</Dependency>
<Dependency versionFrom="5.26.0">ki18n-devel</Dependency>
<Dependency versionFrom="5.26.0">kiconthemes-devel</Dependency>
<Dependency versionFrom="5.26.0">kio-devel</Dependency>
<Dependency versionFrom="5.26.0">kitemviews-devel</Dependency>
<Dependency versionFrom="5.26.0">kjobwidgets-devel</Dependency>
<Dependency versionFrom="5.26.0">kservice-devel</Dependency>
<Dependency versionFrom="5.26.0">ktextwidgets-devel</Dependency>
<Dependency versionFrom="5.26.0">kwidgetsaddons-devel</Dependency>
<Dependency versionFrom="5.26.0">kimap-devel</Dependency>
<Dependency versionFrom="5.26.0">kwindowsystem-devel</Dependency>
<Dependency versionFrom="5.26.0">kxmlgui-devel</Dependency>
<Dependency versionFrom="5.26.0">kitemmodels-devel</Dependency>
<Dependency versionFrom="5.26.0">kdoctools-devel</Dependency>
<Dependency versionFrom="5.26.0">kemoticons-devel</Dependency>
<Dependency versionFrom="5.26.0">kinit-devel</Dependency>
<Dependency versionFrom="5.26.0">kunitconversion-devel</Dependency>
<Dependency versionFrom="5.26.0">sonnet-devel</Dependency>
<Dependency versionFrom="5.26.0">syntax-highlighting-devel</Dependency>
<Dependency versionFrom="5.4.0">akonadi-devel</Dependency>
<Dependency versionFrom="5.4.0">akonadi-mime-devel</Dependency>
<Dependency versionFrom="5.4.0">akonadi-contacts-devel</Dependency>
<Dependency versionFrom="5.4.0">akonadi-notes-devel</Dependency>
<Dependency versionFrom="5.4.0">akonadi-search-devel</Dependency>
<Dependency versionFrom="5.4.0">grantleetheme-devel</Dependency>
<Dependency versionFrom="5.4.0">kcontacts-devel</Dependency>
<Dependency versionFrom="5.4.0">kdepim-apps-libs-devel</Dependency>
<Dependency versionFrom="5.4.0">kidentitymanagement-devel</Dependency>
<Dependency versionFrom="5.4.0">kldap-devel</Dependency>
<Dependency versionFrom="5.4.0">kmailtransport-devel</Dependency>
<Dependency versionFrom="5.4.0">kmbox-devel</Dependency>
<Dependency versionFrom="5.4.0">kpimtextedit-devel</Dependency>
<Dependency versionFrom="5.4.0">libgravatar-devel</Dependency>
<Dependency versionFrom="5.4.0">libkdepim-devel</Dependency>
<Dependency versionFrom="5.4.0">libkleo-devel</Dependency>
<Dependency versionFrom="5.4.0">pimcommon-devel</Dependency>
<Dependency versionFrom="5.6.2">qt5-base-devel</Dependency>
<Dependency versionFrom="5.6.2">qt5-webengine-devel</Dependency>
<Dependency versionFrom="5.6.2">qt5-webkit-devel</Dependency>
<Dependency versionFrom="2.1.26">cyrus-sasl-devel</Dependency>
<Dependency>git</Dependency>
</BuildDependencies>
<SourceURI>desktop/kde/applications/messagelib/pspec.xml</SourceURI>
</Source>
@@ -64057,14 +64074,13 @@ thunar-volman is installed and configured properly, and you plug in your digical
<Dependency>kdelibs4-support-devel</Dependency>
<Dependency>qt5-webkit-devel</Dependency>
<Dependency>kdewebkit-devel</Dependency>
<Dependency>gpgme-devel</Dependency>
<Dependency>akonadi-calendar-devel</Dependency>
<Dependency>akonadi-search-devel</Dependency>
<Dependency>akonadi-contacts-devel</Dependency>
<Dependency>grantleetheme-devel</Dependency>
<Dependency>kpimtextedit-devel</Dependency>
<Dependency>kimap-devel</Dependency>
<Dependency>prison-devel</Dependency>
<Dependency>prison-qt5-devel</Dependency>
<Dependency versionFrom="2.4.41">openldap-client</Dependency>
<Dependency versionFrom="2.1.26">cyrus-sasl-devel</Dependency>
</BuildDependencies>
@@ -64110,10 +64126,8 @@ thunar-volman is installed and configured properly, and you plug in your digical
<Files>
<Path fileType="config">/etc/xdg</Path>
<Path fileType="library">/usr/lib</Path>
<Path fileType="library">/usr/lib/qt5</Path>
<Path fileType="doc">/usr/share/doc</Path>
<Path fileType="data">/usr/mkspecs/</Path>
<Path fileType="executable">/usr/bin</Path>
<Path fileType="data">/usr/share</Path>
</Files>
</Package>
<Package>
@@ -64128,13 +64142,11 @@ thunar-volman is installed and configured properly, and you plug in your digical
<Files>
<Path fileType="data">/usr/lib/cmake</Path>
<Path fileType="header">/usr/include</Path>
<Path fileType="data">/usr/lib/gpgmepp</Path>
<Path fileType="data">/usr/share/kde4/apps/cmake</Path>
</Files>
</Package>
<History>
<Update release="6">
<Date>2016-12-25</Date>
<Date>2016-12-27</Date>
<Version>16.12.0</Version>
<Comment>Version bump.</Comment>
<Name>Stefan Gronewold(groni)</Name>
@@ -65998,12 +66010,10 @@ thunar-volman is installed and configured properly, and you plug in your digical
<Dependency>qt5-sql-mysql</Dependency>
<Dependency>qt5-sql-odbc</Dependency>
<Dependency>qt5-sql-postgresql</Dependency>
<Dependency>prison-devel</Dependency>
<Dependency>kmbox-devel</Dependency>
<Dependency>qt5-phonon-devel</Dependency>
<Dependency>akonadi-devel</Dependency>
<Dependency>libical-devel</Dependency>
<Dependency>libqjson-devel</Dependency>
<Dependency>libgpg-error-devel</Dependency>
<Dependency>libxslt-devel</Dependency>
<Dependency versionFrom="2.4.41">openldap-client</Dependency>
@@ -66054,10 +66064,8 @@ thunar-volman is installed and configured properly, and you plug in your digical
<Dependency>kwidgetsaddons</Dependency>
<Dependency>kdelibs4-support</Dependency>
<Dependency>qt5-phonon</Dependency>
<Dependency>prison-qt5</Dependency>
<Dependency>akonadi</Dependency>
<Dependency>gpgme</Dependency>
<Dependency>kpimtextedit</Dependency>
<Dependency>kwindowsystem</Dependency>
<Dependency versionFrom="2.1.26">cyrus-sasl</Dependency>
</RuntimeDependencies>
@@ -66085,7 +66093,7 @@ thunar-volman is installed and configured properly, and you plug in your digical
</Package>
<History>
<Update release="5">
<Date>2016-12-24</Date>
<Date>2016-12-23</Date>
<Version>16.12.0</Version>
<Comment>Version bump.</Comment>
<Name>Stefan Gronewold(groni)</Name>
@@ -69382,7 +69390,7 @@ thunar-volman is installed and configured properly, and you plug in your digical
<Dependency>kwidgetsaddons</Dependency>
<Dependency>kdelibs4-support</Dependency>
<Dependency>qt5-phonon</Dependency>
<Dependency>prison-qt5</Dependency>
<Dependency>prison</Dependency>
<Dependency>akonadi</Dependency>
<Dependency>libkdepim</Dependency>
<Dependency>akonadi-contacts</Dependency>
@@ -82636,7 +82644,7 @@ thunar-volman is installed and configured properly, and you plug in your digical
<Dependency>NetworkManager-devel</Dependency>
<Dependency>networkmanager-qt-devel</Dependency>
<Dependency>pam-devel</Dependency>
<Dependency>prison-qt5-devel</Dependency>
<Dependency>prison-devel</Dependency>
<Dependency versionFrom="5.6.2">qt5-base-devel</Dependency>
<Dependency>xorg-app-devel</Dependency>
<Dependency>qt5-sql-mysql</Dependency>
@@ -82718,7 +82726,7 @@ thunar-volman is installed and configured properly, and you plug in your digical
<Dependency>libXrender</Dependency>
<Dependency>networkmanager-qt</Dependency>
<Dependency>pam</Dependency>
<Dependency>prison-qt5</Dependency>
<Dependency>prison</Dependency>
<Dependency>plasma-framework</Dependency>
<Dependency versionFrom="5.6.2">qt5-base</Dependency>
<Dependency>qt5-declarative</Dependency>
@@ -87541,12 +87549,6 @@ thunar-volman is installed and configured properly, and you plug in your digical
<Path fileType="library">/usr/lib/qt5</Path>
<Path fileType="doc">/usr/share/doc</Path>
</Files>
<Conflicts>
<Package>prison-qt5</Package>
</Conflicts>
<Replaces>
<Package>prison-qt5</Package>
</Replaces>
</Package>
<Package>
<Name>prison-devel</Name>
@@ -87558,12 +87560,6 @@ thunar-volman is installed and configured properly, and you plug in your digical
<Path fileType="header">/usr/include</Path>
<Path fileType="data">/usr/lib/cmake</Path>
</Files>
<Conflicts>
<Package>prison-qt5-devel</Package>
</Conflicts>
<Replaces>
<Package>prison-qt5-devel</Package>
</Replaces>
</Package>
<History>
<Update release="3">
@@ -93115,74 +93111,6 @@ thunar-volman is installed and configured properly, and you plug in your digical
</Update>
</History>
</SpecFile>
<SpecFile>
<Source>
<Name>prison-qt5</Name>
<Homepage>http://www.kde.org</Homepage>
<Packager>
<Name>Pisi Linux Admins</Name>
<Email>admin@pisilinux.org</Email>
</Packager>
<License>MIT</License>
<IsA>library</IsA>
<PartOf>desktop.kde.addon</PartOf>
<Summary xml:lang="en">A barcode API to produce QRCode barcodes and DataMatrix barcode</Summary>
<Description xml:lang="en">A barcode API to produce QRCode barcodes and DataMatrix barcode.</Description>
<Archive type="tarxz" sha1sum="fb5770924f6305f4c5a00e5bac04cea207abd6e7">http://download.lunar-linux.org/lunar/mirrors/prison-frameworks-1.2.1.tar.xz</Archive>
<BuildDependencies>
<Dependency>qt5-base-devel</Dependency>
<Dependency>libdmtx-devel</Dependency>
<Dependency>qrencode-devel</Dependency>
<Dependency>extra-cmake-modules</Dependency>
<Dependency>mesa-devel</Dependency>
</BuildDependencies>
<SourceURI>desktop/kde/addon/prison-qt5/pspec.xml</SourceURI>
</Source>
<Package>
<Name>prison-qt5</Name>
<RuntimeDependencies>
<Dependency>qt5-base</Dependency>
<Dependency>libgcc</Dependency>
<Dependency>mesa</Dependency>
<Dependency>libdmtx</Dependency>
<Dependency>qrencode</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="library">/usr/lib/*.so.*</Path>
<Path fileType="library">/usr/lib/qt5/mkspecs/modules</Path>
<Path fileType="doc">/usr/share/doc</Path>
</Files>
</Package>
<Package>
<Name>prison-qt5-devel</Name>
<Summary xml:lang="en">Development files for libepoxy</Summary>
<RuntimeDependencies>
<Dependency release="2">prison-qt5</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="header">/usr/include/KF5/prison_version.h</Path>
<Path fileType="header">/usr/include/KF5/PRISON/prison</Path>
<Path fileType="library">/usr/lib/*.so</Path>
<Path fileType="data">/usr/lib/cmake/KF5Prison/*.cmake</Path>
</Files>
</Package>
<History>
<Update release="2">
<Date>2016-05-22</Date>
<Version>1.2.1</Version>
<Comment>Rebuild</Comment>
<Name>Alihan Öztürk</Name>
<Email>alihan@pisilinux.org</Email>
</Update>
<Update release="1">
<Date>2016-01-17</Date>
<Version>1.2.1</Version>
<Comment>First release</Comment>
<Name>Alihan Öztürk</Name>
<Email>alihan@pisilinux.org</Email>
</Update>
</History>
</SpecFile>
<SpecFile>
<Source>
<Name>kdeconnect</Name>
pisi-index.xml.sha1sum
+1 -1
View File
@@ -1 +1 @@
2ea6e02d2e3926a9bce2243f788fc7344255e3b4
229267660d54b9965fc2dd4d548f9f9a43f4623f
pisi-index.xml.xz
BIN
View File
Binary file not shown.
pisi-index.xml.xz.sha1sum
+1 -1
View File
@@ -1 +1 @@
64829c11e858c904ed863bdae4aff44368d4abac
d5eed460ab2d96d96ad29985c36f7acc682fbff4