Merge branch 'master' of github.com:pisilinux/main

office/misc/scribus/actions.py

@@ -26,5 +26,5 @@ def install():
     autotools.rawInstall("DESTDIR=%s" % get.installDIR())
     
     pisitools.insinto("/usr/share/applications", "vnd.scribus.desktop", "scribus.desktop")
-    pisitools.insinto("/usr/share/pixmaps", "resources/icons/scribus.png")
-    pisitools.insinto("/usr/share/pixmaps", "resources/icons/scribusdoc.png", "x-scribus.png")
+    pisitools.insinto("/usr/share/pixmaps", "resources/iconsets/1_5_1/scribus.png")
+    pisitools.insinto("/usr/share/pixmaps", "resources/iconsets/1_5_0/scribusdoc.png", "x-scribus.png")

office/misc/scribus/pspec.xml

@@ -14,7 +14,7 @@
         <IsA>app:gui</IsA>
         <Summary>Desktop Publishing (DTP) and Layout program</Summary>
         <Description>Scribus is an opensource desktop publishing application with features like CMYK colorspace and PDF output.
-        </Description><Archive sha1sum="fdf451037073ee648f135669535508813d61ee7e" type="tarxz">http://sourceforge.net/projects/scribus/files/scribus-devel/1.5.0/scribus-1.5.0.tar.xz</Archive>
+        </Description><Archive sha1sum="87f426863be8057d83e73b58649ccc2a3266c73b" type="tarxz">http://sourceforge.net/projects/scribus/files/scribus-devel/1.5.2/scribus-1.5.2.tar.xz</Archive>
         <BuildDependencies>
             <Dependency>cmake</Dependency>
             <Dependency>cups-devel</Dependency>
@@ -51,7 +51,7 @@
             <Patch>scribus-standard-font-paths.patch</Patch>
             <Patch>PisiLinux-default-font.patch</Patch>
             <Patch>PisiLinux-correctly_link_to_libxml2.patch</Patch>
-            <Patch>scribus-1.5.0-QObject.patch</Patch>
+            <!--<Patch>scribus-1.5.0-QObject.patch</Patch>-->
         </Patches>
     </Source>
 
@@ -99,8 +99,8 @@
 
     <History>
         <Update release="1">
-            <Date>2016-01-27</Date>
-            <Version>1.5.0</Version>
+            <Date>2016-05-18</Date>
+            <Version>1.5.2</Version>
             <Comment>First release</Comment>
             <Name>Stefan Gronewold</Name>
             <Email>groni@pisilinux.org</Email>