diff options
| -rw-r--r-- | .SRCINFO | 15 | ||||
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | PKGBUILD | 80 | ||||
| -rw-r--r-- | entrance.service | 4 |
4 files changed, 48 insertions, 52 deletions
@@ -1,19 +1,18 @@ -pkgbase = entrance-svn - pkgdesc = Successor of the e17 display manager - Entrance - pkgver = 74295 +pkgbase = entrance-git + pkgdesc = Enlightenment Display Manager + pkgver = 20130324 pkgrel = 1 url = http://trac.enlightenment.org/e arch = i686 arch = x86_64 license = GPL - makedepends = subversion + makedepends = git depends = elementary - provides = entrance - conflicts = elsa + conflicts = entrance-svn source = entrance-pam source = entrance.service md5sums = 9a76cae5b3a0fcbb6116fa08c7a587b5 - md5sums = a10831272be5d65d40d9f7b5b03361b1 + md5sums = 8c6ff8570c3d689fda99e018e5428a67 -pkgname = entrance-svn +pkgname = entrance-git diff --git a/.gitignore b/.gitignore index e4fa42cf9be4..cfd5f1c65302 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ src/ pkg/ *.tar.* +*.log @@ -1,66 +1,62 @@ -# Maintainer: meklu <meklu at meklu dot org> +# Maintainer: Doug Newgard <scimmia22 at outlook dot com> +# Contributor: meklu <meklu at meklu dot org> # Contributor: Samsagax <samsagax at gmail dot com> # Contributor: Swift Geek <swiftgeek+spam@gmail.com> -pkgname=entrance-svn -pkgver=74295 +pkgname=entrance-git +pkgver=20130324 pkgrel=1 -pkgdesc="Successor of the e17 display manager - Entrance" +pkgdesc="Enlightenment Display Manager" url="http://trac.enlightenment.org/e" license=("GPL") arch=("i686" "x86_64") -provides=('entrance') -conflicts=('elsa') depends=('elementary') -makedepends=('subversion') +makedepends=('git') +conflicts=('entrance-svn') source=('entrance-pam' - 'entrance.service') + 'entrance.service') md5sums=('9a76cae5b3a0fcbb6116fa08c7a587b5' - 'a10831272be5d65d40d9f7b5b03361b1') + '8c6ff8570c3d689fda99e018e5428a67') -_svntrunk="http://svn.enlightenment.org/svn/e/trunk/PROTO/entrance/" -_svnmod="entrance" +_gitroot="git://git.enlightenment.org/misc/entrance.git" +_gitname="entrance" -build () -{ - cd $srcdir +build () { + cd "$srcdir" + msg "Connecting to GIT server...." - msg "Connecting to $_svntrunk SVN server...." - if [ -d $_svnmod/.svn ]; then - (cd $_svnmod && svn up -r $pkgver) - else - svn co $_svntrunk --config-dir ./ -r $pkgver $_svnmod - fi + if [[ -d "$_gitname" ]]; then + cd "$_gitname" && git pull origin + msg "The local files are updated." + else + git clone "$_gitroot" "$_gitname" + fi - msg "SVN checkout done or server timeout" - msg "Starting make..." + msg "GIT checkout done or server timeout" + msg "Starting build..." - rm -rf $_svnmod-build - cp -r $_svnmod $_svnmod-build - cd $_svnmod-build - - ./autogen.sh \ - --prefix=/usr \ - --sysconfdir=/etc - - make + rm -rf "$srcdir/$_gitname-build" + git clone "$srcdir/$_gitname" "$srcdir/$_gitname-build" + cd "$srcdir/$_gitname-build" + ./autogen.sh \ + --prefix=/usr \ + --sysconfdir=/etc + + make } package() { - cd $srcdir/$_svnmod-build + cd "$srcdir/$_gitname-build" - make DESTDIR=$pkgdir install + make DESTDIR="$pkgdir" install - # install license files - install -Dm644 $srcdir/$_svnmod-build/COPYING \ - $pkgdir/usr/share/licenses/$pkgname/COPYING +# install license files + install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING" - # install pam file - install -Dm644 $srcdir/entrance-pam \ - $pkgdir/etc/pam.d/entrance +# install pam file + install -Dm644 "$srcdir/entrance-pam" "$pkgdir/etc/pam.d/entrance" - # install systemd files - install -Dm644 $srcdir/entrance.service \ - $pkgdir/usr/lib/systemd/system/entrance.service +# install systemd files + install -Dm644 "$srcdir/entrance.service" "$pkgdir/usr/lib/systemd/system/entrance.service" } diff --git a/entrance.service b/entrance.service index f4c2b5045cac..de9d8ae43568 100644 --- a/entrance.service +++ b/entrance.service @@ -1,7 +1,7 @@ [Unit] -Description=E17 Display Manager +Description=Enlightenment Display Manager Conflicts=getty@tty1.service -After=systemd-user-sessions.service getty@tty1.service +After=systemd-user-sessions.service [Service] ExecStart=/usr/sbin/entrance --nodaemon |