[arch-commits] Commit in scribus/trunk (CalendarWizard.patch PKGBUILD)

[Gaetan Bisson]

    Date: Thursday, May 29, 2014 @ 06:48:47
  Author: bisson
Revision: 112062

upstream update

Modified:
  scribus/trunk/PKGBUILD
Deleted:
  scribus/trunk/CalendarWizard.patch

----------------------+
 CalendarWizard.patch |   23 -----------------------
 PKGBUILD             |   11 ++++-------
 2 files changed, 4 insertions(+), 30 deletions(-)

Deleted: CalendarWizard.patch
===================================================================
--- CalendarWizard.patch	2014-05-29 04:22:26 UTC (rev 112061)
+++ CalendarWizard.patch	2014-05-29 04:48:47 UTC (rev 112062)
@@ -1,23 +0,0 @@
-Modified: trunk/Scribus/scribus/plugins/scriptplugin/scripts/CalendarWizard.py
-URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18692&path=/trunk/Scribus/scribus/plugins/scriptplugin/scripts/CalendarWizard.py
-==============================================================================
---- trunk/Scribus/scribus/plugins/scriptplugin/scripts/CalendarWizard.py (original)
-+++ trunk/Scribus/scribus/plugins/scriptplugin/scripts/CalendarWizard.py Tue Jan  7 20:09:18 2014
-@@ -491,11 +491,11 @@
-         self.langLabel = Label(self, text='Select language:')
- 
-         self.langFrame = Frame(self)
--        self.langFrame.pack()
--        self.langScrollbar = Scrollbar(self.langFrame)
--        self.langScrollbar.pack(fill=Y, side=RIGHT)
-+        self.langFrame.grid()
-+        self.langScrollbar = Scrollbar(self.langFrame, orient=VERTICAL)
-+        self.langScrollbar.grid(row=0, column=1, sticky=N+S)
-         self.langListbox = Listbox(self.langFrame, selectmode=SINGLE, height=10, yscrollcommand=self.langScrollbar.set)
--        self.langListbox.pack(fill=X,side=LEFT)
-+        self.langListbox.grid(row=0, column=0, sticky=N+S+E+W)
-         self.langScrollbar.config(command=self.langListbox.yview)
- 
-         keys = localization.keys()
-
-

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-05-29 04:22:26 UTC (rev 112061)
+++ PKGBUILD	2014-05-29 04:48:47 UTC (rev 112062)
@@ -6,8 +6,8 @@
 # Contributor: Ben <ben at benmazer.net>
 
 pkgname=scribus
-pkgver=1.4.3
-pkgrel=3
+pkgver=1.4.4
+pkgrel=1
 pkgdesc='Desktop publishing software'
 url='http://www.scribus.net/'
 license=('GPL')
@@ -17,16 +17,13 @@
 depends=('qt4' 'cairo' 'lcms2' 'libcups' 'libxml2' 'hyphen'
          'ghostscript' 'python2' 'podofo' 'boost-libs'
          'desktop-file-utils' 'shared-mime-info')
-source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.xz"
-        'CalendarWizard.patch')
-sha1sums=('30c111762790e4407c13236bbb4b06f04e907f71'
-          'a92629a98bc960a6f7f946faf2d6f06e9d1e9452')
+source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.xz")
+sha1sums=('7bd3b4a7d6e6262126079847c617b3a25ba8ab06')
 
 install=install
 
 prepare() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
-	patch -p2 -i ../CalendarWizard.patch
 	sed 's|Icon=scribus|Icon=/usr/share/scribus/icons/scribus.png|' -i scribus.desktop
 	sed \
 		-e 's|#!/usr/bin/python|#!/usr/bin/python2|' \