r3586 - in packages/trunk/neverball/debian: . patches

Tue Aug 7 23:16:13 UTC 2007

Author: jorda-guest
Date: 2007-08-07 23:16:13 +0000 (Tue, 07 Aug 2007)
New Revision: 3586

Added:
   packages/trunk/neverball/debian/neverball-common.install
   packages/trunk/neverball/debian/neverball-data.install
   packages/trunk/neverball/debian/neverputt-data.install
   packages/trunk/neverball/debian/neverputt.install
   packages/trunk/neverball/debian/neverputt.manpages
   packages/trunk/neverball/debian/neverputt.menu
Removed:
   packages/trunk/neverball/debian/docs
   packages/trunk/neverball/debian/neverdata.install
Modified:
   packages/trunk/neverball/debian/changelog
   packages/trunk/neverball/debian/control
   packages/trunk/neverball/debian/neverball.install
   packages/trunk/neverball/debian/neverball.manpages
   packages/trunk/neverball/debian/neverball.menu
   packages/trunk/neverball/debian/patches/data_path.patch
   packages/trunk/neverball/debian/rules
Log:
Splitting neverball and neverputt.


Modified: packages/trunk/neverball/debian/changelog
===================================================================

--- packages/trunk/neverball/debian/changelog	2007-08-07 18:20:55 UTC (rev 3585)
+++ packages/trunk/neverball/debian/changelog	2007-08-07 23:16:13 UTC (rev 3586)
@@ -6,12 +6,14 @@
     + Added a new build dependency on quilt (>= 0.40).
     + Added XS-Vcs-Svn and XS-Vcs-Browser fields.
     + Added homepage URL to description.
