From 8be80cf90958f48f8cbd21961d901aa3f538511e Mon Sep 17 00:00:00 2001 From: Frank Date: Mon, 20 Jun 2011 10:11:16 -0700 Subject: [PATCH] Bug 10343 - 2.2.5 > 2.2.6 upgrade not working on Ubuntu 10.04 builds resolved fixed --- debian/rules | 4 ++-- wscript | 6 +++++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/debian/rules b/debian/rules index f975634dfc7..5c5ddcbe0a1 100755 --- a/debian/rules +++ b/debian/rules @@ -25,7 +25,7 @@ configure: configure-stamp configure-stamp: dh_testdir # Add here commands to configure the package. - ./waf configure --prefix=/usr --libdir=/usr/lib --bindir=/usr/bin --javadir=/usr/share/java --sharedstatedir=/var/lib --localstatedir=/var --sysconfdir=/etc --mandir=/usr/share/man --libexecdir=/usr/bin --with-tomcat=/usr/share/tomcat6 --tomcat-user=cloud --fast + ./waf configure --prefix=/usr --libdir=/usr/lib --bindir=/usr/bin --javadir=/usr/share/java --sharedstatedir=/var/lib --localstatedir=/var --sysconfdir=/etc --mandir=/usr/share/man --libexecdir=/usr/bin --with-tomcat=/usr/share/tomcat6 --tomcat-user=cloud --fast --package-version=$(PACKAGEVERSION) ./waf showconfig touch configure-stamp @@ -38,7 +38,7 @@ build-arch: build-arch-stamp build-arch-stamp: configure-stamp # Add here commands to compile the arch part of the package. - ./waf build --build-number=$(BUILDNUMBER) + ./waf build --build-number=$(BUILDNUMBER) --package-version=$(PACKAGEVERSION) touch $@ # build-indep: build-indep-stamp diff --git a/wscript b/wscript index 01bc6944bc1..12f845a0c9f 100644 --- a/wscript +++ b/wscript @@ -610,6 +610,10 @@ def deb(context): if Options.options.VERNUM: VERSION = Options.options.VERNUM + else: + VERSION = "2.2" + + version = ["--set-envvar=PACKAGEVERSION=%s"%VERSION] if Options.options.PRERELEASE: if not buildnumber: @@ -658,7 +662,7 @@ def deb(context): f.close() checkdeps = lambda: c(["dpkg-checkbuilddeps"],srcdir) - dodeb = lambda: c(["debuild",'-e','WAFCACHE','--no-lintian', '--no-tgz-check']+buildnumber+["-us","-uc"],srcdir) + dodeb = lambda: c(["debuild",'-e','WAFCACHE','--no-lintian', '--no-tgz-check']+buildnumber+version+["-us","-uc"],srcdir) try: checkdeps() except (CalledProcessError,OSError),e: Utils.pprint("YELLOW","Dependencies might be missing. Trying to auto-install them...")