[Python-apps-commits] r7853 - in packages/openerp6 (trunk trunk/debian/rules)

[xnox-guest at users.alioth.debian.org]

    Date: Friday, November 25, 2011 @ 20:27:05
  Author: xnox-guest
Revision: 7853

work in progress

Modified:
  packages/openerp6/trunk/	(properties)
  packages/openerp6/trunk/debian/rules

Modified: packages/openerp6/trunk/debian/rules
===================================================================
--- packages/openerp6/trunk/debian/rules	2011-11-25 20:20:09 UTC (rev 7852)
+++ packages/openerp6/trunk/debian/rules	2011-11-25 20:27:05 UTC (rev 7853)
@@ -35,16 +35,18 @@
 # You can specify local checkout, e.g.
 # export UPSTREAM_BRANCH=~/src/openerp/6.0/server
 # For running stable-updates and/or get-orig-tarball
-UPSTREAM_BRANCH?=lp:openobject-server/6.0
+upstream_server?=lp:openobject-server/6.0
+upstream_client?=lp:openobject-client/6.0
+upstream_web?=lp:openobject-client-web/6.0
+comp = $(subst .patch,,$(subst debian/patches/z_stable_updates_,,$(@)))
 PATCH_FILE:=debian/patches/z_stable_updates.patch
-PATCH_LEVEL:=$(shell echo $(DEB_VERSION) | sed -rne 's,.*bzr([0-9]*).*,\1,p')
-stable-updates:
-	rm -f $(PATCH_FILE)
-	echo "Upstream stable fixes & translation updates" >> $(PATCH_FILE)
-	echo "Upto revision $(PATCH_LEVEL) from the stable release branch" >> $(PATCH_FILE)
-	echo "Log of changes only (translation updates ignored)" >> $(PATCH_FILE)
-	bzr log $(UPSTREAM_BRANCH) --forward -n 0 --line -rtag:$(DEB_VERSION_UPSTREAM)..$(PATCH_LEVEL) --show-ids | grep -v "Launchpad Translations" >> $(PATCH_FILE)
-	bzr diff $(UPSTREAM_BRANCH) -pa/:b/ -rtag:$(DEB_VERSION_UPSTREAM)..$(PATCH_LEVEL) | filterdiff -p1 -x 'debian/*' >> $(PATCH_FILE)
+debian/patches/z_stable_updates_%.patch:
+	rm -f $(@)
+	echo "Upstream stable fixes & translation updates" >> $(@)
+	echo "Upto revision $(PATCH_LEVEL) from the stable release branch" >> $(@)
+	echo "Log of changes only (translation updates ignored)" >> $(@)
+	bzr log $(upstream_$(comp)) --forward -n 0 --line -rtag:$(DEB_VERSION_UPSTREAM)..$(PATCH_LEVEL) --show-ids | grep -v "Launchpad Translations" >> $(@)
+	bzr diff $(upstream_$(comp)) -pa/:b/ -rtag:$(DEB_VERSION_UPSTREAM)..$(@) | filterdiff -p1 -x 'debian/*' >> $(@)
 
 generate-config:
 	HOME=./debian/local ./bin/openerp-server.py \