r4785 - packages/trunk/wesnoth/debian
Gerfried Fuchs
alfie at alioth.debian.org
Wed Nov 28 07:30:28 UTC 2007
Author: alfie
Date: 2007-11-28 07:30:28 +0000 (Wed, 28 Nov 2007)
New Revision: 4785
Modified:
packages/trunk/wesnoth/debian/changelog
packages/trunk/wesnoth/debian/compat
packages/trunk/wesnoth/debian/control
packages/trunk/wesnoth/debian/rules
packages/trunk/wesnoth/debian/wesnoth-server.init.d
Log:
* New upstream release with a fix for a directory traversal problem in the
WML engine.
* Server now supports reloading of config on SIGHUP, adding support for that
to the init.d script.
* (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
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 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.
Modified: packages/trunk/wesnoth/debian/changelog
===================================================================
--- packages/trunk/wesnoth/debian/changelog 2007-11-27 22:07:20 UTC (rev 4784)
+++ packages/trunk/wesnoth/debian/changelog 2007-11-28 07:30:28 UTC (rev 4785)
@@ -1,8 +1,25 @@
-wesnoth (1:1.2.7-3) unstable; urgency=low
+wesnoth (1:1.2.8-1) UNRELEASED; urgency=low
+ * New upstream release with a fix for a directory traversal problem in the
+ WML engine.
+ * 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
+ 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 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.
- --
+ -- Gerfried Fuchs <rhonda at debian.at> Wed, 28 Nov 2007 08:00:19 +0100
wesnoth (1:1.2.7-2) unstable; urgency=low
Modified: packages/trunk/wesnoth/debian/compat
===================================================================
--- packages/trunk/wesnoth/debian/compat 2007-11-27 22:07:20 UTC (rev 4784)
+++ packages/trunk/wesnoth/debian/compat 2007-11-28 07:30:28 UTC (rev 4785)
@@ -1 +1 @@
-4
+5
Modified: packages/trunk/wesnoth/debian/control
===================================================================
--- packages/trunk/wesnoth/debian/control 2007-11-27 22:07:20 UTC (rev 4784)
+++ packages/trunk/wesnoth/debian/control 2007-11-28 07:30:28 UTC (rev 4785)
@@ -2,26 +2,42 @@
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), 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://www.wesnoth.org/
-XS-Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/wesnoth/
-XS-Vcs-Browser: http://svn.debian.org/wsvn/pkg-games/packages/trunk/wesnoth/?op=log
+Homepage: http://wesnoth.org/
+Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/wesnoth/
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-games/packages/trunk/wesnoth/?op=log
Package: wesnoth
Architecture: any
Depends: ${shlibs:Depends}, wesnoth-data (= ${source:Version})
+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
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 (= ${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})
+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
+ the official campaigns installed.
+ .
+ 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-data
Architecture: all
Depends: ttf-dejavu
-Recommends: wesnoth-music, wesnoth-httt, wesnoth-trow, wesnoth-utbs, wesnoth-ttb, wesnoth-tsg, wesnoth-ei
+Recommends: wesnoth-music
Suggests: ttf-sazanami-gothic
Description: data files for Wesnoth
This package contains the sound files and graphics for Wesnoth.
@@ -33,7 +49,6 @@
Package: wesnoth-music
Architecture: all
-Replaces: wesnoth-data (<< 0.7.5)
Description: music files for Wesnoth
This package contains the music files for Wesnoth.
.
@@ -65,9 +80,9 @@
from one scenario to the next in a campaign.
Package: wesnoth-httt
+Depends: wesnoth-data (>= ${wesnoth:Stable-Version}), wesnoth-data (<< ${wesnoth:Next-Version})
Architecture: all
Depends: wesnoth
-Replaces: wesnoth-data (<< 0.9.1)
Description: Heir to the Throne official campaign for Wesnoth
This package contains the Heir to the Throne campaign for Wesnoth.
.
@@ -77,6 +92,7 @@
from one scenario to the next in a campaign.
Package: wesnoth-tsg
+Depends: wesnoth-data (>= ${wesnoth:Stable-Version}), wesnoth-data (<< ${wesnoth:Next-Version})
Architecture: all
Depends: wesnoth
Description: The South Guard official campaign for Wesnoth
@@ -88,9 +104,9 @@
from one scenario to the next in a campaign.
Package: wesnoth-trow
+Depends: wesnoth-data (>= ${wesnoth:Stable-Version}), wesnoth-data (<< ${wesnoth:Next-Version})
Architecture: all
Depends: wesnoth
-Replaces: wesnoth-data (<< 0.9.1)
Description: The Rise of Wesnoth official campaign for Wesnoth
This package contains the Rise of Wesnoth campaign for Wesnoth.
.
@@ -100,6 +116,7 @@
from one scenario to the next in a campaign.
Package: wesnoth-ttb
+Depends: wesnoth-data (>= ${wesnoth:Stable-Version}), wesnoth-data (<< ${wesnoth:Next-Version})
Architecture: all
Depends: wesnoth
Description: A Tale of Two Brothers official campaign for Wesnoth
@@ -111,9 +128,9 @@
from one scenario to the next in a campaign.
Package: wesnoth-ei
+Depends: wesnoth-data (>= ${wesnoth:Stable-Version}), wesnoth-data (<< ${wesnoth:Next-Version})
Architecture: all
Depends: wesnoth
-Replaces: wesnoth-data (<< 0.9.1)
Description: Eastern Invasion official campaign for Wesnoth
This package contains the Eastern Invasion campaign for Wesnoth.
.
@@ -123,6 +140,7 @@
from one scenario to the next in a campaign.
Package: wesnoth-utbs
+Depends: wesnoth-data (>= ${wesnoth:Stable-Version}), wesnoth-data (<< ${wesnoth:Next-Version})
Architecture: all
Depends: wesnoth
Description: Under the Burning Suns official campaign for Wesnoth
Modified: packages/trunk/wesnoth/debian/rules
===================================================================
--- packages/trunk/wesnoth/debian/rules 2007-11-27 22:07:20 UTC (rev 4784)
+++ packages/trunk/wesnoth/debian/rules 2007-11-28 07:30:28 UTC (rev 4785)
@@ -1,20 +1,69 @@
#!/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
+STABLE_VERSION = $(shell dpkg-parsechangelog | grep "^Version:" | cut -d" " -f2 | cut -d: -f2 | cut -d. -f1-2)
-common-install-indep::
+
+clean:
+ 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
+ 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 +73,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/wesnoth \
+ $(MAKE) install-exec
+ DESTDIR=$(CURDIR)/debian/wesnoth \
+ $(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
+ 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/trunk/wesnoth/debian/wesnoth-server.init.d
===================================================================
--- packages/trunk/wesnoth/debian/wesnoth-server.init.d 2007-11-27 22:07:20 UTC (rev 4784)
+++ packages/trunk/wesnoth/debian/wesnoth-server.init.d 2007-11-28 07:30:28 UTC (rev 4785)
@@ -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