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

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

    Date: Tuesday, December 13, 2011 @ 19:57:42
  Author: xnox-guest
Revision: 7953

Fix get-orig-source

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

Modified: packages/openerp6/trunk/debian/rules
===================================================================
--- packages/openerp6/trunk/debian/rules	2011-12-13 19:30:06 UTC (rev 7952)
+++ packages/openerp6/trunk/debian/rules	2011-12-13 19:57:42 UTC (rev 7953)
@@ -1,7 +1,6 @@
 #!/usr/bin/make -f
-DEBIAN_DIR := $(shell echo $(MAKEFILE))
 #copied from dpkg-dev 1.16 to ease backporting
-include ./debian/pkg-info.mk
+-include ./debian/pkg-info.mk
 
 DH_VERBOSE:=1
 
@@ -37,6 +36,9 @@
 override_dh_installchangelogs:
 	dh_installchangelogs doc/Changelog
 
+override_dh_builddeb:
+	dh_builddeb -- -Zlzma
+
 override_dh_fixperms:
 	dh_fixperms
 	find debian/$(DEB_SOURCE)-*/usr/share/$(DEB_SOURCE)/ -type f -print0 | xargs -0 chmod 0644
@@ -80,15 +82,17 @@
 	sed -f ./debian/local/config.sed ./debian/local/.openerp_serverrc > debian/local/server.conf.tpl
 	rm ./debian/local/.openerp_serverrc
 
-uscan_options:= --no-conf --force-download --download-current-version --no-symlink --destdir .
-package_name:=$(DEB_SOURCE)_$(DEB_VERSION_UPSTREAM)
+package:=openerp6
+package_vers:=6.0.3
+package_name:=$(package)_$(package_vers)
+uscan_options:= --no-conf --force-download --no-symlink --destdir . --package $(package) --upstream-version $(package_vers) --download-current-version
 debian_dir:=$(dir $(firstword $(MAKEFILE_LIST)))
 get-orig-source:
-	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
+	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-$(package_vers).tar.gz $(package_name).orig.tar.gz
+	mv openerp-client-$(package_vers).tar.gz $(package_name).orig-client.tar.gz
+	mv openerp-web-$(package_vers).tar.gz $(package_name).orig-web.tar.gz
 
 .PHONY: stable-updates generate-config get-orig-source debian/patches/series