[arch-commits] Commit in pathological/trunk (5 files)

Eric Bélanger eric at archlinux.org
Sat Jul 11 00:41:21 UTC 2009


    Date: Friday, July 10, 2009 @ 20:41:21
  Author: eric
Revision: 45400

upgpkg: pathological 1.1.3-5
    Removed binary from /usr/share (close FS#15302), Moved saved games to /var, Fixed segmentation fault, FHS man pages, Added docs, Added ChangeLog, PKGBUILD clean up

Added:
  pathological/trunk/ChangeLog
  pathological/trunk/encoding.patch
  pathological/trunk/pygame_181.patch
Modified:
  pathological/trunk/PKGBUILD
  pathological/trunk/pathological.install

----------------------+
 ChangeLog            |    9 +++++++
 PKGBUILD             |   61 ++++++++++++++++---------------------------------
 encoding.patch       |    8 ++++++
 pathological.install |   25 ++++++++------------
 pygame_181.patch     |   10 ++++++++
 5 files changed, 58 insertions(+), 55 deletions(-)

Added: ChangeLog
===================================================================
--- ChangeLog	                        (rev 0)
+++ ChangeLog	2009-07-11 00:41:21 UTC (rev 45400)
@@ -0,0 +1,9 @@
+2009-07-10  Eric Belanger  <eric at archlinux.org>
+
+	* pathological 1.1.3-5
+	* Removed binary from /usr/share (close FS#15302)
+	* Moved saved games to /var
+	* Fixed segmentation fault
+	* FHS man pages
+	* Added docs
+	* Added ChangeLog

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2009-07-11 00:36:21 UTC (rev 45399)
+++ PKGBUILD	2009-07-11 00:41:21 UTC (rev 45400)
@@ -4,56 +4,35 @@
 
 pkgname=pathological
 pkgver=1.1.3
-pkgrel=4
+pkgrel=5
 pkgdesc="A puzzle game with the same feel as frozen bubble"
 arch=('i686' 'x86_64')
 url="http://pathological.sourceforge.net/"
 license=('GPL')
 depends=('python-pygame')
+makedepends=('netpbm')
 install=pathological.install
 source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz
-        pathological.desktop)
-md5sums=('76a446080c0fed12baf39354d8e0ce4a' '0fbf64860efe3d287eb74681758c4f75')
-sha1sums=('70b1c9e12704c7fd3b301aa90bceee2e8373b7b9' '9b57f854ce9621542d810a21c61325de343950d7')
+        pathological.desktop pygame_181.patch encoding.patch)
+md5sums=('76a446080c0fed12baf39354d8e0ce4a' '0fbf64860efe3d287eb74681758c4f75'\
+         'bcd59890efe29a9f8c83227656c31a3e' '06d9221d0d8adaf232a3766870a8bcc0')
+sha1sums=('70b1c9e12704c7fd3b301aa90bceee2e8373b7b9'
+          '9b57f854ce9621542d810a21c61325de343950d7'
+          '6f0aa0f74a87bd53771f2db6d3117981c4f070d3'
+          '7dbaa9ced7da0094280425a68b4c8db3382f230a')
 
 build() {
-  cd ${startdir}/src/${pkgname}-${pkgver}
-  make write-highscores || return 1
-  
-  sed -i -e 's|/usr/lib/pathological/bin/write-highscores|/usr/share/pathological/write-highscores|' pathological.py
-  sed -i -e 's|/var/games/pathological_scores|/usr/share/games/pathological/pathological_scores|' pathological
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -p0 < ../encoding.patch || return 1
+  patch -p1 < ../pygame_181.patch || return 1
+  sed -i 's|X11R6/include/X11|share|' Makefile || return 1
+  sed -i 's|usr/games|usr/bin|' Makefile || return 1
 
-  # silence python from complaining about missing encoding
-  p_has__coding=`head -n3 pathological.py | grep coding`
-  if [ -z "${p_has__coding}" ]; then
-    head -n1 pathological.py > p.tmp
-    echo "# -*- coding: utf-8 -*-" >> p.tmp
-    p_num_lines=`wc -l pathological.py | awk '{ print $1 }'`
-    p_num_lines=`expr ${p_num_lines} - 1`
-    tail -n${p_num_lines} pathological.py >> p.tmp
-    mv p.tmp pathological.py
-  fi
+  make || return 1
+  make DESTDIR="${pkgdir}" install || return 1
+  install -D -m644 ../pathological.desktop "${pkgdir}/usr/share/applications/pathological.desktop"
 
-  mkdir -p ${startdir}/pkg/usr/share/games/pathological
-  cp -r circuits graphics music sounds \
-	${startdir}/pkg/usr/share/games/pathological/
-  chmod 755 ${startdir}/pkg/usr/share/games/pathological/*
-
-  install -m755 pathological.py \
-                 ${startdir}/pkg/usr/share/games/pathological
-  install -m2755 -g100 write-highscores \
-                       ${startdir}/pkg/usr/share/games/pathological
-
-  mkdir -p ${startdir}/pkg/usr/share/{pixmaps,applications}
-  install -m644 pathological.xpm ${startdir}/pkg/usr/share/pixmaps/
-  install -m644 ${startdir}/src/pathological.desktop \
-                ${startdir}/pkg/usr/share/applications/
-
-  rm ${startdir}/pkg/usr/share/games/pathological/graphics/*.xcf
-
-  mkdir -p ${startdir}/pkg/usr/man/man6
-  install -m0644 pathological.6.gz ${startdir}/pkg/usr/man/man6
-
-  mkdir -p ${startdir}/pkg/usr/bin
-  install -m755 pathological ${startdir}/pkg/usr/bin
+  chown root:games "${pkgdir}/var/games"
+  chmod 775 "${pkgdir}/var/games"
+  rm "${pkgdir}/var/games/pathological_scores"
 }

Added: encoding.patch
===================================================================
--- encoding.patch	                        (rev 0)
+++ encoding.patch	2009-07-11 00:41:21 UTC (rev 45400)
@@ -0,0 +1,8 @@
+--- pathological.py.orig	2009-07-10 01:49:39.000000000 -0400
++++ pathological.py	2009-07-10 01:49:53.000000000 -0400
+@@ -1,4 +1,5 @@
+ #!/usr/bin/python
++# -*- coding: utf-8 -*-
+ """
+ Copyright (C) 2003  John-Paul Gignac
+ 

Modified: pathological.install
===================================================================
--- pathological.install	2009-07-11 00:36:21 UTC (rev 45399)
+++ pathological.install	2009-07-11 00:41:21 UTC (rev 45400)
@@ -1,6 +1,5 @@
 post_install() {
-  if [ ! -e /usr/share/games/pathological/pathological_scores ]; then
-    cat << _EOF > /usr/share/games/pathological/pathological_scores
+    cat << _EOF > var/games/pathological_scores
 0 all-boards 1 John-Paul
 0 all-boards 1 Kim
 0 all-boards 1 Matths
@@ -12,20 +11,18 @@
 0 all-boards 1 everyone who
 0 all-boards 1 contributed!
 _EOF
-  chown root:users /usr/share/games/pathological/pathological_scores
-  chmod 664 /usr/share/games/pathological/pathological_scores
-  fi
-}
 
-post_upgrade() {
-  post_install $1
+  chown root:games var/games/pathological_scores
+  chmod 664 var/games/pathological_scores
 }
 
-post_remove() {
-  rm -f /usr/share/games/pathological/pathological_scores
+pre_upgrade() {
+  if [ -e usr/share/games/pathological/pathological_scores ]; then
+    mv usr/share/games/pathological/pathological_scores var/games/
+  fi
 }
 
-op=$1
-shift
-
-$op $*
+post_upgrade() {
+  chown root:games var/games/pathological_scores
+  chmod 664 var/games/pathological_scores
+}

Added: pygame_181.patch
===================================================================
--- pygame_181.patch	                        (rev 0)
+++ pygame_181.patch	2009-07-11 00:41:21 UTC (rev 45400)
@@ -0,0 +1,10 @@
+--- pathological-1.1.3.orig.orig/pathological.py	2009-04-15 10:50:11.000000000 -0400
++++ pathological-1.1.3.orig/pathological.py	2009-04-15 10:50:56.000000000 -0400
+@@ -169,6 +169,7 @@
+ 	if not pygame.mixer or not pygame.mixer.music:
+ 		print "Background music not available."
+ 		return
++	pygame.mixer.music.stop()
+ 	fullname = os.path.join('music', name)
+ 	try:
+ 		pygame.mixer.music.load(fullname)




More information about the arch-commits mailing list