[arch-commits] Commit in eric/trunk (ChangeLog PKGBUILD eric.changelog eric.install)

Ray Rashif schiv at archlinux.org
Sat Nov 6 14:24:40 UTC 2010


    Date: Saturday, November 6, 2010 @ 10:24:39
  Author: schiv
Revision: 98284

upgpkg: eric 4.4.9-1
latest rel bump; fixed pyxml for this

Added:
  eric/trunk/eric.changelog
    (from rev 98273, eric/trunk/ChangeLog)
Modified:
  eric/trunk/PKGBUILD
  eric/trunk/eric.install
Deleted:
  eric/trunk/ChangeLog

----------------+
 ChangeLog      |   81 --------------------------------------------------
 PKGBUILD       |   67 +++++++++++++++++++++--------------------
 eric.changelog |   88 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 eric.install   |   10 +++---
 4 files changed, 128 insertions(+), 118 deletions(-)

Deleted: ChangeLog
===================================================================
--- ChangeLog	2010-11-06 11:00:57 UTC (rev 98283)
+++ ChangeLog	2010-11-06 14:24:39 UTC (rev 98284)
@@ -1,81 +0,0 @@
-
-2009-08-05  Douglas Soares de Andrade  <douglas at archlinux.org>
-
-	* Updated: 4.3.6
-
-2009-07-06  Douglas Soares de Andrade  <douglas at archlinux.org>
-
-	* Updated for x86_64: 4.3.5
-
-2009-06-13  Douglas Soares de Andrade  <douglas at archlinux.org>
-
-	* Updated for i686: 4.3.4
-
-2009-05-03  Douglas Soares de Andrade  <douglas at archlinux.org>
-
-	* Updated for i686: 4.3.3
-
-2009-04-10  Douglas Soares de Andrade  <douglas at archlinux.org>
-
-	* Updated for i686: 4.3.2
-
-2009-03-07  Douglas Soares de Andrade  <douglas at archlinux.org>
-
-	* Updated for i686: 4.3.1
-
-2009-02-08  Douglas Soares de Andrade  <douglas at archlinux.org>
-
-	* Updated for i686: 4.3.0
-
-2008-12-10  Douglas Soares de Andrade  <douglas at archlinux.org>
-
-	* Updated for i686: 4.2.4a
-
-2008-11-22  Douglas Soares de Andrade  <douglas at archlinux.org>
-
-	* Updated for i686: 4.2.3
-
-2008-10-08  Douglas Soares de Andrade  <douglas at archlinux.org>
-
-	* Updated for i686: 4.2.2a
-
-2008-09-13  Douglas Soares de Andrade  <douglas at archlinux.org>
-
-	* Updated for i686: 4.2.1
-
-2008-08-09  Douglas Soares de Andrade  <douglas at archlinux.org>
-
-	* Updated for i686: 4.2.0
-
-2008-07-05  Eric Belanger  <eric at archlinux.org>
-
-	* eric 4.1.6-1
-	* Upstream update
-
-2008-06-08  Eric Belanger  <eric at archlinux.org>
-
-	* eric 4.1.5-1
-	* Upstream update
-
-2008-05-19  Eric Belanger  <eric at archlinux.org>
-
-	* eric 4.1.4-1
-	* Upstream update
-
-2008-05-04  Eric Belanger  <eric at archlinux.org>
-
-	* eric 4.1.3-1
-	* Upstream update
-	* Added missing executable symlinks
-
-2008-04-17  Eric Belanger  <eric at archlinux.org>
-
-	* eric 4.1.2-1
-	* Upstream update
-	* Added .desktop file
-	
-2008-03-02  Eric Belanger  <eric at archlinux.org>
-
-	* eric 4.1.1-1
-	* Upstream update
-	* Added sitecustomize.py existance test in install scriptlet

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-11-06 11:00:57 UTC (rev 98283)
+++ PKGBUILD	2010-11-06 14:24:39 UTC (rev 98284)
@@ -1,62 +1,65 @@
+# Maintainer: Daniel J Griffiths <ghost1227 at archlinux.us>
 # Contributor: Eric Belanger <eric at archlinux.org>
 # Contributor: riai <riai at bigfoot.com>, Ben <ben at benmazer.net>
-# Maintainer: Daniel J Griffiths <ghost1227 at archlinux.us>
 
 pkgname=eric
-pkgver=4.4.5
-pkgrel=2
-pkgdesc="A full-featured Python IDE that is written in PyQt4 using the QScintilla2 editor widget"
+pkgver=4.4.9
+pkgrel=1
+pkgdesc="A full-featured Python and Ruby IDE in PyQt4"
 arch=('any')
 url="http://eric-ide.python-projects.org/index.html"
 license=('GPL3')
 depends=('python-qscintilla')
 conflicts=('eric4')
 replaces=('eric4')
-options=(force)
+provides=('eric4')
 install=eric.install
+changelog=eric.changelog
 source=(http://downloads.sourceforge.net/eric-ide/${pkgname}4-${pkgver}.tar.gz
-	'eric.desktop')
-md5sums=('4d03bf835a7c65e7b626446615fc926e'
-	 '77c494bb839c5744869d34355ea69095')
+        'eric.desktop')
+md5sums=('e8c9451850c70f4009785cc0d83adc25'
+         '77c494bb839c5744869d34355ea69095')
 
-build() {
-	/bin/true
-}
-
 package() {
 	cd ${srcdir}/${pkgname}4-${pkgver}
 
-	python2 install.py -c -b /usr/bin -i ${pkgdir} || return 1
+	# our pyxml is patched
+	# not version-depending because not critical
+	sed -i 's/v < (0, 8, 6)/v < (0, 8, 4)/' install.py
 
+	python2 install.py -c -b /usr/bin -i ${pkgdir}
+
 	install -D -m644 ${srcdir}/eric.desktop \
-		${pkgdir}/usr/share/applications/eric.desktop || return 1
+		${pkgdir}/usr/share/applications/eric.desktop
 	install -D -m644 eric/icons/default/eric.png \
-		${pkgdir}/usr/share/pixmaps/eric.png || return 1
+		${pkgdir}/usr/share/pixmaps/eric.png
 
 	# Creating version independant symlinks
-	ln -s /usr/bin/eric4 ${pkgdir}/usr/bin/eric || return 1
-	ln -s /usr/bin/eric4-api ${pkgdir}/usr/bin/eric-api || return 1
-	ln -s /usr/bin/eric4-compare ${pkgdir}/usr/bin/eric-compare || return 1
+	ln -s /usr/bin/eric4 ${pkgdir}/usr/bin/eric
+	ln -s /usr/bin/eric4-api ${pkgdir}/usr/bin/eric-api
+	ln -s /usr/bin/eric4-compare ${pkgdir}/usr/bin/eric-compare
 	ln -s /usr/bin/eric4-configure \
-		${pkgdir}/usr/bin/eric-configure || return 1
-	ln -s /usr/bin/eric4-diff ${pkgdir}/usr/bin/eric-diff || return 1
-	ln -s /usr/bin/eric4-doc ${pkgdir}/usr/bin/eric-doc || return 1
-	ln -s /usr/bin/eric4-editor ${pkgdir}/usr/bin/eric-editor || return 1
+		${pkgdir}/usr/bin/eric-configure
+	ln -s /usr/bin/eric4-diff ${pkgdir}/usr/bin/eric-diff
+	ln -s /usr/bin/eric4-doc ${pkgdir}/usr/bin/eric-doc
+	ln -s /usr/bin/eric4-editor ${pkgdir}/usr/bin/eric-editor
 	ln -s /usr/bin/eric4-helpviewer \
-		${pkgdir}/usr/bin/eric-helpviewer || return 1
+		${pkgdir}/usr/bin/eric-helpviewer
 	ln -s /usr/bin/eric4-plugininstall \
-		${pkgdir}/usr/bin/eric-plugininstall || return 1
+		${pkgdir}/usr/bin/eric-plugininstall
 	ln -s /usr/bin/eric4-pluginrepository \
-		${pkgdir}/usr/bin/eric-pluginrepository || return 1
+		${pkgdir}/usr/bin/eric-pluginrepository
 	ln -s /usr/bin/eric4-pluginuninstall \
-		${pkgdir}/usr/bin/eric-pluginuninstall || return 1
-	ln -s /usr/bin/eric4-qregexp ${pkgdir}/usr/bin/eric-qregexp || return 1
-	ln -s /usr/bin/eric4-re ${pkgdir}/usr/bin/eric-re || return 1
-	ln -s /usr/bin/eric4-tray ${pkgdir}/usr/bin/eric-tray || return 1
+		${pkgdir}/usr/bin/eric-pluginuninstall
+	ln -s /usr/bin/eric4-qregexp ${pkgdir}/usr/bin/eric-qregexp
+	ln -s /usr/bin/eric4-re ${pkgdir}/usr/bin/eric-re
+	ln -s /usr/bin/eric4-tray ${pkgdir}/usr/bin/eric-tray
 	ln -s /usr/bin/eric4-trpreviewer \
-		${pkgdir}/usr/bin/eric-trpreviewer || return 1
+		${pkgdir}/usr/bin/eric-trpreviewer
 	ln -s /usr/bin/eric4-uipreviewer \
-		${pkgdir}/usr/bin/eric-uipreviewer || return 1
+		${pkgdir}/usr/bin/eric-uipreviewer
 	ln -s /usr/bin/eric4-unittest \
-		${pkgdir}/usr/bin/eric-unittest || return 1
+		${pkgdir}/usr/bin/eric-unittest
 }