-    + neverdata now recommends neverball.
+    + Split neverball and neverputt along with its respective data
+      packages, and include the neverball-common package, which contains
+      the files shared between both games.
   * debian/rules:
     + Targets and comments cleanup.
     + Do not ignore `make clean'.
     + Fix permissions of various data files that are marked as executable.
-    + Do not install empty directories nor source map files.
+    + Do not install map source files.
   * Use quilt as patch manager.
   * debian/watch: Added a watchfile.
   * debian/README.Debian: Removed, doesn't provide any info. (Closes: #354395)

Modified: packages/trunk/neverball/debian/control
===================================================================
--- packages/trunk/neverball/debian/control	2007-08-07 18:20:55 UTC (rev 3585)
+++ packages/trunk/neverball/debian/control	2007-08-07 23:16:13 UTC (rev 3586)
@@ -9,16 +9,20 @@
 
 Package: neverball
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, neverdata (>= 1.3.0)
-Description: 3D arcade games: neverball & neverputt
- neverball:
+Depends: ${shlibs:Depends}, ${misc:Depends}, neverball-common (= ${source:Version}), neverball-data (= ${source:Version})
+Description: 3D puzzle-action game
  In the grand tradition of Marble Madness and Super Monkey Ball, Neverball
  has you guide a rolling ball through dangerous territory. Balance on narrow
  bridges, navigate mazes, ride moving platforms, and dodge pushers and
  shovers to get to the goal. Race against the clock to collect coins to earn
  extra balls.
  .
- neverputt:
+  Homepage: http://icculus.org/neverball/
+
+Package: neverputt
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, neverball-common (= ${source:Version}), neverputt-data (= ${source:Version})
+Description: 3D miniature golf game
  Neverputt is a hot-seat multi-player miniature golf game for 1 to 4 players.
  The 18-hole course takes advantage of all the elements that challenge
  Neverball players, including moving platforms and barriers, teleporters,
@@ -27,9 +31,21 @@
  .
   Homepage: http://icculus.org/neverball/
 
-Package: neverdata
+Package: neverball-common
 Architecture: all
 Depends: ttf-bitstream-vera
+Description: data files for neverball and neverputt
+ This package contains the data files shared between neverball and
+ neverputt.
+
+Package: neverball-data
+Architecture: all
 Recommends: neverball
-Description: data files for neverball & neverputt
- Level and data files for neverball and neverputt.
+Description: data files for neverball
+ This package contains the data files needed to play neverball.
+
+Package: neverputt-data
+Architecture: all
+Recommends: neverputt
+Description: data files for neverputt
+ This package contains the data files needed to play neverputt.

Deleted: packages/trunk/neverball/debian/docs
===================================================================
--- packages/trunk/neverball/debian/docs	2007-08-07 18:20:55 UTC (rev 3585)
+++ packages/trunk/neverball/debian/docs	2007-08-07 23:16:13 UTC (rev 3586)
@@ -1 +0,0 @@
-README

Added: packages/trunk/neverball/debian/neverball-common.install
===================================================================
--- packages/trunk/neverball/debian/neverball-common.install	                        (rev 0)
+++ packages/trunk/neverball/debian/neverball-common.install	2007-08-07 23:16:13 UTC (rev 3586)
@@ -0,0 +1,6 @@
+data/back/* usr/share/games/neverball/back
+data/bgm/*  usr/share/games/neverball/bgm
+data/mtrl/* usr/share/games/neverball/mtrl
+data/obj/*  usr/share/games/neverball/obj
+data/png/*  usr/share/games/neverball/png
+data/snd/*  usr/share/games/neverball/snd

Added: packages/trunk/neverball/debian/neverball-data.install
===================================================================
--- packages/trunk/neverball/debian/neverball-data.install	                        (rev 0)
+++ packages/trunk/neverball/debian/neverball-data.install	2007-08-07 23:16:13 UTC (rev 3586)
@@ -0,0 +1,8 @@
+data/map-back/*  usr/share/games/neverball/map-back
+data/map-mym/*   usr/share/games/neverball/map-mym
+data/map-rlk/*   usr/share/games/neverball/map-rlk
+data/shot-mym/*  usr/share/games/neverball/shot-mym
+data/shot-rlk/*  usr/share/games/neverball/shot-rlk
+data/levels-*    usr/share/games/neverball
+data/scores-*    usr/share/games/neverball
+data/sets.txt    usr/share/games/neverball

Modified: packages/trunk/neverball/debian/neverball.install
===================================================================
--- packages/trunk/neverball/debian/neverball.install	2007-08-07 18:20:55 UTC (rev 3585)
+++ packages/trunk/neverball/debian/neverball.install	2007-08-07 23:16:13 UTC (rev 3586)
@@ -1,5 +1,3 @@
 neverball usr/games
-neverputt usr/games
 mapc usr/bin
 debian/neverball.xpm usr/share/pixmaps
-debian/neverputt.xpm usr/share/pixmaps

Modified: packages/trunk/neverball/debian/neverball.manpages
===================================================================
--- packages/trunk/neverball/debian/neverball.manpages	2007-08-07 18:20:55 UTC (rev 3585)
+++ packages/trunk/neverball/debian/neverball.manpages	2007-08-07 23:16:13 UTC (rev 3586)
@@ -1,3 +1,2 @@
 debian/neverball.6
-debian/neverputt.6
 debian/mapc.1

Modified: packages/trunk/neverball/debian/neverball.menu
===================================================================
--- packages/trunk/neverball/debian/neverball.menu	2007-08-07 18:20:55 UTC (rev 3585)
+++ packages/trunk/neverball/debian/neverball.menu	2007-08-07 23:16:13 UTC (rev 3586)
@@ -1,6 +1,3 @@
 ?package(neverball): needs="X11" section="Games/Action" \
   title="Neverball" command="/usr/games/neverball" \
   icon="/usr/share/pixmaps/neverball.xpm"
-?package(neverball): needs="X11" section="Games/Action" \
-  title="Neverputt" command="/usr/games/neverputt" \
-  icon="/usr/share/pixmaps/neverputt.xpm"

Deleted: packages/trunk/neverball/debian/neverdata.install
===================================================================
--- packages/trunk/neverball/debian/neverdata.install	2007-08-07 18:20:55 UTC (rev 3585)
+++ packages/trunk/neverball/debian/neverdata.install	2007-08-07 23:16:13 UTC (rev 3586)
@@ -1 +0,0 @@
-data/* usr/share/games/neverdata

Added: packages/trunk/neverball/debian/neverputt-data.install
===================================================================
--- packages/trunk/neverball/debian/neverputt-data.install	                        (rev 0)
+++ packages/trunk/neverball/debian/neverputt-data.install	2007-08-07 23:16:13 UTC (rev 3586)
@@ -0,0 +1,5 @@
+data/map-putt/*  usr/share/games/neverball/map-putt
+data/map-paxed/* usr/share/games/neverball/map-paxed
+data/shot-putt/* usr/share/games/neverball/shot-putt
+data/holes-*     usr/share/games/neverball
+data/courses.txt usr/share/games/neverball

Added: packages/trunk/neverball/debian/neverputt.install
===================================================================
--- packages/trunk/neverball/debian/neverputt.install	                        (rev 0)
+++ packages/trunk/neverball/debian/neverputt.install	2007-08-07 23:16:13 UTC (rev 3586)
@@ -0,0 +1,2 @@
+neverputt usr/games
+debian/neverputt.xpm usr/share/pixmaps

Added: packages/trunk/neverball/debian/neverputt.manpages
===================================================================
--- packages/trunk/neverball/debian/neverputt.manpages	                        (rev 0)
+++ packages/trunk/neverball/debian/neverputt.manpages	2007-08-07 23:16:13 UTC (rev 3586)
@@ -0,0 +1 @@
+debian/neverputt.6

Added: packages/trunk/neverball/debian/neverputt.menu
===================================================================
--- packages/trunk/neverball/debian/neverputt.menu	                        (rev 0)
+++ packages/trunk/neverball/debian/neverputt.menu	2007-08-07 23:16:13 UTC (rev 3586)
@@ -0,0 +1,3 @@
+?package(neverputt): needs="X11" section="Games/Action" \
+  title="Neverputt" command="/usr/games/neverputt" \
+  icon="/usr/share/pixmaps/neverputt.xpm"

Modified: packages/trunk/neverball/debian/patches/data_path.patch
===================================================================
--- packages/trunk/neverball/debian/patches/data_path.patch	2007-08-07 18:20:55 UTC (rev 3585)
+++ packages/trunk/neverball/debian/patches/data_path.patch	2007-08-07 23:16:13 UTC (rev 3586)
@@ -5,7 +5,7 @@
  /*---------------------------------------------------------------------------*/
  
 -#define CONFIG_DATA "./data"
-+#define CONFIG_DATA "/usr/share/games/neverdata"
++#define CONFIG_DATA "/usr/share/games/neverball"
  #define CONFIG_USER ".neverball"
  
  /*

Modified: packages/trunk/neverball/debian/rules
===================================================================
--- packages/trunk/neverball/debian/rules	2007-08-07 18:20:55 UTC (rev 3585)
+++ packages/trunk/neverball/debian/rules	2007-08-07 23:16:13 UTC (rev 3586)
@@ -36,9 +36,8 @@
 	dh_testroot
 	dh_clean -k 
 	dh_installdirs
-	# Install everything except duplicated font, empty dirs and source
-	# map files.
-	dh_install -XVeraBd.ttf -Xmap-misc -Xshot-misc -X*.map
+	# Install everything except the duplicated font and source map files.
+	dh_install -XVeraBd.ttf -X*.map
 
 # Build architecture-independent files here.
 binary-indep: build install
@@ -47,12 +46,12 @@
 	dh_installchangelogs -i CHANGES
 	dh_installdocs -i
 	dh_link -i usr/share/fonts/truetype/ttf-bitstream-vera/VeraBd.ttf \
-	           usr/share/games/neverdata/ttf/VeraBd.ttf
+	           usr/share/games/neverball/ttf/VeraBd.ttf
 	dh_compress -i
 	dh_fixperms -i
 	# Fixing permissions of data files.
-	find debian/neverdata/usr/share/games/neverdata -type f -perm /+x \
-	     -exec chmod 0644 {} +
+	find debian/never{ball-common,ball-data,putt-data}/usr/share/games/neverball \
+	     -type f -perm /+x -exec chmod 0644 {} +
 	dh_installdeb -i
 	dh_gencontrol -i
 	dh_md5sums -i
@@ -63,7 +62,7 @@
 	dh_testdir -a
 	dh_testroot -a
 	dh_installchangelogs -a CHANGES
-	dh_installdocs -a
+	dh_installdocs -a README
 	dh_installman -a
 	dh_installmenu -a
 	dh_strip -a


