[Python-apps-commits] r7855 - in packages/openerp6 (3 files)

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

    Date: Friday, November 25, 2011 @ 20:27:59
  Author: xnox-guest
Revision: 7855

Changes to patch generation

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

Modified: packages/openerp6/trunk/debian/changelog
===================================================================
--- packages/openerp6/trunk/debian/changelog	2011-11-25 20:27:38 UTC (rev 7854)
+++ packages/openerp6/trunk/debian/changelog	2011-11-25 20:27:59 UTC (rev 7855)
@@ -1,4 +1,4 @@
-openerp6 (6.0.3-1bzr3544) UNRELEASED; urgency=low
+openerp6 (6.0.3-1bzr20111123) UNRELEASED; urgency=low
 
   [ Tristan Hill ]
   * Update to version 6.0.3

Modified: packages/openerp6/trunk/debian/rules
===================================================================
--- packages/openerp6/trunk/debian/rules	2011-11-25 20:27:38 UTC (rev 7854)
+++ packages/openerp6/trunk/debian/rules	2011-11-25 20:27:59 UTC (rev 7855)
@@ -35,19 +35,29 @@
 # You can specify local checkout, e.g.
 # export UPSTREAM_BRANCH=~/src/openerp/6.0/server
 # For running stable-updates and/or get-orig-tarball
+branches:=server addons client web
+patches:=$(patsubst %, debian/patches/z_stable_updates_%.patch, $(branches))
 upstream_server?=lp:openobject-server/6.0
+upstream_addons?=lp:openobject-addons/6.0
 upstream_client?=lp:openobject-client/6.0
 upstream_web?=lp:openobject-client-web/6.0
+prefix_server?=a/:b/
+prefix_addons?=a/bin/addons/:b/bin/addons/
+prefix_client?=a/client/:b/client/
+prefix_web?=a/web/:b/web/
 comp = $(subst .patch,,$(subst debian/patches/z_stable_updates_,,$(@)))
-PATCH_FILE:=debian/patches/z_stable_updates.patch
+PATCH_LEVEL:=date:$(shell echo $(DEB_VERSION) | sed -rne 's,.*bzr(....)(..)(..),\1-\2-\3,p')
 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 "Upto revisionspec $(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/*' >> $(@)
+	bzr diff $(upstream_$(comp)) -p$(prefix_$(comp)) -rtag:$(DEB_VERSION_UPSTREAM)..$(PATCH_LEVEL) | filterdiff -p1 -x 'debian/*' >> $(@)
 
+stable-updates:
+	rm -f $(patches)
+	./debian/rules $(patches)
+
 generate-config:
 	HOME=./debian/local ./bin/openerp-server.py \
 		-s --stop-after-init \