[tryton-debian-vcs] tryton-modules-analytic-sale branch debian-wheezy-2.6 created. 8ccde412915a6d7a2a2794461be12f54f85ec680

Mathias Behrle tryton-debian-vcs at alioth.debian.org
Wed Nov 27 16:58:53 UTC 2013


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-modules-analytic-sale.git;a=commitdiff;h=8ccde412915a6d7a2a2794461be12f54f85ec680
commit 8ccde412915a6d7a2a2794461be12f54f85ec680
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Sat May 11 17:38:21 2013 +0200

    Adding epoch of tryton-modules-analytic-invoice in Depends.

diff --git a/debian/control b/debian/control
index b216c17..b4b985e 100644
--- a/debian/control
+++ b/debian/control
@@ -15,7 +15,7 @@ Architecture: all
 Depends:
  ${misc:Depends}, ${python:Depends}, tryton-server (>= ${version:major}),
  tryton-modules-analytic-account (>= ${version:major}),
- tryton-modules-analytic-invoice (>= ${version:major}),
+ tryton-modules-analytic-invoice (>= 1:${version:major}),
  tryton-modules-sale (>= ${version:major}), python-pkg-resources
 Description: Tryton Application Platform (Financial and Accounting Module)
  Tryton is a high-level general purpose application platform written in Python
commit 0e7c2df8d73c15f4c29936ca381ef422b982c79d
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Sat Apr 27 14:54:47 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 688d111..b216c17 100644
--- a/debian/control
+++ b/debian/control
@@ -13,10 +13,10 @@ X-Python-Version: >= 2.6
 Package: tryton-modules-analytic-sale
 Architecture: all
 Depends:
- ${misc:Depends}, ${python:Depends}, tryton-server (>= 2.6),
- tryton-modules-analytic-account (>= 2.6),
- tryton-modules-analytic-invoice (>= 2.6), tryton-modules-sale (>= 2.6),
- python-pkg-resources
+ ${misc:Depends}, ${python:Depends}, tryton-server (>= ${version:major}),
+ tryton-modules-analytic-account (>= ${version:major}),
+ tryton-modules-analytic-invoice (>= ${version:major}),
+ tryton-modules-sale (>= ${version:major}), python-pkg-resources
 Description: Tryton Application Platform (Financial and Accounting Module)
  Tryton is a high-level general purpose application platform written in Python
  and using PostgreSQL as database engine. It is the core base of a complete
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 e67e90bc90899a5b047cf750aa9a3787c009f257
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Wed Apr 24 00:59:38 2013 +0200

    Versioning watch file for Tryton branch 2.6.

diff --git a/debian/watch b/debian/watch
index 9a3dbeb..337c725 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,2 @@
 version=3
-http://downloads.tryton.org/current/ .*trytond_analytic_sale-(\d.*)\.(?:tgz|tbz2|txz|tar\.(?:gz|bz2|xz))
+http://downloads.tryton.org/2.6/ .*trytond_analytic_sale-(\d.*)\.(?:tgz|tbz2|txz|tar\.(?:gz|bz2|xz))
-- 
tryton-modules-analytic-sale



More information about the tryton-debian-vcs mailing list