[SCM] Debian packaging of wesnoth branch, natty-backports, updated. debian/1.10.3-1-12-g1d7cc23

Gerfried Fuchs rhonda at debian.org
Fri Jun 29 09:05:19 UTC 2012 

The following commit has been merged in the natty-backports branch:
commit 56d559250d255c8ab88ea1f45583ee13dc9450b6
Merge: 23bacaab620c42086a6292b079fc95084399cdbe f8afd820faa6e3b41f3c19dc8c70a7c1132ca872
Author: Gerfried Fuchs <rhonda at debian.org>
Date:   Thu Jun 28 15:41:26 2012 +0200

    Merge tag 'debian/1.10.3-1' into natty-backports
    
    Uploaded 1:1.10.3-1 to unstable
    
    Conflicts:
    	debian/changelog

diff --combined debian/changelog
index 54dad65,a2172d0..6f30786
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,11 -1,13 +1,21 @@@
+ wesnoth-1.10 (1:1.10.3-1) unstable; urgency=low
+ 
+   * New upstream stable release (closes: #676460)
+   * Remove divert handling which was for wesnoth 1.6 (LP: #999378)
+   * Update package descriptions with data from campaigns (closes: #675170)
+   * Update lintian overrides files.
+   * Get rid of wesnoth-all package.
+ 
+  -- Gerfried Fuchs <rhonda at debian.org>  Fri, 08 Jun 2012 01:04:39 +0200
+ 
 +wesnoth-1.10 (1:1.10.2-1~natty1) natty-backports; urgency=low
 +
 +  * Backport to natty, changes kept:
 +    - Switch to use ttf-droid instead of fonts-droid which is not available in
 +      natty.
 +
 + -- Gerfried Fuchs <rhonda at ubuntu.com>  Fri, 13 Apr 2012 11:57:17 +0200
 +
  wesnoth-1.10 (1:1.10.2-1) unstable; urgency=low
  
    * New upstream stable release.
@@@ -15,14 -17,6 +25,14 @@@
  
   -- Gerfried Fuchs <rhonda at debian.org>  Sun, 08 Apr 2012 16:16:17 +0200
  
 +wesnoth-1.10 (1:1.10.1-1~natty1) natty-backports; urgency=low
 +
 +  * Backport to natty, changes kept:
 +    - Switch to use ttf-droid instead of fonts-droid which is not available in
 +      natty.
 +
 + -- Gerfried Fuchs <rhonda at ubuntu.com>  Tue, 06 Mar 2012 13:32:11 +0100
 +
  wesnoth-1.10 (1:1.10.1-1) unstable; urgency=low
  
    * New upstream stable release, making fix-xdg-path patch obsolete.
@@@ -31,14 -25,6 +41,14 @@@
  
   -- Gerfried Fuchs <rhonda at debian.org>  Tue, 28 Feb 2012 00:44:18 +0100
  
 +wesnoth-1.10 (1:1.10-1~natty1) natty-backports; urgency=low
 +
 +  * Backport to natty (LP: #932011)
 +  * Switch to use ttf-droid instead of fonts-droid which is not available in
 +    natty.
 +
 + -- Gerfried Fuchs <rhonda at ubuntu.com>  Sun, 12 Feb 2012 11:41:50 +0100
 +
  wesnoth-1.10 (1:1.10-1) unstable; urgency=low
  
    * New upstream stable release!  \o/
diff --combined debian/control
index 43b30be,bd8403b..5170947
--- a/debian/control
+++ b/debian/control
@@@ -18,7 -18,7 +18,7 @@@ Vcs-Browser: http://git.debian.org/?p=p
  Package: wesnoth-1.10-data
  Architecture: all
  Depends: ${misc:Depends}, ttf-dejavu
 -Recommends: fonts-droid
 +Recommends: ttf-droid
  Suggests: wesnoth-1.10-music
  Description: data files for Wesnoth (branch 1.10)
   This package contains the sound files and graphics for Wesnoth. It is required
@@@ -110,20 -110,6 +110,6 @@@ Description: fantasy turn-based strateg
   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: ${misc:Depends}, wesnoth (= ${source:Version}),
-   wesnoth-1.10-data (= ${source:Version})
- Description: fantasy turn-based strategy game - complete suite (transitional package)
-  This transitional package depends on the wesnoth package which pulls in the
-  complete set of the latest stable version.  You can safely remove this
-  package after the upgrade.
-  .
-  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
  Architecture: all
  Depends: ${misc:Depends}, wesnoth-1.10 (>= ${binary:Version}),
@@@ -203,7 -189,7 +189,7 @@@ Description: "Heir to the Throne" offic
   This package contains the "Heir to the Throne" campaign for Wesnoth:
   "Fight to regain the throne of Wesnoth, of which you are the legitimate
   heir."
-  (Novice level, 25 scenarios.)
+  (Novice level, 23 scenarios.)
   .
   Battle for control of villages, using variety of units which have advantages
   and disadvantages in different types of terrains and against different types
@@@ -219,7 -205,7 +205,7 @@@ Description: "The South Guard" officia
   "A young Knight, Deoran, is dispatched to take command of the South Guard...
   Note: This campaign is designed as an introduction to Wesnoth. The 'Civilian'
   difficulty level is aimed at first-time players."
-  (Novice level, 9 or 10 scenarios depending on the branch you take.)
+  (Novice level, 9 scenarios.)
   .
   Battle for control of villages, using variety of units which have advantages
   and disadvantages in different types of terrains and against different types
@@@ -235,7 -221,7 +221,7 @@@ Description: "The Rise of Wesnoth" offi
   "Lead Prince Haldric through the destruction of the Green Isle and across the
   Ocean to establish the very kingdom of Wesnoth itself. The confrontation with
   Lich-Lord Jevyan awaits..."
-  (Intermediate level, 25 scenarios.)
+  (Intermediate level, 24 scenarios.)
   .
   Battle for control of villages, using variety of units which have advantages
   and disadvantages in different types of terrains and against different types
@@@ -248,11 -234,10 +234,10 @@@ Depends: ${misc:Depends}, wesnoth-1.10-
  Architecture: all
  Description: "A Tale of Two Brothers" official campaign for Wesnoth (branch 1.10)
   This package contains the "A Tale of Two Brothers" campaign for Wesnoth:
-  "An evil mage is threatening the local village and its inhabitants. When their
-  leader Bjarn sends for aid from his brother Arne, he is victorious, but Bjarn
-  himself is kidnapped. Can you rescue him?"
-  (Novice level, 4 scenarios; the 'Hard' version may challenge more experienced
-  players.)
+  "An evil mage is threatening the small village of Maghre and its inhabitants.
+  The village’s mage sends to his warrior brother for help, but not all goes as
+  planned. Can you help?"
+  (Novice level, 4 scenarios.)
   .
   Battle for control of villages, using variety of units which have advantages
   and disadvantages in different types of terrains and against different types
@@@ -268,7 -253,7 +253,7 @@@ Description: "The Eastern Invasion" off
   "There are rumors of undead attacks on the eastern border of Wesnoth. You, an
   officer in the Royal Army, have been sent to the eastern front to protect the
   villagers and find out what is happening."
-  (Intermediate level, 18 scenarios.)"
+  (Intermediate level, 16 scenarios.)"
   .
   Battle for control of villages, using variety of units which have advantages
   and disadvantages in different types of terrains and against different types
@@@ -284,7 -269,7 +269,7 @@@ Description: "Under the Burning Suns" o
   "In the distant future a small band of elves struggles to survive amidst the
   ruins of fallen empires. Lead your people out of the desert on an epic journey
   to find a new home."
-  (Expert level, 11 scenarios, some under reconstruction)
+  (Expert level, 10 scenarios.)
   .
   Battle for control of villages, using variety of units which have advantages
   and disadvantages in different types of terrains and against different types
@@@ -299,7 -284,7 +284,7 @@@ Description: "Descent Into Darkness" of
   This package contains the "Descent Into Darkness" campaign for Wesnoth:
   "Learn the dark arts of necromancy in order to save your people from an orcish
   incursion."
-  (Expert level, 11 scenarios.)
+  (Intermediate level, 12 scenarios.)
   .
   Battle for control of villages, using variety of units which have advantages
   and disadvantages in different types of terrains and against different types
@@@ -317,7 -302,7 +302,7 @@@ Description: "Northern Rebirth" officia
   lives, or risk all for freedom and rise up against their cruel overlords.
   Little did they suspect that their struggle would be the hinge of great events
   that might restore the Northlands to the glory they had once known."
-  (Expert level, 14 scenarios.)
+  (Expert level, 13 scenarios.)
   .
   Battle for control of villages, using variety of units which have advantages
   and disadvantages in different types of terrains and against different types
@@@ -355,8 -340,8 +340,8 @@@ Description: "Son of the Black-Eye" off
   Now, as his son, it's up to you to thwart the selfish designs of the humans
   who have broken the old agreements with the orcs and are bent upon taking your
   lands. Unite the warring orcish tribes, bring together the Orcish Council and
-  call up the Great Horde to send the human-worms and their tree-shagger allies
-  to the land of the dead!"
+  call up the Great Horde to send the human-worms and their wose-born allies to
+  the land of the dead!"
   (Expert level, 18 scenarios.)
   .
   Battle for control of villages, using variety of units which have advantages
@@@ -374,7 -359,7 +359,7 @@@ Description: "Liberty" official campaig
   marchlanders revolts against the tyranny of Queen Asheviere. To win their way
   to freedom, they must defeat not just the trained blades of Wesnothian troops
   but darker foes including orcs and undead."
-  (Intermediate level, 9 scenarios)
+  (Intermediate level, 8 scenarios)
   .
   Battle for control of villages, using variety of units which have advantages
   and disadvantages in different types of terrains and against different types
@@@ -406,7 -391,7 +391,7 @@@ Description: "The Hammer of Thursagan" 
   out their kin at Kal Kartha and to learn the fate of the legendary Hammer of
   Thursagan. The perils of their journey through the wild Northern Lands, though
   great, pale beside the evil they will face at its end."
-  (Intermediate level, 13 scenarios.)
+  (Intermediate level, 11 scenarios.)
   .
   Battle for control of villages, using variety of units which have advantages
   and disadvantages in different types of terrains and against different types
@@@ -422,7 -407,7 +407,7 @@@ Description: "Legend of Wesmere" offici
   "The tale of Kalenz, the High Lord who rallied his people after the second
   orcish invasion of the Great Continent and became the most renowned hero in
   the recorded history of the Elves."
-  (Intermediate level, 17 playable scenarios.)
+  (Intermediate level, 18 scenarios.)
   .
   Battle for control of villages, using variety of units which have advantages
   and disadvantages in different types of terrains and against different types
@@@ -439,7 -424,7 +424,7 @@@ Description: "Delfador's Memoirs" offic
   south across the Great River, and mysterious and deadly creatures roam the
   night. Who is the shadowy Iliah-Malal? Can you defeat him before he destroys
   all life in Wesnoth?"
-  (Intermediate level, 23 scenarios)
+  (Intermediate level, 19 scenarios)
   .
   Battle for control of villages, using variety of units which have advantages
   and disadvantages in different types of terrains and against different types
diff --combined debian/control.in
index 99d7a60,e9ae495..8c2d427
--- a/debian/control.in
+++ b/debian/control.in
@@@ -9,7 -9,7 +9,7 @@@ Build-Depends: debhelper (>= 7), libsdl
    libboost-serialization-dev, libboost-system-dev, libboost-thread-dev,
    libboost-program-options-dev,
    libpango1.0-dev, cmake (>= 2.6)
- Standards-Version: 3.9.2
+ Standards-Version: 3.9.3
  Uploaders: Gerfried Fuchs <rhonda at debian.org>
  Homepage: http://wesnoth.org/
  Vcs-Git: git://git.debian.org/git/pkg-games/wesnoth.git
@@@ -18,7 -18,7 +18,7 @@@ Vcs-Browser: http://git.debian.org/?p=p
  Package: wesnoth-BRANCH-data
  Architecture: all
  Depends: ${misc:Depends}, ttf-dejavu
 -Recommends: fonts-droid
 +Recommends: ttf-droid
  Suggests: wesnoth-BRANCH-music
  Description: data files for Wesnoth (branch BRANCH)
   This package contains the sound files and graphics for Wesnoth. It is required
@@@ -110,20 -110,6 +110,6 @@@ Description: fantasy turn-based strateg
   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: ${misc:Depends}, wesnoth (= ${source:Version}),
-   wesnoth-BRANCH-data (= ${source:Version})
- Description: fantasy turn-based strategy game - complete suite (transitional package)
-  This transitional package depends on the wesnoth package which pulls in the
-  complete set of the latest stable version.  You can safely remove this
-  package after the upgrade.
-  .
-  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
  Architecture: all
  Depends: ${misc:Depends}, wesnoth-BRANCH (>= ${binary:Version}),
@@@ -203,7 -189,7 +189,7 @@@ Description: "Heir to the Throne" offic
   This package contains the "Heir to the Throne" campaign for Wesnoth:
   "Fight to regain the throne of Wesnoth, of which you are the legitimate
   heir."
-  (Novice level, 25 scenarios.)
+  (Novice level, 23 scenarios.)
   .
   Battle for control of villages, using variety of units which have advantages
   and disadvantages in different types of terrains and against different types
@@@ -219,7 -205,7 +205,7 @@@ Description: "The South Guard" officia
   "A young Knight, Deoran, is dispatched to take command of the South Guard...
   Note: This campaign is designed as an introduction to Wesnoth. The 'Civilian'
   difficulty level is aimed at first-time players."
-  (Novice level, 9 or 10 scenarios depending on the branch you take.)
+  (Novice level, 9 scenarios.)
   .
   Battle for control of villages, using variety of units which have advantages
   and disadvantages in different types of terrains and against different types
@@@ -235,7 -221,7 +221,7 @@@ Description: "The Rise of Wesnoth" offi
   "Lead Prince Haldric through the destruction of the Green Isle and across the
   Ocean to establish the very kingdom of Wesnoth itself. The confrontation with
   Lich-Lord Jevyan awaits..."
-  (Intermediate level, 25 scenarios.)
+  (Intermediate level, 24 scenarios.)
   .
   Battle for control of villages, using variety of units which have advantages
   and disadvantages in different types of terrains and against different types
@@@ -248,11 -234,10 +234,10 @@@ Depends: ${misc:Depends}, wesnoth-BRANC
  Architecture: all
  Description: "A Tale of Two Brothers" official campaign for Wesnoth (branch BRANCH)
   This package contains the "A Tale of Two Brothers" campaign for Wesnoth:
-  "An evil mage is threatening the local village and its inhabitants. When their
-  leader Bjarn sends for aid from his brother Arne, he is victorious, but Bjarn
-  himself is kidnapped. Can you rescue him?"
-  (Novice level, 4 scenarios; the 'Hard' version may challenge more experienced
-  players.)
+  "An evil mage is threatening the small village of Maghre and its inhabitants.
+  The village’s mage sends to his warrior brother for help, but not all goes as
+  planned. Can you help?"
+  (Novice level, 4 scenarios.)
   .
   Battle for control of villages, using variety of units which have advantages
   and disadvantages in different types of terrains and against different types
@@@ -268,7 -253,7 +253,7 @@@ Description: "The Eastern Invasion" off
   "There are rumors of undead attacks on the eastern border of Wesnoth. You, an
   officer in the Royal Army, have been sent to the eastern front to protect the
   villagers and find out what is happening."
-  (Intermediate level, 18 scenarios.)"
+  (Intermediate level, 16 scenarios.)"
   .
   Battle for control of villages, using variety of units which have advantages
   and disadvantages in different types of terrains and against different types
@@@ -284,7 -269,7 +269,7 @@@ Description: "Under the Burning Suns" o
   "In the distant future a small band of elves struggles to survive amidst the
   ruins of fallen empires. Lead your people out of the desert on an epic journey
   to find a new home."
-  (Expert level, 11 scenarios, some under reconstruction)
+  (Expert level, 10 scenarios.)
   .
   Battle for control of villages, using variety of units which have advantages
   and disadvantages in different types of terrains and against different types
@@@ -299,7 -284,7 +284,7 @@@ Description: "Descent Into Darkness" of
   This package contains the "Descent Into Darkness" campaign for Wesnoth:
   "Learn the dark arts of necromancy in order to save your people from an orcish
   incursion."
-  (Expert level, 11 scenarios.)
+  (Intermediate level, 12 scenarios.)
   .
   Battle for control of villages, using variety of units which have advantages
   and disadvantages in different types of terrains and against different types
@@@ -317,7 -302,7 +302,7 @@@ Description: "Northern Rebirth" officia
   lives, or risk all for freedom and rise up against their cruel overlords.
   Little did they suspect that their struggle would be the hinge of great events
   that might restore the Northlands to the glory they had once known."
-  (Expert level, 14 scenarios.)
+  (Expert level, 13 scenarios.)
   .
   Battle for control of villages, using variety of units which have advantages
   and disadvantages in different types of terrains and against different types
@@@ -355,8 -340,8 +340,8 @@@ Description: "Son of the Black-Eye" off
   Now, as his son, it's up to you to thwart the selfish designs of the humans
   who have broken the old agreements with the orcs and are bent upon taking your
   lands. Unite the warring orcish tribes, bring together the Orcish Council and
-  call up the Great Horde to send the human-worms and their tree-shagger allies
-  to the land of the dead!"
+  call up the Great Horde to send the human-worms and their wose-born allies to
+  the land of the dead!"
   (Expert level, 18 scenarios.)
   .
   Battle for control of villages, using variety of units which have advantages
@@@ -374,7 -359,7 +359,7 @@@ Description: "Liberty" official campaig
   marchlanders revolts against the tyranny of Queen Asheviere. To win their way
   to freedom, they must defeat not just the trained blades of Wesnothian troops
   but darker foes including orcs and undead."
-  (Intermediate level, 9 scenarios)
+  (Intermediate level, 8 scenarios)
   .
   Battle for control of villages, using variety of units which have advantages
   and disadvantages in different types of terrains and against different types
@@@ -406,7 -391,7 +391,7 @@@ Description: "The Hammer of Thursagan" 
   out their kin at Kal Kartha and to learn the fate of the legendary Hammer of
   Thursagan. The perils of their journey through the wild Northern Lands, though
   great, pale beside the evil they will face at its end."
-  (Intermediate level, 13 scenarios.)
+  (Intermediate level, 11 scenarios.)
   .
   Battle for control of villages, using variety of units which have advantages
   and disadvantages in different types of terrains and against different types
@@@ -422,7 -407,7 +407,7 @@@ Description: "Legend of Wesmere" offici
   "The tale of Kalenz, the High Lord who rallied his people after the second
   orcish invasion of the Great Continent and became the most renowned hero in
   the recorded history of the Elves."
-  (Intermediate level, 17 playable scenarios.)
+  (Intermediate level, 18 scenarios.)
   .
   Battle for control of villages, using variety of units which have advantages
   and disadvantages in different types of terrains and against different types
@@@ -439,7 -424,7 +424,7 @@@ Description: "Delfador's Memoirs" offic
   south across the Great River, and mysterious and deadly creatures roam the
   night. Who is the shadowy Iliah-Malal? Can you defeat him before he destroys
   all life in Wesnoth?"
-  (Intermediate level, 23 scenarios)
+  (Intermediate level, 19 scenarios)
   .
   Battle for control of villages, using variety of units which have advantages
   and disadvantages in different types of terrains and against different types

-- 
Debian packaging of wesnoth

More information about the Pkg-games-commits mailing list