summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Chen2018-02-06 15:51:20 -0500
committerDaniel Chen2018-02-06 15:51:20 -0500
commitd4b26b084e6dede31f18a8fb82b8deff3dd7815e (patch)
tree6f7447f44c7ca21a7e51ac8016b03b2a7c558405
parent77a4813794f58cdf9a2d3dc9296fcd89be5139ab (diff)
parent6959e65795ee61ba210b7944c52a655def3e9747 (diff)
downloadaur-d4b26b084e6dede31f18a8fb82b8deff3dd7815e.tar.gz
fix conflicts
-rw-r--r--.SRCINFO3
-rw-r--r--LICENSE3
-rw-r--r--PKGBUILD4
3 files changed, 5 insertions, 5 deletions
diff --git a/.SRCINFO b/.SRCINFO
index aea9701f3c7..774731b44f3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
# Generated by mksrcinfo v8
-# Tue Feb 6 20:49:28 UTC 2018
+# Tue Feb 6 20:51:09 UTC 2018
pkgbase = nteract-bin
pkgdesc = Interactive literate coding notebook
pkgver = 0.7.0
@@ -8,7 +8,6 @@ pkgbase = nteract-bin
install = nteract-bin.install
arch = x86_64
license = BSD-3-Clause
- makedepends = gendesk
depends = alsa-lib
depends = gconf
depends = gtk2
diff --git a/LICENSE b/LICENSE
index 1064cce0730..79d2e86e15b 100644
--- a/LICENSE
+++ b/LICENSE
@@ -11,7 +11,7 @@ modification, are permitted provided that the following conditions are met:
this list of conditions and the following disclaimer in the documentation
and/or other materials provided with the distribution.
-* Neither the name of transformime-react nor the names of its
+* Neither the name of nteract nor the names of its
contributors may be used to endorse or promote products derived from
this software without specific prior written permission.
@@ -25,3 +25,4 @@ SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
diff --git a/PKGBUILD b/PKGBUILD
index aae0374962a..09288dba601 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -10,7 +10,6 @@ url='https://nteract.io'
arch=('x86_64')
license=('BSD-3-Clause')
depends=('alsa-lib' 'gconf' 'gtk2' 'libxss' 'libxtst' 'nodejs' 'nss' 'python')
-makedepends=('gendesk')
optdepends=('ihaskell-git: support for Haskell'
'julia: support for Julia (requires the "IJulia" package)'
'python-ipykernel: support for Python 3'
@@ -42,7 +41,8 @@ package() {
ln -s "/usr/lib/${_pkgname}/${_pkgname}" "${pkgdir}/usr/bin/${_pkgname}"
# Place desktop entry and icons
- desktop-file-install -m 644 --dir "${pkgdir}/usr/share/applications/" "${srcdir}/${_pkgname}.desktop"
+ sed -i 's/opt/usr\/lib/' "${srcdir}/usr/share/applications/${_pkgname}.desktop"
+ desktop-file-install -m 644 --dir "${pkgdir}/usr/share/applications/" "${srcdir}/usr/share/applications/${_pkgname}.desktop"
install -dm755 "${pkgdir}/usr/share/icons/hicolor/"
cp -R "${srcdir}/usr/share/icons/hicolor/"* "${pkgdir}/usr/share/icons/hicolor/"