[arch-commits] Commit in maxima/repos/extra-x86_64 (6 files)

Ronald van Haren ronald at nymeria.archlinux.org
Tue Feb 19 19:05:06 UTC 2013


    Date: Tuesday, February 19, 2013 @ 20:05:06
  Author: ronald
Revision: 178301

fix svn conflict

Added:
  maxima/repos/extra-x86_64/PKGBUILD
    (from rev 178300, maxima/trunk/PKGBUILD)
  maxima/repos/extra-x86_64/maxima.desktop
    (from rev 178300, maxima/trunk/maxima.desktop)
  maxima/repos/extra-x86_64/maxima.install
    (from rev 178300, maxima/trunk/maxima.install)
Deleted:
  maxima/repos/extra-x86_64/PKGBUILD
  maxima/repos/extra-x86_64/maxima.desktop
  maxima/repos/extra-x86_64/maxima.install

----------------+
 PKGBUILD       |   92 +++++++++++++++++++++++++++----------------------------
 maxima.desktop |   22 ++++++-------
 maxima.install |   36 ++++++++++-----------
 3 files changed, 75 insertions(+), 75 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2013-02-19 18:50:48 UTC (rev 178300)
+++ PKGBUILD	2013-02-19 19:05:06 UTC (rev 178301)
@@ -1,46 +0,0 @@
-# $Id$
-# Maintainer: Ronald van Haren <ronald.archlinux.org>
-# Contributor: Damir Perisa <damir at archlinux.org>
-
-pkgname=maxima
-pkgver=5.28.0
-pkgrel=7
-pkgdesc="Maxima - a sophisticated computer algebra system"
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://maxima.sourceforge.net"
-depends=('sbcl=1.1.4' 'texinfo' 'sh')
-makedepends=('python2')
-optdepends=('gnuplot: plotting capabilities' 'rlwrap: readline support via /usr/bin/rmaxima' 'tk: graphical xmaxima interface')
-# needs rebuild when bash changes version
-# needs a rebuild when sbcl changes version
-options=('!makeflags' '!zipman') # don't zip info pages or they won't work inside maxima
-install=maxima.install
-source=("http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz" "$pkgname.desktop")
-sha1sums=('52d7dad4681711a6ead73b72835b177107363b9c'
-          '4398ebb1ec85ccfa12f37516a56d60c26f74b18b')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-
-  # set correct python executable to create docs
-  sed -i "s|${PYTHONBIN:-python}|python2|" doc/info/extract_categories.sh
-
-  ./configure --prefix=/usr --mandir=/usr/share/man --infodir=/usr/share/info \
-	--libexecdir=/usr/lib --enable-sbcl --with-default-lisp=sbcl
-  make
-}
-
-package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install
-
-  # install some freedesktop.org compatibility
-  install -Dm644 ${srcdir}/${pkgname}.desktop \
-  	${pkgdir}/usr/share/applications/${pkgname}.desktop
-
-  # make sure, we have a nice icon for the desktop file at the right place ;)
-  install -d ${pkgdir}/usr/share/pixmaps/
-  ln -s /usr/share/maxima/${pkgver}/xmaxima/maxima-new.png \
-	${pkgdir}/usr/share/pixmaps/${pkgname}.png
-}

Copied: maxima/repos/extra-x86_64/PKGBUILD (from rev 178300, maxima/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2013-02-19 19:05:06 UTC (rev 178301)
@@ -0,0 +1,46 @@
+# $Id$
+# Maintainer: Ronald van Haren <ronald.archlinux.org>
+# Contributor: Damir Perisa <damir at archlinux.org>
+
+pkgname=maxima
+pkgver=5.29.1
+pkgrel=1
+pkgdesc="Maxima - a sophisticated computer algebra system"
+arch=('i686' 'x86_64')
+license=('GPL')
+url="http://maxima.sourceforge.net"
+depends=('sbcl=1.1.4' 'texinfo' 'sh')
+makedepends=('python2')
+optdepends=('gnuplot: plotting capabilities' 'rlwrap: readline support via /usr/bin/rmaxima' 'tk: graphical xmaxima interface')
+# needs rebuild when bash changes version
+# needs a rebuild when sbcl changes version
+options=('!makeflags' '!zipman') # don't zip info pages or they won't work inside maxima
+install=maxima.install
+source=("http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz" "$pkgname.desktop")
+sha1sums=('9be04303d6a5472bc95576b7de7286fa4b8ff604'
+          '4398ebb1ec85ccfa12f37516a56d60c26f74b18b')
+
+build() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+
+  # set correct python executable to create docs
+  sed -i "s|${PYTHONBIN:-python}|python2|" doc/info/extract_categories.sh
+
+  ./configure --prefix=/usr --mandir=/usr/share/man --infodir=/usr/share/info \
+	--libexecdir=/usr/lib --enable-sbcl --with-default-lisp=sbcl
+  make
+}
+
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  make DESTDIR=${pkgdir} install
+
+  # install some freedesktop.org compatibility
+  install -Dm644 ${srcdir}/${pkgname}.desktop \
+  	${pkgdir}/usr/share/applications/${pkgname}.desktop
+
+  # make sure, we have a nice icon for the desktop file at the right place ;)
+  install -d ${pkgdir}/usr/share/pixmaps/
+  ln -s /usr/share/maxima/${pkgver}/xmaxima/maxima-new.png \
+	${pkgdir}/usr/share/pixmaps/${pkgname}.png
+}

Deleted: maxima.desktop
===================================================================
--- maxima.desktop	2013-02-19 18:50:48 UTC (rev 178300)
+++ maxima.desktop	2013-02-19 19:05:06 UTC (rev 178301)
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Name=XMaxima
-GenericName=A computer algebra system
-GenericName[de]=Computeralgebra System
-GenericName[it]=algebra a livello avanzato
-Comment=A sophisticated computer algebra system
-Exec=xmaxima
-Icon=maxima
-Terminal=true
-Type=Application
-Categories=Science;Math;

Copied: maxima/repos/extra-x86_64/maxima.desktop (from rev 178300, maxima/trunk/maxima.desktop)
===================================================================
--- maxima.desktop	                        (rev 0)
+++ maxima.desktop	2013-02-19 19:05:06 UTC (rev 178301)
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Name=XMaxima
+GenericName=A computer algebra system
+GenericName[de]=Computeralgebra System
+GenericName[it]=algebra a livello avanzato
+Comment=A sophisticated computer algebra system
+Exec=xmaxima
+Icon=maxima
+Terminal=true
+Type=Application
+Categories=Science;Math;

Deleted: maxima.install
===================================================================
--- maxima.install	2013-02-19 18:50:48 UTC (rev 178300)
+++ maxima.install	2013-02-19 19:05:06 UTC (rev 178301)
@@ -1,18 +0,0 @@
-infodir=/usr/share/info
-filelist=(imaxima.info maxima.info xmaxima.info)
-
-post_install() {
-  for file in ${filelist[@]}; do
-    install-info $infodir/$file $infodir/dir 2> /dev/null
-  done
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  for file in ${filelist[@]}; do
-    install-info --delete $infodir/$file $infodir/dir 2> /dev/null
-  done
-}

Copied: maxima/repos/extra-x86_64/maxima.install (from rev 178300, maxima/trunk/maxima.install)
===================================================================
--- maxima.install	                        (rev 0)
+++ maxima.install	2013-02-19 19:05:06 UTC (rev 178301)
@@ -0,0 +1,18 @@
+infodir=/usr/share/info
+filelist=(imaxima.info maxima.info xmaxima.info)
+
+post_install() {
+  for file in ${filelist[@]}; do
+    install-info $infodir/$file $infodir/dir 2> /dev/null
+  done
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+pre_remove() {
+  for file in ${filelist[@]}; do
+    install-info --delete $infodir/$file $infodir/dir 2> /dev/null
+  done
+}




More information about the arch-commits mailing list