r8409 - in packages/trunk/performous/debian: . patches

[Miriam Ruiz]

Author: miriam
Date: 2008-11-13 23:38:56 +0000 (Thu, 13 Nov 2008)
New Revision: 8409

Added:
   packages/trunk/performous/debian/patches/directories.patch
Modified:
   packages/trunk/performous/debian/README.Debian
   packages/trunk/performous/debian/patches/series
   packages/trunk/performous/debian/performous.menu
   packages/trunk/performous/debian/rules
Log:
Put files in /usr/games and /usr/share/games/



Modified: packages/trunk/performous/debian/README.Debian
===================================================================
--- packages/trunk/performous/debian/README.Debian	2008-11-13 11:17:49 UTC (rev 8408)
+++ packages/trunk/performous/debian/README.Debian	2008-11-13 23:38:56 UTC (rev 8409)
@@ -28,4 +28,11 @@
 
 For more (up to date) information, see http://performous.org/
 
+Songs are searched for in the following directories:
+    $HOME/.ultrastar/songs/
+    /usr/local/share/games/ultrastar/songs/
+    /usr/local/share/ultrastar/songs/
+    /usr/share/games/ultrastar/songs/
+    /usr/share/ultrastar/songs/
+
  -- Miriam Ruiz <little_miry at yahoo.es>  Tue, 11 Nov 2008 21:11:40 +0100

Added: packages/trunk/performous/debian/patches/directories.patch
===================================================================
--- packages/trunk/performous/debian/patches/directories.patch	                        (rev 0)
+++ packages/trunk/performous/debian/patches/directories.patch	2008-11-13 23:38:56 UTC (rev 8409)
@@ -0,0 +1,27 @@
+Index: performous-0.3.0/CMakeLists.txt
+===================================================================
+--- performous-0.3.0.orig/CMakeLists.txt	2008-11-13 23:32:38.000000000 +0000
++++ performous-0.3.0/CMakeLists.txt	2008-11-13 23:36:58.000000000 +0000
+@@ -40,17 +40,18 @@
+ endif(NOT CMAKE_BUILD_TYPE)
+ 
+ 
+-set(SHARE_INSTALL "share/performous")
++set(SHARE_INSTALL "share/games/performous")
+ 
+ add_subdirectory(libda)
+ add_subdirectory(themes)
+ add_subdirectory(data)
+ add_subdirectory(game)
+ 
++set(PERFORMOUS_THEME_PATH "${CMAKE_INSTALL_PREFIX}/${SHARE_INSTALL}/themes")
++set(PERFORMOUS_PLUGIN_PATH "${CMAKE_INSTALL_PREFIX}/lib/libda")
++set(PERFORMOUS_EXECUTABLE "${CMAKE_INSTALL_PREFIX}/bin/performous")
++
+ if(NOT "${CMAKE_INSTALL_PREFIX}" MATCHES "^/usr/")
+-	set(PERFORMOUS_THEME_PATH "${CMAKE_INSTALL_PREFIX}/${SHARE_INSTALL}/themes")
+-	set(PERFORMOUS_PLUGIN_PATH "${CMAKE_INSTALL_PREFIX}/lib/libda")
+-	set(PERFORMOUS_EXECUTABLE "${CMAKE_INSTALL_PREFIX}/bin/performous")
+ 	configure_file("${PROJECT_SOURCE_DIR}/cmake/performous.sh.cmake" "${PROJECT_BINARY_DIR}/performous.sh" ESCAPE_QUOTES @ONLY)
+ 	install(PROGRAMS "${PROJECT_BINARY_DIR}/performous.sh" DESTINATION bin)
+ 	install(SCRIPT "${PROJECT_SOURCE_DIR}/cmake/performous-launcher.cmake")

Modified: packages/trunk/performous/debian/patches/series
===================================================================
--- packages/trunk/performous/debian/patches/series	2008-11-13 11:17:49 UTC (rev 8408)
+++ packages/trunk/performous/debian/patches/series	2008-11-13 23:38:56 UTC (rev 8409)
@@ -1 +1,2 @@
 desktop.patch
+directories.patch

Modified: packages/trunk/performous/debian/performous.menu
===================================================================
--- packages/trunk/performous/debian/performous.menu	2008-11-13 11:17:49 UTC (rev 8408)
+++ packages/trunk/performous/debian/performous.menu	2008-11-13 23:38:56 UTC (rev 8409)
@@ -1,3 +1,3 @@
-?package(ultrastar-ng):needs="x11" section="Games/Action" \
+?package(performous):needs="x11" section="Games/Action" \
 	title="Performous" command="/usr/games/performous" \
 	icon="/usr/share/pixmaps/performous.xpm"

Modified: packages/trunk/performous/debian/rules
===================================================================
--- packages/trunk/performous/debian/rules	2008-11-13 11:17:49 UTC (rev 8408)
+++ packages/trunk/performous/debian/rules	2008-11-13 23:38:56 UTC (rev 8409)
@@ -26,7 +26,7 @@
 	cd $(BUILD_TREE); $(MAKE)
 	touch $@
 
-clean:
+clean: configure
 	dh_testdir
 	dh_testroot
 	QUILT_PATCHES=debian/patches quilt pop -a -R || test $$? = 2
@@ -45,6 +45,8 @@
 	cd $(BUILD_TREE); $(MAKE) install DESTDIR=$(CURDIR)/debian/performous
 	$(MAKE) -C debian/h2m
 	cp themes/lima/icon.png $(CURDIR)/debian/performous/usr/share/pixmaps/performous.png
+	mkdir -p  $(CURDIR)/debian/performous/usr/share/games/performous/songs
+	mv $(CURDIR)/debian/performous/usr/bin $(CURDIR)/debian/performous/usr/games
 
 # Build architecture independant packages using the common target.
 binary-indep: