[arch-commits] Commit in eric/trunk (7 files)

Ray Rashif schiv at archlinux.org
Mon Apr 4 07:15:40 UTC 2011


    Date: Monday, April 4, 2011 @ 03:15:39
  Author: schiv
Revision: 117490

upgpkg: eric4 4.4.13-1
make way for eric(5)

Added:
  eric/trunk/eric4.changelog
    (from rev 117482, eric/trunk/eric.changelog)
  eric/trunk/eric4.desktop
    (from rev 117482, eric/trunk/eric.desktop)
  eric/trunk/eric4.install
    (from rev 117482, eric/trunk/eric.install)
Modified:
  eric/trunk/PKGBUILD
Deleted:
  eric/trunk/eric.changelog
  eric/trunk/eric.desktop
  eric/trunk/eric.install

-----------------+
 PKGBUILD        |   70 +++++++++++++---------------------------
 eric.changelog  |   88 --------------------------------------------------
 eric.desktop    |    8 ----
 eric.install    |   17 ---------
 eric4.changelog |   94 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 eric4.desktop   |    8 ++++
 eric4.install   |   17 +++++++++
 7 files changed, 142 insertions(+), 160 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-04-04 07:03:49 UTC (rev 117489)
+++ PKGBUILD	2011-04-04 07:15:39 UTC (rev 117490)
@@ -1,65 +1,41 @@
 # $Id$
-# Maintainer: Daniel J Griffiths <ghost1227 at archlinux.us>
+# Maintainer: Ray Rashif <schiv at archlinux.org>
+# Contributor: Daniel J Griffiths <ghost1227 at archlinux.us>
 # Contributor: riai <riai at bigfoot.com>, Ben <ben at benmazer.net>
 
-pkgname=eric
-pkgver=4.4.12
-pkgrel=2
-pkgdesc="A full-featured Python and Ruby IDE in PyQt4"
+pkgname=eric4
+pkgver=4.4.13
+pkgrel=1
+pkgdesc="A full-featured Python 2.x and Ruby IDE in PyQt4"
 arch=('any')
-url="http://eric-ide.python-projects.org/index.html"
+url="http://eric-ide.python-projects.org/"
 license=('GPL3')
 depends=('python2-qt' 'python2-qscintilla')
-conflicts=('eric4')
-replaces=('eric4')
-provides=('eric4')
-install=eric.install
-changelog=eric.changelog
-source=(http://downloads.sourceforge.net/eric-ide/${pkgname}4-${pkgver}.tar.gz
-        'eric.desktop')
-md5sums=('c2a689c57e80e794db9795e209dc3471' '77c494bb839c5744869d34355ea69095')
-sha1sums=('94fd470a3dd61859ade7f73c52c5cd03e3083e56' '7529658c06e6c5c9ab587f0d18a2eafd42b87fee')
+conflicts=('eric<5')
+install=$pkgname.install
+changelog=$pkgname.changelog
+source=("http://downloads.sourceforge.net/eric-ide/$pkgname-$pkgver.tar.gz"
+        "$pkgname.desktop")
+md5sums=('d3d403f5e0c23bac5561bf416f5680ee'
+         'f609e117d5132c055a5868b74e13ac77')
 
 package() {
-	cd "${srcdir}/${pkgname}4-${pkgver}"
+	cd "$srcdir/$pkgname-$pkgver"
 
 	# 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}"
+	python2 install.py -c -b /usr/bin -i "$pkgdir"
 
-	sed -i 's/; /\n/' "${pkgdir}/usr/lib/python2.7/site-packages/eric4.pth"
+	sed -i 's/; /\n/' \
+    "$pkgdir/usr/lib/python2.7/site-packages/eric4.pth"
 
-	install -D -m644 "${srcdir}/eric.desktop" \
-		"${pkgdir}/usr/share/applications/eric.desktop"
-	install -D -m644 eric/icons/default/eric.png \
-		"${pkgdir}/usr/share/pixmaps/eric.png"
-
-	# Creating version independant symlinks
-	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
-	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-plugininstall \
-		"${pkgdir}"/usr/bin/eric-plugininstall
-	ln -s /usr/bin/eric4-pluginrepository \
-		"${pkgdir}"/usr/bin/eric-pluginrepository
-	ln -s /usr/bin/eric4-pluginuninstall \
-		"${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
-	ln -s /usr/bin/eric4-uipreviewer \
-		"${pkgdir}"/usr/bin/eric-uipreviewer
-	ln -s /usr/bin/eric4-unittest \
-		"${pkgdir}"/usr/bin/eric-unittest
+  # freedesktop.org compatibility
+	install -Dm644 "$srcdir/$pkgname.desktop" \
+		"$pkgdir/usr/share/applications/$pkgname.desktop"
+	install -Dm644 eric/icons/default/eric.png \
+		"$pkgdir/usr/share/pixmaps/$pkgname.png"
 }
 
 # vim:set ts=2 sw=2 et:

Deleted: eric.changelog
===================================================================
--- eric.changelog	2011-04-04 07:03:49 UTC (rev 117489)
+++ eric.changelog	2011-04-04 07:15:39 UTC (rev 117490)
@@ -1,88 +0,0 @@
-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

Deleted: eric.desktop
===================================================================
--- eric.desktop	2011-04-04 07:03:49 UTC (rev 117489)
+++ eric.desktop	2011-04-04 07:15:39 UTC (rev 117490)
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Name=Eric IDE
-Comment=A full featured Python IDE
-Icon=eric
-Exec=eric
-Terminal=false
-Type=Application
-Categories=Qt;Development;IDE;

Deleted: eric.install
===================================================================
--- eric.install	2011-04-04 07:03:49 UTC (rev 117489)
+++ eric.install	2011-04-04 07:15:39 UTC (rev 117490)
@@ -1,17 +0,0 @@
-post_upgrade() {
-  post_remove $1
-}
-
-post_remove() {
-  if test -e usr/lib/python2.7/site-packages/sitecustomize.py
-  then
-    sed -i -e '/import sys/d' \
-	usr/lib/python2.7/site-packages/sitecustomize.py
-    sed -i -e '/sys.setappdefaultencoding = sys.setdefaultencoding/d' \
-	usr/lib/python2.7/site-packages/sitecustomize.py
-    if test ! -s usr/lib/python2.7/site-packages/sitecustomize.py
-    then
-      rm usr/lib/python2.7/site-packages/sitecustomize.py
-    fi
-  fi
-}

Copied: eric/trunk/eric4.changelog (from rev 117482, eric/trunk/eric.changelog)
===================================================================
--- eric4.changelog	                        (rev 0)
+++ eric4.changelog	2011-04-04 07:15:39 UTC (rev 117490)
@@ -0,0 +1,94 @@
+2011-04-04 Ray Rashif <schiv at archlinux.org>
+
+	* Updated: eric 4.4.12-2 -> eric4 4.4.13-1
+	Rename to eric4 for eric5 to eric transition
+	Remove eric-specific symlinks
+
+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

Copied: eric/trunk/eric4.desktop (from rev 117482, eric/trunk/eric.desktop)
===================================================================
--- eric4.desktop	                        (rev 0)
+++ eric4.desktop	2011-04-04 07:15:39 UTC (rev 117490)
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Name=Eric 4
+Comment=Python 2.x & Ruby IDE
+Icon=eric4
+Exec=eric4
+Terminal=false
+Type=Application
+Categories=Qt;Development;IDE;

Copied: eric/trunk/eric4.install (from rev 117482, eric/trunk/eric.install)
===================================================================
--- eric4.install	                        (rev 0)
+++ eric4.install	2011-04-04 07:15:39 UTC (rev 117490)
@@ -0,0 +1,17 @@
+post_upgrade() {
+  post_remove $1
+}
+
+post_remove() {
+  if test -e usr/lib/python2.7/site-packages/sitecustomize.py
+  then
+    sed -i -e '/import sys/d' \
+	usr/lib/python2.7/site-packages/sitecustomize.py
+    sed -i -e '/sys.setappdefaultencoding = sys.setdefaultencoding/d' \
+	usr/lib/python2.7/site-packages/sitecustomize.py
+    if test ! -s usr/lib/python2.7/site-packages/sitecustomize.py
+    then
+      rm usr/lib/python2.7/site-packages/sitecustomize.py
+    fi
+  fi
+}




More information about the arch-commits mailing list