[Python-apps-commits] r7856 - in packages/openerp6 (4 files)

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

    Date: Friday, November 25, 2011 @ 22:13:09
  Author: xnox-guest
Revision: 7856

get-orig-source target

Added:
  packages/openerp6/trunk/debian/watch.client
  packages/openerp6/trunk/debian/watch.web
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:27:59 UTC (rev 7855)
+++ packages/openerp6/trunk/debian/rules	2011-11-25 22:13:09 UTC (rev 7856)
@@ -1,5 +1,5 @@
 #!/usr/bin/make -f
-
+DEBIAN_DIR := $(shell echo $(MAKEFILE))
 #copied from dpkg-dev 1.16 to ease backporting
 include ./debian/pkg-info.mk
 
@@ -45,7 +45,7 @@
 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_,,$(@)))
+comp = $(subst .patch,,$(@F))
 PATCH_LEVEL:=date:$(shell echo $(DEB_VERSION) | sed -rne 's,.*bzr(....)(..)(..),\1-\2-\3,p')
 debian/patches/z_stable_updates_%.patch:
 	echo "Upstream stable fixes & translation updates" >> $(@)
@@ -65,8 +65,15 @@
 	sed -f ./debian/local/config.sed ./debian/local/.openerp_serverrc > debian/local/config
 	rm ./debian/local/.openerp_serverrc
 
-# per-file-timestamps  generates checksum identical tarballs
+uscan_options:= --no-conf --force-download --download-current-version --no-symlink --destdir .
+package_name:=$(DEB_SOURCE)_$(DEB_VERSION_UPSTREAM)
+debian_dir:=$(dir $(firstword $(MAKEFILE_LIST)))
 get-orig-source:
-	bzr export --per-file-timestamps $(DEB_SOURCE)_$(DEB_VERSION_UPSTREAM).orig.tar.gz --root $(DEB_SOURCE)-$(DEB_VERSION_UPSTREAM) -rtag:$(DEB_VERSION_UPSTREAM) $(UPSTREAM_BRANCH)
+	uscan $(uscan_options) --watchfile $(debian_dir)/watch
+	uscan $(uscan_options) --watchfile $(debian_dir)/watch.client
+	uscan $(uscan_options) --watchfile $(debian_dir)/watch.web
+	mv openerp-server-$(DEB_VERSION_UPSTREAM).tar.gz $(package_name).orig.tar.gz
+	mv openerp-client-$(DEB_VERSION_UPSTREAM).tar.gz $(package_name).orig-client.tar.gz
+	mv openerp-web-$(DEB_VERSION_UPSTREAM).tar.gz $(package_name).orig-web.tar.gz
 
 .PHONY: stable-updates generate-config get-orig-source

Added: packages/openerp6/trunk/debian/watch.client
===================================================================
--- packages/openerp6/trunk/debian/watch.client	                        (rev 0)
+++ packages/openerp6/trunk/debian/watch.client	2011-11-25 22:13:09 UTC (rev 7856)
@@ -0,0 +1,2 @@
+version=3
+http://www.openerp.com/download/stable/source/openerp-client-(.+).tar.gz

Added: packages/openerp6/trunk/debian/watch.web
===================================================================
--- packages/openerp6/trunk/debian/watch.web	                        (rev 0)
+++ packages/openerp6/trunk/debian/watch.web	2011-11-25 22:13:09 UTC (rev 7856)
@@ -0,0 +1,2 @@
+version=3
+http://www.openerp.com/download/stable/source/openerp-web-(.+).tar.gz