Update to new Debian patches, remove Changelog, clean PKGBUILD

3 files changed, 38 insertions, 48 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 2662150d9e02..260c54abe8c8 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,17 +1,17 @@
 pkgbase = rrootage
 	pkgdesc = rRootage is an abstract shooter, created by Kenta Cho and ported to Linux by Evil Mr Henry.
 	pkgver = 0.23a
-	pkgrel = 1
+	pkgrel = 2
 	url = http://rrootage.sourceforge.net/
 	arch = x86_64
 	arch = i686
 	license = custom:rrootage
 	depends = libbulletml
 	depends = sdl_mixer
-	source = http://downloads.sourceforge.net/rrootage/rRootage-0.23a.tar.gz
-	source = http://ftp.de.debian.org/debian/pool/main/r/rrootage/rrootage_0.23a-9.diff.gz
-	sha1sums = 8b63bfe17fd311ade6983ec99ec53e44cb8ee3f1
-	sha1sums = 0674a153ccbd9bdb8e675cbe9c6b2ed79ee53361
+	source = https://downloads.sourceforge.net/rrootage/rRootage-0.23a.tar.gz
+	source = http://http.debian.net/debian/pool/main/r/rrootage/rrootage_0.23a-12.debian.tar.xz
+	sha256sums = 964edbe21802e3e40d6a8da19b61132decacd13bf9a71bac86abce012379ff07
+	sha256sums = d0c35a0572ae1185b0f34c8df66d878481b7d83440ad9b9585610f4010437f88
 
 pkgname = rrootage
 
diff --git a/PKGBUILD b/PKGBUILD
index f1017164c4f3..506cd84d149b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,58 +1,51 @@
-# Contributor: Ivy Foster <ivy.foster@gmail.com>
+# Contributor: Ivy Foster <code@escondida.tk>
 
-pkgname='rrootage'
-pkgver='0.23a'
-pkgrel=1
+pkgname=rrootage
+pkgver=0.23a
+pkgrel=2
 pkgdesc='rRootage is an abstract shooter, created by Kenta Cho and ported to Linux by Evil Mr Henry.'
 url='http://rrootage.sourceforge.net/'
 license=('custom:rrootage')
-changelog='rrootage.changelog'
 
-arch=('x86_64' 'i686')
-depends=('libbulletml' 'sdl_mixer')
-source=("http://downloads.sourceforge.net/rrootage/rRootage-$pkgver.tar.gz"
-	http://ftp.de.debian.org/debian/pool/main/r/rrootage/rrootage_0.23a-9.diff.gz)
-sha1sums=('8b63bfe17fd311ade6983ec99ec53e44cb8ee3f1'
-	'0674a153ccbd9bdb8e675cbe9c6b2ed79ee53361')
+arch=(x86_64 i686)
+depends=(libbulletml sdl_mixer)
+source=(
+	"https://downloads.sourceforge.net/rrootage/rRootage-$pkgver.tar.gz"
+	"http://http.debian.net/debian/pool/main/r/rrootage/rrootage_0.23a-12.debian.tar.xz"
+)
+sha256sums=(
+	964edbe21802e3e40d6a8da19b61132decacd13bf9a71bac86abce012379ff07
+	d0c35a0572ae1185b0f34c8df66d878481b7d83440ad9b9585610f4010437f88
+)
 
 prepare() {
 	cd rRootage
 
-	# Unpack the patches
-	patch -Np1 <"$srcdir"/rrootage_0.23a-9.diff
-	# *sigh* patch the patch
-	sed 's/windowMode = 0/windowMode = 1/' \
-		-i debian/patches/09_rrootage_make_highres_default.patch
-	sed -e '/^Medium resolution mode/ s/ (default)//' \
-		-e '/^High resolution mode/ s/\.$/ (default)./' \
-		-i debian/rrootage.6
-
-	for patch in debian/patches/*.patch; do
+	for patch in ../debian/patches/*.patch; do
 		patch -Np1 <"$patch"
 	done
 }
 
 build() {
-	cd rRootage
-	make -C src -f makefile.lin
+	make -C rRootage/src -f makefile.lin
 }
 
 package() {
-	cd rRootage
-
-	install -d "$pkgdir"/usr/share/games
-	cp -r rr_share "$pkgdir"/usr/share/games/rrootage
-	install -D src/rrootage "$pkgdir"/usr/bin/rrootage
-
-	install -D -m 644 readme.txt "$pkgdir"/usr/share/licenses/rrootage/README.jp
-	install -m 644 readme_e.txt "$pkgdir"/usr/share/licenses/rrootage/README.en
-
-	install -D -m 644 readme.txt "$pkgdir"/usr/share/doc/rrootage/README.jp
-	install -m 644 readme_e.txt "$pkgdir"/usr/share/doc/rrootage/README.en
-	install -m 644 readme_linux "$pkgdir"/usr/share/doc/rrootage/README
-
-	install -D -m 644 debian/rrootage.6 "$pkgdir"/usr/share/man/man6/rrootage.6
-	install -D -m 644 debian/rrootage.desktop \
-		"$pkgdir"/usr/share/applications/rrootage.desktop
-	install -D -m 644 debian/rrootage.xpm "$pkgdir"/usr/share/pixmaps/rrootage.xpm
+	cd debian
+	install -D -m 644 rrootage.6 "$pkgdir/usr/share/man/man6/rrootage.6"
+	install -D -m 644 rrootage.desktop \
+		"$pkgdir/usr/share/applications/rrootage.desktop"
+	install -D -m 644 rrootage.xpm "$pkgdir/usr/share/pixmaps/rrootage.xpm"
+
+	cd "$srcdir/rRootage"
+	install -d "$pkgdir/usr/share/games"
+	cp -r rr_share "$pkgdir/usr/share/games/rrootage"
+	install -D src/rrootage "$pkgdir/usr/bin/rrootage"
+
+	install -D -m 644 readme.txt "$pkgdir/usr/share/licenses/rrootage/README.jp"
+	install -m 644 readme_e.txt "$pkgdir/usr/share/licenses/rrootage/README.en"
+
+	install -D -m 644 readme.txt "$pkgdir/usr/share/doc/rrootage/README.jp"
+	install -m 644 readme_e.txt "$pkgdir/usr/share/doc/rrootage/README.en"
+	install -m 644 readme_linux "$pkgdir/usr/share/doc/rrootage/README"
 }
diff --git a/rrootage.changelog b/rrootage.changelog
deleted file mode 100644
index 54376557143e..000000000000
--- a/rrootage.changelog
+++ /dev/null
@@ -1,3 +0,0 @@
-2015-12-11  Ivy Foster  <ivy.foster@gmail.com>
-	* 0.23a-1:
-	- Initial commit
\ No newline at end of file