[SCM] Debian packaging of wesnoth branch, lenny-backports, updated. debian/1.8.1-1_bpo50+1-8-g78f0c27

Wed Jun 2 11:23:14 UTC 2010

The following commit has been merged in the lenny-backports branch:
commit 5fb3a6afa357aefa24fcc6d43387056b0bb1c35f
Merge: c2c0359529225cfa2ee5907ff74bc5fc256e3a01 d560fdb7f8e42983b334531cd05933996dd9d074
Author: Gerfried Fuchs <rhonda at debian.at>
Date:   Wed Jun 2 13:20:40 2010 +0200

    Merge commit 'debian/1.8.2-1' into lenny-backports

diff --combined debian/changelog
index 75d0678,bca36e4..1e5df44

--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,13 -1,13 +1,23 @@@
+ wesnoth-1.8 (1:1.8.2-1) unstable; urgency=low
+ 
+   * New upstream stable release.
+   * Call configure with --disable-strict-compilation
+     --disable-maintainer-mode.
+   * debian/rules: There is only one build and install target, enabling
+     DEB_BUILD_OPTIONS="parallel=X" support.
+ 
+  -- 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/rules
index 7ebfb47,b41ba06..d99655a
--- a/debian/rules
+++ b/debian/rules
@@@ -46,7 -46,7 +46,7 @@@ 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-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 CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs"
  
  
  include /usr/share/quilt/quilt.make
@@@ -54,7 -54,7 +54,7 @@@
  clean: unpatch
  	dh_testdir
  	dh_testroot
- 	rm -f build-arch-stamp build-indep-stamp
+ 	rm -f build-stamp
  	# Add here commands to clean up after the build process.
  	[ ! -f Makefile ] || $(MAKE) distclean
  	rm -f aclocal.m4 config.h.in Makefile.in configure m4/Makefile.in \
@@@ -70,36 -70,22 +70,22 @@@
  
  
  #Architecture
- build: build-arch build-indep
- 
- build-arch: build-arch-stamp
- build-arch-stamp: patch
+ build: build-stamp
+ build-stamp: patch
  	./autogen.sh
  	./configure $(CONFIGURE_SWITCHES)
  	$(MAKE)
  	touch $@
  
  
- build-indep: build-indep-stamp
- build-indep-stamp: patch
- 	# Add here commands to compile the indep part of the package.
- 	touch $@
- 
- 
- install: install-indep install-arch
- 
- install-indep:
+ install: install-stamp
+ install-stamp:
  	dh_testdir
  	dh_testroot
- 	dh_prep -i
- 	dh_installdirs -i
+ 	dh_prep
+ 	dh_installdirs
  
- 	# 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 \
- 			pkgdatadir=/usr/share/games/wesnoth/$(BRANCH_VERSION)
+ 	$(MAKE) DESTDIR=$(CURDIR)/debian/tmp install
  
  	cd $(CURDIR)/debian/tmp/usr/share/games/wesnoth/$(BRANCH_VERSION)/data/tools \
  		&& chmod +x extractbindings unit_tree/TeamColorizer \
@@@ -107,29 -93,10 +93,10 @@@
  		wmlindent wmlflip wmllint wmlscope wesnoth_addon_manager \
  		wmlvalidator hexometer/hexometer wmlxgettext
  
+ 	dh_install
  
- 	DESTDIR=$(CURDIR)/debian/tmp/ \
- 		$(MAKE) -C po install \
- 			localedir=/usr/share/games/wesnoth/$(BRANCH_VERSION)/locale
- 
- 	dh_install -i
- 
- 
- install-arch:
- 	dh_testdir
- 	dh_testroot
- 	dh_prep -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
+ 	touch $@
  
- 	dh_install -s
  
  
  # Must not depend on anything. This is to be called by
@@@ -161,13 -128,13 +128,13 @@@ binary-common
  
  
  # Build architecture independant packages using the common target.
- binary-indep: build-indep install-indep
+ binary-indep: build 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
@@@ -185,7 -152,7 +152,7 @@@
  	$(MAKE) -f debian/rules DH_OPTIONS=-i binary-common
  
  # Build architecture dependant packages using the common target.
- binary-arch: build-arch install-arch
+ binary-arch: build 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 \
@@@ -238,4 -205,4 +205,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

-- 
Debian packaging of wesnoth

