r8235 - packages/branches/wesnoth/experimental/debian

Gerfried Fuchs alfie at alioth.debian.org
Sun Oct 5 23:07:29 UTC 2008


Author: alfie
Date: 2008-10-05 23:07:29 +0000 (Sun, 05 Oct 2008)
New Revision: 8235

Added:
   packages/branches/wesnoth/experimental/debian/wesnoth-core.install
   packages/branches/wesnoth/experimental/debian/wesnoth-core.menu
   packages/branches/wesnoth/experimental/debian/wesnoth.postinst
Removed:
   packages/branches/wesnoth/experimental/debian/wesnoth-all.postinst
   packages/branches/wesnoth/experimental/debian/wesnoth.install
   packages/branches/wesnoth/experimental/debian/wesnoth.menu
   packages/branches/wesnoth/experimental/debian/wesnoth.postinst
Modified:
   packages/branches/wesnoth/experimental/debian/NEWS
   packages/branches/wesnoth/experimental/debian/changelog
   packages/branches/wesnoth/experimental/debian/control
Log:
 * Rename wesnoth to wesnoth-core and wesnoth-all to wesnoth. Document the
   switch in the NEWS file.


Modified: packages/branches/wesnoth/experimental/debian/NEWS
===================================================================
--- packages/branches/wesnoth/experimental/debian/NEWS	2008-10-05 22:18:55 UTC (rev 8234)
+++ packages/branches/wesnoth/experimental/debian/NEWS	2008-10-05 23:07:29 UTC (rev 8235)
@@ -1,3 +1,13 @@
+wesnoth (1:1.5.5-1) experimental; urgency=low
+
+  * The meaning of the wesnoth package has changed: It is now the old
+    wesnoth-all package that pulls in all the campaigns. If you don't want
+    that and didn't use wesnoth-all before please switch to using the
+    wesnoth-core package. The switch was done to reduce the confusion of users
+    who wonder about where the campaigns are.
+
+ -- Gerfried Fuchs <rhonda at debian.at>  Mon, 06 Oct 2008 00:17:43 +0200
+
 wesnoth (1:1.4-1) unstable; urgency=low
 
   * Please be aware what a new stable upstream release of wesnoth means for

Modified: packages/branches/wesnoth/experimental/debian/changelog
===================================================================
--- packages/branches/wesnoth/experimental/debian/changelog	2008-10-05 22:18:55 UTC (rev 8234)
+++ packages/branches/wesnoth/experimental/debian/changelog	2008-10-05 23:07:29 UTC (rev 8235)
@@ -5,8 +5,10 @@
     - Northern Rebirth scenario: AI problem (closes: #499895, #501136)
   * Install data/tools/wmltest and data/tools/addon_manager into wesnoth-tools
     package, too.
+  * Rename wesnoth to wesnoth-core and wesnoth-all to wesnoth. Document the
+    switch in the NEWS file.
 
- -- Gerfried Fuchs <rhonda at debian.at>  Mon, 06 Oct 2008 00:17:43 +0200
+ -- Gerfried Fuchs <rhonda at debian.at>  Mon, 06 Oct 2008 00:55:25 +0200
 
 wesnoth (1:1.5.4-1) experimental; urgency=low
 

Modified: packages/branches/wesnoth/experimental/debian/control
===================================================================
--- packages/branches/wesnoth/experimental/debian/control	2008-10-05 22:18:55 UTC (rev 8234)
+++ packages/branches/wesnoth/experimental/debian/control	2008-10-05 23:07:29 UTC (rev 8235)
@@ -27,14 +27,14 @@
  of attacks.  Units gain experience and advance levels, and are carried over
  from one scenario to the next in a campaign.
 
-Package: wesnoth
+Package: wesnoth-core
 Architecture: any
 Depends: ${shlibs:Depends}, wesnoth-data (= ${source:Version})
 Replaces: wesnoth-data (<< 1:1.3.9-3), wesnoth-editor (<< 1:1.5.4-1)
 Provides: wesnoth-editor
 Conflicts: wesnoth-editor
 Recommends: wesnoth-ttb, wesnoth-httt, wesnoth-tsg
-Suggests: wesnoth-all
+Suggests: wesnoth
 Description: fantasy turn-based strategy game
  Battle for control of villages, using variety of units which have advantages
  and disadvantages in different types of terrains and against different types
@@ -45,12 +45,26 @@
  those that are considered to be an introduction to the game. They are just
  recommended but not depended on - quite some people enjoy the multiplayer mode
  for which they aren't needed. If you want to have all the official campaigns
- installed you are encouraged to install wesnoth-all.
+ installed you are encouraged to install wesnoth.
 
+Package: wesnoth-editor
+Architecture: all
+Depends: wesnoth-core (= ${binary:Version}), wesnoth-data (= ${source:Version})
+Description: map editor for Wesnoth - transitional package
+ Battle for control of villages, using variety of units which have advantages
+ and disadvantages in different types of terrains and against different types
+ of attacks.  Units gain experience and advance levels, and are carried over
+ from one scenario to the next in a campaign.
+ .
+ This package used to contain the map editor for Wesnoth. It was incorporated
+ into the main program so this package has become useless. Please use the
+ integrated editor in the main wesnoth binary. You can savely remove this
+ package after the upgrade.
+
 Package: wesnoth-dbg
 Architecture: any
 Priority: extra
-Depends: wesnoth (= ${binary:Version}), wesnoth-data (= ${source:Version})
+Depends: wesnoth-core (= ${binary:Version}), wesnoth-data (= ${source:Version})
 Description: fantasy turn-based strategy game (debugging symbols)
  Battle for control of villages, using variety of units which have advantages
  and disadvantages in different types of terrains and against different types
@@ -59,9 +73,9 @@
  .
  This package contains the debugging symbols for the wesnoth binaries.
 
-Package: wesnoth-all
+Package: wesnoth
 Architecture: all
-Depends: wesnoth (>= ${binary:Version}), wesnoth (<< ${binary:Version}.~),
+Depends: wesnoth-core (>= ${binary:Version}), wesnoth-core (<< ${binary:Version}.~),
   wesnoth-data (= ${source:Version}),
   wesnoth-httt (= ${source:Version}), wesnoth-tsg (= ${source:Version}),
   wesnoth-trow (= ${source:Version}), wesnoth-ttb (= ${source:Version}),
@@ -70,18 +84,37 @@
   wesnoth-sof (= ${source:Version}), wesnoth-sotbe (= ${source:Version}),
   wesnoth-l (= ${source:Version}), wesnoth-aoi (= ${source:Version}),
   wesnoth-thot (= ${source:Version})
+Replaces: wesnoth-all (<< 1:1.5.5-1)
+Provides: wesnoth-all
+Conflicts: wesnoth-all
 Recommends: wesnoth-music (= ${source:Version})
 Description: fantasy turn-based strategy game - complete suite
  This package depends on the complete set of packages built from the wesnoth
  source package but the server (which can be found in the wesnoth-server
  package), most helpful if you always want to have all the official campaigns
- installed.
+ installed. If you only want to play over the network with other players or
+ want to play only a few campaigns you just need to install the wesnoth-core
+ package and the corresponding campaign packages.
  .
  Battle for control of villages, using variety of units which have advantages
  and disadvantages in different types of terrains and against different types
  of attacks.  Units gain experience and advance levels, and are carried over
  from one scenario to the next in a campaign.
 
+Package: wesnoth-all
+Architecture: all
+Depends: wesnoth (= ${source:Version}), wesnoth-data (= ${source:Version})
+Description: complete campaign suite for Wesnoth - transitional package
+ Battle for control of villages, using variety of units which have advantages
+ and disadvantages in different types of terrains and against different types
+ of attacks.  Units gain experience and advance levels, and are carried over
+ from one scenario to the next in a campaign.
+ .
+ This package used to contain the depending package for all the official
+ campaigns for Wesnoth. It was renamed to wesnoth to reduce the confusion on
+ users expecting to get all the official campaigns on installing the wesnoth
+ package. You can savely remove this package after the upgrade.
+
 Package: wesnoth-music
 Architecture: all
 Description: music files for Wesnoth
@@ -122,7 +155,7 @@
  from one scenario to the next in a campaign.
 
 Package: wesnoth-httt
-Depends: wesnoth (>= ${wesnoth:Stable-Version}), wesnoth (<< ${wesnoth:Next-Version})
+Depends: wesnoth-core (>= ${wesnoth:Stable-Version}), wesnoth-core (<< ${wesnoth:Next-Version})
 Architecture: all
 Description: "Heir to the Throne official" campaign for Wesnoth
  This package contains the "Heir to the Throne" campaign for Wesnoth:
@@ -136,7 +169,7 @@
  from one scenario to the next in a campaign.
 
 Package: wesnoth-tsg
-Depends: wesnoth (>= ${wesnoth:Stable-Version}), wesnoth (<< ${wesnoth:Next-Version})
+Depends: wesnoth-core (>= ${wesnoth:Stable-Version}), wesnoth-core (<< ${wesnoth:Next-Version})
 Architecture: all
 Description: "The South Guard official" campaign for Wesnoth
  This package contains the "The South Guard" campaign for Wesnoth:
@@ -151,7 +184,7 @@
  from one scenario to the next in a campaign.
 
 Package: wesnoth-trow
-Depends: wesnoth (>= ${wesnoth:Stable-Version}), wesnoth (<< ${wesnoth:Next-Version})
+Depends: wesnoth-core (>= ${wesnoth:Stable-Version}), wesnoth-core (<< ${wesnoth:Next-Version})
 Architecture: all
 Description: "The Rise of Wesnoth official" campaign for Wesnoth
  This package contains the "The Rise of Wesnoth" campaign for Wesnoth:
@@ -166,7 +199,7 @@
  from one scenario to the next in a campaign.
 
 Package: wesnoth-ttb
-Depends: wesnoth (>= ${wesnoth:Stable-Version}), wesnoth (<< ${wesnoth:Next-Version})
+Depends: wesnoth-core (>= ${wesnoth:Stable-Version}), wesnoth-core (<< ${wesnoth:Next-Version})
 Architecture: all
 Description: "A Tale of Two Brothers official" campaign for Wesnoth
  This package contains the "A Tale of Two Brothers" campaign for Wesnoth:
@@ -182,7 +215,7 @@
  from one scenario to the next in a campaign.
 
 Package: wesnoth-ei
-Depends: wesnoth (>= ${wesnoth:Stable-Version}), wesnoth (<< ${wesnoth:Next-Version})
+Depends: wesnoth-core (>= ${wesnoth:Stable-Version}), wesnoth-core (<< ${wesnoth:Next-Version})
 Architecture: all
 Description: "The Eastern Invasion official" campaign for Wesnoth
  This package contains the "The Eastern Invasion" campaign for Wesnoth:
@@ -197,7 +230,7 @@
  from one scenario to the next in a campaign.
 
 Package: wesnoth-utbs
-Depends: wesnoth (>= ${wesnoth:Stable-Version}), wesnoth (<< ${wesnoth:Next-Version})
+Depends: wesnoth-core (>= ${wesnoth:Stable-Version}), wesnoth-core (<< ${wesnoth:Next-Version})
 Architecture: all
 Description: "Under the Burning Suns official" campaign for Wesnoth
  This package contains the "Under the Burning Suns" campaign for Wesnoth:
@@ -212,7 +245,7 @@
  from one scenario to the next in a campaign.
 
 Package: wesnoth-did
-Depends: wesnoth (>= ${wesnoth:Stable-Version}), wesnoth (<< ${wesnoth:Next-Version})
+Depends: wesnoth-core (>= ${wesnoth:Stable-Version}), wesnoth-core (<< ${wesnoth:Next-Version})
 Architecture: all
 Description: "Descent Into Darkness official" campaign for Wesnoth
  This package contains the "Descent Into Darkness" campaign for Wesnoth:
@@ -226,7 +259,7 @@
  from one scenario to the next in a campaign.
 
 Package: wesnoth-nr
-Depends: wesnoth (>= ${wesnoth:Stable-Version}), wesnoth (<< ${wesnoth:Next-Version})
+Depends: wesnoth-core (>= ${wesnoth:Stable-Version}), wesnoth-core (<< ${wesnoth:Next-Version})
 Architecture: all
 Description: "Northern Rebirth official" campaign for Wesnoth
  This package contains the "Northern Rebirth" campaign for Wesnoth:
@@ -243,7 +276,7 @@
  from one scenario to the next in a campaign.
 
 Package: wesnoth-sof
-Depends: wesnoth (>= ${wesnoth:Stable-Version}), wesnoth (<< ${wesnoth:Next-Version})
+Depends: wesnoth-core (>= ${wesnoth:Stable-Version}), wesnoth-core (<< ${wesnoth:Next-Version})
 Architecture: all
 Description: "The Sceptre of Fire official" campaign for Wesnoth
  This package contains the "The Sceptre of Fire" campaign for Wesnoth:
@@ -263,7 +296,7 @@
  from one scenario to the next in a campaign.
 
 Package: wesnoth-sotbe
-Depends: wesnoth (>= ${wesnoth:Stable-Version}), wesnoth (<< ${wesnoth:Next-Version})
+Depends: wesnoth-core (>= ${wesnoth:Stable-Version}), wesnoth-core (<< ${wesnoth:Next-Version})
 Architecture: all
 Description: "Son of the Black-Eye official" campaign for Wesnoth
  This package contains the "Son of the Black-Eye" campaign for Wesnoth:
@@ -281,7 +314,7 @@
  from one scenario to the next in a campaign.
 
 Package: wesnoth-l
-Depends: wesnoth (>= ${wesnoth:Stable-Version}), wesnoth (<< ${wesnoth:Next-Version})
+Depends: wesnoth-core (>= ${wesnoth:Stable-Version}), wesnoth-core (<< ${wesnoth:Next-Version})
 Architecture: all
 Description: "Liberty official" campaign for Wesnoth
  This package contains the "Liberty campaign" for Wesnoth:
@@ -297,7 +330,7 @@
  from one scenario to the next in a campaign.
 
 Package: wesnoth-aoi
-Depends: wesnoth (>= ${wesnoth:Stable-Version}), wesnoth (<< ${wesnoth:Next-Version})
+Depends: wesnoth-core (>= ${wesnoth:Stable-Version}), wesnoth-core (<< ${wesnoth:Next-Version})
 Architecture: all
 Description: "An Orcish Incursion official" campaign for Wesnoth
  This package contains the "An Orcish Incursion" campaign for Wesnoth:
@@ -311,7 +344,7 @@
  from one scenario to the next in a campaign.
 
 Package: wesnoth-thot
-Depends: wesnoth (>= ${wesnoth:Stable-Version}), wesnoth (<< ${wesnoth:Next-Version})
+Depends: wesnoth-core (>= ${wesnoth:Stable-Version}), wesnoth-core (<< ${wesnoth:Next-Version})
 Architecture: all
 Description: "The Hammer of Thursagan official" campaign for Wesnoth
  This package contains the "The Hammer of Thursagan" campaign for Wesnoth:

Deleted: packages/branches/wesnoth/experimental/debian/wesnoth-all.postinst
===================================================================
--- packages/branches/wesnoth/experimental/debian/wesnoth-all.postinst	2008-10-05 22:18:55 UTC (rev 8234)
+++ packages/branches/wesnoth/experimental/debian/wesnoth-all.postinst	2008-10-05 23:07:29 UTC (rev 8235)
@@ -1,18 +0,0 @@
-#!/bin/sh -e
-# postinst script for wesnoth-all
-# copyright 2008 by Gerfried Fuchs <rhonda at debian.at>
-# Licenced the same way as wesnoth itself
-
-action=$1
-version=$2
-
-if dpkg --compare-versions "$version" lt-nl 1:1.4.1-2 \
-	&& [ "$1" = configure ] \
-	&& [ ! -L /usr/share/doc/wesnoth-all ] \
-	&& [ -d /usr/share/doc/wesnoth-all ] \
-	&& rmdir /usr/share/doc/wesnoth-all 2>/dev/null ; then
-
-	ln -s wesnoth-data /usr/share/doc/wesnoth-all
-fi
-
-#DEBHELPER#

Copied: packages/branches/wesnoth/experimental/debian/wesnoth-core.install (from rev 8223, packages/branches/wesnoth/experimental/debian/wesnoth.install)
===================================================================
--- packages/branches/wesnoth/experimental/debian/wesnoth-core.install	                        (rev 0)
+++ packages/branches/wesnoth/experimental/debian/wesnoth-core.install	2008-10-05 23:07:29 UTC (rev 8235)
@@ -0,0 +1,10 @@
+debian/tmp/usr/games/wesnoth
+debian/wesnoth-smallgui /usr/games
+debian/wesnoth-nolog /usr/games
+debian/wesnoth_editor /usr/games
+debian/tmp/usr/share/man/man6/wesnoth.6
+debian/tmp/usr/share/man/*/man6/wesnoth.6
+icons/wesnoth.desktop /usr/share/applications
+icons/wesnoth_editor.desktop /usr/share/applications
+debian/wesnoth-icon.xpm /usr/share/pixmaps
+debian/wesnoth_editor-icon.xpm /usr/share/pixmaps


Property changes on: packages/branches/wesnoth/experimental/debian/wesnoth-core.install
___________________________________________________________________
Name: svn:mergeinfo
   + 

Copied: packages/branches/wesnoth/experimental/debian/wesnoth-core.menu (from rev 8223, packages/branches/wesnoth/experimental/debian/wesnoth.menu)
===================================================================
--- packages/branches/wesnoth/experimental/debian/wesnoth-core.menu	                        (rev 0)
+++ packages/branches/wesnoth/experimental/debian/wesnoth-core.menu	2008-10-05 23:07:29 UTC (rev 8235)
@@ -0,0 +1,14 @@
+?package(wesnoth-core): \
+ needs="X11" \
+ section="Games/Strategy" \
+ title="Battle for Wesnoth" \
+ longtitle="Battle for Wesnoth is a fantasy turn-based strategy game" \
+ command="/usr/games/wesnoth-nolog" \
+ icon="/usr/share/pixmaps/wesnoth-icon.xpm"
+?package(wesnoth-core): \
+ needs="X11" \
+ section="Games/Tools" \
+ title="Battle for Wesnoth Editor" \
+ longtitle="Map editor for Battle for Wesnoth, a fantasy turn-based strategy game" \
+ command="/usr/games/wesnoth --editor" \
+ icon="/usr/share/pixmaps/wesnoth_editor-icon.xpm"


Property changes on: packages/branches/wesnoth/experimental/debian/wesnoth-core.menu
___________________________________________________________________
Name: svn:mergeinfo
   + 

Deleted: packages/branches/wesnoth/experimental/debian/wesnoth.install
===================================================================
--- packages/branches/wesnoth/experimental/debian/wesnoth.install	2008-10-05 22:18:55 UTC (rev 8234)
+++ packages/branches/wesnoth/experimental/debian/wesnoth.install	2008-10-05 23:07:29 UTC (rev 8235)
@@ -1,10 +0,0 @@
-debian/tmp/usr/games/wesnoth
-debian/wesnoth-smallgui /usr/games
-debian/wesnoth-nolog /usr/games
-debian/wesnoth_editor /usr/games
-debian/tmp/usr/share/man/man6/wesnoth.6
-debian/tmp/usr/share/man/*/man6/wesnoth.6
-icons/wesnoth.desktop /usr/share/applications
-icons/wesnoth_editor.desktop /usr/share/applications
-debian/wesnoth-icon.xpm /usr/share/pixmaps
-debian/wesnoth_editor-icon.xpm /usr/share/pixmaps

Deleted: packages/branches/wesnoth/experimental/debian/wesnoth.menu
===================================================================
--- packages/branches/wesnoth/experimental/debian/wesnoth.menu	2008-10-05 22:18:55 UTC (rev 8234)
+++ packages/branches/wesnoth/experimental/debian/wesnoth.menu	2008-10-05 23:07:29 UTC (rev 8235)
@@ -1,14 +0,0 @@
-?package(wesnoth): \
- needs="X11" \
- section="Games/Strategy" \
- title="Battle for Wesnoth" \
- longtitle="Battle for Wesnoth is a fantasy turn-based strategy game" \
- command="/usr/games/wesnoth-nolog" \
- icon="/usr/share/pixmaps/wesnoth-icon.xpm"
-?package(wesnoth): \
- needs="X11" \
- section="Games/Tools" \
- title="Battle for Wesnoth Editor" \
- longtitle="Map editor for Battle for Wesnoth, a fantasy turn-based strategy game" \
- command="/usr/games/wesnoth --editor" \
- icon="/usr/share/pixmaps/wesnoth_editor-icon.xpm"

Deleted: packages/branches/wesnoth/experimental/debian/wesnoth.postinst
===================================================================
--- packages/branches/wesnoth/experimental/debian/wesnoth.postinst	2008-10-05 22:18:55 UTC (rev 8234)
+++ packages/branches/wesnoth/experimental/debian/wesnoth.postinst	2008-10-05 23:07:29 UTC (rev 8235)
@@ -1,15 +0,0 @@
-#!/bin/sh -e
-# postinst script for wesnoth
-# copyright 2008 by Gerfried Fuchs <rhonda at debian.at>
-# Licenced the same way as wesnoth itself
-
-if dpkg --compare-versions "$version" lt-nl 1:1.4.1-2 \
-	&& [ "$1" = configure ] \
-	&& [ ! -L /usr/share/doc/wesnoth ] \
-	&& [ -d /usr/share/doc/wesnoth ] \
-	&& rmdir /usr/share/doc/wesnoth 2>/dev/null ; then
-
-	ln -s wesnoth-data /usr/share/doc/wesnoth
-fi
-
-#DEBHELPER#

Copied: packages/branches/wesnoth/experimental/debian/wesnoth.postinst (from rev 8223, packages/branches/wesnoth/experimental/debian/wesnoth-all.postinst)
===================================================================
--- packages/branches/wesnoth/experimental/debian/wesnoth.postinst	                        (rev 0)
+++ packages/branches/wesnoth/experimental/debian/wesnoth.postinst	2008-10-05 23:07:29 UTC (rev 8235)
@@ -0,0 +1,15 @@
+#!/bin/sh -e
+# postinst script for wesnoth
+# copyright 2008 by Gerfried Fuchs <rhonda at debian.at>
+# Licenced the same way as wesnoth itself
+
+if dpkg --compare-versions "$version" lt-nl 1:1.4.1-2 \
+	&& [ "$1" = configure ] \
+	&& [ ! -L /usr/share/doc/wesnoth ] \
+	&& [ -d /usr/share/doc/wesnoth ] \
+	&& rmdir /usr/share/doc/wesnoth 2>/dev/null ; then
+
+	ln -s wesnoth-data /usr/share/doc/wesnoth
+fi
+
+#DEBHELPER#


Property changes on: packages/branches/wesnoth/experimental/debian/wesnoth.postinst
___________________________________________________________________
Name: svn:mergeinfo
   + 




More information about the Pkg-games-commits mailing list