r4826 - in packages/branches/wesnoth/experimental/debian: . patches

Gerfried Fuchs alfie at alioth.debian.org
Sun Dec 2 17:01:13 UTC 2007 

Author: alfie
Date: 2007-12-02 17:01:13 +0000 (Sun, 02 Dec 2007)
New Revision: 4826

Added:
   packages/branches/wesnoth/experimental/debian/patches/
   packages/branches/wesnoth/experimental/debian/patches/01_fix-manpage
   packages/branches/wesnoth/experimental/debian/patches/02_fix-desktop-files
   packages/branches/wesnoth/experimental/debian/patches/series
Modified:
   packages/branches/wesnoth/experimental/debian/changelog
   packages/branches/wesnoth/experimental/debian/compat
   packages/branches/wesnoth/experimental/debian/control
   packages/branches/wesnoth/experimental/debian/rules
   packages/branches/wesnoth/experimental/debian/wesnoth-server.init.d
Log:
  * New upstream release with a fix for a directory traversal problem in the
    WML engine which could lead to sending arbitrary files [CVE-2007-5742].
  * Server now supports reloading of config on SIGHUP, adding support for that
    to the init.d script.
  * Removed cdbs dependency for easier maintenanceability of debian/rules, use
    quilt as patch management.
  * Bumped debhelper to compat 5.
  * Add explicit Build-Depends on libsdl1.2-dev instead of depending on the
    implicit pullin through the other libsdl Build-Dependencies.
  * Added patches:
    - fix-manpage: fix the wesnoth_editor manpage NAME syntax
    - fix-desktop-files: remove obsoleted entries from .desktop files


Modified: packages/branches/wesnoth/experimental/debian/changelog
===================================================================
--- packages/branches/wesnoth/experimental/debian/changelog	2007-12-01 17:33:43 UTC (rev 4825)
+++ packages/branches/wesnoth/experimental/debian/changelog	2007-12-02 17:01:13 UTC (rev 4826)
@@ -1,17 +1,28 @@
-wesnoth (1:1.3.10-1) UNRELEASED; urgency=low
+wesnoth (1:1.3.12-1) experimental; urgency=medium
 
-  * New upstream release.
+  * New upstream release with a fix for a directory traversal problem in the
+    WML engine which could lead to sending arbitrary files [CVE-2007-5742].
+  * Server now supports reloading of config on SIGHUP, adding support for that
+    to the init.d script.
   * 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: make the campaigns
-    depend on wesnoth-data with same Upstream-Version. This change was both
+    depend on wesnoth with same Upstream-Version. This change was both
     inspired by #447151 and Andreas Tille, thanks.
   * Add wesnoth-all meta package which depends on all but the server packages
     produced, closes: #449132
   * Removed cruft package relationship handling from before the etch release.
+  * Removed cdbs dependency for easier maintenanceability of debian/rules, use
+    quilt as patch management.
   * Removed XS- prefix from Vcs control fields.
+  * Bumped debhelper to compat 5.
+  * Add explicit Build-Depends on libsdl1.2-dev instead of depending on the
+    implicit pullin through the other libsdl Build-Dependencies.
+  * Added patches:
+    - fix-manpage: fix the wesnoth_editor manpage NAME syntax
+    - fix-desktop-files: remove obsoleted entries from .desktop files
 
- -- Gerfried Fuchs <rhonda at debian.at>  Mon, 12 Nov 2007 11:23:37 +0100
+ -- Gerfried Fuchs <rhonda at debian.at>  Sat, 01 Dec 2007 21:03:22 +0100
 
 wesnoth (1:1.3.9-3) experimental; urgency=low
 

Modified: packages/branches/wesnoth/experimental/debian/compat
===================================================================
--- packages/branches/wesnoth/experimental/debian/compat	2007-12-01 17:33:43 UTC (rev 4825)
+++ packages/branches/wesnoth/experimental/debian/compat	2007-12-02 17:01:13 UTC (rev 4826)
@@ -1 +1 @@
-4
+5

Modified: packages/branches/wesnoth/experimental/debian/control
===================================================================
--- packages/branches/wesnoth/experimental/debian/control	2007-12-01 17:33:43 UTC (rev 4825)
+++ packages/branches/wesnoth/experimental/debian/control	2007-12-02 17:01:13 UTC (rev 4826)
@@ -2,7 +2,9 @@
 Section: games
 Priority: optional
 Maintainer: Isaac Clerencia <isaac at debian.org>
