From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 1DF7C1381F3 for ; Thu, 15 Nov 2012 22:46:19 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7A5E821C01B; Thu, 15 Nov 2012 22:46:09 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id CA1B621C01B for ; Thu, 15 Nov 2012 22:46:08 +0000 (UTC) Received: from flycatcher.gentoo.org (flycatcher.gentoo.org [81.93.255.6]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C2C5833D977 for ; Thu, 15 Nov 2012 22:46:07 +0000 (UTC) Received: by flycatcher.gentoo.org (Postfix, from userid 665) id 8A4ED20C9F; Thu, 15 Nov 2012 22:46:06 +0000 (UTC) From: "Michael Sterrett (mr_bones_)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, mr_bones_@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in games-arcade/berusky/files: berusky-1.5.2-gentoo.patch berusky-1.1-ovflfix.patch berusky-1.1-gentoo.patch X-VCS-Repository: gentoo-x86 X-VCS-Files: berusky-1.5.2-gentoo.patch berusky-1.1-ovflfix.patch berusky-1.1-gentoo.patch X-VCS-Directories: games-arcade/berusky/files X-VCS-Committer: mr_bones_ X-VCS-Committer-Name: Michael Sterrett Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Message-Id: <20121115224606.8A4ED20C9F@flycatcher.gentoo.org> Date: Thu, 15 Nov 2012 22:46:06 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: fe73778f-b99c-4891-bfe7-2628321147e9 X-Archives-Hash: b3fe571c966f71238dcaa6fbe8f0325d mr_bones_ 12/11/15 22:46:06 Added: berusky-1.5.2-gentoo.patch Removed: berusky-1.1-ovflfix.patch berusky-1.1-gentoo.patch Log: version bump (Portage version: 2.1.11.31/cvs/Linux x86_64, unsigned Manifest commit) Revision Changes Path 1.1 games-arcade/berusky/files/berusky-1.5.2-gentoo.patch file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-arcade/berusky/files/berusky-1.5.2-gentoo.patch?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-arcade/berusky/files/berusky-1.5.2-gentoo.patch?rev=1.1&content-type=text/plain Index: berusky-1.5.2-gentoo.patch =================================================================== diff -ru berusky-1.5.2.orig/Makefile.am berusky-1.5.2/Makefile.am --- berusky-1.5.2.orig/Makefile.am 2012-05-17 06:30:00.000000000 -0400 +++ berusky-1.5.2/Makefile.am 2012-11-15 17:26:23.271928805 -0500 @@ -5,8 +5,7 @@ SUBDIRS = po src data -beruskydocdir = ${prefix}/doc/berusky -beruskydoc_DATA = \ +EXTRA_DIST = \ README\ COPYING\ AUTHORS\ @@ -15,8 +14,6 @@ NEWS\ TODO -EXTRA_DIST = $(beruskydoc_DATA) - # Copy all the spec files. Of cource, only one is actually used. dist-hook: for specfile in *.spec; do \ diff -ru berusky-1.5.2.orig/data/Makefile.am berusky-1.5.2/data/Makefile.am --- berusky-1.5.2.orig/data/Makefile.am 2012-05-17 06:30:00.000000000 -0400 +++ berusky-1.5.2/data/Makefile.am 2012-11-15 17:27:12.966230390 -0500 @@ -3,10 +3,3 @@ ## Created by Anjuta - will be overwritten ## If you don't want it to overwrite it, ## Please disable it in the Anjuta project configuration - -berusky_datadir = $(prefix)/@NO_PREFIX_PACKAGE_DATA_DIR@/@PACKAGE@ - -berusky_data_DATA = \ - berusky.ini - -EXTRA_DIST = $(berusky_data_DATA) diff -ru berusky-1.5.2.orig/data/berusky.ini berusky-1.5.2/data/berusky.ini --- berusky-1.5.2.orig/data/berusky.ini 2012-05-17 06:30:00.000000000 -0400 +++ berusky-1.5.2/data/berusky.ini 2012-11-15 17:27:52.708872231 -0500 @@ -1,9 +1,9 @@ # Configuration for berusky game # Game data location -level_data = /usr/share/berusky/Levels -game_data = /usr/share/berusky/GameData -graphics_data = /usr/share/berusky/Graphics +level_data = @GENTOO_DATADIR@/Levels +game_data = @GENTOO_DATADIR@/GameData +graphics_data = @GENTOO_DATADIR@/Graphics # Graphics settings for game and editor # game runs in 640x480 @@ -17,7 +17,7 @@ # Game binary & tmp dir # they're used by editor for "run level" command -game_binary = /usr/bin/berusky +game_binary = @GENTOO_BINDIR@/berusky tmp_data = /var/tmp # Dir for users levels (it's the default level dir for level editor) diff -ru berusky-1.5.2.orig/src/defines.h berusky-1.5.2/src/defines.h --- berusky-1.5.2.orig/src/defines.h 2012-09-22 15:21:33.000000000 -0400 +++ berusky-1.5.2/src/defines.h 2012-11-15 17:28:33.043493961 -0500 @@ -445,7 +445,7 @@ #define INI_USER_DIRECTORY "~/.berusky" #define INI_USER_LEVELS "~/.berusky/User" #define INI_USER_PROFILES "~/.berusky/Profiles" -#define INI_FILE_GLOBAL "/var/games/berusky/"INI_FILE_NAME +#define INI_FILE_GLOBAL "@GENTOO_DATADIR@/"INI_FILE_NAME #define INI_FILE_USER "~/.berusky/"INI_FILE_NAME #define INI_FILE_LOCAL "./"INI_FILE_NAME #elif WINDOWS