From 1caf1d95a73f2196a2573fc316ad331290a5168c Mon Sep 17 00:00:00 2001
From: alihanozturk <alihan@pisilinux.org>
Date: Sat, 28 May 2016 19:59:00 +0300
Subject: [PATCH 1/3] update icon

---
 desktop/pisilinux/package-manager/actions.py | 1 +
 desktop/pisilinux/package-manager/pspec.xml  | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/desktop/pisilinux/package-manager/actions.py b/desktop/pisilinux/package-manager/actions.py
index 0896aa0007..c0a74f9cf3 100644
--- a/desktop/pisilinux/package-manager/actions.py
+++ b/desktop/pisilinux/package-manager/actions.py
@@ -9,6 +9,7 @@ from pisi.actionsapi import pisitools
 from pisi.actionsapi import kde4
 
 def install():
+    pisitools.dosed("data/*.desktop", "Icon=application-x-pisi", "Icon=/usr/share/icons/breeze/apps/128/package-manager.png")
     pythonmodules.install()
 
     # Copy Notification Rc file for Kde 4
diff --git a/desktop/pisilinux/package-manager/pspec.xml b/desktop/pisilinux/package-manager/pspec.xml
index 5c73cb790e..ba86628a22 100644
--- a/desktop/pisilinux/package-manager/pspec.xml
+++ b/desktop/pisilinux/package-manager/pspec.xml
@@ -41,7 +41,7 @@
 
     <History>
         <Update release="1">
-            <Date>2016-04-15</Date>
+            <Date>2016-05-28</Date>
             <Version>4.1.1</Version>
             <Comment>ported pyqt5</Comment>
             <Name>Ayhan Yalçınsoy</Name>

From 662da131411292a5b6136052fd2b3da8e1a3cdcf Mon Sep 17 00:00:00 2001
From: alihanozturk <alihan@pisilinux.org>
Date: Sat, 28 May 2016 20:02:24 +0300
Subject: [PATCH 2/3] gst:fix

---
 multimedia/video/gst-plugins-good-next/pspec.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/multimedia/video/gst-plugins-good-next/pspec.xml b/multimedia/video/gst-plugins-good-next/pspec.xml
index 964dbccf19..c8b2ca8e07 100644
--- a/multimedia/video/gst-plugins-good-next/pspec.xml
+++ b/multimedia/video/gst-plugins-good-next/pspec.xml
@@ -29,7 +29,7 @@
             <!--<Dependency>libshout-devel</Dependency>-->
             <!--<Dependency>wavpack-devel</Dependency>-->
             <!--<Dependency>libcaca-devel</Dependency>-->
-            <Dependency>libsoup-devel</Dependency>z
+            <Dependency>libsoup-devel</Dependency>
             <!--<Dependency>libsoup-gnome</Dependency>-->
             <Dependency>libXext-devel</Dependency>
             <Dependency>libv4l-devel</Dependency>

From 0003243edb82363fd59d7b0ccb36b6813d84c2d0 Mon Sep 17 00:00:00 2001
From: alihanozturk <alihan@pisilinux.org>
Date: Sat, 28 May 2016 20:03:05 +0300
Subject: [PATCH 3/3] fix conflicts

---
 desktop/pisilinux/package-manager/pspec.xml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/desktop/pisilinux/package-manager/pspec.xml b/desktop/pisilinux/package-manager/pspec.xml
index 11fc078607..ba86628a22 100644
--- a/desktop/pisilinux/package-manager/pspec.xml
+++ b/desktop/pisilinux/package-manager/pspec.xml
@@ -41,11 +41,7 @@
 
     <History>
         <Update release="1">
-<<<<<<< HEAD
             <Date>2016-05-28</Date>
-=======
-            <Date>2016-04-28</Date>
->>>>>>> 0cacccf24999358249ace629587d3b6c85b2b448
             <Version>4.1.1</Version>
             <Comment>ported pyqt5</Comment>
             <Name>Ayhan Yalçınsoy</Name>