r13794 - in packages/trunk/funguloids/debian: . patches

[Fabian Greffrath]

Author: fabian-guest
Date: 2012-10-04 12:22:49 +0000 (Thu, 04 Oct 2012)
New Revision: 13794

Added:
   packages/trunk/funguloids/debian/funguloids-data.install
   packages/trunk/funguloids/debian/patches/doc_path.patch
Modified:
   packages/trunk/funguloids/debian/control
   packages/trunk/funguloids/debian/funguloids.install
   packages/trunk/funguloids/debian/patches/series
   packages/trunk/funguloids/debian/rules
Log:
Fix install location of documentation and an architecture-independant funguloids-data package for
all the game data (Closes: #602735).

Modified: packages/trunk/funguloids/debian/control
===================================================================
--- packages/trunk/funguloids/debian/control	2012-10-04 10:54:19 UTC (rev 13793)
+++ packages/trunk/funguloids/debian/control	2012-10-04 12:22:49 UTC (rev 13794)
@@ -22,9 +22,22 @@
 
 Package: funguloids
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: funguloids-data (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends}
 Description: space-flying-mushroom-picking-simulator game
  "Those Funny Funguloids!" is actually a nice little piece of entertainment.
  You collect mushrooms, bring them back to your home base and profit! That's
  the basic idea in a nutshell. It has smooth, appealing 3d graphics and nice
  atmospheric sound effects. Go ahead and try it out - it has sounds too!
+ 
+Package: funguloids-data
+Architecture: all
+Depends: ${misc:Depends}
+Breaks: funguloids (<< 1.06-9~)
+Replaces: funguloids (<< 1.06-9~)
+Description: space-flying-mushroom-picking-simulator game (data files)
+ "Those Funny Funguloids!" is actually a nice little piece of entertainment.
+ You collect mushrooms, bring them back to your home base and profit! That's
+ the basic idea in a nutshell. It has smooth, appealing 3d graphics and nice
+ atmospheric sound effects. Go ahead and try it out - it has sounds too!
+ .
+ This package contains the architecture-independent data files.

Added: packages/trunk/funguloids/debian/funguloids-data.install
===================================================================
--- packages/trunk/funguloids/debian/funguloids-data.install	                        (rev 0)
+++ packages/trunk/funguloids/debian/funguloids-data.install	2012-10-04 12:22:49 UTC (rev 13794)
@@ -0,0 +1 @@
+usr/share

Modified: packages/trunk/funguloids/debian/funguloids.install
===================================================================
--- packages/trunk/funguloids/debian/funguloids.install	2012-10-04 10:54:19 UTC (rev 13793)
+++ packages/trunk/funguloids/debian/funguloids.install	2012-10-04 12:22:49 UTC (rev 13794)
@@ -1 +1,2 @@
 debian/funguloids.desktop usr/share/applications
+usr/games

Added: packages/trunk/funguloids/debian/patches/doc_path.patch
===================================================================
--- packages/trunk/funguloids/debian/patches/doc_path.patch	                        (rev 0)
+++ packages/trunk/funguloids/debian/patches/doc_path.patch	2012-10-04 12:22:49 UTC (rev 13794)
@@ -0,0 +1,16 @@
+Author: Fabian Greffrath <fabian+debian at greffrath.com>
+Subject: Fix location of documentation.
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -254,8 +254,8 @@ bininstalldir="${prefix}/games"
+ gameinstalldir="${prefix}/share/games/funguloids"
+ iconinstalldir="${prefix}/share/games/funguloids/icon"
+ musicinstalldir="${prefix}/share/games/funguloids/music"
+-docinstalldir="${prefix}/share/docs/funguloids"
+-docimageinstalldir="${prefix}/share/docs/funguloids/docs"
++docinstalldir="${prefix}/share/doc/funguloids"
++docimageinstalldir="${prefix}/share/doc/funguloids/docs"
+ pixmapinstalldir="${prefix}/share/pixmaps"
+ 
+ AC_SUBST(prefix)

Modified: packages/trunk/funguloids/debian/patches/series
===================================================================
--- packages/trunk/funguloids/debian/patches/series	2012-10-04 10:54:19 UTC (rev 13793)
+++ packages/trunk/funguloids/debian/patches/series	2012-10-04 12:22:49 UTC (rev 13794)
@@ -7,3 +7,4 @@
 g++4.6.patch
 optional_cg.patch
 g++4.7.patch
+doc_path.patch

Modified: packages/trunk/funguloids/debian/rules
===================================================================
--- packages/trunk/funguloids/debian/rules	2012-10-04 10:54:19 UTC (rev 13793)
+++ packages/trunk/funguloids/debian/rules	2012-10-04 12:22:49 UTC (rev 13794)
@@ -42,3 +42,5 @@
 		mv bin/funguloids.mpk.orig bin/funguloids.mpk ; \
 	fi
 
+override_dh_install:
+	dh_install --fail-missing