2.4.0.r10355.966e24b-1

2 files changed, 4 insertions, 25 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ad5b958a41a2..0da0d46c9ed6 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = amule-git
 	pkgdesc = Client for the eD2k and Kad networks
-	pkgver = 2.4.0.r10323.d3c6603
+	pkgver = 2.4.0.r10355.966e24b
 	pkgrel = 1
 	url = http://amule.org/
 	arch = i686
@@ -13,8 +13,6 @@ pkgbase = amule-git
 	depends = libupnp
 	depends = wxgtk2.8
 	conflicts = amule
-	backup = usr/share/webapps/amps/index.php
-	backup = usr/share/webapps/amps/style.css
 	source = git+https://github.com/amule-project/amule.git
 	source = http://svgicons.o7a.net/unofficial/amule.png
 	source = https://anonscm.debian.org/cgit/pkg-amule/amule.git/plain/debian/patches/configure_ignore_gdlib-config_garbage.diff
diff --git a/PKGBUILD b/PKGBUILD
index a34aa090fe60..630c3730447f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,5 +1,5 @@
 pkgname=amule-git
-pkgver=2.4.0.r10323.d3c6603
+pkgver=2.4.0.r10355.966e24b
 pkgrel=1
 pkgdesc='Client for the eD2k and Kad networks'
 arch=(i686 x86_64)
@@ -18,8 +18,6 @@ makedepends=(
   git
 )
 conflicts=(amule)
-backup=(usr/share/webapps/amps/index.php
-        usr/share/webapps/amps/style.css)
 source=(
 git+https://github.com/amule-project/amule.git
 http://svgicons.o7a.net/unofficial/amule.png
@@ -50,9 +48,8 @@ prepare() {
   patch -Np1 < $srcdir/use_xdg-open_as_preview_default.diff
   patch -Np1 < $srcdir/version_check.diff
 
-  sed -i 's\./LucidaSansRegular.ttf\/usr/share/fonts/TTF/DejaVuSans.ttf\' src/utils/amps/index.php
-  sed -i 's\/usr/share/fonts/corefonts/times.ttf\/usr/share/fonts/TTF/DejaVuSerif.ttf\' \
-    src/utils/cas/configfile.c
+  sed -i 's\/usr/share/fonts/corefonts/times.ttf\/usr/share/fonts/TTF/DejaVuSerif.ttf\;
+    s\/share/cas/\/share/amule/cas/\' src/utils/cas/configfile.c
 }
 
 build() {
@@ -68,7 +65,6 @@ build() {
     --enable-amulecmd
     --enable-cas
     --enable-ccache
-    --enable-fileview
     --enable-geoip
     --enable-mmap
     --enable-optimize
@@ -92,23 +88,8 @@ package() {
   rm $pkgdir/usr/share/pixmaps/amule.*
   install -m644 $srcdir/amule.png $pkgdir/usr/share/pixmaps/
 
-  install src/utils/fileview/mulefileview $pkgdir/usr/bin/
-  ln -rs $pkgdir/usr/bin/mulefileview $pkgdir/usr/bin/fileview
-
-  install -d $pkgdir/usr/share/webapps/amps/
-  install -m644 $(find src/utils/amps -maxdepth 1 -type f) $pkgdir/usr/share/webapps/amps/
-  install -d $pkgdir/usr/share/webapps/amps/langs/
-  install -m644 src/utils/amps/langs/* $pkgdir/usr/share/webapps/amps/langs/
-  install -d $pkgdir/usr/share/webapps/amps/images/
-  install -m644 src/utils/amps/images/* $pkgdir/usr/share/webapps/amps/images/
-
   install -m644 *.txt docs/{*.dia,AUTHORS,COPYING,README.*} README* $pkgdir/usr/share/doc/amule/
 
   install -d $pkgdir/usr/share/doc/amule/cas/
   install -m644 src/utils/cas/README $pkgdir/usr/share/doc/amule/cas/
-
-  install -d $pkgdir/usr/share/doc/amps/
-  ln -rs $pkgdir/usr/share/webapps/amps/{CHANGELOG,COPYING,README,SETTINGS,TODO} \
-    $pkgdir/usr/share/doc/amps/
-  ln -rs $pkgdir/usr/share/doc/amps/ $pkgdir/usr/share/doc/amule/
 }