------------------------------------------------------------ revno: 82 committer: Dmitrijs Ledkovs <[email protected]> branch nick: trunk timestamp: Mon 2010-11-29 23:00:16 +0000 message: Simplify and reduce login in debian/rules. added: .bzrignore modified: .bzr-builddeb/default.conf debian/changelog debian/rules
-- lp:xiphos/debian https://code.launchpad.net/~pkgcrosswire/xiphos/main Your team Crosswire Packaging Team is subscribed to branch lp:xiphos/debian. To unsubscribe from this branch go to https://code.launchpad.net/~pkgcrosswire/xiphos/main/+edit-subscription
=== modified file '.bzr-builddeb/default.conf' --- .bzr-builddeb/default.conf 2010-11-14 00:43:39 +0000 +++ .bzr-builddeb/default.conf 2010-11-29 23:00:16 +0000 @@ -1,2 +1,2 @@ [HOOKS] -pre-build = ./debian/rules source-format +pre-build = ./debian/rules clean === added file '.bzrignore' --- .bzrignore 1970-01-01 00:00:00 +0000 +++ .bzrignore 2010-11-29 23:00:16 +0000 @@ -0,0 +1,3 @@ +debian/source/format +src/examples/ipc-interface.xml +src/examples/marshal.list === modified file 'debian/changelog' --- debian/changelog 2010-11-27 16:41:39 +0000 +++ debian/changelog 2010-11-29 23:00:16 +0000 @@ -1,3 +1,10 @@ +xiphos (3.1.4-2) UNRELEASED; urgency=low + + [ Dmitrijs Ledkovs <[email protected] ] + * Simplify and reduce login in debian/rules. + + -- Dmitrijs Ledkovs <[email protected]> Mon, 29 Nov 2010 22:58:32 +0000 + xiphos (3.1.4-1) experimental; urgency=low [ Jonathan Marsden ] === modified file 'debian/rules' --- debian/rules 2010-11-14 00:43:39 +0000 +++ debian/rules 2010-11-29 23:00:16 +0000 @@ -1,25 +1,12 @@ #!/usr/bin/make -f #Ubuntu doesn't have dh_xulrunner yet xul:=$(shell which dh_xulrunner) -qul:=$(shell which dh_quilt_patch) ppa:=$(shell sed -n "1s/.*~.*/yes/p" debian/changelog) - -ifneq ($(qul),) -args:=quilt -else -include /usr/share/quilt/quilt.make -clean: unpatch -build: $(QUILT_STAMPFN) -endif -ifneq ($(xul),) -args:=$(args),xulrunner -endif -ifneq ($(args),) -with=--with $(args) -endif +# Yes, the next variable name and value are the same +,:=, %: - dh $@ $(with) + dh $@ --with quilt$(if $(xul),$(,)xulrunner) override_dh_auto_configure: ./waf configure --nocache --prefix=/usr override_dh_auto_build: @@ -38,25 +25,11 @@ | sed -n "/xulrunner-1.9.*-dev\t./s/\(xulrunner-1.9.*\)-dev\t.*/\1/p")/" \ debian/xiphos.substvars endif -override_dh_clean: source-format +override_dh_clean: + echo $(if $(ppa),"1.0","3.0 (quilt)") > debian/source/format dh_clean rm -rf .waf* rm -rf waffles/*.pyc -source-format: -ifeq ($(ppa),) - echo "3.0 (quilt)" > debian/source/format -else - echo "1.0" > debian/source/format -endif - - -# build lzma compressed debs on Launchpad ;-) override_dh_builddeb: -ifeq ($(ppa),) - dh_builddeb -else - dh_builddeb -- -Zlzma -endif - -.PHONY: source-format + dh_builddeb $(if $(ppa),-- -Zlzma)
_______________________________________________ Pkg-crosswire-devel mailing list [email protected] http://lists.alioth.debian.org/mailman/listinfo/pkg-crosswire-devel
