Author: alfie
Date: 2008-03-17 21:28:55 +0000 (Mon, 17 Mar 2008)
New Revision: 6146
Modified:
packages/trunk/wesnoth/debian/changelog
packages/trunk/wesnoth/debian/control
packages/trunk/wesnoth/debian/rules
packages/trunk/wesnoth/debian/wesnoth.install
Log:
* Build a wesnoth-smallgui binary (closes: #469234)
Remove trailing spaces in debian/rules
Modified: packages/trunk/wesnoth/debian/changelog
===================================================================
--- packages/trunk/wesnoth/debian/changelog 2008-03-17 20:31:26 UTC (rev
6145)
+++ packages/trunk/wesnoth/debian/changelog 2008-03-17 21:28:55 UTC (rev
6146)
@@ -19,8 +19,9 @@
developers.
* Install documentation only into wesnoth-data package and make the
depending packages have symlinks to the doc dir.
+ * Build a wesnoth-smallgui binary (closes: #469234)
- -- Gerfried Fuchs <[EMAIL PROTECTED]> Wed, 12 Mar 2008 11:25:43 +0100
+ -- Gerfried Fuchs <[EMAIL PROTECTED]> Mon, 17 Mar 2008 22:28:29 +0100
wesnoth (1:1.4-1) unstable; urgency=low
Modified: packages/trunk/wesnoth/debian/control
===================================================================
--- packages/trunk/wesnoth/debian/control 2008-03-17 20:31:26 UTC (rev
6145)
+++ packages/trunk/wesnoth/debian/control 2008-03-17 21:28:55 UTC (rev
6146)
@@ -11,6 +11,19 @@
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-data
+Architecture: all
+Depends: ttf-dejavu
+Recommends: wesnoth-music
+Suggests: ttf-sazanami-gothic, ttf-wqy-zenhei
+Description: data files for Wesnoth
+ This package contains the sound files and graphics for 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
Architecture: any
Depends: ${shlibs:Depends}, wesnoth-data (= ${source:Version})
@@ -46,19 +59,6 @@
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
-Suggests: ttf-sazanami-gothic, ttf-wqy-zenhei
-Description: data files for Wesnoth
- This package contains the sound files and graphics for 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-music
Architecture: all
Description: music files for Wesnoth
Modified: packages/trunk/wesnoth/debian/rules
===================================================================
--- packages/trunk/wesnoth/debian/rules 2008-03-17 20:31:26 UTC (rev 6145)
+++ packages/trunk/wesnoth/debian/rules 2008-03-17 21:28:55 UTC (rev 6146)
@@ -19,7 +19,9 @@
CFLAGS += -O2
endif
+CONFIGURE_SWITCHES = --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE)
--disable-rpath --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 --enable-python-install CFLAGS="$(CFLAGS)"
LDFLAGS="-Wl,-z,defs"
+
# 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 | cut -d- -f1)
@@ -41,40 +43,32 @@
clean: unpatch
dh_testdir
dh_testroot
- rm -f build-arch-stamp build-indep-stamp
+ 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
+ rm -f config.sub config.guess src/wesnoth-smallgui
+ dh_clean
-config.status: configure patch-stamp
- dh_testdir
- # Add here commands to configure the package.
- ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \
- --disable-rpath --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 \
- --enable-python-install CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs"
+#Architecture
+build: build-arch build-indep patch-stamp
-#Architecture
-build: build-arch build-indep
-
build-arch: build-arch-stamp
-build-arch-stamp: config.status
- $(MAKE)
+build-arch-stamp:
+ ./configure $(CONFIGURE_SWITCHES) --enable-smallgui
+ $(MAKE)
+ mv src/wesnoth src/wesnoth-smallgui
+ ./configure $(CONFIGURE_SWITCHES) --disable-smallgui
+ $(MAKE)
touch $@
build-indep: build-indep-stamp
-build-indep-stamp: config.status
+build-indep-stamp:
# Add here commands to compile the indep part of the package.
- #$(MAKE) doc
touch $@
@@ -83,7 +77,7 @@
install-indep:
dh_testdir
dh_testroot
- dh_clean -k -i
+ dh_clean -k -i
dh_installdirs -i
# Add here commands to install the indep part of the package into
@@ -103,9 +97,9 @@
install-arch:
dh_testdir
dh_testroot
- dh_clean -k -s
+ dh_clean -k -s
dh_installdirs -s
- # Add here commands to install the arch part of the package into
+ # Add here commands to install the arch part of the package into
# debian/tmp.
$(MAKE) DESTDIR=$(CURDIR)/debian/tmp install
DESTDIR=$(CURDIR)/debian/tmp \
@@ -121,14 +115,14 @@
dh_testdir
dh_testroot
dh_installchangelogs changelog
- dh_installdocs --all README
+ dh_installdocs
dh_installexamples
dh_installmenu
# dh_python
dh_installinit
dh_installman
dh_strip
- dh_compress
+ dh_compress
dh_fixperms
dh_makeshlibs
dh_installdeb
@@ -153,6 +147,7 @@
for i in wesnoth-all wesnoth-httt wesnoth-tsg wesnoth-trow wesnoth-ttb \
wesnoth-ei wesnoth-utbs wesnoth-did wesnoth-nr wesnoth-sof \
wesnoth-sotbe wesnoth-l wesnoth-aoi wesnoth-thot; do \
+ install -p -d -m755 debian/$$i/usr/share/doc; \
ln -s wesnoth-data debian/$$i/usr/share/doc/$$i; \
done
@@ -166,10 +161,12 @@
for i in debian/wesnoth/usr/share/man/*/man6/wesnoth.6; do \
ln -s wesnoth.6.gz `dirname $$i`/wesnoth-nolog.6.gz; \
+ ln -s wesnoth.6.gz `dirname $$i`/wesnoth-smallgui.6.gz; \
done
ln -s wesnoth.6.gz debian/wesnoth/usr/share/man/man6/wesnoth-nolog.6.gz
for i in wesnoth wesnoth-editor; do \
+ install -p -d -m755 debian/$$i/usr/share/doc; \
ln -s wesnoth-data debian/$$i/usr/share/doc/$$i; \
done
@@ -177,4 +174,4 @@
binary: binary-arch binary-indep
-.PHONY: build clean binary-indep binary-arch binary install install-indep
install-arch
+.PHONY: build clean binary-indep binary-arch binary install install-indep
install-arch
Modified: packages/trunk/wesnoth/debian/wesnoth.install
===================================================================
--- packages/trunk/wesnoth/debian/wesnoth.install 2008-03-17 20:31:26 UTC
(rev 6145)
+++ packages/trunk/wesnoth/debian/wesnoth.install 2008-03-17 21:28:55 UTC
(rev 6146)
@@ -1,4 +1,5 @@
debian/tmp/usr/games/wesnoth
+src/wesnoth-smallgui /usr/games
debian/wesnoth-nolog /usr/games
debian/tmp/usr/share/man/man6/wesnoth.6
debian/tmp/usr/share/man/*/man6/wesnoth.6
_______________________________________________
Pkg-games-commits mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits
