[arch-commits] Commit in sage-notebook/repos/community-any (8 files)

Antonio Rojas arojas at archlinux.org
Sun Jan 11 10:31:21 UTC 2015


    Date: Sunday, January 11, 2015 @ 11:31:20
  Author: arojas
Revision: 125720

archrelease: copy trunk to community-any

Added:
  sage-notebook/repos/community-any/PKGBUILD
    (from rev 125719, sage-notebook/trunk/PKGBUILD)
  sage-notebook/repos/community-any/jmol.patch
    (from rev 125719, sage-notebook/trunk/jmol.patch)
  sage-notebook/repos/community-any/sage-notebook.install
    (from rev 125719, sage-notebook/trunk/sage-notebook.install)
  sage-notebook/repos/community-any/sage.service
    (from rev 125719, sage-notebook/trunk/sage.service)
Deleted:
  sage-notebook/repos/community-any/PKGBUILD
  sage-notebook/repos/community-any/jmol.patch
  sage-notebook/repos/community-any/sage-notebook.install
  sage-notebook/repos/community-any/sage.service

-----------------------+
 PKGBUILD              |  128 ++++++++++++++++++++++++------------------------
 jmol.patch            |   42 +++++++--------
 sage-notebook.install |   31 +++++------
 sage.service          |   16 +++---
 4 files changed, 107 insertions(+), 110 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2015-01-11 10:30:45 UTC (rev 125719)
+++ PKGBUILD	2015-01-11 10:31:20 UTC (rev 125720)
@@ -1,64 +0,0 @@
-# Maintainer: Antonio Rojas <arojas at archlinux.org>
-# Maintainer: Evgeniy Alekseev <arcanis.arch at gmail dot com>
-
-pkgname=sage-notebook
-pkgver=0.11.1
-pkgrel=2
-pkgdesc='Web-based notebook interface for Sage'
-arch=('any')
-url='http://www.sagemath.org'
-license=('GPL3')
-depends=('sage-mathematics' 'python2-twisted' 'python2-flask-oldsessions' 'python2-flask-openid' 'python2-flask-autoindex' 'python2-flask-babel' 'python2-flask-silk' 'python2-webassets')
-optdepends=('python2-pyopenssl: to use the notebook in secure mode')
-makedepends=('gendesk')
-source=("https://github.com/sagemath/sagenb/archive/$pkgver.tar.gz" 'sage.service' 'jmol.patch')
-install=$pkgname.install
-md5sums=('74d9ddd0f1b77ff8ef9d0f5b0007cf00'
-         '61620179a7ecd85401d8e5a6ece3ea41'
-         'b29760c97a5328faa179a46008391bf0')
-
-prepare() {
-# create *.desktop file
-  gendesk -f -n \
-          --pkgname="sage-notebook" \
-          --pkgdesc="Sage notebook" \
-          --name="Sage" \
-          --exec="/usr/bin/sage -notebook" \
-          --terminal=true \
-          --categories="Education;Science;Math" \
-          --custom="X-DCOP-ServiceType=
-X-KDE-SubstituteUID=false
-X-KDE-Username="
-
-  cd sagenb-$pkgver
-  
-# Use python2
-  find -name '*.py' | xargs sed -e 's|#! /usr/bin/python|#! /usr/bin/python2|' -e 's|#!/usr/bin/python|#!/usr/bin/python2|' \
-    -e 's|#!/usr/bin/env python|#!/usr/bin/env python2|' -i
-  sed -e 's|python %s|python2 %s|' -i sagenb/notebook/run_notebook.py
-  sed -e "s|python = 'python'|python = 'python2'|" -i sagenb/interfaces/expect.py 
-
-# fix displaying 3D plots
-  patch -p0 -i "$srcdir"/jmol.patch
-}
-
-build() {
-  cd sagenb-${pkgver}
-
-  python2 setup.py build
-}
-
-package() {
-  cd sagenb-${pkgver}
-
-  python2 setup.py install --root "$pkgdir" --optimize=1
-
-  install -D -m644 COPYING "$pkgdir"/usr/share/licenses/${pkgname}/COPYING
-
-# install a systemd user unit
-  install -Dm644 "${srcdir}/sage.service" "$pkgdir/usr/lib/systemd/user/sage.service"
-# install *.desktop and icon files
-  install -Dm644 "${srcdir}/sage-notebook.desktop" "$pkgdir/usr/share/applications/sage-notebook.desktop"
-  install -Dm644 "$pkgdir/usr/lib/python2.7/site-packages/sagenb/data/sage/images/icon48x48.png" \
-                 "$pkgdir/usr/share/pixmaps/sage-notebook.png"
-}

Copied: sage-notebook/repos/community-any/PKGBUILD (from rev 125719, sage-notebook/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2015-01-11 10:31:20 UTC (rev 125720)
@@ -0,0 +1,64 @@
+# Maintainer: Antonio Rojas <arojas at archlinux.org>
+# Maintainer: Evgeniy Alekseev <arcanis.arch at gmail dot com>
+
+pkgname=sage-notebook
+pkgver=0.11.1
+pkgrel=3
+pkgdesc='Web-based notebook interface for Sage'
+arch=('any')
+url='http://www.sagemath.org'
+license=('GPL3')
+depends=('sage-mathematics' 'python2-twisted' 'python2-flask-oldsessions' 'python2-flask-openid' 'python2-flask-autoindex' 'python2-flask-babel' 'python2-flask-silk' 'python2-webassets')
+optdepends=('python2-pyopenssl: to use the notebook in secure mode')
+makedepends=('gendesk')
+source=("https://github.com/sagemath/sagenb/archive/$pkgver.tar.gz" 'sage.service' 'jmol.patch')
+install=$pkgname.install
+md5sums=('74d9ddd0f1b77ff8ef9d0f5b0007cf00'
+         '61620179a7ecd85401d8e5a6ece3ea41'
+         'b29760c97a5328faa179a46008391bf0')
+
+prepare() {
+# create *.desktop file
+  gendesk -f -n \
+          --pkgname="sage-notebook" \
+          --pkgdesc="Sage notebook" \
+          --name="Sage" \
+          --exec="/usr/bin/sage -notebook" \
+          --terminal=true \
+          --categories="Education;Science;Math" \
+          --custom="X-DCOP-ServiceType=
+X-KDE-SubstituteUID=false
+X-KDE-Username="
+
+  cd sagenb-$pkgver
+  
+# Use python2
+  find -name '*.py' | xargs sed -e 's|#! /usr/bin/python|#! /usr/bin/python2|' -e 's|#!/usr/bin/python|#!/usr/bin/python2|' \
+    -e 's|#!/usr/bin/env python|#!/usr/bin/env python2|' -i
+  sed -e 's|python %s|python2 %s|' -i sagenb/notebook/run_notebook.py
+  sed -e "s|python = 'python'|python = 'python2'|" -i sagenb/interfaces/expect.py 
+
+# fix displaying 3D plots
+  patch -p0 -i "$srcdir"/jmol.patch
+}
+
+build() {
+  cd sagenb-${pkgver}
+
+  python2 setup.py build
+}
+
+package() {
+  cd sagenb-${pkgver}
+
+  python2 setup.py install --root "$pkgdir" --optimize=1
+
+  install -D -m644 COPYING "$pkgdir"/usr/share/licenses/${pkgname}/COPYING
+
+# install a systemd user unit
+  install -Dm644 "${srcdir}/sage.service" "$pkgdir/usr/lib/systemd/user/sage.service"
+# install *.desktop and icon files
+  install -Dm644 "${srcdir}/sage-notebook.desktop" "$pkgdir/usr/share/applications/sage-notebook.desktop"
+  install -Dm644 "$pkgdir/usr/lib/python2.7/site-packages/sagenb/data/sage/images/icon48x48.png" \
+                 "$pkgdir/usr/share/pixmaps/sage-notebook.png"
+}

Deleted: jmol.patch
===================================================================
--- jmol.patch	2015-01-11 10:30:45 UTC (rev 125719)
+++ jmol.patch	2015-01-11 10:31:20 UTC (rev 125720)
@@ -1,21 +0,0 @@
---- sagenb/flask_version/base.py.orig	2015-01-06 19:30:34.326174783 +0100
-+++ sagenb/flask_version/base.py	2015-01-06 19:31:08.439723240 +0100
-@@ -36,12 +36,12 @@
-         self.add_static_path('/javascript', DATA)
-         self.add_static_path('/static', DATA)
-         self.add_static_path('/java', DATA)
--        self.add_static_path('/java/jmol', os.path.join(os.environ["SAGE_ROOT"],"local","share","jmol"))
--        self.add_static_path('/jsmol', os.path.join(os.environ["SAGE_ROOT"],"local","share","jsmol"))
--        self.add_static_path('/jsmol/js', os.path.join(os.environ["SAGE_ROOT"],"local","share","jsmol","js"))
--        self.add_static_path('/j2s', os.path.join(os.environ["SAGE_ROOT"],"local","share","jsmol","j2s"))
--        self.add_static_path('/jsmol/j2s', os.path.join(os.environ["SAGE_ROOT"],"local","share","jsmol","j2s"))
--        self.add_static_path('/j2s/core', os.path.join(os.environ["SAGE_ROOT"],"local","share","jsmol","j2s","core"))
-+        self.add_static_path('/java/jmol', os.path.join(os.environ["SAGE_ROOT"],"share","jmol"))
-+        self.add_static_path('/jsmol', os.path.join(os.environ["SAGE_ROOT"],"share","jsmol"))
-+        self.add_static_path('/jsmol/js', os.path.join(os.environ["SAGE_ROOT"],"share","jsmol","js"))
-+        self.add_static_path('/j2s', os.path.join(os.environ["SAGE_ROOT"],"share","jsmol","j2s"))
-+        self.add_static_path('/jsmol/j2s', os.path.join(os.environ["SAGE_ROOT"],"share","jsmol","j2s"))
-+        self.add_static_path('/j2s/core', os.path.join(os.environ["SAGE_ROOT"],"share","jsmol","j2s","core"))
-         import mimetypes
-         mimetypes.add_type('text/plain','.jmol')
- 

Copied: sage-notebook/repos/community-any/jmol.patch (from rev 125719, sage-notebook/trunk/jmol.patch)
===================================================================
--- jmol.patch	                        (rev 0)
+++ jmol.patch	2015-01-11 10:31:20 UTC (rev 125720)
@@ -0,0 +1,21 @@
+--- sagenb/flask_version/base.py.orig	2015-01-06 19:30:34.326174783 +0100
++++ sagenb/flask_version/base.py	2015-01-06 19:31:08.439723240 +0100
+@@ -36,12 +36,12 @@
+         self.add_static_path('/javascript', DATA)
+         self.add_static_path('/static', DATA)
+         self.add_static_path('/java', DATA)
+-        self.add_static_path('/java/jmol', os.path.join(os.environ["SAGE_ROOT"],"local","share","jmol"))
+-        self.add_static_path('/jsmol', os.path.join(os.environ["SAGE_ROOT"],"local","share","jsmol"))
+-        self.add_static_path('/jsmol/js', os.path.join(os.environ["SAGE_ROOT"],"local","share","jsmol","js"))
+-        self.add_static_path('/j2s', os.path.join(os.environ["SAGE_ROOT"],"local","share","jsmol","j2s"))
+-        self.add_static_path('/jsmol/j2s', os.path.join(os.environ["SAGE_ROOT"],"local","share","jsmol","j2s"))
+-        self.add_static_path('/j2s/core', os.path.join(os.environ["SAGE_ROOT"],"local","share","jsmol","j2s","core"))
++        self.add_static_path('/java/jmol', os.path.join(os.environ["SAGE_ROOT"],"share","jmol"))
++        self.add_static_path('/jsmol', os.path.join(os.environ["SAGE_ROOT"],"share","jsmol"))
++        self.add_static_path('/jsmol/js', os.path.join(os.environ["SAGE_ROOT"],"share","jsmol","js"))
++        self.add_static_path('/j2s', os.path.join(os.environ["SAGE_ROOT"],"share","jsmol","j2s"))
++        self.add_static_path('/jsmol/j2s', os.path.join(os.environ["SAGE_ROOT"],"share","jsmol","j2s"))
++        self.add_static_path('/j2s/core', os.path.join(os.environ["SAGE_ROOT"],"share","jsmol","j2s","core"))
+         import mimetypes
+         mimetypes.add_type('text/plain','.jmol')
+ 

Deleted: sage-notebook.install
===================================================================
--- sage-notebook.install	2015-01-11 10:30:45 UTC (rev 125719)
+++ sage-notebook.install	2015-01-11 10:31:20 UTC (rev 125720)
@@ -1,17 +0,0 @@
-post_install() {
-  update-desktop-database -q
-
-  # add sagemath user for the daemon
-  useradd -r -c 'Sage daemon' -d /var/lib/sage -s /bin/false sagemath
-}
-
-post_upgrade() {
-  post_install $1
-  echo "There is now a user session unit included to run a sage notebook as your user."
-  echo "The wiki includes a guide on starting systemd user sessions"
-}
-
-post_remove() {
-  # remove the sagemath daemon user
-  userdel sagemath
-}

Copied: sage-notebook/repos/community-any/sage-notebook.install (from rev 125719, sage-notebook/trunk/sage-notebook.install)
===================================================================
--- sage-notebook.install	                        (rev 0)
+++ sage-notebook.install	2015-01-11 10:31:20 UTC (rev 125720)
@@ -0,0 +1,14 @@
+post_install() {
+  update-desktop-database -q
+
+  getent passwd sagemath > /dev/null && userdel sagemath
+}
+
+post_upgrade() {
+  update-desktop-database -q
+
+  if [ "$(vercmp $2 0.11.1-3)" -lt 0 ]; then
+    getent passwd sagemath > /dev/null && userdel sagemath 
+  fi
+}
+

Deleted: sage.service
===================================================================
--- sage.service	2015-01-11 10:30:45 UTC (rev 125719)
+++ sage.service	2015-01-11 10:31:20 UTC (rev 125720)
@@ -1,8 +0,0 @@
-[Unit]
-Description=A free open-source mathematics software system
-
-[Service]
-ExecStart=/usr/bin/sage -n
-
-[Install]
-WantedBy=default.target

Copied: sage-notebook/repos/community-any/sage.service (from rev 125719, sage-notebook/trunk/sage.service)
===================================================================
--- sage.service	                        (rev 0)
+++ sage.service	2015-01-11 10:31:20 UTC (rev 125720)
@@ -0,0 +1,8 @@
+[Unit]
+Description=A free open-source mathematics software system
+
+[Service]
+ExecStart=/usr/bin/sage -n
+
+[Install]
+WantedBy=default.target



More information about the arch-commits mailing list