+
+# vim:set ts=2 sw=2 et:

Copied: eric/trunk/eric.changelog (from rev 98273, eric/trunk/ChangeLog)
===================================================================
--- eric.changelog	                        (rev 0)
+++ eric.changelog	2010-11-06 14:24:39 UTC (rev 98284)
@@ -0,0 +1,88 @@
+2010-11-06 Ray Rashif <schiv at archlinux.org>
+
+	* Updated: 4.4.9
+	Shortened description
+	Updated pyxml with fix
+	Minor PKGBUILD cosmetic changes
+	Bothered to update this log
+
+2009-08-05  Douglas Soares de Andrade  <douglas at archlinux.org>
+
+	* Updated: 4.3.6
+
+2009-07-06  Douglas Soares de Andrade  <douglas at archlinux.org>
+
+	* Updated for x86_64: 4.3.5
+
+2009-06-13  Douglas Soares de Andrade  <douglas at archlinux.org>
+
+	* Updated for i686: 4.3.4
+
+2009-05-03  Douglas Soares de Andrade  <douglas at archlinux.org>
+
+	* Updated for i686: 4.3.3
+
+2009-04-10  Douglas Soares de Andrade  <douglas at archlinux.org>
+
+	* Updated for i686: 4.3.2
+
+2009-03-07  Douglas Soares de Andrade  <douglas at archlinux.org>
+
+	* Updated for i686: 4.3.1
+
+2009-02-08  Douglas Soares de Andrade  <douglas at archlinux.org>
+
+	* Updated for i686: 4.3.0
+
+2008-12-10  Douglas Soares de Andrade  <douglas at archlinux.org>
+
+	* Updated for i686: 4.2.4a
+
+2008-11-22  Douglas Soares de Andrade  <douglas at archlinux.org>
+
+	* Updated for i686: 4.2.3
+
+2008-10-08  Douglas Soares de Andrade  <douglas at archlinux.org>
+
+	* Updated for i686: 4.2.2a
+
+2008-09-13  Douglas Soares de Andrade  <douglas at archlinux.org>
+
+	* Updated for i686: 4.2.1
+
+2008-08-09  Douglas Soares de Andrade  <douglas at archlinux.org>
+
+	* Updated for i686: 4.2.0
+
+2008-07-05  Eric Belanger  <eric at archlinux.org>
+
+	* eric 4.1.6-1
+	* Upstream update
+
+2008-06-08  Eric Belanger  <eric at archlinux.org>
+
+	* eric 4.1.5-1
+	* Upstream update
+
+2008-05-19  Eric Belanger  <eric at archlinux.org>
+
+	* eric 4.1.4-1
+	* Upstream update
+
+2008-05-04  Eric Belanger  <eric at archlinux.org>
+
+	* eric 4.1.3-1
+	* Upstream update
+	* Added missing executable symlinks
+
+2008-04-17  Eric Belanger  <eric at archlinux.org>
+
+	* eric 4.1.2-1
+	* Upstream update
+	* Added .desktop file
+
+2008-03-02  Eric Belanger  <eric at archlinux.org>
+
+	* eric 4.1.1-1
+	* Upstream update
+	* Added sitecustomize.py existance test in install scriptlet

Modified: eric.install
===================================================================
--- eric.install	2010-11-06 11:00:57 UTC (rev 98283)
+++ eric.install	2010-11-06 14:24:39 UTC (rev 98284)
@@ -3,15 +3,15 @@
 }
 
 post_remove() {
-  if test -e usr/lib/python2.6/site-packages/sitecustomize.py
+  if test -e usr/lib/python2.7/site-packages/sitecustomize.py
   then
     sed -i -e '/import sys/d' \
-	usr/lib/python2.6/site-packages/sitecustomize.py
+	usr/lib/python2.7/site-packages/sitecustomize.py
     sed -i -e '/sys.setappdefaultencoding = sys.setdefaultencoding/d' \
-	usr/lib/python2.6/site-packages/sitecustomize.py
-    if test ! -s usr/lib/python2.6/site-packages/sitecustomize.py
+	usr/lib/python2.7/site-packages/sitecustomize.py
+    if test ! -s usr/lib/python2.7/site-packages/sitecustomize.py
     then
-      rm usr/lib/python2.6/site-packages/sitecustomize.py
+      rm usr/lib/python2.7/site-packages/sitecustomize.py
     fi
   fi
 }




More information about the arch-commits mailing list