APPLIED: Re: ACK: Allow passing version for dpkg-genchanges to dpkg-buildpackage for -meta

[Herton Ronaldo Krzesinski]

On Tue, Apr 17, 2012 at 07:26:33PM -0600, Tim Gardner wrote:
> On 04/17/2012 08:37 AM, Herton Ronaldo Krzesinski wrote:
> >Ok how about this:
> >
> >diff --git a/Makefile b/Makefile
> >index 0d18f4a..fc0b59f 100644
> >--- a/Makefile
> >+++ b/Makefile
> >@@ -1,20 +1,30 @@
> >  LOG		:= meta-source/debian/changelog
> >-META_VERSION	:= $(shell head -1 $(LOG)|sed 's/.*(\(.*\)).*/\1/')
> >+META_NAME	:= $(shell head -n 1 $(LOG) | sed 's/\(.*\)[[:space:]]\+(.*).*/\1/')
> >+META_VERSION	:= $(shell head -n 1 $(LOG) | sed 's/.*(\(.*\)).*/\1/')
> >+META_SERIES	:= $(shell head -n 1 $(LOG) | sed 's/.*(.*)[[:space:]]\+\(.*\);.*/\1/' | sed 's/-.*//')
> >+LAST_VERSION	?= $(shell rmadison -a source -s $(META_SERIES)-updates $(META_NAME) | cut -d '|' -f 2 | tr -d '[:blank:]')
> >+
> >+ifeq ($(LAST_VERSION),)
> >+LAST_VERSION	:= $(shell rmadison -a source -s $(META_SERIES) $(META_NAME) | cut -d '|' -f 2 | tr -d '[:blank:]')
> >+ifeq ($(LAST_VERSION),)
> >+LAST_VERSION	:= $(META_VERSION)
> >+endif
> >+endif
> >
> >  all: source
> >
> >  source: clean
> >-	ln -s meta-source linux-meta-$(META_VERSION)
> >-	cd linux-meta-$(META_VERSION); \
> >-	dpkg-buildpackage -S -sa -rfakeroot -I.git -I.gitignore -i'\.git.*'
> >+	ln -s meta-source $(META_NAME)-$(META_VERSION)
> >+	cd $(META_NAME)-$(META_VERSION); \
> >+	dpkg-buildpackage -S -sa -rfakeroot -I.git -I.gitignore -i'\.git.*' -v$(LAST_VERSION)
> >
> >  binary: clean
> >-	ln -s meta-source linux-meta-$(META_VERSION)
> >-	cd linux-meta-$(META_VERSION); \
> >+	ln -s meta-source $(META_NAME)-$(META_VERSION)
> >+	cd $(META_NAME)-$(META_VERSION); \
> >  	debuild -b
> >
> >  clean:
> >  	cd meta-source&&  fakeroot debian/rules clean
> >-	rm -f linux-meta-$(META_VERSION)
> >+	rm -f $(META_NAME)-$(META_VERSION)
> >  	rm -f *.dsc *.changes *.gz *.deb *.build *.upload
> >
> 
> Looks good to me.
> -- 
> Tim Gardner tim.gardner at canonical.com
> 

I applied the change above for our supported -meta branches (with minor
fixes to apply in some cases):

ubuntu-hardy-meta/master
ubuntu-lucid-meta/{ec2,lts-backport-natty,lts-backport-oneiric,master,ports}
ubuntu-natty-meta/{master,ti-omap4}
ubuntu-oneiric-meta/{master,ti-omap4}
ubuntu-precise-meta/{master,ti-omap4}

-- 
[]'s
Herton