Author: alfie
Date: 2007-11-29 14:24:56 +0000 (Thu, 29 Nov 2007)
New Revision: 4795
Added:
packages/trunk/wesnoth/debian/patches/
packages/trunk/wesnoth/debian/patches/01_fix-manpage
packages/trunk/wesnoth/debian/patches/02_fix-desktop-files
packages/trunk/wesnoth/debian/patches/series
Modified:
packages/trunk/wesnoth/debian/changelog
packages/trunk/wesnoth/debian/control
packages/trunk/wesnoth/debian/rules
Log:
Add quilt patch management support and two patches for fixing wesnoth_editor
manpages and fixing .desktop files
Do depend on >= ${binary:Version, << ${binary:Version}.~ for binNMUability in
wesnoth-all
Use wesnoth instead of wesnoth-data for Campaign dependencies
Document CVE number in changelog
Make the substvars version code in debian/rules actually work properly
Modified: packages/trunk/wesnoth/debian/changelog
===================================================================
--- packages/trunk/wesnoth/debian/changelog 2007-11-29 10:10:50 UTC (rev
4794)
+++ packages/trunk/wesnoth/debian/changelog 2007-11-29 14:24:56 UTC (rev
4795)
@@ -1,25 +1,28 @@
-wesnoth (1:1.2.8-1) UNRELEASED; urgency=low
+wesnoth (1:1.2.8-1) unstable; urgency=medium
* New upstream release with a fix for a directory traversal problem in the
- WML engine.
+ 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.
+ * 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.
- * Make distclean depending on an existing Makefile.
* 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 <[EMAIL PROTECTED]> Wed, 28 Nov 2007 08:00:19 +0100
+ -- Gerfried Fuchs <[EMAIL PROTECTED]> Wed, 28 Nov 2007 20:10:28 +0100
wesnoth (1:1.2.7-2) unstable; urgency=low
Modified: packages/trunk/wesnoth/debian/control
===================================================================
--- packages/trunk/wesnoth/debian/control 2007-11-29 10:10:50 UTC (rev
4794)
+++ packages/trunk/wesnoth/debian/control 2007-11-29 14:24:56 UTC (rev
4795)
@@ -2,7 +2,7 @@
Section: games
Priority: optional
Maintainer: Isaac Clerencia <[EMAIL PROTECTED]>
-Build-Depends: debhelper (>= 5), libsdl-image1.2-dev, libfreetype6-dev,
+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
@@ -23,7 +23,12 @@
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})
+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})
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
@@ -80,9 +85,8 @@
from one scenario to the next in a campaign.
Package: wesnoth-httt
-Depends: wesnoth-data (>= ${wesnoth:Stable-Version}), wesnoth-data (<<
${wesnoth:Next-Version})
+Depends: wesnoth (>= ${wesnoth:Stable-Version}), wesnoth (<<
${wesnoth:Next-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,9 +96,8 @@
from one scenario to the next in a campaign.
Package: wesnoth-tsg
-Depends: wesnoth-data (>= ${wesnoth:Stable-Version}), wesnoth-data (<<
${wesnoth:Next-Version})
+Depends: wesnoth (>= ${wesnoth:Stable-Version}), wesnoth (<<
${wesnoth:Next-Version})
Architecture: all
-Depends: wesnoth
Description: The South Guard official campaign for Wesnoth
This package contains The South Guard campaign for Wesnoth.
.
@@ -104,9 +107,8 @@
from one scenario to the next in a campaign.
Package: wesnoth-trow
-Depends: wesnoth-data (>= ${wesnoth:Stable-Version}), wesnoth-data (<<
${wesnoth:Next-Version})
+Depends: wesnoth (>= ${wesnoth:Stable-Version}), wesnoth (<<
${wesnoth:Next-Version})
Architecture: all
-Depends: wesnoth
Description: The Rise of Wesnoth official campaign for Wesnoth
This package contains the Rise of Wesnoth campaign for Wesnoth.
.
@@ -116,9 +118,8 @@
from one scenario to the next in a campaign.
Package: wesnoth-ttb
-Depends: wesnoth-data (>= ${wesnoth:Stable-Version}), wesnoth-data (<<
${wesnoth:Next-Version})
+Depends: wesnoth (>= ${wesnoth:Stable-Version}), wesnoth (<<
${wesnoth:Next-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.
.
@@ -128,9 +129,8 @@
from one scenario to the next in a campaign.
Package: wesnoth-ei
-Depends: wesnoth-data (>= ${wesnoth:Stable-Version}), wesnoth-data (<<
${wesnoth:Next-Version})
+Depends: wesnoth (>= ${wesnoth:Stable-Version}), wesnoth (<<
${wesnoth:Next-Version})
Architecture: all
-Depends: wesnoth
Description: Eastern Invasion official campaign for Wesnoth
This package contains the Eastern Invasion campaign for Wesnoth.
.
@@ -140,9 +140,8 @@
from one scenario to the next in a campaign.
Package: wesnoth-utbs
-Depends: wesnoth-data (>= ${wesnoth:Stable-Version}), wesnoth-data (<<
${wesnoth:Next-Version})
+Depends: wesnoth (>= ${wesnoth:Stable-Version}), wesnoth (<<
${wesnoth:Next-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.
.
Added: packages/trunk/wesnoth/debian/patches/01_fix-manpage
===================================================================
--- packages/trunk/wesnoth/debian/patches/01_fix-manpage
(rev 0)
+++ packages/trunk/wesnoth/debian/patches/01_fix-manpage 2007-11-29
14:24:56 UTC (rev 4795)
@@ -0,0 +1,159 @@
+Author: Gerfried Fuchs <[EMAIL PROTECTED]> vim:ft=diff:
+Description: fix the wesnoth_editor manpage NAME syntax
+
+Index: wesnoth-1.2.8/doc/man/cs/wesnoth_editor.6
+===================================================================
+--- wesnoth-1.2.8.orig/doc/man/cs/wesnoth_editor.6
++++ wesnoth-1.2.8/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.2.8/doc/man/de/wesnoth_editor.6
+===================================================================
+--- wesnoth-1.2.8.orig/doc/man/de/wesnoth_editor.6
++++ wesnoth-1.2.8/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.2.8/doc/man/en_GB/wesnoth_editor.6
+===================================================================
+--- wesnoth-1.2.8.orig/doc/man/en_GB/wesnoth_editor.6
++++ wesnoth-1.2.8/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.2.8/doc/man/fr/wesnoth_editor.6
+===================================================================
+--- wesnoth-1.2.8.orig/doc/man/fr/wesnoth_editor.6
++++ wesnoth-1.2.8/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.2.8/doc/man/it/wesnoth_editor.6
+===================================================================
+--- wesnoth-1.2.8.orig/doc/man/it/wesnoth_editor.6
++++ wesnoth-1.2.8/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.2.8/doc/man/ja/wesnoth_editor.6
+===================================================================
+--- wesnoth-1.2.8.orig/doc/man/ja/wesnoth_editor.6
++++ wesnoth-1.2.8/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.2.8/doc/man/nl/wesnoth_editor.6
+===================================================================
+--- wesnoth-1.2.8.orig/doc/man/nl/wesnoth_editor.6
++++ wesnoth-1.2.8/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.2.8/doc/man/pt_BR/wesnoth_editor.6
+===================================================================
+--- wesnoth-1.2.8.orig/doc/man/pt_BR/wesnoth_editor.6
++++ wesnoth-1.2.8/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.2.8/doc/man/ru/wesnoth_editor.6
+===================================================================
+--- wesnoth-1.2.8.orig/doc/man/ru/wesnoth_editor.6
++++ wesnoth-1.2.8/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.2.8/doc/man/sk/wesnoth_editor.6
+===================================================================
+--- wesnoth-1.2.8.orig/doc/man/sk/wesnoth_editor.6
++++ wesnoth-1.2.8/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.2.8/doc/man/sv/wesnoth_editor.6
+===================================================================
+--- wesnoth-1.2.8.orig/doc/man/sv/wesnoth_editor.6
++++ wesnoth-1.2.8/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.2.8/doc/man/wesnoth_editor.6
+===================================================================
+--- wesnoth-1.2.8.orig/doc/man/wesnoth_editor.6
++++ wesnoth-1.2.8/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/trunk/wesnoth/debian/patches/02_fix-desktop-files
===================================================================
--- packages/trunk/wesnoth/debian/patches/02_fix-desktop-files
(rev 0)
+++ packages/trunk/wesnoth/debian/patches/02_fix-desktop-files 2007-11-29
14:24:56 UTC (rev 4795)
@@ -0,0 +1,41 @@
+Author: Gerfried Fuchs <[EMAIL PROTECTED]> vim:ft=diff:
+Description: remove obsoleted entries from .desktop files
+
+Index: wesnoth-1.2.8/icons/wesnoth.desktop
+===================================================================
+--- wesnoth-1.2.8.orig/icons/wesnoth.desktop
++++ wesnoth-1.2.8/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
+@@ -41,7 +40,6 @@ Comment[sk]=Ťahová strategická hra z
+ Comment[sr]=Фантазијска стратешка игра на потезе
+ [EMAIL PROTECTED] strateška igra na poteze
+ Icon=wesnoth-icon.png
+-FilePattern=wesnoth
+ TryExec=wesnoth
+ Exec=wesnoth
+ Categories=Game;StrategyGame;
+Index: wesnoth-1.2.8/icons/wesnoth_editor.desktop
+===================================================================
+--- wesnoth-1.2.8.orig/icons/wesnoth_editor.desktop
++++ wesnoth-1.2.8/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
+@@ -12,7 +11,6 @@ Comment=A map editor for Battle for Wesn
+ Comment[de]=Ein Karteneditor für Battle for Wesnoth
+ Comment[fr]=Un éditeur de cartes pour La Bataille pour Wesnoth
+ Icon=wesnoth_editor-icon.png
+-FilePattern=wesnoth_editor
+ TryExec=wesnoth_editor
+ Exec=wesnoth_editor
+ Categories=Game;StrategyGame;
Added: packages/trunk/wesnoth/debian/patches/series
===================================================================
--- packages/trunk/wesnoth/debian/patches/series
(rev 0)
+++ packages/trunk/wesnoth/debian/patches/series 2007-11-29 14:24:56 UTC
(rev 4795)
@@ -0,0 +1,2 @@
+01_fix-manpage
+02_fix-desktop-files
Modified: packages/trunk/wesnoth/debian/rules
===================================================================
--- packages/trunk/wesnoth/debian/rules 2007-11-29 10:10:50 UTC (rev 4794)
+++ packages/trunk/wesnoth/debian/rules 2007-11-29 14:24:56 UTC (rev 4795)
@@ -12,10 +12,15 @@
DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-STABLE_VERSION = $(shell dpkg-parsechangelog | grep "^Version:" | cut -d" "
-f2 | cut -d: -f2 | cut -d. -f1-2)
+# 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 )) )
+include /usr/share/quilt/quilt.make
-clean:
+clean: unpatch
dh_testdir
dh_testroot
rm -f build-arch-stamp build-indep-stamp
@@ -27,7 +32,7 @@
dh_clean
-config.status: configure
+config.status: configure patch
dh_testdir
# Add here commands to configure the package.
./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \
@@ -84,9 +89,9 @@
# Add here commands to install the arch part of the package into
# debian/tmp.
$(MAKE) DESTDIR=$(CURDIR)/debian/tmp install
- DESTDIR=$(CURDIR)/debian/wesnoth \
+ DESTDIR=$(CURDIR)/debian/tmp \
$(MAKE) install-exec
- DESTDIR=$(CURDIR)/debian/wesnoth \
+ DESTDIR=$(CURDIR)/debian/tmp \
$(MAKE) -C doc/man install
dh_install -s
# Must not depend on anything. This is to be called by
@@ -109,7 +114,7 @@
dh_makeshlibs
dh_installdeb
dh_shlibdeps
- dh_gencontrol
+ dh_gencontrol -- -Vwesnoth:Stable-Version=$(STABLE_VERSION)
-Vwesnoth:Next-Version=$(NEXT_VERSION)
dh_md5sums
dh_builddeb
_______________________________________________
Pkg-games-commits mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits
