Date: Tuesday, December 6, 2011 @ 06:33:55 Author: schiv Revision: 144469
archrelease: copy trunk to extra-any Added: eric/repos/extra-any/.contrib (from rev 144468, eric/trunk/.contrib) eric/repos/extra-any/PKGBUILD (from rev 144468, eric/trunk/PKGBUILD) eric/repos/extra-any/desktop.patch (from rev 144468, eric/trunk/desktop.patch) eric/repos/extra-any/eric.install (from rev 144468, eric/trunk/eric.install) Deleted: eric/repos/extra-any/PKGBUILD eric/repos/extra-any/eric.desktop ---------------+ .contrib | 7 +++ PKGBUILD | 106 +++++++++++++++++++++++++++----------------------------- desktop.patch | 58 ++++++++++++++++++++++++++++++ eric.desktop | 8 ---- eric.install | 10 +++++ 5 files changed, 127 insertions(+), 62 deletions(-) Copied: eric/repos/extra-any/.contrib (from rev 144468, eric/trunk/.contrib) =================================================================== --- .contrib (rev 0) +++ .contrib 2011-12-06 11:33:55 UTC (rev 144469) @@ -0,0 +1,7 @@ +This is a list of (past) contributors not already credited in the PKGBUILD: + +Eric Belanger <e...@archlinux.org> +riai <r...@bigfoot.com> +Ben <b...@benmazer.net> +Daniel J Griffiths <ghost1...@archlinux.us> +Felix Rohrbach <f...@gmx.de> Deleted: PKGBUILD =================================================================== --- PKGBUILD 2011-12-06 11:33:30 UTC (rev 144468) +++ PKGBUILD 2011-12-06 11:33:55 UTC (rev 144469) @@ -1,54 +0,0 @@ -# $Id$ -# Maintainer: Ray Rashif <sc...@archlinux.org> -# Contributor: Brad Fanella <bradfane...@archlinux.us> -# Contributor: Eric Belanger <e...@archlinux.org> -# Contributor: riai <r...@bigfoot.com>, Ben <b...@benmazer.net> -# Contributor: Daniel J Griffiths <ghost1...@archlinux.us> -# Contributor: Felix Rohrbach <f...@gmx.de> - -pkgname=eric -pkgver=5.1.6 -pkgrel=1 -pkgdesc="A full-featured Python 3.x and Ruby IDE in PyQt4" -arch=('any') -url="http://eric-ide.python-projects.org/" -license=('GPL3') -depends=('python-qt' 'python-qscintilla') -conflicts=('eric5') -provides=('eric5') -replaces=('eric5') -source=("http://downloads.sourceforge.net/eric-ide/${pkgname}5-$pkgver.tar.gz" - "$pkgname.desktop") -md5sums=('aae03cadf252c2556429c0c4cc17acd8' - 'eb0ee7ce0b5c3ff815a9c0145f7ae536') - -package() { - cd "$srcdir/${pkgname}5-$pkgver" - - python install.py -c -b /usr/bin -i "$pkgdir" - - # freedesktop.org compatibility - install -Dm644 "$srcdir/$pkgname.desktop" \ - "$pkgdir/usr/share/applications/$pkgname.desktop" - - rm "$pkgdir/usr/share/applications/${pkgname}5.desktop" - - # Remove files conflicting with eric4 - # what are we doing here? - # TODO: tell upstream to fix their stuff - # and allow installation of eric4 + eric5 - # OR package these files separately eg. 'eric-common' - rm "$pkgdir/usr/share/qt/qsci/api/python/zope-2.10.7.api" - rm "$pkgdir/usr/share/qt/qsci/api/python/zope-2.11.2.api" - rm "$pkgdir/usr/share/qt/qsci/api/python/zope-3.3.1.api" - rm "$pkgdir/usr/share/qt/qsci/api/ruby/Ruby-1.8.7.api" - - # some canonical symlinks - cd "$pkgdir/usr/bin" - - for i in *; do - ln -s /usr/bin/$i ${i/eric5/eric} - done -} - -# vim:set ts=2 sw=2 et: Copied: eric/repos/extra-any/PKGBUILD (from rev 144468, eric/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2011-12-06 11:33:55 UTC (rev 144469) @@ -0,0 +1,52 @@ +# $Id$ +# Maintainer: Ray Rashif <sc...@archlinux.org> +# Contributor: Brad Fanella <bradfane...@archlinux.us> +# See .contrib for older/other contributors + +pkgname=eric +pkgver=5.1.7 +pkgrel=1 +pkgdesc="A full-featured Python 3.x and Ruby IDE in PyQt4" +arch=('any') +url="http://eric-ide.python-projects.org/" +license=('GPL3') +depends=('python-qscintilla') +conflicts=('eric5') +provides=('eric5') +replaces=('eric5') +install=$pkgname.install +source=("http://downloads.sourceforge.net/eric-ide/${pkgname}5-$pkgver.tar.gz" + 'desktop.patch') +md5sums=('a6bdcfba1ebc2cd9a9ade36a3af032a5' + '6400f0f83634bfe7c332ee84ff6786c7') + +build() { + cd "$srcdir/${pkgname}5-$pkgver" + + # freedesktop.org compatibility + patch -Np1 -i "$srcdir/desktop.patch" +} + +package() { + cd "$srcdir/${pkgname}5-$pkgver" + + python install.py -c -b /usr/bin -i "$pkgdir" + + # Remove files conflicting with eric4 + # what are we doing here? + # TODO: tell upstream to fix their stuff + # and allow installation of eric4 + eric5 + # OR package these files separately eg. 'eric-common' + rm "$pkgdir/usr/share/qt/qsci/api/python/zope-2.10.7.api" + rm "$pkgdir/usr/share/qt/qsci/api/python/zope-2.11.2.api" + rm "$pkgdir/usr/share/qt/qsci/api/python/zope-3.3.1.api" + rm "$pkgdir/usr/share/qt/qsci/api/ruby/Ruby-1.8.7.api" + + # some canonical symlinks + cd "$pkgdir/usr/bin" + for i in *; do + ln -s /usr/bin/$i ${i/eric5/eric} + done +} + +# vim:set ts=2 sw=2 et: Copied: eric/repos/extra-any/desktop.patch (from rev 144468, eric/trunk/desktop.patch) =================================================================== --- desktop.patch (rev 0) +++ desktop.patch 2011-12-06 11:33:55 UTC (rev 144469) @@ -0,0 +1,58 @@ +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 Deleted: eric.desktop =================================================================== --- eric.desktop 2011-12-06 11:33:30 UTC (rev 144468) +++ eric.desktop 2011-12-06 11:33:55 UTC (rev 144469) @@ -1,8 +0,0 @@ -[Desktop Entry] -Name=Eric -Comment=Python 3.x & Ruby IDE -Icon=eric -Exec=eric -Terminal=false -Type=Application -Categories=Qt;Development;IDE; Copied: eric/repos/extra-any/eric.install (from rev 144468, eric/trunk/eric.install) =================================================================== --- eric.install (rev 0) +++ eric.install 2011-12-06 11:33:55 UTC (rev 144469) @@ -0,0 +1,10 @@ +post_install() { + echo " > Updating desktop mime database..." + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +# vim:set ts=2 sw=2 et: