r4456 - packages/branches/wesnoth/experimental/debian

[Gerfried Fuchs]

Author: alfie
Date: 2007-10-23 10:03:00 +0000 (Tue, 23 Oct 2007)
New Revision: 4456

Modified:
   packages/branches/wesnoth/experimental/debian/changelog
   packages/branches/wesnoth/experimental/debian/control
Log:
Tighten campaign dependencies and introduce virtual wesnoth-campaign-<version> package.


Modified: packages/branches/wesnoth/experimental/debian/changelog
===================================================================
--- packages/branches/wesnoth/experimental/debian/changelog	2007-10-23 10:02:13 UTC (rev 4455)
+++ packages/branches/wesnoth/experimental/debian/changelog	2007-10-23 10:03:00 UTC (rev 4456)
@@ -1,6 +1,11 @@
 wesnoth (1:1.3.9-4) experimental; urgency=low
 
   * Fixed a grammar issue in the package descriptions, closes: #446545
+  * (Re)work the dependency handling with respect to campaigns and
+    incompatibility in between different wesnoth versions: recommend a
+    versioned virtual package (wesnoth-campaign-${source:Upstream-Version})
+    and make the campaigns depend on wesnoth-data with same Upstream-Version.
+    This change was both inspired by #447151 and Andreas Tille, thanks.
 
  -- 
 

Modified: packages/branches/wesnoth/experimental/debian/control
===================================================================
--- packages/branches/wesnoth/experimental/debian/control	2007-10-23 10:02:13 UTC (rev 4455)
+++ packages/branches/wesnoth/experimental/debian/control	2007-10-23 10:03:00 UTC (rev 4456)
@@ -22,7 +22,8 @@
 Package: wesnoth-data
 Architecture: all
 Depends: ttf-dejavu
-Recommends: wesnoth-music, wesnoth-did, wesnoth-ei, wesnoth-httt, wesnoth-l, wesnoth-nr, wesnoth-sof, wesnoth-sotbe, wesnoth-ttb, wesnoth-trow, wesnoth-tsg, wesnoth-utbs
+Recommends: wesnoth-music, wesnoth-campaign-${source:Upstream-Version}
+Conflicts: wesnoth-campaign-1.2
 Suggests: ttf-sazanami-gothic
 Description: data files for Wesnoth
  This package contains the sound files and graphics for Wesnoth.
@@ -66,6 +67,8 @@
  from one scenario to the next in a campaign.
 
 Package: wesnoth-httt
+Provides: wesnoth-campaign-${source:Upstream-Version}
+Depends: wesnoth-data (>= ${source:Upstream-Version}), wesnoth-data (<< ${source:Upstream-Version}.1)
 Architecture: all
 Depends: wesnoth
 Replaces: wesnoth-data (<< 0.9.1)
@@ -78,6 +81,8 @@
  from one scenario to the next in a campaign.
 
 Package: wesnoth-tsg
+Provides: wesnoth-campaign-${source:Upstream-Version}
+Depends: wesnoth-data (>= ${source:Upstream-Version}), wesnoth-data (<< ${source:Upstream-Version}.1)
 Architecture: all
 Depends: wesnoth
 Description: The South Guard official campaign for Wesnoth
@@ -89,6 +94,8 @@
  from one scenario to the next in a campaign.
 
 Package: wesnoth-trow
+Provides: wesnoth-campaign-${source:Upstream-Version}
+Depends: wesnoth-data (>= ${source:Upstream-Version}), wesnoth-data (<< ${source:Upstream-Version}.1)
 Architecture: all
 Depends: wesnoth
 Replaces: wesnoth-data (<< 0.9.1)
@@ -101,6 +108,8 @@
  from one scenario to the next in a campaign.
 
 Package: wesnoth-ttb
+Provides: wesnoth-campaign-${source:Upstream-Version}
+Depends: wesnoth-data (>= ${source:Upstream-Version}), wesnoth-data (<< ${source:Upstream-Version}.1)
 Architecture: all
 Depends: wesnoth
 Description: A Tale of Two Brothers official campaign for Wesnoth
@@ -112,6 +121,8 @@
  from one scenario to the next in a campaign.
 
 Package: wesnoth-ei
+Provides: wesnoth-campaign-${source:Upstream-Version}
+Depends: wesnoth-data (>= ${source:Upstream-Version}), wesnoth-data (<< ${source:Upstream-Version}.1)
 Architecture: all
 Depends: wesnoth
 Replaces: wesnoth-data (<< 0.9.1)
@@ -124,6 +135,8 @@
  from one scenario to the next in a campaign.
 
 Package: wesnoth-utbs
+Provides: wesnoth-campaign-${source:Upstream-Version}
+Depends: wesnoth-data (>= ${source:Upstream-Version}), wesnoth-data (<< ${source:Upstream-Version}.1)
 Architecture: all
 Depends: wesnoth
 Description: Under the Burning Suns official campaign for Wesnoth
@@ -135,6 +148,8 @@
  from one scenario to the next in a campaign.
 
 Package: wesnoth-did
+Provides: wesnoth-campaign-${source:Upstream-Version}
+Depends: wesnoth-data (>= ${source:Upstream-Version}), wesnoth-data (<< ${source:Upstream-Version}.1)
 Architecture: all
 Depends: wesnoth
 Description: Descent into Darkness official campaign for Wesnoth
@@ -146,6 +161,8 @@
  from one scenario to the next in a campaign.
 
 Package: wesnoth-nr
+Provides: wesnoth-campaign-${source:Upstream-Version}
+Depends: wesnoth-data (>= ${source:Upstream-Version}), wesnoth-data (<< ${source:Upstream-Version}.1)
 Architecture: all
 Depends: wesnoth
 Description: Northern Rebirth official campaign for Wesnoth
@@ -157,6 +174,8 @@
  from one scenario to the next in a campaign.
 
 Package: wesnoth-sof
+Provides: wesnoth-campaign-${source:Upstream-Version}
+Depends: wesnoth-data (>= ${source:Upstream-Version}), wesnoth-data (<< ${source:Upstream-Version}.1)
 Architecture: all
 Depends: wesnoth
 Description: Sceptre of Fire official campaign for Wesnoth
@@ -168,6 +187,8 @@
  from one scenario to the next in a campaign.
 
 Package: wesnoth-sotbe
+Provides: wesnoth-campaign-${source:Upstream-Version}
+Depends: wesnoth-data (>= ${source:Upstream-Version}), wesnoth-data (<< ${source:Upstream-Version}.1)
 Architecture: all
 Depends: wesnoth
 Description: Son of the Black Eye official campaign for Wesnoth
@@ -179,6 +200,8 @@
  from one scenario to the next in a campaign.
 
 Package: wesnoth-l
+Provides: wesnoth-campaign-${source:Upstream-Version}
+Depends: wesnoth-data (>= ${source:Upstream-Version}), wesnoth-data (<< ${source:Upstream-Version}.1)
 Architecture: all
 Depends: wesnoth
 Description: Liberty official campaign for Wesnoth
@@ -190,6 +213,8 @@
  from one scenario to the next in a campaign.
 
 Package: wesnoth-aoi
+Provides: wesnoth-campaign-${source:Upstream-Version}
+Depends: wesnoth-data (>= ${source:Upstream-Version}), wesnoth-data (<< ${source:Upstream-Version}.1)
 Architecture: all
 Depends: wesnoth
 Description: An Orcish Incursion official campaign for Wesnoth