-Build-Depends: cdbs (>= 0.4.23-1.1), debhelper (>= 4.2.21), libsdl-image1.2-dev, libfreetype6-dev, libsdl-mixer1.2-dev, libsdl-net1.2-dev, libfribidi-dev, python-dev (>= 2.3)
+Build-Depends: debhelper (>= 5), quilt, libsdl-image1.2-dev, libfreetype6-dev,
+  libsdl-mixer1.2-dev, libsdl-net1.2-dev, libfribidi-dev, libsdl1.2-dev,
+  python-dev (>= 2.3)
 Standards-Version: 3.7.2
 Uploaders: Cyril Bouthors <cyril at bouthors.org>, Gerfried Fuchs <rhonda at debian.at>
 Homepage: http://wesnoth.org/
@@ -13,6 +15,7 @@
 Architecture: any
 Depends: ${shlibs:Depends}, wesnoth-data (= ${source:Version})
 Replaces: wesnoth-data (<< 1.3.8)
+Suggests: wesnoth-all
 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
@@ -21,7 +24,15 @@
 
 Package: wesnoth-all
 Architecture: all
-Depends: wesnoth (= ${binary:Version}), wesnoth-data (= ${source:Version}), wesnoth-music (= ${source:Version}), wesnoth-editor (= ${binary:Version}), wesnoth-httt (= ${source:Version}), wesnoth-tsg (= ${source:Version}), wesnoth-trow (= ${source:Version}), wesnoth-ttb (= ${source:Version}), wesnoth-ei (= ${source:Version}), wesnoth-utbs (= ${source:Version}), wesnoth-did (= ${source:Version}), wesnoth-nr (= ${source:Version}), wesnoth-sof (= ${source:Version}), wesnoth-sotbe (= ${source:Version}), wesnoth-l (= ${source:Version}), wesnoth-aoi (= ${source:Version})
+Depends: wesnoth (>= ${binary:Version}), wesnoth (<< ${binary:Version}.~),
+  wesnoth-data (= ${source:Version}), wesnoth-music (= ${source:Version}),
+  wesnoth-editor (>= ${binary:Version}), wesnoth-editor (<< ${binary:Version}.~),
+  wesnoth-httt (= ${source:Version}), wesnoth-tsg (= ${source:Version}),
+  wesnoth-trow (= ${source:Version}), wesnoth-ttb (= ${source:Version}),
+  wesnoth-ei (= ${source:Version}), wesnoth-utbs (= ${source:Version}),
+  wesnoth-did (= ${source:Version}), wesnoth-nr (= ${source:Version}),
+  wesnoth-sof (= ${source:Version}), wesnoth-sotbe (= ${source:Version}),
+  wesnoth-l (= ${source:Version}), wesnoth-aoi (= ${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, most helpful if you always want to have all
@@ -35,8 +46,7 @@
 Package: wesnoth-data
 Architecture: all
 Depends: ttf-dejavu
-Recommends: wesnoth-music, wesnoth-campaign-${source:Upstream-Version}
-Conflicts: wesnoth-campaign-1.2
+Recommends: wesnoth-music
 Suggests: ttf-sazanami-gothic
 Description: data files for Wesnoth
  This package contains the sound files and graphics for Wesnoth.
@@ -79,10 +89,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}.~)
+Depends: wesnoth (>= ${source:Upstream-Version}), wesnoth (<< ${source:Upstream-Version}.~)
 Architecture: all
-Depends: wesnoth
 Description: Heir to the Throne official campaign for Wesnoth
  This package contains the Heir to the Throne campaign for Wesnoth.
  .
@@ -92,10 +100,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}.~)
+Depends: wesnoth (>= ${source:Upstream-Version}), wesnoth (<< ${source:Upstream-Version}.~)
 Architecture: all
-Depends: wesnoth
 Description: The South Guard official campaign for Wesnoth
  This package contains The South Guard campaign for Wesnoth.
  .
@@ -105,10 +111,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}.~)
+Depends: wesnoth (>= ${source:Upstream-Version}), wesnoth (<< ${source:Upstream-Version}.~)
 Architecture: all
-Depends: wesnoth
 Description: The Rise of Wesnoth official campaign for Wesnoth
  This package contains the Rise of Wesnoth campaign for Wesnoth.
  .
@@ -118,10 +122,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}.~)
+Depends: wesnoth (>= ${source:Upstream-Version}), wesnoth (<< ${source:Upstream-Version}.~)
 Architecture: all
-Depends: wesnoth
 Description: A Tale of Two Brothers official campaign for Wesnoth
  This package contains A Tale of Two Brothers campaign for Wesnoth.
  .
@@ -131,10 +133,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}.~)
+Depends: wesnoth (>= ${source:Upstream-Version}), wesnoth (<< ${source:Upstream-Version}.~)
 Architecture: all
-Depends: wesnoth
 Description: Eastern Invasion official campaign for Wesnoth
  This package contains the Eastern Invasion campaign for Wesnoth.
  .
@@ -144,10 +144,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}.~)
+Depends: wesnoth (>= ${source:Upstream-Version}), wesnoth (<< ${source:Upstream-Version}.~)
 Architecture: all
-Depends: wesnoth
 Description: Under the Burning Suns official campaign for Wesnoth
  This package contains the Under the Burning Suns campaign for Wesnoth.
  .
@@ -157,10 +155,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}.~)
+Depends: wesnoth (>= ${source:Upstream-Version}), wesnoth (<< ${source:Upstream-Version}.~)
 Architecture: all
-Depends: wesnoth
 Description: Descent into Darkness official campaign for Wesnoth
  This package contains the Descent into Darkness campaign for Wesnoth.
  .
@@ -170,10 +166,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}.~)
+Depends: wesnoth (>= ${source:Upstream-Version}), wesnoth (<< ${source:Upstream-Version}.~)
 Architecture: all
-Depends: wesnoth
 Description: Northern Rebirth official campaign for Wesnoth
  This package contains the Northern Rebirth campaign for Wesnoth.
  .
@@ -183,10 +177,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}.~)
+Depends: wesnoth (>= ${source:Upstream-Version}), wesnoth (<< ${source:Upstream-Version}.~)
 Architecture: all
-Depends: wesnoth
 Description: Sceptre of Fire official campaign for Wesnoth
  This package contains the Sceptre of Fire campaign for Wesnoth.
  .
@@ -196,10 +188,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}.~)
+Depends: wesnoth (>= ${source:Upstream-Version}), wesnoth (<< ${source:Upstream-Version}.~)
 Architecture: all
-Depends: wesnoth
 Description: Son of the Black Eye official campaign for Wesnoth
  This package contains the Son of the Black Eye campaign for Wesnoth.
  .
@@ -209,10 +199,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}.~)
+Depends: wesnoth (>= ${source:Upstream-Version}), wesnoth (<< ${source:Upstream-Version}.~)
 Architecture: all
-Depends: wesnoth
 Description: Liberty official campaign for Wesnoth
  This package contains the Liberty campaign for Wesnoth.
  .
@@ -222,10 +210,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}.~)
+Depends: wesnoth (>= ${source:Upstream-Version}), wesnoth (<< ${source:Upstream-Version}.~)
 Architecture: all
-Depends: wesnoth
 Description: An Orcish Incursion official campaign for Wesnoth
  This package contains the An Orcish Incursion campaign for Wesnoth.
  .

Added: packages/branches/wesnoth/experimental/debian/patches/01_fix-manpage
===================================================================
--- packages/branches/wesnoth/experimental/debian/patches/01_fix-manpage	                        (rev 0)
+++ packages/branches/wesnoth/experimental/debian/patches/01_fix-manpage	2007-12-02 17:01:13 UTC (rev 4826)
@@ -0,0 +1,237 @@
+Author: Gerfried Fuchs <rhonda at debian.at>	vim:ft=diff:
+Description: fix the wesnoth_editor manpage NAME syntax
+
+Index: wesnoth-1.3.12/doc/man/cs/wesnoth_editor.6
+===================================================================
+--- wesnoth-1.3.12.orig/doc/man/cs/wesnoth_editor.6
++++ wesnoth-1.3.12/doc/man/cs/wesnoth_editor.6
+@@ -21,7 +21,7 @@
+ .TH WESNOTH_EDITOR 6 "Èerven 2005" wesnoth_editor "editor map pro Bitvu o Wesnoth"
+ 
+ .SH NÁZEV
+-editor map pro Bitvu o Wesnoth
++wesnoth_editor \- editor map pro Bitvu o Wesnoth
+ 
+ .SH POU®ITÍ
+ \fBwesnoth_editor\fP
+Index: wesnoth-1.3.12/doc/man/da/wesnoth_editor.6
+===================================================================
+--- wesnoth-1.3.12.orig/doc/man/da/wesnoth_editor.6
++++ wesnoth-1.3.12/doc/man/da/wesnoth_editor.6
+@@ -21,7 +21,7 @@
+ .TH WESNOTH_EDITOR 6 "Juni 2005" wesnoth_editor "Kampen om Wesnoths kortredigering"
+ 
+ .SH NAVN
+-Kampen om Wesnoths kortredigering
++wesnoth_editor \- Kampen om Wesnoths kortredigering
+ 
+ .SH SYNOPSIS
+ \fBwesnoth_editor\fP
+Index: wesnoth-1.3.12/doc/man/de/wesnoth_editor.6
+===================================================================
+--- wesnoth-1.3.12.orig/doc/man/de/wesnoth_editor.6
++++ wesnoth-1.3.12/doc/man/de/wesnoth_editor.6
+@@ -21,7 +21,7 @@
+ .TH WESNOTH_EDITOR 6 "Juni 2005" wesnoth_editor "Battle for Wesnoth \- Karteneditor"
+ 
+ .SH NAME
+-Battle for Wesnoth \- Karteneditor
++wesnoth_editor \- Battle for Wesnoth \- Karteneditor
+ 
+ .SH ZUSAMMENFASSUNG
+ \fBwesnoth_editor\fP
+Index: wesnoth-1.3.12/doc/man/en_GB/wesnoth_editor.6
+===================================================================
+--- wesnoth-1.3.12.orig/doc/man/en_GB/wesnoth_editor.6
++++ wesnoth-1.3.12/doc/man/en_GB/wesnoth_editor.6
+@@ -21,7 +21,7 @@
+ .TH WESNOTH_EDITOR 6 "June 2005" wesnoth_editor "Battle for Wesnoth map editor"
+ 
+ .SH NAME
+-Battle for Wesnoth map editor
++wesnoth_editor \- Battle for Wesnoth map editor
+ 
+ .SH SYNOPSIS
+ \fBwesnoth_editor\fP
+Index: wesnoth-1.3.12/doc/man/es/wesnoth_editor.6
+===================================================================
+--- wesnoth-1.3.12.orig/doc/man/es/wesnoth_editor.6
++++ wesnoth-1.3.12/doc/man/es/wesnoth_editor.6
+@@ -21,7 +21,7 @@
+ .TH WESNOTH_EDITOR 6 "Junio de 2005" wesnoth_editor "Editor de mapas de La batalla por Wesnoth"
+ 
+ .SH NOMBRE
+-Editor de mapas de La batalla por Wesnoth
++wesnoth_editor \- Editor de mapas de La batalla por Wesnoth
+ 
+ .SH SINOPSIS
+ \fBwesnoth_editor\fP
+Index: wesnoth-1.3.12/doc/man/fr/wesnoth_editor.6
+===================================================================
+--- wesnoth-1.3.12.orig/doc/man/fr/wesnoth_editor.6
++++ wesnoth-1.3.12/doc/man/fr/wesnoth_editor.6
+@@ -21,7 +21,7 @@
+ .TH WESNOTH_EDITOR 6 "Juin 2005" wesnoth_editor "Éditeur de carte de la Bataille pour Wesnoth"
+ 
+ .SH NOM
+-Éditeur de carte de la Bataille pour Wesnoth
++wesnoth_editor \- Éditeur de carte de la Bataille pour Wesnoth
+ 
+ .SH SYNOPSIS
+ \fBwesnoth_editor\fP
+Index: wesnoth-1.3.12/doc/man/gl_ES/wesnoth_editor.6
+===================================================================
+--- wesnoth-1.3.12.orig/doc/man/gl_ES/wesnoth_editor.6
++++ wesnoth-1.3.12/doc/man/gl_ES/wesnoth_editor.6
+@@ -21,7 +21,7 @@
+ .TH WESNOTH_EDITOR 6 "Xuño de 2005" wesnoth_editor "Editor de mapas de Battle for Wesnoth"
+ 
+ .SH NOME
+-Editor de mapas de Battle for Wesnoth
++wesnoth_editor \- Editor de mapas de Battle for Wesnoth
+ 
+ .SH SINOPSE
+ \fBwesnoth_editor\fP
+Index: wesnoth-1.3.12/doc/man/hu/wesnoth_editor.6
+===================================================================
+--- wesnoth-1.3.12.orig/doc/man/hu/wesnoth_editor.6
++++ wesnoth-1.3.12/doc/man/hu/wesnoth_editor.6
+@@ -21,7 +21,7 @@
+ .TH WESNOTH_EDITOR 6 "2005 június" wesnoth_editor "Harc Wesnoth\-ért pályaszerkeszt?"
+ 
+ .SH NÉV
+-Harc Wesnoth\-ért pályaszerkeszt?
++wesnoth_editor \- Harc Wesnoth\-ért pályaszerkeszt?
+ 
+ .SH ÁTTEKINTÉS
+ \fBwesnoth_editor\fP
+Index: wesnoth-1.3.12/doc/man/it/wesnoth_editor.6
+===================================================================
+--- wesnoth-1.3.12.orig/doc/man/it/wesnoth_editor.6
++++ wesnoth-1.3.12/doc/man/it/wesnoth_editor.6
+@@ -21,7 +21,7 @@
+ .TH WESNOTH_EDITOR 6 "giugno 2005" wesnoth_editor "Editor di mappe di Battle of Wesnoth"
+ 
+ .SH NOME
+-Editor di mappe di Battle of Wesnoth
++wesnoth_editor \- Editor di mappe di Battle of Wesnoth
+ 
+ .SH SYNOPSIS
+ \fBwesnoth_editor\fP
+Index: wesnoth-1.3.12/doc/man/ja/wesnoth_editor.6
+===================================================================
+--- wesnoth-1.3.12.orig/doc/man/ja/wesnoth_editor.6
++++ wesnoth-1.3.12/doc/man/ja/wesnoth_editor.6
+@@ -21,7 +21,7 @@
+ .TH WESNOTH_EDITOR 6 2005ǯ6·î wesnoth_editor "Battle for Wesnoth ¥Þ¥Ã¥×¡¦¥¨¥Ç¥£¥¿¡¼"
+ 
+ .SH ̾Á°
+-Battle for Wesnoth ¥Þ¥Ã¥×¡¦¥¨¥Ç¥£¥¿¡¼
++wesnoth_editor \- Battle for Wesnoth ¥Þ¥Ã¥×¡¦¥¨¥Ç¥£¥¿¡¼
+ 
+ .SH ½ñ¼°
+ \fBwesnoth_editor\fP
+Index: wesnoth-1.3.12/doc/man/nl/wesnoth_editor.6
+===================================================================
+--- wesnoth-1.3.12.orig/doc/man/nl/wesnoth_editor.6
++++ wesnoth-1.3.12/doc/man/nl/wesnoth_editor.6
+@@ -21,7 +21,7 @@
+ .TH WESNOTH_EDITOR 6 "Juni 2005" wesnoth_editor "Strijd om Wesnoth map editor"
+ 
+ .SH NAAM
+-Strijd om Wesnoth map editor
++wesnoth_editor \- Strijd om Wesnoth map editor
+ 
+ .SH OVERZICHT
+ \fBwesnoth_editor\fP
+Index: wesnoth-1.3.12/doc/man/pl/wesnoth_editor.6
+===================================================================
+--- wesnoth-1.3.12.orig/doc/man/pl/wesnoth_editor.6
++++ wesnoth-1.3.12/doc/man/pl/wesnoth_editor.6
+@@ -21,7 +21,7 @@
+ .TH WESNOTH_EDITOR 6 "Czerwiec 2005 r." wesnoth_editor "Edytor map do Bitwy o Wesnoth"
+ 
+ .SH NAZWA
+-Edytor map do Bitwy o Wesnoth
++wesnoth_editor \- Edytor map do Bitwy o Wesnoth
+ 
+ .SH SK?ADNIA
+ \fBwesnoth_editor\fP
+Index: wesnoth-1.3.12/doc/man/pt_BR/wesnoth_editor.6
+===================================================================
+--- wesnoth-1.3.12.orig/doc/man/pt_BR/wesnoth_editor.6
++++ wesnoth-1.3.12/doc/man/pt_BR/wesnoth_editor.6
+@@ -21,7 +21,7 @@
+ .TH WESNOTH_EDITOR 6 "Junho 2005" wesnoth_editor "Editor de mapas de Battle for Wesnoth"
+ 
+ .SH NOME
+-Editor de mapas de Battle for Wesnoth
++wesnoth_editor \- Editor de mapas de Battle for Wesnoth
+ 
+ .SH SINOPSE
+ \fBwesnoth_editor\fP
+Index: wesnoth-1.3.12/doc/man/ru/wesnoth_editor.6
+===================================================================
+--- wesnoth-1.3.12.orig/doc/man/ru/wesnoth_editor.6
++++ wesnoth-1.3.12/doc/man/ru/wesnoth_editor.6
+@@ -21,7 +21,7 @@
+ .TH WESNOTH_EDITOR 6 "éÀÎØ 2005" wesnoth_editor "òÅÄÁËÔÏÒ ËÁÒÔ ÄÌÑ ÉÇÒÙ âÉÔ×Á ÚÁ ÷ÅÓÎÏÔ"
+ 
+ .SH éíñ
+-òÅÄÁËÔÏÒ ËÁÒÔ ÄÌÑ ÉÇÒÙ âÉÔ×Á ÚÁ ÷ÅÓÎÏÔ
++wesnoth_editor \- òÅÄÁËÔÏÒ ËÁÒÔ ÄÌÑ ÉÇÒÙ âÉÔ×Á ÚÁ ÷ÅÓÎÏÔ
+ 
+ .SH ïâúïò
+ \fBwesnoth_editor\fP
+Index: wesnoth-1.3.12/doc/man/sk/wesnoth_editor.6
+===================================================================
+--- wesnoth-1.3.12.orig/doc/man/sk/wesnoth_editor.6
++++ wesnoth-1.3.12/doc/man/sk/wesnoth_editor.6
+@@ -21,7 +21,7 @@
+ .TH WESNOTH_EDITOR 6 "Jún 2005" wesnoth_editor "Editor máp pre Bitku o Wesnoth"
+ 
+ .SH NÁZOV
+-Editor máp pre Bitku o Wesnoth
++wesnoth_editor \- Editor máp pre Bitku o Wesnoth
+ 
+ .SH ZHRNUTIE
+ \fBwesnoth_editor\fP
+Index: wesnoth-1.3.12/doc/man/sr at latin/wesnoth_editor.6
+===================================================================
+--- wesnoth-1.3.12.orig/doc/man/sr at latin/wesnoth_editor.6
++++ wesnoth-1.3.12/doc/man/sr at latin/wesnoth_editor.6
+@@ -21,7 +21,7 @@
+ .TH WESNOTH_EDITOR 6 "Jun 2005" wesnoth_editor "Ure?iva? mapa Boja za Vesnot"
+ 
+ .SH IME
+-Ure?iva? mapa Boja za Vesnot
++wesnoth_editor \- Ure?iva? mapa Boja za Vesnot
+ 
+ .SH PREGLED
+ \fBwesnoth_editor\fP
+Index: wesnoth-1.3.12/doc/man/sv/wesnoth_editor.6
+===================================================================
+--- wesnoth-1.3.12.orig/doc/man/sv/wesnoth_editor.6
++++ wesnoth-1.3.12/doc/man/sv/wesnoth_editor.6
+@@ -21,7 +21,7 @@
+ .TH WESNOTH_EDITOR 6 "Juni 2005" wesnoth_editor "Kampen om Wesnoths karteditor"
+ 
+ .SH NAMN
+-Kampen om Wesnoths karteditor
++wesnoth_editor \- Kampen om Wesnoths karteditor
+ 
+ .SH SYNOPSIS
+ \fBwesnoth_editor\fP
+Index: wesnoth-1.3.12/doc/man/wesnoth_editor.6
+===================================================================
+--- wesnoth-1.3.12.orig/doc/man/wesnoth_editor.6
++++ wesnoth-1.3.12/doc/man/wesnoth_editor.6
+@@ -16,7 +16,7 @@
+ .TH WESNOTH_EDITOR 6 "June 2005" "wesnoth_editor" "Battle for Wesnoth map editor"
+ 
+ .SH NAME
+-Battle for Wesnoth map editor
++wesnoth_editor \- Battle for Wesnoth map editor
+ 
+ .SH SYNOPSIS
+ .B wesnoth_editor

Added: packages/branches/wesnoth/experimental/debian/patches/02_fix-desktop-files
===================================================================
--- packages/branches/wesnoth/experimental/debian/patches/02_fix-desktop-files	                        (rev 0)
+++ packages/branches/wesnoth/experimental/debian/patches/02_fix-desktop-files	2007-12-02 17:01:13 UTC (rev 4826)
@@ -0,0 +1,41 @@
+Author: Gerfried Fuchs <rhonda at debian.at>	vim:ft=diff:
+Description: remove obsoleted entries from .desktop files
+
+Index: wesnoth-1.3.12/icons/wesnoth.desktop
+===================================================================
+--- wesnoth-1.3.12.orig/icons/wesnoth.desktop
++++ wesnoth-1.3.12/icons/wesnoth.desktop
+@@ -1,6 +1,5 @@
+ [Desktop Entry]
+ Version=1.0
+-Encoding=UTF-8
+ Type=Application
+ Name=Battle for Wesnoth
+ Name[af]=Die Stryd vir Wesnoth
+@@ -45,7 +44,6 @@ Comment[sk]=Ťahová strategická hra z 
+ Comment[sr]=Фантазијска стратешка игра на потезе
+ Comment[sr at latin]=Fantazijska strateška igra na poteze
+ Icon=wesnoth-icon.png
+-FilePattern=wesnoth
+ TryExec=wesnoth
+ Exec=wesnoth
+ Categories=Game;StrategyGame;
+Index: wesnoth-1.3.12/icons/wesnoth_editor.desktop
+===================================================================
+--- wesnoth-1.3.12.orig/icons/wesnoth_editor.desktop
++++ wesnoth-1.3.12/icons/wesnoth_editor.desktop
+@@ -1,6 +1,5 @@
+ [Desktop Entry]
+ Version=1.0
+-Encoding=UTF-8
+ Type=Application
+ Name=Battle for Wesnoth Map Editor
+ Name[de]=Battle for Wesnoth Karteneditor
+@@ -15,7 +14,6 @@ Comment[de]=Ein Karteneditor für Battle
+ Comment[fr]=Un éditeur de cartes pour La Bataille pour Wesnoth
+ Comment[lt]=Žemėlapių redaktorius Mūšio dėl Wesnoth žemėlapiams
+ Icon=wesnoth_editor-icon.png
+-FilePattern=wesnoth_editor
+ TryExec=wesnoth_editor
+ Exec=wesnoth_editor
+ Categories=Game;StrategyGame;

