update to 15.1 and use/generate everything from the .deb

5 files changed, 11 insertions, 117 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 136983ebc20c..f7514621eb4d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,20 +1,15 @@
 pkgbase = anarchism
 	pkgdesc = Source of information regarding Anarchist (libertarian socialist) theory and practice.
-	pkgver = 15.0
+	pkgver = 15.1
 	pkgrel = 1
 	url = http://www.infoshop.org/AnAnarchistFAQ
 	arch = any
 	license = FDL
+	makedepends = librsvg
 	depends = xdg-utils
 	options = docs
-	source = http://ftp.debian.org/debian/pool/main/a/anarchism/anarchism_15.0-2_all.deb
-	source = anarchism.desktop
-	source = anarchism.png
-	source = anarchism.svg
-	sha256sums = b326b2a666c2b13dcdad188884a4337891677fd67186e8d29313d09c37bd2476
-	sha256sums = fc5cc0c2918037bdbebb16b27de5e847e5041c6e50fe37ef073b501446221521
-	sha256sums = 81f90b8985679d1a9741cf21a4908cbb12d3fe3d67dabb7af0b77e73c1c16744
-	sha256sums = 66fbad2b8a849e1a643f98dac50095b8ab5ddf0256f407c2c629aa5ef5e17e62
+	source = http://ftp.debian.org/debian/pool/main/a/anarchism/anarchism_15.1-4_all.deb
+	sha256sums = 89c6f8f06bf6b81f8ec1862bbf54c16af661bbde72c4ec0597256a3532d631dc
 
 pkgname = anarchism
 
diff --git a/PKGBUILD b/PKGBUILD
index 2bc82419f916..dc8770714f46 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,21 +4,17 @@
 # Mélanie Chauvel (ariasuni) <perso@hack-libre.org>
 
 pkgname=anarchism
-pkgver=15.0
+pkgver=15.1
 pkgrel=1
-_debpkgrel=2
+_debpkgrel=4
 pkgdesc='Source of information regarding Anarchist (libertarian socialist) theory and practice.'
 arch=(any)
 license=(FDL)
 url=http://www.infoshop.org/AnAnarchistFAQ
 options=(docs)
 depends=(xdg-utils)
-source=(
-  http://ftp.debian.org/debian/pool/main/a/$pkgname/$pkgname\_$pkgver-$_debpkgrel\_all.deb
-  anarchism.desktop
-  anarchism.png
-  anarchism.svg
-)
+makedepends=(librsvg)
+source=(http://ftp.debian.org/debian/pool/main/a/$pkgname/$pkgname\_$pkgver-$_debpkgrel\_all.deb)
 
 build() {
   cd $srcdir
@@ -29,12 +25,8 @@ build() {
 package() {
   cd $srcdir
   cp -r usr $pkgdir
-  mkdir -p $pkgdir/usr/share/{applications,pixmaps}
-  cp $pkgname.png $pkgdir/usr/share/pixmaps
-  cp $pkgname.desktop $pkgdir/usr/share/applications
+  mkdir -p $pkgdir/usr/share/pixmaps
+  rsvg-convert -a -h 256 usr/share/$pkgname/icons/$pkgname.svg > $pkgdir/usr/share/pixmaps/$pkgname.png
 }
 
-sha256sums=('b326b2a666c2b13dcdad188884a4337891677fd67186e8d29313d09c37bd2476'
-            'fc5cc0c2918037bdbebb16b27de5e847e5041c6e50fe37ef073b501446221521'
-            '81f90b8985679d1a9741cf21a4908cbb12d3fe3d67dabb7af0b77e73c1c16744'
-            '66fbad2b8a849e1a643f98dac50095b8ab5ddf0256f407c2c629aa5ef5e17e62')
+sha256sums=('89c6f8f06bf6b81f8ec1862bbf54c16af661bbde72c4ec0597256a3532d631dc')
diff --git a/anarchism.desktop b/anarchism.desktop
deleted file mode 100644
index 57af53ce3df9..000000000000
--- a/anarchism.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Comment=An Anarchist FAQ
-Exec=xdg-open file:///usr/share/doc/anarchism/html/index.html
-Icon=anarchism.png
-Name=An Anarchist FAQ
-StartupNotify=true
-Terminal=false
-Type=Application
-Categories=Education;Science
diff --git a/anarchism.png b/anarchism.png
deleted file mode 100644
index 38ba7809e374..000000000000
--- a/anarchism.png
+++ /dev/null
diff --git a/anarchism.svg b/anarchism.svg
deleted file mode 100644
index cbb4c485efb5..000000000000
--- a/anarchism.svg
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="1000"
-   height="1000"
-   id="svg2"
-   sodipodi:version="0.32"
-   inkscape:version="0.46"
-   version="1.0"
-   sodipodi:docname="anarchism.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
-  <defs
-     id="defs4">
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 526.18109 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="744.09448 : 526.18109 : 1"
-       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
-       id="perspective10" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="0.24748737"
-     inkscape:cx="971.78661"
-     inkscape:cy="560.19802"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:window-width="1280"
-     inkscape:window-height="969"
-     inkscape:window-x="0"
-     inkscape:window-y="31" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Ebene 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(146.60449,-82.732526)">
-    <text
-       xml:space="preserve"
-       style="font-size:1073.45263672px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:DejaVu Sans;-inkscape-font-specification:DejaVu Sans Bold"
-       x="-53.020844"
-       y="941.28369"
-       id="text2383"
-       sodipodi:linespacing="125%"><tspan
-         sodipodi:role="line"
-         id="tspan2385"
-         x="-53.020844"
-         y="941.28369">A</tspan></text>
-    <path
-       sodipodi:type="arc"
-       style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:4.82581043;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="path2387"
-       sodipodi:cx="-528.49921"
-       sodipodi:cy="37.537682"
-       sodipodi:rx="23.927988"
-       sodipodi:ry="22.602163"
-       d="M -504.57122,37.537682 A 23.927988,22.602163 0 1 1 -552.42719,37.537682 A 23.927988,22.602163 0 1 1 -504.57122,37.537682 z"
-       transform="matrix(19.182072,0,0,16.570282,10493.112,-18.479877)" />
-  </g>
-</svg>