[SCM] Debian packaging of wesnoth branch, lenny-backports, updated. debian/1.8.5-1-25-gae22140
Gerfried Fuchs
rhonda at debian.at
Mon Oct 11 17:11:31 UTC 2010
The following commit has been merged in the lenny-backports branch:
commit 15ba36a39f2599e261fc404162077753af55de0b
Merge: 089af41cd49a6b434770e90466a0b338ac20c86d aa9cacadde901f7991a0ed0d4833391d6e31ae20
Author: Gerfried Fuchs <rhonda at debian.at>
Date: Mon Oct 11 19:07:25 2010 +0200
Merge branch 'master' into lenny-backports
diff --combined debian/changelog
index ab2c688,44105d0..a96ed0e
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,13 -1,84 +1,94 @@@
+ wesnoth-1.8 (1:1.8.5-1) unstable; urgency=low
+
+ * New upstream stable release.
+
+ -- Gerfried Fuchs <rhonda at debian.at> Thu, 30 Sep 2010 08:47:42 +0200
+
+ wesnoth-1.8 (1:1.8.4-1) unstable; urgency=low
+
+ * New upstream stable release.
+ * Also create metapackages for wesnoth-music and transitional packages for
+ wesnoth-editor and wesnoth-all to ease upgrades (closes: #594317)
+
+ -- Gerfried Fuchs <rhonda at debian.at> Sun, 26 Sep 2010 22:19:05 +0200
+
+ wesnoth-1.8 (1:1.8.3-5) unstable; urgency=low
+
+ * Brown paper bag release.
+ * When changing from directory to symlink in wesnoth and wesnoth-core do use
+ wesnoth-1.8-data, not the non-existing wesnoth-data one. Also remove the
+ now potential existing wrong symlink we might have introduced through -4
+ upgrades. Thanks to my proof reader Julien Cristau again.
+ * Also switch the version comparison to lt-nl instead of le-nl so that the
+ check won't trigger on reinstall, also noticed by Julien.
+
+ -- Gerfried Fuchs <rhonda at debian.at> Thu, 19 Aug 2010 21:18:07 +0200
+
+ wesnoth-1.8 (1:1.8.3-4) unstable; urgency=low
+
+ * Ship default file for the server init script and adapt the init script to
+ use the script name instead of the binary name for the default file.
+ * Fix debian/branchcheck helper script. Noticed by Julien Cristau, thanks.
+ * Add postinst scripts for wesnoth and wesnoth-core packages that turn the
+ doc directory into symlinks. Also noticed by Julien Cristau, thanks!
+ * Improve a package description by suggestion of Julien Cristau.
+ * Add NEWS entry about the new handling of things.
+
+ -- Gerfried Fuchs <rhonda at debian.at> Wed, 18 Aug 2010 22:57:00 +0200
+
+ wesnoth-1.8 (1:1.8.3-3) unstable; urgency=low
+
+ * Make wesnoth and wesnoth-core packages directly depend on
+ wesnoth-1.8-core.
+ * Change debianization licensing to WTFPLv2.
+ * Use same commandline in the menu file like in the application file for the
+ editor.
+ * Bump Standards-Version to 3.9.1.
+ * Fix spelling errors in control file.
+ * Add lintian override for diversion-for-unknown-file.
+ * Move update-alternatives --remove to prerm.
+
+ -- Gerfried Fuchs <rhonda at debian.at> Sun, 15 Aug 2010 22:57:20 +0200
+
+ wesnoth-1.8 (1:1.8.3-2) unstable; urgency=low
+
+ * Adjust LSB init.d headers to match runlinks.
+ * Update wesnoth-1.8-core package description, synchronize spacing and
+ ordering in other package descriptions.
+ * Bump to Standards-Version 3.9.0.
+ * Use BRANODOT as placeholder in branchcheck script (for alternative
+ priority)
+ * Use alternative handling and dpkg-divert for wesnoth binaries and
+ manpages.
+ * Add wesnoth and wesnoth-core meta packages depending on the corresponding
+ branch package (closes: #586291)
+ * Call patch and unpatch explicitly instead of having them as dependency.
+ This applies the patches again (closes: #588712, LP: #610056)
+ * New patch wesnothd-name to make the client search for wesnothd-1.8 instead
+ of only wesnothd.
+
+ -- Gerfried Fuchs <rhonda at debian.at> Fri, 13 Aug 2010 21:29:26 +0200
+
+ wesnoth-1.8 (1:1.8.3-1) unstable; urgency=low
+
+ * New upstream release
+ * Really enable DEB_BUILD_OPTIONS="parallel=X" in debian/rules.
+ * unpatch after cleaning, not before.
+ * Have its own configure target.
+ * Put make depends on build where it belongs.
+
+ -- Gerfried Fuchs <rhonda at debian.at> Tue, 06 Jul 2010 17:42:53 +0200
+
+wesnoth-1.8 (1:1.8.2-1~bpo50+1) lenny-backports; urgency=low
+
+ * Rebuild for lenny-backports.
+ * Old changes:
+ - Switch back wqy-zenhei to symlink to ttf file and make use of the lenny
+ package.
+ - Use versioned 1.35 Build-Depends for boost libraries which are in lenny.
+
+ -- Gerfried Fuchs <rhonda at debian.at> Sat, 12 Jun 2010 19:55:58 +0200
+
wesnoth-1.8 (1:1.8.2-1) unstable; urgency=low
* New upstream stable release.
@@@ -18,16 -89,6 +99,16 @@@
-- Gerfried Fuchs <rhonda at debian.at> Tue, 01 Jun 2010 21:16:42 +0200
+wesnoth-1.8 (1:1.8.1-1~bpo50+1) lenny-backports; urgency=low
+
+ * Rebuild for lenny-backports.
+ * Dig up ancient backports change:
+ - Switch back wqy-zenhei to symlink to ttf file and make use of the lenny
+ package.
+ * Use versioned 1.35 Build-Depends for boost libraries which are in lenny.
+
+ -- Gerfried Fuchs <rhonda at debian.at> Mon, 03 May 2010 21:59:05 +0200
+
wesnoth-1.8 (1:1.8.1-1) unstable; urgency=low
* New upstream stable release.
diff --combined debian/control
index ef4029f,a341bfb..6ad61d5
--- a/debian/control
+++ b/debian/control
@@@ -5,9 -5,9 +5,9 @@@ Maintainer: Debian Games Team <pkg-game
Build-Depends: debhelper (>= 7), quilt, libsdl-image1.2-dev, libfreetype6-dev,
libsdl-mixer1.2-dev, libsdl-net1.2-dev, libfribidi-dev, libsdl1.2-dev,
libsdl-ttf2.0-dev (>= 2.0.8), python-support, libdbus-1-dev,
- libboost-iostreams-dev, libboost-test-dev, libboost-regex-dev,
- libboost-serialization-dev, libpango1.0-dev, automake, liblua5.1-0-dev
+ libboost-iostreams1.35-dev, libboost-test1.35-dev, libboost-regex1.35-dev,
+ libboost-serialization1.35-dev, libpango1.0-dev, automake, liblua5.1-0-dev
- Standards-Version: 3.8.4
+ Standards-Version: 3.9.1
Uploaders: Gerfried Fuchs <rhonda at debian.at>
Homepage: http://wesnoth.org/
Vcs-Git: git://git.debian.org/git/pkg-games/wesnoth.git
@@@ -16,7 -16,7 +16,7 @@@ Vcs-Browser: http://git.debian.org/?p=p
Package: wesnoth-1.8-data
Architecture: all
Depends: ${misc:Depends}, ttf-dejavu
-Recommends: ttf-wqy-zenhei (>= 0.8.38-1)
+Recommends: ttf-wqy-zenhei
Suggests: wesnoth-1.8-music
Description: data files for Wesnoth (branch 1.8)
This package contains the sound files and graphics for Wesnoth. It is required
@@@ -33,16 -33,44 +33,44 @@@ Depends: ${misc:Depends}, ${shlibs:Depe
wesnoth-1.8-data (= ${source:Version})
Suggests: wesnoth
Description: fantasy turn-based strategy game (branch 1.8)
+ This package contains the main program for wesnoth. It can be used to play
+ multiplayer games. If you want to play campaigns you will have to install
+ them individually, but if you prefer to have all the official campaigns
+ installed please be advised to install the wesnoth-1.8 package which depends
+ on all of them.
+ .
+ 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-core
+ Architecture: all
+ Depends: ${misc:Depends}, wesnoth-1.8-core (>= ${binary:Version}),
+ wesnoth-1.8-data (= ${source:Version})
+ Suggests: wesnoth
+ Description: fantasy turn-based strategy game (metapackage)
+ This metapackage pulls in the core wesnoth package which allows you to play
+ using the latest stable version.
+ .
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-editor
+ Architecture: all
+ Depends: ${misc:Depends}, wesnoth-1.8-core (>= ${binary:Version}),
+ wesnoth-1.8-data (= ${source:Version})
+ Description: map editor for Wesnoth (transitional package)
+ This transitional package pulls in the core wesnoth package which now has an
+ included map editor. There is no standalone version anymore. You can safely
+ remove this package after the upgrade.
.
- Please note that this package recommends only three of the official campaigns,
- 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.
+ 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-1.8-dbg
Section: debug
@@@ -51,12 -79,12 +79,12 @@@ Priority: extr
Depends: ${misc:Depends}, wesnoth-1.8-core (= ${binary:Version}),
wesnoth-1.8-data (= ${source:Version})
Description: fantasy turn-based strategy game (debugging symbols for branch 1.8)
+ This package contains the debugging symbols for the wesnoth binaries.
+ .
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 contains the debugging symbols for the wesnoth binaries.
Package: wesnoth-1.8
Architecture: all
@@@ -83,10 -111,40 +111,40 @@@ Description: fantasy turn-based strateg
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-1.8-server package), most helpful if you always
- want to have all the official campaigns installed. If you only want to play
+ want to have all the official campaigns 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-1.8-core package and
- the corresponding campaign packages.
+ the wanted 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: ${misc:Depends}, wesnoth (= ${source:Version}),
+ wesnoth-1.8-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.8 (>= ${binary:Version}),
+ wesnoth-1.8-data (= ${source:Version})
+ Description: fantasy turn-based strategy game - complete suite (metapackage)
+ This metapackage pulls in the complete set of the latest stable version, most
+ helpful if you always want to have all the official campaigns 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
+ wanted 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
@@@ -97,7 -155,7 +155,7 @@@ Package: wesnoth-1.8-musi
Architecture: all
Depends: ${misc:Depends}
Description: music files for Wesnoth (branch 1.8)
- This package contains the music files for Wesnoth. It is not required but
+ This package contains the music files for Wesnoth. It is not required but
gives nice background music and encouraged.
.
Battle for control of villages, using variety of units which have advantages
@@@ -105,11 -163,24 +163,24 @@@
of attacks. Units gain experience and advance levels, and are carried over
from one scenario to the next in a campaign.
+ Package: wesnoth-music
+ Architecture: all
+ Depends: ${misc:Depends}, wesnoth-1.8-music (= ${source:Version}),
+ wesnoth-1.8-data (= ${source:Version})
+ Description: music files for Wesnoth (metapackage)
+ This metapackage pulls in the music package for use with the latest stable
+ version of wesnoth.
+ .
+ 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-1.8-server
Architecture: any
Depends: ${misc:Depends}, ${shlibs:Depends}, lsb-base
Description: multiplayer network server for Wesnoth (branch 1.8)
- This package contains the multiplayer network server for Wesnoth. You need it
+ This package contains the multiplayer network server for Wesnoth. You need it
if you want to host multiplayer games on your computer and don't want to use
the official servers.
.
@@@ -126,8 -197,8 +197,8 @@@ Enhances: wesnoth-1.8-cor
Description: tools for campaign developers for Wesnoth (branch 1.8)
This package contains various tools for Wesnoth that are especially useful for
campaign developers, including but not limited to scripts supporting the
- generation and checking of WML (Wesnoth Markup Language). You can find them in
- the directory /usr/share/games/wesnoth/1.8/data/tools
+ generation and checking of WML (Wesnoth Markup Language). You can find them
+ in the directory /usr/share/games/wesnoth/1.8/data/tools
after installation of the package.
.
Battle for control of villages, using variety of units which have advantages
diff --combined debian/rules
index d99655a,d0b7235..005b9d2
--- a/debian/rules
+++ b/debian/rules
@@@ -1,7 -1,7 +1,7 @@@
#!/usr/bin/make -f
# debian/rules for wesnoth
# copyright 2007-2010 by Gerfried Fuchs <rhonda at debian.at>
- # Licenced under BSD style
+ # Licenced under WTFPLv2
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
@@@ -20,11 -20,10 +20,10 @@@ ifneq (,$(filter noopt,$(DEB_BUILD_OPTI
else
CFLAGS += -O2
endif
- ## disabled for the time being again - debian/rules need to get rewritten
- ## ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
- ## NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
- ## MAKEFLAGS += -j$(NUMJOBS)
- ## endif
+ ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
+ NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
+ MAKEFLAGS += -j$(NUMJOBS)
+ endif
# calculate the version strings
@@@ -46,12 -45,10 +45,10 @@@ endi
## used for package name extension
BRANCH_VERSION = $(STRIP_MAJOR).$(MINOR_VERSION)
- CONFIGURE_SWITCHES = --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --disable-strict-compilation --disable-maintainer-mode --disable-rpath --prefix=/usr --mandir=\$${prefix}/share/man --bindir=\$${prefix}/games --with-datadir-name=wesnoth/$(BRANCH_VERSION) --with-localedir=\$${prefix}/share/games/wesnoth/$(BRANCH_VERSION)/locale --with-fifodir=/var/run/wesnothd --datadir=\$${prefix}/share/games --enable-server --with-fribidi --enable-python-install CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs"
-
+ CONFIGURE_SWITCHES = --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --disable-strict-compilation --disable-maintainer-mode --disable-rpath --prefix=/usr --mandir=\$${prefix}/share/man --bindir=\$${prefix}/games --with-datadir-name=wesnoth/$(BRANCH_VERSION) --with-localedir=\$${prefix}/share/games/wesnoth/$(BRANCH_VERSION)/locale --with-fifodir=/var/run/wesnothd --datadir=\$${prefix}/share/games --enable-server --with-fribidi --enable-python-install
- include /usr/share/quilt/quilt.make
- clean: unpatch
+ clean:
dh_testdir
dh_testroot
rm -f build-stamp
@@@ -66,20 -63,25 +63,25 @@@
find po -name "*.gmo" -exec rm -f {} \;
find po -name "stamp-po" -exec rm -f {} \;
rm -f config.sub config.guess
+ $(MAKE) -f /usr/share/quilt/quilt.make unpatch
dh_clean
- #Architecture
+ configure: configure-stamp
+ configure-stamp:
+ $(MAKE) -f /usr/share/quilt/quilt.make patch
+ CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs" ./autogen.sh $(CONFIGURE_SWITCHES)
+ touch $@
+
+
build: build-stamp
- build-stamp: patch
- ./autogen.sh
- ./configure $(CONFIGURE_SWITCHES)
+ build-stamp: configure-stamp
$(MAKE)
touch $@
install: install-stamp
- install-stamp:
+ install-stamp: build
dh_testdir
dh_testroot
dh_prep
@@@ -128,13 -130,13 +130,13 @@@ binary-common
# Build architecture independant packages using the common target.
- binary-indep: build install
+ binary-indep: install
# workaround for dh_link (mis)behavior, see BTS#445550
for i in ttf-dejavu/DejaVuSans.ttf; \
do ln -s /usr/share/fonts/truetype/$$i \
debian/wesnoth-$(BRANCH_VERSION)-data/usr/share/games/wesnoth/$(BRANCH_VERSION)/fonts/`basename $$i`; \
done
- ln -s /usr/share/fonts/truetype/wqy/wqy-zenhei.ttc \
+ ln -s /usr/share/fonts/truetype/wqy/wqy-zenhei.ttf \
debian/wesnoth-$(BRANCH_VERSION)-data/usr/share/games/wesnoth/$(BRANCH_VERSION)/fonts/wqy-zenhei.ttc
# rename icons versioned
@@@ -144,7 -146,7 +146,7 @@@
debian/wesnoth-$(BRANCH_VERSION)-data/usr/share/icons/wesnoth-$(BRANCH_VERSION)_editor-icon.png
# /usr/share/doc symlinks
- for i in wesnoth-$(BRANCH_VERSION); do \
+ for i in wesnoth-$(BRANCH_VERSION) wesnoth wesnoth-core wesnoth-music wesnoth-editor wesnoth-all; do \
install -p -d -m755 debian/$$i/usr/share/doc; \
ln -s wesnoth-$(BRANCH_VERSION)-data debian/$$i/usr/share/doc/$$i; \
done
@@@ -152,7 -154,7 +154,7 @@@
$(MAKE) -f debian/rules DH_OPTIONS=-i binary-common
# Build architecture dependant packages using the common target.
- binary-arch: build install
+ binary-arch: install
# manpage symlinks for old binaries
for i in debian/wesnoth-$(BRANCH_VERSION)-core/usr/share/man/*/man6/wesnoth.6; do \
ln -s wesnoth-$(BRANCH_VERSION).6.gz \
@@@ -205,4 -207,4 +207,4 @@@
binary: binary-arch binary-indep
- .PHONY: build clean binary-indep binary-arch binary install
+ .PHONY: clean configure build binary-indep binary-arch binary install patch unpatch
--
Debian packaging of wesnoth
More information about the Pkg-games-commits
mailing list