Added: packages/branches/wesnoth/experimental/debian/patches/series
===================================================================
--- packages/branches/wesnoth/experimental/debian/patches/series	                        (rev 0)
+++ packages/branches/wesnoth/experimental/debian/patches/series	2007-12-02 17:01:13 UTC (rev 4826)
@@ -0,0 +1,2 @@
+01_fix-manpage
+02_fix-desktop-files

Modified: packages/branches/wesnoth/experimental/debian/rules
===================================================================
--- packages/branches/wesnoth/experimental/debian/rules	2007-12-01 17:33:43 UTC (rev 4825)
+++ packages/branches/wesnoth/experimental/debian/rules	2007-12-02 17:01:13 UTC (rev 4826)
@@ -1,20 +1,74 @@
 #!/usr/bin/make -f
+# debian/rules for wesnoth
 
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/autotools.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
 
-DEB_CONFIGURE_EXTRA_FLAGS := --bindir=/usr/games --with-localedir=/usr/share/locale --with-fifodir=/var/run/wesnothd --with-datadir-name=wesnoth --datadir=/usr/share/games --enable-editor --enable-server --enable-python --with-fribidi
-DEB_INSTALL_CHANGELOGS_ALL := changelog
+# This has to be exported to make some magic below work.
+export DH_OPTIONS
 
