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

fixed conflict

Browse Source
This commit is contained in:
ayhanyalcinsoy
2016-06-14 00:46:16 +03:00
parent 70ac1490a7 3b79c2e0fa
commit d562a9b0aa
11 changed files with 103793 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
network/plugin/flashplugin/pspec.xml
+9 -2
View File
@@ -13,8 +13,8 @@
<Icon>flash-player-properties</Icon>
<Summary>Adobe Flash Player</Summary>
<Description>Adobe (Macromedia) Flash Player is an application to present interactive (and possibly multimedia-containing) content created using Adobe Flash.</Description>
<Archive sha1sum="0d0f08baf151e332cee8f94657f2b967cacaed86" type="targz" target="i686">http://fpdownload.macromedia.com/get/flashplayer/pdc/11.2.202.569/install_flash_player_11_linux.i386.tar.gz</Archive>
<Archive sha1sum="bb564198ae07889f528ee41729d7f54b5844d3d6" type="targz" target="x86_64">http://fpdownload.macromedia.com/get/flashplayer/pdc/11.2.202.569/install_flash_player_11_linux.x86_64.tar.gz</Archive>
<Archive sha1sum="c55eecc3d92559fcc1abe3992a61a0223fb3684a" type="targz" target="i686">https://fpdownload.adobe.com/get/flashplayer/pdc/11.2.202.621/install_flash_player_11_linux.i386.tar.gz</Archive>
<Archive sha1sum="e62ad3af195e82c2c04b524586c5163e9ae8a51d" type="targz" target="x86_64">https://fpdownload.adobe.com/get/flashplayer/pdc/11.2.202.621/install_flash_player_11_linux.x86_64.tar.gz</Archive>
<BuildDependencies>
<Dependency>nss</Dependency>
<Dependency>gtk2</Dependency>
@@ -78,6 +78,13 @@
</Package>-->
<History>
<Update release="3">
<Date>2016-06-14</Date>
<Version>11.2.202.621</Version>
<Comment>Version Bump</Comment>
<Name>Pisi Linux Community</Name>
<Email>admin@pisilinux.org</Email>
</Update>
<Update release="2">
<Date>2016-06-09</Date>
<Version>11.2.202.569</Version>
network/plugin/freshplayerplugin/pspec.xml
+8 -1
View File
@@ -12,7 +12,7 @@
<IsA>app:gui</IsA>
<Summary>ppapi2npapi compatibility layer</Summary>
<Description>PPAPI-host NPAPI-plugin adapter.</Description>
<Archive sha1sum="765785671a636b14824d633e074ee911205405ac" type="targz">https://github.com/i-rinat/freshplayerplugin/archive/v0.3.4.tar.gz</Archive>
<Archive sha1sum="9f76b38802697576856f880a0672257cc0a9544f" type="targz">https://github.com/i-rinat/freshplayerplugin/archive/v0.3.5.tar.gz</Archive>
<BuildDependencies>
<Dependency>cmake</Dependency>
<Dependency>ragel</Dependency>
@@ -52,6 +52,13 @@
</Package>
<History>
<Update release="3">
<Date>2016-06-14</Date>
<Version>0.3.5</Version>
<Comment>Version Bump</Comment>
<Name>Pisi Linux Community</Name>
<Email>admin@pisilinux.org</Email>
</Update>
<Update release="2">
<Date>2016-06-09</Date>
<Version>0.3.4</Version>
network/web/chromium-browser/pspec.xml
+2 -2
View File
@@ -9,7 +9,7 @@
<Email>admin@pisilinux.org</Email>
</Packager>
<License>GPLv2</License>
<Icon>chromium</Icon>
<Icon>chromium-browser</Icon>
<IsA>app:gui</IsA>
<Summary>A WebKit powered web browser</Summary>
<Description>Chromium-browser is an open-source web browser, powered by WebKit.</Description>
@@ -88,7 +88,7 @@
</Patches>
</Source>
<Package>
<Name>chromium</Name>
<Name>chromium-browser</Name>
<RuntimeDependencies>
<Dependency>alsa-lib</Dependency>
<Dependency>dbus</Dependency>
pisi-index.xml
+103660
View File
File diff suppressed because it is too large Load Diff
pisi-index.xml.sha1sum
+1
View File
@@ -0,0 +1 @@
95cda0f584a6b7953284d7647e8c389cc2f6fd76
pisi-index.xml.xz
BIN
View File
Binary file not shown.
pisi-index.xml.xz.sha1sum
+1
View File
@@ -0,0 +1 @@
0880211d249455fb0352accd3a5eb03be845b1a1
programming/language/python/python-backports-ssl-match-hostname/actions.py
+15
View File
@@ -0,0 +1,15 @@
#!/usr/bin/python
# -*- coding: utf-8 -*-
# Licensed under the GNU General Public License, version 3.
# See the file http://www.gnu.org/copyleft/gpl.txt
from pisi.actionsapi import pythonmodules
from pisi.actionsapi import pisitools
def build():
pythonmodules.compile()
def install():
pythonmodules.install()
pisitools.dodoc("PKG-INFO", "MANIFEST*")
programming/language/python/python-backports-ssl-match-hostname/pspec.xml
+41
View File
@@ -0,0 +1,41 @@
<PISI>
<Source>
<Name>python-backports-ssl-match-hostname</Name>
<Homepage>https://pypi.python.org/pypi/backports.ssl_match_hostname</Homepage>
<Packager>
<Name>Alihan Öztürk</Name>
<Email>alihan@pisilinux.org</Email>
</Packager>
<License>PSF-2.2</License>
<IsA>app</IsA>
<Summary>The ssl.match_hostname() function from Python 3.4</Summary>
<Description>The ssl.match_hostname() function from Python 3.4</Description>
<Archive sha1sum="da4e41f3b110279d2382df47ac1e4f10c63cf954" type="targz">https://pypi.python.org/packages/3a/15/f9e48bfd2b971ade10ad0c03babab057791c260b05322cbd3f47e27be108/backports.ssl_match_hostname-3.4.0.2.tar.gz</Archive>
<BuildDependencies>
<Dependency>python-devel</Dependency>
<Dependency>python-setuptools</Dependency>
</BuildDependencies>
</Source>
<Package>
<Name>python-backports-ssl-match-hostname</Name>
<Summary>The ssl.match_hostname() function from Python 3.4</Summary>
<RuntimeDependencies>
<Dependency>python</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="library">/usr/lib/python*</Path>
<Path fileType="doc">/usr/share/doc</Path>
</Files>
</Package>
<History>
<Update release="1">
<Date>2016-06-15</Date>
<Version>3.4.0.2</Version>
<Comment>First release</Comment>
<Name>Alihan Öztürk</Name>
<Email>alihan@pisilinux.org</Email>
</Update>
</History>
</PISI>
programming/language/python3/python3-backports-ssl-match-hostname/actions.py
+15
View File
@@ -0,0 +1,15 @@
#!/usr/bin/python
# -*- coding: utf-8 -*-
# Licensed under the GNU General Public License, version 3.
# See the file http://www.gnu.org/copyleft/gpl.txt
from pisi.actionsapi import pythonmodules
from pisi.actionsapi import pisitools
def build():
pythonmodules.compile(pyVer="3")
def install():
pythonmodules.install(pyVer="3")
pisitools.dodoc("PKG-INFO", "MANIFEST*")
programming/language/python3/python3-backports-ssl-match-hostname/pspec.xml
+41
View File
@@ -0,0 +1,41 @@
<PISI>
<Source>
<Name>python3-backports-ssl-match-hostname</Name>
<Homepage>https://pypi.python.org/pypi/backports.ssl_match_hostname</Homepage>
<Packager>
<Name>Alihan Öztürk</Name>
<Email>alihan@pisilinux.org</Email>
</Packager>
<License>PSF-2.2</License>
<IsA>app</IsA>
<Summary>The ssl.match_hostname() function from Python 3.4</Summary>
<Description>The ssl.match_hostname() function from Python 3.4</Description>
<Archive sha1sum="da4e41f3b110279d2382df47ac1e4f10c63cf954" type="targz">https://pypi.python.org/packages/3a/15/f9e48bfd2b971ade10ad0c03babab057791c260b05322cbd3f47e27be108/backports.ssl_match_hostname-3.4.0.2.tar.gz</Archive>
<BuildDependencies>
<Dependency>python3-devel</Dependency>
<Dependency>python3-setuptools</Dependency>
</BuildDependencies>
</Source>
<Package>
<Name>python3-backports-ssl-match-hostname</Name>
<Summary>The ssl.match_hostname() function from Python 3.4</Summary>
<RuntimeDependencies>
<Dependency>python3</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="library">/usr/lib/python*</Path>
<Path fileType="doc">/usr/share/doc</Path>
</Files>
</Package>
<History>
<Update release="1">
<Date>2016-06-15</Date>
<Version>3.4.0.2</Version>
<Comment>First release</Comment>
<Name>Alihan Öztürk</Name>
<Email>alihan@pisilinux.org</Email>
</Update>
</History>
</PISI>