[arch-commits] Commit in eric/trunk (PKGBUILD desktop.patch eric.desktop)

[Ray Rashif]

    Date: Sunday, February 5, 2012 @ 10:49:25
  Author: schiv
Revision: 149055

upgpkg: eric 5.1.8-1

upstream release

Added:
  eric/trunk/eric.desktop
Modified:
  eric/trunk/PKGBUILD
Deleted:
  eric/trunk/desktop.patch

---------------+
 PKGBUILD      |   23 +++++++++++++---------
 desktop.patch |   58 --------------------------------------------------------
 eric.desktop  |   10 +++++++++
 3 files changed, 24 insertions(+), 67 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-02-05 15:38:18 UTC (rev 149054)
+++ PKGBUILD	2012-02-05 15:49:25 UTC (rev 149055)
@@ -4,7 +4,7 @@
 # See .contrib for older/other contributors
 
 pkgname=eric
-pkgver=5.1.7
+pkgver=5.1.8
 pkgrel=1
 pkgdesc="A full-featured Python 3.x and Ruby IDE in PyQt4"
 arch=('any')
@@ -15,20 +15,25 @@
 provides=('eric5')
 replaces=('eric5')
 install=$pkgname.install
-source=("http://downloads.sourceforge.net/eric-ide/${pkgname}5-$pkgver.tar.gz"
-        'desktop.patch')
-md5sums=('a6bdcfba1ebc2cd9a9ade36a3af032a5'
-         '6400f0f83634bfe7c332ee84ff6786c7')
+source=("http://downloads.sourceforge.net/eric-ide/eric5-$pkgver.tar.gz"
+        "$pkgname.desktop")
+md5sums=('5f9bbb74ed694bff10ba31c3fa27b1c2'
+         '8aa446c29e6de54e85410e040e754c6e')
 
 build() {
-  cd "$srcdir/${pkgname}5-$pkgver"
+  cd "$srcdir/eric5-$pkgver"
 
-  # freedesktop.org compatibility
-  patch -Np1 -i "$srcdir/desktop.patch"
+  # some freedesktop.org compatibility adjustments
+  for i in $(grep -R "eric5.desktop" . | sed 's/:.*//' | sort -u); do
+    sed -i "s/eric5.desktop/eric.desktop/" $i
+  done
+
+  rm eric/eric5.desktop
+  install -m644 ../$pkgname.desktop eric/$pkgname.desktop
 }
 
 package() {
-  cd "$srcdir/${pkgname}5-$pkgver"
+  cd "$srcdir/eric5-$pkgver"
 
   python install.py -c -b /usr/bin -i "$pkgdir"
 

Deleted: desktop.patch
===================================================================
--- desktop.patch	2012-02-05 15:38:18 UTC (rev 149054)
+++ desktop.patch	2012-02-05 15:49:25 UTC (rev 149055)
@@ -1,58 +0,0 @@
-diff -Nbaur eric5-5.1.7.orig/eric/eric5.desktop eric5-5.1.7/eric/eric5.desktop
---- eric5-5.1.7.orig/eric/eric5.desktop	2011-12-06 06:42:40.196800129 +0000
-+++ eric5-5.1.7/eric/eric5.desktop	1970-01-01 00:00:00.000000000 +0000
-@@ -1,14 +0,0 @@
--[Desktop Entry]
--Type=Application
--Exec=eric5
--MimeType=application/x-eric5;
--Icon=eric
--Terminal=false
--Name=eric5
--Name[de]=eric5
--Comment=Integrated Development Environment for Python
--Comment[de]=Integrierte Entwicklungsumgebung für Python
--GenericName=Integrated Development Environment for Python
--GenericName[de]=Integrierte Entwicklungsumgebung für Python
--Categories=Qt;Python;Development;IDE;
--StartupNotify=true
-diff -Nbaur eric5-5.1.7.orig/eric/eric.desktop eric5-5.1.7/eric/eric.desktop
---- eric5-5.1.7.orig/eric/eric.desktop	1970-01-01 00:00:00.000000000 +0000
-+++ eric5-5.1.7/eric/eric.desktop	2011-12-06 06:53:24.102176503 +0000
-@@ -0,0 +1,10 @@
-+[Desktop Entry]
-+Type=Application
-+Exec=eric5
-+MimeType=application/x-eric5;
-+Icon=eric
-+Terminal=false
-+Name=Eric
-+Comment=Python 3.x & Ruby IDE
-+Categories=Qt;Python;Development;IDE;
-+StartupNotify=true
-diff -Nbaur eric5-5.1.7.orig/install.py eric5-5.1.7/install.py
---- eric5-5.1.7.orig/install.py	2011-12-06 06:42:40.253467010 +0000
-+++ eric5-5.1.7/install.py	2011-12-06 06:58:31.401420942 +0000
-@@ -276,7 +276,7 @@
-     # Remove the menu entry for Linux systems
-     if sys.platform.startswith("linux"):
-         for name in ["/usr/share/pixmaps/eric.png", 
--                     "/usr/share/applications/eric5.desktop"]:
-+                     "/usr/share/applications/eric.desktop"]:
-             if os.path.exists(name):
-                 os.remove(name)
-     
-@@ -519,11 +519,11 @@
-             dst = os.path.normpath(os.path.join(distDir, "usr/share/applications"))
-             if not os.path.exists(dst):
-                 os.makedirs(dst)
--            shutil.copy(os.path.join(sourceDir, "eric5.desktop"), dst)
-+            shutil.copy(os.path.join(sourceDir, "eric.desktop"), dst)
-         else:
-             shutil.copy(os.path.join(sourceDir, "icons", "default", "eric.png"), 
-                 "/usr/share/pixmaps")
--            shutil.copy(os.path.join(sourceDir, "eric5.desktop"), 
-+            shutil.copy(os.path.join(sourceDir, "eric.desktop"),
-                 "/usr/share/applications")
-     
-     # Create a Mac application bundle

Added: eric.desktop
===================================================================
--- eric.desktop	                        (rev 0)
+++ eric.desktop	2012-02-05 15:49:25 UTC (rev 149055)
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Type=Application
+Exec=eric5
+MimeType=application/x-eric5;
+Icon=eric
+Terminal=false
+Name=Eric 5
+Comment=Python 3.x & Ruby IDE
+Categories=Qt;Python;Development;IDE;
+StartupNotify=true