Remove unnecessary empty package sat-pyjamas

2 files changed, 8 insertions, 42 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 37ce36f8d12e..b17506cc6754 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,16 +1,16 @@
 #Maintainer: jnanar <info@agayon.be>
 
 pkgbase='sat-libervia-hg'
-pkgname=('sat-libervia-hg' 'sat-pyjamas')
+pkgname=('sat-libervia-hg')
 _realname=libervia
 _pyjamasname=pyjamas
 venv_pyjama='venv'
-pkgver=0.6.1.r1105.e6ff5530900e
+pkgver=0.6.1.r1107.2066d4fd9036
 VERSION=0.6.1
 pkgrel=1
 url="http://salut-a-toi.org/"
 arch=('any')
-depends=('python2'  'python2-txjsonrpc-git' 'python2-jinja' 'python2-shortuuid-git' 'sat-media-hg' 'sat-xmpp-hg' 'sat-templates-hg' 'python2-zope-interface' 'python2-pyopenssl' 'python2-autobahn')
+depends=('python2'  'python2-txjsonrpc-git' 'python2-jinja' 'python2-shortuuid-git' 'sat-media-hg' 'sat-xmpp-hg' 'sat-templates-hg' 'python2-zope-interface' 'python2-pyopenssl' 'python2-autobahn' 'dbus')
 makedepends=('python2-setuptools' 'python-virtualenv' 'mercurial')
 license=('AGPL3')
 install=$pkgbase.install
@@ -25,15 +25,13 @@ md5sums=('a0d6344951153f79302eb2b6fd08376e'
 options=('!strip')
 
 pkgver() {
-  cd "$_realname"
-  printf "$VERSION.r%s.%s" "$(hg identify -n)" "$(hg identify -i)" 
+         cd "$_realname"
+         printf "$VERSION.r%s.%s" "$(hg identify -n)" "$(hg identify -i)" 
 }
 
     
 pyjamas_build(){
- 
-    pwd
-	virtualenv $venv_pyjama -ppython2.7 --system-site-packages
+ 	virtualenv $venv_pyjama -ppython2.7 --system-site-packages
 	cd $_pyjamasname
 	source $srcdir/$venv_pyjama/bin/activate	
 	python2.7 bootstrap.py
@@ -42,30 +40,15 @@ pyjamas_build(){
                  
 build() {
         pyjamas_build
-
         cd "$srcdir/$_realname"
         install -dm755 "$srcdir/fakeinstall/"
         PYJSBUILD_PATH="$srcdir/pyjamas/bin/"
-PATH=$PATH:$PYJSBUILD_PATH LIBERVIA_INSTALL=arch NO_PREINSTALL_OPT=nopreinstall SAT_INSTALL=nopreinstall python2 setup.py install --root="$srcdir/fakeinstall/" --prefix=/usr --optimize=1
+        PATH=$PATH:$PYJSBUILD_PATH LIBERVIA_INSTALL=arch NO_PREINSTALL_OPT=nopreinstall SAT_INSTALL=nopreinstall python2 setup.py install --root="$srcdir/fakeinstall/" --prefix=/usr --optimize=1
 	cp -r $srcdir/$_realname/src/{browser,pages,common,server,twisted} $srcdir/fakeinstall/usr/lib/python2.7/site-packages/libervia
 }
 
-
-package_sat-pyjamas(){
-        provides=('sat-pyjamas')
-        conflicts=('sat-pyjamas')
-	pkgdesc="Pyjamas is a toolkit and applications framework, for the Web."
-	echo "Building Libervia depends on pyjamas."
-	echo "We use a special version of pyjamas provided by SàT"
-}
-
-
-
-
-
 package_sat-libervia-hg(){
          pkgdesc="Salut à Toi, multi-frontends multi-purposes XMPP client (Web interface)"
-         depends=('dbus' 'sat-templates-hg'  'sat-media-hg' 'sat-xmpp-hg')
          provides=('sat-libervia')
          conflicts=('sat-libervia')
 	 cd "$pkgdir"
@@ -75,10 +58,8 @@ package_sat-libervia-hg(){
 	 install -dm755 usr/share/libervia
 	 install -dm755 usr/lib/python2.7/site-packages/twisted/plugins
 	 # HTML destination
-	 install -dm755 usr/share/libervia/html
-	 
+	 install -dm755 usr/share/libervia/html	 
 	 cd "$srcdir/fakeinstall"
-
          cp "$srcdir/libervia/src/libervia.sh" "$pkgdir/usr/bin/libervia"
 	 mv -v usr/share/doc/libervia "$pkgdir/usr/share/doc/"
          mv -v usr/share/libervia "$pkgdir/usr/share/libervia/"
diff --git a/sat-pyjamas.install b/sat-pyjamas.install
deleted file mode 100644
index 104bc5b4933e..000000000000
--- a/sat-pyjamas.install
+++ /dev/null
@@ -1,15 +0,0 @@
-print_information() {
-
-  echo "sat-pyjamas is only useful to build libervia."
-}
-
-
-post_upgrade(){
-print_information
-}
-
-post_install(){
-
-print_information
-}
-