-common-install-arch::
-	DESTDIR=$(CURDIR)/debian/tmp/ \
-		$(MAKE) install-exec
+# These are used for cross-compiling and for saving the configure script
+# from having to guess our platform (since we know it already)
+DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
-	DESTDIR=$(CURDIR)/debian/tmp/ \
-		$(MAKE) -C doc/man install
+# calculate the version strings
+MAJOR_VERSION = $(shell dpkg-parsechangelog | grep "^Version:" | cut -d" " -f2 | cut -d. -f1)
+MINOR_VERSION = $(shell dpkg-parsechangelog | grep "^Version:" | cut -d" " -f2 | cut -d. -f2)
+STABLE_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION)
+NEXT_VERSION = $(MAJOR_VERSION).$(shell echo $$(( $(MINOR_VERSION) + 1 )) )
 
-common-install-indep::
+include /usr/share/quilt/quilt.make
+
+clean: unpatch
+	dh_testdir
+	dh_testroot
+	rm -f build-arch-stamp build-indep-stamp 
+	# Add here commands to clean up after the build process.
+	[ ! -f Makefile ] || $(MAKE) distclean
+	find po -name "*.gmo" -exec rm -f {} \;
+	find po -name "stamp-po" -exec rm -f {} \;
+	rm -f config.sub config.guess
+	dh_clean 
+
+
+config.status: configure patch
+	dh_testdir
+	# Add here commands to configure the package.
+	./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \
+		--prefix=/usr --mandir=\$${prefix}/share/man \
+		--bindir=\$${prefix}/games --with-datadir-name=wesnoth \
+		--with-localedir=\$${prefix}/share/locale \
+		--with-fifodir=/var/run/wesnothd --datadir=\$${prefix}/share/games \
+		--enable-editor --enable-server --enable-python --with-fribidi \
+		CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs"
+
+
+#Architecture 
+build: build-arch build-indep
+
+build-arch: build-arch-stamp
+build-arch-stamp: config.status
+	$(MAKE) 
+	touch $@
+
+
+build-indep: build-indep-stamp
+build-indep-stamp:  config.status
+	# Add here commands to compile the indep part of the package.
+	#$(MAKE) doc
+	touch $@
+
+
+install: install-indep install-arch
+install-indep:
+	dh_testdir
+	dh_testroot
+	dh_clean -k -i 
+	dh_installdirs -i
+
+	# Add here commands to install the indep part of the package into
+	# debian/<package>-doc.
 	DESTDIR=$(CURDIR)/debian/tmp/ \
 		$(MAKE) install-data-local \
 			datadir=/usr/share \
