r8184 - packages/branches/neverball/experimental/debian

[Jordà Polo]

Author: jorda-guest
Date: 2008-09-21 22:49:09 +0000 (Sun, 21 Sep 2008)
New Revision: 8184

Modified:
   packages/branches/neverball/experimental/debian/changelog
   packages/branches/neverball/experimental/debian/control
Log:
Move dependency on neverball-common from "binary" packages to -data packages,
as suggested by Gonéri Le Bouder.


Modified: packages/branches/neverball/experimental/debian/changelog
===================================================================
--- packages/branches/neverball/experimental/debian/changelog	2008-09-21 20:18:08 UTC (rev 8183)
+++ packages/branches/neverball/experimental/debian/changelog	2008-09-21 22:49:09 UTC (rev 8184)
@@ -19,6 +19,8 @@
     + Update Standards-Version to 3.8.0: added a brief debian/README.source.
     + Conflict with previous versions and restrict compatibility to current
       source version only.
+    + Move dependency on neverball-common from "binary" packages to -data
+      packages.
   * Provide debug package. (Closes: #484872)
   * Split neverputt into neverputt and neverputt-data.
   * Remove .desktop files and manpages from the package, they are now

Modified: packages/branches/neverball/experimental/debian/control
===================================================================
--- packages/branches/neverball/experimental/debian/control	2008-09-21 20:18:08 UTC (rev 8183)
+++ packages/branches/neverball/experimental/debian/control	2008-09-21 22:49:09 UTC (rev 8184)
@@ -14,10 +14,8 @@
 Package: neverball
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends},
- neverball-common (= ${source:Version}), neverball-data (= ${source:Version})
+ neverball-data (= ${source:Version})
 Suggests: neverputt
-Conflicts: neverball-common (<< 1.4.0+svn2527-1),
- neverball-data (<< 1.4.0+svn2527-1)
 Description: 3D floor-tilting 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
@@ -25,20 +23,9 @@
  shovers to get to the goal. Race against the clock to collect coins to earn
  extra balls.
 
-Package: neverball-common
-Architecture: all
-Depends: ttf-dejavu-core
-Conflicts: neverdata, neverball-data (<< 1.4.0+svn2527-1),
- neverball (<< 1.4.0+svn2527-1), neverputt (<< 1.4.0+svn2527-1)
-Replaces: neverdata, neverball-data (<< 1.4.0+svn2527-1)
-Description: data files for Neverball and Neverputt
- The engine of the floor-tilting game Neverball is also used by its spin-off,
- a miniature golf game known as Neverputt.
- .
- This package contains the data files shared between Neverball and Neverputt.
-
 Package: neverball-data
 Architecture: all
+Depends: neverball-common (= ${source:Version})
 Recommends: neverball
 Conflicts: neverdata, neverball (<< 1.4.0+svn2527-1)
 Replaces: neverdata
@@ -51,12 +38,23 @@
  .
  This package contains the data files needed to play Neverball.
 
+Package: neverball-common
+Architecture: all
+Depends: ttf-dejavu-core
+Conflicts: neverdata, neverball-data (<< 1.4.0+svn2527-1),
+ neverball (<< 1.4.0+svn2527-1), neverputt (<< 1.4.0+svn2527-1)
+Replaces: neverdata, neverball-data (<< 1.4.0+svn2527-1)
+Description: data files for Neverball and Neverputt
+ The engine of the floor-tilting game Neverball is also used by its spin-off,
+ a miniature golf game known as Neverputt.
+ .
+ This package contains the data files shared between Neverball and Neverputt.
+
 Package: neverputt
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends},
- neverball-common (= ${source:Version}), neverputt-data (= ${source:Version})
+ neverputt-data (= ${source:Version})
 Suggests: neverball
-Conflicts: neverball-common (<< 1.4.0+svn2527-1)
 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
@@ -66,6 +64,7 @@
 
 Package: neverputt-data
 Architecture: all
+Depends: neverball-common (= ${source:Version})
 Recommends: neverputt (>= 1.4.0+svn2527-1)
 Conflicts: neverdata, neverputt (<< 1.4.0+svn2527-1)
 Replaces: neverdata, neverputt (<< 1.4.0+svn2527-1)