r13763 - packages/trunk/nikki/debian

[Paul Wise]

Author: pabs
Date: 2012-08-16 01:09:29 +0000 (Thu, 16 Aug 2012)
New Revision: 13763

Added:
   packages/trunk/nikki/debian/nikki-data.install
   packages/trunk/nikki/debian/nikki.install
   packages/trunk/nikki/debian/nikki.menu
Removed:
   packages/trunk/nikki/debian/install
   packages/trunk/nikki/debian/menu
Modified:
   packages/trunk/nikki/debian/control
   packages/trunk/nikki/debian/rules
Log:
Split the data out into a separate package

Modified: packages/trunk/nikki/debian/control
===================================================================
--- packages/trunk/nikki/debian/control	2012-08-15 22:36:07 UTC (rev 13762)
+++ packages/trunk/nikki/debian/control	2012-08-16 01:09:29 UTC (rev 13763)
@@ -60,6 +60,7 @@
 Package: nikki
 Architecture: any
 Depends:
+ nikki-data (>= ${source:Upstream-Version}),
  ${misc:Depends},
  ${shlibs:Depends}
 Description: platform game with remote controllable robots
@@ -71,3 +72,13 @@
  of them via computer terminals. The nifty use of the robots and the
  combination of their characteristic special abilities enable Nikki to solve
  puzzles, overcome obstacles, and complete the level tasks.
+
+Package: nikki-data
+Architecture: all
+Depends:
+ ${misc:Depends}
+Description: data for the Nikki and the Robots game
+ This package contains data and docs for the Nikki and the Robots game.
+ .
+ It contains the in-game documentation, sound, music, levels, sprites, tiles,
+ backgrounds, bitmap fonts and other graphics.

Deleted: packages/trunk/nikki/debian/install
===================================================================
--- packages/trunk/nikki/debian/install	2012-08-15 22:36:07 UTC (rev 13762)
+++ packages/trunk/nikki/debian/install	2012-08-16 01:09:29 UTC (rev 13763)
@@ -1,9 +0,0 @@
-data/menu/nikki.desktop usr/share/applications
-data/png/icon-128.png usr/share/icons/hicolor/128x128/apps
-data/png/icon-16.png usr/share/icons/hicolor/16x16/apps
-data/png/icon-256.png usr/share/icons/hicolor/256x256/apps
-data/png/icon-32.png usr/share/icons/hicolor/32x32/apps
-data/png/icon-512.png usr/share/icons/hicolor/512x512/apps
-data/png/icon-64.png usr/share/icons/hicolor/64x64/apps
-data/svg/nikki-icon.svg usr/share/icons/hicolor/scalable/apps
-nikki.xpm usr/share/icons/hicolor/32x32/apps

Deleted: packages/trunk/nikki/debian/menu
===================================================================
--- packages/trunk/nikki/debian/menu	2012-08-15 22:36:07 UTC (rev 13762)
+++ packages/trunk/nikki/debian/menu	2012-08-16 01:09:29 UTC (rev 13763)
@@ -1,7 +0,0 @@
-?package(nikki): \
- needs="x11" \
- section="Games/Adventure" \
- title="Nikki and the Robots" \
- longtitle="Control robots, collect batteries and find all the switches!!!" \
- command="/usr/games/nikki" \
- icon="/usr/share/icons/hicolor/32x32/apps/nikki.xpm"

Added: packages/trunk/nikki/debian/nikki-data.install
===================================================================
--- packages/trunk/nikki/debian/nikki-data.install	                        (rev 0)
+++ packages/trunk/nikki/debian/nikki-data.install	2012-08-16 01:09:29 UTC (rev 13763)
@@ -0,0 +1 @@
+usr/share/nikki

Copied: packages/trunk/nikki/debian/nikki.install (from rev 13758, packages/trunk/nikki/debian/install)
===================================================================
--- packages/trunk/nikki/debian/nikki.install	                        (rev 0)
+++ packages/trunk/nikki/debian/nikki.install	2012-08-16 01:09:29 UTC (rev 13763)
@@ -0,0 +1,10 @@
+data/menu/nikki.desktop usr/share/applications
+data/png/icon-128.png usr/share/icons/hicolor/128x128/apps
+data/png/icon-16.png usr/share/icons/hicolor/16x16/apps
+data/png/icon-256.png usr/share/icons/hicolor/256x256/apps
+data/png/icon-32.png usr/share/icons/hicolor/32x32/apps
+data/png/icon-512.png usr/share/icons/hicolor/512x512/apps
+data/png/icon-64.png usr/share/icons/hicolor/64x64/apps
+data/svg/nikki-icon.svg usr/share/icons/hicolor/scalable/apps
+nikki.xpm usr/share/icons/hicolor/32x32/apps
+usr/games

Copied: packages/trunk/nikki/debian/nikki.menu (from rev 13758, packages/trunk/nikki/debian/menu)
===================================================================
--- packages/trunk/nikki/debian/nikki.menu	                        (rev 0)
+++ packages/trunk/nikki/debian/nikki.menu	2012-08-16 01:09:29 UTC (rev 13763)
@@ -0,0 +1,7 @@
+?package(nikki): \
+ needs="x11" \
+ section="Games/Adventure" \
+ title="Nikki and the Robots" \
+ longtitle="Control robots, collect batteries and find all the switches!!!" \
+ command="/usr/games/nikki" \
+ icon="/usr/share/icons/hicolor/32x32/apps/nikki.xpm"

Modified: packages/trunk/nikki/debian/rules
===================================================================
--- packages/trunk/nikki/debian/rules	2012-08-15 22:36:07 UTC (rev 13762)
+++ packages/trunk/nikki/debian/rules	2012-08-16 01:09:29 UTC (rev 13763)
@@ -19,11 +19,10 @@
 	rm -rf src/Setup.hi src/Setup.o nikki.xpm src/testsuite/.cabal
 
 override_dh_auto_install:
-	cd src/rootInstall && ./dist/setup copy --destdir=../../debian/nikki/
-	rm -f debian/nikki/usr/share/nikki/LICENSE
-	rm -f debian/nikki/usr/share/nikki/README
-	find debian/nikki -name *.license -delete
-	mkdir -p debian/nikki/usr/share/doc/nikki
+	cd src/rootInstall && ./dist/setup copy --destdir=../../debian/tmp/
+	rm -f debian/tmp/usr/share/nikki/LICENSE
+	rm -f debian/tmp/usr/share/nikki/README
+	find debian/tmp -name *.license -delete
 
 # Disabled until 0.5.1.3 or later is released
 # Earlier versions require an unnessecary dependency
@@ -32,8 +31,8 @@
 
 override_dh_install:
 	dh_install
-	prename s/icon-[0-9]+/nikki/ debian/nikki/usr/share/icons/hicolor/*/apps/icon-*.png
-	prename s/-icon// debian/nikki/usr/share/icons/hicolor/*/apps/*.svg
+	prename s/icon-[0-9]+/nikki/ debian/*/usr/share/icons/hicolor/*/apps/icon-*.png
+	prename s/-icon// debian/*/usr/share/icons/hicolor/*/apps/*.svg
 
 override_dh_installchangelogs:
 	dh_installchangelogs src/CHANGELOG