@@ -24,6 +78,55 @@
 		$(MAKE) -C po install \
 			localedir=/usr/share/locale
 
-clean::
-	find po -name "*.gmo" -exec rm -f {} \;
-	find po -name "stamp-po" -exec rm -f {} \;
+	dh_install -i
+
+
+install-arch:
+	dh_testdir
+	dh_testroot
+	dh_clean -k -s 
+	dh_installdirs -s
+	# Add here commands to install the arch part of the package into 
+	# debian/tmp.
+	$(MAKE) DESTDIR=$(CURDIR)/debian/tmp install
+	DESTDIR=$(CURDIR)/debian/tmp \
+		$(MAKE) install-exec
+	DESTDIR=$(CURDIR)/debian/tmp \
+		$(MAKE) -C doc/man install
+	dh_install -s
+# Must not depend on anything. This is to be called by
+# binary-arch/binary-indep
+# in another 'make' thread.
+binary-common:
+	dh_testdir
+	dh_testroot
+	dh_installchangelogs changelog
+	dh_installdocs --all README
+	dh_installexamples
+	dh_installmenu
+#	dh_python
+	dh_installinit
+	dh_installman
+	dh_link
+	dh_strip
+	dh_compress 
+	dh_fixperms
+	dh_makeshlibs
+	dh_installdeb
+	dh_shlibdeps
+	dh_gencontrol -- -Vwesnoth:Stable-Version=$(STABLE_VERSION) -Vwesnoth:Next-Version=$(NEXT_VERSION)
+	dh_md5sums
+	dh_builddeb
+
+
+# Build architecture independant packages using the common target.
+binary-indep: build-indep install-indep
+	$(MAKE) -f debian/rules DH_OPTIONS=-i binary-common
+
+# Build architecture dependant packages using the common target.
+binary-arch: build-arch install-arch
+	$(MAKE) -f debian/rules DH_OPTIONS=-s binary-common
+
+
+binary: binary-arch binary-indep
+.PHONY: build clean binary-indep binary-arch binary install install-indep install-arch 

Modified: packages/branches/wesnoth/experimental/debian/wesnoth-server.init.d
===================================================================
--- packages/branches/wesnoth/experimental/debian/wesnoth-server.init.d	2007-12-01 17:33:43 UTC (rev 4825)
+++ packages/branches/wesnoth/experimental/debian/wesnoth-server.init.d	2007-12-02 17:01:13 UTC (rev 4826)
@@ -41,22 +41,29 @@
 	return 0
 }
 
+wesnoth_reload() {
+	start-stop-daemon --stop --signal 1 --quiet --pidfile $PIDFILE
+}
+
 case "$1" in
   start)
-	log_begin_msg "Starting $DESC: $NAME"
+	log_daemon_msg "Starting $DESC" "$NAME"
 	wesnoth_start
 	log_end_msg $?
 	;;
   stop)
-	log_begin_msg "Stopping $DESC: $NAME"
+	log_daemon_msg "Stopping $DESC" "$NAME"
 	wesnoth_stop
 	log_end_msg $?
 	;;
   reload)
+  	log_daemon_msg "Reloading $DESC" "$NAME"
+  	wesnoth_reload
+	log_end_msg $?
   	;;
 
   restart|force-reload)
-	log_begin_msg "Restarting $DESC: $NAME"
+	log_daemon_msg "Restarting $DESC" "$NAME"
 	wesnoth_stop && sleep 1 && wesnoth_start
 	log_end_msg $?
 	;;

More information about the Pkg-games-commits mailing list