[tryton-debian-vcs] tryton-neso branch debian-wheezy-2.6 created. 6984df6b45f4539ed83cc3357acd7128127c7450

[Mathias Behrle]

The following commit has been merged in the debian-wheezy-2.6 branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-neso.git;a=commitdiff;h=6984df6b45f4539ed83cc3357acd7128127c7450
commit 6984df6b45f4539ed83cc3357acd7128127c7450
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Thu May 2 00:18:49 2013 +0200

    Improving update of major version in Depends.
    
    Pulling the major version for Depends directly from the package version.
    Thanks to Ilya Melnikov for pushing the idea.

diff --git a/debian/control b/debian/control
index 960b792..e13daf6 100644
--- a/debian/control
+++ b/debian/control
@@ -13,8 +13,8 @@ X-Python-Version: >= 2.6
 Package: tryton-neso
 Architecture: all
 Depends:
- ${misc:Depends}, ${python:Depends}, tryton-client (>= 2.6),
- tryton-server (>= 2.6)
+ ${misc:Depends}, ${python:Depends}, tryton-client (>= ${version:major}),
+ tryton-server (>= ${version:major})
 Recommends: tryton-modules-all
 Description: Tryton Application Platform (Standalone Client/Server)
  Tryton is a high-level general purpose application platform written in Python
diff --git a/debian/rules b/debian/rules
index 1ae0776..0f63ab4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,5 +1,7 @@
 #!/usr/bin/make -f
 
+MAJOR := $(shell python setup.py --version | awk -F "." '{print $$1 "." $$2}')
+
 %:
 	dh ${@} --with python2
 
@@ -8,5 +10,8 @@ override_dh_auto_clean:
 
 	rm -rf *.egg-info
 
+override_dh_gencontrol:
+	dh_gencontrol -- -Vversion:major="$(MAJOR)"
+
 override_dh_builddeb:
 	dh_builddeb -- -Zxz -z9
commit d7016a4838c87e69b06a4ea6cafad31e369bddc4
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Wed Apr 24 00:59:51 2013 +0200

    Versioning watch file for Tryton branch 2.6.

diff --git a/debian/watch b/debian/watch
index 3ba657d..0c72345 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,2 @@
 version=3
-http://downloads.tryton.org/current/ .*neso-(\d.*)\.(?:tgz|tbz2|txz|tar\.(?:gz|bz2|xz))
+http://downloads.tryton.org/2.6/ .*neso-(\d.*)\.(?:tgz|tbz2|txz|tar\.(?:gz|bz2|xz))
-- 
tryton-neso